diff --git a/KlassenBIB/Sanierung.cs b/KlassenBIB/Sanierung.cs index 5ee7291..848a657 100644 --- a/KlassenBIB/Sanierung.cs +++ b/KlassenBIB/Sanierung.cs @@ -10,8 +10,8 @@ namespace KlassenBIB { Guid guid; string projektnummer; - decimal tempAusen; - decimal tempKanal; + double tempAusen; + double tempKanal; string wetter; bool genehmigungVorhanden; bool wasserhaltungEingerichtet; @@ -23,8 +23,8 @@ namespace KlassenBIB public Guid Guid { get => guid; set => guid = value; } public string ProjektNummer { get => projektnummer; set => projektnummer = value; } - public decimal TempAusen { get => tempAusen; set => tempAusen = value; } - public decimal TempKanal { get => tempKanal; set => tempKanal = value; } + public double TempAusen { get => tempAusen; set => tempAusen = value; } + public double TempKanal { get => tempKanal; set => tempKanal = value; } public string Wetter { get => wetter; set => wetter = value; } public bool GenehmigungVorhanden { get => genehmigungVorhanden; set => genehmigungVorhanden = value; } public bool WasserhaltungEingerichtet { get => wasserhaltungEingerichtet; set => wasserhaltungEingerichtet = value; } diff --git a/SanSystem/SanSystem.csproj b/SanSystem/SanSystem.csproj index 8bf3484..52a77d1 100644 --- a/SanSystem/SanSystem.csproj +++ b/SanSystem/SanSystem.csproj @@ -71,6 +71,9 @@ + + frmObjektEdit.cs + frmObjekteList.cs diff --git a/SanSystem/frmMain.cs b/SanSystem/frmMain.cs index 6b50d00..66dd8df 100644 --- a/SanSystem/frmMain.cs +++ b/SanSystem/frmMain.cs @@ -20,6 +20,7 @@ namespace SanSystem Datenbank.Instance.LoadProjekt("projekt1.xaml"); this.Width = Screen.PrimaryScreen.WorkingArea.Width; this.Height = Screen.PrimaryScreen.WorkingArea.Height; + this.WindowState = FormWindowState.Maximized; this.StartPosition = FormStartPosition.Manual; this.Location = new Point(0, 0); } @@ -46,8 +47,8 @@ namespace SanSystem strassenList.Show(); - frmObjektEdit frmObjektEdit = new frmObjektEdit(); - frmObjektEdit.Show(); + //frmObjektEdit frmObjektEdit = new frmObjektEdit(); + //frmObjektEdit.Show(); } private void frm_main_FormClosing(object sender, FormClosingEventArgs e) diff --git a/SanSystem/frmObjektEdit.Designer.cs b/SanSystem/frmObjektEdit.Designer.cs index 25dace4..2603e46 100644 --- a/SanSystem/frmObjektEdit.Designer.cs +++ b/SanSystem/frmObjektEdit.Designer.cs @@ -30,12 +30,17 @@ { this.tabControl1 = new System.Windows.Forms.TabControl(); this.tabPage1 = new System.Windows.Forms.TabPage(); - this.textBox6 = new System.Windows.Forms.TextBox(); - this.textBox5 = new System.Windows.Forms.TextBox(); - this.textBox4 = new System.Windows.Forms.TextBox(); - this.textBox3 = new System.Windows.Forms.TextBox(); - this.textBox2 = new System.Windows.Forms.TextBox(); - this.textBox1 = new System.Windows.Forms.TextBox(); + this.dateTimePicker1 = 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(); + this.label19 = new System.Windows.Forms.Label(); + this.label18 = new System.Windows.Forms.Label(); + this.txt_material = new System.Windows.Forms.TextBox(); + this.txt_dn = new System.Windows.Forms.TextBox(); + 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(); @@ -60,11 +65,33 @@ this.label11 = new System.Windows.Forms.Label(); this.label10 = new System.Windows.Forms.Label(); this.label9 = new System.Windows.Forms.Label(); + this.textBox1 = new System.Windows.Forms.TextBox(); + this.textBox2 = new System.Windows.Forms.TextBox(); + this.textBox3 = new System.Windows.Forms.TextBox(); + this.dateTimePicker2 = 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.tabControl1.SuspendLayout(); this.tabPage1.SuspendLayout(); this.tabPage2.SuspendLayout(); this.tabPage3.SuspendLayout(); this.groupBox1.SuspendLayout(); + this.groupBox2.SuspendLayout(); + this.groupBox3.SuspendLayout(); this.SuspendLayout(); // // tabControl1 @@ -72,87 +99,153 @@ this.tabControl1.Controls.Add(this.tabPage1); this.tabControl1.Controls.Add(this.tabPage2); this.tabControl1.Controls.Add(this.tabPage3); - this.tabControl1.Location = new System.Drawing.Point(12, 12); + this.tabControl1.Location = new System.Drawing.Point(13, 14); + this.tabControl1.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.tabControl1.Name = "tabControl1"; this.tabControl1.SelectedIndex = 0; - this.tabControl1.Size = new System.Drawing.Size(776, 426); + this.tabControl1.Size = new System.Drawing.Size(1101, 612); this.tabControl1.TabIndex = 0; // // tabPage1 // - this.tabPage1.Controls.Add(this.textBox6); - this.tabPage1.Controls.Add(this.textBox5); - this.tabPage1.Controls.Add(this.textBox4); - this.tabPage1.Controls.Add(this.textBox3); - this.tabPage1.Controls.Add(this.textBox2); - this.tabPage1.Controls.Add(this.textBox1); - this.tabPage1.Controls.Add(this.label6); + this.tabPage1.Controls.Add(this.groupBox2); + this.tabPage1.Controls.Add(this.dateTimePicker1); + this.tabPage1.Controls.Add(this.label20); + this.tabPage1.Controls.Add(this.txt_hausnummer); + this.tabPage1.Controls.Add(this.txt_strasse); + this.tabPage1.Controls.Add(this.label19); + this.tabPage1.Controls.Add(this.label18); + this.tabPage1.Controls.Add(this.txt_material); + this.tabPage1.Controls.Add(this.txt_dn); + this.tabPage1.Controls.Add(this.txt_punkt_bis); + this.tabPage1.Controls.Add(this.txt_punkt_von); + this.tabPage1.Controls.Add(this.txt_pro_nr); this.tabPage1.Controls.Add(this.label5); this.tabPage1.Controls.Add(this.label4); this.tabPage1.Controls.Add(this.label3); this.tabPage1.Controls.Add(this.label2); this.tabPage1.Controls.Add(this.label1); - this.tabPage1.Location = new System.Drawing.Point(4, 22); + this.tabPage1.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.tabPage1.Location = new System.Drawing.Point(4, 29); + this.tabPage1.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.tabPage1.Name = "tabPage1"; - this.tabPage1.Padding = new System.Windows.Forms.Padding(3); - this.tabPage1.Size = new System.Drawing.Size(768, 400); + this.tabPage1.Padding = new System.Windows.Forms.Padding(4, 5, 4, 5); + this.tabPage1.Size = new System.Drawing.Size(1093, 579); this.tabPage1.TabIndex = 0; this.tabPage1.Text = "Grunddaten"; this.tabPage1.UseVisualStyleBackColor = true; // - // textBox6 + // dateTimePicker1 // - this.textBox6.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.textBox6.Location = new System.Drawing.Point(128, 179); - this.textBox6.Name = "textBox6"; - this.textBox6.Size = new System.Drawing.Size(221, 26); - this.textBox6.TabIndex = 11; + 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; // - // textBox5 + // label20 // - this.textBox5.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.textBox5.Location = new System.Drawing.Point(128, 145); - this.textBox5.Name = "textBox5"; - this.textBox5.Size = new System.Drawing.Size(221, 26); - this.textBox5.TabIndex = 10; + this.label20.AutoSize = true; + this.label20.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.label20.Location = new System.Drawing.Point(12, 281); + this.label20.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label20.Name = "label20"; + this.label20.Size = new System.Drawing.Size(216, 20); + this.label20.TabIndex = 16; + this.label20.Text = "Haltungslänge gemessen am"; // - // textBox4 + // txt_hausnummer // - this.textBox4.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.textBox4.Location = new System.Drawing.Point(128, 113); - this.textBox4.Name = "textBox4"; - this.textBox4.Size = new System.Drawing.Size(221, 26); - this.textBox4.TabIndex = 9; + this.txt_hausnummer.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.txt_hausnummer.Location = new System.Drawing.Point(758, 85); + this.txt_hausnummer.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); + this.txt_hausnummer.Name = "txt_hausnummer"; + this.txt_hausnummer.Size = new System.Drawing.Size(148, 26); + this.txt_hausnummer.TabIndex = 15; // - // textBox3 + // txt_strasse // - this.textBox3.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.textBox3.Location = new System.Drawing.Point(128, 82); - this.textBox3.Name = "textBox3"; - this.textBox3.Size = new System.Drawing.Size(221, 26); - this.textBox3.TabIndex = 8; + this.txt_strasse.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.txt_strasse.Location = new System.Drawing.Point(758, 35); + this.txt_strasse.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); + this.txt_strasse.Name = "txt_strasse"; + this.txt_strasse.Size = new System.Drawing.Size(320, 26); + this.txt_strasse.TabIndex = 14; // - // textBox2 + // label19 // - this.textBox2.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.textBox2.Location = new System.Drawing.Point(128, 52); - this.textBox2.Name = "textBox2"; - this.textBox2.Size = new System.Drawing.Size(221, 26); - this.textBox2.TabIndex = 7; + this.label19.AutoSize = true; + this.label19.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.label19.Location = new System.Drawing.Point(560, 89); + this.label19.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label19.Name = "label19"; + this.label19.Size = new System.Drawing.Size(105, 20); + this.label19.TabIndex = 13; + this.label19.Text = "Hausnummer"; // - // textBox1 + // label18 // - this.textBox1.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.textBox1.Location = new System.Drawing.Point(128, 20); - this.textBox1.Name = "textBox1"; - this.textBox1.Size = new System.Drawing.Size(221, 26); - this.textBox1.TabIndex = 6; + this.label18.AutoSize = true; + this.label18.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.label18.Location = new System.Drawing.Point(560, 40); + this.label18.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label18.Name = "label18"; + this.label18.Size = new System.Drawing.Size(64, 20); + this.label18.TabIndex = 12; + this.label18.Text = "Strasse"; + // + // txt_material + // + this.txt_material.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.txt_material.Location = new System.Drawing.Point(192, 223); + this.txt_material.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); + this.txt_material.Name = "txt_material"; + this.txt_material.Size = new System.Drawing.Size(330, 26); + this.txt_material.TabIndex = 10; + // + // txt_dn + // + this.txt_dn.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.txt_dn.Location = new System.Drawing.Point(192, 174); + this.txt_dn.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); + this.txt_dn.Name = "txt_dn"; + this.txt_dn.Size = new System.Drawing.Size(330, 26); + this.txt_dn.TabIndex = 9; + // + // txt_punkt_bis + // + this.txt_punkt_bis.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.txt_punkt_bis.Location = new System.Drawing.Point(192, 126); + this.txt_punkt_bis.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); + this.txt_punkt_bis.Name = "txt_punkt_bis"; + this.txt_punkt_bis.Size = new System.Drawing.Size(330, 26); + this.txt_punkt_bis.TabIndex = 8; + // + // txt_punkt_von + // + this.txt_punkt_von.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.txt_punkt_von.Location = new System.Drawing.Point(192, 80); + this.txt_punkt_von.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); + this.txt_punkt_von.Name = "txt_punkt_von"; + this.txt_punkt_von.Size = new System.Drawing.Size(330, 26); + this.txt_punkt_von.TabIndex = 7; + // + // txt_pro_nr + // + this.txt_pro_nr.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.txt_pro_nr.Location = new System.Drawing.Point(192, 31); + this.txt_pro_nr.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); + this.txt_pro_nr.Name = "txt_pro_nr"; + 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(6, 181); + 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; @@ -162,7 +255,8 @@ // this.label5.AutoSize = true; this.label5.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.label5.Location = new System.Drawing.Point(6, 148); + this.label5.Location = new System.Drawing.Point(9, 228); + this.label5.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label5.Name = "label5"; this.label5.Size = new System.Drawing.Size(65, 20); this.label5.TabIndex = 4; @@ -172,7 +266,8 @@ // this.label4.AutoSize = true; this.label4.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.label4.Location = new System.Drawing.Point(6, 115); + this.label4.Location = new System.Drawing.Point(9, 177); + this.label4.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label4.Name = "label4"; this.label4.Size = new System.Drawing.Size(104, 20); this.label4.TabIndex = 3; @@ -182,7 +277,8 @@ // this.label3.AutoSize = true; this.label3.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.label3.Location = new System.Drawing.Point(6, 84); + this.label3.Location = new System.Drawing.Point(9, 129); + this.label3.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label3.Name = "label3"; this.label3.Size = new System.Drawing.Size(76, 20); this.label3.TabIndex = 2; @@ -192,7 +288,8 @@ // this.label2.AutoSize = true; this.label2.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.label2.Location = new System.Drawing.Point(6, 54); + this.label2.Location = new System.Drawing.Point(9, 83); + this.label2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label2.Name = "label2"; this.label2.Size = new System.Drawing.Size(83, 20); this.label2.TabIndex = 1; @@ -202,7 +299,8 @@ // this.label1.AutoSize = true; this.label1.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.label1.Location = new System.Drawing.Point(6, 23); + this.label1.Location = new System.Drawing.Point(9, 35); + this.label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label1.Name = "label1"; this.label1.Size = new System.Drawing.Size(116, 20); this.label1.TabIndex = 0; @@ -210,16 +308,18 @@ // // tabPage2 // + this.tabPage2.Controls.Add(this.groupBox3); this.tabPage2.Controls.Add(this.label8); this.tabPage2.Controls.Add(this.label7); this.tabPage2.Controls.Add(this.cb_lb_vorbereitung); this.tabPage2.Controls.Add(this.cb_stvo); this.tabPage2.Controls.Add(this.cb_wasserhaltung); this.tabPage2.Controls.Add(this.cb_genehmigung); - this.tabPage2.Location = new System.Drawing.Point(4, 22); + this.tabPage2.Location = new System.Drawing.Point(4, 29); + this.tabPage2.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.tabPage2.Name = "tabPage2"; - this.tabPage2.Padding = new System.Windows.Forms.Padding(3); - this.tabPage2.Size = new System.Drawing.Size(768, 400); + this.tabPage2.Padding = new System.Windows.Forms.Padding(4, 5, 4, 5); + this.tabPage2.Size = new System.Drawing.Size(1093, 579); this.tabPage2.TabIndex = 1; this.tabPage2.Text = "Vorraussetzungen"; this.tabPage2.UseVisualStyleBackColor = true; @@ -228,7 +328,8 @@ // this.label8.AutoSize = true; this.label8.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.label8.Location = new System.Drawing.Point(345, 156); + this.label8.Location = new System.Drawing.Point(468, 221); + this.label8.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label8.Name = "label8"; this.label8.Size = new System.Drawing.Size(88, 20); this.label8.TabIndex = 6; @@ -238,7 +339,8 @@ // this.label7.AutoSize = true; this.label7.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.label7.Location = new System.Drawing.Point(39, 156); + this.label7.Location = new System.Drawing.Point(8, 221); + this.label7.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label7.Name = "label7"; this.label7.Size = new System.Drawing.Size(134, 20); this.label7.TabIndex = 5; @@ -252,16 +354,18 @@ "HD - Reinigung", "Mechanisch", "Roboter"}); - this.cb_lb_vorbereitung.Location = new System.Drawing.Point(179, 156); + this.cb_lb_vorbereitung.Location = new System.Drawing.Point(218, 221); + this.cb_lb_vorbereitung.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.cb_lb_vorbereitung.Name = "cb_lb_vorbereitung"; - this.cb_lb_vorbereitung.Size = new System.Drawing.Size(142, 67); + this.cb_lb_vorbereitung.Size = new System.Drawing.Size(211, 88); this.cb_lb_vorbereitung.TabIndex = 4; // // cb_stvo // this.cb_stvo.AutoSize = true; this.cb_stvo.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.cb_stvo.Location = new System.Drawing.Point(39, 97); + this.cb_stvo.Location = new System.Drawing.Point(8, 130); + this.cb_stvo.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.cb_stvo.Name = "cb_stvo"; this.cb_stvo.Size = new System.Drawing.Size(263, 24); this.cb_stvo.TabIndex = 2; @@ -272,7 +376,8 @@ // this.cb_wasserhaltung.AutoSize = true; this.cb_wasserhaltung.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.cb_wasserhaltung.Location = new System.Drawing.Point(39, 64); + this.cb_wasserhaltung.Location = new System.Drawing.Point(8, 79); + this.cb_wasserhaltung.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.cb_wasserhaltung.Name = "cb_wasserhaltung"; this.cb_wasserhaltung.Size = new System.Drawing.Size(269, 24); this.cb_wasserhaltung.TabIndex = 1; @@ -283,7 +388,8 @@ // this.cb_genehmigung.AutoSize = true; this.cb_genehmigung.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.cb_genehmigung.Location = new System.Drawing.Point(39, 27); + this.cb_genehmigung.Location = new System.Drawing.Point(8, 23); + this.cb_genehmigung.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.cb_genehmigung.Name = "cb_genehmigung"; this.cb_genehmigung.Size = new System.Drawing.Size(245, 24); this.cb_genehmigung.TabIndex = 0; @@ -292,30 +398,42 @@ // // tabPage3 // + this.tabPage3.Controls.Add(this.txt_liner); + this.tabPage3.Controls.Add(this.txt_harzbedarf); + this.tabPage3.Controls.Add(this.txt_harz); + this.tabPage3.Controls.Add(this.txt_charge_liner); + this.tabPage3.Controls.Add(this.txt_charge_harz); this.tabPage3.Controls.Add(this.groupBox1); this.tabPage3.Controls.Add(this.label13); this.tabPage3.Controls.Add(this.label12); this.tabPage3.Controls.Add(this.label11); this.tabPage3.Controls.Add(this.label10); this.tabPage3.Controls.Add(this.label9); - this.tabPage3.Location = new System.Drawing.Point(4, 22); + this.tabPage3.Location = new System.Drawing.Point(4, 29); + this.tabPage3.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.tabPage3.Name = "tabPage3"; - this.tabPage3.Padding = new System.Windows.Forms.Padding(3); - this.tabPage3.Size = new System.Drawing.Size(768, 400); + this.tabPage3.Padding = new System.Windows.Forms.Padding(4, 5, 4, 5); + this.tabPage3.Size = new System.Drawing.Size(1093, 579); this.tabPage3.TabIndex = 2; this.tabPage3.Text = "LinerGrundlagen"; this.tabPage3.UseVisualStyleBackColor = true; // // groupBox1 // + this.groupBox1.Controls.Add(this.dateTimePicker2); + this.groupBox1.Controls.Add(this.textBox3); + this.groupBox1.Controls.Add(this.textBox2); + this.groupBox1.Controls.Add(this.textBox1); this.groupBox1.Controls.Add(this.label17); this.groupBox1.Controls.Add(this.label14); this.groupBox1.Controls.Add(this.label16); this.groupBox1.Controls.Add(this.label15); this.groupBox1.Font = new System.Drawing.Font("Microsoft Sans Serif", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.groupBox1.Location = new System.Drawing.Point(27, 148); + this.groupBox1.Location = new System.Drawing.Point(40, 228); + this.groupBox1.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.groupBox1.Name = "groupBox1"; - this.groupBox1.Size = new System.Drawing.Size(502, 213); + this.groupBox1.Padding = new System.Windows.Forms.Padding(4, 5, 4, 5); + this.groupBox1.Size = new System.Drawing.Size(753, 328); this.groupBox1.TabIndex = 9; this.groupBox1.TabStop = false; this.groupBox1.Text = "Kalibrierung"; @@ -324,7 +442,8 @@ // this.label17.AutoSize = true; this.label17.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.label17.Location = new System.Drawing.Point(229, 88); + this.label17.Location = new System.Drawing.Point(406, 123); + this.label17.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label17.Name = "label17"; this.label17.Size = new System.Drawing.Size(68, 20); this.label17.TabIndex = 8; @@ -334,7 +453,8 @@ // this.label14.AutoSize = true; this.label14.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.label14.Location = new System.Drawing.Point(6, 153); + this.label14.Location = new System.Drawing.Point(9, 235); + this.label14.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label14.Name = "label14"; this.label14.Size = new System.Drawing.Size(129, 20); this.label14.TabIndex = 5; @@ -344,7 +464,8 @@ // this.label16.AutoSize = true; this.label16.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.label16.Location = new System.Drawing.Point(2, 80); + this.label16.Location = new System.Drawing.Point(3, 123); + this.label16.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label16.Name = "label16"; this.label16.Size = new System.Drawing.Size(127, 20); this.label16.TabIndex = 7; @@ -354,7 +475,8 @@ // this.label15.AutoSize = true; this.label15.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.label15.Location = new System.Drawing.Point(2, 31); + this.label15.Location = new System.Drawing.Point(3, 48); + this.label15.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label15.Name = "label15"; this.label15.Size = new System.Drawing.Size(166, 20); this.label15.TabIndex = 6; @@ -364,7 +486,8 @@ // this.label13.AutoSize = true; this.label13.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.label13.Location = new System.Drawing.Point(229, 100); + this.label13.Location = new System.Drawing.Point(368, 154); + this.label13.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label13.Name = "label13"; this.label13.Size = new System.Drawing.Size(126, 20); this.label13.TabIndex = 4; @@ -374,7 +497,8 @@ // this.label12.AutoSize = true; this.label12.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.label12.Location = new System.Drawing.Point(24, 100); + this.label12.Location = new System.Drawing.Point(36, 154); + this.label12.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label12.Name = "label12"; this.label12.Size = new System.Drawing.Size(44, 20); this.label12.TabIndex = 3; @@ -384,7 +508,8 @@ // this.label11.AutoSize = true; this.label11.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.label11.Location = new System.Drawing.Point(24, 65); + this.label11.Location = new System.Drawing.Point(36, 100); + this.label11.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label11.Name = "label11"; this.label11.Size = new System.Drawing.Size(110, 20); this.label11.TabIndex = 2; @@ -394,7 +519,8 @@ // this.label10.AutoSize = true; this.label10.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.label10.Location = new System.Drawing.Point(229, 30); + this.label10.Location = new System.Drawing.Point(368, 46); + this.label10.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label10.Name = "label10"; this.label10.Size = new System.Drawing.Size(126, 20); this.label10.TabIndex = 1; @@ -404,20 +530,211 @@ // this.label9.AutoSize = true; this.label9.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.label9.Location = new System.Drawing.Point(24, 30); + this.label9.Location = new System.Drawing.Point(36, 46); + this.label9.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label9.Name = "label9"; this.label9.Size = new System.Drawing.Size(43, 20); this.label9.TabIndex = 0; this.label9.Text = "Harz"; // + // textBox1 + // + this.textBox1.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.textBox1.Location = new System.Drawing.Point(212, 118); + this.textBox1.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); + this.textBox1.Name = "textBox1"; + this.textBox1.Size = new System.Drawing.Size(148, 26); + this.textBox1.TabIndex = 9; + // + // textBox2 + // + this.textBox2.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.textBox2.Location = new System.Drawing.Point(212, 231); + this.textBox2.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); + this.textBox2.Name = "textBox2"; + this.textBox2.Size = new System.Drawing.Size(148, 26); + this.textBox2.TabIndex = 10; + // + // textBox3 + // + this.textBox3.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.textBox3.Location = new System.Drawing.Point(518, 118); + this.textBox3.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); + this.textBox3.Name = "textBox3"; + this.textBox3.Size = new System.Drawing.Size(148, 26); + this.textBox3.TabIndex = 11; + // + // dateTimePicker2 + // + this.dateTimePicker2.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.dateTimePicker2.Location = new System.Drawing.Point(212, 48); + this.dateTimePicker2.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); + this.dateTimePicker2.Name = "dateTimePicker2"; + this.dateTimePicker2.Size = new System.Drawing.Size(439, 26); + this.dateTimePicker2.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(121, 24); + this.checkBox1.TabIndex = 20; + this.checkBox1.Text = "Geschlossen"; + 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(68, 20); + this.label21.TabIndex = 21; + this.label21.Text = "Schacht"; + // + // 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; + // // frmObjektEdit // - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); + this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 20F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(800, 450); + this.ClientSize = new System.Drawing.Size(1131, 701); this.Controls.Add(this.tabControl1); + this.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.Name = "frmObjektEdit"; this.Text = "FrmObjektEdit"; + this.Load += new System.EventHandler(this.frmObjektEdit_Load); this.tabControl1.ResumeLayout(false); this.tabPage1.ResumeLayout(false); this.tabPage1.PerformLayout(); @@ -427,6 +744,10 @@ 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); } @@ -442,12 +763,11 @@ private System.Windows.Forms.Label label3; private System.Windows.Forms.Label label2; private System.Windows.Forms.Label label1; - private System.Windows.Forms.TextBox textBox6; - private System.Windows.Forms.TextBox textBox5; - private System.Windows.Forms.TextBox textBox4; - private System.Windows.Forms.TextBox textBox3; - private System.Windows.Forms.TextBox textBox2; - private System.Windows.Forms.TextBox textBox1; + private System.Windows.Forms.TextBox txt_material; + private System.Windows.Forms.TextBox txt_dn; + private System.Windows.Forms.TextBox txt_punkt_bis; + private System.Windows.Forms.TextBox txt_punkt_von; + private System.Windows.Forms.TextBox txt_pro_nr; private System.Windows.Forms.CheckedListBox cb_lb_vorbereitung; private System.Windows.Forms.CheckBox cb_stvo; private System.Windows.Forms.CheckBox cb_wasserhaltung; @@ -465,5 +785,31 @@ private System.Windows.Forms.Label label11; private System.Windows.Forms.Label label10; private System.Windows.Forms.Label label9; + private System.Windows.Forms.Label label18; + 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.Label label20; + private System.Windows.Forms.TextBox txt_liner; + private System.Windows.Forms.TextBox txt_harzbedarf; + private System.Windows.Forms.TextBox txt_harz; + private System.Windows.Forms.TextBox txt_charge_liner; + private System.Windows.Forms.TextBox txt_charge_harz; + private System.Windows.Forms.DateTimePicker dateTimePicker2; + private System.Windows.Forms.TextBox textBox3; + private System.Windows.Forms.TextBox textBox2; + private System.Windows.Forms.TextBox textBox1; + private System.Windows.Forms.GroupBox groupBox2; + private System.Windows.Forms.MaskedTextBox txt_haltungslaenge; + private System.Windows.Forms.MaskedTextBox txt_laenge_schacht; + private System.Windows.Forms.Label label21; + private System.Windows.Forms.CheckBox checkBox1; + private System.Windows.Forms.GroupBox groupBox3; + private System.Windows.Forms.Button btn_get_temp; + private System.Windows.Forms.TextBox txt_temp_kanal; + private System.Windows.Forms.TextBox txt_temp_aussen; + private System.Windows.Forms.Label label23; + private System.Windows.Forms.Label label22; } } \ No newline at end of file diff --git a/SanSystem/frmObjektEdit.cs b/SanSystem/frmObjektEdit.cs index 9769ef4..fde812f 100644 --- a/SanSystem/frmObjektEdit.cs +++ b/SanSystem/frmObjektEdit.cs @@ -1,4 +1,5 @@ -using System; +using KlassenBIB; +using System; using System.Collections.Generic; using System.ComponentModel; using System.Data; @@ -12,9 +13,26 @@ namespace SanSystem { public partial class frmObjektEdit : Form { - public frmObjektEdit() + Inspektionsobjekt inspektionsobjekt = null; + public frmObjektEdit(Inspektionsobjekt inspektion) { InitializeComponent(); + this.inspektionsobjekt = inspektion; + } + + 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_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.Sanierung, "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")); } } } diff --git a/SanSystem/frmObjektEdit.resx b/SanSystem/frmObjektEdit.resx new file mode 100644 index 0000000..1af7de1 --- /dev/null +++ b/SanSystem/frmObjektEdit.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/SanSystem/frmObjekteList.Designer.cs b/SanSystem/frmObjekteList.Designer.cs index a488bfc..31e23c1 100644 --- a/SanSystem/frmObjekteList.Designer.cs +++ b/SanSystem/frmObjekteList.Designer.cs @@ -70,10 +70,12 @@ this.dGObjekte.DataSource = this.strasseBindingSource; this.dGObjekte.Location = new System.Drawing.Point(9, 133); this.dGObjekte.Margin = new System.Windows.Forms.Padding(2); + this.dGObjekte.MultiSelect = false; this.dGObjekte.Name = "dGObjekte"; this.dGObjekte.RowTemplate.Height = 24; this.dGObjekte.Size = new System.Drawing.Size(951, 238); this.dGObjekte.TabIndex = 0; + this.dGObjekte.RowHeaderMouseDoubleClick += new System.Windows.Forms.DataGridViewCellMouseEventHandler(this.dGObjekte_RowHeaderMouseDoubleClick); // // objektbezeichnungDataGridViewTextBoxColumn // diff --git a/SanSystem/frmObjekteList.cs b/SanSystem/frmObjekteList.cs index 07adc84..8c707b5 100644 --- a/SanSystem/frmObjekteList.cs +++ b/SanSystem/frmObjekteList.cs @@ -45,7 +45,7 @@ namespace SanSystem strasse.Objekte.Add(new Inspektionsobjekt() { - Objektbezeichnung = "1229292" + Objektbezeichnung = "134" }); dGObjekte.DataSource = null; dGObjekte.DataSource = strasse.Objekte; @@ -56,5 +56,27 @@ namespace SanSystem { dGObjekte.DataSource = strasse.Objekte; } + + private void dGObjekte_RowHeaderMouseDoubleClick(object sender, DataGridViewCellMouseEventArgs e) + { + DataGridView dataGridView = (DataGridView)sender; + if (dataGridView == null) return; + DataGridViewSelectedRowCollection dataGridViewRowsSelect = dataGridView.SelectedRows; + + + if (dataGridViewRowsSelect.Count > 1) return; + + DataGridViewRow dgvr = dataGridViewRowsSelect[0]; + + Inspektionsobjekt inspektionsobjekt = (Inspektionsobjekt)dgvr.DataBoundItem; + if (inspektionsobjekt == null) return; + + frmObjektEdit frmObjektEdit = new frmObjektEdit(inspektionsobjekt); + frmObjektEdit.MdiParent = this.MdiParent; + frmObjektEdit.Show(); + + + //throw new Exception(); + } } } diff --git a/SanSystem/frmStrassenList.Designer.cs b/SanSystem/frmStrassenList.Designer.cs index 97d7fbc..33f39da 100644 --- a/SanSystem/frmStrassenList.Designer.cs +++ b/SanSystem/frmStrassenList.Designer.cs @@ -34,18 +34,23 @@ // // lst_strassen // + this.lst_strassen.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) + | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.lst_strassen.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.lst_strassen.FormattingEnabled = true; - this.lst_strassen.Location = new System.Drawing.Point(7, 15); + this.lst_strassen.ItemHeight = 20; + this.lst_strassen.Location = new System.Drawing.Point(12, 59); this.lst_strassen.Margin = new System.Windows.Forms.Padding(2); this.lst_strassen.Name = "lst_strassen"; - this.lst_strassen.Size = new System.Drawing.Size(190, 277); + 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 // - this.button1.Location = new System.Drawing.Point(57, 305); + 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; @@ -57,7 +62,7 @@ // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(212, 367); + this.ClientSize = new System.Drawing.Size(212, 546); this.ControlBox = false; this.Controls.Add(this.button1); this.Controls.Add(this.lst_strassen); diff --git a/SanSystem/frmStrassenList.cs b/SanSystem/frmStrassenList.cs index 784f366..2a2a336 100644 --- a/SanSystem/frmStrassenList.cs +++ b/SanSystem/frmStrassenList.cs @@ -19,6 +19,7 @@ namespace SanSystem public frmStrassenList() { InitializeComponent(); + } private void frmStrassenList_Load(object sender, EventArgs e) @@ -27,6 +28,8 @@ namespace SanSystem lst_strassen.DataSource = bs; + this.Height = this.MdiParent.Height - 120; + } @@ -42,8 +45,8 @@ namespace SanSystem private void button1_Click(object sender, EventArgs e) { - Datenbank.Instance.loadedProjekt.Adressen.Add(new KlassenBIB.Strasse() { Strassename = "Damian" }); - bs.ResetBindings(false); + //Datenbank.Instance.loadedProjekt.Adressen.Add(new KlassenBIB.Strasse() { Strassename = "Damian" }); + //bs.ResetBindings(false); } diff --git a/TempCAN/Properties/AssemblyInfo.cs b/TempCAN/Properties/AssemblyInfo.cs new file mode 100644 index 0000000..4144f82 --- /dev/null +++ b/TempCAN/Properties/AssemblyInfo.cs @@ -0,0 +1,36 @@ +using System.Reflection; +using System.Runtime.CompilerServices; +using System.Runtime.InteropServices; + +// Allgemeine Informationen über eine Assembly werden über die folgenden +// Attribute gesteuert. Ändern Sie diese Attributwerte, um die Informationen zu ändern, +// die einer Assembly zugeordnet sind. +[assembly: AssemblyTitle("TempCAN")] +[assembly: AssemblyDescription("")] +[assembly: AssemblyConfiguration("")] +[assembly: AssemblyCompany("")] +[assembly: AssemblyProduct("TempCAN")] +[assembly: AssemblyCopyright("Copyright © 2018")] +[assembly: AssemblyTrademark("")] +[assembly: AssemblyCulture("")] + +// Durch Festlegen von ComVisible auf FALSE werden die Typen in dieser Assembly +// für COM-Komponenten unsichtbar. Wenn Sie auf einen Typ in dieser Assembly von +// COM aus zugreifen müssen, sollten Sie das ComVisible-Attribut für diesen Typ auf "True" festlegen. +[assembly: ComVisible(false)] + +// Die folgende GUID bestimmt die ID der Typbibliothek, wenn dieses Projekt für COM verfügbar gemacht wird +[assembly: Guid("e4979419-5eae-4b6d-a6a0-9632c1de87a0")] + +// Versionsinformationen für eine Assembly bestehen aus den folgenden vier Werten: +// +// Hauptversion +// Nebenversion +// Buildnummer +// Revision +// +// Sie können alle Werte angeben oder Standardwerte für die Build- und Revisionsnummern verwenden, +// indem Sie "*" wie unten gezeigt eingeben: +// [assembly: AssemblyVersion("1.0.*")] +[assembly: AssemblyVersion("1.0.0.0")] +[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/TempCAN/TempCAN.csproj b/TempCAN/TempCAN.csproj new file mode 100644 index 0000000..8273e5d --- /dev/null +++ b/TempCAN/TempCAN.csproj @@ -0,0 +1,53 @@ + + + + + Debug + AnyCPU + e4979419-5eae-4b6d-a6a0-9632c1de87a0 + Library + Properties + TempCAN + TempCAN + v4.6.1 + 512 + + + true + full + false + bin\Debug\ + DEBUG;TRACE + prompt + 4 + + + pdbonly + true + bin\Release\ + TRACE + prompt + 4 + + + + + + + + + + + + + + + + + + + + + + + diff --git a/TempCAN/Temperatur.cs b/TempCAN/Temperatur.cs new file mode 100644 index 0000000..412f253 --- /dev/null +++ b/TempCAN/Temperatur.cs @@ -0,0 +1,15 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace TempCAN +{ + public class Temperatur + { + private static string HOST = "localhost"; + private static int PORT = 4223; + + } +} diff --git a/dlls/Tinkerforge.dll b/dlls/Tinkerforge.dll new file mode 100644 index 0000000..4682e16 Binary files /dev/null and b/dlls/Tinkerforge.dll differ