Husky/Kanalsanierungsverwaltung
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

BugFix

Browse Source 
felder Frieren nun nicht mehr ein, problem lag beim Databinding. Fand Statt im on load methode, dies führte dazu dass beim datumpicker, der noch nicht angezeigt wurde, die felder einfrieren.

Schnittstelle für Temperatur erweitert.

Beim schließen des forms, wird die Straßenliste neugebaut
This commit is contained in:
Husky
2018-06-30 11:58:42 +02:00
parent 8cf246893b
commit 322cd4c991
13 changed files with 491 additions and 364 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
SanSystem/SanSystem.csproj
View File

@@ -115,6 +115,10 @@
<Project>{c82bd650-466b-403f-bed9-2b1660771f54}</Project>
<Name>KlassenBIB</Name>
</ProjectReference>
<ProjectReference Include="..\TempCAN\TempCAN.csproj">
<Project>{e4979419-5eae-4b6d-a6a0-9632c1de87a0}</Project>
<Name>TempCAN</Name>
</ProjectReference>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
</Project>

605
SanSystem/frmObjektEdit.Designer.cs generated
View File

@@ -30,7 +30,16 @@
{
this.tabControl1 = new System.Windows.Forms.TabControl();
this.tabPage1 = new System.Windows.Forms.TabPage();
this.dateTimePicker1 = new System.Windows.Forms.DateTimePicker();
this.cb_material = new System.Windows.Forms.ComboBox();
this.cbb_wetter = new System.Windows.Forms.ComboBox();
this.label24 = new System.Windows.Forms.Label();
this.groupBox2 = new System.Windows.Forms.GroupBox();
this.txt_haltungslaenge = new System.Windows.Forms.MaskedTextBox();
this.txt_laenge_schacht = new System.Windows.Forms.MaskedTextBox();
this.label21 = new System.Windows.Forms.Label();
this.checkBox1 = new System.Windows.Forms.CheckBox();
this.label6 = new System.Windows.Forms.Label();
this.dt_haltunggemessen_datum = new System.Windows.Forms.DateTimePicker();
this.label20 = new System.Windows.Forms.Label();
this.txt_hausnummer = new System.Windows.Forms.TextBox();
this.txt_strasse = new System.Windows.Forms.TextBox();
@@ -40,13 +49,18 @@
this.txt_punkt_bis = new System.Windows.Forms.TextBox();
this.txt_punkt_von = new System.Windows.Forms.TextBox();
this.txt_pro_nr = new System.Windows.Forms.TextBox();
this.label6 = new System.Windows.Forms.Label();
this.label5 = new System.Windows.Forms.Label();
this.label4 = new System.Windows.Forms.Label();
this.label3 = new System.Windows.Forms.Label();
this.label2 = new System.Windows.Forms.Label();
this.label1 = new System.Windows.Forms.Label();
this.tabPage2 = new System.Windows.Forms.TabPage();
this.groupBox3 = new System.Windows.Forms.GroupBox();
this.btn_get_temp = new System.Windows.Forms.Button();
this.txt_temp_kanal = new System.Windows.Forms.TextBox();
this.txt_temp_aussen = new System.Windows.Forms.TextBox();
this.label23 = new System.Windows.Forms.Label();
this.label22 = new System.Windows.Forms.Label();
this.label8 = new System.Windows.Forms.Label();
this.label7 = new System.Windows.Forms.Label();
this.cb_lb_vorbereitung = new System.Windows.Forms.CheckedListBox();
@@ -54,7 +68,16 @@
this.cb_wasserhaltung = new System.Windows.Forms.CheckBox();
this.cb_genehmigung = new System.Windows.Forms.CheckBox();
this.tabPage3 = new System.Windows.Forms.TabPage();
this.txt_liner = new System.Windows.Forms.TextBox();
this.txt_harzbedarf = new System.Windows.Forms.TextBox();
this.txt_harz = new System.Windows.Forms.TextBox();
this.txt_charge_liner = new System.Windows.Forms.TextBox();
this.txt_charge_harz = new System.Windows.Forms.TextBox();
this.groupBox1 = new System.Windows.Forms.GroupBox();
this.dt_kalibrierdatum = new System.Windows.Forms.DateTimePicker();
this.txt_vakuum = new System.Windows.Forms.TextBox();
this.txt_temp_harz = new System.Windows.Forms.TextBox();
this.txt_walze_distance = new System.Windows.Forms.TextBox();
this.label17 = new System.Windows.Forms.Label();
this.label14 = new System.Windows.Forms.Label();
this.label16 = new System.Windows.Forms.Label();
@@ -64,36 +87,13 @@
this.label11 = new System.Windows.Forms.Label();
this.label10 = new System.Windows.Forms.Label();
this.label9 = new System.Windows.Forms.Label();
this.txt_walze_distance = new System.Windows.Forms.TextBox();
this.txt_temp_harz = new System.Windows.Forms.TextBox();
this.txt_vakuum = new System.Windows.Forms.TextBox();
this.dt_kalibrierdatum = new System.Windows.Forms.DateTimePicker();
this.txt_charge_harz = new System.Windows.Forms.TextBox();
this.txt_charge_liner = new System.Windows.Forms.TextBox();
this.txt_harz = new System.Windows.Forms.TextBox();
this.txt_harzbedarf = new System.Windows.Forms.TextBox();
this.txt_liner = new System.Windows.Forms.TextBox();
this.checkBox1 = new System.Windows.Forms.CheckBox();
this.groupBox2 = new System.Windows.Forms.GroupBox();
this.label21 = new System.Windows.Forms.Label();
this.txt_laenge_schacht = new System.Windows.Forms.MaskedTextBox();
this.txt_haltungslaenge = new System.Windows.Forms.MaskedTextBox();
this.groupBox3 = new System.Windows.Forms.GroupBox();
this.label22 = new System.Windows.Forms.Label();
this.label23 = new System.Windows.Forms.Label();
this.txt_temp_aussen = new System.Windows.Forms.TextBox();
this.txt_temp_kanal = new System.Windows.Forms.TextBox();
this.btn_get_temp = new System.Windows.Forms.Button();
this.label24 = new System.Windows.Forms.Label();
this.cbb_wetter = new System.Windows.Forms.ComboBox();
this.cb_material = new System.Windows.Forms.ComboBox();
this.tabControl1.SuspendLayout();
this.tabPage1.SuspendLayout();
this.groupBox2.SuspendLayout();
this.tabPage2.SuspendLayout();
this.groupBox3.SuspendLayout();
this.tabPage3.SuspendLayout();
this.groupBox1.SuspendLayout();
this.groupBox2.SuspendLayout();
this.groupBox3.SuspendLayout();
this.SuspendLayout();
//
// tabControl1
@@ -107,6 +107,7 @@
this.tabControl1.SelectedIndex = 0;
this.tabControl1.Size = new System.Drawing.Size(1101, 612);
this.tabControl1.TabIndex = 0;
this.tabControl1.SelectedIndexChanged += new System.EventHandler(this.tabControl1_SelectedIndexChanged);
//
// tabPage1
//
@@ -114,7 +115,7 @@
this.tabPage1.Controls.Add(this.cbb_wetter);
this.tabPage1.Controls.Add(this.label24);
this.tabPage1.Controls.Add(this.groupBox2);
this.tabPage1.Controls.Add(this.dateTimePicker1);
this.tabPage1.Controls.Add(this.dt_haltunggemessen_datum);
this.tabPage1.Controls.Add(this.label20);
this.tabPage1.Controls.Add(this.txt_hausnummer);
this.tabPage1.Controls.Add(this.txt_strasse);
@@ -139,14 +140,140 @@
this.tabPage1.Text = "Grunddaten";
this.tabPage1.UseVisualStyleBackColor = true;
//
// dateTimePicker1
// cb_material
//
this.dateTimePicker1.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.dateTimePicker1.Location = new System.Drawing.Point(254, 276);
this.dateTimePicker1.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.dateTimePicker1.Name = "dateTimePicker1";
this.dateTimePicker1.Size = new System.Drawing.Size(288, 26);
this.dateTimePicker1.TabIndex = 17;
this.cb_material.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.cb_material.FormattingEnabled = true;
this.cb_material.Items.AddRange(new object[] {
"Asbestzement",
"Beton",
"Betonsegment",
"Duktiles Gusseisen",
"Edelstahl",
"Faserzement",
"Glasfaserverstärkter Kunststoff",
"Grauguss",
"Mauerwerk",
"Nichtidenfizierter Kunststoff",
"Nichtidentifizierter Werkstoff",
"Nichtidentifiziertes Eisen und Stahl",
"Ortbeton",
"Pflaster",
"Polyesterharz",
"Polyesterharzbeton",
"Polyethylen",
"Polyethylen hoher Dichte",
"Polymerbeton",
"Polymermodifizierter Zementbeton",
"Polypropylen",
"Polyvinylchlorid ",
"Polyvinylchlorid hart",
"Porosit",
"Rasen",
"Spannbeton",
"Spritzbeton",
"Stahl",
"Stahlbeton",
"Stahlfaserbeton",
"Steinzeug",
"unbefestigt, anstehender Boden",
"unterschiedliche Werkstoffe",
"Ziegelwerk"});
this.cb_material.Location = new System.Drawing.Point(192, 225);
this.cb_material.Name = "cb_material";
this.cb_material.Size = new System.Drawing.Size(323, 28);
this.cb_material.TabIndex = 24;
//
// cbb_wetter
//
this.cbb_wetter.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.cbb_wetter.FormattingEnabled = true;
this.cbb_wetter.Location = new System.Drawing.Point(758, 154);
this.cbb_wetter.Name = "cbb_wetter";
this.cbb_wetter.Size = new System.Drawing.Size(282, 28);
this.cbb_wetter.TabIndex = 23;
//
// label24
//
this.label24.AutoSize = true;
this.label24.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.label24.Location = new System.Drawing.Point(561, 157);
this.label24.Name = "label24";
this.label24.Size = new System.Drawing.Size(57, 20);
this.label24.TabIndex = 22;
this.label24.Text = "Wetter";
//
// groupBox2
//
this.groupBox2.Controls.Add(this.txt_haltungslaenge);
this.groupBox2.Controls.Add(this.txt_laenge_schacht);
this.groupBox2.Controls.Add(this.label21);
this.groupBox2.Controls.Add(this.checkBox1);
this.groupBox2.Controls.Add(this.label6);
this.groupBox2.Location = new System.Drawing.Point(13, 340);
this.groupBox2.Name = "groupBox2";
this.groupBox2.Size = new System.Drawing.Size(375, 203);
this.groupBox2.TabIndex = 21;
this.groupBox2.TabStop = false;
this.groupBox2.Text = "groupBox2";
//
// txt_haltungslaenge
//
this.txt_haltungslaenge.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.txt_haltungslaenge.Location = new System.Drawing.Point(188, 21);
this.txt_haltungslaenge.Name = "txt_haltungslaenge";
this.txt_haltungslaenge.Size = new System.Drawing.Size(136, 26);
this.txt_haltungslaenge.TabIndex = 24;
//
// txt_laenge_schacht
//
this.txt_laenge_schacht.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.txt_laenge_schacht.Location = new System.Drawing.Point(188, 112);
this.txt_laenge_schacht.Name = "txt_laenge_schacht";
this.txt_laenge_schacht.Size = new System.Drawing.Size(136, 26);
this.txt_laenge_schacht.TabIndex = 23;
//
// label21
//
this.label21.AutoSize = true;
this.label21.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.label21.Location = new System.Drawing.Point(6, 114);
this.label21.Name = "label21";
this.label21.Size = new System.Drawing.Size(107, 20);
this.label21.TabIndex = 21;
this.label21.Text = "Schachtlänge";
//
// checkBox1
//
this.checkBox1.AutoSize = true;
this.checkBox1.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.checkBox1.Location = new System.Drawing.Point(9, 75);
this.checkBox1.Name = "checkBox1";
this.checkBox1.Size = new System.Drawing.Size(172, 24);
this.checkBox1.TabIndex = 20;
this.checkBox1.Text = "Geschlossene Ende";
this.checkBox1.UseVisualStyleBackColor = true;
//
// label6
//
this.label6.AutoSize = true;
this.label6.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.label6.Location = new System.Drawing.Point(5, 26);
this.label6.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label6.Name = "label6";
this.label6.Size = new System.Drawing.Size(112, 20);
this.label6.TabIndex = 5;
this.label6.Text = "Haltungslänge";
//
// dt_haltunggemessen_datum
//
this.dt_haltunggemessen_datum.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.dt_haltunggemessen_datum.Location = new System.Drawing.Point(236, 276);
this.dt_haltunggemessen_datum.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.dt_haltunggemessen_datum.Name = "dt_haltunggemessen_datum";
this.dt_haltunggemessen_datum.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.dt_haltunggemessen_datum.Size = new System.Drawing.Size(288, 26);
this.dt_haltunggemessen_datum.TabIndex = 17;
//
// label20
//
@@ -235,17 +362,6 @@
this.txt_pro_nr.Size = new System.Drawing.Size(330, 26);
this.txt_pro_nr.TabIndex = 6;
//
// label6
//
this.label6.AutoSize = true;
this.label6.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.label6.Location = new System.Drawing.Point(5, 26);
this.label6.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label6.Name = "label6";
this.label6.Size = new System.Drawing.Size(112, 20);
this.label6.TabIndex = 5;
this.label6.Text = "Haltungslänge";
//
// label5
//
this.label5.AutoSize = true;
@@ -319,6 +435,62 @@
this.tabPage2.Text = "Vorraussetzungen";
this.tabPage2.UseVisualStyleBackColor = true;
//
// groupBox3
//
this.groupBox3.Controls.Add(this.btn_get_temp);
this.groupBox3.Controls.Add(this.txt_temp_kanal);
this.groupBox3.Controls.Add(this.txt_temp_aussen);
this.groupBox3.Controls.Add(this.label23);
this.groupBox3.Controls.Add(this.label22);
this.groupBox3.Location = new System.Drawing.Point(396, 23);
this.groupBox3.Name = "groupBox3";
this.groupBox3.Size = new System.Drawing.Size(485, 131);
this.groupBox3.TabIndex = 7;
this.groupBox3.TabStop = false;
this.groupBox3.Text = "groupBox3";
//
// btn_get_temp
//
this.btn_get_temp.Location = new System.Drawing.Point(236, 29);
this.btn_get_temp.Name = "btn_get_temp";
this.btn_get_temp.Size = new System.Drawing.Size(174, 36);
this.btn_get_temp.TabIndex = 4;
this.btn_get_temp.Text = "Von Anlage holen";
this.btn_get_temp.UseVisualStyleBackColor = true;
this.btn_get_temp.Click += new System.EventHandler(this.btn_get_temp_Click);
//
// txt_temp_kanal
//
this.txt_temp_kanal.Location = new System.Drawing.Point(114, 77);
this.txt_temp_kanal.Name = "txt_temp_kanal";
this.txt_temp_kanal.Size = new System.Drawing.Size(100, 26);
this.txt_temp_kanal.TabIndex = 3;
//
// txt_temp_aussen
//
this.txt_temp_aussen.Location = new System.Drawing.Point(114, 34);
this.txt_temp_aussen.Name = "txt_temp_aussen";
this.txt_temp_aussen.Size = new System.Drawing.Size(100, 26);
this.txt_temp_aussen.TabIndex = 2;
//
// label23
//
this.label23.AutoSize = true;
this.label23.Location = new System.Drawing.Point(15, 80);
this.label23.Name = "label23";
this.label23.Size = new System.Drawing.Size(49, 20);
this.label23.TabIndex = 1;
this.label23.Text = "Kanal";
//
// label22
//
this.label22.AutoSize = true;
this.label22.Location = new System.Drawing.Point(15, 34);
this.label22.Name = "label22";
this.label22.Size = new System.Drawing.Size(63, 20);
this.label22.TabIndex = 0;
this.label22.Text = "Aussen";
//
// label8
//
this.label8.AutoSize = true;
@@ -413,6 +585,51 @@
this.tabPage3.Text = "LinerGrundlagen";
this.tabPage3.UseVisualStyleBackColor = true;
//
// txt_liner
//
this.txt_liner.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.txt_liner.Location = new System.Drawing.Point(162, 148);
this.txt_liner.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.txt_liner.Name = "txt_liner";
this.txt_liner.Size = new System.Drawing.Size(148, 26);
this.txt_liner.TabIndex = 14;
//
// txt_harzbedarf
//
this.txt_harzbedarf.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.txt_harzbedarf.Location = new System.Drawing.Point(162, 97);
this.txt_harzbedarf.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.txt_harzbedarf.Name = "txt_harzbedarf";
this.txt_harzbedarf.Size = new System.Drawing.Size(148, 26);
this.txt_harzbedarf.TabIndex = 13;
//
// txt_harz
//
this.txt_harz.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.txt_harz.Location = new System.Drawing.Point(162, 43);
this.txt_harz.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.txt_harz.Name = "txt_harz";
this.txt_harz.Size = new System.Drawing.Size(148, 26);
this.txt_harz.TabIndex = 12;
//
// txt_charge_liner
//
this.txt_charge_liner.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.txt_charge_liner.Location = new System.Drawing.Point(558, 148);
this.txt_charge_liner.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.txt_charge_liner.Name = "txt_charge_liner";
this.txt_charge_liner.Size = new System.Drawing.Size(300, 26);
this.txt_charge_liner.TabIndex = 11;
//
// txt_charge_harz
//
this.txt_charge_harz.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.txt_charge_harz.Location = new System.Drawing.Point(558, 46);
this.txt_charge_harz.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.txt_charge_harz.Name = "txt_charge_harz";
this.txt_charge_harz.Size = new System.Drawing.Size(300, 26);
this.txt_charge_harz.TabIndex = 10;
//
// groupBox1
//
this.groupBox1.Controls.Add(this.dt_kalibrierdatum);
@@ -433,6 +650,42 @@
this.groupBox1.TabStop = false;
this.groupBox1.Text = "Kalibrierung";
//
// dt_kalibrierdatum
//
this.dt_kalibrierdatum.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.dt_kalibrierdatum.Location = new System.Drawing.Point(212, 48);
this.dt_kalibrierdatum.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.dt_kalibrierdatum.Name = "dt_kalibrierdatum";
this.dt_kalibrierdatum.Size = new System.Drawing.Size(283, 26);
this.dt_kalibrierdatum.TabIndex = 12;
//
// txt_vakuum
//
this.txt_vakuum.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.txt_vakuum.Location = new System.Drawing.Point(518, 118);
this.txt_vakuum.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.txt_vakuum.Name = "txt_vakuum";
this.txt_vakuum.Size = new System.Drawing.Size(148, 26);
this.txt_vakuum.TabIndex = 11;
//
// txt_temp_harz
//
this.txt_temp_harz.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.txt_temp_harz.Location = new System.Drawing.Point(212, 232);
this.txt_temp_harz.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.txt_temp_harz.Name = "txt_temp_harz";
this.txt_temp_harz.Size = new System.Drawing.Size(148, 26);
this.txt_temp_harz.TabIndex = 10;
//
// txt_walze_distance
//
this.txt_walze_distance.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.txt_walze_distance.Location = new System.Drawing.Point(212, 118);
this.txt_walze_distance.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.txt_walze_distance.Name = "txt_walze_distance";
this.txt_walze_distance.Size = new System.Drawing.Size(148, 26);
this.txt_walze_distance.TabIndex = 9;
//
// label17
//
this.label17.AutoSize = true;
@@ -532,256 +785,6 @@
this.label9.TabIndex = 0;
this.label9.Text = "Harz";
//
// txt_walze_distance
//
this.txt_walze_distance.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.txt_walze_distance.Location = new System.Drawing.Point(212, 118);
this.txt_walze_distance.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.txt_walze_distance.Name = "txt_walze_distance";
this.txt_walze_distance.Size = new System.Drawing.Size(148, 26);
this.txt_walze_distance.TabIndex = 9;
//
// txt_temp_harz
//
this.txt_temp_harz.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.txt_temp_harz.Location = new System.Drawing.Point(212, 232);
this.txt_temp_harz.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.txt_temp_harz.Name = "txt_temp_harz";
this.txt_temp_harz.Size = new System.Drawing.Size(148, 26);
this.txt_temp_harz.TabIndex = 10;
//
// txt_vakuum
//
this.txt_vakuum.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.txt_vakuum.Location = new System.Drawing.Point(518, 118);
this.txt_vakuum.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.txt_vakuum.Name = "txt_vakuum";
this.txt_vakuum.Size = new System.Drawing.Size(148, 26);
this.txt_vakuum.TabIndex = 11;
//
// dt_kalibrierdatum
//
this.dt_kalibrierdatum.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.dt_kalibrierdatum.Location = new System.Drawing.Point(212, 48);
this.dt_kalibrierdatum.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.dt_kalibrierdatum.Name = "dt_kalibrierdatum";
this.dt_kalibrierdatum.Size = new System.Drawing.Size(283, 26);
this.dt_kalibrierdatum.TabIndex = 12;
//
// txt_charge_harz
//
this.txt_charge_harz.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.txt_charge_harz.Location = new System.Drawing.Point(558, 46);
this.txt_charge_harz.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.txt_charge_harz.Name = "txt_charge_harz";
this.txt_charge_harz.Size = new System.Drawing.Size(300, 26);
this.txt_charge_harz.TabIndex = 10;
//
// txt_charge_liner
//
this.txt_charge_liner.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.txt_charge_liner.Location = new System.Drawing.Point(558, 148);
this.txt_charge_liner.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.txt_charge_liner.Name = "txt_charge_liner";
this.txt_charge_liner.Size = new System.Drawing.Size(300, 26);
this.txt_charge_liner.TabIndex = 11;
//
// txt_harz
//
this.txt_harz.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.txt_harz.Location = new System.Drawing.Point(162, 43);
this.txt_harz.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.txt_harz.Name = "txt_harz";
this.txt_harz.Size = new System.Drawing.Size(148, 26);
this.txt_harz.TabIndex = 12;
//
// txt_harzbedarf
//
this.txt_harzbedarf.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.txt_harzbedarf.Location = new System.Drawing.Point(162, 97);
this.txt_harzbedarf.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.txt_harzbedarf.Name = "txt_harzbedarf";
this.txt_harzbedarf.Size = new System.Drawing.Size(148, 26);
this.txt_harzbedarf.TabIndex = 13;
//
// txt_liner
//
this.txt_liner.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.txt_liner.Location = new System.Drawing.Point(162, 148);
this.txt_liner.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.txt_liner.Name = "txt_liner";
this.txt_liner.Size = new System.Drawing.Size(148, 26);
this.txt_liner.TabIndex = 14;
//
// checkBox1
//
this.checkBox1.AutoSize = true;
this.checkBox1.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.checkBox1.Location = new System.Drawing.Point(9, 75);
this.checkBox1.Name = "checkBox1";
this.checkBox1.Size = new System.Drawing.Size(172, 24);
this.checkBox1.TabIndex = 20;
this.checkBox1.Text = "Geschlossene Ende";
this.checkBox1.UseVisualStyleBackColor = true;
//
// groupBox2
//
this.groupBox2.Controls.Add(this.txt_haltungslaenge);
this.groupBox2.Controls.Add(this.txt_laenge_schacht);
this.groupBox2.Controls.Add(this.label21);
this.groupBox2.Controls.Add(this.checkBox1);
this.groupBox2.Controls.Add(this.label6);
this.groupBox2.Location = new System.Drawing.Point(13, 340);
this.groupBox2.Name = "groupBox2";
this.groupBox2.Size = new System.Drawing.Size(375, 203);
this.groupBox2.TabIndex = 21;
this.groupBox2.TabStop = false;
this.groupBox2.Text = "groupBox2";
//
// label21
//
this.label21.AutoSize = true;
this.label21.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.label21.Location = new System.Drawing.Point(6, 114);
this.label21.Name = "label21";
this.label21.Size = new System.Drawing.Size(107, 20);
this.label21.TabIndex = 21;
this.label21.Text = "Schachtlänge";
//
// txt_laenge_schacht
//
this.txt_laenge_schacht.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.txt_laenge_schacht.Location = new System.Drawing.Point(188, 112);
this.txt_laenge_schacht.Name = "txt_laenge_schacht";
this.txt_laenge_schacht.Size = new System.Drawing.Size(136, 26);
this.txt_laenge_schacht.TabIndex = 23;
//
// txt_haltungslaenge
//
this.txt_haltungslaenge.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.txt_haltungslaenge.Location = new System.Drawing.Point(188, 21);
this.txt_haltungslaenge.Name = "txt_haltungslaenge";
this.txt_haltungslaenge.Size = new System.Drawing.Size(136, 26);
this.txt_haltungslaenge.TabIndex = 24;
//
// groupBox3
//
this.groupBox3.Controls.Add(this.btn_get_temp);
this.groupBox3.Controls.Add(this.txt_temp_kanal);
this.groupBox3.Controls.Add(this.txt_temp_aussen);
this.groupBox3.Controls.Add(this.label23);
this.groupBox3.Controls.Add(this.label22);
this.groupBox3.Location = new System.Drawing.Point(396, 23);
this.groupBox3.Name = "groupBox3";
this.groupBox3.Size = new System.Drawing.Size(485, 131);
this.groupBox3.TabIndex = 7;
this.groupBox3.TabStop = false;
this.groupBox3.Text = "groupBox3";
//
// label22
//
this.label22.AutoSize = true;
this.label22.Location = new System.Drawing.Point(15, 34);
this.label22.Name = "label22";
this.label22.Size = new System.Drawing.Size(63, 20);
this.label22.TabIndex = 0;
this.label22.Text = "Aussen";
//
// label23
//
this.label23.AutoSize = true;
this.label23.Location = new System.Drawing.Point(15, 80);
this.label23.Name = "label23";
this.label23.Size = new System.Drawing.Size(49, 20);
this.label23.TabIndex = 1;
this.label23.Text = "Kanal";
//
// txt_temp_aussen
//
this.txt_temp_aussen.Location = new System.Drawing.Point(114, 34);
this.txt_temp_aussen.Name = "txt_temp_aussen";
this.txt_temp_aussen.Size = new System.Drawing.Size(100, 26);
this.txt_temp_aussen.TabIndex = 2;
//
// txt_temp_kanal
//
this.txt_temp_kanal.Location = new System.Drawing.Point(114, 77);
this.txt_temp_kanal.Name = "txt_temp_kanal";
this.txt_temp_kanal.Size = new System.Drawing.Size(100, 26);
this.txt_temp_kanal.TabIndex = 3;
//
// btn_get_temp
//
this.btn_get_temp.Location = new System.Drawing.Point(236, 29);
this.btn_get_temp.Name = "btn_get_temp";
this.btn_get_temp.Size = new System.Drawing.Size(174, 36);
this.btn_get_temp.TabIndex = 4;
this.btn_get_temp.Text = "Von Anlage holen";
this.btn_get_temp.UseVisualStyleBackColor = true;
//
// label24
//
this.label24.AutoSize = true;
this.label24.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.label24.Location = new System.Drawing.Point(561, 157);
this.label24.Name = "label24";
this.label24.Size = new System.Drawing.Size(57, 20);
this.label24.TabIndex = 22;
this.label24.Text = "Wetter";
//
// cbb_wetter
//
this.cbb_wetter.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.cbb_wetter.FormattingEnabled = true;
this.cbb_wetter.Location = new System.Drawing.Point(758, 154);
this.cbb_wetter.Name = "cbb_wetter";
this.cbb_wetter.Size = new System.Drawing.Size(282, 28);
this.cbb_wetter.TabIndex = 23;
//
// cb_material
//
this.cb_material.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.cb_material.FormattingEnabled = true;
this.cb_material.Items.AddRange(new object[] {
"Asbestzement",
"Beton",
"Betonsegment",
"Duktiles Gusseisen",
"Edelstahl",
"Faserzement",
"Glasfaserverstärkter Kunststoff",
"Grauguss",
"Mauerwerk",
"Nichtidenfizierter Kunststoff",
"Nichtidentifizierter Werkstoff",
"Nichtidentifiziertes Eisen und Stahl",
"Ortbeton",
"Pflaster",
"Polyesterharz",
"Polyesterharzbeton",
"Polyethylen",
"Polyethylen hoher Dichte",
"Polymerbeton",
"Polymermodifizierter Zementbeton",
"Polypropylen",
"Polyvinylchlorid ",
"Polyvinylchlorid hart",
"Porosit",
"Rasen",
"Spannbeton",
"Spritzbeton",
"Stahl",
"Stahlbeton",
"Stahlfaserbeton",
"Steinzeug",
"unbefestigt, anstehender Boden",
"unterschiedliche Werkstoffe",
"Ziegelwerk"});
this.cb_material.Location = new System.Drawing.Point(192, 225);
this.cb_material.Name = "cb_material";
this.cb_material.Size = new System.Drawing.Size(323, 28);
this.cb_material.TabIndex = 24;
//
// frmObjektEdit
//
this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 20F);
@@ -796,16 +799,16 @@
this.tabControl1.ResumeLayout(false);
this.tabPage1.ResumeLayout(false);
this.tabPage1.PerformLayout();
this.groupBox2.ResumeLayout(false);
this.groupBox2.PerformLayout();
this.tabPage2.ResumeLayout(false);
this.tabPage2.PerformLayout();
this.groupBox3.ResumeLayout(false);
this.groupBox3.PerformLayout();
this.tabPage3.ResumeLayout(false);
this.tabPage3.PerformLayout();
this.groupBox1.ResumeLayout(false);
this.groupBox1.PerformLayout();
this.groupBox2.ResumeLayout(false);
this.groupBox2.PerformLayout();
this.groupBox3.ResumeLayout(false);
this.groupBox3.PerformLayout();
this.ResumeLayout(false);
}
@@ -846,7 +849,7 @@
private System.Windows.Forms.Label label19;
private System.Windows.Forms.TextBox txt_hausnummer;
private System.Windows.Forms.TextBox txt_strasse;
private System.Windows.Forms.DateTimePicker dateTimePicker1;
private System.Windows.Forms.DateTimePicker dt_haltunggemessen_datum;
private System.Windows.Forms.Label label20;
private System.Windows.Forms.TextBox txt_liner;
private System.Windows.Forms.TextBox txt_harzbedarf;

