Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
V
vadere
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Locked Files
Issues
110
Issues
110
List
Boards
Labels
Service Desk
Milestones
Iterations
Merge Requests
3
Merge Requests
3
Requirements
Requirements
List
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Security & Compliance
Security & Compliance
Dependency List
License Compliance
Operations
Operations
Incidents
Environments
Analytics
Analytics
CI / CD
Code Review
Insights
Issue
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
vadere
vadere
Commits
30a8af67
Commit
30a8af67
authored
Feb 28, 2019
by
Benedikt Kleinmeier
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
In "Events" tab, added menu to load presettings.
parent
bd787ec5
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
100 additions
and
1 deletion
+100
-1
VadereGui/resources/messages.properties
VadereGui/resources/messages.properties
+1
-0
VadereGui/resources/messages_de_DE.properties
VadereGui/resources/messages_de_DE.properties
+1
-0
VadereGui/src/org/vadere/gui/projectview/view/TextView.java
VadereGui/src/org/vadere/gui/projectview/view/TextView.java
+34
-1
VadereState/src/org/vadere/state/events/presettings/EventPresettings.java
...org/vadere/state/events/presettings/EventPresettings.java
+64
-0
No files found.
VadereGui/resources/messages.properties
View file @
30a8af67
...
...
@@ -340,6 +340,7 @@ Tab.Event.title=Events
Tab.OutputProcessors.title
=
Data output
Tab.TopographyCreator.title
=
Topography creator
Tab.PostVisualization.title
=
Post-Visualization
TextView.Button.LoadPresettings
=
Load presettings
# Info Panel at bottom of Topography creator
InfoPanel.ScenarioSize.label
=
Scenario Size
...
...
VadereGui/resources/messages_de_DE.properties
View file @
30a8af67
...
...
@@ -334,6 +334,7 @@ Tab.Event.title=Events
Tab.OutputProcessors.title
=
Datenausgabe
Tab.TopographyCreator.title
=
Topographie-Designer
Tab.PostVisualization.title
=
Post-Visualisierung
TextView.Button.LoadPresettings
=
Voreinstellungen laden
# Info Panel at bottom of Topography creator
InfoPanel.ScenarioSize.label
=
Szenariogr
\u
00f6
\u
00dfe
...
...
VadereGui/src/org/vadere/gui/projectview/view/TextView.java
View file @
30a8af67
...
...
@@ -14,6 +14,7 @@ import org.vadere.simulator.projects.dataprocessing.DataProcessingJsonManager;
import
org.vadere.simulator.projects.io.JsonConverter
;
import
org.vadere.state.attributes.ModelDefinition
;
import
org.vadere.state.events.json.EventInfoStore
;
import
org.vadere.state.events.presettings.EventPresettings
;
import
org.vadere.state.scenario.Topography
;
import
org.vadere.state.util.StateJsonConverter
;
import
org.vadere.util.io.IOUtils
;
...
...
@@ -110,15 +111,18 @@ public class TextView extends JPanel implements IJsonView {
add
(
panelTop
,
BorderLayout
.
NORTH
);
panelTop
.
setLayout
(
new
FlowLayout
(
FlowLayout
.
CENTER
,
5
,
5
));
generatePresettingsMenu
(
attributeType
);
JButton
btnSaveToFile
=
new
JButton
(
Messages
.
getString
(
"TextFileView.btnSaveToFile.text"
));
btnSaveToFile
.
addActionListener
(
saveToFileActionListener
);
btnSaveToFile
.
setIcon
(
new
ImageIcon
(
Resources
.
class
.
getResource
(
"/icons/floppy.gif"
)));
panelTop
.
add
(
btnSaveToFile
);
btnLoadFromFile
=
new
JButton
(
Messages
.
getString
(
"TextView.btnLoadFromFile.text"
));
btnLoadFromFile
.
setIcon
(
new
ImageIcon
(
Resources
.
class
.
getResource
(
"/icons/floppy.gif"
)));
panelTop
.
add
(
btnLoadFromFile
);
jsonValidIndicator
=
new
JsonValidIndicator
();
jsonValidIndicator
=
new
JsonValidIndicator
();
panelTop
.
add
(
jsonValidIndicator
);
JScrollPane
scrollPane
=
new
JScrollPane
();
add
(
scrollPane
,
BorderLayout
.
CENTER
);
...
...
@@ -205,6 +209,35 @@ public class TextView extends JPanel implements IJsonView {
jsonValidIndicator
.
setValid
();
}
private
void
generatePresettingsMenu
(
final
AttributeType
attributeType
)
{
if
(
attributeType
==
AttributeType
.
EVENT
)
{
JMenuBar
presetMenuBar
=
new
JMenuBar
();
JMenu
mnPresetMenu
=
new
JMenu
(
Messages
.
getString
(
"TextView.Button.LoadPresettings"
));
presetMenuBar
.
add
(
mnPresetMenu
);
EventPresettings
.
PRESETTINGS_MAP
.
forEach
(
(
clazz
,
jsonString
)
->
mnPresetMenu
.
add
(
new
JMenuItem
(
new
AbstractAction
(
clazz
.
getSimpleName
())
{
private
static
final
long
serialVersionUID
=
1L
;
@Override
public
void
actionPerformed
(
ActionEvent
e
)
{
if
(
JOptionPane
.
showConfirmDialog
(
ProjectView
.
getMainWindow
(),
Messages
.
getString
(
"Tab.Model.confirmLoadTemplate.text"
),
Messages
.
getString
(
"Tab.Model.confirmLoadTemplate.title"
),
JOptionPane
.
OK_CANCEL_OPTION
)
==
JOptionPane
.
OK_OPTION
)
{
try
{
txtrTextfiletextarea
.
setText
(
jsonString
);
}
catch
(
Exception
e1
)
{
e1
.
printStackTrace
();
}
}
}
})));
panelTop
.
add
(
presetMenuBar
);
}
}
@Override
public
void
setVadereScenario
(
Scenario
scenario
)
{
// in order to avoid passing the exception upwards. might not be the best solution
try
{
...
...
VadereState/src/org/vadere/state/events/presettings/EventPresettings.java
0 → 100644
View file @
30a8af67
package
org.vadere.state.events.presettings
;
import
com.fasterxml.jackson.databind.ObjectMapper
;
import
org.vadere.state.events.json.EventInfo
;
import
org.vadere.state.events.json.EventInfoStore
;
import
org.vadere.state.events.types.*
;
import
org.vadere.state.util.JacksonObjectMapper
;
import
org.vadere.util.geometry.shapes.VRectangle
;
import
java.io.IOException
;
import
java.util.ArrayList
;
import
java.util.HashMap
;
import
java.util.List
;
import
java.util.Map
;
/**
* Provide JSON presettings for commonly used events.
*
* This class can be used as helper for GUI elements.
*/
public
class
EventPresettings
{
/** Map an event class (e.g., BangEvent) to a JSON string. */
public
static
Map
<
Class
,
String
>
PRESETTINGS_MAP
;
// Static initializer for "PRESETTINGS_MAP".
static
{
PRESETTINGS_MAP
=
new
HashMap
<>();
Event
[]
eventsToUse
=
new
Event
[]
{
new
BangEvent
(),
new
WaitEvent
(),
new
WaitInAreaEvent
(
0
,
new
VRectangle
(
0
,
0
,
10
,
10
)),
};
for
(
Event
event
:
eventsToUse
)
{
// Container for a timeframe and the corresponding events.
EventInfo
eventInfo
=
new
EventInfo
();
List
<
Event
>
events
=
new
ArrayList
<>();
events
.
add
(
event
);
eventInfo
.
setEventTimeframe
(
new
EventTimeframe
(
0
,
10
,
false
,
0
));
eventInfo
.
setEvents
(
events
);
// Container for multiple event infos.
List
<
EventInfo
>
eventInfos
=
new
ArrayList
<>();
eventInfos
.
add
(
eventInfo
);
EventInfoStore
eventInfoStore
=
new
EventInfoStore
();
eventInfoStore
.
setEventInfos
(
eventInfos
);
try
{
ObjectMapper
mapper
=
new
JacksonObjectMapper
();
// String jsonDataString = mapper.writeValueAsString(eventInfoStore);
String
jsonDataString
=
mapper
.
writerWithDefaultPrettyPrinter
().
writeValueAsString
(
eventInfoStore
);
PRESETTINGS_MAP
.
put
(
event
.
getClass
(),
jsonDataString
);
}
catch
(
IOException
e
)
{
e
.
printStackTrace
();
}
}
}
}
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment