Skip to content

Commit 0ffaa28

Browse files
sweiland-openrailssweiland-openrails
authored
Merge pull request #956 from sweiland-openrails/mapSettingsSaved
Map settings saved
2 parents 6fd8417 + 406cba6 commit 0ffaa28

File tree

5 files changed

+182
-6
lines changed

5 files changed

+182
-6
lines changed

‎Source/ORTS.Settings/UserSettings.cs‎

Lines changed: 45 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -424,6 +424,50 @@ public string DirectXFeatureLevel
424424
[DoNotSave]
425425
public bool MultiplayerServer { get; set; }
426426

427+
// map settings
428+
[Default(false)]
429+
public bool Map_showTrainStateCheckbox { get; set; }
430+
[Default(false)]
431+
public bool Map_showTrainLabelsCheckbox { get; set; }
432+
[Default(false)]
433+
public bool Map_showSignalStateCheckbox { get; set; }
434+
[Default(false)]
435+
public bool Map_showSignalsCheckbox { get; set; }
436+
[Default(false)]
437+
public bool Map_showSwitchesCheckbox { get; set; }
438+
[Default(false)]
439+
public bool Map_showSidingLabelsCheckbox { get; set; }
440+
[Default(false)]
441+
public bool Map_showPlatformLabelsCheckbox { get; set; }
442+
[Default(false)]
443+
public bool Map_showPlatformsCheckbox { get; set; }
444+
[Default(true)]
445+
public bool Map_showTimeCheckbox { get; set; }
446+
[Default(false)]
447+
public bool Map_useAntiAliasingCheckbox { get; set; }
448+
[Default(true)]
449+
public bool Map_penaltyCheckbox { get; set; }
450+
[Default(true)]
451+
public bool Map_preferGreenCheckbox { get; set; }
452+
[Default(true)]
453+
public bool Map_allowJoiningCheckbox { get; set; }
454+
[Default(true)]
455+
public bool Map_allowThrowingSwitchesCheckbox { get; set; }
456+
[Default(true)]
457+
public bool Map_allowChangingSignalsCheckbox { get; set; }
458+
[Default(true)]
459+
public bool Map_drawPathCheckbox { get; set; }
460+
[Default(5000)]
461+
public int Map_mapResolutionUpDown { get; set; }
462+
[Default("light")]
463+
public string Map_rotateThemesButton { get; set; }
464+
[Default(true)]
465+
public bool Map_showActiveTrainsRadio { get; set; }
466+
[Default(false)]
467+
public bool Map_showAllTrainsRadio { get; set; }
468+
[Default(new[] { 104, 104, 800, 600 })]
469+
public int[] Map_MapViewer { get; set; }
470+
427471
// In-game settings:
428472
[Default(false)]
429473
public bool Letterbox2DCab { get; set; }
@@ -493,7 +537,7 @@ public string GetCacheFilePath(string type, string key)
493537
return Path.Combine(directory, hash + ".cache-or");
494538
}
495539

496-
PropertyInfo GetProperty(string name)
540+
public PropertyInfo GetProperty(string name)
497541
{
498542
return GetType().GetProperty(name, BindingFlags.Public | BindingFlags.Instance | BindingFlags.FlattenHierarchy);
499543
}

‎Source/RunActivity/Viewer3D/Map/MapDataProvider.cs‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -249,7 +249,8 @@ public float GetUnusedYLocation(float startX, float wantY, string name)
249249
var desiredPositionY = (int)(wantY / MapViewer.spacing); // The positionY of the ideal row for the text.
250250
var endX = startX + (name.Length * F.trainFont.Size);
251251

252-
if (endX < 0) // Out of drawing area
252+
if ((endX < 0) || // Out of drawing area
253+
(F.alignedTextY == null))
253254
return noFreeSlotFound;
254255

255256
var positionY = desiredPositionY;

‎Source/RunActivity/Viewer3D/Map/MapForm.cs‎

Lines changed: 117 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
using System.Diagnostics;
2121
using System.Drawing;
2222
using System.Linq;
23+
using System.Reflection;
2324
using System.Text.RegularExpressions;
2425
using System.Windows.Forms;
2526
using GNU.Gettext;
@@ -122,6 +123,8 @@ public partial class MapViewer : Form
122123
private double lastUpdateTime;
123124

124125
private bool MapCustomizationVisible = false;
126+
127+
private Form GameForm;
125128
#endregion
126129

127130
public MapViewer(Simulator simulator, Viewer viewer)
@@ -139,9 +142,9 @@ public MapViewer(Simulator simulator, Viewer viewer)
139142
MapThemeProvider = new MapThemeProvider();
140143
nodes = simulator.TDB.TrackDB.TrackNodes;
141144

