Notice: If you are member of any public project or group, please make sure that your GitLab username is not the same as the LRZ identifier/Kennung (see https://gitlab.lrz.de/profile/account). Please change your username if necessary. For more information see the section "Public projects / Öffentliche Projekte" at https://doku.lrz.de/display/PUBLIC/GitLab . Thank you!

Commit ddb8a8ad authored by hm-schuhba1's avatar hm-schuhba1

move TopographyBuilder to simulator module

parent 282fab9d
......@@ -12,7 +12,7 @@ import org.vadere.gui.components.model.IDefaultModel;
import org.vadere.gui.projectview.view.JsonValidIndicator;
import org.vadere.gui.projectview.view.ProjectView;
import org.vadere.gui.projectview.view.ScenarioPanel;
import org.vadere.gui.topographycreator.model.AgentWrapper;
import org.vadere.simulator.utils.builder.topography.AgentWrapper;
import org.vadere.gui.topographycreator.model.TopographyCreatorModel;
import org.vadere.state.attributes.Attributes;
import org.vadere.state.scenario.Pedestrian;
......
......@@ -7,7 +7,7 @@ import java.awt.geom.Rectangle2D;
import javax.swing.undo.UndoableEdit;
import javax.swing.undo.UndoableEditSupport;
import org.vadere.gui.topographycreator.model.AgentWrapper;
import org.vadere.simulator.utils.builder.topography.AgentWrapper;
import org.vadere.gui.topographycreator.model.IDrawPanelModel;
import org.vadere.state.scenario.ScenarioElement;
import org.vadere.util.geometry.shapes.VCircle;
......
......@@ -5,6 +5,7 @@ import javax.swing.undo.CannotRedoException;
import javax.swing.undo.CannotUndoException;
import org.vadere.gui.topographycreator.model.IDrawPanelModel;
import org.vadere.simulator.utils.builder.topography.AttributeModifier;
import org.vadere.state.scenario.ScenarioElement;
import org.vadere.util.geometry.shapes.VShape;
......
......@@ -9,6 +9,7 @@ import javax.swing.undo.UndoableEditSupport;
import org.vadere.gui.components.control.DefaultSelectionMode;
import org.vadere.gui.components.control.IMode;
import org.vadere.gui.topographycreator.model.IDrawPanelModel;
import org.vadere.simulator.utils.builder.topography.AttributeModifier;
import org.vadere.state.scenario.ScenarioElement;
import org.vadere.util.geometry.shapes.VPoint;
import org.vadere.util.geometry.shapes.VShape;
......
......@@ -15,6 +15,8 @@ import org.vadere.gui.components.control.IMode;
import org.vadere.gui.components.model.DefaultConfig;
import org.vadere.gui.components.model.DefaultModel;
import org.vadere.simulator.projects.Scenario;
import org.vadere.simulator.utils.builder.topography.AgentWrapper;
import org.vadere.simulator.utils.builder.topography.TopographyBuilder;
import org.vadere.state.attributes.scenario.AttributesTopography;
import org.vadere.state.scenario.Obstacle;
import org.vadere.state.scenario.ScenarioElement;
......
package org.vadere.gui.topographycreator.model;
import org.vadere.simulator.utils.builder.topography.AgentWrapper;
import org.vadere.state.attributes.Attributes;
import org.vadere.state.attributes.scenario.AttributesObstacle;
import org.vadere.state.attributes.scenario.AttributesSource;
......
package org.vadere.gui.topographycreator.model;
package org.vadere.simulator.utils.builder.topography;
import java.util.LinkedList;
import java.util.Random;
......@@ -25,6 +25,7 @@ public final class AgentWrapper extends ScenarioElement {
/** The wrapped store object. */
private Agent agent;
public
AgentWrapper(final VPoint position) {
// use a Pedestrian as default
// TODO this default does not make much sense
......
package org.vadere.gui.topographycreator.control;
package org.vadere.simulator.utils.builder.topography;
import org.vadere.gui.topographycreator.model.AgentWrapper;
import org.vadere.simulator.utils.builder.topography.AgentWrapper;
import org.vadere.state.attributes.AttributesEmbedShape;
import org.vadere.state.scenario.ScenarioElement;
import org.vadere.util.geometry.shapes.VPoint;
......
package org.vadere.gui.topographycreator.model;
package org.vadere.simulator.utils.builder.topography;
import java.awt.geom.Rectangle2D;
import java.lang.reflect.Field;
......@@ -8,7 +8,6 @@ import java.util.List;
import java.util.function.Predicate;
import org.jetbrains.annotations.NotNull;
import org.vadere.gui.topographycreator.control.AttributeModifier;
import org.vadere.state.attributes.scenario.AttributesAgent;
import org.vadere.state.attributes.scenario.AttributesCar;
import org.vadere.state.attributes.scenario.AttributesTopography;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment