Compare commits
5 Commits
032bf5d2a2
...
630de13d2c
Author | SHA1 | Date | |
---|---|---|---|
630de13d2c | |||
75671e0272 | |||
11c83fd8b0 | |||
dded2fe5dc | |||
6f35bd337b |
@ -26,7 +26,6 @@ namespace Locomotive
|
|||||||
{
|
{
|
||||||
return _locomotive?.GetCurrentPosition() ?? default;
|
return _locomotive?.GetCurrentPosition() ?? default;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void MoveObject(Direction direction)
|
public void MoveObject(Direction direction)
|
||||||
{
|
{
|
||||||
_locomotive?.MoveTransport(direction);
|
_locomotive?.MoveTransport(direction);
|
||||||
@ -37,5 +36,8 @@ namespace Locomotive
|
|||||||
_locomotive?.SetPosition(x, y, width, height);
|
_locomotive?.SetPosition(x, y, width, height);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public string getInfo() => _locomotive?.getDataForSave();
|
||||||
|
|
||||||
|
public static IDrawningObject Create(string data) => new DrawningObjectLocomotive(data.createDrawningLocomotive());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -45,9 +45,16 @@
|
|||||||
this.maskedTextBoxPosition = new System.Windows.Forms.MaskedTextBox();
|
this.maskedTextBoxPosition = new System.Windows.Forms.MaskedTextBox();
|
||||||
this.buttonAddLocomotive = new System.Windows.Forms.Button();
|
this.buttonAddLocomotive = new System.Windows.Forms.Button();
|
||||||
this.pictureBox = new System.Windows.Forms.PictureBox();
|
this.pictureBox = new System.Windows.Forms.PictureBox();
|
||||||
|
this.menuStrip = new System.Windows.Forms.MenuStrip();
|
||||||
|
this.fileToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
|
||||||
|
this.saveToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
|
||||||
|
this.loadToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
|
||||||
|
this.loadFileDialog = new System.Windows.Forms.OpenFileDialog();
|
||||||
|
this.saveFileDialog = new System.Windows.Forms.SaveFileDialog();
|
||||||
this.groupBoxTools.SuspendLayout();
|
this.groupBoxTools.SuspendLayout();
|
||||||
this.groupBox1.SuspendLayout();
|
this.groupBox1.SuspendLayout();
|
||||||
((System.ComponentModel.ISupportInitialize)(this.pictureBox)).BeginInit();
|
((System.ComponentModel.ISupportInitialize)(this.pictureBox)).BeginInit();
|
||||||
|
this.menuStrip.SuspendLayout();
|
||||||
this.SuspendLayout();
|
this.SuspendLayout();
|
||||||
//
|
//
|
||||||
// groupBoxTools
|
// groupBoxTools
|
||||||
@ -63,9 +70,9 @@
|
|||||||
this.groupBoxTools.Controls.Add(this.maskedTextBoxPosition);
|
this.groupBoxTools.Controls.Add(this.maskedTextBoxPosition);
|
||||||
this.groupBoxTools.Controls.Add(this.buttonAddLocomotive);
|
this.groupBoxTools.Controls.Add(this.buttonAddLocomotive);
|
||||||
this.groupBoxTools.Dock = System.Windows.Forms.DockStyle.Right;
|
this.groupBoxTools.Dock = System.Windows.Forms.DockStyle.Right;
|
||||||
this.groupBoxTools.Location = new System.Drawing.Point(580, 0);
|
this.groupBoxTools.Location = new System.Drawing.Point(580, 28);
|
||||||
this.groupBoxTools.Name = "groupBoxTools";
|
this.groupBoxTools.Name = "groupBoxTools";
|
||||||
this.groupBoxTools.Size = new System.Drawing.Size(220, 546);
|
this.groupBoxTools.Size = new System.Drawing.Size(220, 540);
|
||||||
this.groupBoxTools.TabIndex = 0;
|
this.groupBoxTools.TabIndex = 0;
|
||||||
this.groupBoxTools.TabStop = false;
|
this.groupBoxTools.TabStop = false;
|
||||||
this.groupBoxTools.Text = "Tools";
|
this.groupBoxTools.Text = "Tools";
|
||||||
@ -228,19 +235,62 @@
|
|||||||
// pictureBox
|
// pictureBox
|
||||||
//
|
//
|
||||||
this.pictureBox.Dock = System.Windows.Forms.DockStyle.Fill;
|
this.pictureBox.Dock = System.Windows.Forms.DockStyle.Fill;
|
||||||
this.pictureBox.Location = new System.Drawing.Point(0, 0);
|
this.pictureBox.Location = new System.Drawing.Point(0, 28);
|
||||||
this.pictureBox.Name = "pictureBox";
|
this.pictureBox.Name = "pictureBox";
|
||||||
this.pictureBox.Size = new System.Drawing.Size(580, 546);
|
this.pictureBox.Size = new System.Drawing.Size(580, 540);
|
||||||
this.pictureBox.TabIndex = 1;
|
this.pictureBox.TabIndex = 1;
|
||||||
this.pictureBox.TabStop = false;
|
this.pictureBox.TabStop = false;
|
||||||
//
|
//
|
||||||
|
// menuStrip
|
||||||
|
//
|
||||||
|
this.menuStrip.ImageScalingSize = new System.Drawing.Size(20, 20);
|
||||||
|
this.menuStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
|
||||||
|
this.fileToolStripMenuItem});
|
||||||
|
this.menuStrip.Location = new System.Drawing.Point(0, 0);
|
||||||
|
this.menuStrip.Name = "menuStrip";
|
||||||
|
this.menuStrip.Size = new System.Drawing.Size(800, 28);
|
||||||
|
this.menuStrip.TabIndex = 2;
|
||||||
|
//
|
||||||
|
// fileToolStripMenuItem
|
||||||
|
//
|
||||||
|
this.fileToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
|
||||||
|
this.saveToolStripMenuItem,
|
||||||
|
this.loadToolStripMenuItem});
|
||||||
|
this.fileToolStripMenuItem.Name = "fileToolStripMenuItem";
|
||||||
|
this.fileToolStripMenuItem.Size = new System.Drawing.Size(46, 24);
|
||||||
|
this.fileToolStripMenuItem.Text = "File";
|
||||||
|
//
|
||||||
|
// saveToolStripMenuItem
|
||||||
|
//
|
||||||
|
this.saveToolStripMenuItem.Name = "saveToolStripMenuItem";
|
||||||
|
this.saveToolStripMenuItem.Size = new System.Drawing.Size(224, 26);
|
||||||
|
this.saveToolStripMenuItem.Text = "Save";
|
||||||
|
this.saveToolStripMenuItem.Click += new System.EventHandler(this.saveToolStripMenuItem_Click);
|
||||||
|
//
|
||||||
|
// loadToolStripMenuItem
|
||||||
|
//
|
||||||
|
this.loadToolStripMenuItem.Name = "loadToolStripMenuItem";
|
||||||
|
this.loadToolStripMenuItem.Size = new System.Drawing.Size(224, 26);
|
||||||
|
this.loadToolStripMenuItem.Text = "Load";
|
||||||
|
this.loadToolStripMenuItem.Click += new System.EventHandler(this.loadToolStripMenuItem_Click);
|
||||||
|
//
|
||||||
|
// loadFileDialog
|
||||||
|
//
|
||||||
|
this.loadFileDialog.Filter = "txt file | *.txt";
|
||||||
|
//
|
||||||
|
// saveFileDialog
|
||||||
|
//
|
||||||
|
this.saveFileDialog.Filter = "txt file | *.txt";
|
||||||
|
//
|
||||||
// FormMapWithSetLocomotives
|
// FormMapWithSetLocomotives
|
||||||
//
|
//
|
||||||
this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 20F);
|
this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 20F);
|
||||||
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
|
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
|
||||||
this.ClientSize = new System.Drawing.Size(800, 546);
|
this.ClientSize = new System.Drawing.Size(800, 568);
|
||||||
this.Controls.Add(this.pictureBox);
|
this.Controls.Add(this.pictureBox);
|
||||||
this.Controls.Add(this.groupBoxTools);
|
this.Controls.Add(this.groupBoxTools);
|
||||||
|
this.Controls.Add(this.menuStrip);
|
||||||
|
this.MainMenuStrip = this.menuStrip;
|
||||||
this.Name = "FormMapWithSetLocomotives";
|
this.Name = "FormMapWithSetLocomotives";
|
||||||
this.Text = "FormMapWithSetLocomotives";
|
this.Text = "FormMapWithSetLocomotives";
|
||||||
this.groupBoxTools.ResumeLayout(false);
|
this.groupBoxTools.ResumeLayout(false);
|
||||||
@ -248,7 +298,10 @@
|
|||||||
this.groupBox1.ResumeLayout(false);
|
this.groupBox1.ResumeLayout(false);
|
||||||
this.groupBox1.PerformLayout();
|
this.groupBox1.PerformLayout();
|
||||||
((System.ComponentModel.ISupportInitialize)(this.pictureBox)).EndInit();
|
((System.ComponentModel.ISupportInitialize)(this.pictureBox)).EndInit();
|
||||||
|
this.menuStrip.ResumeLayout(false);
|
||||||
|
this.menuStrip.PerformLayout();
|
||||||
this.ResumeLayout(false);
|
this.ResumeLayout(false);
|
||||||
|
this.PerformLayout();
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -271,5 +324,11 @@
|
|||||||
private Button buttonAddMap;
|
private Button buttonAddMap;
|
||||||
private Button buttonDeleteMap;
|
private Button buttonDeleteMap;
|
||||||
private ListBox listBoxMaps;
|
private ListBox listBoxMaps;
|
||||||
|
private MenuStrip menuStrip;
|
||||||
|
private ToolStripMenuItem fileToolStripMenuItem;
|
||||||
|
private ToolStripMenuItem saveToolStripMenuItem;
|
||||||
|
private ToolStripMenuItem loadToolStripMenuItem;
|
||||||
|
private OpenFileDialog loadFileDialog;
|
||||||
|
private SaveFileDialog saveFileDialog;
|
||||||
}
|
}
|
||||||
}
|
}
|
@ -186,5 +186,36 @@ namespace Locomotive
|
|||||||
pictureBox.Image = _mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty].MoveObject(dir);
|
pictureBox.Image = _mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty].MoveObject(dir);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private void saveToolStripMenuItem_Click(object sender, EventArgs e)
|
||||||
|
{
|
||||||
|
if (saveFileDialog.ShowDialog() == DialogResult.OK)
|
||||||
|
{
|
||||||
|
if (_mapsCollection.SaveData(saveFileDialog.FileName))
|
||||||
|
{
|
||||||
|
MessageBox.Show("Saved successfully", "Result", MessageBoxButtons.OK, MessageBoxIcon.Information);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
MessageBox.Show("Saving failed", "Result", MessageBoxButtons.OK, MessageBoxIcon.Error);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private void loadToolStripMenuItem_Click(object sender, EventArgs e)
|
||||||
|
{
|
||||||
|
if (loadFileDialog.ShowDialog() == DialogResult.OK)
|
||||||
|
{
|
||||||
|
if (_mapsCollection.LoadData(loadFileDialog.FileName))
|
||||||
|
{
|
||||||
|
MessageBox.Show("Loaded successfully", "Result", MessageBoxButtons.OK, MessageBoxIcon.Information);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
MessageBox.Show("Loading failed", "Result", MessageBoxButtons.OK, MessageBoxIcon.Error);
|
||||||
|
}
|
||||||
|
ReloadMaps();
|
||||||
|
pictureBox.Image = _mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty].ShowSet();
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -57,4 +57,16 @@
|
|||||||
<resheader name="writer">
|
<resheader name="writer">
|
||||||
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||||
</resheader>
|
</resheader>
|
||||||
|
<metadata name="menuStrip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
|
||||||
|
<value>17, 17</value>
|
||||||
|
</metadata>
|
||||||
|
<metadata name="loadFileDialog.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
|
||||||
|
<value>144, 17</value>
|
||||||
|
</metadata>
|
||||||
|
<metadata name="saveFileDialog.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
|
||||||
|
<value>311, 17</value>
|
||||||
|
</metadata>
|
||||||
|
<metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
|
||||||
|
<value>33</value>
|
||||||
|
</metadata>
|
||||||
</root>
|
</root>
|
@ -19,5 +19,7 @@ namespace Locomotive
|
|||||||
/// Получение текущей позиции объекта
|
/// Получение текущей позиции объекта
|
||||||
(float Left, float Right, float Top, float Bottom) GetCurrentPosition();
|
(float Left, float Right, float Top, float Bottom) GetCurrentPosition();
|
||||||
|
|
||||||
|
// Получение информации по объекту
|
||||||
|
string getInfo();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -158,5 +158,26 @@ namespace Locomotive
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// Получение данных в виде строки
|
||||||
|
public string GetData(char separatorType, char separatorData)
|
||||||
|
{
|
||||||
|
string data = $"{_map.GetType().Name}{separatorType}";
|
||||||
|
foreach (var locomotive in _setLocomotives.GetLocomotives())
|
||||||
|
{
|
||||||
|
data += $"{locomotive.getInfo()}{separatorData}";
|
||||||
|
}
|
||||||
|
return data;
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Загрузка списка из массива строк
|
||||||
|
public void LoadData(string[] records)
|
||||||
|
{
|
||||||
|
foreach (var rec in records)
|
||||||
|
{
|
||||||
|
_setLocomotives.Insert(DrawningObjectLocomotive.Create(rec) as T);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -9,7 +9,7 @@ namespace Locomotive
|
|||||||
internal class MapsCollection
|
internal class MapsCollection
|
||||||
{
|
{
|
||||||
/// Словарь (хранилище) с картами
|
/// Словарь (хранилище) с картами
|
||||||
readonly Dictionary<string, MapWithSetLocomotivesGeneric<DrawningObjectLocomotive,
|
readonly Dictionary<string, MapWithSetLocomotivesGeneric<IDrawningObject,
|
||||||
AbstractMap>> _mapStorages;
|
AbstractMap>> _mapStorages;
|
||||||
/// Возвращение списка названий карт
|
/// Возвращение списка названий карт
|
||||||
public List<string> Keys => _mapStorages.Keys.ToList();
|
public List<string> Keys => _mapStorages.Keys.ToList();
|
||||||
@ -17,11 +17,16 @@ namespace Locomotive
|
|||||||
private readonly int _pictureWidth;
|
private readonly int _pictureWidth;
|
||||||
/// Высота окна отрисовки
|
/// Высота окна отрисовки
|
||||||
private readonly int _pictureHeight;
|
private readonly int _pictureHeight;
|
||||||
|
|
||||||
|
// Сепараторы
|
||||||
|
private readonly char separatorDict = '|';
|
||||||
|
private readonly char separatorData = ';';
|
||||||
|
|
||||||
/// Конструктор
|
/// Конструктор
|
||||||
public MapsCollection(int pictureWidth, int pictureHeight)
|
public MapsCollection(int pictureWidth, int pictureHeight)
|
||||||
{
|
{
|
||||||
_mapStorages = new Dictionary<string,
|
_mapStorages = new Dictionary<string,
|
||||||
MapWithSetLocomotivesGeneric<DrawningObjectLocomotive, AbstractMap>>();
|
MapWithSetLocomotivesGeneric<IDrawningObject, AbstractMap>>();
|
||||||
_pictureWidth = pictureWidth;
|
_pictureWidth = pictureWidth;
|
||||||
_pictureHeight = pictureHeight;
|
_pictureHeight = pictureHeight;
|
||||||
}
|
}
|
||||||
@ -29,7 +34,7 @@ namespace Locomotive
|
|||||||
public void AddMap(string name, AbstractMap map)
|
public void AddMap(string name, AbstractMap map)
|
||||||
{
|
{
|
||||||
// Логика для добавления
|
// Логика для добавления
|
||||||
if (!_mapStorages.ContainsKey(name)) _mapStorages.Add(name, new MapWithSetLocomotivesGeneric<DrawningObjectLocomotive, AbstractMap>(_pictureWidth, _pictureHeight, map));
|
if (!_mapStorages.ContainsKey(name)) _mapStorages.Add(name, new MapWithSetLocomotivesGeneric<IDrawningObject, AbstractMap>(_pictureWidth, _pictureHeight, map));
|
||||||
}
|
}
|
||||||
/// Удаление карты
|
/// Удаление карты
|
||||||
public void DelMap(string name)
|
public void DelMap(string name)
|
||||||
@ -38,7 +43,7 @@ namespace Locomotive
|
|||||||
if (_mapStorages.ContainsKey(name)) _mapStorages.Remove(name);
|
if (_mapStorages.ContainsKey(name)) _mapStorages.Remove(name);
|
||||||
}
|
}
|
||||||
/// Доступ к парковке
|
/// Доступ к парковке
|
||||||
public MapWithSetLocomotivesGeneric<DrawningObjectLocomotive, AbstractMap> this[string ind]
|
public MapWithSetLocomotivesGeneric<IDrawningObject, AbstractMap> this[string ind]
|
||||||
{
|
{
|
||||||
get
|
get
|
||||||
{
|
{
|
||||||
@ -48,5 +53,71 @@ namespace Locomotive
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// Сохранение информации по локомотивам в хранилище в файл
|
||||||
|
public bool SaveData(string filename)
|
||||||
|
{
|
||||||
|
if (File.Exists(filename))
|
||||||
|
{
|
||||||
|
File.Delete(filename);
|
||||||
|
}
|
||||||
|
using (FileStream fs = new(filename, FileMode.Create))
|
||||||
|
using (StreamWriter sw = new StreamWriter(fs, Encoding.UTF8))
|
||||||
|
{
|
||||||
|
sw.WriteLine("MapsCollection");
|
||||||
|
foreach (var storage in _mapStorages)
|
||||||
|
{
|
||||||
|
|
||||||
|
sw.WriteLine(
|
||||||
|
$"{storage.Key}{separatorDict}{storage.Value.GetData(separatorDict, separatorData)}"
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
/// Загрузка нформации по локомотивам в депо из файла
|
||||||
|
public bool LoadData(string filename)
|
||||||
|
{
|
||||||
|
if (!File.Exists(filename))
|
||||||
|
{
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
using (FileStream fs = new(filename, FileMode.Open))
|
||||||
|
using (StreamReader sr = new StreamReader(fs, Encoding.UTF8))
|
||||||
|
{
|
||||||
|
string curLine = sr.ReadLine();
|
||||||
|
|
||||||
|
if (!curLine.Contains("MapsCollection"))
|
||||||
|
{
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
_mapStorages.Clear();
|
||||||
|
while ((curLine = sr.ReadLine()) != null)
|
||||||
|
{
|
||||||
|
var elems = curLine.Split(separatorDict);
|
||||||
|
AbstractMap map = null;
|
||||||
|
|
||||||
|
switch (elems[1])
|
||||||
|
{
|
||||||
|
case "Simple Map":
|
||||||
|
map = new SimpleMap();
|
||||||
|
break;
|
||||||
|
case "Spike Map":
|
||||||
|
map = new SpikeMap();
|
||||||
|
break;
|
||||||
|
case "Rail Map":
|
||||||
|
map = new RailroadMap();
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
|
_mapStorages.Add(elems[0], new MapWithSetLocomotivesGeneric<IDrawningObject, AbstractMap>(_pictureWidth, _pictureHeight, map));
|
||||||
|
_mapStorages[elems[0]].LoadData(elems[2].Split(separatorData, StringSplitOptions.RemoveEmptyEntries));
|
||||||
|
}
|
||||||
|
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user