145+
ViewWindow = new RectangleF(0, 0, 5000f, 5000f);
142146
InitializeForm();
143147

144-
ViewWindow = new RectangleF(0, 0, 5000f, 5000f);
145148
mapResolutionUpDown.Accelerations.Add(new NumericUpDownAcceleration(1, 100));
146149
selectedTrainList = new List<Train>();
147150

@@ -153,6 +156,8 @@ public MapViewer(Simulator simulator, Viewer viewer)
153156
AddNewMessage(e.Time, e.Message);
154157
};
155158

159+
GameForm = (Form)System.Windows.Forms.Control.FromHandle(Viewer.Game.Window.Handle); // qqq
160+
156161
// Initialise the timer used to handle user input
157162
UITimer = new Timer();
158163
UITimer.Interval = 100;
@@ -193,6 +198,110 @@ void InitializeForm()
193198
float[] dashPattern = { 4, 2 };
194199
ZoomTargetPen.DashPattern = dashPattern;
195200
pathPen.DashPattern = dashPattern;
201+
202+
setDefaults(this);
203+
}
204+
205+
//
206+
// set the defaults for all the map controls which have a property in UserSettings.c
207+
// properties are stored in the registry or in a .ini file
208+
//
209+
private void setDefaults(System.Windows.Forms.Control controlToSet)
210+
{
211+
foreach (System.Windows.Forms.Control control in controlToSet.Controls)
212+
{
213+
// recursive call to find deeper controls
214+
setDefaults(control);
215+
}
216+
217+
string name = "Map_" + controlToSet.Name;
218+
PropertyInfo property = Viewer.Settings.GetProperty(name);
219+
if (property != null)
220+
{
221+
if (controlToSet is CheckBox checkBox)
222+
{
223+
checkBox.Checked = (bool)property.GetValue(Viewer.Settings);
224+
checkBox.CheckedChanged += c_ControlChanged;
225+
}
226+
if (controlToSet is NumericUpDown numericUpDown)
227+
{
228+
numericUpDown.Value = (int)property.GetValue(Viewer.Settings, null);
229+
numericUpDown.ValueChanged += c_ControlChanged;
230+
}
231+
if (controlToSet is Button button)
232+
{
233+
if (name.Equals("Map_rotateThemesButton"))
234+
{
235+
ThemeName = (string)property.GetValue(Viewer.Settings, null);
236+
Theme = MapThemeProvider.GetTheme(ThemeName);
237+
238+
ApplyThemeRecursively(this);
239+
MapCanvasColor = Theme.MapCanvasColor;
240+
TrackPen.Color = Theme.TrackColor;
241+
}
242+
button.Click += c_ControlChanged;
243+
}
244+
if (controlToSet is RadioButton radioButton)
245+
{
246+
radioButton.Checked = (bool)property.GetValue(Viewer.Settings);
247+
radioButton.CheckedChanged += c_ControlChanged;
248+
}
249+
if (controlToSet is MapViewer mapViewer)
250+
{
251+
Size size = new Size(
252+
((int[])property.GetValue(Viewer.Settings, null))[2],
253+
((int[])property.GetValue(Viewer.Settings, null))[3]);
254+
Size = size;
255+
256+
StartPosition = FormStartPosition.Manual;
257+
this.Location = new System.Drawing.Point(
258+
((int[])property.GetValue(Viewer.Settings, null))[0],
259+
((int[])property.GetValue(Viewer.Settings, null))[1]);
260+
261+
mapViewer.Resize += c_ControlChanged;
262+
mapViewer.Move += c_ControlChanged;
263+
}
264+
}
265+
}
266+
267+
//
268+
// save the setting of a map control
269+
//
270+
void c_ControlChanged(object sender, EventArgs e)
271+
{
272+
if (sender is CheckBox checkBox)
273+
{
274+
string name = "Map_" + checkBox.Name;
275+
Viewer.Settings.GetProperty(name).SetValue(Viewer.Settings, checkBox.CheckState == CheckState.Checked, null);
276+
Viewer.Settings.Save(name);
277+
}
278+
if (sender is NumericUpDown numericUpDown)
279+
{
280+
string name = "Map_" + numericUpDown.Name;
281+
Viewer.Settings.GetProperty(name).SetValue(Viewer.Settings, (int)numericUpDown.Value, null);
282+
Viewer.Settings.Save(name);
283+
}
284+
if (sender is Button button)
285+
{
286+
string name = "Map_" + button.Name;
287+
Viewer.Settings.GetProperty(name).SetValue(Viewer.Settings, ThemeName, null);
288+
Viewer.Settings.Save(name);
289+
}
290+
if (sender is RadioButton radioButton)
291+
{
292+
string name = "Map_" + radioButton.Name;
293+
Viewer.Settings.GetProperty(name).SetValue(Viewer.Settings, radioButton.Checked, null);
294+
Viewer.Settings.Save(name);
295+
}
296+
if (sender is MapViewer mapViewer)
297+
{
298+
string name = "Map_" + mapViewer.Name;
299+
300+
int X = this.Bounds.X;
301+
int Y = this.Bounds.Y;
302+
Viewer.Settings.GetProperty(name).SetValue(Viewer.Settings, new int[] { X, Y, Size.Width, Size.Height }, null);
303+
Viewer.Settings.Save(name);
304+
}
196305
}
197306

