Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
vadere
vadere
Commits
d7a03210
Commit
d7a03210
authored
May 22, 2019
by
Benedikt Kleinmeier
Browse files
Added check box "chShowMeasurementAreas" in "SettingsDialog".
parent
d3ace741
Changes
4
Hide whitespace changes
Inline
Side-by-side
VadereGui/resources/messages.properties
View file @
d7a03210
...
...
@@ -234,6 +234,7 @@ SettingsDialog.chbShowTargets.text=Show Targets
SettingsDialog.chbShowSources.text
=
Show Sources
SettingsDialog.chbShowAbsorbingAreas.text
=
Show Absorbing Areas
SettingsDialog.chbShowStairs.text
=
Show Stairs
SettingsDialog.chbShowMeasurementAreas.text
=
Show Measurement Areas
ProjectView.btnSnapshot.tooltip
=
Snapshot
ProjectView.btnPNGSnapshot.tooltip
=
PNG Snapshot
ProjectView.btnSVGSnapshot.tooltip
=
SVG Snapshot
...
...
VadereGui/resources/messages_de_DE.properties
View file @
d7a03210
...
...
@@ -229,6 +229,7 @@ SettingsDialog.chbShowObstacles.text=Hindernisse anzeigen
SettingsDialog.chbShowTargets.text
=
Ziele anzeigen
SettingsDialog.chbShowSources.text
=
Quellen anzeigen
SettingsDialog.chbShowAbsorbingAreas.text
=
Absorbierende Bereiche anzeigen
SettingsDialog.chbShowMeasurementAreas.text
=
Messbereich anzeigen
SettingsDialog.chbShowStairs.text
=
Treppen anzeigen
ProjectView.btnSnapshot.tooltip
=
Snapshot
ProjectView.btnPNGSnapshot.tooltip
=
PNG-Snapshot
...
...
VadereGui/src/org/vadere/gui/components/model/DefaultSimulationConfig.java
View file @
d7a03210
...
...
@@ -118,6 +118,10 @@ public class DefaultSimulationConfig extends DefaultConfig {
return
showAbsorbingAreas
;
}
public
boolean
isShowMeasurementAreas
()
{
return
showMeasurementArea
;
}
public
void
setShowTargetPotentielFieldMesh
(
final
boolean
showTargetPotentielFieldMesh
)
{
this
.
showTargetPotentielFieldMesh
=
showTargetPotentielFieldMesh
;
setChanged
();
...
...
VadereGui/src/org/vadere/gui/components/view/SettingsDialog.java
View file @
d7a03210
...
...
@@ -87,7 +87,7 @@ public class SettingsDialog extends JDialog {
// Layout definition for sub panels
FormLayout
additionalLayout
=
new
FormLayout
(
"5dlu, pref, 2dlu, pref, 2dlu, pref, 2dlu, pref, 5dlu"
,
// col
"5dlu, pref, 2dlu, pref, 2dlu, pref, 2dlu, pref, 2dlu, pref, 2dlu, pref, 2dlu, pref, 2dlu, pref, 2dlu, pref, 2dlu, pref, 2dlu, pref, 2dlu, pref, 5dlu"
);
// rows
"5dlu, pref, 2dlu, pref, 2dlu, pref, 2dlu, pref, 2dlu, pref, 2dlu, pref, 2dlu, pref, 2dlu, pref, 2dlu, pref, 2dlu, pref, 2dlu, pref, 2dlu, pref,
2dlu, pref,
5dlu"
);
// rows
FormLayout
colorLayout
=
new
FormLayout
(
"5dlu, pref, 2dlu, pref:grow, 2dlu, pref, 2dlu, pref, 5dlu"
,
// col
"5dlu, pref, 2dlu, pref, 2dlu, pref, 2dlu, pref, 2dlu, pref, 2dlu, pref, 2dlu, pref, 2dlu, pref, 2dlu, pref, 2dlu, pref, 2dlu, pref, 2dlu, pref, 2dlu, pref, 2dlu, pref, 2dlu, pref, 2dlu, pref, 2dlu, pref, 2dlu, pref, 5dlu"
);
// rows
colorLayeredPane
.
setLayout
(
colorLayout
);
...
...
@@ -107,6 +107,7 @@ public class SettingsDialog extends JDialog {
JCheckBox
chShowTargets
=
new
JCheckBox
((
Messages
.
getString
(
"SettingsDialog.chbShowTargets.text"
)));
JCheckBox
chShowSources
=
new
JCheckBox
((
Messages
.
getString
(
"SettingsDialog.chbShowSources.text"
)));
JCheckBox
chShowAbsorbingAreas
=
new
JCheckBox
((
Messages
.
getString
(
"SettingsDialog.chbShowAbsorbingAreas.text"
)));
JCheckBox
chShowMeasurementAreas
=
new
JCheckBox
((
Messages
.
getString
(
"SettingsDialog.chbShowMeasurementAreas.text"
)));
JCheckBox
chShowStairs
=
new
JCheckBox
((
Messages
.
getString
(
"SettingsDialog.chbShowStairs.text"
)));
JCheckBox
chShowPedIds
=
new
JCheckBox
((
Messages
.
getString
(
"SettingsDialog.chbShowPedestrianIds.text"
)));
...
...
@@ -147,6 +148,12 @@ public class SettingsDialog extends JDialog {
model
.
notifyObservers
();
});
chShowMeasurementAreas
.
setSelected
(
model
.
config
.
isShowMeasurementArea
());
chShowMeasurementAreas
.
addItemListener
(
e
->
{
model
.
config
.
setShowMeasurementArea
(!
model
.
config
.
isShowMeasurementArea
());
model
.
notifyObservers
();
});
chShowStairs
.
setSelected
(
model
.
config
.
isShowSources
());
chShowStairs
.
addItemListener
(
e
->
{
model
.
config
.
setShowStairs
(!
model
.
config
.
isShowStairs
());
...
...
@@ -263,7 +270,8 @@ public class SettingsDialog extends JDialog {
additionalLayeredPane
.
add
(
chShowSources
,
cc
.
xyw
(
2
,
8
,
5
));
additionalLayeredPane
.
add
(
chShowStairs
,
cc
.
xyw
(
2
,
10
,
5
));
additionalLayeredPane
.
add
(
chShowAbsorbingAreas
,
cc
.
xyw
(
2
,
12
,
5
));
additionalLayeredPane
.
add
(
chShowPedIds
,
cc
.
xyw
(
2
,
14
,
5
));
additionalLayeredPane
.
add
(
chShowMeasurementAreas
,
cc
.
xyw
(
2
,
14
,
5
));
additionalLayeredPane
.
add
(
chShowPedIds
,
cc
.
xyw
(
2
,
16
,
5
));
JCheckBox
chChowLogo
=
new
JCheckBox
(
Messages
.
getString
(
"SettingsDialog.chbLogo.text"
));
chChowLogo
.
setSelected
(
model
.
config
.
isShowLogo
());
...
...
@@ -271,19 +279,19 @@ public class SettingsDialog extends JDialog {
model
.
config
.
setShowLogo
(!
model
.
config
.
isShowLogo
());
model
.
notifyObservers
();
});
additionalLayeredPane
.
add
(
chChowLogo
,
cc
.
xyw
(
2
,
1
6
,
5
));
additionalLayeredPane
.
add
(
chChowLogo
,
cc
.
xyw
(
2
,
1
8
,
5
));
additionalLayeredPane
.
add
(
new
JLabel
(
Messages
.
getString
(
"SettingsDialog.lblSnapshotDir.text"
)
+
":"
),
cc
.
xy
(
2
,
18
));
cc
.
xy
(
2
,
20
));
JTextField
tSnapshotDir
=
new
JTextField
(
Preferences
.
userNodeForPackage
(
PostVisualisation
.
class
).
get
(
"SettingsDialog.snapshotDirectory.path"
,
"."
));
tSnapshotDir
.
setEditable
(
false
);
tSnapshotDir
.
setPreferredSize
(
new
Dimension
(
130
,
20
));
additionalLayeredPane
.
add
(
tSnapshotDir
,
cc
.
xy
(
4
,
18
));
additionalLayeredPane
.
add
(
tSnapshotDir
,
cc
.
xy
(
4
,
20
));
final
JButton
bSnapshotDir
=
new
JButton
(
Messages
.
getString
(
"SettingsDialog.btnEditSnapshot.text"
));
bSnapshotDir
.
addActionListener
(
new
ActionSetSnapshotDirectory
(
"Set Snapshot Directory"
,
model
,
tSnapshotDir
));
additionalLayeredPane
.
add
(
bSnapshotDir
,
cc
.
xy
(
6
,
18
));
additionalLayeredPane
.
add
(
bSnapshotDir
,
cc
.
xy
(
6
,
22
));
final
JSpinner
spinnerCellWidth
=
new
JSpinner
();
final
SpinnerNumberModel
sModelCellWidth
=
new
SpinnerNumberModel
(
model
.
config
.
getGridWidth
(),
...
...
@@ -296,8 +304,8 @@ public class SettingsDialog extends JDialog {
});
additionalLayeredPane
.
add
(
new
JLabel
(
Messages
.
getString
(
"SettingsDialog.lblCellWidth.text"
)
+
":"
),
cc
.
xy
(
2
,
2
0
));
additionalLayeredPane
.
add
(
spinnerCellWidth
,
cc
.
xy
(
4
,
2
0
));
cc
.
xy
(
2
,
2
2
));
additionalLayeredPane
.
add
(
spinnerCellWidth
,
cc
.
xy
(
4
,
2
2
));
mainPanel
.
add
(
getAdditionalOptionPanel
(),
cc
.
xy
(
2
,
6
));
...
...
Benedikt Kleinmeier
@hm-kleinmei
mentioned in issue
#248 (closed)
·
May 23, 2019
mentioned in issue
#248 (closed)
mentioned in issue #248
Toggle commit list
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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