vergessene commit
This commit is contained in:
@@ -24,6 +24,7 @@ namespace BerichtGen
|
|||||||
/// <param name="source">Die zuverwendete Vorlagenname</param>
|
/// <param name="source">Die zuverwendete Vorlagenname</param>
|
||||||
/// <param name="savepath">Pfad zum Speichern</param>
|
/// <param name="savepath">Pfad zum Speichern</param>
|
||||||
/// <param name="filename"></param>
|
/// <param name="filename"></param>
|
||||||
|
/// <param name="daten"></param>
|
||||||
/// <param name="bilderObjects">Zur zeit ohne Implementierung</param>
|
/// <param name="bilderObjects">Zur zeit ohne Implementierung</param>
|
||||||
/// <param name="tableContents">Für Tabellen anzeige</param>
|
/// <param name="tableContents">Für Tabellen anzeige</param>
|
||||||
/// <param name="erzeugeDOC">Ein doc datei soll erzeugt werden</param>
|
/// <param name="erzeugeDOC">Ein doc datei soll erzeugt werden</param>
|
||||||
@@ -135,7 +136,7 @@ namespace BerichtGen
|
|||||||
graphics.Dispose();
|
graphics.Dispose();
|
||||||
|
|
||||||
}
|
}
|
||||||
catch(Exception ex)
|
catch(Exception)
|
||||||
{
|
{
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -37,7 +37,11 @@ namespace KlassenBIB
|
|||||||
{
|
{
|
||||||
return haltungslaenge * harzbedarf;
|
return haltungslaenge * harzbedarf;
|
||||||
}
|
}
|
||||||
|
/// <summary>
|
||||||
|
///
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="projektpfad"></param>
|
||||||
|
/// <returns></returns>
|
||||||
public override string CheckVerzeichnisse(string projektpfad)
|
public override string CheckVerzeichnisse(string projektpfad)
|
||||||
{
|
{
|
||||||
string path = Path.Combine(projektpfad, PfadZurSan);
|
string path = Path.Combine(projektpfad, PfadZurSan);
|
||||||
@@ -48,6 +52,11 @@ namespace KlassenBIB
|
|||||||
|
|
||||||
return mypath;
|
return mypath;
|
||||||
}
|
}
|
||||||
|
/// <summary>
|
||||||
|
///
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="destinationPath"></param>
|
||||||
|
/// <returns></returns>
|
||||||
|
|
||||||
public Hashtable MakeProtokoll(string destinationPath)
|
public Hashtable MakeProtokoll(string destinationPath)
|
||||||
{
|
{
|
||||||
@@ -139,17 +148,30 @@ namespace KlassenBIB
|
|||||||
|
|
||||||
return grunddaten;
|
return grunddaten;
|
||||||
}
|
}
|
||||||
|
/// <summary>
|
||||||
|
///
|
||||||
|
/// </summary>
|
||||||
public InlinerSanierung()
|
public InlinerSanierung()
|
||||||
{
|
{
|
||||||
//datumKalibrierung = new DateTime();
|
//datumKalibrierung = new DateTime();
|
||||||
Verzeichnispfad = "UVAnlage";
|
Verzeichnispfad = "UVAnlage";
|
||||||
if (datumKalibrierung <= DateTime.MinValue || datumKalibrierung >= DateTime.MaxValue) datumKalibrierung = DateTime.Now;
|
if (datumKalibrierung <= DateTime.MinValue || datumKalibrierung >= DateTime.MaxValue) datumKalibrierung = DateTime.Now;
|
||||||
}
|
}
|
||||||
|
/// <summary>
|
||||||
|
///
|
||||||
|
/// </summary>
|
||||||
public double KalibrierUnterdruck { get => kalibrierUnterdruck; set => kalibrierUnterdruck = value; }
|
public double KalibrierUnterdruck { get => kalibrierUnterdruck; set => kalibrierUnterdruck = value; }
|
||||||
|
/// <summary>
|
||||||
|
///
|
||||||
|
/// </summary>
|
||||||
public double KalibierWalzenAbstand { get => kalibierWalzenAbstand; set => kalibierWalzenAbstand = value; }
|
public double KalibierWalzenAbstand { get => kalibierWalzenAbstand; set => kalibierWalzenAbstand = value; }
|
||||||
|
/// <summary>
|
||||||
|
///
|
||||||
|
/// </summary>
|
||||||
public double HarzKalibrierTemperatur { get => harzKalibrierTemperatur; set => harzKalibrierTemperatur = value; }
|
public double HarzKalibrierTemperatur { get => harzKalibrierTemperatur; set => harzKalibrierTemperatur = value; }
|
||||||
|
/// <summary>
|
||||||
|
///
|
||||||
|
/// </summary>
|
||||||
public DateTime DatumKalibrierung
|
public DateTime DatumKalibrierung
|
||||||
{
|
{
|
||||||
get
|
get
|
||||||
@@ -163,15 +185,45 @@ namespace KlassenBIB
|
|||||||
datumKalibrierung = value;
|
datumKalibrierung = value;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
/// <summary>
|
||||||
|
///
|
||||||
|
/// </summary>
|
||||||
public string HarzChargenummer { get => harzChargenummer; set => harzChargenummer = value; }
|
public string HarzChargenummer { get => harzChargenummer; set => harzChargenummer = value; }
|
||||||
|
/// <summary>
|
||||||
|
///
|
||||||
|
/// </summary>
|
||||||
public string LinerChargenummer { get => linerChargenummer; set => linerChargenummer = value; }
|
public string LinerChargenummer { get => linerChargenummer; set => linerChargenummer = value; }
|
||||||
|
/// <summary>
|
||||||
|
///
|
||||||
|
/// </summary>
|
||||||
public double Harzbedarf { get => harzbedarf; set => harzbedarf = value; }
|
public double Harzbedarf { get => harzbedarf; set => harzbedarf = value; }
|
||||||
|
/// <summary>
|
||||||
|
///
|
||||||
|
/// </summary>
|
||||||
public uint Rueckholgeschwindigkeit { get => rueckholgeschwindigkeit; set => rueckholgeschwindigkeit = value; }
|
public uint Rueckholgeschwindigkeit { get => rueckholgeschwindigkeit; set => rueckholgeschwindigkeit = value; }
|
||||||
|
/// <summary>
|
||||||
|
///
|
||||||
|
/// </summary>
|
||||||
public bool GeschlosseneEnde { get => geschlosseneEnde; set => geschlosseneEnde = value; }
|
public bool GeschlosseneEnde { get => geschlosseneEnde; set => geschlosseneEnde = value; }
|
||||||
|
/// <summary>
|
||||||
|
///
|
||||||
|
/// </summary>
|
||||||
public double HarzBedarf { get => harzbedarf; set => harzbedarf = value; }
|
public double HarzBedarf { get => harzbedarf; set => harzbedarf = value; }
|
||||||
|
/// <summary>
|
||||||
|
///
|
||||||
|
/// </summary>
|
||||||
public string HarzTyp { get => harzTyp; set => harzTyp = value; }
|
public string HarzTyp { get => harzTyp; set => harzTyp = value; }
|
||||||
|
/// <summary>
|
||||||
|
///
|
||||||
|
/// </summary>
|
||||||
public string LinerTyp { get => linerTyp; set => linerTyp = value; }
|
public string LinerTyp { get => linerTyp; set => linerTyp = value; }
|
||||||
|
/// <summary>
|
||||||
|
///
|
||||||
|
/// </summary>
|
||||||
public DateTime AnfangAushaertung { get => anfangAushaertung; set => anfangAushaertung = value; }
|
public DateTime AnfangAushaertung { get => anfangAushaertung; set => anfangAushaertung = value; }
|
||||||
|
/// <summary>
|
||||||
|
///
|
||||||
|
/// </summary>
|
||||||
public DateTime EndeAushaertung { get => endeAushaertung; set => endeAushaertung = value; }
|
public DateTime EndeAushaertung { get => endeAushaertung; set => endeAushaertung = value; }
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -6,16 +6,30 @@ using System.Threading.Tasks;
|
|||||||
|
|
||||||
namespace KlassenBIB
|
namespace KlassenBIB
|
||||||
{
|
{
|
||||||
|
/// <summary>
|
||||||
|
///
|
||||||
|
/// </summary>
|
||||||
public abstract class Sanieren : Sanierung
|
public abstract class Sanieren : Sanierung
|
||||||
{
|
{
|
||||||
Guid guid;
|
Guid guid;
|
||||||
DateTime datum = new DateTime();
|
DateTime datum = new DateTime();
|
||||||
bool fertig = false;
|
bool fertig = false;
|
||||||
string verzeichnispfad;
|
string verzeichnispfad;
|
||||||
|
/// <summary>
|
||||||
|
///
|
||||||
|
/// </summary>
|
||||||
public Guid Guid { get => guid; set => guid = value; }
|
public Guid Guid { get => guid; set => guid = value; }
|
||||||
|
/// <summary>
|
||||||
|
///
|
||||||
|
/// </summary>
|
||||||
public DateTime Datum { get => datum; set => datum = value; }
|
public DateTime Datum { get => datum; set => datum = value; }
|
||||||
|
/// <summary>
|
||||||
|
///
|
||||||
|
/// </summary>
|
||||||
public bool Fertig { get => fertig; set => fertig = value; }
|
public bool Fertig { get => fertig; set => fertig = value; }
|
||||||
|
/// <summary>
|
||||||
|
///
|
||||||
|
/// </summary>
|
||||||
public string Verzeichnispfad { get => verzeichnispfad; protected set => verzeichnispfad = value; }
|
public string Verzeichnispfad { get => verzeichnispfad; protected set => verzeichnispfad = value; }
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -11,6 +11,9 @@ namespace KlassenBIB
|
|||||||
//
|
//
|
||||||
// Zusammenfassung:
|
// Zusammenfassung:
|
||||||
// Bietet die grundlegene Struktur für eine Sanierung
|
// Bietet die grundlegene Struktur für eine Sanierung
|
||||||
|
/// <summary>
|
||||||
|
///
|
||||||
|
/// </summary>
|
||||||
[EditorBrowsable(EditorBrowsableState.Never)]
|
[EditorBrowsable(EditorBrowsableState.Never)]
|
||||||
[Browsable(false)]
|
[Browsable(false)]
|
||||||
public abstract class Sanierung : INotifyPropertyChanged
|
public abstract class Sanierung : INotifyPropertyChanged
|
||||||
@@ -26,6 +29,9 @@ namespace KlassenBIB
|
|||||||
DateTime hDReinigungDatum;
|
DateTime hDReinigungDatum;
|
||||||
//DateTime sanierungsDatum;
|
//DateTime sanierungsDatum;
|
||||||
Inspektionsobjekt inspektionsobjekt;
|
Inspektionsobjekt inspektionsobjekt;
|
||||||
|
/// <summary>
|
||||||
|
///
|
||||||
|
/// </summary>
|
||||||
protected string pfadZurSan;
|
protected string pfadZurSan;
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
|
|||||||
@@ -6,6 +6,9 @@ using System.Threading.Tasks;
|
|||||||
|
|
||||||
namespace KlassenBIB
|
namespace KlassenBIB
|
||||||
{
|
{
|
||||||
|
/// <summary>
|
||||||
|
///
|
||||||
|
/// </summary>
|
||||||
public class SanierungCollection : List<Sanierung>
|
public class SanierungCollection : List<Sanierung>
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -11,8 +11,14 @@ using System.Windows.Forms;
|
|||||||
|
|
||||||
namespace SanSystem
|
namespace SanSystem
|
||||||
{
|
{
|
||||||
|
/// <summary>
|
||||||
|
///
|
||||||
|
/// </summary>
|
||||||
public partial class FrmKalibrierungFestlegung : Form
|
public partial class FrmKalibrierungFestlegung : Form
|
||||||
{
|
{
|
||||||
|
/// <summary>
|
||||||
|
///
|
||||||
|
/// </summary>
|
||||||
public FrmKalibrierungFestlegung(List<Inspektionsobjekt> inspektionsobjekts)
|
public FrmKalibrierungFestlegung(List<Inspektionsobjekt> inspektionsobjekts)
|
||||||
{
|
{
|
||||||
InitializeComponent();
|
InitializeComponent();
|
||||||
|
|||||||
@@ -11,8 +11,14 @@ using System.Windows.Forms;
|
|||||||
|
|
||||||
namespace SanSystem
|
namespace SanSystem
|
||||||
{
|
{
|
||||||
|
/// <summary>
|
||||||
|
///
|
||||||
|
/// </summary>
|
||||||
public partial class FrmNewProjekt : Form
|
public partial class FrmNewProjekt : Form
|
||||||
{
|
{
|
||||||
|
/// <summary>
|
||||||
|
///
|
||||||
|
/// </summary>
|
||||||
public FrmNewProjekt()
|
public FrmNewProjekt()
|
||||||
{
|
{
|
||||||
InitializeComponent();
|
InitializeComponent();
|
||||||
|
|||||||
@@ -12,6 +12,9 @@ using System.Windows.Forms;
|
|||||||
|
|
||||||
namespace SanSystem
|
namespace SanSystem
|
||||||
{
|
{
|
||||||
|
/// <summary>
|
||||||
|
///
|
||||||
|
/// </summary>
|
||||||
public partial class FrmSelectMassenDate : Form
|
public partial class FrmSelectMassenDate : Form
|
||||||
{
|
{
|
||||||
|
|
||||||
|
|||||||
@@ -10,21 +10,39 @@ using System.Windows.Forms;
|
|||||||
|
|
||||||
namespace SanSystem
|
namespace SanSystem
|
||||||
{
|
{
|
||||||
|
/// <summary>
|
||||||
|
///
|
||||||
|
/// </summary>
|
||||||
public partial class FrmSelectNewSan : Form
|
public partial class FrmSelectNewSan : Form
|
||||||
{
|
{
|
||||||
|
/// <summary>
|
||||||
|
///
|
||||||
|
/// </summary>
|
||||||
public event EventHandler AddInlinerClicked;
|
public event EventHandler AddInlinerClicked;
|
||||||
|
/// <summary>
|
||||||
|
///
|
||||||
|
/// </summary>
|
||||||
public event EventHandler AddSchachtAnbindungClicked;
|
public event EventHandler AddSchachtAnbindungClicked;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
///
|
||||||
|
/// </summary>
|
||||||
protected virtual void OnAddSchachtAnbindungClicked(EventArgs e)
|
protected virtual void OnAddSchachtAnbindungClicked(EventArgs e)
|
||||||
{
|
{
|
||||||
EventHandler handler = AddSchachtAnbindungClicked;
|
EventHandler handler = AddSchachtAnbindungClicked;
|
||||||
if (handler != null) handler(this, e);
|
if (handler != null) handler(this, e);
|
||||||
}
|
}
|
||||||
|
/// <summary>
|
||||||
|
///
|
||||||
|
/// </summary>
|
||||||
protected virtual void OnAddInlinerClicked(EventArgs e)
|
protected virtual void OnAddInlinerClicked(EventArgs e)
|
||||||
{
|
{
|
||||||
EventHandler handler = AddInlinerClicked;
|
EventHandler handler = AddInlinerClicked;
|
||||||
if (handler != null) handler(this, e);
|
if (handler != null) handler(this, e);
|
||||||
}
|
}
|
||||||
|
/// <summary>
|
||||||
|
///
|
||||||
|
/// </summary>
|
||||||
public FrmSelectNewSan()
|
public FrmSelectNewSan()
|
||||||
{
|
{
|
||||||
InitializeComponent();
|
InitializeComponent();
|
||||||
|
|||||||
@@ -17,7 +17,9 @@ using Syncfusion.Windows.Forms.Chart;
|
|||||||
|
|
||||||
namespace SanSystem
|
namespace SanSystem
|
||||||
{
|
{
|
||||||
|
/// <summary>
|
||||||
|
///
|
||||||
|
/// </summary>
|
||||||
public partial class UCInliner : UserControl
|
public partial class UCInliner : UserControl
|
||||||
{
|
{
|
||||||
enum TabPages
|
enum TabPages
|
||||||
@@ -29,6 +31,10 @@ namespace SanSystem
|
|||||||
string destinationPath = string.Empty;
|
string destinationPath = string.Empty;
|
||||||
UCLinerGrundlagen UCLinerGrundlagen = null;
|
UCLinerGrundlagen UCLinerGrundlagen = null;
|
||||||
List<string> filenames = new List<string>();
|
List<string> filenames = new List<string>();
|
||||||
|
/// <summary>
|
||||||
|
///
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="san"></param>
|
||||||
public UCInliner(InlinerSanierung san)
|
public UCInliner(InlinerSanierung san)
|
||||||
{
|
{
|
||||||
InitializeComponent();
|
InitializeComponent();
|
||||||
@@ -143,7 +149,7 @@ namespace SanSystem
|
|||||||
FtpClient newClient = null;
|
FtpClient newClient = null;
|
||||||
client.Dispose();
|
client.Dispose();
|
||||||
|
|
||||||
FtpClient newclient = null;
|
//FtpClient newclient = null;
|
||||||
foreach (string file in filenames)
|
foreach (string file in filenames)
|
||||||
{
|
{
|
||||||
newClient = new FtpClient("192.168.250.2");
|
newClient = new FtpClient("192.168.250.2");
|
||||||
@@ -166,7 +172,7 @@ namespace SanSystem
|
|||||||
}
|
}
|
||||||
catch (TimeoutException ex)
|
catch (TimeoutException ex)
|
||||||
{
|
{
|
||||||
MessageBox.Show("Die anlage reagiert nicht!");
|
MessageBox.Show("Die anlage reagiert nicht!\n"+ex.Message);
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -11,16 +11,28 @@ using KlassenBIB;
|
|||||||
|
|
||||||
namespace SanSystem
|
namespace SanSystem
|
||||||
{
|
{
|
||||||
|
/// <summary>
|
||||||
|
///
|
||||||
|
/// </summary>
|
||||||
public partial class UCLinerGrundlagen : UserControl
|
public partial class UCLinerGrundlagen : UserControl
|
||||||
{
|
{
|
||||||
InlinerSanierung inliner = null;
|
InlinerSanierung inliner = null;
|
||||||
|
/// <summary>
|
||||||
|
///
|
||||||
|
/// </summary>
|
||||||
public List<Inspektionsobjekt> inspektionsobjekts = null;
|
public List<Inspektionsobjekt> inspektionsobjekts = null;
|
||||||
|
/// <summary>
|
||||||
|
///
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="inliner"></param>
|
||||||
public UCLinerGrundlagen(InlinerSanierung inliner)
|
public UCLinerGrundlagen(InlinerSanierung inliner)
|
||||||
{
|
{
|
||||||
InitializeComponent();
|
InitializeComponent();
|
||||||
this.inliner = inliner;
|
this.inliner = inliner;
|
||||||
}
|
}
|
||||||
|
/// <summary>
|
||||||
|
///
|
||||||
|
/// </summary>
|
||||||
public UCLinerGrundlagen()
|
public UCLinerGrundlagen()
|
||||||
{
|
{
|
||||||
InitializeComponent();
|
InitializeComponent();
|
||||||
|
|||||||
@@ -13,6 +13,9 @@ using System.IO;
|
|||||||
|
|
||||||
namespace SanSystem
|
namespace SanSystem
|
||||||
{
|
{
|
||||||
|
/// <summary>
|
||||||
|
///
|
||||||
|
/// </summary>
|
||||||
public partial class UCSchachtanbindung : UserControl
|
public partial class UCSchachtanbindung : UserControl
|
||||||
{
|
{
|
||||||
SchachtAnbindung schacht = null;
|
SchachtAnbindung schacht = null;
|
||||||
|
|||||||
3
SanSystem/frmMain.Designer.cs
generated
3
SanSystem/frmMain.Designer.cs
generated
@@ -1,5 +1,8 @@
|
|||||||
namespace SanSystem
|
namespace SanSystem
|
||||||
{
|
{
|
||||||
|
/// <summary>
|
||||||
|
///
|
||||||
|
/// </summary>
|
||||||
partial class frmMain
|
partial class frmMain
|
||||||
{
|
{
|
||||||
/// <summary>
|
/// <summary>
|
||||||
|
|||||||
@@ -16,9 +16,14 @@ using System.Windows.Forms;
|
|||||||
|
|
||||||
namespace SanSystem
|
namespace SanSystem
|
||||||
{
|
{
|
||||||
|
/// <summary>
|
||||||
|
///
|
||||||
|
/// </summary>
|
||||||
public partial class frmMain : Form
|
public partial class frmMain : Form
|
||||||
{
|
{
|
||||||
|
/// <summary>
|
||||||
|
///
|
||||||
|
/// </summary>
|
||||||
public frmMain()
|
public frmMain()
|
||||||
{
|
{
|
||||||
InitializeComponent();
|
InitializeComponent();
|
||||||
|
|||||||
@@ -14,11 +14,17 @@ using Database;
|
|||||||
|
|
||||||
namespace SanSystem
|
namespace SanSystem
|
||||||
{
|
{
|
||||||
|
/// <summary>
|
||||||
|
///
|
||||||
|
/// </summary>
|
||||||
public partial class frmObjektEdit : Form
|
public partial class frmObjektEdit : Form
|
||||||
{
|
{
|
||||||
Inspektionsobjekt inspektionsobjekt = null;
|
Inspektionsobjekt inspektionsobjekt = null;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
///
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="inspektion"></param>
|
||||||
public frmObjektEdit(Inspektionsobjekt inspektion)
|
public frmObjektEdit(Inspektionsobjekt inspektion)
|
||||||
{
|
{
|
||||||
InitializeComponent();
|
InitializeComponent();
|
||||||
|
|||||||
@@ -15,12 +15,18 @@ using System.Windows.Forms;
|
|||||||
|
|
||||||
namespace SanSystem
|
namespace SanSystem
|
||||||
{
|
{
|
||||||
|
/// <summary>
|
||||||
|
///
|
||||||
|
/// </summary>
|
||||||
public partial class frmObjekteList : Form
|
public partial class frmObjekteList : Form
|
||||||
{
|
{
|
||||||
|
|
||||||
private List<Inspektionsobjekt> inspektionsobjekte;
|
private List<Inspektionsobjekt> inspektionsobjekte;
|
||||||
ObjecteListSetting objecteListSetting = new ObjecteListSetting();
|
ObjecteListSetting objecteListSetting = new ObjecteListSetting();
|
||||||
|
/// <summary>
|
||||||
|
///
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="streetname"></param>
|
||||||
private void loadObjekte(string streetname)
|
private void loadObjekte(string streetname)
|
||||||
{
|
{
|
||||||
|
|
||||||
@@ -63,7 +69,10 @@ namespace SanSystem
|
|||||||
}
|
}
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
/// <summary>
|
||||||
|
///
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="streetname"></param>
|
||||||
public frmObjekteList(string streetname)
|
public frmObjekteList(string streetname)
|
||||||
{
|
{
|
||||||
InitializeComponent();
|
InitializeComponent();
|
||||||
|
|||||||
@@ -11,8 +11,14 @@ using System.Windows.Forms;
|
|||||||
|
|
||||||
namespace SanSystem
|
namespace SanSystem
|
||||||
{
|
{
|
||||||
|
/// <summary>
|
||||||
|
///
|
||||||
|
/// </summary>
|
||||||
public partial class frmProjektList : Form
|
public partial class frmProjektList : Form
|
||||||
{
|
{
|
||||||
|
/// <summary>
|
||||||
|
///
|
||||||
|
/// </summary>
|
||||||
public frmProjektList()
|
public frmProjektList()
|
||||||
{
|
{
|
||||||
InitializeComponent();
|
InitializeComponent();
|
||||||
|
|||||||
@@ -12,10 +12,15 @@ using System.Windows.Forms;
|
|||||||
|
|
||||||
namespace SanSystem
|
namespace SanSystem
|
||||||
{
|
{
|
||||||
|
/// <summary>
|
||||||
|
///
|
||||||
|
/// </summary>
|
||||||
public partial class frmStrassenList : Form
|
public partial class frmStrassenList : Form
|
||||||
{
|
{
|
||||||
BindingSource bs = new BindingSource();
|
BindingSource bs = new BindingSource();
|
||||||
|
/// <summary>
|
||||||
|
///
|
||||||
|
/// </summary>
|
||||||
public frmStrassenList()
|
public frmStrassenList()
|
||||||
{
|
{
|
||||||
InitializeComponent();
|
InitializeComponent();
|
||||||
|
|||||||
@@ -6,6 +6,9 @@ using System.Threading.Tasks;
|
|||||||
|
|
||||||
namespace SchnittstelleImporter.XML2006
|
namespace SchnittstelleImporter.XML2006
|
||||||
{
|
{
|
||||||
|
/// <summary>
|
||||||
|
///
|
||||||
|
/// </summary>
|
||||||
public class Anschlussdaten
|
public class Anschlussdaten
|
||||||
{
|
{
|
||||||
string objektbezeichnung;
|
string objektbezeichnung;
|
||||||
|
|||||||
@@ -11,9 +11,21 @@ namespace SchnittstelleImporter.XML2006
|
|||||||
/// </summary>
|
/// </summary>
|
||||||
public enum EAnlagetyp
|
public enum EAnlagetyp
|
||||||
{
|
{
|
||||||
|
/// <summary>
|
||||||
|
///
|
||||||
|
/// </summary>
|
||||||
Haltung = 1,
|
Haltung = 1,
|
||||||
|
/// <summary>
|
||||||
|
///
|
||||||
|
/// </summary>
|
||||||
Anschlussleitung = 2,
|
Anschlussleitung = 2,
|
||||||
|
/// <summary>
|
||||||
|
///
|
||||||
|
/// </summary>
|
||||||
Schacht = 3,
|
Schacht = 3,
|
||||||
|
/// <summary>
|
||||||
|
///
|
||||||
|
/// </summary>
|
||||||
Bauwerk = 4
|
Bauwerk = 4
|
||||||
}
|
}
|
||||||
/// <summary>
|
/// <summary>
|
||||||
@@ -40,7 +52,13 @@ namespace SchnittstelleImporter.XML2006
|
|||||||
/// </summary>
|
/// </summary>
|
||||||
public enum ERohrleitungstyp
|
public enum ERohrleitungstyp
|
||||||
{
|
{
|
||||||
|
/// <summary>
|
||||||
|
///
|
||||||
|
/// </summary>
|
||||||
HALTUNG,
|
HALTUNG,
|
||||||
|
/// <summary>
|
||||||
|
///
|
||||||
|
/// </summary>
|
||||||
LEITUNG
|
LEITUNG
|
||||||
}
|
}
|
||||||
/// <summary>
|
/// <summary>
|
||||||
@@ -56,8 +74,17 @@ namespace SchnittstelleImporter.XML2006
|
|||||||
/// </summary>
|
/// </summary>
|
||||||
public enum EKnotenTyp
|
public enum EKnotenTyp
|
||||||
{
|
{
|
||||||
|
/// <summary>
|
||||||
|
///
|
||||||
|
/// </summary>
|
||||||
SCHACHT = 0,
|
SCHACHT = 0,
|
||||||
|
/// <summary>
|
||||||
|
///
|
||||||
|
/// </summary>
|
||||||
ANSCHLUSSPUNKT = 1,
|
ANSCHLUSSPUNKT = 1,
|
||||||
|
/// <summary>
|
||||||
|
///
|
||||||
|
/// </summary>
|
||||||
BAUWERK = 2
|
BAUWERK = 2
|
||||||
}
|
}
|
||||||
/// <summary>
|
/// <summary>
|
||||||
@@ -65,9 +92,21 @@ namespace SchnittstelleImporter.XML2006
|
|||||||
/// </summary>
|
/// </summary>
|
||||||
public enum EKantenTyp
|
public enum EKantenTyp
|
||||||
{
|
{
|
||||||
|
/// <summary>
|
||||||
|
///
|
||||||
|
/// </summary>
|
||||||
HALTUNG,
|
HALTUNG,
|
||||||
|
/// <summary>
|
||||||
|
///
|
||||||
|
/// </summary>
|
||||||
LEITUNG,
|
LEITUNG,
|
||||||
|
/// <summary>
|
||||||
|
///
|
||||||
|
/// </summary>
|
||||||
RINNE,
|
RINNE,
|
||||||
|
/// <summary>
|
||||||
|
///
|
||||||
|
/// </summary>
|
||||||
GERINNE
|
GERINNE
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -6,6 +6,9 @@ using System.Threading.Tasks;
|
|||||||
|
|
||||||
namespace SchnittstelleImporter.XML2006
|
namespace SchnittstelleImporter.XML2006
|
||||||
{
|
{
|
||||||
|
/// <summary>
|
||||||
|
///
|
||||||
|
/// </summary>
|
||||||
public sealed class InspizierteAbwassertechnischeAnlage
|
public sealed class InspizierteAbwassertechnischeAnlage
|
||||||
{
|
{
|
||||||
string objektbezeichnung;
|
string objektbezeichnung;
|
||||||
|
|||||||
@@ -6,6 +6,9 @@ using System.Threading.Tasks;
|
|||||||
|
|
||||||
namespace SchnittstelleImporter.XML2006
|
namespace SchnittstelleImporter.XML2006
|
||||||
{
|
{
|
||||||
|
/// <summary>
|
||||||
|
///
|
||||||
|
/// </summary>
|
||||||
public class Lage
|
public class Lage
|
||||||
{
|
{
|
||||||
string strassename;
|
string strassename;
|
||||||
|
|||||||
@@ -6,6 +6,9 @@ using System.Threading.Tasks;
|
|||||||
|
|
||||||
namespace SchnittstelleImporter.XML2006
|
namespace SchnittstelleImporter.XML2006
|
||||||
{
|
{
|
||||||
|
/// <summary>
|
||||||
|
///
|
||||||
|
/// </summary>
|
||||||
public class OptischeInspektion
|
public class OptischeInspektion
|
||||||
{
|
{
|
||||||
DateTime inspektionstime;
|
DateTime inspektionstime;
|
||||||
|
|||||||
@@ -6,6 +6,9 @@ using System.Threading.Tasks;
|
|||||||
|
|
||||||
namespace SchnittstelleImporter.XML2006
|
namespace SchnittstelleImporter.XML2006
|
||||||
{
|
{
|
||||||
|
/// <summary>
|
||||||
|
///
|
||||||
|
/// </summary>
|
||||||
public class RGrunddaten
|
public class RGrunddaten
|
||||||
{
|
{
|
||||||
string knotenZulauf;
|
string knotenZulauf;
|
||||||
|
|||||||
@@ -6,11 +6,23 @@ using System.Threading.Tasks;
|
|||||||
|
|
||||||
namespace SchnittstelleImporter.XML2006
|
namespace SchnittstelleImporter.XML2006
|
||||||
{
|
{
|
||||||
|
/// <summary>
|
||||||
|
///
|
||||||
|
/// </summary>
|
||||||
public struct Quantifizierung
|
public struct Quantifizierung
|
||||||
{
|
{
|
||||||
|
/// <summary>
|
||||||
|
///
|
||||||
|
/// </summary>
|
||||||
public decimal Numerisch;
|
public decimal Numerisch;
|
||||||
|
/// <summary>
|
||||||
|
///
|
||||||
|
/// </summary>
|
||||||
public string Text;
|
public string Text;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
///
|
||||||
|
/// </summary>
|
||||||
public override string ToString()
|
public override string ToString()
|
||||||
{
|
{
|
||||||
if (Text != null)
|
if (Text != null)
|
||||||
@@ -20,6 +32,9 @@ namespace SchnittstelleImporter.XML2006
|
|||||||
return Numerisch.ToString();
|
return Numerisch.ToString();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
/// <summary>
|
||||||
|
///
|
||||||
|
/// </summary>
|
||||||
public class RZustand
|
public class RZustand
|
||||||
{
|
{
|
||||||
decimal station;
|
decimal station;
|
||||||
@@ -35,17 +50,53 @@ namespace SchnittstelleImporter.XML2006
|
|||||||
int positionBis;
|
int positionBis;
|
||||||
string kommentar;
|
string kommentar;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
///
|
||||||
|
/// </summary>
|
||||||
public decimal Station { get => station; set => station = value; }
|
public decimal Station { get => station; set => station = value; }
|
||||||
|
/// <summary>
|
||||||
|
///
|
||||||
|
/// </summary>
|
||||||
public string Inspektionskode { get => inspektionskode; set => inspektionskode = value; }
|
public string Inspektionskode { get => inspektionskode; set => inspektionskode = value; }
|
||||||
|
/// <summary>
|
||||||
|
///
|
||||||
|
/// </summary>
|
||||||
public string Charakterisierung1 { get => charakterisierung1; set => charakterisierung1 = value; }
|
public string Charakterisierung1 { get => charakterisierung1; set => charakterisierung1 = value; }
|
||||||
|
/// <summary>
|
||||||
|
///
|
||||||
|
/// </summary>
|
||||||
public string Charakterisierung2 { get => charakterisierung2; set => charakterisierung2 = value; }
|
public string Charakterisierung2 { get => charakterisierung2; set => charakterisierung2 = value; }
|
||||||
|
/// <summary>
|
||||||
|
///
|
||||||
|
/// </summary>
|
||||||
public bool Verbindung { get => verbindung; set => verbindung = value; }
|
public bool Verbindung { get => verbindung; set => verbindung = value; }
|
||||||
|
/// <summary>
|
||||||
|
///
|
||||||
|
/// </summary>
|
||||||
public Quantifizierung Quantifizierung1 { get => quantifizierung1; set => quantifizierung1 = value; }
|
public Quantifizierung Quantifizierung1 { get => quantifizierung1; set => quantifizierung1 = value; }
|
||||||
|
/// <summary>
|
||||||
|
///
|
||||||
|
/// </summary>
|
||||||
public Quantifizierung Quantifizierung2 { get => quantifizierung2; set => quantifizierung2 = value; }
|
public Quantifizierung Quantifizierung2 { get => quantifizierung2; set => quantifizierung2 = value; }
|
||||||
|
/// <summary>
|
||||||
|
///
|
||||||
|
/// </summary>
|
||||||
public string Streckenschaden { get => streckenschaden; set => streckenschaden = value; }
|
public string Streckenschaden { get => streckenschaden; set => streckenschaden = value; }
|
||||||
|
/// <summary>
|
||||||
|
///
|
||||||
|
/// </summary>
|
||||||
public int Streckenschadennr { get => streckenschadennr; set => streckenschadennr = value; }
|
public int Streckenschadennr { get => streckenschadennr; set => streckenschadennr = value; }
|
||||||
|
/// <summary>
|
||||||
|
///
|
||||||
|
/// </summary>
|
||||||
public int PositionVon { get => positionVon; set => positionVon = value; }
|
public int PositionVon { get => positionVon; set => positionVon = value; }
|
||||||
|
/// <summary>
|
||||||
|
///
|
||||||
|
/// </summary>
|
||||||
public int PositionBis { get => positionBis; set => positionBis = value; }
|
public int PositionBis { get => positionBis; set => positionBis = value; }
|
||||||
|
/// <summary>
|
||||||
|
///
|
||||||
|
/// </summary>
|
||||||
public string Kommentar { get => kommentar; set => kommentar = value; }
|
public string Kommentar { get => kommentar; set => kommentar = value; }
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -13,6 +13,9 @@ namespace SchnittstelleImporter.XML2006
|
|||||||
/// </summary>
|
/// </summary>
|
||||||
public static class XMLParser
|
public static class XMLParser
|
||||||
{
|
{
|
||||||
|
/// <summary>
|
||||||
|
///
|
||||||
|
/// </summary>
|
||||||
public static Dictionary<InspizierteAbwassertechnischeAnlage, string> anlageInFile = new Dictionary<InspizierteAbwassertechnischeAnlage, string>();
|
public static Dictionary<InspizierteAbwassertechnischeAnlage, string> anlageInFile = new Dictionary<InspizierteAbwassertechnischeAnlage, string>();
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Gibt eine Liste an anlagen zurück von einer XML Datei.
|
/// Gibt eine Liste an anlagen zurück von einer XML Datei.
|
||||||
|
|||||||
@@ -7,12 +7,24 @@ using SanShared;
|
|||||||
|
|
||||||
namespace TempCAN
|
namespace TempCAN
|
||||||
{
|
{
|
||||||
|
/// <summary>
|
||||||
|
///
|
||||||
|
/// </summary>
|
||||||
public enum TemperaturSchnittstellen
|
public enum TemperaturSchnittstellen
|
||||||
{
|
{
|
||||||
|
/// <summary>
|
||||||
|
///
|
||||||
|
/// </summary>
|
||||||
TINKERFORGE
|
TINKERFORGE
|
||||||
}
|
}
|
||||||
|
/// <summary>
|
||||||
|
///
|
||||||
|
/// </summary>
|
||||||
public static class TemperaturBuilder
|
public static class TemperaturBuilder
|
||||||
{
|
{
|
||||||
|
/// <summary>
|
||||||
|
///
|
||||||
|
/// </summary>
|
||||||
public static ITemperature Temperatur(TemperaturSchnittstellen temperaturSchnittstellen)
|
public static ITemperature Temperatur(TemperaturSchnittstellen temperaturSchnittstellen)
|
||||||
{
|
{
|
||||||
switch(temperaturSchnittstellen)
|
switch(temperaturSchnittstellen)
|
||||||
|
|||||||
@@ -8,6 +8,9 @@ using Tinkerforge;
|
|||||||
|
|
||||||
namespace TempCAN
|
namespace TempCAN
|
||||||
{
|
{
|
||||||
|
/// <summary>
|
||||||
|
///
|
||||||
|
/// </summary>
|
||||||
public class TinkerForgeTemperatur : ITemperature
|
public class TinkerForgeTemperatur : ITemperature
|
||||||
{
|
{
|
||||||
private static string HOST = "localhost";
|
private static string HOST = "localhost";
|
||||||
@@ -16,6 +19,9 @@ namespace TempCAN
|
|||||||
double temperatur;
|
double temperatur;
|
||||||
bool erfolg = true;
|
bool erfolg = true;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
///
|
||||||
|
/// </summary>
|
||||||
public TinkerForgeTemperatur()
|
public TinkerForgeTemperatur()
|
||||||
{
|
{
|
||||||
IPConnection ipcon = new IPConnection();
|
IPConnection ipcon = new IPConnection();
|
||||||
@@ -39,6 +45,9 @@ namespace TempCAN
|
|||||||
ipcon = null;
|
ipcon = null;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
///
|
||||||
|
/// </summary>
|
||||||
public double GetTemperatur(out string message)
|
public double GetTemperatur(out string message)
|
||||||
{
|
{
|
||||||
message = "";
|
message = "";
|
||||||
|
|||||||
Reference in New Issue
Block a user