69
SanSystem/frmObjektEdit.cs
View File

@@ -11,6 +11,12 @@ using System.Windows.Forms;
namespace SanSystem
{
enum TabPages
{
GRUNDDATEN = 0,
VORRAUSSETZUNGEN,
LINERGRUNDLAGEN
}
public partial class frmObjektEdit : Form
{
Inspektionsobjekt inspektionsobjekt = null;
@@ -21,34 +27,67 @@ namespace SanSystem
this.inspektionsobjekt = inspektion;
if (inspektion.Sanierung == null) inspektion.Sanierung = new InlinerSanierung();
this.inliner = (InlinerSanierung)inspektion.Sanierung;
//if (inliner == null) inliner = new InlinerSanierung();
}
private void frmObjektEdit_Load(object sender, EventArgs e)
{
txt_punkt_von.DataBindings.Add(new Binding("Text", inspektionsobjekt, "VonPunkt"));
txt_punkt_bis.DataBindings.Add(new Binding("Text", inspektionsobjekt, "BisPunkt"));
txt_strasse.DataBindings.Add(new Binding("Text", inspektionsobjekt, "StrasseName"));
txt_hausnummer.DataBindings.Add(new Binding("Text", inspektionsobjekt, "Hausnummer"));
cb_material.DataBindings.Add(new Binding("Text", inspektionsobjekt, "RohrMaterial"));
txt_haltungslaenge.DataBindings.Add(new Binding("Text", inspektionsobjekt, "Haltungslaenge"));
txt_dn.DataBindings.Add(new Binding("Text", inspektionsobjekt, "Kanalrohrweite"));
txt_temp_aussen.DataBindings.Add(new Binding("Text", inspektionsobjekt.Sanierung, "TempAusen"));
txt_temp_kanal.DataBindings.Add(new Binding("Text", inspektionsobjekt.Sanierung, "tempKanal"));
txt_pro_nr.DataBindings.Add(new Binding("Text", inspektionsobjekt, "ProjektNummer"));
cb_genehmigung.DataBindings.Add(new Binding("Checked", inspektionsobjekt.Sanierung, "genehmigungVorhanden"));
cb_stvo.DataBindings.Add(new Binding("Checked", inspektionsobjekt.Sanierung, "sTVOAbsicherung"));
cb_wasserhaltung.DataBindings.Add(new Binding("Checked", inspektionsobjekt.Sanierung, "wasserhaltungEingerichtet"));
dt_haltunggemessen_datum.DataBindings.Add(new Binding("Value", inspektionsobjekt, "HaltungGemessen"));
}
private void tabControl1_SelectedIndexChanged(object sender, EventArgs e)
{
TabControl tb = (TabControl)sender;
if (tb == null) return;
switch(tb.SelectedIndex)
{
case (int)TabPages.VORRAUSSETZUNGEN:
cb_genehmigung.DataBindings.Clear();
cb_stvo.DataBindings.Clear();
cb_wasserhaltung.DataBindings.Clear();
txt_temp_aussen.DataBindings.Clear();
txt_temp_kanal.DataBindings.Clear();
cb_genehmigung.DataBindings.Add(new Binding("Checked", inspektionsobjekt.Sanierung, "genehmigungVorhanden"));
cb_stvo.DataBindings.Add(new Binding("Checked", inspektionsobjekt.Sanierung, "sTVOAbsicherung"));
cb_wasserhaltung.DataBindings.Add(new Binding("Checked", inspektionsobjekt.Sanierung, "wasserhaltungEingerichtet"));
txt_temp_aussen.DataBindings.Add(new Binding("Text", inspektionsobjekt.Sanierung, "TempAusen",false, DataSourceUpdateMode.OnPropertyChanged));
txt_temp_kanal.DataBindings.Add(new Binding("Text", inspektionsobjekt.Sanierung, "TempKanal"));
break;
case (int)TabPages.LINERGRUNDLAGEN:
txt_walze_distance.DataBindings.Clear();
txt_vakuum.DataBindings.Clear();
txt_temp_harz.DataBindings.Clear();
txt_charge_harz.DataBindings.Clear();
txt_charge_liner.DataBindings.Clear();
dt_kalibrierdatum.DataBindings.Clear();
//
txt_walze_distance.DataBindings.Add(new Binding("Text", inspektionsobjekt.Sanierung, "KalibierWalzenAbstand"));
txt_vakuum.DataBindings.Add(new Binding("Text", inspektionsobjekt.Sanierung, "KalibrierUnterdruck"));
txt_temp_harz.DataBindings.Add(new Binding("Text", inspektionsobjekt.Sanierung, "HarzKalibrierTemperatur"));
txt_charge_harz.DataBindings.Add(new Binding("Text", inspektionsobjekt.Sanierung, "HarzChargenummer"));
txt_charge_liner.DataBindings.Add(new Binding("Text", inspektionsobjekt.Sanierung, "LinerChargenummer"));
//dt_kalibrierdatum.DataBindings.Add(new Binding("Value", inliner, "DatumKalibrierung"));
//dt_kalibrierdatum.Value = inspektionsobjekt.Sanierung.
txt_walze_distance.DataBindings.Add(new Binding("Text", inspektionsobjekt.Sanierung, "KalibierWalzenAbstand"));
txt_vakuum.DataBindings.Add(new Binding("Text", inspektionsobjekt.Sanierung, "KalibrierUnterdruck"));
txt_temp_harz.DataBindings.Add(new Binding("Text", inspektionsobjekt.Sanierung, "HarzKalibrierTemperatur"));
txt_charge_harz.DataBindings.Add(new Binding("Text", inspektionsobjekt.Sanierung, "HarzChargenummer"));
txt_charge_liner.DataBindings.Add(new Binding("Text", inspektionsobjekt.Sanierung, "LinerChargenummer"));
dt_kalibrierdatum.DataBindings.Add(new Binding("Value", inliner, "DatumKalibrierung"));
break;
}
//throw new Exception(sender.GetType().ToString());
}
private void btn_get_temp_Click(object sender, EventArgs e)
{
TempCAN.ITemperature temperature = TempCAN.TemperaturBuilder.Temperatur(TempCAN.TemperaturSchnittstellen.TINKERFORGE);
double temperatur = temperature.GetTemperatur();
inspektionsobjekt.Sanierung.TempAusen = temperatur;
//var x = txt_temp_aussen.DataBindings;
txt_temp_aussen.Update();
}
}
}

