diff --git a/.vs/Mip_v1/v16/.suo b/.vs/Mip_v1/v16/.suo index eb29a67..94ec709 100644 Binary files a/.vs/Mip_v1/v16/.suo and b/.vs/Mip_v1/v16/.suo differ diff --git a/Mip/frmNacenovanie.Designer.cs b/Mip/frmNacenovanie.Designer.cs index 4e3c9ba..6cb3065 100644 --- a/Mip/frmNacenovanie.Designer.cs +++ b/Mip/frmNacenovanie.Designer.cs @@ -1182,7 +1182,7 @@ this.panel1.Location = new System.Drawing.Point(0, 0); this.panel1.Margin = new System.Windows.Forms.Padding(1); this.panel1.Name = "panel1"; - this.panel1.Size = new System.Drawing.Size(1551, 130); + this.panel1.Size = new System.Drawing.Size(551, 130); this.panel1.TabIndex = 20; // // panel19 @@ -1443,7 +1443,7 @@ this.Výkres.Controls.Add(this.panel15); this.Výkres.Controls.Add(this.panel105); this.Výkres.Dock = System.Windows.Forms.DockStyle.Right; - this.Výkres.Location = new System.Drawing.Point(1551, 0); + this.Výkres.Location = new System.Drawing.Point(551, 0); this.Výkres.MaximumSize = new System.Drawing.Size(1073, 916); this.Výkres.MinimumSize = new System.Drawing.Size(23, 916); this.Výkres.Name = "Výkres"; @@ -1533,7 +1533,7 @@ // button4 // this.button4.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); - this.button4.Location = new System.Drawing.Point(1474, 31); + this.button4.Location = new System.Drawing.Point(474, 31); this.button4.Margin = new System.Windows.Forms.Padding(1); this.button4.Name = "button4"; this.button4.Size = new System.Drawing.Size(75, 23); @@ -1590,7 +1590,7 @@ this.panel17.Dock = System.Windows.Forms.DockStyle.Bottom; this.panel17.Location = new System.Drawing.Point(0, 865); this.panel17.Name = "panel17"; - this.panel17.Size = new System.Drawing.Size(1551, 56); + this.panel17.Size = new System.Drawing.Size(551, 56); this.panel17.TabIndex = 22; // // panel24 @@ -1601,7 +1601,7 @@ this.panel24.Dock = System.Windows.Forms.DockStyle.Top; this.panel24.Location = new System.Drawing.Point(0, 0); this.panel24.Name = "panel24"; - this.panel24.Size = new System.Drawing.Size(1549, 31); + this.panel24.Size = new System.Drawing.Size(549, 31); this.panel24.TabIndex = 13; // // label14 @@ -1610,7 +1610,7 @@ | System.Windows.Forms.AnchorStyles.Right))); this.label14.Location = new System.Drawing.Point(94, 1); this.label14.Name = "label14"; - this.label14.Size = new System.Drawing.Size(1000, 29); + this.label14.Size = new System.Drawing.Size(0, 29); this.label14.TabIndex = 1; this.label14.Text = "----"; // @@ -1641,7 +1641,7 @@ this.panel16.Location = new System.Drawing.Point(0, 130); this.panel16.MinimumSize = new System.Drawing.Size(551, 730); this.panel16.Name = "panel16"; - this.panel16.Size = new System.Drawing.Size(1551, 735); + this.panel16.Size = new System.Drawing.Size(551, 735); this.panel16.TabIndex = 21; // // Polotovar @@ -1653,7 +1653,7 @@ this.Polotovar.Controls.Add(this.label17); this.Polotovar.Controls.Add(this.panel10); this.Polotovar.Dock = System.Windows.Forms.DockStyle.Right; - this.Polotovar.Location = new System.Drawing.Point(351, 0); + this.Polotovar.Location = new System.Drawing.Point(411, 0); this.Polotovar.Margin = new System.Windows.Forms.Padding(1); this.Polotovar.MaximumSize = new System.Drawing.Size(324, 728); this.Polotovar.MinimumSize = new System.Drawing.Size(23, 728); @@ -2840,7 +2840,7 @@ this.Materiál.Controls.Add(this.label15); this.Materiál.Controls.Add(this.panel11); this.Materiál.Dock = System.Windows.Forms.DockStyle.Right; - this.Materiál.Location = new System.Drawing.Point(374, 0); + this.Materiál.Location = new System.Drawing.Point(434, 0); this.Materiál.Margin = new System.Windows.Forms.Padding(1); this.Materiál.MaximumSize = new System.Drawing.Size(457, 728); this.Materiál.MinimumSize = new System.Drawing.Size(23, 728); @@ -5222,12 +5222,12 @@ this.Naceňovanie.Controls.Add(this.panel77); this.Naceňovanie.Controls.Add(this.panel14); this.Naceňovanie.Dock = System.Windows.Forms.DockStyle.Right; - this.Naceňovanie.Location = new System.Drawing.Point(397, 0); + this.Naceňovanie.Location = new System.Drawing.Point(457, 0); this.Naceňovanie.Margin = new System.Windows.Forms.Padding(1); this.Naceňovanie.MaximumSize = new System.Drawing.Size(406, 728); this.Naceňovanie.MinimumSize = new System.Drawing.Size(23, 728); this.Naceňovanie.Name = "Naceňovanie"; - this.Naceňovanie.Size = new System.Drawing.Size(406, 728); + this.Naceňovanie.Size = new System.Drawing.Size(23, 728); this.Naceňovanie.TabIndex = 6; // // panel110 @@ -7045,12 +7045,12 @@ this.Vyhodnocovanie.Controls.Add(this.panel112); this.Vyhodnocovanie.Controls.Add(this.panel12); this.Vyhodnocovanie.Dock = System.Windows.Forms.DockStyle.Right; - this.Vyhodnocovanie.Location = new System.Drawing.Point(803, 0); + this.Vyhodnocovanie.Location = new System.Drawing.Point(480, 0); this.Vyhodnocovanie.Margin = new System.Windows.Forms.Padding(1); this.Vyhodnocovanie.MaximumSize = new System.Drawing.Size(700, 728); this.Vyhodnocovanie.MinimumSize = new System.Drawing.Size(23, 728); this.Vyhodnocovanie.Name = "Vyhodnocovanie"; - this.Vyhodnocovanie.Size = new System.Drawing.Size(700, 728); + this.Vyhodnocovanie.Size = new System.Drawing.Size(23, 728); this.Vyhodnocovanie.TabIndex = 4; // // panel112 @@ -8662,7 +8662,7 @@ // // button22 // - this.button22.Location = new System.Drawing.Point(427, 18); + this.button22.Location = new System.Drawing.Point(383, 2); this.button22.Name = "button22"; this.button22.Size = new System.Drawing.Size(75, 23); this.button22.TabIndex = 3; @@ -8804,7 +8804,7 @@ this.Sadzby.Controls.Add(this.panel70); this.Sadzby.Controls.Add(this.panel13); this.Sadzby.Dock = System.Windows.Forms.DockStyle.Right; - this.Sadzby.Location = new System.Drawing.Point(1503, 0); + this.Sadzby.Location = new System.Drawing.Point(503, 0); this.Sadzby.Margin = new System.Windows.Forms.Padding(1); this.Sadzby.MaximumSize = new System.Drawing.Size(350, 728); this.Sadzby.MinimumSize = new System.Drawing.Size(23, 728); @@ -9481,7 +9481,7 @@ this.Počty.Controls.Add(this.panel98); this.Počty.Controls.Add(this.panel9); this.Počty.Dock = System.Windows.Forms.DockStyle.Right; - this.Počty.Location = new System.Drawing.Point(1526, 0); + this.Počty.Location = new System.Drawing.Point(526, 0); this.Počty.Margin = new System.Windows.Forms.Padding(1); this.Počty.MaximumSize = new System.Drawing.Size(403, 728); this.Počty.MinimumSize = new System.Drawing.Size(23, 728); @@ -11277,7 +11277,7 @@ // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(1574, 921); + this.ClientSize = new System.Drawing.Size(574, 921); this.Controls.Add(this.panel16); this.Controls.Add(this.panel1); this.Controls.Add(this.panel17); diff --git a/Mip/frmNacenovanie.cs b/Mip/frmNacenovanie.cs index f786ff8..94ec2ed 100644 --- a/Mip/frmNacenovanie.cs +++ b/Mip/frmNacenovanie.cs @@ -654,7 +654,7 @@ namespace Mip } else { - decimal Objem = Convert.ToDecimal(l66) * Convert.ToDecimal(l65) * Convert.ToDecimal(l64) / Convert.ToDecimal(l6) / 1000000; + decimal Objem = (Convert.ToDecimal(l66) * Convert.ToDecimal(l65) * Convert.ToDecimal(l64) / Convert.ToDecimal(l6) / 1000000) - (decimal)dObjemVypichu; dObjemPouzMaterialu = Objem; } } @@ -781,9 +781,9 @@ namespace Mip form.label69.Text = l27 + (myNuD18 + myNuD1 + myNuD4).ToString() + "/" + (myNuD19 - myNuD2 - myNuD6).ToString() + "x" + (Convert.ToDecimal(l64)- myNuD13).ToString(); else form.label69.Text = l27 + (myNuD18 + myNuD1 + myNuD4).ToString() + "x" + (myNuD19 + myNuD2 + myNuD6).ToString() + "x" + (Convert.ToDecimal(l64) - myNuD13).ToString(); - + if(ObjemPouzMaterialu()!= 0) decPomer = (double)ObjemVyrobku()/(double)ObjemPouzMaterialu(); - else decPomer =0; + else decPomer =0; form.label33.Text = "Využ. mat.: " + Math.Round(decPomer*100,4).ToString() + " %"; form.ResumeLayout(); }