Skip to content

GitLab

Commit 2a6ebee9 authored by Mario Teixeira Parente's avatar Mario Teixeira Parente
Browse files

Renames processor things to 'log'

parent f97faef4
Hide whitespace changes
Inline Side-by-side
VadereGui/resources/messages.properties
View file @ 2a6ebee9
......@@ -262,7 +262,7 @@ Tab.Model.addAttributesMenu.title=Add Attributes
Tab.Model.insertModelNameMenu.title=Insert model-name
Tab.Pedestrians.title=Pedestrians
Tab.Topography.title=Topography
Tab.OutputProcessors.title=Output processors
Tab.OutputProcessors.title=Log files
Tab.TopographyCreator.title=Topography creator
Tab.PostVisualization.title=Post-Visualization
......
VadereGui/resources/messages_de.properties
View file @ 2a6ebee9
......@@ -262,7 +262,7 @@ Tab.Model.addAttributesMenu.title=Attributes hinzuf\u00fcgen
Tab.Model.insertModelNameMenu.title=Model-Name einf\u00fcgen
Tab.Pedestrians.title=Fu\u00dfg\u00e4nger
Tab.Topography.title=Topographie
Tab.OutputProcessors.title=Output-Prozessoren
Tab.OutputProcessors.title=Log-Dateien
Tab.TopographyCreator.title=Topographie-Designer
Tab.PostVisualization.title=Post-Visualisierung
......
VadereGui/resources/processorTemplates/procs.json deleted 100644 → 0
View file @ f97faef4
{
"logfiles": [ {
"type": "org.vadere.simulator.projects.dataprocessing_mtp.TimestepPedestrianIdLogFile",
"filename": "log_ts_pid.txt",
"processors": [ 1, 2, 3, 5, 13, 14, 17 ]
}, {
"type": "org.vadere.simulator.projects.dataprocessing_mtp.PedestrianIdLogFile",
"filename": "log_pid.txt",
"processors": [ 4, 8, 9, 10, 15, 16 ]
}, {
"type": "org.vadere.simulator.projects.dataprocessing_mtp.TimestepLogFile",
"filename": "log_ts.txt",
"processors": [ 6, 7 ]
}, {
"type": "org.vadere.simulator.projects.dataprocessing_mtp.NoDataKeyLogFile",
"filename": "log_nokey.txt",
"processors": [ 11, 12 ]
}],
"processors": [ {
"type": "org.vadere.simulator.projects.dataprocessing_mtp.PedestrianPositionProcessor",
"id": 1
}, {
"type": "org.vadere.simulator.projects.dataprocessing_mtp.PedestrianVelocityProcessor",
"id": 2
}, {
"type": "org.vadere.simulator.projects.dataprocessing_mtp.PedestrianDensityCountingProcessor",
"id": 3
}, {
"type": "org.vadere.simulator.projects.dataprocessing_mtp.PedestrianLastPositionProcessor",
"id": 4
}, {
"type": "org.vadere.simulator.projects.dataprocessing_mtp.PedestrianDensityGaussianProcessor",
"id": 5
}, {
"type": "org.vadere.simulator.projects.dataprocessing_mtp.AreaDensityVoronoiProcessor",
"id": 6
}, {
"type": "org.vadere.simulator.projects.dataprocessing_mtp.AreaSpeedProcessor",
"id": 7
}, {
"type": "org.vadere.simulator.projects.dataprocessing_mtp.PedestrianStartTimeProcessor",
"id": 8
}, {
"type": "org.vadere.simulator.projects.dataprocessing_mtp.PedestrianEndTimeProcessor",
"id": 9
}, {
"type": "org.vadere.simulator.projects.dataprocessing_mtp.PedestrianEvacuationTimeProcessor",
"id": 10
}, {
"type": "org.vadere.simulator.projects.dataprocessing_mtp.MeanPedestrianEvacuationTimeProcessor",
"id": 11
}, {
"type": "org.vadere.simulator.projects.dataprocessing_mtp.EvacuationTimeProcessor",
"id": 12
}, {
"type": "org.vadere.simulator.projects.dataprocessing_mtp.PedestrianFlowProcessor",
"id": 13
}, {
"type": "org.vadere.simulator.projects.dataprocessing_mtp.PedestrianOverlapProcessor",
"id": 14
}, {
"type": "org.vadere.simulator.projects.dataprocessing_mtp.PedestrianWaitingTimeProcessor",
"id": 15
}, {
"type": "org.vadere.simulator.projects.dataprocessing_mtp.PedestrianWaitingEndTimeProcessor",
"id": 16
}, {
"type": "org.vadere.simulator.projects.dataprocessing_mtp.PedestrianOSMStrideLengthProcessor",
"id": 17
} ],
"attributes": {
"org.vadere.simulator.projects.dataprocessing_mtp.AttributesVelocityProcessor": {
"processorId": 2,
"pedestrianPositionProcessorId": 1
},
"org.vadere.simulator.projects.dataprocessing_mtp.AttributesPedestrianDensityCountingProcessor": {
"processorId": 3,
"pedestrianPositionProcessorId": 1,
"radius": 1.5
},
"org.vadere.simulator.projects.dataprocessing_mtp.AttributesPedestrianLastPositionProcessor": {
"processorId": 4,
"pedestrianPositionProcessorId": 1
},
"org.vadere.simulator.projects.dataprocessing_mtp.AttributesPedestrianDensityGaussianProcessor": {
"processorId": 5,
"pedestrianPositionProcessorId": 1
},
"org.vadere.simulator.projects.dataprocessing_mtp.AttributesAreaDensityVoronoiProcessor": {
"processorId": 6,
"measurementArea": {
"x" : 5.0,
"y" : 2.0,
"width" : 1.0,
"height" : 1.0,
"type" : "RECTANGLE"
},
"voronoiArea": {
"x" : 5.0,
"y" : 2.0,
"width" : 1.0,
"height" : 1.0,
"type" : "RECTANGLE"
}
},
"org.vadere.simulator.projects.dataprocessing_mtp.AttributesAreaSpeedProcessor": {
"processorId": 7,
"measurementArea": {
"x" : 5.0,
"y" : 2.0,
"width" : 1.0,
"height" : 1.0,
"type" : "RECTANGLE"
},
"pedestrianPositionProcessorId": 1,
"pedestrianVelocityProcessorId": 2
},
"org.vadere.simulator.projects.dataprocessing_mtp.AttributesPedestrianEvacuationTimeProcessor": {
"processorId": 10,
"pedestrianStartTimeProcessorId": 8
},
"org.vadere.simulator.projects.dataprocessing_mtp.AttributesMeanPedestrianEvacuationTimeProcessor": {
"processorId": 11,
"pedestrianEvacuationTimeProcessorId": 10
},
"org.vadere.simulator.projects.dataprocessing_mtp.AttributesEvacuationTimeProcessor": {
"processorId": 12,
"pedestrianEvacuationTimeProcessorId": 10
},
"org.vadere.simulator.projects.dataprocessing_mtp.AttributesPedestrianFlowProcessor": {
"processorId": 13,
"pedestrianVelocityProcessorId": 2,
"pedestrianDensityProcessorId": 3
},
"org.vadere.simulator.projects.dataprocessing_mtp.AttributesPedestrianOverlapProcessor": {
"processorId": 14,
"pedRadius": 0.21
},
"org.vadere.simulator.projects.dataprocessing_mtp.AttributesPedestrianWaitingTimeProcessor": {
"processorId": 15,
"waitingArea": {
"x" : 5.0,
"y" : 2.0,
"width" : 1.0,
"height" : 1.0,
"type" : "RECTANGLE"
}
},
"org.vadere.simulator.projects.dataprocessing_mtp.AttributesPedestrianWaitingEndTimeProcessor": {
"processorId": 16,
"waitingArea": {
"x" : 5.0,
"y" : 2.0,
"width" : 1.0,
"height" : 1.0,
"type" : "RECTANGLE"
}
}
}
}
VadereGui/src/org/vadere/gui/projectview/view/ScenarioJPanel.java
View file @ 2a6ebee9
......@@ -182,8 +182,8 @@ public class ScenarioJPanel extends JPanel implements IProjectChangeListener, Pr
try {
// TODO add more templates and make a loop here
String templateFileName = "procs.json";
String templateJson = org.apache.commons.io.IOUtils.toString(this.getClass().getResourceAsStream("/processorTemplates/" + templateFileName), "UTF-8");
String templateFileName = "log_default.json";
String templateJson = org.apache.commons.io.IOUtils.toString(this.getClass().getResourceAsStream("/logTemplates/" + templateFileName), "UTF-8");
JMenuBar processorsMenuBar = new JMenuBar();
JMenu processorsMenu = new JMenu(Messages.getString("Tab.Model.loadTemplateMenu.title"));
......
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