198307
#region initData
@@ -1233,6 +1342,13 @@ void UITimer_Tick(object sender, EventArgs e)
12331342
}
12341343
Visible = true;
12351344

1345+
if (Viewer.MapViewerEnabledSetToTrue)
1346+
{
1347+
GenerateView();
1348+
GameForm.Focus();
1349+
Viewer.MapViewerEnabledSetToTrue = false;
1350+
}
1351+
12361352
if (Program.Simulator.GameTime - lastUpdateTime < 1)
12371353
return;
12381354

‎Source/RunActivity/Viewer3D/Processes/GameStateViewer3D.cs‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,6 @@ internal override void BeginRender(RenderFrame frame)
5353
// We must create these forms on the main thread (Render) or they won't pump events correctly.
5454
Program.MapForm = new MapViewer(Viewer.Simulator, Viewer);
5555
Program.MapForm.Hide();
56-
Viewer.MapViewerEnabled = false;
5756

5857
Program.SoundDebugForm = new SoundDebugForm(Viewer);
5958
Program.SoundDebugForm.Hide();

‎Source/RunActivity/Viewer3D/Viewer.cs‎

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,9 @@ void CameraActivate()
192192
public Vector3 NearPoint { get; private set; }
193193
public Vector3 FarPoint { get; private set; }
194194

195-
public bool MapViewerEnabled { get; set; }
195+
public bool MapViewerEnabled { get; set; } = false;
196+
public bool MapViewerEnabledSetToTrue { get; set; } = false;
197+
196198
public bool SoundDebugFormEnabled { get; set; }
197199

198200
public TRPFile TRP; // Track profile file
@@ -376,6 +378,7 @@ public void Save(BinaryWriter outf, string fileStem)
376378
outf.Write(Simulator.Trains.IndexOf(SelectedTrain));
377379

378380
WindowManager.Save(outf);
381+
outf.Write(MapViewerEnabled);
379382

380383
outf.Write(WellKnownCameras.IndexOf(Camera));
381384
foreach (var camera in WellKnownCameras)
@@ -420,6 +423,11 @@ public void Restore(BinaryReader inf)
420423
}
421424

422425
WindowManager.Restore(inf);
426+
MapViewerEnabled = inf.ReadBoolean();
427+
if (MapViewerEnabled)
428+
{
429+
MapViewerEnabledSetToTrue = true;
430+
}
423431

424432
var cameraToRestore = inf.ReadInt32();
425433
foreach (var camera in WellKnownCameras)
@@ -1172,7 +1180,15 @@ void HandleUserInput(ElapsedTime elapsedTime)
11721180
if (UserInput.IsPressed(UserCommand.GameSwitchManualMode)) PlayerTrain.RequestToggleManualMode();
11731181
if (UserInput.IsPressed(UserCommand.GameResetOutOfControlMode)) new ResetOutOfControlModeCommand(Log);
11741182

1175-
if (UserInput.IsPressed(UserCommand.GameMultiPlayerDispatcher)) { MapViewerEnabled = !MapViewerEnabled; return; }
1183+
if (UserInput.IsPressed(UserCommand.GameMultiPlayerDispatcher))
1184+
{
1185+
MapViewerEnabled = !MapViewerEnabled;
1186+
if (MapViewerEnabled)
1187+
{
1188+
MapViewerEnabledSetToTrue = true;
1189+
}
1190+
return;
1191+
}
11761192
if (UserInput.IsPressed(UserCommand.DebugSoundForm)) { SoundDebugFormEnabled = !SoundDebugFormEnabled; return; }
11771193

11781194
if (UserInput.IsPressed(UserCommand.CameraJumpSeeSwitch))

0 commit comments

Comments
 (0)