diff --git a/AgroBase/.vs/AgroBase/FileContentIndex/2073c366-683b-4e8c-9da0-0ee832ed5d9a.vsidx b/AgroBase/.vs/AgroBase/FileContentIndex/2073c366-683b-4e8c-9da0-0ee832ed5d9a.vsidx deleted file mode 100644 index b5c58fb1f..000000000 Binary files a/AgroBase/.vs/AgroBase/FileContentIndex/2073c366-683b-4e8c-9da0-0ee832ed5d9a.vsidx and /dev/null differ diff --git a/AgroBase/.vs/AgroBase/FileContentIndex/c66b2bce-481e-4f3c-a4fd-cc760aa95680.vsidx b/AgroBase/.vs/AgroBase/FileContentIndex/c66b2bce-481e-4f3c-a4fd-cc760aa95680.vsidx new file mode 100644 index 000000000..86a8fbfe3 Binary files /dev/null and b/AgroBase/.vs/AgroBase/FileContentIndex/c66b2bce-481e-4f3c-a4fd-cc760aa95680.vsidx differ diff --git a/AgroBase/.vs/AgroBase/v17/.suo b/AgroBase/.vs/AgroBase/v17/.suo index 827639719..00aa8a99f 100644 Binary files a/AgroBase/.vs/AgroBase/v17/.suo and b/AgroBase/.vs/AgroBase/v17/.suo differ diff --git a/AgroBase/.vs/AgroBase/v17/DocumentLayout.json b/AgroBase/.vs/AgroBase/v17/DocumentLayout.json index 7f350f246..c1d20ef95 100644 --- a/AgroBase/.vs/AgroBase/v17/DocumentLayout.json +++ b/AgroBase/.vs/AgroBase/v17/DocumentLayout.json @@ -2,6 +2,10 @@ "Version": 1, "WorkspaceRootPath": "C:\\ZendionINC\\agrobot_base\\AgroBase\\", "Documents": [ + { + "AbsoluteMoniker": "D:0:0:{C54B41C0-1D21-4E3E-949E-0F86BBC86A33}|AgroBase\\AgroBase.csproj|c:\\zendioninc\\agrobot_base\\agrobase\\agrobase\\forms\\movimentacao\\frmmovconfig.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", + "RelativeMoniker": "D:0:0:{C54B41C0-1D21-4E3E-949E-0F86BBC86A33}|AgroBase\\AgroBase.csproj|solutionrelative:agrobase\\forms\\movimentacao\\frmmovconfig.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" + }, { "AbsoluteMoniker": "D:0:0:{C54B41C0-1D21-4E3E-949E-0F86BBC86A33}|AgroBase\\AgroBase.csproj|c:\\zendioninc\\agrobot_base\\agrobase\\agrobase\\models\\modules\\pinoutmodel.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", "RelativeMoniker": "D:0:0:{C54B41C0-1D21-4E3E-949E-0F86BBC86A33}|AgroBase\\AgroBase.csproj|solutionrelative:agrobase\\models\\modules\\pinoutmodel.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" @@ -19,12 +23,25 @@ { "$type": "Document", "DocumentIndex": 0, + "Title": "frmMovConfig.cs", + "DocumentMoniker": "C:\\ZendionINC\\agrobot_base\\AgroBase\\AgroBase\\Forms\\Movimentacao\\frmMovConfig.cs", + "RelativeDocumentMoniker": "AgroBase\\Forms\\Movimentacao\\frmMovConfig.cs", + "ToolTip": "C:\\ZendionINC\\agrobot_base\\AgroBase\\AgroBase\\Forms\\Movimentacao\\frmMovConfig.cs", + "RelativeToolTip": "AgroBase\\Forms\\Movimentacao\\frmMovConfig.cs", + "ViewState": "AQIAAAAAAAAAAAAAAAAAABUAAABCAAAA", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", + "WhenOpened": "2024-06-04T00:14:19.466Z", + "EditorCaption": "" + }, + { + "$type": "Document", + "DocumentIndex": 1, "Title": "PinoutModel.cs", "DocumentMoniker": "C:\\ZendionINC\\agrobot_base\\AgroBase\\AgroBase\\Models\\Modules\\PinoutModel.cs", "RelativeDocumentMoniker": "AgroBase\\Models\\Modules\\PinoutModel.cs", "ToolTip": "C:\\ZendionINC\\agrobot_base\\AgroBase\\AgroBase\\Models\\Modules\\PinoutModel.cs", "RelativeToolTip": "AgroBase\\Models\\Modules\\PinoutModel.cs", - "ViewState": "AQIAAA0AAAAAAAAAAAAzwLYAAABFAAAA", + "ViewState": "AQIAAAAAAAAAAAAAAAAAALYAAABFAAAA", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", "WhenOpened": "2024-06-03T22:54:24.905Z", "EditorCaption": "" diff --git a/AgroBase/AgroBase/Forms/Movimentacao/frmMovConfig.Designer.cs b/AgroBase/AgroBase/Forms/Movimentacao/frmMovConfig.Designer.cs index 2989a6cff..36c959664 100644 --- a/AgroBase/AgroBase/Forms/Movimentacao/frmMovConfig.Designer.cs +++ b/AgroBase/AgroBase/Forms/Movimentacao/frmMovConfig.Designer.cs @@ -76,6 +76,14 @@ namespace AgroBase.Forms.Movimentacao this.lblRampa = new System.Windows.Forms.Label(); this.nudRampa = new System.Windows.Forms.NumericUpDown(); this.btnSalvar = new System.Windows.Forms.Button(); + this.txtDFEndereco = new System.Windows.Forms.TextBox(); + this.lblDFEndereco = new System.Windows.Forms.Label(); + this.label1 = new System.Windows.Forms.Label(); + this.txtEFEndereco = new System.Windows.Forms.TextBox(); + this.label2 = new System.Windows.Forms.Label(); + this.txtETEndereco = new System.Windows.Forms.TextBox(); + this.label3 = new System.Windows.Forms.Label(); + this.txtDTEndereco = new System.Windows.Forms.TextBox(); this.gpbSentido.SuspendLayout(); this.gpbDF.SuspendLayout(); this.gpbEF.SuspendLayout(); @@ -98,13 +106,15 @@ namespace AgroBase.Forms.Movimentacao this.gpbSentido.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.gpbSentido.Name = "gpbSentido"; this.gpbSentido.Padding = new System.Windows.Forms.Padding(3, 2, 3, 2); - this.gpbSentido.Size = new System.Drawing.Size(501, 362); + this.gpbSentido.Size = new System.Drawing.Size(501, 429); this.gpbSentido.TabIndex = 40; this.gpbSentido.TabStop = false; this.gpbSentido.Text = "Sentido de giro"; // // gpbDF // + this.gpbDF.Controls.Add(this.lblDFEndereco); + this.gpbDF.Controls.Add(this.txtDFEndereco); this.gpbDF.Controls.Add(this.cmbDFFrente); this.gpbDF.Controls.Add(this.cmbDFTras); this.gpbDF.Controls.Add(this.cmbDFDireita); @@ -117,7 +127,7 @@ namespace AgroBase.Forms.Movimentacao this.gpbDF.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.gpbDF.Name = "gpbDF"; this.gpbDF.Padding = new System.Windows.Forms.Padding(3, 2, 3, 2); - this.gpbDF.Size = new System.Drawing.Size(224, 159); + this.gpbDF.Size = new System.Drawing.Size(224, 193); this.gpbDF.TabIndex = 9; this.gpbDF.TabStop = false; this.gpbDF.Text = "M4 - Direito Frente (DF)"; @@ -196,6 +206,8 @@ namespace AgroBase.Forms.Movimentacao // // gpbEF // + this.gpbEF.Controls.Add(this.label1); + this.gpbEF.Controls.Add(this.txtEFEndereco); this.gpbEF.Controls.Add(this.cmbEFFrente); this.gpbEF.Controls.Add(this.cmbEFTras); this.gpbEF.Controls.Add(this.cmbEFDireita); @@ -208,7 +220,7 @@ namespace AgroBase.Forms.Movimentacao this.gpbEF.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.gpbEF.Name = "gpbEF"; this.gpbEF.Padding = new System.Windows.Forms.Padding(3, 2, 3, 2); - this.gpbEF.Size = new System.Drawing.Size(224, 159); + this.gpbEF.Size = new System.Drawing.Size(224, 193); this.gpbEF.TabIndex = 9; this.gpbEF.TabStop = false; this.gpbEF.Text = "M2 - Esquerdo Frente (EF)"; @@ -287,6 +299,8 @@ namespace AgroBase.Forms.Movimentacao // // gpbDT // + this.gpbDT.Controls.Add(this.label3); + this.gpbDT.Controls.Add(this.txtDTEndereco); this.gpbDT.Controls.Add(this.cmbDTFrente); this.gpbDT.Controls.Add(this.cmbDTTras); this.gpbDT.Controls.Add(this.cmbDTDireita); @@ -295,11 +309,11 @@ namespace AgroBase.Forms.Movimentacao this.gpbDT.Controls.Add(this.lblDTDireita); this.gpbDT.Controls.Add(this.lblDTTras); this.gpbDT.Controls.Add(this.lblDTFrente); - this.gpbDT.Location = new System.Drawing.Point(260, 190); + this.gpbDT.Location = new System.Drawing.Point(260, 223); this.gpbDT.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.gpbDT.Name = "gpbDT"; this.gpbDT.Padding = new System.Windows.Forms.Padding(3, 2, 3, 2); - this.gpbDT.Size = new System.Drawing.Size(224, 159); + this.gpbDT.Size = new System.Drawing.Size(224, 193); this.gpbDT.TabIndex = 9; this.gpbDT.TabStop = false; this.gpbDT.Text = "M3 - Direito Trás (DT)"; @@ -378,6 +392,8 @@ namespace AgroBase.Forms.Movimentacao // // gpbET // + this.gpbET.Controls.Add(this.label2); + this.gpbET.Controls.Add(this.txtETEndereco); this.gpbET.Controls.Add(this.cmbETFrente); this.gpbET.Controls.Add(this.cmbETTras); this.gpbET.Controls.Add(this.cmbETDireita); @@ -386,11 +402,11 @@ namespace AgroBase.Forms.Movimentacao this.gpbET.Controls.Add(this.lblETDireita); this.gpbET.Controls.Add(this.lblETTras); this.gpbET.Controls.Add(this.lblETFrente); - this.gpbET.Location = new System.Drawing.Point(17, 190); + this.gpbET.Location = new System.Drawing.Point(17, 223); this.gpbET.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.gpbET.Name = "gpbET"; this.gpbET.Padding = new System.Windows.Forms.Padding(3, 2, 3, 2); - this.gpbET.Size = new System.Drawing.Size(224, 159); + this.gpbET.Size = new System.Drawing.Size(224, 193); this.gpbET.TabIndex = 0; this.gpbET.TabStop = false; this.gpbET.Text = "M1 - Esquerdo Trás (ET)"; @@ -477,7 +493,7 @@ namespace AgroBase.Forms.Movimentacao this.groupBox1.Controls.Add(this.nudNumPolos); this.groupBox1.Controls.Add(this.lblRampa); this.groupBox1.Controls.Add(this.nudRampa); - this.groupBox1.Location = new System.Drawing.Point(15, 380); + this.groupBox1.Location = new System.Drawing.Point(15, 447); this.groupBox1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.groupBox1.Name = "groupBox1"; this.groupBox1.Padding = new System.Windows.Forms.Padding(3, 2, 3, 2); @@ -599,7 +615,7 @@ namespace AgroBase.Forms.Movimentacao // // btnSalvar // - this.btnSalvar.Location = new System.Drawing.Point(363, 475); + this.btnSalvar.Location = new System.Drawing.Point(363, 532); this.btnSalvar.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.btnSalvar.Name = "btnSalvar"; this.btnSalvar.Size = new System.Drawing.Size(153, 30); @@ -608,12 +624,80 @@ namespace AgroBase.Forms.Movimentacao this.btnSalvar.UseVisualStyleBackColor = true; this.btnSalvar.Click += new System.EventHandler(this.btnSalvar_Click); // + // txtDFEndereco + // + this.txtDFEndereco.Location = new System.Drawing.Point(88, 153); + this.txtDFEndereco.Name = "txtDFEndereco"; + this.txtDFEndereco.Size = new System.Drawing.Size(121, 22); + this.txtDFEndereco.TabIndex = 8; + this.txtDFEndereco.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; + // + // lblDFEndereco + // + this.lblDFEndereco.AutoSize = true; + this.lblDFEndereco.Location = new System.Drawing.Point(13, 156); + this.lblDFEndereco.Name = "lblDFEndereco"; + this.lblDFEndereco.Size = new System.Drawing.Size(66, 16); + this.lblDFEndereco.TabIndex = 9; + this.lblDFEndereco.Text = "Endereço"; + // + // label1 + // + this.label1.AutoSize = true; + this.label1.Location = new System.Drawing.Point(13, 156); + this.label1.Name = "label1"; + this.label1.Size = new System.Drawing.Size(66, 16); + this.label1.TabIndex = 11; + this.label1.Text = "Endereço"; + // + // txtEFEndereco + // + this.txtEFEndereco.Location = new System.Drawing.Point(88, 153); + this.txtEFEndereco.Name = "txtEFEndereco"; + this.txtEFEndereco.Size = new System.Drawing.Size(121, 22); + this.txtEFEndereco.TabIndex = 10; + this.txtEFEndereco.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; + // + // label2 + // + this.label2.AutoSize = true; + this.label2.Location = new System.Drawing.Point(13, 156); + this.label2.Name = "label2"; + this.label2.Size = new System.Drawing.Size(66, 16); + this.label2.TabIndex = 11; + this.label2.Text = "Endereço"; + // + // txtETEndereco + // + this.txtETEndereco.Location = new System.Drawing.Point(88, 153); + this.txtETEndereco.Name = "txtETEndereco"; + this.txtETEndereco.Size = new System.Drawing.Size(121, 22); + this.txtETEndereco.TabIndex = 10; + this.txtETEndereco.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; + // + // label3 + // + this.label3.AutoSize = true; + this.label3.Location = new System.Drawing.Point(13, 156); + this.label3.Name = "label3"; + this.label3.Size = new System.Drawing.Size(66, 16); + this.label3.TabIndex = 11; + this.label3.Text = "Endereço"; + // + // txtDTEndereco + // + this.txtDTEndereco.Location = new System.Drawing.Point(88, 153); + this.txtDTEndereco.Name = "txtDTEndereco"; + this.txtDTEndereco.Size = new System.Drawing.Size(121, 22); + this.txtDTEndereco.TabIndex = 10; + this.txtDTEndereco.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; + // // frmMovConfig // this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 16F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.BackColor = System.Drawing.Color.White; - this.ClientSize = new System.Drawing.Size(531, 521); + this.ClientSize = new System.Drawing.Size(531, 577); this.Controls.Add(this.btnSalvar); this.Controls.Add(this.groupBox1); this.Controls.Add(this.gpbSentido); @@ -691,5 +775,13 @@ namespace AgroBase.Forms.Movimentacao private System.Windows.Forms.Button btnSalvar; private System.Windows.Forms.Label lblDiametroRoda; private System.Windows.Forms.NumericUpDown nudDiametroRoda; + private System.Windows.Forms.Label lblDFEndereco; + private System.Windows.Forms.TextBox txtDFEndereco; + private System.Windows.Forms.Label label1; + private System.Windows.Forms.TextBox txtEFEndereco; + private System.Windows.Forms.Label label3; + private System.Windows.Forms.TextBox txtDTEndereco; + private System.Windows.Forms.Label label2; + private System.Windows.Forms.TextBox txtETEndereco; } } \ No newline at end of file diff --git a/AgroBase/AgroBase/Forms/Movimentacao/frmMovConfig.cs b/AgroBase/AgroBase/Forms/Movimentacao/frmMovConfig.cs index 038096f34..aa972eda7 100644 --- a/AgroBase/AgroBase/Forms/Movimentacao/frmMovConfig.cs +++ b/AgroBase/AgroBase/Forms/Movimentacao/frmMovConfig.cs @@ -61,6 +61,9 @@ namespace AgroBase.Forms.Movimentacao nudNumPolos.Value = Motor.NumeroPolos; nudRampa.Value = Motor.Rampa; nudRPMMax.Value = Motor.RPM_Max; + + TextBox txtEndereco = FuncoesGlobais.FindControlRecursive(gpbSentido, "txt" + Motor.ID + "Endereco"); + txtEndereco.Text = Motor.Endereco; } } @@ -101,6 +104,9 @@ namespace AgroBase.Forms.Movimentacao Motor.NumeroPolos = MovimentacaoModel.NumPolos; Motor.Rampa = MovimentacaoModel.Rampa; Motor.RPM_Max = MovimentacaoModel.RPM_Max; + + TextBox txtEndereco = FuncoesGlobais.FindControlRecursive(gpbSentido, "txt" + Motor.ID + "Endereco"); + Motor.Endereco = txtEndereco.Text; } } diff --git a/AgroBase/AgroBase/bin/Debug/AgroBase.pdb b/AgroBase/AgroBase/bin/Debug/AgroBase.pdb index 86d02cc0c..120c280c6 100644 Binary files a/AgroBase/AgroBase/bin/Debug/AgroBase.pdb and b/AgroBase/AgroBase/bin/Debug/AgroBase.pdb differ diff --git a/AgroBase/AgroBase/obj/Debug/AgroBase.csproj.GenerateResource.cache b/AgroBase/AgroBase/obj/Debug/AgroBase.csproj.GenerateResource.cache index f90d550fc..eedc9a0dd 100644 Binary files a/AgroBase/AgroBase/obj/Debug/AgroBase.csproj.GenerateResource.cache and b/AgroBase/AgroBase/obj/Debug/AgroBase.csproj.GenerateResource.cache differ diff --git a/AgroBase/AgroBase/obj/Debug/AgroBase.pdb b/AgroBase/AgroBase/obj/Debug/AgroBase.pdb index 86d02cc0c..120c280c6 100644 Binary files a/AgroBase/AgroBase/obj/Debug/AgroBase.pdb and b/AgroBase/AgroBase/obj/Debug/AgroBase.pdb differ diff --git a/AgroBase/AgroBase/obj/Debug/DesignTimeResolveAssemblyReferences.cache b/AgroBase/AgroBase/obj/Debug/DesignTimeResolveAssemblyReferences.cache index 31289b2d2..d588532f4 100644 Binary files a/AgroBase/AgroBase/obj/Debug/DesignTimeResolveAssemblyReferences.cache and b/AgroBase/AgroBase/obj/Debug/DesignTimeResolveAssemblyReferences.cache differ