diff --git a/INSTALL/Output/sw2urdfSetup.exe b/INSTALL/Output/sw2urdfSetup.exe index 41c6d160..52739787 100644 Binary files a/INSTALL/Output/sw2urdfSetup.exe and b/INSTALL/Output/sw2urdfSetup.exe differ diff --git a/SW2URDF.sln b/SW2URDF.sln index 268ba022..179d1db8 100644 --- a/SW2URDF.sln +++ b/SW2URDF.sln @@ -23,8 +23,8 @@ Global Test|x86 = Test|x86 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {473A16EC-06E9-4C08-B6EF-9AF0036B69E6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {473A16EC-06E9-4C08-B6EF-9AF0036B69E6}.Debug|Any CPU.Build.0 = Debug|Any CPU + {473A16EC-06E9-4C08-B6EF-9AF0036B69E6}.Debug|Any CPU.ActiveCfg = Debug|x64 + {473A16EC-06E9-4C08-B6EF-9AF0036B69E6}.Debug|Any CPU.Build.0 = Debug|x64 {473A16EC-06E9-4C08-B6EF-9AF0036B69E6}.Debug|x64.ActiveCfg = Debug|x64 {473A16EC-06E9-4C08-B6EF-9AF0036B69E6}.Debug|x64.Build.0 = Debug|x64 {473A16EC-06E9-4C08-B6EF-9AF0036B69E6}.Debug|x86.ActiveCfg = Debug|x86 diff --git a/SW2URDF/UI/AssemblyExportForm.Designer.cs b/SW2URDF/UI/AssemblyExportForm.Designer.cs index 5504308c..d8ead606 100644 --- a/SW2URDF/UI/AssemblyExportForm.Designer.cs +++ b/SW2URDF/UI/AssemblyExportForm.Designer.cs @@ -198,18 +198,18 @@ private void InitializeComponent() this.panelLinkProperties.Controls.Add(this.treeViewLinkProperties); this.panelLinkProperties.Dock = System.Windows.Forms.DockStyle.Fill; this.panelLinkProperties.Location = new System.Drawing.Point(0, 0); - this.panelLinkProperties.Margin = new System.Windows.Forms.Padding(4); this.panelLinkProperties.Name = "panelLinkProperties"; - this.panelLinkProperties.Size = new System.Drawing.Size(1431, 846); + this.panelLinkProperties.Size = new System.Drawing.Size(1073, 687); this.panelLinkProperties.TabIndex = 222; this.panelLinkProperties.Visible = false; // // buttonLinksExportUrdfOnly // - this.buttonLinksExportUrdfOnly.Location = new System.Drawing.Point(1012, 804); - this.buttonLinksExportUrdfOnly.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.buttonLinksExportUrdfOnly.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); + this.buttonLinksExportUrdfOnly.Location = new System.Drawing.Point(759, 653); + this.buttonLinksExportUrdfOnly.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); this.buttonLinksExportUrdfOnly.Name = "buttonLinksExportUrdfOnly"; - this.buttonLinksExportUrdfOnly.Size = new System.Drawing.Size(200, 28); + this.buttonLinksExportUrdfOnly.Size = new System.Drawing.Size(150, 23); this.buttonLinksExportUrdfOnly.TabIndex = 94; this.buttonLinksExportUrdfOnly.Text = "Export URDF Only..."; this.buttonLinksExportUrdfOnly.UseVisualStyleBackColor = true; @@ -218,10 +218,9 @@ private void InitializeComponent() // label2 // this.label2.AutoSize = true; - this.label2.Location = new System.Drawing.Point(29, 42); - this.label2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label2.Location = new System.Drawing.Point(22, 34); this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(377, 17); + this.label2.Size = new System.Drawing.Size(282, 13); this.label2.TabIndex = 93; this.label2.Text = "Use this page to make any changes to the links\' properties"; // @@ -229,20 +228,18 @@ private void InitializeComponent() // this.label5.AutoSize = true; this.label5.Font = new System.Drawing.Font("Microsoft Sans Serif", 10F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.label5.Location = new System.Drawing.Point(16, 11); - this.label5.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label5.Location = new System.Drawing.Point(12, 9); this.label5.Name = "label5"; - this.label5.Size = new System.Drawing.Size(224, 20); + this.label5.Size = new System.Drawing.Size(193, 17); this.label5.TabIndex = 92; this.label5.Text = "Configure Link Properties"; // // buttonLinksFinish // this.buttonLinksFinish.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); - this.buttonLinksFinish.Location = new System.Drawing.Point(1219, 804); - this.buttonLinksFinish.Margin = new System.Windows.Forms.Padding(4); + this.buttonLinksFinish.Location = new System.Drawing.Point(914, 653); this.buttonLinksFinish.Name = "buttonLinksFinish"; - this.buttonLinksFinish.Size = new System.Drawing.Size(200, 28); + this.buttonLinksFinish.Size = new System.Drawing.Size(150, 23); this.buttonLinksFinish.TabIndex = 91; this.buttonLinksFinish.Text = "Export URDF and Meshes..."; this.buttonLinksFinish.UseVisualStyleBackColor = true; @@ -251,10 +248,9 @@ private void InitializeComponent() // buttonLinksPrevious // this.buttonLinksPrevious.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); - this.buttonLinksPrevious.Location = new System.Drawing.Point(679, 804); - this.buttonLinksPrevious.Margin = new System.Windows.Forms.Padding(4); + this.buttonLinksPrevious.Location = new System.Drawing.Point(509, 653); this.buttonLinksPrevious.Name = "buttonLinksPrevious"; - this.buttonLinksPrevious.Size = new System.Drawing.Size(100, 28); + this.buttonLinksPrevious.Size = new System.Drawing.Size(75, 23); this.buttonLinksPrevious.TabIndex = 90; this.buttonLinksPrevious.Text = "Previous"; this.buttonLinksPrevious.UseVisualStyleBackColor = true; @@ -263,10 +259,9 @@ private void InitializeComponent() // buttonLinksCancel // this.buttonLinksCancel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); - this.buttonLinksCancel.Location = new System.Drawing.Point(16, 804); - this.buttonLinksCancel.Margin = new System.Windows.Forms.Padding(4); + this.buttonLinksCancel.Location = new System.Drawing.Point(12, 653); this.buttonLinksCancel.Name = "buttonLinksCancel"; - this.buttonLinksCancel.Size = new System.Drawing.Size(100, 28); + this.buttonLinksCancel.Size = new System.Drawing.Size(75, 23); this.buttonLinksCancel.TabIndex = 89; this.buttonLinksCancel.Text = "Cancel"; this.buttonLinksCancel.UseVisualStyleBackColor = true; @@ -274,6 +269,7 @@ private void InitializeComponent() // // groupBox5 // + this.groupBox5.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.groupBox5.Controls.Add(this.label15); this.groupBox5.Controls.Add(this.textBoxIxx); this.groupBox5.Controls.Add(this.textBoxIxz); @@ -304,11 +300,9 @@ private void InitializeComponent() this.groupBox5.Controls.Add(this.label50); this.groupBox5.Controls.Add(this.textBoxMass); this.groupBox5.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.groupBox5.Location = new System.Drawing.Point(658, 107); - this.groupBox5.Margin = new System.Windows.Forms.Padding(4); + this.groupBox5.Location = new System.Drawing.Point(494, 87); this.groupBox5.Name = "groupBox5"; - this.groupBox5.Padding = new System.Windows.Forms.Padding(4); - this.groupBox5.Size = new System.Drawing.Size(757, 240); + this.groupBox5.Size = new System.Drawing.Size(568, 195); this.groupBox5.TabIndex = 71; this.groupBox5.TabStop = false; // @@ -316,269 +310,241 @@ private void InitializeComponent() // this.label15.AutoSize = true; this.label15.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.label15.Location = new System.Drawing.Point(8, 0); - this.label15.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label15.Location = new System.Drawing.Point(6, 0); this.label15.Name = "label15"; - this.label15.Size = new System.Drawing.Size(58, 17); + this.label15.Size = new System.Drawing.Size(46, 13); this.label15.TabIndex = 33; this.label15.Text = "Inertial"; // // textBoxIxx // - this.textBoxIxx.Location = new System.Drawing.Point(364, 72); - this.textBoxIxx.Margin = new System.Windows.Forms.Padding(4); + this.textBoxIxx.Location = new System.Drawing.Point(273, 58); this.textBoxIxx.Name = "textBoxIxx"; - this.textBoxIxx.Size = new System.Drawing.Size(86, 23); + this.textBoxIxx.Size = new System.Drawing.Size(66, 20); this.textBoxIxx.TabIndex = 7; // // textBoxIxz // - this.textBoxIxz.Location = new System.Drawing.Point(629, 72); - this.textBoxIxz.Margin = new System.Windows.Forms.Padding(4); + this.textBoxIxz.Location = new System.Drawing.Point(472, 58); this.textBoxIxz.Name = "textBoxIxz"; - this.textBoxIxz.Size = new System.Drawing.Size(86, 23); + this.textBoxIxz.Size = new System.Drawing.Size(66, 20); this.textBoxIxz.TabIndex = 9; // // textBoxInertialOriginX // - this.textBoxInertialOriginX.Location = new System.Drawing.Point(59, 72); - this.textBoxInertialOriginX.Margin = new System.Windows.Forms.Padding(4); + this.textBoxInertialOriginX.Location = new System.Drawing.Point(44, 58); this.textBoxInertialOriginX.Name = "textBoxInertialOriginX"; - this.textBoxInertialOriginX.Size = new System.Drawing.Size(86, 23); + this.textBoxInertialOriginX.Size = new System.Drawing.Size(66, 20); this.textBoxInertialOriginX.TabIndex = 3; // // label16 // this.label16.AutoSize = true; - this.label16.Location = new System.Drawing.Point(158, 78); - this.label16.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label16.Location = new System.Drawing.Point(118, 63); this.label16.Name = "label16"; - this.label16.Size = new System.Drawing.Size(32, 17); + this.label16.Size = new System.Drawing.Size(25, 13); this.label16.TabIndex = 27; this.label16.Text = "Roll"; // // textBoxInertialOriginYaw // - this.textBoxInertialOriginYaw.Location = new System.Drawing.Point(200, 136); - this.textBoxInertialOriginYaw.Margin = new System.Windows.Forms.Padding(4); + this.textBoxInertialOriginYaw.Location = new System.Drawing.Point(150, 110); this.textBoxInertialOriginYaw.Name = "textBoxInertialOriginYaw"; - this.textBoxInertialOriginYaw.Size = new System.Drawing.Size(86, 23); + this.textBoxInertialOriginYaw.Size = new System.Drawing.Size(66, 20); this.textBoxInertialOriginYaw.TabIndex = 32; // // label11 // this.label11.AutoSize = true; - this.label11.Location = new System.Drawing.Point(596, 72); - this.label11.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label11.Location = new System.Drawing.Point(447, 58); this.label11.Name = "label11"; - this.label11.Size = new System.Drawing.Size(24, 17); + this.label11.Size = new System.Drawing.Size(19, 13); this.label11.TabIndex = 16; this.label11.Text = "ixz"; // // label12 // this.label12.AutoSize = true; - this.label12.Location = new System.Drawing.Point(9, 198); - this.label12.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label12.Location = new System.Drawing.Point(7, 161); this.label12.Name = "label12"; - this.label12.Size = new System.Drawing.Size(70, 17); + this.label12.Size = new System.Drawing.Size(53, 13); this.label12.TabIndex = 13; this.label12.Text = "Mass (kg)"; // // textBoxIyy // - this.textBoxIyy.Location = new System.Drawing.Point(492, 104); - this.textBoxIyy.Margin = new System.Windows.Forms.Padding(4); + this.textBoxIyy.Location = new System.Drawing.Point(369, 84); this.textBoxIyy.Name = "textBoxIyy"; - this.textBoxIyy.Size = new System.Drawing.Size(86, 23); + this.textBoxIyy.Size = new System.Drawing.Size(66, 20); this.textBoxIyy.TabIndex = 10; // // textBoxInertialOriginPitch // - this.textBoxInertialOriginPitch.Location = new System.Drawing.Point(200, 104); - this.textBoxInertialOriginPitch.Margin = new System.Windows.Forms.Padding(4); + this.textBoxInertialOriginPitch.Location = new System.Drawing.Point(150, 84); this.textBoxInertialOriginPitch.Name = "textBoxInertialOriginPitch"; - this.textBoxInertialOriginPitch.Size = new System.Drawing.Size(86, 23); + this.textBoxInertialOriginPitch.Size = new System.Drawing.Size(66, 20); this.textBoxInertialOriginPitch.TabIndex = 31; // // label13 // this.label13.AutoSize = true; - this.label13.Location = new System.Drawing.Point(35, 72); - this.label13.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label13.Location = new System.Drawing.Point(26, 58); this.label13.Name = "label13"; - this.label13.Size = new System.Drawing.Size(14, 17); + this.label13.Size = new System.Drawing.Size(12, 13); this.label13.TabIndex = 20; this.label13.Text = "x"; // // label14 // this.label14.AutoSize = true; - this.label14.Location = new System.Drawing.Point(331, 72); - this.label14.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label14.Location = new System.Drawing.Point(248, 58); this.label14.Name = "label14"; - this.label14.Size = new System.Drawing.Size(23, 17); + this.label14.Size = new System.Drawing.Size(19, 13); this.label14.TabIndex = 14; this.label14.Text = "ixx"; // // textBoxInertialOriginRoll // - this.textBoxInertialOriginRoll.Location = new System.Drawing.Point(200, 72); - this.textBoxInertialOriginRoll.Margin = new System.Windows.Forms.Padding(4); + this.textBoxInertialOriginRoll.Location = new System.Drawing.Point(150, 58); this.textBoxInertialOriginRoll.Name = "textBoxInertialOriginRoll"; - this.textBoxInertialOriginRoll.Size = new System.Drawing.Size(86, 23); + this.textBoxInertialOriginRoll.Size = new System.Drawing.Size(66, 20); this.textBoxInertialOriginRoll.TabIndex = 30; // // textBoxInertialOriginY // - this.textBoxInertialOriginY.Location = new System.Drawing.Point(59, 104); - this.textBoxInertialOriginY.Margin = new System.Windows.Forms.Padding(4); + this.textBoxInertialOriginY.Location = new System.Drawing.Point(44, 84); this.textBoxInertialOriginY.Name = "textBoxInertialOriginY"; - this.textBoxInertialOriginY.Size = new System.Drawing.Size(86, 23); + this.textBoxInertialOriginY.Size = new System.Drawing.Size(66, 20); this.textBoxInertialOriginY.TabIndex = 4; // // label17 // this.label17.AutoSize = true; - this.label17.Location = new System.Drawing.Point(35, 104); - this.label17.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label17.Location = new System.Drawing.Point(26, 84); this.label17.Name = "label17"; - this.label17.Size = new System.Drawing.Size(15, 17); + this.label17.Size = new System.Drawing.Size(12, 13); this.label17.TabIndex = 21; this.label17.Text = "y"; // // label18 // this.label18.AutoSize = true; - this.label18.Location = new System.Drawing.Point(596, 141); - this.label18.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label18.Location = new System.Drawing.Point(447, 115); this.label18.Name = "label18"; - this.label18.Size = new System.Drawing.Size(25, 17); + this.label18.Size = new System.Drawing.Size(19, 13); this.label18.TabIndex = 19; this.label18.Text = "izz"; // // textBoxIyz // - this.textBoxIyz.Location = new System.Drawing.Point(629, 104); - this.textBoxIyz.Margin = new System.Windows.Forms.Padding(4); + this.textBoxIyz.Location = new System.Drawing.Point(472, 84); this.textBoxIyz.Name = "textBoxIyz"; - this.textBoxIyz.Size = new System.Drawing.Size(86, 23); + this.textBoxIyz.Size = new System.Drawing.Size(66, 20); this.textBoxIyz.TabIndex = 11; // // label36 // this.label36.AutoSize = true; - this.label36.Location = new System.Drawing.Point(9, 27); - this.label36.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label36.Location = new System.Drawing.Point(7, 22); this.label36.Name = "label36"; - this.label36.Size = new System.Drawing.Size(71, 17); + this.label36.Size = new System.Drawing.Size(51, 13); this.label36.TabIndex = 24; this.label36.Text = "Origin (m)"; // // label44 // this.label44.AutoSize = true; - this.label44.Location = new System.Drawing.Point(313, 27); - this.label44.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label44.Location = new System.Drawing.Point(235, 22); this.label44.Name = "label44"; - this.label44.Size = new System.Drawing.Size(192, 17); + this.label44.Size = new System.Drawing.Size(144, 13); this.label44.TabIndex = 23; this.label44.Text = "Moment of Inertia (Kg * m^-2)"; // // label45 // this.label45.AutoSize = true; - this.label45.Location = new System.Drawing.Point(151, 110); - this.label45.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label45.Location = new System.Drawing.Point(113, 89); this.label45.Name = "label45"; - this.label45.Size = new System.Drawing.Size(39, 17); + this.label45.Size = new System.Drawing.Size(31, 13); this.label45.TabIndex = 28; this.label45.Text = "Pitch"; // // label46 // this.label46.AutoSize = true; - this.label46.Location = new System.Drawing.Point(155, 142); - this.label46.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label46.Location = new System.Drawing.Point(116, 115); this.label46.Name = "label46"; - this.label46.Size = new System.Drawing.Size(34, 17); + this.label46.Size = new System.Drawing.Size(28, 13); this.label46.TabIndex = 29; this.label46.Text = "Yaw"; // // textBoxInertialOriginZ // - this.textBoxInertialOriginZ.Location = new System.Drawing.Point(59, 136); - this.textBoxInertialOriginZ.Margin = new System.Windows.Forms.Padding(4); + this.textBoxInertialOriginZ.Location = new System.Drawing.Point(44, 110); this.textBoxInertialOriginZ.Name = "textBoxInertialOriginZ"; - this.textBoxInertialOriginZ.Size = new System.Drawing.Size(86, 23); + this.textBoxInertialOriginZ.Size = new System.Drawing.Size(66, 20); this.textBoxInertialOriginZ.TabIndex = 5; // // label47 // this.label47.AutoSize = true; - this.label47.Location = new System.Drawing.Point(35, 136); - this.label47.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label47.Location = new System.Drawing.Point(26, 110); this.label47.Name = "label47"; - this.label47.Size = new System.Drawing.Size(15, 17); + this.label47.Size = new System.Drawing.Size(12, 13); this.label47.TabIndex = 22; this.label47.Text = "z"; // // label48 // this.label48.AutoSize = true; - this.label48.Location = new System.Drawing.Point(596, 107); - this.label48.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label48.Location = new System.Drawing.Point(447, 87); this.label48.Name = "label48"; - this.label48.Size = new System.Drawing.Size(25, 17); + this.label48.Size = new System.Drawing.Size(19, 13); this.label48.TabIndex = 18; this.label48.Text = "iyz"; // // label49 // this.label49.AutoSize = true; - this.label49.Location = new System.Drawing.Point(459, 109); - this.label49.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label49.Location = new System.Drawing.Point(344, 89); this.label49.Name = "label49"; - this.label49.Size = new System.Drawing.Size(25, 17); + this.label49.Size = new System.Drawing.Size(19, 13); this.label49.TabIndex = 17; this.label49.Text = "iyy"; // // textBoxIxy // - this.textBoxIxy.Location = new System.Drawing.Point(492, 72); - this.textBoxIxy.Margin = new System.Windows.Forms.Padding(4); + this.textBoxIxy.Location = new System.Drawing.Point(369, 58); this.textBoxIxy.Name = "textBoxIxy"; - this.textBoxIxy.Size = new System.Drawing.Size(86, 23); + this.textBoxIxy.Size = new System.Drawing.Size(66, 20); this.textBoxIxy.TabIndex = 8; // // textBoxIzz // - this.textBoxIzz.Location = new System.Drawing.Point(629, 136); - this.textBoxIzz.Margin = new System.Windows.Forms.Padding(4); + this.textBoxIzz.Location = new System.Drawing.Point(472, 110); this.textBoxIzz.Name = "textBoxIzz"; - this.textBoxIzz.Size = new System.Drawing.Size(86, 23); + this.textBoxIzz.Size = new System.Drawing.Size(66, 20); this.textBoxIzz.TabIndex = 12; // // label50 // this.label50.AutoSize = true; - this.label50.Location = new System.Drawing.Point(459, 72); - this.label50.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label50.Location = new System.Drawing.Point(344, 58); this.label50.Name = "label50"; - this.label50.Size = new System.Drawing.Size(24, 17); + this.label50.Size = new System.Drawing.Size(19, 13); this.label50.TabIndex = 15; this.label50.Text = "ixy"; // // textBoxMass // - this.textBoxMass.Location = new System.Drawing.Point(87, 198); - this.textBoxMass.Margin = new System.Windows.Forms.Padding(4); + this.textBoxMass.Location = new System.Drawing.Point(65, 161); this.textBoxMass.Name = "textBoxMass"; - this.textBoxMass.Size = new System.Drawing.Size(86, 23); + this.textBoxMass.Size = new System.Drawing.Size(66, 20); this.textBoxMass.TabIndex = 6; // // groupBox4 // + this.groupBox4.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.groupBox4.Controls.Add(this.radioButtonFine); this.groupBox4.Controls.Add(this.radioButtonCourse); this.groupBox4.Controls.Add(this.label10); @@ -610,21 +576,18 @@ private void InitializeComponent() this.groupBox4.Controls.Add(this.textBoxVisualOriginY); this.groupBox4.Controls.Add(this.label30); this.groupBox4.Controls.Add(this.textBoxTexture); - this.groupBox4.Location = new System.Drawing.Point(658, 370); - this.groupBox4.Margin = new System.Windows.Forms.Padding(4); + this.groupBox4.Location = new System.Drawing.Point(494, 301); this.groupBox4.Name = "groupBox4"; - this.groupBox4.Padding = new System.Windows.Forms.Padding(4); - this.groupBox4.Size = new System.Drawing.Size(757, 406); + this.groupBox4.Size = new System.Drawing.Size(568, 330); this.groupBox4.TabIndex = 72; this.groupBox4.TabStop = false; // // radioButtonFine // this.radioButtonFine.AutoSize = true; - this.radioButtonFine.Location = new System.Drawing.Point(135, 228); - this.radioButtonFine.Margin = new System.Windows.Forms.Padding(4); + this.radioButtonFine.Location = new System.Drawing.Point(101, 185); this.radioButtonFine.Name = "radioButtonFine"; - this.radioButtonFine.Size = new System.Drawing.Size(56, 21); + this.radioButtonFine.Size = new System.Drawing.Size(45, 17); this.radioButtonFine.TabIndex = 68; this.radioButtonFine.Text = "Fine"; this.radioButtonFine.UseVisualStyleBackColor = true; @@ -633,10 +596,9 @@ private void InitializeComponent() // this.radioButtonCourse.AutoSize = true; this.radioButtonCourse.Checked = true; - this.radioButtonCourse.Location = new System.Drawing.Point(26, 228); - this.radioButtonCourse.Margin = new System.Windows.Forms.Padding(4); + this.radioButtonCourse.Location = new System.Drawing.Point(20, 185); this.radioButtonCourse.Name = "radioButtonCourse"; - this.radioButtonCourse.Size = new System.Drawing.Size(74, 21); + this.radioButtonCourse.Size = new System.Drawing.Size(58, 17); this.radioButtonCourse.TabIndex = 67; this.radioButtonCourse.TabStop = true; this.radioButtonCourse.Text = "Course"; @@ -645,10 +607,9 @@ private void InitializeComponent() // label10 // this.label10.AutoSize = true; - this.label10.Location = new System.Drawing.Point(9, 196); - this.label10.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label10.Location = new System.Drawing.Point(7, 159); this.label10.Name = "label10"; - this.label10.Size = new System.Drawing.Size(82, 17); + this.label10.Size = new System.Drawing.Size(63, 13); this.label10.TabIndex = 66; this.label10.Text = "Mesh Detail"; // @@ -656,53 +617,47 @@ private void InitializeComponent() // this.label19.AutoSize = true; this.label19.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.label19.Location = new System.Drawing.Point(4, 0); - this.label19.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label19.Location = new System.Drawing.Point(3, 0); this.label19.Name = "label19"; - this.label19.Size = new System.Drawing.Size(210, 17); + this.label19.Size = new System.Drawing.Size(164, 13); this.label19.TabIndex = 62; this.label19.Text = "Visual and Collision Meshes"; // // textBoxVisualOriginZ // - this.textBoxVisualOriginZ.Location = new System.Drawing.Point(55, 138); - this.textBoxVisualOriginZ.Margin = new System.Windows.Forms.Padding(4); + this.textBoxVisualOriginZ.Location = new System.Drawing.Point(41, 112); this.textBoxVisualOriginZ.Name = "textBoxVisualOriginZ"; - this.textBoxVisualOriginZ.Size = new System.Drawing.Size(86, 22); + this.textBoxVisualOriginZ.Size = new System.Drawing.Size(66, 20); this.textBoxVisualOriginZ.TabIndex = 35; // // textBoxVisualOriginYaw // - this.textBoxVisualOriginYaw.Location = new System.Drawing.Point(197, 138); - this.textBoxVisualOriginYaw.Margin = new System.Windows.Forms.Padding(4); + this.textBoxVisualOriginYaw.Location = new System.Drawing.Point(148, 112); this.textBoxVisualOriginYaw.Name = "textBoxVisualOriginYaw"; - this.textBoxVisualOriginYaw.Size = new System.Drawing.Size(86, 22); + this.textBoxVisualOriginYaw.Size = new System.Drawing.Size(66, 20); this.textBoxVisualOriginYaw.TabIndex = 45; // // label34 // this.label34.AutoSize = true; - this.label34.Location = new System.Drawing.Point(9, 339); - this.label34.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label34.Location = new System.Drawing.Point(7, 275); this.label34.Name = "label34"; - this.label34.Size = new System.Drawing.Size(166, 17); + this.label34.Size = new System.Drawing.Size(124, 13); this.label34.TabIndex = 60; this.label34.Text = "Texture (Replaces Color)"; // // textBoxVisualOriginPitch // - this.textBoxVisualOriginPitch.Location = new System.Drawing.Point(197, 106); - this.textBoxVisualOriginPitch.Margin = new System.Windows.Forms.Padding(4); + this.textBoxVisualOriginPitch.Location = new System.Drawing.Point(148, 86); this.textBoxVisualOriginPitch.Name = "textBoxVisualOriginPitch"; - this.textBoxVisualOriginPitch.Size = new System.Drawing.Size(86, 22); + this.textBoxVisualOriginPitch.Size = new System.Drawing.Size(66, 20); this.textBoxVisualOriginPitch.TabIndex = 44; // // buttonTextureBrowse // - this.buttonTextureBrowse.Location = new System.Drawing.Point(530, 368); - this.buttonTextureBrowse.Margin = new System.Windows.Forms.Padding(4); + this.buttonTextureBrowse.Location = new System.Drawing.Point(398, 299); this.buttonTextureBrowse.Name = "buttonTextureBrowse"; - this.buttonTextureBrowse.Size = new System.Drawing.Size(100, 28); + this.buttonTextureBrowse.Size = new System.Drawing.Size(75, 23); this.buttonTextureBrowse.TabIndex = 59; this.buttonTextureBrowse.Text = "Browse..."; this.buttonTextureBrowse.UseVisualStyleBackColor = true; @@ -711,208 +666,186 @@ private void InitializeComponent() // label28 // this.label28.AutoSize = true; - this.label28.Location = new System.Drawing.Point(9, 268); - this.label28.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label28.Location = new System.Drawing.Point(7, 218); this.label28.Name = "label28"; - this.label28.Size = new System.Drawing.Size(97, 17); + this.label28.Size = new System.Drawing.Size(73, 13); this.label28.TabIndex = 47; this.label28.Text = "Material name"; // // textBoxVisualOriginRoll // - this.textBoxVisualOriginRoll.Location = new System.Drawing.Point(197, 74); - this.textBoxVisualOriginRoll.Margin = new System.Windows.Forms.Padding(4); + this.textBoxVisualOriginRoll.Location = new System.Drawing.Point(148, 60); this.textBoxVisualOriginRoll.Name = "textBoxVisualOriginRoll"; - this.textBoxVisualOriginRoll.Size = new System.Drawing.Size(86, 22); + this.textBoxVisualOriginRoll.Size = new System.Drawing.Size(66, 20); this.textBoxVisualOriginRoll.TabIndex = 43; // // comboBoxMaterials // this.comboBoxMaterials.FormattingEnabled = true; - this.comboBoxMaterials.Location = new System.Drawing.Point(21, 300); - this.comboBoxMaterials.Margin = new System.Windows.Forms.Padding(4); + this.comboBoxMaterials.Location = new System.Drawing.Point(16, 244); this.comboBoxMaterials.Name = "comboBoxMaterials"; - this.comboBoxMaterials.Size = new System.Drawing.Size(160, 24); + this.comboBoxMaterials.Size = new System.Drawing.Size(121, 21); this.comboBoxMaterials.TabIndex = 48; // // label26 // this.label26.AutoSize = true; - this.label26.Location = new System.Drawing.Point(30, 74); - this.label26.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label26.Location = new System.Drawing.Point(22, 60); this.label26.Name = "label26"; - this.label26.Size = new System.Drawing.Size(14, 17); + this.label26.Size = new System.Drawing.Size(12, 13); this.label26.TabIndex = 36; this.label26.Text = "x"; // // label20 // this.label20.AutoSize = true; - this.label20.Location = new System.Drawing.Point(152, 138); - this.label20.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label20.Location = new System.Drawing.Point(114, 112); this.label20.Name = "label20"; - this.label20.Size = new System.Drawing.Size(34, 17); + this.label20.Size = new System.Drawing.Size(28, 13); this.label20.TabIndex = 42; this.label20.Text = "Yaw"; // // domainUpDownAlpha // - this.domainUpDownAlpha.Location = new System.Drawing.Point(549, 174); - this.domainUpDownAlpha.Margin = new System.Windows.Forms.Padding(4); + this.domainUpDownAlpha.Location = new System.Drawing.Point(412, 141); this.domainUpDownAlpha.Name = "domainUpDownAlpha"; - this.domainUpDownAlpha.Size = new System.Drawing.Size(80, 22); + this.domainUpDownAlpha.Size = new System.Drawing.Size(60, 20); this.domainUpDownAlpha.TabIndex = 57; this.domainUpDownAlpha.Text = "1"; // // label29 // this.label29.AutoSize = true; - this.label29.Location = new System.Drawing.Point(487, 41); - this.label29.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label29.Location = new System.Drawing.Point(365, 33); this.label29.Name = "label29"; - this.label29.Size = new System.Drawing.Size(41, 17); + this.label29.Size = new System.Drawing.Size(31, 13); this.label29.TabIndex = 49; this.label29.Text = "Color"; // // label25 // this.label25.AutoSize = true; - this.label25.Location = new System.Drawing.Point(30, 106); - this.label25.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label25.Location = new System.Drawing.Point(22, 86); this.label25.Name = "label25"; - this.label25.Size = new System.Drawing.Size(15, 17); + this.label25.Size = new System.Drawing.Size(12, 13); this.label25.TabIndex = 37; this.label25.Text = "y"; // // label21 // this.label21.AutoSize = true; - this.label21.Location = new System.Drawing.Point(148, 106); - this.label21.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label21.Location = new System.Drawing.Point(111, 86); this.label21.Name = "label21"; - this.label21.Size = new System.Drawing.Size(39, 17); + this.label21.Size = new System.Drawing.Size(31, 13); this.label21.TabIndex = 41; this.label21.Text = "Pitch"; // // label33 // this.label33.AutoSize = true; - this.label33.Location = new System.Drawing.Point(496, 176); - this.label33.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label33.Location = new System.Drawing.Point(372, 143); this.label33.Name = "label33"; - this.label33.Size = new System.Drawing.Size(44, 17); + this.label33.Size = new System.Drawing.Size(34, 13); this.label33.TabIndex = 56; this.label33.Text = "Alpha"; // // domainUpDownRed // - this.domainUpDownRed.Location = new System.Drawing.Point(549, 75); - this.domainUpDownRed.Margin = new System.Windows.Forms.Padding(4); + this.domainUpDownRed.Location = new System.Drawing.Point(412, 61); this.domainUpDownRed.Name = "domainUpDownRed"; - this.domainUpDownRed.Size = new System.Drawing.Size(80, 22); + this.domainUpDownRed.Size = new System.Drawing.Size(60, 20); this.domainUpDownRed.TabIndex = 50; this.domainUpDownRed.Text = "1"; // // label24 // this.label24.AutoSize = true; - this.label24.Location = new System.Drawing.Point(30, 138); - this.label24.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label24.Location = new System.Drawing.Point(22, 112); this.label24.Name = "label24"; - this.label24.Size = new System.Drawing.Size(15, 17); + this.label24.Size = new System.Drawing.Size(12, 13); this.label24.TabIndex = 38; this.label24.Text = "z"; // // label22 // this.label22.AutoSize = true; - this.label22.Location = new System.Drawing.Point(156, 74); - this.label22.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label22.Location = new System.Drawing.Point(117, 60); this.label22.Name = "label22"; - this.label22.Size = new System.Drawing.Size(32, 17); + this.label22.Size = new System.Drawing.Size(25, 13); this.label22.TabIndex = 40; this.label22.Text = "Roll"; // // label32 // this.label32.AutoSize = true; - this.label32.Location = new System.Drawing.Point(504, 144); - this.label32.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label32.Location = new System.Drawing.Point(378, 117); this.label32.Name = "label32"; - this.label32.Size = new System.Drawing.Size(36, 17); + this.label32.Size = new System.Drawing.Size(28, 13); this.label32.TabIndex = 55; this.label32.Text = "Blue"; // // domainUpDownGreen // - this.domainUpDownGreen.Location = new System.Drawing.Point(549, 110); - this.domainUpDownGreen.Margin = new System.Windows.Forms.Padding(4); + this.domainUpDownGreen.Location = new System.Drawing.Point(412, 89); this.domainUpDownGreen.Name = "domainUpDownGreen"; - this.domainUpDownGreen.Size = new System.Drawing.Size(80, 22); + this.domainUpDownGreen.Size = new System.Drawing.Size(60, 20); this.domainUpDownGreen.TabIndex = 51; this.domainUpDownGreen.Text = "1"; // // textBoxVisualOriginX // - this.textBoxVisualOriginX.Location = new System.Drawing.Point(55, 74); - this.textBoxVisualOriginX.Margin = new System.Windows.Forms.Padding(4); + this.textBoxVisualOriginX.Location = new System.Drawing.Point(41, 60); this.textBoxVisualOriginX.Name = "textBoxVisualOriginX"; - this.textBoxVisualOriginX.Size = new System.Drawing.Size(86, 22); + this.textBoxVisualOriginX.Size = new System.Drawing.Size(66, 20); this.textBoxVisualOriginX.TabIndex = 33; // // label31 // this.label31.AutoSize = true; - this.label31.Location = new System.Drawing.Point(493, 112); - this.label31.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label31.Location = new System.Drawing.Point(370, 91); this.label31.Name = "label31"; - this.label31.Size = new System.Drawing.Size(48, 17); + this.label31.Size = new System.Drawing.Size(36, 13); this.label31.TabIndex = 54; this.label31.Text = "Green"; // // domainUpDownBlue // - this.domainUpDownBlue.Location = new System.Drawing.Point(549, 142); - this.domainUpDownBlue.Margin = new System.Windows.Forms.Padding(4); + this.domainUpDownBlue.Location = new System.Drawing.Point(412, 115); this.domainUpDownBlue.Name = "domainUpDownBlue"; - this.domainUpDownBlue.Size = new System.Drawing.Size(80, 22); + this.domainUpDownBlue.Size = new System.Drawing.Size(60, 20); this.domainUpDownBlue.TabIndex = 52; this.domainUpDownBlue.Text = "1"; // // label23 // this.label23.AutoSize = true; - this.label23.Location = new System.Drawing.Point(9, 41); - this.label23.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label23.Location = new System.Drawing.Point(7, 33); this.label23.Name = "label23"; - this.label23.Size = new System.Drawing.Size(71, 17); + this.label23.Size = new System.Drawing.Size(51, 13); this.label23.TabIndex = 39; this.label23.Text = "Origin (m)"; // // textBoxVisualOriginY // - this.textBoxVisualOriginY.Location = new System.Drawing.Point(55, 106); - this.textBoxVisualOriginY.Margin = new System.Windows.Forms.Padding(4); + this.textBoxVisualOriginY.Location = new System.Drawing.Point(41, 86); this.textBoxVisualOriginY.Name = "textBoxVisualOriginY"; - this.textBoxVisualOriginY.Size = new System.Drawing.Size(86, 22); + this.textBoxVisualOriginY.Size = new System.Drawing.Size(66, 20); this.textBoxVisualOriginY.TabIndex = 34; // // label30 // this.label30.AutoSize = true; - this.label30.Location = new System.Drawing.Point(505, 78); - this.label30.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label30.Location = new System.Drawing.Point(379, 63); this.label30.Name = "label30"; - this.label30.Size = new System.Drawing.Size(34, 17); + this.label30.Size = new System.Drawing.Size(27, 13); this.label30.TabIndex = 53; this.label30.Text = "Red"; // // textBoxTexture // - this.textBoxTexture.Location = new System.Drawing.Point(21, 371); - this.textBoxTexture.Margin = new System.Windows.Forms.Padding(4); + this.textBoxTexture.Location = new System.Drawing.Point(16, 301); this.textBoxTexture.Name = "textBoxTexture"; - this.textBoxTexture.Size = new System.Drawing.Size(468, 22); + this.textBoxTexture.Size = new System.Drawing.Size(352, 20); this.textBoxTexture.TabIndex = 58; // // treeViewLinkProperties @@ -921,20 +854,18 @@ private void InitializeComponent() this.treeViewLinkProperties.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.treeViewLinkProperties.Location = new System.Drawing.Point(16, 98); - this.treeViewLinkProperties.Margin = new System.Windows.Forms.Padding(4); + this.treeViewLinkProperties.Location = new System.Drawing.Point(12, 80); this.treeViewLinkProperties.Name = "treeViewLinkProperties"; - this.treeViewLinkProperties.Size = new System.Drawing.Size(600, 698); + this.treeViewLinkProperties.Size = new System.Drawing.Size(451, 568); this.treeViewLinkProperties.TabIndex = 74; this.treeViewLinkProperties.AfterSelect += new System.Windows.Forms.TreeViewEventHandler(this.TreeViewLinkPropertiesAfterSelect); // // buttonJointNext // this.buttonJointNext.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); - this.buttonJointNext.Location = new System.Drawing.Point(1315, 804); - this.buttonJointNext.Margin = new System.Windows.Forms.Padding(4); + this.buttonJointNext.Location = new System.Drawing.Point(986, 653); this.buttonJointNext.Name = "buttonJointNext"; - this.buttonJointNext.Size = new System.Drawing.Size(100, 28); + this.buttonJointNext.Size = new System.Drawing.Size(75, 23); this.buttonJointNext.TabIndex = 162; this.buttonJointNext.Text = "Next"; this.buttonJointNext.UseVisualStyleBackColor = true; @@ -943,10 +874,9 @@ private void InitializeComponent() // buttonJointCancel // this.buttonJointCancel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); - this.buttonJointCancel.Location = new System.Drawing.Point(16, 804); - this.buttonJointCancel.Margin = new System.Windows.Forms.Padding(4); + this.buttonJointCancel.Location = new System.Drawing.Point(12, 653); this.buttonJointCancel.Name = "buttonJointCancel"; - this.buttonJointCancel.Size = new System.Drawing.Size(100, 28); + this.buttonJointCancel.Size = new System.Drawing.Size(75, 23); this.buttonJointCancel.TabIndex = 160; this.buttonJointCancel.Text = "Cancel"; this.buttonJointCancel.UseVisualStyleBackColor = true; @@ -956,84 +886,75 @@ private void InitializeComponent() // this.label7.AutoSize = true; this.label7.Font = new System.Drawing.Font("Microsoft Sans Serif", 10F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.label7.Location = new System.Drawing.Point(16, 11); - this.label7.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label7.Location = new System.Drawing.Point(12, 9); this.label7.Name = "label7"; - this.label7.Size = new System.Drawing.Size(230, 20); + this.label7.Size = new System.Drawing.Size(198, 17); this.label7.TabIndex = 223; this.label7.Text = "Configure Joint Properties"; // // label6 // this.label6.AutoSize = true; - this.label6.Location = new System.Drawing.Point(844, 352); - this.label6.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label6.Location = new System.Drawing.Point(633, 286); this.label6.Name = "label6"; - this.label6.Size = new System.Drawing.Size(113, 17); + this.label6.Size = new System.Drawing.Size(82, 13); this.label6.TabIndex = 221; this.label6.Text = "Orientation (rad)"; // // label3 // this.label3.AutoSize = true; - this.label3.Location = new System.Drawing.Point(704, 352); - this.label3.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label3.Location = new System.Drawing.Point(528, 286); this.label3.Name = "label3"; - this.label3.Size = new System.Drawing.Size(83, 17); + this.label3.Size = new System.Drawing.Size(61, 13); this.label3.TabIndex = 220; this.label3.Text = "Position (m)"; // // textBoxKVelocity // - this.textBoxKVelocity.Location = new System.Drawing.Point(1273, 665); - this.textBoxKVelocity.Margin = new System.Windows.Forms.Padding(4); + this.textBoxKVelocity.Location = new System.Drawing.Point(955, 540); this.textBoxKVelocity.Name = "textBoxKVelocity"; - this.textBoxKVelocity.Size = new System.Drawing.Size(86, 22); + this.textBoxKVelocity.Size = new System.Drawing.Size(66, 20); this.textBoxKVelocity.TabIndex = 218; // // labelKVelocity // this.labelKVelocity.AutoSize = true; - this.labelKVelocity.Location = new System.Drawing.Point(1196, 668); - this.labelKVelocity.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.labelKVelocity.Location = new System.Drawing.Point(897, 543); this.labelKVelocity.Name = "labelKVelocity"; - this.labelKVelocity.Size = new System.Drawing.Size(66, 17); + this.labelKVelocity.Size = new System.Drawing.Size(52, 13); this.labelKVelocity.TabIndex = 219; this.labelKVelocity.Text = "k velocity"; // // textBoxSoftLower // - this.textBoxSoftLower.Location = new System.Drawing.Point(1273, 566); - this.textBoxSoftLower.Margin = new System.Windows.Forms.Padding(4); + this.textBoxSoftLower.Location = new System.Drawing.Point(955, 460); this.textBoxSoftLower.Name = "textBoxSoftLower"; - this.textBoxSoftLower.Size = new System.Drawing.Size(86, 22); + this.textBoxSoftLower.Size = new System.Drawing.Size(66, 20); this.textBoxSoftLower.TabIndex = 211; // // labelSoftLower // this.labelSoftLower.AutoSize = true; - this.labelSoftLower.Location = new System.Drawing.Point(1138, 570); - this.labelSoftLower.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.labelSoftLower.Location = new System.Drawing.Point(854, 463); this.labelSoftLower.Name = "labelSoftLower"; - this.labelSoftLower.Size = new System.Drawing.Size(131, 17); + this.labelSoftLower.Size = new System.Drawing.Size(96, 13); this.labelSoftLower.TabIndex = 214; this.labelSoftLower.Text = "soft lower limit (rad)"; // // textBoxSoftUpper // - this.textBoxSoftUpper.Location = new System.Drawing.Point(1273, 601); - this.textBoxSoftUpper.Margin = new System.Windows.Forms.Padding(4); + this.textBoxSoftUpper.Location = new System.Drawing.Point(955, 488); this.textBoxSoftUpper.Name = "textBoxSoftUpper"; - this.textBoxSoftUpper.Size = new System.Drawing.Size(86, 22); + this.textBoxSoftUpper.Size = new System.Drawing.Size(66, 20); this.textBoxSoftUpper.TabIndex = 212; // // labelSoftUpper // this.labelSoftUpper.AutoSize = true; - this.labelSoftUpper.Location = new System.Drawing.Point(1134, 604); - this.labelSoftUpper.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.labelSoftUpper.Location = new System.Drawing.Point(850, 491); this.labelSoftUpper.Name = "labelSoftUpper"; - this.labelSoftUpper.Size = new System.Drawing.Size(135, 17); + this.labelSoftUpper.Size = new System.Drawing.Size(98, 13); this.labelSoftUpper.TabIndex = 215; this.labelSoftUpper.Text = "soft upper limit (rad)"; // @@ -1041,64 +962,57 @@ private void InitializeComponent() // this.label80.AutoSize = true; this.label80.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.label80.Location = new System.Drawing.Point(1269, 530); - this.label80.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label80.Location = new System.Drawing.Point(952, 431); this.label80.Name = "label80"; - this.label80.Size = new System.Drawing.Size(130, 17); + this.label80.Size = new System.Drawing.Size(101, 13); this.label80.TabIndex = 217; this.label80.Text = "Safety Controller"; // // textBoxKPosition // - this.textBoxKPosition.Location = new System.Drawing.Point(1273, 633); - this.textBoxKPosition.Margin = new System.Windows.Forms.Padding(4); + this.textBoxKPosition.Location = new System.Drawing.Point(955, 514); this.textBoxKPosition.Name = "textBoxKPosition"; - this.textBoxKPosition.Size = new System.Drawing.Size(86, 22); + this.textBoxKPosition.Size = new System.Drawing.Size(66, 20); this.textBoxKPosition.TabIndex = 213; // // labelKPosition // this.labelKPosition.AutoSize = true; - this.labelKPosition.Location = new System.Drawing.Point(1196, 636); - this.labelKPosition.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.labelKPosition.Location = new System.Drawing.Point(897, 517); this.labelKPosition.Name = "labelKPosition"; - this.labelKPosition.Size = new System.Drawing.Size(68, 17); + this.labelKPosition.Size = new System.Drawing.Size(52, 13); this.labelKPosition.TabIndex = 216; this.labelKPosition.Text = "k position"; // // textBoxFriction // - this.textBoxFriction.Location = new System.Drawing.Point(1022, 566); - this.textBoxFriction.Margin = new System.Windows.Forms.Padding(4); + this.textBoxFriction.Location = new System.Drawing.Point(766, 460); this.textBoxFriction.Name = "textBoxFriction"; - this.textBoxFriction.Size = new System.Drawing.Size(86, 22); + this.textBoxFriction.Size = new System.Drawing.Size(66, 20); this.textBoxFriction.TabIndex = 206; // // labelFriction // this.labelFriction.AutoSize = true; - this.labelFriction.Location = new System.Drawing.Point(925, 570); - this.labelFriction.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.labelFriction.Location = new System.Drawing.Point(694, 463); this.labelFriction.Name = "labelFriction"; - this.labelFriction.Size = new System.Drawing.Size(90, 17); + this.labelFriction.Size = new System.Drawing.Size(67, 13); this.labelFriction.TabIndex = 208; this.labelFriction.Text = "friction (N*m)"; // // textBoxDamping // - this.textBoxDamping.Location = new System.Drawing.Point(1022, 598); - this.textBoxDamping.Margin = new System.Windows.Forms.Padding(4); + this.textBoxDamping.Location = new System.Drawing.Point(766, 486); this.textBoxDamping.Name = "textBoxDamping"; - this.textBoxDamping.Size = new System.Drawing.Size(86, 22); + this.textBoxDamping.Size = new System.Drawing.Size(66, 20); this.textBoxDamping.TabIndex = 207; // // labelDamping // this.labelDamping.AutoSize = true; - this.labelDamping.Location = new System.Drawing.Point(856, 602); - this.labelDamping.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.labelDamping.Location = new System.Drawing.Point(642, 489); this.labelDamping.Name = "labelDamping"; - this.labelDamping.Size = new System.Drawing.Size(160, 17); + this.labelDamping.Size = new System.Drawing.Size(119, 13); this.labelDamping.TabIndex = 209; this.labelDamping.Text = "damping (N*m*s*rad^-1)"; // @@ -1106,46 +1020,41 @@ private void InitializeComponent() // this.label76.AutoSize = true; this.label76.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.label76.Location = new System.Drawing.Point(1019, 526); - this.label76.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label76.Location = new System.Drawing.Point(764, 427); this.label76.Name = "label76"; - this.label76.Size = new System.Drawing.Size(77, 17); + this.label76.Size = new System.Drawing.Size(61, 13); this.label76.TabIndex = 210; this.label76.Text = "Dynamics"; // // textBoxCalibrationRising // - this.textBoxCalibrationRising.Location = new System.Drawing.Point(708, 566); - this.textBoxCalibrationRising.Margin = new System.Windows.Forms.Padding(4); + this.textBoxCalibrationRising.Location = new System.Drawing.Point(531, 460); this.textBoxCalibrationRising.Name = "textBoxCalibrationRising"; - this.textBoxCalibrationRising.Size = new System.Drawing.Size(86, 22); + this.textBoxCalibrationRising.Size = new System.Drawing.Size(66, 20); this.textBoxCalibrationRising.TabIndex = 201; // // label7CalibrationRising // this.label7CalibrationRising.AutoSize = true; - this.label7CalibrationRising.Location = new System.Drawing.Point(659, 570); - this.label7CalibrationRising.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label7CalibrationRising.Location = new System.Drawing.Point(494, 463); this.label7CalibrationRising.Name = "label7CalibrationRising"; - this.label7CalibrationRising.Size = new System.Drawing.Size(42, 17); + this.label7CalibrationRising.Size = new System.Drawing.Size(31, 13); this.label7CalibrationRising.TabIndex = 203; this.label7CalibrationRising.Text = "rising"; // // textBoxCalibrationFalling // - this.textBoxCalibrationFalling.Location = new System.Drawing.Point(708, 598); - this.textBoxCalibrationFalling.Margin = new System.Windows.Forms.Padding(4); + this.textBoxCalibrationFalling.Location = new System.Drawing.Point(531, 486); this.textBoxCalibrationFalling.Name = "textBoxCalibrationFalling"; - this.textBoxCalibrationFalling.Size = new System.Drawing.Size(86, 22); + this.textBoxCalibrationFalling.Size = new System.Drawing.Size(66, 20); this.textBoxCalibrationFalling.TabIndex = 202; // // label73 // this.label73.AutoSize = true; - this.label73.Location = new System.Drawing.Point(654, 602); - this.label73.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label73.Location = new System.Drawing.Point(490, 489); this.label73.Name = "label73"; - this.label73.Size = new System.Drawing.Size(45, 17); + this.label73.Size = new System.Drawing.Size(34, 13); this.label73.TabIndex = 204; this.label73.Text = "falling"; // @@ -1153,64 +1062,57 @@ private void InitializeComponent() // this.label74.AutoSize = true; this.label74.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.label74.Location = new System.Drawing.Point(704, 526); - this.label74.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label74.Location = new System.Drawing.Point(528, 427); this.label74.Name = "label74"; - this.label74.Size = new System.Drawing.Size(86, 17); + this.label74.Size = new System.Drawing.Size(67, 13); this.label74.TabIndex = 205; this.label74.Text = "Calibration"; // // textBoxLimitVelocity // - this.textBoxLimitVelocity.Location = new System.Drawing.Point(1273, 466); - this.textBoxLimitVelocity.Margin = new System.Windows.Forms.Padding(4); + this.textBoxLimitVelocity.Location = new System.Drawing.Point(955, 379); this.textBoxLimitVelocity.Name = "textBoxLimitVelocity"; - this.textBoxLimitVelocity.Size = new System.Drawing.Size(86, 22); + this.textBoxLimitVelocity.Size = new System.Drawing.Size(66, 20); this.textBoxLimitVelocity.TabIndex = 199; // // labelVelocity // this.labelVelocity.AutoSize = true; - this.labelVelocity.Location = new System.Drawing.Point(1172, 469); - this.labelVelocity.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.labelVelocity.Location = new System.Drawing.Point(879, 381); this.labelVelocity.Name = "labelVelocity"; - this.labelVelocity.Size = new System.Drawing.Size(91, 17); + this.labelVelocity.Size = new System.Drawing.Size(70, 13); this.labelVelocity.TabIndex = 200; this.labelVelocity.Text = "velocity (m/s)"; // // textBoxLimitLower // - this.textBoxLimitLower.Location = new System.Drawing.Point(1273, 370); - this.textBoxLimitLower.Margin = new System.Windows.Forms.Padding(4); + this.textBoxLimitLower.Location = new System.Drawing.Point(955, 301); this.textBoxLimitLower.Name = "textBoxLimitLower"; - this.textBoxLimitLower.Size = new System.Drawing.Size(86, 22); + this.textBoxLimitLower.Size = new System.Drawing.Size(66, 20); this.textBoxLimitLower.TabIndex = 192; // // labelLowerLimit // this.labelLowerLimit.AutoSize = true; - this.labelLowerLimit.Location = new System.Drawing.Point(1191, 373); - this.labelLowerLimit.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.labelLowerLimit.Location = new System.Drawing.Point(893, 303); this.labelLowerLimit.Name = "labelLowerLimit"; - this.labelLowerLimit.Size = new System.Drawing.Size(76, 17); + this.labelLowerLimit.Size = new System.Drawing.Size(56, 13); this.labelLowerLimit.TabIndex = 195; this.labelLowerLimit.Text = "lower (rad)"; // // textBoxLimitUpper // - this.textBoxLimitUpper.Location = new System.Drawing.Point(1273, 402); - this.textBoxLimitUpper.Margin = new System.Windows.Forms.Padding(4); + this.textBoxLimitUpper.Location = new System.Drawing.Point(955, 327); this.textBoxLimitUpper.Name = "textBoxLimitUpper"; - this.textBoxLimitUpper.Size = new System.Drawing.Size(86, 22); + this.textBoxLimitUpper.Size = new System.Drawing.Size(66, 20); this.textBoxLimitUpper.TabIndex = 193; // // labelLimitUpper // this.labelLimitUpper.AutoSize = true; - this.labelLimitUpper.Location = new System.Drawing.Point(1188, 406); - this.labelLimitUpper.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.labelLimitUpper.Location = new System.Drawing.Point(891, 330); this.labelLimitUpper.Name = "labelLimitUpper"; - this.labelLimitUpper.Size = new System.Drawing.Size(80, 17); + this.labelLimitUpper.Size = new System.Drawing.Size(58, 13); this.labelLimitUpper.TabIndex = 196; this.labelLimitUpper.Text = "upper (rad)"; // @@ -1218,28 +1120,25 @@ private void InitializeComponent() // this.label68.AutoSize = true; this.label68.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.label68.Location = new System.Drawing.Point(1269, 331); - this.label68.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label68.Location = new System.Drawing.Point(952, 269); this.label68.Name = "label68"; - this.label68.Size = new System.Drawing.Size(42, 17); + this.label68.Size = new System.Drawing.Size(33, 13); this.label68.TabIndex = 198; this.label68.Text = "Limit"; // // textBoxLimitEffort // - this.textBoxLimitEffort.Location = new System.Drawing.Point(1273, 434); - this.textBoxLimitEffort.Margin = new System.Windows.Forms.Padding(4); + this.textBoxLimitEffort.Location = new System.Drawing.Point(955, 353); this.textBoxLimitEffort.Name = "textBoxLimitEffort"; - this.textBoxLimitEffort.Size = new System.Drawing.Size(86, 22); + this.textBoxLimitEffort.Size = new System.Drawing.Size(66, 20); this.textBoxLimitEffort.TabIndex = 194; // // labelEffort // this.labelEffort.AutoSize = true; - this.labelEffort.Location = new System.Drawing.Point(1187, 437); - this.labelEffort.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.labelEffort.Location = new System.Drawing.Point(890, 355); this.labelEffort.Name = "labelEffort"; - this.labelEffort.Size = new System.Drawing.Size(81, 17); + this.labelEffort.Size = new System.Drawing.Size(59, 13); this.labelEffort.TabIndex = 197; this.labelEffort.Text = "effort (N-m)"; // @@ -1247,10 +1146,9 @@ private void InitializeComponent() // this.label65.AutoSize = true; this.label65.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.label65.Location = new System.Drawing.Point(692, 130); - this.label65.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label65.Location = new System.Drawing.Point(519, 106); this.label65.Name = "label65"; - this.label65.Size = new System.Drawing.Size(73, 17); + this.label65.Size = new System.Drawing.Size(56, 13); this.label65.TabIndex = 191; this.label65.Text = "Child Link:"; // @@ -1258,10 +1156,9 @@ private void InitializeComponent() // this.label64.AutoSize = true; this.label64.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.label64.Location = new System.Drawing.Point(683, 98); - this.label64.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label64.Location = new System.Drawing.Point(512, 80); this.label64.Name = "label64"; - this.label64.Size = new System.Drawing.Size(84, 17); + this.label64.Size = new System.Drawing.Size(64, 13); this.label64.TabIndex = 190; this.label64.Text = "Parent Link:"; // @@ -1269,29 +1166,26 @@ private void InitializeComponent() // this.label63.AutoSize = true; this.label63.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.label63.Location = new System.Drawing.Point(684, 160); - this.label63.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label63.Location = new System.Drawing.Point(513, 130); this.label63.Name = "label63"; - this.label63.Size = new System.Drawing.Size(79, 17); + this.label63.Size = new System.Drawing.Size(60, 13); this.label63.TabIndex = 189; this.label63.Text = "Joint Name"; // // textBoxJointName // - this.textBoxJointName.Location = new System.Drawing.Point(716, 182); - this.textBoxJointName.Margin = new System.Windows.Forms.Padding(4); + this.textBoxJointName.Location = new System.Drawing.Point(537, 148); this.textBoxJointName.Name = "textBoxJointName"; - this.textBoxJointName.Size = new System.Drawing.Size(392, 22); + this.textBoxJointName.Size = new System.Drawing.Size(295, 20); this.textBoxJointName.TabIndex = 188; // // label62 // this.label62.AutoSize = true; this.label62.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.label62.Location = new System.Drawing.Point(1138, 162); - this.label62.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label62.Location = new System.Drawing.Point(854, 132); this.label62.Name = "label62"; - this.label62.Size = new System.Drawing.Size(74, 17); + this.label62.Size = new System.Drawing.Size(56, 13); this.label62.TabIndex = 187; this.label62.Text = "Joint Type"; // @@ -1305,45 +1199,40 @@ private void InitializeComponent() "planar", "prismatic", "revolute"}); - this.comboBoxJointType.Location = new System.Drawing.Point(1187, 183); - this.comboBoxJointType.Margin = new System.Windows.Forms.Padding(4); + this.comboBoxJointType.Location = new System.Drawing.Point(890, 149); this.comboBoxJointType.Name = "comboBoxJointType"; - this.comboBoxJointType.Size = new System.Drawing.Size(160, 24); + this.comboBoxJointType.Size = new System.Drawing.Size(121, 21); this.comboBoxJointType.TabIndex = 186; // // textBoxAxisX // - this.textBoxAxisX.Location = new System.Drawing.Point(1022, 373); - this.textBoxAxisX.Margin = new System.Windows.Forms.Padding(4); + this.textBoxAxisX.Location = new System.Drawing.Point(766, 303); this.textBoxAxisX.Name = "textBoxAxisX"; - this.textBoxAxisX.Size = new System.Drawing.Size(86, 22); + this.textBoxAxisX.Size = new System.Drawing.Size(66, 20); this.textBoxAxisX.TabIndex = 179; // // label58 // this.label58.AutoSize = true; - this.label58.Location = new System.Drawing.Point(999, 373); - this.label58.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label58.Location = new System.Drawing.Point(749, 303); this.label58.Name = "label58"; - this.label58.Size = new System.Drawing.Size(14, 17); + this.label58.Size = new System.Drawing.Size(12, 13); this.label58.TabIndex = 182; this.label58.Text = "x"; // // textBoxAxisY // - this.textBoxAxisY.Location = new System.Drawing.Point(1022, 405); - this.textBoxAxisY.Margin = new System.Windows.Forms.Padding(4); + this.textBoxAxisY.Location = new System.Drawing.Point(766, 329); this.textBoxAxisY.Name = "textBoxAxisY"; - this.textBoxAxisY.Size = new System.Drawing.Size(86, 22); + this.textBoxAxisY.Size = new System.Drawing.Size(66, 20); this.textBoxAxisY.TabIndex = 180; // // label59 // this.label59.AutoSize = true; - this.label59.Location = new System.Drawing.Point(999, 409); - this.label59.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label59.Location = new System.Drawing.Point(749, 332); this.label59.Name = "label59"; - this.label59.Size = new System.Drawing.Size(15, 17); + this.label59.Size = new System.Drawing.Size(12, 13); this.label59.TabIndex = 183; this.label59.Text = "y"; // @@ -1351,98 +1240,87 @@ private void InitializeComponent() // this.label60.AutoSize = true; this.label60.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.label60.Location = new System.Drawing.Point(1019, 331); - this.label60.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label60.Location = new System.Drawing.Point(764, 269); this.label60.Name = "label60"; - this.label60.Size = new System.Drawing.Size(37, 17); + this.label60.Size = new System.Drawing.Size(30, 13); this.label60.TabIndex = 185; this.label60.Text = "Axis"; // // textBoxAxisZ // - this.textBoxAxisZ.Location = new System.Drawing.Point(1022, 437); - this.textBoxAxisZ.Margin = new System.Windows.Forms.Padding(4); + this.textBoxAxisZ.Location = new System.Drawing.Point(766, 355); this.textBoxAxisZ.Name = "textBoxAxisZ"; - this.textBoxAxisZ.Size = new System.Drawing.Size(86, 22); + this.textBoxAxisZ.Size = new System.Drawing.Size(66, 20); this.textBoxAxisZ.TabIndex = 181; // // label61 // this.label61.AutoSize = true; - this.label61.Location = new System.Drawing.Point(999, 439); - this.label61.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label61.Location = new System.Drawing.Point(749, 357); this.label61.Name = "label61"; - this.label61.Size = new System.Drawing.Size(15, 17); + this.label61.Size = new System.Drawing.Size(12, 13); this.label61.TabIndex = 184; this.label61.Text = "z"; // // textBoxJointX // - this.textBoxJointX.Location = new System.Drawing.Point(707, 373); - this.textBoxJointX.Margin = new System.Windows.Forms.Padding(4); + this.textBoxJointX.Location = new System.Drawing.Point(530, 303); this.textBoxJointX.Name = "textBoxJointX"; - this.textBoxJointX.Size = new System.Drawing.Size(86, 22); + this.textBoxJointX.Size = new System.Drawing.Size(66, 20); this.textBoxJointX.TabIndex = 166; // // label51 // this.label51.AutoSize = true; - this.label51.Location = new System.Drawing.Point(808, 378); - this.label51.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label51.Location = new System.Drawing.Point(606, 307); this.label51.Name = "label51"; - this.label51.Size = new System.Drawing.Size(32, 17); + this.label51.Size = new System.Drawing.Size(25, 13); this.label51.TabIndex = 173; this.label51.Text = "Roll"; // // textBoxJointYaw // - this.textBoxJointYaw.Location = new System.Drawing.Point(851, 437); - this.textBoxJointYaw.Margin = new System.Windows.Forms.Padding(4); + this.textBoxJointYaw.Location = new System.Drawing.Point(638, 355); this.textBoxJointYaw.Name = "textBoxJointYaw"; - this.textBoxJointYaw.Size = new System.Drawing.Size(86, 22); + this.textBoxJointYaw.Size = new System.Drawing.Size(66, 20); this.textBoxJointYaw.TabIndex = 178; // // textBoxJointPitch // - this.textBoxJointPitch.Location = new System.Drawing.Point(851, 405); - this.textBoxJointPitch.Margin = new System.Windows.Forms.Padding(4); + this.textBoxJointPitch.Location = new System.Drawing.Point(638, 329); this.textBoxJointPitch.Name = "textBoxJointPitch"; - this.textBoxJointPitch.Size = new System.Drawing.Size(86, 22); + this.textBoxJointPitch.Size = new System.Drawing.Size(66, 20); this.textBoxJointPitch.TabIndex = 177; // // label52 // this.label52.AutoSize = true; - this.label52.Location = new System.Drawing.Point(683, 373); - this.label52.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label52.Location = new System.Drawing.Point(512, 303); this.label52.Name = "label52"; - this.label52.Size = new System.Drawing.Size(14, 17); + this.label52.Size = new System.Drawing.Size(12, 13); this.label52.TabIndex = 169; this.label52.Text = "x"; // // textBoxJointRoll // - this.textBoxJointRoll.Location = new System.Drawing.Point(850, 373); - this.textBoxJointRoll.Margin = new System.Windows.Forms.Padding(4); + this.textBoxJointRoll.Location = new System.Drawing.Point(638, 303); this.textBoxJointRoll.Name = "textBoxJointRoll"; - this.textBoxJointRoll.Size = new System.Drawing.Size(86, 22); + this.textBoxJointRoll.Size = new System.Drawing.Size(66, 20); this.textBoxJointRoll.TabIndex = 176; // // textBoxJointY // - this.textBoxJointY.Location = new System.Drawing.Point(707, 405); - this.textBoxJointY.Margin = new System.Windows.Forms.Padding(4); + this.textBoxJointY.Location = new System.Drawing.Point(530, 329); this.textBoxJointY.Name = "textBoxJointY"; - this.textBoxJointY.Size = new System.Drawing.Size(86, 22); + this.textBoxJointY.Size = new System.Drawing.Size(66, 20); this.textBoxJointY.TabIndex = 167; // // label53 // this.label53.AutoSize = true; - this.label53.Location = new System.Drawing.Point(683, 409); - this.label53.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label53.Location = new System.Drawing.Point(512, 332); this.label53.Name = "label53"; - this.label53.Size = new System.Drawing.Size(15, 17); + this.label53.Size = new System.Drawing.Size(12, 13); this.label53.TabIndex = 170; this.label53.Text = "y"; // @@ -1450,75 +1328,67 @@ private void InitializeComponent() // this.label54.AutoSize = true; this.label54.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.label54.Location = new System.Drawing.Point(704, 331); - this.label54.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label54.Location = new System.Drawing.Point(528, 269); this.label54.Name = "label54"; - this.label54.Size = new System.Drawing.Size(52, 17); + this.label54.Size = new System.Drawing.Size(40, 13); this.label54.TabIndex = 172; this.label54.Text = "Origin"; // // label55 // this.label55.AutoSize = true; - this.label55.Location = new System.Drawing.Point(802, 410); - this.label55.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label55.Location = new System.Drawing.Point(602, 333); this.label55.Name = "label55"; - this.label55.Size = new System.Drawing.Size(39, 17); + this.label55.Size = new System.Drawing.Size(31, 13); this.label55.TabIndex = 174; this.label55.Text = "Pitch"; // // label56 // this.label56.AutoSize = true; - this.label56.Location = new System.Drawing.Point(805, 441); - this.label56.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label56.Location = new System.Drawing.Point(604, 358); this.label56.Name = "label56"; - this.label56.Size = new System.Drawing.Size(34, 17); + this.label56.Size = new System.Drawing.Size(28, 13); this.label56.TabIndex = 175; this.label56.Text = "Yaw"; // // textBoxJointZ // - this.textBoxJointZ.Location = new System.Drawing.Point(707, 437); - this.textBoxJointZ.Margin = new System.Windows.Forms.Padding(4); + this.textBoxJointZ.Location = new System.Drawing.Point(530, 355); this.textBoxJointZ.Name = "textBoxJointZ"; - this.textBoxJointZ.Size = new System.Drawing.Size(86, 22); + this.textBoxJointZ.Size = new System.Drawing.Size(66, 20); this.textBoxJointZ.TabIndex = 168; // // label57 // this.label57.AutoSize = true; - this.label57.Location = new System.Drawing.Point(684, 441); - this.label57.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label57.Location = new System.Drawing.Point(513, 358); this.label57.Name = "label57"; - this.label57.Size = new System.Drawing.Size(15, 17); + this.label57.Size = new System.Drawing.Size(12, 13); this.label57.TabIndex = 171; this.label57.Text = "z"; // // labelChild // this.labelChild.AutoSize = true; - this.labelChild.Location = new System.Drawing.Point(766, 130); - this.labelChild.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.labelChild.Location = new System.Drawing.Point(574, 106); this.labelChild.Name = "labelChild"; - this.labelChild.Size = new System.Drawing.Size(0, 17); + this.labelChild.Size = new System.Drawing.Size(0, 13); this.labelChild.TabIndex = 165; // // labelParent // this.labelParent.AutoSize = true; - this.labelParent.Location = new System.Drawing.Point(765, 98); - this.labelParent.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.labelParent.Location = new System.Drawing.Point(574, 80); this.labelParent.Name = "labelParent"; - this.labelParent.Size = new System.Drawing.Size(0, 17); + this.labelParent.Size = new System.Drawing.Size(0, 13); this.labelParent.TabIndex = 164; // // treeViewJointTree // - this.treeViewJointTree.Location = new System.Drawing.Point(16, 98); - this.treeViewJointTree.Margin = new System.Windows.Forms.Padding(4); + this.treeViewJointTree.Location = new System.Drawing.Point(12, 80); this.treeViewJointTree.Name = "treeViewJointTree"; - this.treeViewJointTree.Size = new System.Drawing.Size(614, 698); + this.treeViewJointTree.Size = new System.Drawing.Size(462, 568); this.treeViewJointTree.TabIndex = 163; this.treeViewJointTree.AfterSelect += new System.Windows.Forms.TreeViewEventHandler(this.TreeViewJointtreeAfterSelect); // @@ -1526,10 +1396,9 @@ private void InitializeComponent() // this.comboBoxAxis.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBoxAxis.FormattingEnabled = true; - this.comboBoxAxis.Location = new System.Drawing.Point(760, 278); - this.comboBoxAxis.Margin = new System.Windows.Forms.Padding(4); + this.comboBoxAxis.Location = new System.Drawing.Point(570, 226); this.comboBoxAxis.Name = "comboBoxAxis"; - this.comboBoxAxis.Size = new System.Drawing.Size(623, 24); + this.comboBoxAxis.Size = new System.Drawing.Size(468, 21); this.comboBoxAxis.TabIndex = 224; this.comboBoxAxis.SelectedIndexChanged += new System.EventHandler(this.ComboBoxAxisSelectedIndexChanged); // @@ -1537,38 +1406,34 @@ private void InitializeComponent() // this.comboBoxOrigin.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBoxOrigin.FormattingEnabled = true; - this.comboBoxOrigin.Location = new System.Drawing.Point(760, 235); - this.comboBoxOrigin.Margin = new System.Windows.Forms.Padding(4); + this.comboBoxOrigin.Location = new System.Drawing.Point(570, 191); this.comboBoxOrigin.Name = "comboBoxOrigin"; - this.comboBoxOrigin.Size = new System.Drawing.Size(623, 24); + this.comboBoxOrigin.Size = new System.Drawing.Size(468, 21); this.comboBoxOrigin.TabIndex = 225; // // label66 // this.label66.AutoSize = true; - this.label66.Location = new System.Drawing.Point(668, 238); - this.label66.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label66.Location = new System.Drawing.Point(501, 193); this.label66.Name = "label66"; - this.label66.Size = new System.Drawing.Size(84, 17); + this.label66.Size = new System.Drawing.Size(63, 13); this.label66.TabIndex = 226; this.label66.Text = "Coordinates"; // // label67 // this.label67.AutoSize = true; - this.label67.Location = new System.Drawing.Point(717, 282); - this.label67.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label67.Location = new System.Drawing.Point(538, 229); this.label67.Name = "label67"; - this.label67.Size = new System.Drawing.Size(33, 17); + this.label67.Size = new System.Drawing.Size(26, 13); this.label67.TabIndex = 227; this.label67.Text = "Axis"; // // label69 // - this.label69.Location = new System.Drawing.Point(29, 42); - this.label69.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label69.Location = new System.Drawing.Point(22, 34); this.label69.Name = "label69"; - this.label69.Size = new System.Drawing.Size(601, 66); + this.label69.Size = new System.Drawing.Size(451, 54); this.label69.TabIndex = 228; this.label69.Text = "Customize the joint properties. If you want to adjust the coordinate systems and " + "axes in the model, click cancel and restart the export. The tool will recognize " + @@ -1577,10 +1442,9 @@ private void InitializeComponent() // label4 // this.label4.AutoSize = true; - this.label4.Location = new System.Drawing.Point(695, 804); - this.label4.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label4.Location = new System.Drawing.Point(521, 653); this.label4.Name = "label4"; - this.label4.Size = new System.Drawing.Size(316, 17); + this.label4.Size = new System.Drawing.Size(239, 13); this.label4.TabIndex = 230; this.label4.Text = "Entries that are blank will not be written to URDF."; // @@ -1588,9 +1452,10 @@ private void InitializeComponent() // this.label1.AutoSize = true; this.label1.Font = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.label1.Location = new System.Drawing.Point(750, 331); + this.label1.Location = new System.Drawing.Point(562, 269); + this.label1.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(14, 17); + this.label1.Size = new System.Drawing.Size(12, 13); this.label1.TabIndex = 231; this.label1.Text = "*"; // @@ -1598,9 +1463,10 @@ private void InitializeComponent() // this.AxisRequiredLabel.AutoSize = true; this.AxisRequiredLabel.Font = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.AxisRequiredLabel.Location = new System.Drawing.Point(1050, 331); + this.AxisRequiredLabel.Location = new System.Drawing.Point(788, 269); + this.AxisRequiredLabel.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); this.AxisRequiredLabel.Name = "AxisRequiredLabel"; - this.AxisRequiredLabel.Size = new System.Drawing.Size(14, 17); + this.AxisRequiredLabel.Size = new System.Drawing.Size(12, 13); this.AxisRequiredLabel.TabIndex = 232; this.AxisRequiredLabel.Text = "*"; // @@ -1608,9 +1474,10 @@ private void InitializeComponent() // this.LimitRequiredLabel.AutoSize = true; this.LimitRequiredLabel.Font = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.LimitRequiredLabel.Location = new System.Drawing.Point(1306, 330); + this.LimitRequiredLabel.Location = new System.Drawing.Point(980, 268); + this.LimitRequiredLabel.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); this.LimitRequiredLabel.Name = "LimitRequiredLabel"; - this.LimitRequiredLabel.Size = new System.Drawing.Size(14, 17); + this.LimitRequiredLabel.Size = new System.Drawing.Size(12, 13); this.LimitRequiredLabel.TabIndex = 233; this.LimitRequiredLabel.Text = "*"; this.LimitRequiredLabel.Visible = false; @@ -1618,18 +1485,20 @@ private void InitializeComponent() // label27 // this.label27.AutoSize = true; - this.label27.Location = new System.Drawing.Point(695, 822); + this.label27.Location = new System.Drawing.Point(521, 668); + this.label27.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); this.label27.Name = "label27"; - this.label27.Size = new System.Drawing.Size(159, 17); + this.label27.Size = new System.Drawing.Size(117, 13); this.label27.TabIndex = 234; this.label27.Text = "* Field group is required"; // // MimicCheckBox // this.MimicCheckBox.AutoSize = true; - this.MimicCheckBox.Location = new System.Drawing.Point(707, 714); + this.MimicCheckBox.Location = new System.Drawing.Point(530, 580); + this.MimicCheckBox.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); this.MimicCheckBox.Name = "MimicCheckBox"; - this.MimicCheckBox.Size = new System.Drawing.Size(139, 21); + this.MimicCheckBox.Size = new System.Drawing.Size(107, 17); this.MimicCheckBox.TabIndex = 235; this.MimicCheckBox.Text = "Mimic Other Joint"; this.MimicCheckBox.UseVisualStyleBackColor = true; @@ -1638,9 +1507,10 @@ private void InitializeComponent() // MimicJointComboBox // this.MimicJointComboBox.FormattingEnabled = true; - this.MimicJointComboBox.Location = new System.Drawing.Point(709, 763); + this.MimicJointComboBox.Location = new System.Drawing.Point(532, 620); + this.MimicJointComboBox.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); this.MimicJointComboBox.Name = "MimicJointComboBox"; - this.MimicJointComboBox.Size = new System.Drawing.Size(210, 24); + this.MimicJointComboBox.Size = new System.Drawing.Size(158, 21); this.MimicJointComboBox.TabIndex = 236; this.MimicJointComboBox.Visible = false; // @@ -1648,36 +1518,38 @@ private void InitializeComponent() // this.MimicJointLabel.AutoSize = true; this.MimicJointLabel.Font = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.MimicJointLabel.Location = new System.Drawing.Point(706, 743); + this.MimicJointLabel.Location = new System.Drawing.Point(530, 604); + this.MimicJointLabel.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); this.MimicJointLabel.Name = "MimicJointLabel"; - this.MimicJointLabel.Size = new System.Drawing.Size(112, 17); + this.MimicJointLabel.Size = new System.Drawing.Size(89, 13); this.MimicJointLabel.TabIndex = 237; this.MimicJointLabel.Text = "Joint to Mimic:"; this.MimicJointLabel.Visible = false; // // textBoxMimicMultiplier // - this.textBoxMimicMultiplier.Location = new System.Drawing.Point(1022, 738); + this.textBoxMimicMultiplier.Location = new System.Drawing.Point(766, 600); + this.textBoxMimicMultiplier.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); this.textBoxMimicMultiplier.Name = "textBoxMimicMultiplier"; - this.textBoxMimicMultiplier.Size = new System.Drawing.Size(86, 22); + this.textBoxMimicMultiplier.Size = new System.Drawing.Size(66, 20); this.textBoxMimicMultiplier.TabIndex = 238; this.textBoxMimicMultiplier.Visible = false; // // textBoxMimicOffset // - this.textBoxMimicOffset.Location = new System.Drawing.Point(1022, 766); + this.textBoxMimicOffset.Location = new System.Drawing.Point(766, 622); + this.textBoxMimicOffset.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); this.textBoxMimicOffset.Name = "textBoxMimicOffset"; - this.textBoxMimicOffset.Size = new System.Drawing.Size(86, 22); + this.textBoxMimicOffset.Size = new System.Drawing.Size(66, 20); this.textBoxMimicOffset.TabIndex = 239; this.textBoxMimicOffset.Visible = false; // // MimicMultiplierLabel // this.MimicMultiplierLabel.AutoSize = true; - this.MimicMultiplierLabel.Location = new System.Drawing.Point(939, 737); - this.MimicMultiplierLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.MimicMultiplierLabel.Location = new System.Drawing.Point(704, 599); this.MimicMultiplierLabel.Name = "MimicMultiplierLabel"; - this.MimicMultiplierLabel.Size = new System.Drawing.Size(64, 17); + this.MimicMultiplierLabel.Size = new System.Drawing.Size(48, 13); this.MimicMultiplierLabel.TabIndex = 240; this.MimicMultiplierLabel.Text = "Multiplier"; this.MimicMultiplierLabel.TextAlign = System.Drawing.ContentAlignment.TopRight; @@ -1686,10 +1558,9 @@ private void InitializeComponent() // MimicOffsetLabel // this.MimicOffsetLabel.AutoSize = true; - this.MimicOffsetLabel.Location = new System.Drawing.Point(931, 766); - this.MimicOffsetLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.MimicOffsetLabel.Location = new System.Drawing.Point(698, 622); this.MimicOffsetLabel.Name = "MimicOffsetLabel"; - this.MimicOffsetLabel.Size = new System.Drawing.Size(81, 17); + this.MimicOffsetLabel.Size = new System.Drawing.Size(59, 13); this.MimicOffsetLabel.TabIndex = 241; this.MimicOffsetLabel.Text = "Offset (rad)"; this.MimicOffsetLabel.TextAlign = System.Drawing.ContentAlignment.TopRight; @@ -1699,19 +1570,18 @@ private void InitializeComponent() // this.MimicEquationLabel.AutoSize = true; this.MimicEquationLabel.Font = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Italic, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.MimicEquationLabel.Location = new System.Drawing.Point(1128, 766); - this.MimicEquationLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.MimicEquationLabel.Location = new System.Drawing.Point(846, 622); this.MimicEquationLabel.Name = "MimicEquationLabel"; - this.MimicEquationLabel.Size = new System.Drawing.Size(231, 17); + this.MimicEquationLabel.Size = new System.Drawing.Size(171, 13); this.MimicEquationLabel.TabIndex = 242; this.MimicEquationLabel.Text = "pos = multiplier * pos_other + offset"; this.MimicEquationLabel.Visible = false; // // AssemblyExportForm // - this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 16F); + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(1431, 846); + this.ClientSize = new System.Drawing.Size(1073, 687); this.Controls.Add(this.LimitRequiredLabel); this.Controls.Add(this.AxisRequiredLabel); this.Controls.Add(this.label1); @@ -1793,7 +1663,7 @@ private void InitializeComponent() this.Controls.Add(this.textBoxMimicOffset); this.Controls.Add(this.textBoxMimicMultiplier); this.Controls.Add(this.MimicEquationLabel); - this.Margin = new System.Windows.Forms.Padding(4); + this.MinimumSize = new System.Drawing.Size(1089, 726); this.Name = "AssemblyExportForm"; this.Text = "SolidWorks Assembly to URDF Exporter"; this.Load += new System.EventHandler(this.AssemblyExportFormLoad);