Commit e9f91aff authored by Benedikt Kleinmeier's avatar Benedikt Kleinmeier
Browse files

In "GUI", renamed tab "Stimuli" to "Perception"

parent 5bb83db7
Pipeline #211648 passed with stages
in 128 minutes and 16 seconds
...@@ -367,7 +367,7 @@ Tab.Model.insertModelNameSubMenu.title=Main models ...@@ -367,7 +367,7 @@ Tab.Model.insertModelNameSubMenu.title=Main models
Tab.Pedestrians.title=Pedestrians Tab.Pedestrians.title=Pedestrians
Tab.Psychology.title=Psychology Tab.Psychology.title=Psychology
Tab.Topography.title=Topography Tab.Topography.title=Topography
Tab.Stimuli.title=Stimuli Tab.Perception.title=Perception
Tab.OutputProcessors.title=Data output Tab.OutputProcessors.title=Data output
Tab.TopographyCreator.title=Topography creator Tab.TopographyCreator.title=Topography creator
Tab.PostVisualization.title=Post-Visualization Tab.PostVisualization.title=Post-Visualization
......
...@@ -361,7 +361,7 @@ Tab.Model.insertModelNameSubMenu.title=Hauptmodelle ...@@ -361,7 +361,7 @@ Tab.Model.insertModelNameSubMenu.title=Hauptmodelle
Tab.Pedestrians.title=Fu\u00dfg\u00e4nger Tab.Pedestrians.title=Fu\u00dfg\u00e4nger
Tab.Psychology.title=Psychologie Tab.Psychology.title=Psychologie
Tab.Topography.title=Topographie Tab.Topography.title=Topographie
Tab.Stimuli.title=Stimuli Tab.Perception.title=Perzeption
Tab.OutputProcessors.title=Datenausgabe Tab.OutputProcessors.title=Datenausgabe
Tab.TopographyCreator.title=Topographie-Designer Tab.TopographyCreator.title=Topographie-Designer
Tab.PostVisualization.title=Post-Visualisierung Tab.PostVisualization.title=Post-Visualisierung
......
package org.vadere.gui.projectview.view; package org.vadere.gui.projectview.view;
public enum AttributeType { public enum AttributeType {
SIMULATION, MODEL, PSYCHOLOGY, PEDESTRIAN, CAR, TOPOGRAPHY, OUTPUTPROCESSOR, STIMULUS; SIMULATION, MODEL, PSYCHOLOGY, PEDESTRIAN, CAR, TOPOGRAPHY, OUTPUTPROCESSOR, PERCEPTION;
public final static String simulationAttributes = "simulation attributes"; public final static String simulationAttributes = "simulation attributes";
public final static String modelAttributes = "panelModel attributes"; public final static String modelAttributes = "panelModel attributes";
...@@ -26,7 +26,7 @@ public enum AttributeType { ...@@ -26,7 +26,7 @@ public enum AttributeType {
case carAttributes: case carAttributes:
return CAR; return CAR;
case stimulusAttributes: case stimulusAttributes:
return STIMULUS; return PERCEPTION;
default: default:
throw new IllegalArgumentException("name " + name + " does not match any attribute type."); throw new IllegalArgumentException("name " + name + " does not match any attribute type.");
} }
......
...@@ -41,7 +41,7 @@ public class ScenarioPanel extends JPanel implements IProjectChangeListener, Pro ...@@ -41,7 +41,7 @@ public class ScenarioPanel extends JPanel implements IProjectChangeListener, Pro
private TextView attributesModelView; // Model tab private TextView attributesModelView; // Model tab
private TextView attributesPsychologyView; // Psychology tab private TextView attributesPsychologyView; // Psychology tab
private TextView topographyFileView; // Topography tab private TextView topographyFileView; // Topography tab
private TextView eventFileView; // Stimulus tab private TextView perceptionFileView; // Stimulus tab
private DataProcessingView dataProcessingGUIview; // DataProcessing private DataProcessingView dataProcessingGUIview; // DataProcessing
private TopographyWindow topographyCreatorView; // Topography creator tab... OR: private TopographyWindow topographyCreatorView; // Topography creator tab... OR:
private final PostvisualizationWindow postVisualizationView; // Post-Visualization tab, replaces Topography tab if output is selected private final PostvisualizationWindow postVisualizationView; // Post-Visualization tab, replaces Topography tab if output is selected
...@@ -201,9 +201,9 @@ public class ScenarioPanel extends JPanel implements IProjectChangeListener, Pro ...@@ -201,9 +201,9 @@ public class ScenarioPanel extends JPanel implements IProjectChangeListener, Pro
topographyFileView.setScenarioChecker(model); topographyFileView.setScenarioChecker(model);
tabbedPane.addTab(Messages.getString("Tab.Topography.title"), topographyFileView); tabbedPane.addTab(Messages.getString("Tab.Topography.title"), topographyFileView);
eventFileView = new TextView( "ProjectView.defaultDirectoryAttributes", AttributeType.STIMULUS); perceptionFileView = new TextView( "ProjectView.defaultDirectoryAttributes", AttributeType.PERCEPTION);
eventFileView.isEditable(true); perceptionFileView.isEditable(true);
tabbedPane.addTab(Messages.getString("Tab.Stimuli.title"), eventFileView); tabbedPane.addTab(Messages.getString("Tab.Perception.title"), perceptionFileView);
dataProcessingGUIview = new DataProcessingView(model); dataProcessingGUIview = new DataProcessingView(model);
tabbedPane.addTab(Messages.getString("Tab.OutputProcessors.title"), dataProcessingGUIview); tabbedPane.addTab(Messages.getString("Tab.OutputProcessors.title"), dataProcessingGUIview);
...@@ -295,8 +295,8 @@ public class ScenarioPanel extends JPanel implements IProjectChangeListener, Pro ...@@ -295,8 +295,8 @@ public class ScenarioPanel extends JPanel implements IProjectChangeListener, Pro
this.topographyFileView.setVadereScenario(scenario); this.topographyFileView.setVadereScenario(scenario);
this.topographyFileView.isEditable(isEditable); this.topographyFileView.isEditable(isEditable);
this.eventFileView.setVadereScenario(scenario); this.perceptionFileView.setVadereScenario(scenario);
this.eventFileView.isEditable(isEditable); this.perceptionFileView.isEditable(isEditable);
this.dataProcessingGUIview.setVadereScenario(scenario); this.dataProcessingGUIview.setVadereScenario(scenario);
this.dataProcessingGUIview.isEditable(isEditable); this.dataProcessingGUIview.isEditable(isEditable);
......
...@@ -195,7 +195,7 @@ public class TextView extends JPanel implements IJsonView { ...@@ -195,7 +195,7 @@ public class TextView extends JPanel implements IJsonView {
case TOPOGRAPHY: case TOPOGRAPHY:
currentScenario.setTopography(StateJsonConverter.deserializeTopography(json)); currentScenario.setTopography(StateJsonConverter.deserializeTopography(json));
break; break;
case STIMULUS: case PERCEPTION:
StimulusInfoStore stimulusInfoStore = StateJsonConverter.deserializeStimuli(json); StimulusInfoStore stimulusInfoStore = StateJsonConverter.deserializeStimuli(json);
currentScenario.getScenarioStore().setStimulusInfoStore(stimulusInfoStore); currentScenario.getScenarioStore().setStimulusInfoStore(stimulusInfoStore);
break; break;
...@@ -222,7 +222,7 @@ public class TextView extends JPanel implements IJsonView { ...@@ -222,7 +222,7 @@ public class TextView extends JPanel implements IJsonView {
} }
private void generatePresettingsMenu(final AttributeType attributeType) { private void generatePresettingsMenu(final AttributeType attributeType) {
if (attributeType == AttributeType.STIMULUS) { if (attributeType == AttributeType.PERCEPTION) {
JMenuBar presetMenuBar = new JMenuBar(); JMenuBar presetMenuBar = new JMenuBar();
JMenu mnPresetMenu = new JMenu(Messages.getString("TextView.Button.LoadPresettings")); JMenu mnPresetMenu = new JMenu(Messages.getString("TextView.Button.LoadPresettings"));
presetMenuBar.add(mnPresetMenu); presetMenuBar.add(mnPresetMenu);
...@@ -283,7 +283,7 @@ public class TextView extends JPanel implements IJsonView { ...@@ -283,7 +283,7 @@ public class TextView extends JPanel implements IJsonView {
topography.removeBoundary(); topography.removeBoundary();
textfileTextarea.setText(StateJsonConverter.serializeTopography(topography)); textfileTextarea.setText(StateJsonConverter.serializeTopography(topography));
break; break;
case STIMULUS: case PERCEPTION:
StimulusInfoStore stimulusInfoStore = scenario.getScenarioStore().getStimulusInfoStore(); StimulusInfoStore stimulusInfoStore = scenario.getScenarioStore().getStimulusInfoStore();
textfileTextarea.setText(StateJsonConverter.serializeStimuli(stimulusInfoStore)); textfileTextarea.setText(StateJsonConverter.serializeStimuli(stimulusInfoStore));
break; break;
......
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