23
SanSystem/frmStrassenList.Designer.cs generated
View File

@@ -29,7 +29,7 @@
private void InitializeComponent()
{
this.lst_strassen = new System.Windows.Forms.ListBox();
this.button1 = new System.Windows.Forms.Button();
this.btn_add = new System.Windows.Forms.Button();
this.SuspendLayout();
//
// lst_strassen
@@ -45,18 +45,17 @@
this.lst_strassen.Name = "lst_strassen";
this.lst_strassen.Size = new System.Drawing.Size(190, 484);
this.lst_strassen.TabIndex = 0;
this.lst_strassen.SelectedIndexChanged += new System.EventHandler(this.lst_strassen_SelectedIndexChanged);
this.lst_strassen.DoubleClick += new System.EventHandler(this.lst_strassen_DoubleClick);
//
// button1
// btn_add
//
this.button1.Location = new System.Drawing.Point(12, 12);
this.button1.Name = "button1";
this.button1.Size = new System.Drawing.Size(89, 42);
this.button1.TabIndex = 1;
this.button1.Text = "button1";
this.button1.UseVisualStyleBackColor = true;
this.button1.Click += new System.EventHandler(this.button1_Click);
this.btn_add.Location = new System.Drawing.Point(12, 12);
this.btn_add.Name = "btn_add";
this.btn_add.Size = new System.Drawing.Size(188, 42);
this.btn_add.TabIndex = 1;
this.btn_add.Text = "Neues Objekt hinzufügen";
this.btn_add.UseVisualStyleBackColor = true;
this.btn_add.Click += new System.EventHandler(this.btn_add_Click);
//
// frmStrassenList
//
@@ -64,7 +63,7 @@
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(212, 546);
this.ControlBox = false;
this.Controls.Add(this.button1);
this.Controls.Add(this.btn_add);
this.Controls.Add(this.lst_strassen);
this.Margin = new System.Windows.Forms.Padding(2);
this.Name = "frmStrassenList";
@@ -77,6 +76,6 @@
#endregion
private System.Windows.Forms.ListBox lst_strassen;
private System.Windows.Forms.Button button1;
private System.Windows.Forms.Button btn_add;
}
}

