Skip to content

Commit

Permalink
Added station inheretence and a controller / model idea.
Browse files Browse the repository at this point in the history
  • Loading branch information
Evan Langlais authored and Evan Langlais committed Mar 3, 2017
1 parent 6982ceb commit 2414f2e
Show file tree
Hide file tree
Showing 11 changed files with 288 additions and 26 deletions.
22 changes: 17 additions & 5 deletions Enigma/Enigma.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -62,16 +62,24 @@
<Reference Include="System.Xml" />
</ItemGroup>
<ItemGroup>
<Compile Include="DebugForm.cs">
<Compile Include="StationsGUI\DebugStationView.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="DebugForm.Designer.cs">
<DependentUpon>DebugForm.cs</DependentUpon>
<Compile Include="StationsGUI\DebugStationView.Designer.cs">
<DependentUpon>DebugStationView.cs</DependentUpon>
</Compile>
<Compile Include="Program.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<EmbeddedResource Include="DebugForm.resx">
<DependentUpon>DebugForm.cs</DependentUpon>
<Compile Include="StationsGUI\HostStationView.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="StationsGUI\HostStationView.Designer.cs">
<DependentUpon>HostStationView.cs</DependentUpon>
</Compile>
<Compile Include="Stations\DebugStation.cs" />
<Compile Include="Stations\HostStation.cs" />
<EmbeddedResource Include="StationsGUI\DebugStationView.resx">
<DependentUpon>DebugStationView.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="Properties\Resources.resx">
<Generator>ResXFileCodeGenerator</Generator>
Expand All @@ -82,6 +90,9 @@
<AutoGen>True</AutoGen>
<DependentUpon>Resources.resx</DependentUpon>
</Compile>
<EmbeddedResource Include="StationsGUI\HostStationView.resx">
<DependentUpon>HostStationView.cs</DependentUpon>
</EmbeddedResource>
<None Include="packages.config" />
<None Include="Properties\Settings.settings">
<Generator>SettingsSingleFileGenerator</Generator>
Expand All @@ -102,6 +113,7 @@
<Name>EnigmaX</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup />
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
Expand Down
7 changes: 5 additions & 2 deletions Enigma/Program.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
using System;
using Enigma.Stations;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
Expand All @@ -17,7 +18,9 @@ static void Main()
{
Application.EnableVisualStyles();
Application.SetCompatibleTextRenderingDefault(false);
Application.Run(new DebugForm());
DebugStation station = new DebugStation(EnigmaX.Classes.StationTypeDef.host, "debug");
station.showView();
Application.Run();
}
}
}
22 changes: 22 additions & 0 deletions Enigma/Stations/DebugStation.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using EnigmaX.Classes;
namespace Enigma.Stations
{
public class DebugStation : Station
{
public DebugStation(StationTypeDef type, string stationid) : base(type, stationid)
{

view = new DebugStationView(this);
}

public override void showView()
{
view.Show();
}
}
}
19 changes: 19 additions & 0 deletions Enigma/Stations/HostStation.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using EnigmaX.Classes;

namespace Enigma.Stations
{
class HostStation : Station
{
public HostStation(string stationid) : base(StationTypeDef.host, stationid)
{
view = new StationsGUI.HostStationView();

}

}
}

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

22 changes: 13 additions & 9 deletions Enigma/DebugForm.cs → Enigma/StationsGUI/DebugStationView.cs
Original file line number Diff line number Diff line change
Expand Up @@ -9,19 +9,23 @@
using System.Windows.Forms;
using MetroFramework.Forms;
using EnigmaX.Classes;
using Enigma.Stations;

namespace Enigma
{
public partial class DebugForm : MetroForm
public partial class DebugStationView : MetroForm
{
public DebugForm()

private Station _station;

public DebugStationView(DebugStation station)
{
InitializeComponent();
_station = station;
}
private Station station;

private void Form1_Load(object sender, EventArgs e)
{
station = new Station(StationTypeDef.host, "test");

}

Expand All @@ -33,15 +37,15 @@ private void InterCom_onReceive(ICMessage message, EventArgs e)

private void metroButton1_Click(object sender, EventArgs e)
{
station.registerStation();
station.interCom.onReceive += InterCom_onReceive;
station.interCom.listen();
_station.registerStation();
_station.interCom.onReceive += InterCom_onReceive;
_station.interCom.listen();
}

private void metroButton2_Click(object sender, EventArgs e)
{
if (station.Registered) {
station.interCom.send("%HOST%|-test", "This is a test dummy ping");
if (_station.Registered) {
_station.interCom.send("%HOST%|-test", "This is a test dummy ping");
}
}
}
Expand Down
File renamed without changes.
47 changes: 47 additions & 0 deletions Enigma/StationsGUI/HostStationView.Designer.cs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

25 changes: 25 additions & 0 deletions Enigma/StationsGUI/HostStationView.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Data;
using System.Drawing;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows.Forms;

namespace Enigma.StationsGUI
{
public partial class HostStationView : Form
{
public HostStationView()
{
InitializeComponent();
}

private void HostStationView_Load(object sender, EventArgs e)
{

}
}
}
120 changes: 120 additions & 0 deletions Enigma/StationsGUI/HostStationView.resx
Original file line number Diff line number Diff line change
@@ -0,0 +1,120 @@
<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
Microsoft ResX Schema
Version 2.0
The primary goals of this format is to allow a simple XML format
that is mostly human readable. The generation and parsing of the
various data types are done through the TypeConverter classes
associated with the data types.
Example:
... ado.net/XML headers & schema ...
<resheader name="resmimetype">text/microsoft-resx</resheader>
<resheader name="version">2.0</resheader>
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
<value>[base64 mime encoded serialized .NET Framework object]</value>
</data>
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
<comment>This is a comment</comment>
</data>
There are any number of "resheader" rows that contain simple
name/value pairs.
Each data row contains a name, and value. The row also contains a
type or mimetype. Type corresponds to a .NET class that support
text/value conversion through the TypeConverter architecture.
Classes that don't support this are serialized and stored with the
mimetype set.
The mimetype is used for serialized objects, and tells the
ResXResourceReader how to depersist the object. This is currently not
extensible. For a given mimetype the value must be set accordingly:
Note - application/x-microsoft.net.object.binary.base64 is the format
that the ResXResourceWriter will generate, however the reader can
read any of the formats listed below.
mimetype: application/x-microsoft.net.object.binary.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.soap.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.bytearray.base64
value : The object must be serialized into a byte array
: using a System.ComponentModel.TypeConverter
: and then encoded with base64 encoding.
-->
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
<xsd:element name="root" msdata:IsDataSet="true">
<xsd:complexType>
<xsd:choice maxOccurs="unbounded">
<xsd:element name="metadata">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" />
</xsd:sequence>
<xsd:attribute name="name" use="required" type="xsd:string" />
<xsd:attribute name="type" type="xsd:string" />
<xsd:attribute name="mimetype" type="xsd:string" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="assembly">
<xsd:complexType>
<xsd:attribute name="alias" type="xsd:string" />
<xsd:attribute name="name" type="xsd:string" />
</xsd:complexType>
</xsd:element>
<xsd:element name="data">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="resheader">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" />
</xsd:complexType>
</xsd:element>
</xsd:choice>
</xsd:complexType>
</xsd:element>
</xsd:schema>
<resheader name="resmimetype">
<value>text/microsoft-resx</value>
</resheader>
<resheader name="version">
<value>2.0</value>
</resheader>
<resheader name="reader">
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
</root>
Loading

0 comments on commit 2414f2e

Please sign in to comment.