39
SanSystem/frmStrassenList.cs
View File

@@ -19,32 +19,31 @@ namespace SanSystem
public frmStrassenList()
{
InitializeComponent();
}
private void buildStreetList()
{
lst_strassen.DataSource = null;
List<string> strassen = Datenbank.Instance.loadedProjekt.Objekte.Select(x => x.StrasseName).Distinct().ToList();
//bs.DataSource = strassen;
lst_strassen.DataSource = strassen;
}
private void frmStrassenList_Load(object sender, EventArgs e)
{
List<string> strassen = Datenbank.Instance.loadedProjekt.Objekte.Select(x => x.StrasseName).Distinct().ToList();
//bs.DataSource = strassen;
lst_strassen.DataSource = strassen;
this.Height = this.MdiParent.Height - 120;
buildStreetList();
}
private void lst_strassen_SelectedIndexChanged(object sender, EventArgs e)
private void btn_add_Click(object sender, EventArgs e)
{
return;
}
private void button1_Click(object sender, EventArgs e)
{
//Datenbank.Instance.loadedProjekt.Objekte.Add(new KlassenBIB.Inspektionsobjekt());
//Datenbank.Instance.loadedProjekt.Adressen.Add(new KlassenBIB.Strasse() { Strassename = "Damian" });
//bs.ResetBindings(false);
KlassenBIB.Inspektionsobjekt inspektionsobjekt = new KlassenBIB.Inspektionsobjekt();
Datenbank.Instance.loadedProjekt.Objekte.Add(inspektionsobjekt);
frmObjektEdit frmObjektEdit = new frmObjektEdit(inspektionsobjekt);
frmObjektEdit.MdiParent = this.MdiParent;
frmObjektEdit.FormClosed += FrmObjekt_FormClosed;
frmObjektEdit.Show();
}
private void lst_strassen_DoubleClick(object sender, EventArgs e)
@@ -54,8 +53,14 @@ namespace SanSystem
frmObjekteList frmObjekteList = new frmObjekteList(selectedStreetName);
frmObjekteList.MdiParent = this.MdiParent;
frmObjekteList.FormClosed += FrmObjekt_FormClosed;
frmObjekteList.Show();
}
private void FrmObjekt_FormClosed(object sender, FormClosedEventArgs e)
{
buildStreetList();
}
}
}