From dc1b8a4859c3b221bf2b9f0de7d84e7ac27366c0 Mon Sep 17 00:00:00 2001 From: BytingBulldogs3539 Date: Sun, 14 Apr 2024 01:47:41 -0400 Subject: [PATCH] Change scaling to dpi based. Change play button to run all paths. --- .../Forms/AboutBox.Designer.cs | 60 +- .../Forms/ConfigurationView.Designer.cs | 89 +-- .../Forms/Menu.Designer.cs | 4 +- .../Forms/MirrorPath.Designer.cs | 27 +- .../Forms/MotionProfiler.Designer.cs | 703 +++++++++--------- .../Forms/MotionProfiler.cs | 169 +++-- .../Forms/MotionProfiler.resx | 2 +- .../Forms/Preview.Designer.cs | 45 +- .../Forms/Settings.Designer.cs | 92 +-- .../Forms/ShiftPath.Designer.cs | 45 +- .../SegmentedProfile/ProfilePath.cs | 14 +- .../VelocityGenerate/VelocityGeneration.cs | 6 +- 12 files changed, 692 insertions(+), 564 deletions(-) diff --git a/Motion-Profile-Mapper/Motion-Profile-Mapper/Forms/AboutBox.Designer.cs b/Motion-Profile-Mapper/Motion-Profile-Mapper/Forms/AboutBox.Designer.cs index 00dc734..2d8e991 100644 --- a/Motion-Profile-Mapper/Motion-Profile-Mapper/Forms/AboutBox.Designer.cs +++ b/Motion-Profile-Mapper/Motion-Profile-Mapper/Forms/AboutBox.Designer.cs @@ -53,8 +53,7 @@ private void InitializeComponent() this.tableLayoutPanel.Controls.Add(this.textBoxDescription, 1, 4); this.tableLayoutPanel.Controls.Add(this.okButton, 1, 5); this.tableLayoutPanel.Dock = System.Windows.Forms.DockStyle.Fill; - this.tableLayoutPanel.Location = new System.Drawing.Point(12, 11); - this.tableLayoutPanel.Margin = new System.Windows.Forms.Padding(4); + this.tableLayoutPanel.Location = new System.Drawing.Point(10, 9); this.tableLayoutPanel.Name = "tableLayoutPanel"; this.tableLayoutPanel.RowCount = 6; this.tableLayoutPanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 10F)); @@ -63,18 +62,17 @@ private void InitializeComponent() this.tableLayoutPanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 10F)); this.tableLayoutPanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50F)); this.tableLayoutPanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 10F)); - this.tableLayoutPanel.Size = new System.Drawing.Size(556, 326); + this.tableLayoutPanel.Size = new System.Drawing.Size(444, 260); this.tableLayoutPanel.TabIndex = 0; // // logoPictureBox // this.logoPictureBox.Dock = System.Windows.Forms.DockStyle.Fill; this.logoPictureBox.Image = ((System.Drawing.Image)(resources.GetObject("logoPictureBox.Image"))); - this.logoPictureBox.Location = new System.Drawing.Point(4, 4); - this.logoPictureBox.Margin = new System.Windows.Forms.Padding(4); + this.logoPictureBox.Location = new System.Drawing.Point(3, 3); this.logoPictureBox.Name = "logoPictureBox"; this.tableLayoutPanel.SetRowSpan(this.logoPictureBox, 6); - this.logoPictureBox.Size = new System.Drawing.Size(175, 318); + this.logoPictureBox.Size = new System.Drawing.Size(140, 254); this.logoPictureBox.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; this.logoPictureBox.TabIndex = 12; this.logoPictureBox.TabStop = false; @@ -84,11 +82,11 @@ private void InitializeComponent() this.labelProductName.Dock = System.Windows.Forms.DockStyle.Fill; this.labelProductName.Font = new System.Drawing.Font("Verdana", 7.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.labelProductName.ForeColor = System.Drawing.Color.Black; - this.labelProductName.Location = new System.Drawing.Point(191, 0); - this.labelProductName.Margin = new System.Windows.Forms.Padding(8, 0, 4, 0); - this.labelProductName.MaximumSize = new System.Drawing.Size(0, 21); + this.labelProductName.Location = new System.Drawing.Point(152, 0); + this.labelProductName.Margin = new System.Windows.Forms.Padding(6, 0, 3, 0); + this.labelProductName.MaximumSize = new System.Drawing.Size(0, 17); this.labelProductName.Name = "labelProductName"; - this.labelProductName.Size = new System.Drawing.Size(361, 21); + this.labelProductName.Size = new System.Drawing.Size(289, 17); this.labelProductName.TabIndex = 19; this.labelProductName.Text = "Product Name"; this.labelProductName.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; @@ -98,11 +96,11 @@ private void InitializeComponent() this.labelVersion.Dock = System.Windows.Forms.DockStyle.Fill; this.labelVersion.Font = new System.Drawing.Font("Verdana", 7.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.labelVersion.ForeColor = System.Drawing.Color.Black; - this.labelVersion.Location = new System.Drawing.Point(191, 32); - this.labelVersion.Margin = new System.Windows.Forms.Padding(8, 0, 4, 0); - this.labelVersion.MaximumSize = new System.Drawing.Size(0, 21); + this.labelVersion.Location = new System.Drawing.Point(152, 26); + this.labelVersion.Margin = new System.Windows.Forms.Padding(6, 0, 3, 0); + this.labelVersion.MaximumSize = new System.Drawing.Size(0, 17); this.labelVersion.Name = "labelVersion"; - this.labelVersion.Size = new System.Drawing.Size(361, 21); + this.labelVersion.Size = new System.Drawing.Size(289, 17); this.labelVersion.TabIndex = 0; this.labelVersion.Text = "Version"; this.labelVersion.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; @@ -112,11 +110,11 @@ private void InitializeComponent() this.labelCopyright.Dock = System.Windows.Forms.DockStyle.Fill; this.labelCopyright.Font = new System.Drawing.Font("Verdana", 7.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.labelCopyright.ForeColor = System.Drawing.Color.Black; - this.labelCopyright.Location = new System.Drawing.Point(191, 64); - this.labelCopyright.Margin = new System.Windows.Forms.Padding(8, 0, 4, 0); - this.labelCopyright.MaximumSize = new System.Drawing.Size(0, 21); + this.labelCopyright.Location = new System.Drawing.Point(152, 52); + this.labelCopyright.Margin = new System.Windows.Forms.Padding(6, 0, 3, 0); + this.labelCopyright.MaximumSize = new System.Drawing.Size(0, 17); this.labelCopyright.Name = "labelCopyright"; - this.labelCopyright.Size = new System.Drawing.Size(361, 21); + this.labelCopyright.Size = new System.Drawing.Size(289, 17); this.labelCopyright.TabIndex = 21; this.labelCopyright.Text = "Copyright"; this.labelCopyright.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; @@ -126,11 +124,11 @@ private void InitializeComponent() this.labelCompanyName.Dock = System.Windows.Forms.DockStyle.Fill; this.labelCompanyName.Font = new System.Drawing.Font("Verdana", 7.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.labelCompanyName.ForeColor = System.Drawing.Color.Black; - this.labelCompanyName.Location = new System.Drawing.Point(191, 96); - this.labelCompanyName.Margin = new System.Windows.Forms.Padding(8, 0, 4, 0); - this.labelCompanyName.MaximumSize = new System.Drawing.Size(0, 21); + this.labelCompanyName.Location = new System.Drawing.Point(152, 78); + this.labelCompanyName.Margin = new System.Windows.Forms.Padding(6, 0, 3, 0); + this.labelCompanyName.MaximumSize = new System.Drawing.Size(0, 17); this.labelCompanyName.Name = "labelCompanyName"; - this.labelCompanyName.Size = new System.Drawing.Size(361, 21); + this.labelCompanyName.Size = new System.Drawing.Size(289, 17); this.labelCompanyName.TabIndex = 22; this.labelCompanyName.Text = "Company Name"; this.labelCompanyName.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; @@ -142,12 +140,12 @@ private void InitializeComponent() this.textBoxDescription.Dock = System.Windows.Forms.DockStyle.Fill; this.textBoxDescription.Font = new System.Drawing.Font("Verdana", 7.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.textBoxDescription.ForeColor = System.Drawing.Color.Black; - this.textBoxDescription.Location = new System.Drawing.Point(191, 132); - this.textBoxDescription.Margin = new System.Windows.Forms.Padding(8, 4, 4, 4); + this.textBoxDescription.Location = new System.Drawing.Point(152, 107); + this.textBoxDescription.Margin = new System.Windows.Forms.Padding(6, 3, 3, 3); this.textBoxDescription.Multiline = true; this.textBoxDescription.Name = "textBoxDescription"; this.textBoxDescription.ReadOnly = true; - this.textBoxDescription.Size = new System.Drawing.Size(361, 155); + this.textBoxDescription.Size = new System.Drawing.Size(289, 124); this.textBoxDescription.TabIndex = 23; this.textBoxDescription.TabStop = false; this.textBoxDescription.Text = "Description"; @@ -157,10 +155,9 @@ private void InitializeComponent() this.okButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); this.okButton.DialogResult = System.Windows.Forms.DialogResult.Cancel; this.okButton.ForeColor = System.Drawing.Color.Black; - this.okButton.Location = new System.Drawing.Point(452, 295); - this.okButton.Margin = new System.Windows.Forms.Padding(4); + this.okButton.Location = new System.Drawing.Point(361, 237); this.okButton.Name = "okButton"; - this.okButton.Size = new System.Drawing.Size(100, 27); + this.okButton.Size = new System.Drawing.Size(80, 20); this.okButton.TabIndex = 24; this.okButton.Text = "&OK"; this.okButton.Click += new System.EventHandler(this.okButton_Click); @@ -168,19 +165,18 @@ private void InitializeComponent() // AboutBox // this.AcceptButton = this.okButton; - this.AutoScaleDimensions = new System.Drawing.SizeF(120F, 120F); + this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi; this.BackColor = System.Drawing.SystemColors.ControlLight; - this.ClientSize = new System.Drawing.Size(580, 348); + this.ClientSize = new System.Drawing.Size(464, 278); this.Controls.Add(this.tableLayoutPanel); this.ForeColor = System.Drawing.Color.White; this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog; this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); - this.Margin = new System.Windows.Forms.Padding(4); this.MaximizeBox = false; this.MinimizeBox = false; this.Name = "AboutBox"; - this.Padding = new System.Windows.Forms.Padding(12, 11, 12, 11); + this.Padding = new System.Windows.Forms.Padding(10, 9, 10, 9); this.ShowInTaskbar = false; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; this.Text = "About"; diff --git a/Motion-Profile-Mapper/Motion-Profile-Mapper/Forms/ConfigurationView.Designer.cs b/Motion-Profile-Mapper/Motion-Profile-Mapper/Forms/ConfigurationView.Designer.cs index 6242a52..cee9b7a 100644 --- a/Motion-Profile-Mapper/Motion-Profile-Mapper/Forms/ConfigurationView.Designer.cs +++ b/Motion-Profile-Mapper/Motion-Profile-Mapper/Forms/ConfigurationView.Designer.cs @@ -99,14 +99,14 @@ private void InitializeComponent() dataGridViewCellStyle3.WrapMode = System.Windows.Forms.DataGridViewTriState.False; this.filenameGrid.DefaultCellStyle = dataGridViewCellStyle3; this.filenameGrid.GridColor = System.Drawing.Color.Silver; - this.filenameGrid.Location = new System.Drawing.Point(15, 111); - this.filenameGrid.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.filenameGrid.Location = new System.Drawing.Point(11, 90); + this.filenameGrid.Margin = new System.Windows.Forms.Padding(2); this.filenameGrid.MultiSelect = false; this.filenameGrid.Name = "filenameGrid"; this.filenameGrid.RowHeadersVisible = false; this.filenameGrid.RowHeadersWidth = 51; this.filenameGrid.RowTemplate.Height = 24; - this.filenameGrid.Size = new System.Drawing.Size(273, 391); + this.filenameGrid.Size = new System.Drawing.Size(205, 318); this.filenameGrid.TabIndex = 1; this.filenameGrid.CellEndEdit += new System.Windows.Forms.DataGridViewCellEventHandler(this.filenameGrid_CellEndEdit); this.filenameGrid.RowEnter += new System.Windows.Forms.DataGridViewCellEventHandler(this.filenameGrid_RowEnter); @@ -127,10 +127,10 @@ private void InitializeComponent() this.newFileButton.IconColor = System.Drawing.Color.Green; this.newFileButton.IconFont = FontAwesome.Sharp.IconFont.Auto; this.newFileButton.IconSize = 24; - this.newFileButton.Location = new System.Drawing.Point(15, 511); + this.newFileButton.Location = new System.Drawing.Point(11, 415); this.newFileButton.Margin = new System.Windows.Forms.Padding(0); this.newFileButton.Name = "newFileButton"; - this.newFileButton.Size = new System.Drawing.Size(135, 30); + this.newFileButton.Size = new System.Drawing.Size(101, 24); this.newFileButton.TabIndex = 49; this.newFileButton.UseVisualStyleBackColor = false; this.newFileButton.Click += new System.EventHandler(this.newFileButton_Click); @@ -146,10 +146,10 @@ private void InitializeComponent() this.deleteButton.IconColor = System.Drawing.Color.Firebrick; this.deleteButton.IconFont = FontAwesome.Sharp.IconFont.Auto; this.deleteButton.IconSize = 24; - this.deleteButton.Location = new System.Drawing.Point(153, 511); + this.deleteButton.Location = new System.Drawing.Point(115, 415); this.deleteButton.Margin = new System.Windows.Forms.Padding(0); this.deleteButton.Name = "deleteButton"; - this.deleteButton.Size = new System.Drawing.Size(135, 30); + this.deleteButton.Size = new System.Drawing.Size(101, 24); this.deleteButton.TabIndex = 50; this.deleteButton.UseVisualStyleBackColor = false; this.deleteButton.Click += new System.EventHandler(this.deleteButton_Click); @@ -163,10 +163,10 @@ private void InitializeComponent() this.saveToRioButton.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.saveToRioButton.Font = new System.Drawing.Font("Verdana", 16.2F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.saveToRioButton.ForeColor = System.Drawing.Color.Teal; - this.saveToRioButton.Location = new System.Drawing.Point(15, 575); - this.saveToRioButton.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.saveToRioButton.Location = new System.Drawing.Point(11, 467); + this.saveToRioButton.Margin = new System.Windows.Forms.Padding(2); this.saveToRioButton.Name = "saveToRioButton"; - this.saveToRioButton.Size = new System.Drawing.Size(273, 50); + this.saveToRioButton.Size = new System.Drawing.Size(205, 41); this.saveToRioButton.TabIndex = 62; this.saveToRioButton.Text = "Save to RIO"; this.toolTip1.SetToolTip(this.saveToRioButton, "Save configuration files to rio. (This will overwrite any pervious version on the" + @@ -181,10 +181,10 @@ private void InitializeComponent() this.loadRIOButton.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.loadRIOButton.Font = new System.Drawing.Font("Verdana", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.loadRIOButton.ForeColor = System.Drawing.Color.Teal; - this.loadRIOButton.Location = new System.Drawing.Point(15, 20); - this.loadRIOButton.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.loadRIOButton.Location = new System.Drawing.Point(11, 16); + this.loadRIOButton.Margin = new System.Windows.Forms.Padding(2); this.loadRIOButton.Name = "loadRIOButton"; - this.loadRIOButton.Size = new System.Drawing.Size(221, 46); + this.loadRIOButton.Size = new System.Drawing.Size(166, 37); this.loadRIOButton.TabIndex = 63; this.loadRIOButton.Text = "Load from RIO"; this.toolTip1.SetToolTip(this.loadRIOButton, "Load the configuration files from the rio"); @@ -225,8 +225,8 @@ private void InitializeComponent() this.configurationGrid.EditMode = System.Windows.Forms.DataGridViewEditMode.EditOnEnter; this.configurationGrid.Enabled = false; this.configurationGrid.EnableHeadersVisualStyles = false; - this.configurationGrid.Location = new System.Drawing.Point(299, 69); - this.configurationGrid.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.configurationGrid.Location = new System.Drawing.Point(224, 56); + this.configurationGrid.Margin = new System.Windows.Forms.Padding(2); this.configurationGrid.MultiSelect = false; this.configurationGrid.Name = "configurationGrid"; dataGridViewCellStyle7.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; @@ -237,10 +237,10 @@ private void InitializeComponent() dataGridViewCellStyle7.SelectionForeColor = System.Drawing.Color.Black; dataGridViewCellStyle7.WrapMode = System.Windows.Forms.DataGridViewTriState.True; this.configurationGrid.RowHeadersDefaultCellStyle = dataGridViewCellStyle7; - this.configurationGrid.RowHeadersWidth = 51; + this.configurationGrid.RowHeadersWidth = 40; this.configurationGrid.RowTemplate.Height = 24; this.configurationGrid.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect; - this.configurationGrid.Size = new System.Drawing.Size(931, 584); + this.configurationGrid.Size = new System.Drawing.Size(698, 474); this.configurationGrid.TabIndex = 65; this.configurationGrid.CellValidated += new System.Windows.Forms.DataGridViewCellEventHandler(this.configurationGrid_CellValidated); this.configurationGrid.CellValidating += new System.Windows.Forms.DataGridViewCellValidatingEventHandler(this.configurationGrid_CellValidating); @@ -255,13 +255,16 @@ private void InitializeComponent() // // Variable_Name // + this.Variable_Name.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill; + this.Variable_Name.FillWeight = 34F; this.Variable_Name.HeaderText = "Variable Name"; this.Variable_Name.MinimumWidth = 6; this.Variable_Name.Name = "Variable_Name"; - this.Variable_Name.Width = 300; // // Variable_Type // + this.Variable_Type.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill; + this.Variable_Type.FillWeight = 14F; this.Variable_Type.HeaderText = "Variable Type"; this.Variable_Type.Items.AddRange(new object[] { "int", @@ -271,21 +274,22 @@ private void InitializeComponent() this.Variable_Type.MinimumWidth = 6; this.Variable_Type.Name = "Variable_Type"; this.Variable_Type.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic; - this.Variable_Type.Width = 125; // // Value // + this.Value.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill; + this.Value.FillWeight = 25F; this.Value.HeaderText = "Value"; this.Value.MinimumWidth = 6; this.Value.Name = "Value"; - this.Value.Width = 219; // // Comment // + this.Comment.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill; + this.Comment.FillWeight = 27F; this.Comment.HeaderText = "Comment"; this.Comment.MinimumWidth = 6; this.Comment.Name = "Comment"; - this.Comment.Width = 234; // // loadLocalButton // @@ -294,10 +298,10 @@ private void InitializeComponent() this.loadLocalButton.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.loadLocalButton.Font = new System.Drawing.Font("Verdana", 7.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.loadLocalButton.ForeColor = System.Drawing.Color.Black; - this.loadLocalButton.Location = new System.Drawing.Point(15, 69); + this.loadLocalButton.Location = new System.Drawing.Point(11, 56); this.loadLocalButton.Margin = new System.Windows.Forms.Padding(1); this.loadLocalButton.Name = "loadLocalButton"; - this.loadLocalButton.Size = new System.Drawing.Size(273, 27); + this.loadLocalButton.Size = new System.Drawing.Size(205, 22); this.loadLocalButton.TabIndex = 66; this.loadLocalButton.Text = "Load from local files"; this.toolTip1.SetToolTip(this.loadLocalButton, "Load files from this device"); @@ -314,10 +318,10 @@ private void InitializeComponent() this.connectionSettingsButton.IconColor = System.Drawing.Color.Teal; this.connectionSettingsButton.IconFont = FontAwesome.Sharp.IconFont.Auto; this.connectionSettingsButton.IconSize = 40; - this.connectionSettingsButton.Location = new System.Drawing.Point(239, 20); + this.connectionSettingsButton.Location = new System.Drawing.Point(179, 16); this.connectionSettingsButton.Margin = new System.Windows.Forms.Padding(0); this.connectionSettingsButton.Name = "connectionSettingsButton"; - this.connectionSettingsButton.Size = new System.Drawing.Size(49, 46); + this.connectionSettingsButton.Size = new System.Drawing.Size(37, 37); this.connectionSettingsButton.TabIndex = 67; this.toolTip1.SetToolTip(this.connectionSettingsButton, "Roborio connection settings"); this.connectionSettingsButton.UseVisualStyleBackColor = false; @@ -332,10 +336,10 @@ private void InitializeComponent() this.saveLocalButton.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.saveLocalButton.Font = new System.Drawing.Font("Verdana", 7.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.saveLocalButton.ForeColor = System.Drawing.Color.Black; - this.saveLocalButton.Location = new System.Drawing.Point(15, 544); + this.saveLocalButton.Location = new System.Drawing.Point(11, 442); this.saveLocalButton.Margin = new System.Windows.Forms.Padding(1); this.saveLocalButton.Name = "saveLocalButton"; - this.saveLocalButton.Size = new System.Drawing.Size(135, 27); + this.saveLocalButton.Size = new System.Drawing.Size(101, 22); this.saveLocalButton.TabIndex = 68; this.saveLocalButton.Text = "Save to local"; this.toolTip1.SetToolTip(this.saveLocalButton, "Save selected configuration to the local drive."); @@ -351,10 +355,10 @@ private void InitializeComponent() this.saveAllLocalButton.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.saveAllLocalButton.Font = new System.Drawing.Font("Verdana", 7.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.saveAllLocalButton.ForeColor = System.Drawing.Color.Black; - this.saveAllLocalButton.Location = new System.Drawing.Point(153, 544); + this.saveAllLocalButton.Location = new System.Drawing.Point(115, 442); this.saveAllLocalButton.Margin = new System.Windows.Forms.Padding(1); this.saveAllLocalButton.Name = "saveAllLocalButton"; - this.saveAllLocalButton.Size = new System.Drawing.Size(135, 27); + this.saveAllLocalButton.Size = new System.Drawing.Size(101, 22); this.saveAllLocalButton.TabIndex = 69; this.saveAllLocalButton.Text = "Save all local"; this.toolTip1.SetToolTip(this.saveAllLocalButton, "Save all configuration files to the local drive."); @@ -368,10 +372,9 @@ private void InitializeComponent() this.infoLabel.BackColor = System.Drawing.SystemColors.ControlLight; this.infoLabel.Font = new System.Drawing.Font("Verdana", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.infoLabel.ForeColor = System.Drawing.Color.Black; - this.infoLabel.Location = new System.Drawing.Point(299, 7); - this.infoLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.infoLabel.Location = new System.Drawing.Point(269, 6); this.infoLabel.Name = "infoLabel"; - this.infoLabel.Size = new System.Drawing.Size(929, 49); + this.infoLabel.Size = new System.Drawing.Size(652, 40); this.infoLabel.TabIndex = 70; this.infoLabel.Text = "Configure Robot Constants"; this.infoLabel.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -382,13 +385,13 @@ private void InitializeComponent() this.rowContextMenuStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.deleteToolStripMenuItem}); this.rowContextMenuStrip.Name = "rowContextMenuStrip"; - this.rowContextMenuStrip.Size = new System.Drawing.Size(123, 28); + this.rowContextMenuStrip.Size = new System.Drawing.Size(108, 26); this.rowContextMenuStrip.Opening += new System.ComponentModel.CancelEventHandler(this.rowContextMenuStrip_Opening); // // deleteToolStripMenuItem // this.deleteToolStripMenuItem.Name = "deleteToolStripMenuItem"; - this.deleteToolStripMenuItem.Size = new System.Drawing.Size(122, 24); + this.deleteToolStripMenuItem.Size = new System.Drawing.Size(107, 22); this.deleteToolStripMenuItem.Text = "Delete"; this.deleteToolStripMenuItem.Click += new System.EventHandler(this.deleteToolStripMenuItem_Click); // @@ -400,9 +403,10 @@ private void InitializeComponent() // timeSinceUpload // this.timeSinceUpload.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); - this.timeSinceUpload.Location = new System.Drawing.Point(12, 630); + this.timeSinceUpload.Location = new System.Drawing.Point(9, 512); + this.timeSinceUpload.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); this.timeSinceUpload.Name = "timeSinceUpload"; - this.timeSinceUpload.Size = new System.Drawing.Size(276, 23); + this.timeSinceUpload.Size = new System.Drawing.Size(207, 19); this.timeSinceUpload.TabIndex = 71; this.timeSinceUpload.Text = "Last Upload: "; this.timeSinceUpload.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; @@ -415,10 +419,10 @@ private void InitializeComponent() this.iconButton2.IconChar = FontAwesome.Sharp.IconChar.BezierCurve; this.iconButton2.IconColor = System.Drawing.Color.SlateBlue; this.iconButton2.IconFont = FontAwesome.Sharp.IconFont.Auto; - this.iconButton2.Location = new System.Drawing.Point(299, 20); + this.iconButton2.Location = new System.Drawing.Point(224, 16); this.iconButton2.Margin = new System.Windows.Forms.Padding(0); this.iconButton2.Name = "iconButton2"; - this.iconButton2.Size = new System.Drawing.Size(56, 47); + this.iconButton2.Size = new System.Drawing.Size(42, 38); this.iconButton2.TabIndex = 78; this.toolTip1.SetToolTip(this.iconButton2, "Switch to motion profiling mode"); this.iconButton2.UseVisualStyleBackColor = false; @@ -426,10 +430,10 @@ private void InitializeComponent() // // ConfigurationView // - this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 16F); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi; this.BackColor = System.Drawing.SystemColors.ControlLight; - this.ClientSize = new System.Drawing.Size(1244, 666); + this.ClientSize = new System.Drawing.Size(933, 541); this.Controls.Add(this.iconButton2); this.Controls.Add(this.timeSinceUpload); this.Controls.Add(this.infoLabel); @@ -444,7 +448,8 @@ private void InitializeComponent() this.Controls.Add(this.newFileButton); this.Controls.Add(this.filenameGrid); this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); - this.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.Margin = new System.Windows.Forms.Padding(2); + this.MinimumSize = new System.Drawing.Size(673, 360); this.Name = "ConfigurationView"; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; this.Text = "Configure Constants"; diff --git a/Motion-Profile-Mapper/Motion-Profile-Mapper/Forms/Menu.Designer.cs b/Motion-Profile-Mapper/Motion-Profile-Mapper/Forms/Menu.Designer.cs index 72d5ab3..9350a9c 100644 --- a/Motion-Profile-Mapper/Motion-Profile-Mapper/Forms/Menu.Designer.cs +++ b/Motion-Profile-Mapper/Motion-Profile-Mapper/Forms/Menu.Designer.cs @@ -68,8 +68,8 @@ private void InitializeComponent() // // Menu // - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi; this.ClientSize = new System.Drawing.Size(289, 131); this.Controls.Add(this.constantsButton); this.Controls.Add(this.mpButton); diff --git a/Motion-Profile-Mapper/Motion-Profile-Mapper/Forms/MirrorPath.Designer.cs b/Motion-Profile-Mapper/Motion-Profile-Mapper/Forms/MirrorPath.Designer.cs index 19b3189..544a8ca 100644 --- a/Motion-Profile-Mapper/Motion-Profile-Mapper/Forms/MirrorPath.Designer.cs +++ b/Motion-Profile-Mapper/Motion-Profile-Mapper/Forms/MirrorPath.Designer.cs @@ -43,9 +43,10 @@ private void InitializeComponent() this.mirrorSelectedButton.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.mirrorSelectedButton.Font = new System.Drawing.Font("Verdana", 7.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.mirrorSelectedButton.ForeColor = System.Drawing.Color.Black; - this.mirrorSelectedButton.Location = new System.Drawing.Point(108, 41); + this.mirrorSelectedButton.Location = new System.Drawing.Point(81, 33); + this.mirrorSelectedButton.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); this.mirrorSelectedButton.Name = "mirrorSelectedButton"; - this.mirrorSelectedButton.Size = new System.Drawing.Size(90, 25); + this.mirrorSelectedButton.Size = new System.Drawing.Size(68, 20); this.mirrorSelectedButton.TabIndex = 18; this.mirrorSelectedButton.Text = "Selected"; this.mirrorSelectedButton.UseVisualStyleBackColor = false; @@ -58,9 +59,10 @@ private void InitializeComponent() this.mirrorAllButton.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.mirrorAllButton.Font = new System.Drawing.Font("Verdana", 7.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.mirrorAllButton.ForeColor = System.Drawing.Color.Black; - this.mirrorAllButton.Location = new System.Drawing.Point(204, 41); + this.mirrorAllButton.Location = new System.Drawing.Point(153, 33); + this.mirrorAllButton.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); this.mirrorAllButton.Name = "mirrorAllButton"; - this.mirrorAllButton.Size = new System.Drawing.Size(90, 25); + this.mirrorAllButton.Size = new System.Drawing.Size(68, 20); this.mirrorAllButton.TabIndex = 23; this.mirrorAllButton.Text = "All"; this.mirrorAllButton.UseVisualStyleBackColor = false; @@ -73,9 +75,10 @@ private void InitializeComponent() this.cancelButton.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.cancelButton.Font = new System.Drawing.Font("Verdana", 7.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.cancelButton.ForeColor = System.Drawing.Color.Black; - this.cancelButton.Location = new System.Drawing.Point(12, 41); + this.cancelButton.Location = new System.Drawing.Point(9, 33); + this.cancelButton.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); this.cancelButton.Name = "cancelButton"; - this.cancelButton.Size = new System.Drawing.Size(90, 25); + this.cancelButton.Size = new System.Drawing.Size(68, 20); this.cancelButton.TabIndex = 13; this.cancelButton.Text = "Cancel"; this.cancelButton.UseVisualStyleBackColor = false; @@ -86,22 +89,24 @@ private void InitializeComponent() this.label6.AutoSize = true; this.label6.Font = new System.Drawing.Font("Verdana", 7.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.label6.ForeColor = System.Drawing.Color.Black; - this.label6.Location = new System.Drawing.Point(33, 12); + this.label6.Location = new System.Drawing.Point(25, 10); + this.label6.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); this.label6.Name = "label6"; - this.label6.Size = new System.Drawing.Size(243, 17); + this.label6.Size = new System.Drawing.Size(195, 13); this.label6.TabIndex = 14; this.label6.Text = "Which paths should be mirrored?"; // // MirrorPath // - this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 16F); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(307, 79); + this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi; + this.ClientSize = new System.Drawing.Size(230, 64); this.Controls.Add(this.label6); this.Controls.Add(this.cancelButton); this.Controls.Add(this.mirrorSelectedButton); this.Controls.Add(this.mirrorAllButton); this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); + this.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); this.Name = "MirrorPath"; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; this.Text = "Mirror Paths"; diff --git a/Motion-Profile-Mapper/Motion-Profile-Mapper/Forms/MotionProfiler.Designer.cs b/Motion-Profile-Mapper/Motion-Profile-Mapper/Forms/MotionProfiler.Designer.cs index d923325..2c47be4 100644 --- a/Motion-Profile-Mapper/Motion-Profile-Mapper/Forms/MotionProfiler.Designer.cs +++ b/Motion-Profile-Mapper/Motion-Profile-Mapper/Forms/MotionProfiler.Designer.cs @@ -41,7 +41,6 @@ private void InitializeComponent() System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle10 = new System.Windows.Forms.DataGridViewCellStyle(); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle11 = new System.Windows.Forms.DataGridViewCellStyle(); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle12 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle13 = new System.Windows.Forms.DataGridViewCellStyle(); System.Windows.Forms.DataVisualization.Charting.ChartArea chartArea1 = new System.Windows.Forms.DataVisualization.Charting.ChartArea(); System.Windows.Forms.DataVisualization.Charting.Legend legend1 = new System.Windows.Forms.DataVisualization.Charting.Legend(); System.Windows.Forms.DataVisualization.Charting.Series series1 = new System.Windows.Forms.DataVisualization.Charting.Series(); @@ -88,24 +87,22 @@ private void InitializeComponent() this.newPathButton = new FontAwesome.Sharp.IconButton(); this.pathOrderDown = new FontAwesome.Sharp.IconButton(); this.pathOrderUp = new FontAwesome.Sharp.IconButton(); + this.radioSpline = new System.Windows.Forms.RadioButton(); + this.radioLine = new System.Windows.Forms.RadioButton(); + this.showPathsCheckbox = new System.Windows.Forms.CheckBox(); + this.GridCheckBox = new System.Windows.Forms.CheckBox(); + this.radioBlue = new System.Windows.Forms.RadioButton(); + this.radioRed = new System.Windows.Forms.RadioButton(); this.Data = new System.Windows.Forms.TabPage(); this.kinematicsChart = new System.Windows.Forms.DataVisualization.Charting.Chart(); this.Field = new System.Windows.Forms.TabPage(); this.splitContainer1 = new System.Windows.Forms.SplitContainer(); this.tableLayoutPanel5 = new System.Windows.Forms.TableLayoutPanel(); + this.tableLayoutPanel6 = new System.Windows.Forms.TableLayoutPanel(); this.panel1 = new System.Windows.Forms.Panel(); - this.trackBar = new System.Windows.Forms.TrackBar(); this.mainField = new System.Windows.Forms.DataVisualization.Charting.Chart(); + this.trackBar = new System.Windows.Forms.TrackBar(); this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel(); - this.tableLayoutPanel2 = new System.Windows.Forms.TableLayoutPanel(); - this.radioBlue = new System.Windows.Forms.RadioButton(); - this.radioRed = new System.Windows.Forms.RadioButton(); - this.tableLayoutPanel3 = new System.Windows.Forms.TableLayoutPanel(); - this.GridCheckBox = new System.Windows.Forms.CheckBox(); - this.showPathsCheckbox = new System.Windows.Forms.CheckBox(); - this.tableLayoutPanel4 = new System.Windows.Forms.TableLayoutPanel(); - this.radioLine = new System.Windows.Forms.RadioButton(); - this.radioSpline = new System.Windows.Forms.RadioButton(); this.MoreData = new System.Windows.Forms.TabControl(); this.timer1 = new System.Windows.Forms.Timer(this.components); this.timeSinceUpload = new System.Windows.Forms.Label(); @@ -115,8 +112,10 @@ private void InitializeComponent() this.undoToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.redoToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.infoToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.label1 = new System.Windows.Forms.Label(); - this.pathTimeLabel = new System.Windows.Forms.Label(); + this.currentTime = new System.Windows.Forms.Label(); + this.tableLayoutPanel2 = new System.Windows.Forms.TableLayoutPanel(); + this.tableLayoutPanel3 = new System.Windows.Forms.TableLayoutPanel(); + this.tableLayoutPanel4 = new System.Windows.Forms.TableLayoutPanel(); ((System.ComponentModel.ISupportInitialize)(this.ControlPointTable)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.profileTable)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.pathTable)).BeginInit(); @@ -128,15 +127,16 @@ private void InitializeComponent() this.splitContainer1.Panel2.SuspendLayout(); this.splitContainer1.SuspendLayout(); this.tableLayoutPanel5.SuspendLayout(); + this.tableLayoutPanel6.SuspendLayout(); this.panel1.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.trackBar)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.mainField)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.trackBar)).BeginInit(); this.tableLayoutPanel1.SuspendLayout(); + this.MoreData.SuspendLayout(); + this.menuStrip1.SuspendLayout(); this.tableLayoutPanel2.SuspendLayout(); this.tableLayoutPanel3.SuspendLayout(); this.tableLayoutPanel4.SuspendLayout(); - this.MoreData.SuspendLayout(); - this.menuStrip1.SuspendLayout(); this.SuspendLayout(); // // infoLabel @@ -146,9 +146,10 @@ private void InitializeComponent() this.infoLabel.BackColor = System.Drawing.SystemColors.ControlLight; this.infoLabel.Font = new System.Drawing.Font("Verdana", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.infoLabel.ForeColor = System.Drawing.Color.Black; - this.infoLabel.Location = new System.Drawing.Point(3, 0); + this.infoLabel.Location = new System.Drawing.Point(2, 0); + this.infoLabel.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); this.infoLabel.Name = "infoLabel"; - this.infoLabel.Size = new System.Drawing.Size(673, 40); + this.infoLabel.Size = new System.Drawing.Size(518, 31); this.infoLabel.TabIndex = 42; this.infoLabel.Text = "Motion Profile Mapper v2.0"; this.infoLabel.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -180,8 +181,7 @@ private void InitializeComponent() dataGridViewCellStyle2.SelectionForeColor = System.Drawing.Color.White; dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.True; this.ControlPointTable.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle2; - this.ControlPointTable.ColumnHeadersHeight = 28; - this.ControlPointTable.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing; + this.ControlPointTable.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; this.ControlPointTable.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { this.x, this.y, @@ -197,7 +197,7 @@ private void InitializeComponent() this.ControlPointTable.EditMode = System.Windows.Forms.DataGridViewEditMode.EditOnKeystroke; this.ControlPointTable.EnableHeadersVisualStyles = false; this.ControlPointTable.GridColor = System.Drawing.Color.Silver; - this.ControlPointTable.Location = new System.Drawing.Point(1039, 385); + this.ControlPointTable.Location = new System.Drawing.Point(783, 292); this.ControlPointTable.Margin = new System.Windows.Forms.Padding(1); this.ControlPointTable.MultiSelect = false; this.ControlPointTable.Name = "ControlPointTable"; @@ -210,52 +210,54 @@ private void InitializeComponent() this.ControlPointTable.RowTemplate.Height = 40; this.ControlPointTable.ScrollBars = System.Windows.Forms.ScrollBars.Vertical; this.ControlPointTable.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect; - this.ControlPointTable.Size = new System.Drawing.Size(234, 323); + this.ControlPointTable.Size = new System.Drawing.Size(175, 247); this.ControlPointTable.TabIndex = 2; + this.ControlPointTable.CellDoubleClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.ControlPointTable_CellDoubleClick); this.ControlPointTable.CellEndEdit += new System.Windows.Forms.DataGridViewCellEventHandler(this.ControlPoints_CellEndEdit); this.ControlPointTable.RowEnter += new System.Windows.Forms.DataGridViewCellEventHandler(this.ControlPointTable_RowEnter); // // x // + this.x.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill; this.x.DataPropertyName = "X"; - this.x.Frozen = true; + this.x.FillWeight = 34F; this.x.HeaderText = "X"; this.x.MinimumWidth = 30; this.x.Name = "x"; this.x.Resizable = System.Windows.Forms.DataGridViewTriState.False; this.x.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable; - this.x.Width = 80; // // y // + this.y.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill; this.y.DataPropertyName = "Y"; - this.y.Frozen = true; + this.y.FillWeight = 34F; this.y.HeaderText = "Y"; this.y.MinimumWidth = 30; this.y.Name = "y"; this.y.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable; - this.y.Width = 80; // // Direction // + this.Direction.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill; this.Direction.DataPropertyName = "Direction"; - this.Direction.Frozen = true; + this.Direction.FillWeight = 32F; this.Direction.HeaderText = "Heading"; this.Direction.MaxInputLength = 3; this.Direction.MinimumWidth = 30; this.Direction.Name = "Direction"; this.Direction.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable; this.Direction.ToolTipText = "Robot direction"; - this.Direction.Width = 74; // // label10 // this.label10.BackColor = System.Drawing.SystemColors.ControlLight; this.label10.Font = new System.Drawing.Font("Verdana", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.label10.ForeColor = System.Drawing.Color.Black; - this.label10.Location = new System.Drawing.Point(13, 84); + this.label10.Location = new System.Drawing.Point(10, 64); + this.label10.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); this.label10.Name = "label10"; - this.label10.Size = new System.Drawing.Size(311, 29); + this.label10.Size = new System.Drawing.Size(231, 22); this.label10.TabIndex = 23; this.label10.Text = "Profiles"; this.label10.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -282,8 +284,7 @@ private void InitializeComponent() dataGridViewCellStyle6.SelectionForeColor = System.Drawing.Color.White; dataGridViewCellStyle6.WrapMode = System.Windows.Forms.DataGridViewTriState.True; this.profileTable.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle6; - this.profileTable.ColumnHeadersHeight = 28; - this.profileTable.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing; + this.profileTable.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; this.profileTable.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { this.dataGridViewTextBoxColumn2, this.dataGridViewTextBoxColumn3}); @@ -298,8 +299,8 @@ private void InitializeComponent() this.profileTable.EditMode = System.Windows.Forms.DataGridViewEditMode.EditProgrammatically; this.profileTable.EnableHeadersVisualStyles = false; this.profileTable.GridColor = System.Drawing.Color.Black; - this.profileTable.Location = new System.Drawing.Point(13, 115); - this.profileTable.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.profileTable.Location = new System.Drawing.Point(10, 88); + this.profileTable.Margin = new System.Windows.Forms.Padding(2); this.profileTable.MultiSelect = false; this.profileTable.Name = "profileTable"; this.profileTable.RightToLeft = System.Windows.Forms.RightToLeft.No; @@ -310,7 +311,7 @@ private void InitializeComponent() this.profileTable.RowHeadersWidth = 20; this.profileTable.RowTemplate.Height = 25; this.profileTable.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect; - this.profileTable.Size = new System.Drawing.Size(311, 550); + this.profileTable.Size = new System.Drawing.Size(231, 421); this.profileTable.TabIndex = 28; this.profileTable.CellDoubleClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.profileTable_CellDoubleClick); this.profileTable.CellEndEdit += new System.Windows.Forms.DataGridViewCellEventHandler(this.profileTable_CellEndEdit); @@ -319,22 +320,23 @@ private void InitializeComponent() // // dataGridViewTextBoxColumn2 // - this.dataGridViewTextBoxColumn2.Frozen = true; + this.dataGridViewTextBoxColumn2.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill; + this.dataGridViewTextBoxColumn2.FillWeight = 50F; this.dataGridViewTextBoxColumn2.HeaderText = "Profile Name"; - this.dataGridViewTextBoxColumn2.MinimumWidth = 155; + this.dataGridViewTextBoxColumn2.MinimumWidth = 10; this.dataGridViewTextBoxColumn2.Name = "dataGridViewTextBoxColumn2"; this.dataGridViewTextBoxColumn2.Resizable = System.Windows.Forms.DataGridViewTriState.True; this.dataGridViewTextBoxColumn2.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable; - this.dataGridViewTextBoxColumn2.Width = 155; // // dataGridViewTextBoxColumn3 // - this.dataGridViewTextBoxColumn3.Frozen = true; + this.dataGridViewTextBoxColumn3.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill; + this.dataGridViewTextBoxColumn3.FillWeight = 50F; this.dataGridViewTextBoxColumn3.HeaderText = "Last Modified"; - this.dataGridViewTextBoxColumn3.MinimumWidth = 155; + this.dataGridViewTextBoxColumn3.MinimumWidth = 10; this.dataGridViewTextBoxColumn3.Name = "dataGridViewTextBoxColumn3"; + this.dataGridViewTextBoxColumn3.ReadOnly = true; this.dataGridViewTextBoxColumn3.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable; - this.dataGridViewTextBoxColumn3.Width = 155; // // pathTable // @@ -358,7 +360,7 @@ private void InitializeComponent() dataGridViewCellStyle10.SelectionForeColor = System.Drawing.Color.White; dataGridViewCellStyle10.WrapMode = System.Windows.Forms.DataGridViewTriState.True; this.pathTable.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle10; - this.pathTable.ColumnHeadersHeight = 28; + this.pathTable.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; this.pathTable.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { this.dataGridViewTextBoxColumn5, this.PathTime}); @@ -373,51 +375,46 @@ private void InitializeComponent() this.pathTable.EditMode = System.Windows.Forms.DataGridViewEditMode.EditProgrammatically; this.pathTable.EnableHeadersVisualStyles = false; this.pathTable.GridColor = System.Drawing.Color.Silver; - this.pathTable.Location = new System.Drawing.Point(1039, 38); + this.pathTable.Location = new System.Drawing.Point(784, 28); this.pathTable.Margin = new System.Windows.Forms.Padding(1); this.pathTable.MultiSelect = false; this.pathTable.Name = "pathTable"; this.pathTable.RightToLeft = System.Windows.Forms.RightToLeft.No; this.pathTable.RowHeadersBorderStyle = System.Windows.Forms.DataGridViewHeaderBorderStyle.None; - dataGridViewCellStyle12.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle12.BackColor = System.Drawing.SystemColors.Control; - dataGridViewCellStyle12.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - dataGridViewCellStyle12.ForeColor = System.Drawing.Color.Black; - dataGridViewCellStyle12.SelectionForeColor = System.Drawing.Color.White; - dataGridViewCellStyle12.WrapMode = System.Windows.Forms.DataGridViewTriState.True; this.pathTable.RowHeadersDefaultCellStyle = dataGridViewCellStyle12; - this.pathTable.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.AutoSizeToAllHeaders; - dataGridViewCellStyle13.ForeColor = System.Drawing.Color.Black; - this.pathTable.RowsDefaultCellStyle = dataGridViewCellStyle13; + this.pathTable.RowHeadersWidth = 35; this.pathTable.RowTemplate.Height = 40; this.pathTable.ScrollBars = System.Windows.Forms.ScrollBars.Vertical; this.pathTable.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect; - this.pathTable.Size = new System.Drawing.Size(234, 283); + this.pathTable.ShowEditingIcon = false; + this.pathTable.Size = new System.Drawing.Size(174, 216); this.pathTable.TabIndex = 34; this.pathTable.CellDoubleClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.pathTable_CellDoubleClick); this.pathTable.CellEndEdit += new System.Windows.Forms.DataGridViewCellEventHandler(this.pathTable_CellEndEdit); this.pathTable.RowEnter += new System.Windows.Forms.DataGridViewCellEventHandler(this.pathTable_RowEnter); this.pathTable.RowPostPaint += new System.Windows.Forms.DataGridViewRowPostPaintEventHandler(this.pathTable_RowPostPaint); + this.pathTable.SelectionChanged += new System.EventHandler(this.pathTable_SelectionChanged); // // dataGridViewTextBoxColumn5 // - this.dataGridViewTextBoxColumn5.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.AllCells; + this.dataGridViewTextBoxColumn5.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill; + this.dataGridViewTextBoxColumn5.FillWeight = 50F; this.dataGridViewTextBoxColumn5.HeaderText = "Path Name"; - this.dataGridViewTextBoxColumn5.MinimumWidth = 100; + this.dataGridViewTextBoxColumn5.MinimumWidth = 10; this.dataGridViewTextBoxColumn5.Name = "dataGridViewTextBoxColumn5"; this.dataGridViewTextBoxColumn5.Resizable = System.Windows.Forms.DataGridViewTriState.False; this.dataGridViewTextBoxColumn5.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable; // // PathTime // - this.PathTime.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.AllCells; + this.PathTime.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill; + this.PathTime.FillWeight = 50F; this.PathTime.HeaderText = "Path Time"; - this.PathTime.MinimumWidth = 114; + this.PathTime.MinimumWidth = 10; this.PathTime.Name = "PathTime"; this.PathTime.ReadOnly = true; this.PathTime.Resizable = System.Windows.Forms.DataGridViewTriState.False; this.PathTime.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable; - this.PathTime.Width = 114; // // label4 // @@ -425,9 +422,10 @@ private void InitializeComponent() this.label4.BackColor = System.Drawing.SystemColors.ControlLight; this.label4.Font = new System.Drawing.Font("Verdana", 10.2F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.label4.ForeColor = System.Drawing.Color.Black; - this.label4.Location = new System.Drawing.Point(1039, 13); + this.label4.Location = new System.Drawing.Point(784, 8); + this.label4.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); this.label4.Name = "label4"; - this.label4.Size = new System.Drawing.Size(234, 21); + this.label4.Size = new System.Drawing.Size(173, 19); this.label4.TabIndex = 35; this.label4.Text = "Path Sequence"; this.label4.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -438,9 +436,10 @@ private void InitializeComponent() this.label5.BackColor = System.Drawing.SystemColors.ControlLight; this.label5.Font = new System.Drawing.Font("Verdana", 10.2F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.label5.ForeColor = System.Drawing.Color.Black; - this.label5.Location = new System.Drawing.Point(1039, 360); + this.label5.Location = new System.Drawing.Point(783, 275); + this.label5.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); this.label5.Name = "label5"; - this.label5.Size = new System.Drawing.Size(234, 21); + this.label5.Size = new System.Drawing.Size(174, 16); this.label5.TabIndex = 36; this.label5.Text = "Selected Path Points"; this.label5.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -453,10 +452,10 @@ private void InitializeComponent() this.saveFileButton.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.saveFileButton.Font = new System.Drawing.Font("Verdana", 7.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.saveFileButton.ForeColor = System.Drawing.Color.Black; - this.saveFileButton.Location = new System.Drawing.Point(14, 716); + this.saveFileButton.Location = new System.Drawing.Point(10, 548); this.saveFileButton.Margin = new System.Windows.Forms.Padding(1); this.saveFileButton.Name = "saveFileButton"; - this.saveFileButton.Size = new System.Drawing.Size(153, 30); + this.saveFileButton.Size = new System.Drawing.Size(115, 23); this.saveFileButton.TabIndex = 59; this.saveFileButton.Text = "Save to files"; this.TestTooltip.SetToolTip(this.saveFileButton, "Save selected profile to local file system"); @@ -471,10 +470,10 @@ private void InitializeComponent() this.saveAllButton.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.saveAllButton.Font = new System.Drawing.Font("Verdana", 7.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.saveAllButton.ForeColor = System.Drawing.Color.Black; - this.saveAllButton.Location = new System.Drawing.Point(171, 716); + this.saveAllButton.Location = new System.Drawing.Point(126, 548); this.saveAllButton.Margin = new System.Windows.Forms.Padding(1); this.saveAllButton.Name = "saveAllButton"; - this.saveAllButton.Size = new System.Drawing.Size(153, 30); + this.saveAllButton.Size = new System.Drawing.Size(115, 23); this.saveAllButton.TabIndex = 60; this.saveAllButton.Text = "Save all to files"; this.TestTooltip.SetToolTip(this.saveAllButton, "Save all profiles to local file system"); @@ -496,9 +495,10 @@ private void InitializeComponent() this.iconButton1.IconColor = System.Drawing.Color.Teal; this.iconButton1.IconFont = FontAwesome.Sharp.IconFont.Solid; this.iconButton1.IconSize = 35; - this.iconButton1.Location = new System.Drawing.Point(91, 31); + this.iconButton1.Location = new System.Drawing.Point(68, 24); + this.iconButton1.Margin = new System.Windows.Forms.Padding(2); this.iconButton1.Name = "iconButton1"; - this.iconButton1.Size = new System.Drawing.Size(74, 50); + this.iconButton1.Size = new System.Drawing.Size(57, 38); this.iconButton1.TabIndex = 85; this.TestTooltip.SetToolTip(this.iconButton1, "Open local files."); this.iconButton1.UseVisualStyleBackColor = false; @@ -513,9 +513,10 @@ private void InitializeComponent() this.downloadButton.IconColor = System.Drawing.Color.Teal; this.downloadButton.IconFont = FontAwesome.Sharp.IconFont.Auto; this.downloadButton.IconSize = 35; - this.downloadButton.Location = new System.Drawing.Point(12, 31); + this.downloadButton.Location = new System.Drawing.Point(10, 24); + this.downloadButton.Margin = new System.Windows.Forms.Padding(2); this.downloadButton.Name = "downloadButton"; - this.downloadButton.Size = new System.Drawing.Size(74, 50); + this.downloadButton.Size = new System.Drawing.Size(57, 38); this.downloadButton.TabIndex = 84; this.TestTooltip.SetToolTip(this.downloadButton, "Download files from roborio."); this.downloadButton.UseVisualStyleBackColor = false; @@ -531,9 +532,10 @@ private void InitializeComponent() this.uploadButton.IconColor = System.Drawing.Color.Teal; this.uploadButton.IconFont = FontAwesome.Sharp.IconFont.Auto; this.uploadButton.IconSize = 35; - this.uploadButton.Location = new System.Drawing.Point(263, 750); + this.uploadButton.Location = new System.Drawing.Point(196, 574); + this.uploadButton.Margin = new System.Windows.Forms.Padding(2); this.uploadButton.Name = "uploadButton"; - this.uploadButton.Size = new System.Drawing.Size(60, 50); + this.uploadButton.Size = new System.Drawing.Size(45, 38); this.uploadButton.TabIndex = 83; this.TestTooltip.SetToolTip(this.uploadButton, "Upload files to roborio"); this.uploadButton.UseVisualStyleBackColor = false; @@ -549,9 +551,10 @@ private void InitializeComponent() this.previewButton.IconColor = System.Drawing.Color.SlateBlue; this.previewButton.IconFont = FontAwesome.Sharp.IconFont.Solid; this.previewButton.IconSize = 40; - this.previewButton.Location = new System.Drawing.Point(1214, 750); + this.previewButton.Location = new System.Drawing.Point(914, 574); + this.previewButton.Margin = new System.Windows.Forms.Padding(2); this.previewButton.Name = "previewButton"; - this.previewButton.Size = new System.Drawing.Size(59, 50); + this.previewButton.Size = new System.Drawing.Size(43, 38); this.previewButton.TabIndex = 82; this.TestTooltip.SetToolTip(this.previewButton, "Preview the file sent to the rio."); this.previewButton.UseVisualStyleBackColor = false; @@ -565,11 +568,11 @@ private void InitializeComponent() this.iconButton2.IconChar = FontAwesome.Sharp.IconChar.FileText; this.iconButton2.IconColor = System.Drawing.Color.SlateBlue; this.iconButton2.IconFont = FontAwesome.Sharp.IconFont.Auto; - this.iconButton2.IconSize = 24; - this.iconButton2.Location = new System.Drawing.Point(170, 31); + this.iconButton2.IconSize = 35; + this.iconButton2.Location = new System.Drawing.Point(126, 24); this.iconButton2.Margin = new System.Windows.Forms.Padding(0); this.iconButton2.Name = "iconButton2"; - this.iconButton2.Size = new System.Drawing.Size(74, 50); + this.iconButton2.Size = new System.Drawing.Size(57, 38); this.iconButton2.TabIndex = 77; this.TestTooltip.SetToolTip(this.iconButton2, "Switch to configuration mode"); this.iconButton2.UseVisualStyleBackColor = false; @@ -585,10 +588,10 @@ private void InitializeComponent() this.playButton.IconColor = System.Drawing.Color.SlateBlue; this.playButton.IconFont = FontAwesome.Sharp.IconFont.Solid; this.playButton.IconSize = 25; - this.playButton.Location = new System.Drawing.Point(1039, 750); + this.playButton.Location = new System.Drawing.Point(783, 574); this.playButton.Margin = new System.Windows.Forms.Padding(0); this.playButton.Name = "playButton"; - this.playButton.Size = new System.Drawing.Size(172, 50); + this.playButton.Size = new System.Drawing.Size(130, 38); this.playButton.TabIndex = 75; this.TestTooltip.SetToolTip(this.playButton, "Play back the path in real time."); this.playButton.UseVisualStyleBackColor = false; @@ -604,11 +607,11 @@ private void InitializeComponent() this.reverseButton.IconColor = System.Drawing.Color.Black; this.reverseButton.IconFont = FontAwesome.Sharp.IconFont.Solid; this.reverseButton.IconSize = 22; - this.reverseButton.Location = new System.Drawing.Point(1156, 708); + this.reverseButton.Location = new System.Drawing.Point(871, 541); this.reverseButton.Margin = new System.Windows.Forms.Padding(0); this.reverseButton.Name = "reverseButton"; this.reverseButton.Rotation = 90D; - this.reverseButton.Size = new System.Drawing.Size(58, 30); + this.reverseButton.Size = new System.Drawing.Size(43, 23); this.reverseButton.TabIndex = 73; this.TestTooltip.SetToolTip(this.reverseButton, "Reverse path point order"); this.reverseButton.UseVisualStyleBackColor = false; @@ -624,10 +627,10 @@ private void InitializeComponent() this.mirrorPathButton.IconColor = System.Drawing.Color.Black; this.mirrorPathButton.IconFont = FontAwesome.Sharp.IconFont.Solid; this.mirrorPathButton.IconSize = 22; - this.mirrorPathButton.Location = new System.Drawing.Point(1098, 708); + this.mirrorPathButton.Location = new System.Drawing.Point(827, 541); this.mirrorPathButton.Margin = new System.Windows.Forms.Padding(0); this.mirrorPathButton.Name = "mirrorPathButton"; - this.mirrorPathButton.Size = new System.Drawing.Size(58, 30); + this.mirrorPathButton.Size = new System.Drawing.Size(43, 23); this.mirrorPathButton.TabIndex = 70; this.TestTooltip.SetToolTip(this.mirrorPathButton, "Mirror paths"); this.mirrorPathButton.UseVisualStyleBackColor = false; @@ -643,10 +646,10 @@ private void InitializeComponent() this.deletePointButton.IconColor = System.Drawing.Color.Firebrick; this.deletePointButton.IconFont = FontAwesome.Sharp.IconFont.Auto; this.deletePointButton.IconSize = 22; - this.deletePointButton.Location = new System.Drawing.Point(1214, 708); + this.deletePointButton.Location = new System.Drawing.Point(915, 541); this.deletePointButton.Margin = new System.Windows.Forms.Padding(0); this.deletePointButton.Name = "deletePointButton"; - this.deletePointButton.Size = new System.Drawing.Size(59, 30); + this.deletePointButton.Size = new System.Drawing.Size(43, 23); this.deletePointButton.TabIndex = 69; this.TestTooltip.SetToolTip(this.deletePointButton, "Delete selected point"); this.deletePointButton.UseVisualStyleBackColor = false; @@ -662,10 +665,10 @@ private void InitializeComponent() this.shiftPathButton.IconColor = System.Drawing.Color.Black; this.shiftPathButton.IconFont = FontAwesome.Sharp.IconFont.Solid; this.shiftPathButton.IconSize = 22; - this.shiftPathButton.Location = new System.Drawing.Point(1039, 708); + this.shiftPathButton.Location = new System.Drawing.Point(783, 541); this.shiftPathButton.Margin = new System.Windows.Forms.Padding(0); this.shiftPathButton.Name = "shiftPathButton"; - this.shiftPathButton.Size = new System.Drawing.Size(59, 30); + this.shiftPathButton.Size = new System.Drawing.Size(43, 23); this.shiftPathButton.TabIndex = 68; this.TestTooltip.SetToolTip(this.shiftPathButton, "Shift all path points"); this.shiftPathButton.UseVisualStyleBackColor = false; @@ -681,10 +684,10 @@ private void InitializeComponent() this.duplicateProfileButton.IconColor = System.Drawing.Color.Black; this.duplicateProfileButton.IconFont = FontAwesome.Sharp.IconFont.Auto; this.duplicateProfileButton.IconSize = 24; - this.duplicateProfileButton.Location = new System.Drawing.Point(169, 679); + this.duplicateProfileButton.Location = new System.Drawing.Point(126, 519); this.duplicateProfileButton.Margin = new System.Windows.Forms.Padding(0); this.duplicateProfileButton.Name = "duplicateProfileButton"; - this.duplicateProfileButton.Size = new System.Drawing.Size(78, 30); + this.duplicateProfileButton.Size = new System.Drawing.Size(57, 23); this.duplicateProfileButton.TabIndex = 66; this.TestTooltip.SetToolTip(this.duplicateProfileButton, "Duplicate profile"); this.duplicateProfileButton.UseVisualStyleBackColor = false; @@ -700,10 +703,10 @@ private void InitializeComponent() this.editPathButton.IconColor = System.Drawing.Color.Black; this.editPathButton.IconFont = FontAwesome.Sharp.IconFont.Auto; this.editPathButton.IconSize = 20; - this.editPathButton.Location = new System.Drawing.Point(1086, 321); + this.editPathButton.Location = new System.Drawing.Point(819, 245); this.editPathButton.Margin = new System.Windows.Forms.Padding(0); this.editPathButton.Name = "editPathButton"; - this.editPathButton.Size = new System.Drawing.Size(47, 30); + this.editPathButton.Size = new System.Drawing.Size(34, 23); this.editPathButton.TabIndex = 63; this.TestTooltip.SetToolTip(this.editPathButton, "Path settings"); this.editPathButton.UseVisualStyleBackColor = false; @@ -718,11 +721,11 @@ private void InitializeComponent() this.rioConectionButton.IconChar = FontAwesome.Sharp.IconChar.Gear; this.rioConectionButton.IconColor = System.Drawing.Color.Teal; this.rioConectionButton.IconFont = FontAwesome.Sharp.IconFont.Auto; - this.rioConectionButton.IconSize = 40; - this.rioConectionButton.Location = new System.Drawing.Point(249, 31); + this.rioConectionButton.IconSize = 35; + this.rioConectionButton.Location = new System.Drawing.Point(184, 24); this.rioConectionButton.Margin = new System.Windows.Forms.Padding(0); this.rioConectionButton.Name = "rioConectionButton"; - this.rioConectionButton.Size = new System.Drawing.Size(74, 50); + this.rioConectionButton.Size = new System.Drawing.Size(57, 38); this.rioConectionButton.TabIndex = 57; this.TestTooltip.SetToolTip(this.rioConectionButton, "App Settings"); this.rioConectionButton.UseVisualStyleBackColor = false; @@ -738,10 +741,10 @@ private void InitializeComponent() this.editProfileButton.IconColor = System.Drawing.Color.Black; this.editProfileButton.IconFont = FontAwesome.Sharp.IconFont.Auto; this.editProfileButton.IconSize = 24; - this.editProfileButton.Location = new System.Drawing.Point(91, 679); + this.editProfileButton.Location = new System.Drawing.Point(68, 519); this.editProfileButton.Margin = new System.Windows.Forms.Padding(0); this.editProfileButton.Name = "editProfileButton"; - this.editProfileButton.Size = new System.Drawing.Size(78, 30); + this.editProfileButton.Size = new System.Drawing.Size(57, 23); this.editProfileButton.TabIndex = 50; this.TestTooltip.SetToolTip(this.editProfileButton, "Edit profile"); this.editProfileButton.UseVisualStyleBackColor = false; @@ -757,10 +760,10 @@ private void InitializeComponent() this.deleteProfileButton.IconColor = System.Drawing.Color.Firebrick; this.deleteProfileButton.IconFont = FontAwesome.Sharp.IconFont.Auto; this.deleteProfileButton.IconSize = 24; - this.deleteProfileButton.Location = new System.Drawing.Point(247, 679); + this.deleteProfileButton.Location = new System.Drawing.Point(184, 519); this.deleteProfileButton.Margin = new System.Windows.Forms.Padding(0); this.deleteProfileButton.Name = "deleteProfileButton"; - this.deleteProfileButton.Size = new System.Drawing.Size(77, 30); + this.deleteProfileButton.Size = new System.Drawing.Size(57, 23); this.deleteProfileButton.TabIndex = 49; this.TestTooltip.SetToolTip(this.deleteProfileButton, "Delete selected profile"); this.deleteProfileButton.UseVisualStyleBackColor = false; @@ -776,10 +779,10 @@ private void InitializeComponent() this.newProfileButton.IconColor = System.Drawing.Color.Green; this.newProfileButton.IconFont = FontAwesome.Sharp.IconFont.Auto; this.newProfileButton.IconSize = 24; - this.newProfileButton.Location = new System.Drawing.Point(14, 679); + this.newProfileButton.Location = new System.Drawing.Point(10, 519); this.newProfileButton.Margin = new System.Windows.Forms.Padding(0); this.newProfileButton.Name = "newProfileButton"; - this.newProfileButton.Size = new System.Drawing.Size(77, 30); + this.newProfileButton.Size = new System.Drawing.Size(57, 23); this.newProfileButton.TabIndex = 48; this.TestTooltip.SetToolTip(this.newProfileButton, "Create new profile"); this.newProfileButton.UseVisualStyleBackColor = false; @@ -795,10 +798,10 @@ private void InitializeComponent() this.deletePathButton.IconColor = System.Drawing.Color.Firebrick; this.deletePathButton.IconFont = FontAwesome.Sharp.IconFont.Auto; this.deletePathButton.IconSize = 20; - this.deletePathButton.Location = new System.Drawing.Point(1227, 321); + this.deletePathButton.Location = new System.Drawing.Point(924, 245); this.deletePathButton.Margin = new System.Windows.Forms.Padding(0); this.deletePathButton.Name = "deletePathButton"; - this.deletePathButton.Size = new System.Drawing.Size(46, 30); + this.deletePathButton.Size = new System.Drawing.Size(34, 23); this.deletePathButton.TabIndex = 47; this.TestTooltip.SetToolTip(this.deletePathButton, "Delete selected path"); this.deletePathButton.UseVisualStyleBackColor = false; @@ -814,10 +817,10 @@ private void InitializeComponent() this.newPathButton.IconColor = System.Drawing.Color.Green; this.newPathButton.IconFont = FontAwesome.Sharp.IconFont.Auto; this.newPathButton.IconSize = 20; - this.newPathButton.Location = new System.Drawing.Point(1039, 321); + this.newPathButton.Location = new System.Drawing.Point(784, 245); this.newPathButton.Margin = new System.Windows.Forms.Padding(0); this.newPathButton.Name = "newPathButton"; - this.newPathButton.Size = new System.Drawing.Size(47, 30); + this.newPathButton.Size = new System.Drawing.Size(34, 23); this.newPathButton.TabIndex = 46; this.TestTooltip.SetToolTip(this.newPathButton, "Add new path"); this.newPathButton.UseVisualStyleBackColor = false; @@ -835,11 +838,11 @@ private void InitializeComponent() this.pathOrderDown.IconFont = FontAwesome.Sharp.IconFont.Auto; this.pathOrderDown.IconSize = 20; this.pathOrderDown.ImageAlign = System.Drawing.ContentAlignment.TopCenter; - this.pathOrderDown.Location = new System.Drawing.Point(1180, 321); + this.pathOrderDown.Location = new System.Drawing.Point(889, 245); this.pathOrderDown.Margin = new System.Windows.Forms.Padding(0); this.pathOrderDown.Name = "pathOrderDown"; this.pathOrderDown.Rotation = 180D; - this.pathOrderDown.Size = new System.Drawing.Size(47, 30); + this.pathOrderDown.Size = new System.Drawing.Size(34, 23); this.pathOrderDown.TabIndex = 45; this.TestTooltip.SetToolTip(this.pathOrderDown, "Move path order down"); this.pathOrderDown.UseVisualStyleBackColor = false; @@ -856,26 +859,130 @@ private void InitializeComponent() this.pathOrderUp.IconFont = FontAwesome.Sharp.IconFont.Auto; this.pathOrderUp.IconSize = 20; this.pathOrderUp.ImageAlign = System.Drawing.ContentAlignment.BottomCenter; - this.pathOrderUp.Location = new System.Drawing.Point(1133, 321); + this.pathOrderUp.Location = new System.Drawing.Point(854, 245); this.pathOrderUp.Margin = new System.Windows.Forms.Padding(0); this.pathOrderUp.Name = "pathOrderUp"; this.pathOrderUp.Rotation = 180D; - this.pathOrderUp.Size = new System.Drawing.Size(47, 30); + this.pathOrderUp.Size = new System.Drawing.Size(34, 23); this.pathOrderUp.TabIndex = 44; this.TestTooltip.SetToolTip(this.pathOrderUp, "Move path order up"); this.pathOrderUp.UseVisualStyleBackColor = false; this.pathOrderUp.Click += new System.EventHandler(this.pathOrderUp_Click); // + // radioSpline + // + this.radioSpline.Anchor = System.Windows.Forms.AnchorStyles.None; + this.radioSpline.AutoSize = true; + this.radioSpline.ForeColor = System.Drawing.Color.Black; + this.radioSpline.Location = new System.Drawing.Point(57, 38); + this.radioSpline.Margin = new System.Windows.Forms.Padding(0); + this.radioSpline.Name = "radioSpline"; + this.radioSpline.Size = new System.Drawing.Size(54, 17); + this.radioSpline.TabIndex = 67; + this.radioSpline.Text = "Spline"; + this.TestTooltip.SetToolTip(this.radioSpline, "Change the path to spline mode."); + this.radioSpline.UseVisualStyleBackColor = true; + this.radioSpline.CheckedChanged += new System.EventHandler(this.radioSpline_CheckedChanged); + // + // radioLine + // + this.radioLine.Anchor = System.Windows.Forms.AnchorStyles.None; + this.radioLine.AutoSize = true; + this.radioLine.Checked = true; + this.radioLine.ForeColor = System.Drawing.Color.Black; + this.radioLine.Location = new System.Drawing.Point(62, 7); + this.radioLine.Margin = new System.Windows.Forms.Padding(0); + this.radioLine.Name = "radioLine"; + this.radioLine.RightToLeft = System.Windows.Forms.RightToLeft.No; + this.radioLine.Size = new System.Drawing.Size(45, 17); + this.radioLine.TabIndex = 66; + this.radioLine.TabStop = true; + this.radioLine.Text = "Line"; + this.TestTooltip.SetToolTip(this.radioLine, "Change the path to simple line mode."); + this.radioLine.UseVisualStyleBackColor = true; + this.radioLine.CheckedChanged += new System.EventHandler(this.radioLine_CheckedChanged); + // + // showPathsCheckbox + // + this.showPathsCheckbox.Anchor = System.Windows.Forms.AnchorStyles.None; + this.showPathsCheckbox.AutoSize = true; + this.showPathsCheckbox.BackColor = System.Drawing.SystemColors.ControlLight; + this.showPathsCheckbox.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center; + this.showPathsCheckbox.Checked = true; + this.showPathsCheckbox.CheckState = System.Windows.Forms.CheckState.Checked; + this.showPathsCheckbox.Font = new System.Drawing.Font("Verdana", 7.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.showPathsCheckbox.ForeColor = System.Drawing.Color.Black; + this.showPathsCheckbox.Location = new System.Drawing.Point(29, 38); + this.showPathsCheckbox.Margin = new System.Windows.Forms.Padding(0); + this.showPathsCheckbox.Name = "showPathsCheckbox"; + this.showPathsCheckbox.Size = new System.Drawing.Size(109, 17); + this.showPathsCheckbox.TabIndex = 43; + this.showPathsCheckbox.Text = "Show all paths"; + this.TestTooltip.SetToolTip(this.showPathsCheckbox, "Display all paths on the field."); + this.showPathsCheckbox.UseVisualStyleBackColor = false; + this.showPathsCheckbox.CheckedChanged += new System.EventHandler(this.showPathsCheckbox_CheckedChanged); + // + // GridCheckBox + // + this.GridCheckBox.Anchor = System.Windows.Forms.AnchorStyles.None; + this.GridCheckBox.AutoSize = true; + this.GridCheckBox.BackColor = System.Drawing.SystemColors.ControlLight; + this.GridCheckBox.Checked = true; + this.GridCheckBox.CheckState = System.Windows.Forms.CheckState.Checked; + this.GridCheckBox.Font = new System.Drawing.Font("Verdana", 7.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.GridCheckBox.ForeColor = System.Drawing.Color.Black; + this.GridCheckBox.Location = new System.Drawing.Point(42, 7); + this.GridCheckBox.Margin = new System.Windows.Forms.Padding(0); + this.GridCheckBox.Name = "GridCheckBox"; + this.GridCheckBox.Size = new System.Drawing.Size(83, 17); + this.GridCheckBox.TabIndex = 27; + this.GridCheckBox.Text = "Show grid"; + this.TestTooltip.SetToolTip(this.GridCheckBox, "Show the grid on the field."); + this.GridCheckBox.UseVisualStyleBackColor = false; + this.GridCheckBox.CheckedChanged += new System.EventHandler(this.GridCheckBox_CheckedChanged); + // + // radioBlue + // + this.radioBlue.Anchor = System.Windows.Forms.AnchorStyles.None; + this.radioBlue.AutoSize = true; + this.radioBlue.ForeColor = System.Drawing.Color.Black; + this.radioBlue.Location = new System.Drawing.Point(41, 38); + this.radioBlue.Margin = new System.Windows.Forms.Padding(0); + this.radioBlue.Name = "radioBlue"; + this.radioBlue.Size = new System.Drawing.Size(85, 17); + this.radioBlue.TabIndex = 67; + this.radioBlue.Text = "Blue alliance"; + this.TestTooltip.SetToolTip(this.radioBlue, "Switch to blue alliance."); + this.radioBlue.UseVisualStyleBackColor = true; + this.radioBlue.CheckedChanged += new System.EventHandler(this.radioBlue_CheckedChanged); + // + // radioRed + // + this.radioRed.Anchor = System.Windows.Forms.AnchorStyles.None; + this.radioRed.AutoSize = true; + this.radioRed.Checked = true; + this.radioRed.ForeColor = System.Drawing.Color.Black; + this.radioRed.Location = new System.Drawing.Point(41, 7); + this.radioRed.Margin = new System.Windows.Forms.Padding(0); + this.radioRed.Name = "radioRed"; + this.radioRed.Size = new System.Drawing.Size(84, 17); + this.radioRed.TabIndex = 66; + this.radioRed.TabStop = true; + this.radioRed.Text = "Red alliance"; + this.TestTooltip.SetToolTip(this.radioRed, "Switch to red alliance."); + this.radioRed.UseVisualStyleBackColor = true; + this.radioRed.CheckedChanged += new System.EventHandler(this.radioRed_CheckedChanged); + // // Data // this.Data.BackColor = System.Drawing.SystemColors.ControlLight; this.Data.Controls.Add(this.kinematicsChart); this.Data.ForeColor = System.Drawing.Color.Black; - this.Data.Location = new System.Drawing.Point(4, 26); + this.Data.Location = new System.Drawing.Point(4, 22); this.Data.Margin = new System.Windows.Forms.Padding(1); this.Data.Name = "Data"; this.Data.Padding = new System.Windows.Forms.Padding(1); - this.Data.Size = new System.Drawing.Size(681, 782); + this.Data.Size = new System.Drawing.Size(524, 595); this.Data.TabIndex = 1; this.Data.Text = "Data"; // @@ -895,6 +1002,7 @@ private void InitializeComponent() legend1.Name = "Legend1"; this.kinematicsChart.Legends.Add(legend1); this.kinematicsChart.Location = new System.Drawing.Point(1, 1); + this.kinematicsChart.Margin = new System.Windows.Forms.Padding(2); this.kinematicsChart.Name = "kinematicsChart"; series1.BorderWidth = 3; series1.ChartArea = "ChartArea1"; @@ -914,26 +1022,28 @@ private void InitializeComponent() this.kinematicsChart.Series.Add(series1); this.kinematicsChart.Series.Add(series2); this.kinematicsChart.Series.Add(series3); - this.kinematicsChart.Size = new System.Drawing.Size(679, 780); + this.kinematicsChart.Size = new System.Drawing.Size(522, 593); this.kinematicsChart.TabIndex = 0; // // Field // this.Field.BackColor = System.Drawing.SystemColors.ControlLight; this.Field.Controls.Add(this.splitContainer1); - this.Field.Location = new System.Drawing.Point(4, 26); + this.Field.Location = new System.Drawing.Point(4, 22); this.Field.Margin = new System.Windows.Forms.Padding(1); this.Field.Name = "Field"; this.Field.Padding = new System.Windows.Forms.Padding(1); - this.Field.Size = new System.Drawing.Size(681, 782); + this.Field.Size = new System.Drawing.Size(524, 595); this.Field.TabIndex = 0; this.Field.Text = "Field"; // // splitContainer1 // this.splitContainer1.Dock = System.Windows.Forms.DockStyle.Fill; + this.splitContainer1.FixedPanel = System.Windows.Forms.FixedPanel.Panel2; this.splitContainer1.IsSplitterFixed = true; this.splitContainer1.Location = new System.Drawing.Point(1, 1); + this.splitContainer1.Margin = new System.Windows.Forms.Padding(2); this.splitContainer1.Name = "splitContainer1"; this.splitContainer1.Orientation = System.Windows.Forms.Orientation.Horizontal; // @@ -943,57 +1053,56 @@ private void InitializeComponent() // // splitContainer1.Panel2 // + this.splitContainer1.Panel2.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center; this.splitContainer1.Panel2.Controls.Add(this.tableLayoutPanel1); this.splitContainer1.Panel2MinSize = 68; - this.splitContainer1.Size = new System.Drawing.Size(679, 780); - this.splitContainer1.SplitterDistance = 706; + this.splitContainer1.Size = new System.Drawing.Size(522, 593); + this.splitContainer1.SplitterDistance = 522; + this.splitContainer1.SplitterWidth = 3; this.splitContainer1.TabIndex = 77; // // tableLayoutPanel5 // - this.tableLayoutPanel5.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.tableLayoutPanel5.ColumnCount = 1; this.tableLayoutPanel5.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F)); - this.tableLayoutPanel5.Controls.Add(this.panel1, 0, 1); this.tableLayoutPanel5.Controls.Add(this.infoLabel, 0, 0); + this.tableLayoutPanel5.Controls.Add(this.tableLayoutPanel6, 0, 1); + this.tableLayoutPanel5.Dock = System.Windows.Forms.DockStyle.Fill; this.tableLayoutPanel5.Location = new System.Drawing.Point(0, 0); + this.tableLayoutPanel5.Margin = new System.Windows.Forms.Padding(2); this.tableLayoutPanel5.Name = "tableLayoutPanel5"; - this.tableLayoutPanel5.RowCount = 3; + this.tableLayoutPanel5.RowCount = 2; this.tableLayoutPanel5.RowStyles.Add(new System.Windows.Forms.RowStyle()); this.tableLayoutPanel5.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F)); - this.tableLayoutPanel5.RowStyles.Add(new System.Windows.Forms.RowStyle()); - this.tableLayoutPanel5.Size = new System.Drawing.Size(679, 706); + this.tableLayoutPanel5.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F)); + this.tableLayoutPanel5.Size = new System.Drawing.Size(522, 522); this.tableLayoutPanel5.TabIndex = 44; // + // tableLayoutPanel6 + // + this.tableLayoutPanel6.ColumnCount = 1; + this.tableLayoutPanel6.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50F)); + this.tableLayoutPanel6.Controls.Add(this.panel1, 0, 0); + this.tableLayoutPanel6.Controls.Add(this.trackBar, 0, 1); + this.tableLayoutPanel6.Dock = System.Windows.Forms.DockStyle.Fill; + this.tableLayoutPanel6.Location = new System.Drawing.Point(3, 34); + this.tableLayoutPanel6.Name = "tableLayoutPanel6"; + this.tableLayoutPanel6.RowCount = 2; + this.tableLayoutPanel6.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50F)); + this.tableLayoutPanel6.RowStyles.Add(new System.Windows.Forms.RowStyle()); + this.tableLayoutPanel6.Size = new System.Drawing.Size(516, 485); + this.tableLayoutPanel6.TabIndex = 86; + // // panel1 // - this.panel1.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.panel1.Controls.Add(this.trackBar); this.panel1.Controls.Add(this.mainField); - this.panel1.Location = new System.Drawing.Point(3, 43); + this.panel1.Dock = System.Windows.Forms.DockStyle.Fill; + this.panel1.Location = new System.Drawing.Point(2, 2); + this.panel1.Margin = new System.Windows.Forms.Padding(2); this.panel1.Name = "panel1"; - this.panel1.Size = new System.Drawing.Size(673, 660); + this.panel1.Size = new System.Drawing.Size(512, 432); this.panel1.TabIndex = 79; // - // trackBar - // - this.trackBar.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); - this.trackBar.Location = new System.Drawing.Point(1, 601); - this.trackBar.Maximum = 1000; - this.trackBar.Name = "trackBar"; - this.trackBar.Size = new System.Drawing.Size(673, 56); - this.trackBar.TabIndex = 43; - this.trackBar.TabStop = false; - this.trackBar.Tag = ""; - this.trackBar.TickFrequency = 0; - this.trackBar.TickStyle = System.Windows.Forms.TickStyle.None; - this.trackBar.ValueChanged += new System.EventHandler(this.trackBar_ValueChanged); - // // mainField // this.mainField.BackColor = System.Drawing.SystemColors.ControlLight; @@ -1001,10 +1110,10 @@ private void InitializeComponent() chartArea2.BackImageWrapMode = System.Windows.Forms.DataVisualization.Charting.ChartImageWrapMode.Scaled; chartArea2.Name = "field"; this.mainField.ChartAreas.Add(chartArea2); - this.mainField.Location = new System.Drawing.Point(1, -3); + this.mainField.Location = new System.Drawing.Point(-3, 0); this.mainField.Margin = new System.Windows.Forms.Padding(0); this.mainField.Name = "mainField"; - this.mainField.Size = new System.Drawing.Size(672, 575); + this.mainField.Size = new System.Drawing.Size(504, 440); this.mainField.TabIndex = 4; this.mainField.Text = "chart2"; this.mainField.MouseClick += new System.Windows.Forms.MouseEventHandler(this.MainField_MouseClick); @@ -1012,162 +1121,41 @@ private void InitializeComponent() this.mainField.MouseMove += new System.Windows.Forms.MouseEventHandler(this.MainField_MouseMove); this.mainField.MouseUp += new System.Windows.Forms.MouseEventHandler(this.mainField_MouseUp); // + // trackBar + // + this.trackBar.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.trackBar.Location = new System.Drawing.Point(2, 438); + this.trackBar.Margin = new System.Windows.Forms.Padding(2); + this.trackBar.Maximum = 1000; + this.trackBar.Name = "trackBar"; + this.trackBar.Size = new System.Drawing.Size(512, 45); + this.trackBar.TabIndex = 43; + this.trackBar.TabStop = false; + this.trackBar.Tag = ""; + this.trackBar.TickFrequency = 0; + this.trackBar.TickStyle = System.Windows.Forms.TickStyle.None; + this.trackBar.ValueChanged += new System.EventHandler(this.trackBar_ValueChanged); + // // tableLayoutPanel1 // this.tableLayoutPanel1.ColumnCount = 3; - this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 33.33333F)); - this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 33.33333F)); - this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 33.33333F)); + this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 33.33332F)); + this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 33.33334F)); + this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 33.33334F)); + this.tableLayoutPanel1.Controls.Add(this.tableLayoutPanel4, 1, 0); this.tableLayoutPanel1.Controls.Add(this.tableLayoutPanel2, 0, 0); - this.tableLayoutPanel1.Controls.Add(this.tableLayoutPanel3, 1, 0); - this.tableLayoutPanel1.Controls.Add(this.tableLayoutPanel4, 2, 0); + this.tableLayoutPanel1.Controls.Add(this.tableLayoutPanel3, 2, 0); this.tableLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Fill; this.tableLayoutPanel1.Location = new System.Drawing.Point(0, 0); + this.tableLayoutPanel1.Margin = new System.Windows.Forms.Padding(2); this.tableLayoutPanel1.Name = "tableLayoutPanel1"; this.tableLayoutPanel1.RowCount = 1; - this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F)); - this.tableLayoutPanel1.Size = new System.Drawing.Size(679, 70); + this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle()); + this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F)); + this.tableLayoutPanel1.Size = new System.Drawing.Size(522, 68); this.tableLayoutPanel1.TabIndex = 0; // - // tableLayoutPanel2 - // - this.tableLayoutPanel2.ColumnCount = 1; - this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50F)); - this.tableLayoutPanel2.Controls.Add(this.radioBlue, 0, 1); - this.tableLayoutPanel2.Controls.Add(this.radioRed, 0, 0); - this.tableLayoutPanel2.Dock = System.Windows.Forms.DockStyle.Fill; - this.tableLayoutPanel2.Location = new System.Drawing.Point(3, 3); - this.tableLayoutPanel2.Name = "tableLayoutPanel2"; - this.tableLayoutPanel2.RowCount = 2; - this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50F)); - this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50F)); - this.tableLayoutPanel2.Size = new System.Drawing.Size(220, 64); - this.tableLayoutPanel2.TabIndex = 0; - // - // radioBlue - // - this.radioBlue.Anchor = System.Windows.Forms.AnchorStyles.None; - this.radioBlue.AutoSize = true; - this.radioBlue.ForeColor = System.Drawing.Color.Black; - this.radioBlue.Location = new System.Drawing.Point(55, 37); - this.radioBlue.Name = "radioBlue"; - this.radioBlue.Size = new System.Drawing.Size(109, 21); - this.radioBlue.TabIndex = 67; - this.radioBlue.Text = "Blue alliance"; - this.radioBlue.UseVisualStyleBackColor = true; - this.radioBlue.CheckedChanged += new System.EventHandler(this.radioBlue_CheckedChanged); - // - // radioRed - // - this.radioRed.Anchor = System.Windows.Forms.AnchorStyles.None; - this.radioRed.AutoSize = true; - this.radioRed.Checked = true; - this.radioRed.ForeColor = System.Drawing.Color.Black; - this.radioRed.Location = new System.Drawing.Point(56, 5); - this.radioRed.Name = "radioRed"; - this.radioRed.Size = new System.Drawing.Size(107, 21); - this.radioRed.TabIndex = 66; - this.radioRed.TabStop = true; - this.radioRed.Text = "Red alliance"; - this.radioRed.UseVisualStyleBackColor = true; - this.radioRed.CheckedChanged += new System.EventHandler(this.radioRed_CheckedChanged); - // - // tableLayoutPanel3 - // - this.tableLayoutPanel3.ColumnCount = 1; - this.tableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50F)); - this.tableLayoutPanel3.Controls.Add(this.GridCheckBox, 0, 0); - this.tableLayoutPanel3.Controls.Add(this.showPathsCheckbox, 0, 1); - this.tableLayoutPanel3.Dock = System.Windows.Forms.DockStyle.Fill; - this.tableLayoutPanel3.Location = new System.Drawing.Point(229, 3); - this.tableLayoutPanel3.Name = "tableLayoutPanel3"; - this.tableLayoutPanel3.RowCount = 2; - this.tableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50F)); - this.tableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50F)); - this.tableLayoutPanel3.Size = new System.Drawing.Size(220, 64); - this.tableLayoutPanel3.TabIndex = 1; - // - // GridCheckBox - // - this.GridCheckBox.Anchor = System.Windows.Forms.AnchorStyles.None; - this.GridCheckBox.AutoSize = true; - this.GridCheckBox.BackColor = System.Drawing.SystemColors.ControlLight; - this.GridCheckBox.Checked = true; - this.GridCheckBox.CheckState = System.Windows.Forms.CheckState.Checked; - this.GridCheckBox.Font = new System.Drawing.Font("Verdana", 7.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.GridCheckBox.ForeColor = System.Drawing.Color.Black; - this.GridCheckBox.Location = new System.Drawing.Point(59, 5); - this.GridCheckBox.Margin = new System.Windows.Forms.Padding(1); - this.GridCheckBox.Name = "GridCheckBox"; - this.GridCheckBox.Size = new System.Drawing.Size(101, 21); - this.GridCheckBox.TabIndex = 27; - this.GridCheckBox.Text = "Show grid"; - this.GridCheckBox.UseVisualStyleBackColor = false; - this.GridCheckBox.CheckedChanged += new System.EventHandler(this.GridCheckBox_CheckedChanged); - // - // showPathsCheckbox - // - this.showPathsCheckbox.Anchor = System.Windows.Forms.AnchorStyles.None; - this.showPathsCheckbox.AutoSize = true; - this.showPathsCheckbox.BackColor = System.Drawing.SystemColors.ControlLight; - this.showPathsCheckbox.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center; - this.showPathsCheckbox.Checked = true; - this.showPathsCheckbox.CheckState = System.Windows.Forms.CheckState.Checked; - this.showPathsCheckbox.Font = new System.Drawing.Font("Verdana", 7.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.showPathsCheckbox.ForeColor = System.Drawing.Color.Black; - this.showPathsCheckbox.Location = new System.Drawing.Point(43, 37); - this.showPathsCheckbox.Margin = new System.Windows.Forms.Padding(1); - this.showPathsCheckbox.Name = "showPathsCheckbox"; - this.showPathsCheckbox.Size = new System.Drawing.Size(133, 21); - this.showPathsCheckbox.TabIndex = 43; - this.showPathsCheckbox.Text = "Show all paths"; - this.showPathsCheckbox.UseVisualStyleBackColor = false; - this.showPathsCheckbox.CheckedChanged += new System.EventHandler(this.showPathsCheckbox_CheckedChanged); - // - // tableLayoutPanel4 - // - this.tableLayoutPanel4.ColumnCount = 1; - this.tableLayoutPanel4.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50F)); - this.tableLayoutPanel4.Controls.Add(this.radioLine, 0, 0); - this.tableLayoutPanel4.Controls.Add(this.radioSpline, 0, 1); - this.tableLayoutPanel4.Dock = System.Windows.Forms.DockStyle.Fill; - this.tableLayoutPanel4.Location = new System.Drawing.Point(455, 3); - this.tableLayoutPanel4.Name = "tableLayoutPanel4"; - this.tableLayoutPanel4.RowCount = 2; - this.tableLayoutPanel4.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50F)); - this.tableLayoutPanel4.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50F)); - this.tableLayoutPanel4.Size = new System.Drawing.Size(221, 64); - this.tableLayoutPanel4.TabIndex = 2; - // - // radioLine - // - this.radioLine.Anchor = System.Windows.Forms.AnchorStyles.None; - this.radioLine.AutoSize = true; - this.radioLine.Checked = true; - this.radioLine.ForeColor = System.Drawing.Color.Black; - this.radioLine.Location = new System.Drawing.Point(82, 5); - this.radioLine.Name = "radioLine"; - this.radioLine.RightToLeft = System.Windows.Forms.RightToLeft.No; - this.radioLine.Size = new System.Drawing.Size(56, 21); - this.radioLine.TabIndex = 66; - this.radioLine.TabStop = true; - this.radioLine.Text = "Line"; - this.radioLine.UseVisualStyleBackColor = true; - this.radioLine.CheckedChanged += new System.EventHandler(this.radioLine_CheckedChanged); - // - // radioSpline - // - this.radioSpline.Anchor = System.Windows.Forms.AnchorStyles.None; - this.radioSpline.AutoSize = true; - this.radioSpline.ForeColor = System.Drawing.Color.Black; - this.radioSpline.Location = new System.Drawing.Point(76, 37); - this.radioSpline.Name = "radioSpline"; - this.radioSpline.Size = new System.Drawing.Size(68, 21); - this.radioSpline.TabIndex = 67; - this.radioSpline.Text = "Spline"; - this.radioSpline.UseVisualStyleBackColor = true; - this.radioSpline.CheckedChanged += new System.EventHandler(this.radioSpline_CheckedChanged); - // // MoreData // this.MoreData.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) @@ -1175,11 +1163,11 @@ private void InitializeComponent() | System.Windows.Forms.AnchorStyles.Right))); this.MoreData.Controls.Add(this.Field); this.MoreData.Controls.Add(this.Data); - this.MoreData.Location = new System.Drawing.Point(336, 0); + this.MoreData.Location = new System.Drawing.Point(245, 0); this.MoreData.Margin = new System.Windows.Forms.Padding(0); this.MoreData.Name = "MoreData"; this.MoreData.SelectedIndex = 0; - this.MoreData.Size = new System.Drawing.Size(689, 812); + this.MoreData.Size = new System.Drawing.Size(532, 621); this.MoreData.TabIndex = 1; this.MoreData.SelectedIndexChanged += new System.EventHandler(this.MotionProfiler_TabChange); // @@ -1191,10 +1179,12 @@ private void InitializeComponent() // timeSinceUpload // this.timeSinceUpload.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); + this.timeSinceUpload.AutoSize = true; this.timeSinceUpload.ForeColor = System.Drawing.Color.Black; - this.timeSinceUpload.Location = new System.Drawing.Point(14, 750); + this.timeSinceUpload.Location = new System.Drawing.Point(11, 574); + this.timeSinceUpload.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); this.timeSinceUpload.Name = "timeSinceUpload"; - this.timeSinceUpload.Size = new System.Drawing.Size(243, 23); + this.timeSinceUpload.Size = new System.Drawing.Size(70, 13); this.timeSinceUpload.TabIndex = 78; this.timeSinceUpload.Text = "Last Upload: "; this.timeSinceUpload.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; @@ -1212,7 +1202,8 @@ private void InitializeComponent() this.fileToolStripMenuItem}); this.menuStrip1.Location = new System.Drawing.Point(0, 0); this.menuStrip1.Name = "menuStrip1"; - this.menuStrip1.Size = new System.Drawing.Size(1285, 30); + this.menuStrip1.Padding = new System.Windows.Forms.Padding(4, 2, 0, 2); + this.menuStrip1.Size = new System.Drawing.Size(964, 24); this.menuStrip1.TabIndex = 79; this.menuStrip1.Text = "menuStrip1"; // @@ -1223,14 +1214,14 @@ private void InitializeComponent() this.redoToolStripMenuItem, this.infoToolStripMenuItem}); this.fileToolStripMenuItem.Name = "fileToolStripMenuItem"; - this.fileToolStripMenuItem.Size = new System.Drawing.Size(46, 26); + this.fileToolStripMenuItem.Size = new System.Drawing.Size(37, 20); this.fileToolStripMenuItem.Text = "File"; // // undoToolStripMenuItem // this.undoToolStripMenuItem.Name = "undoToolStripMenuItem"; this.undoToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Z))); - this.undoToolStripMenuItem.Size = new System.Drawing.Size(179, 26); + this.undoToolStripMenuItem.Size = new System.Drawing.Size(144, 22); this.undoToolStripMenuItem.Text = "Undo"; this.undoToolStripMenuItem.Click += new System.EventHandler(this.undoToolStripMenuItem_Click); // @@ -1238,48 +1229,84 @@ private void InitializeComponent() // this.redoToolStripMenuItem.Name = "redoToolStripMenuItem"; this.redoToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Y))); - this.redoToolStripMenuItem.Size = new System.Drawing.Size(179, 26); + this.redoToolStripMenuItem.Size = new System.Drawing.Size(144, 22); this.redoToolStripMenuItem.Text = "Redo"; this.redoToolStripMenuItem.Click += new System.EventHandler(this.redoToolStripMenuItem_Click); // // infoToolStripMenuItem // this.infoToolStripMenuItem.Name = "infoToolStripMenuItem"; - this.infoToolStripMenuItem.Size = new System.Drawing.Size(179, 26); + this.infoToolStripMenuItem.Size = new System.Drawing.Size(144, 22); this.infoToolStripMenuItem.Text = "Info"; this.infoToolStripMenuItem.Click += new System.EventHandler(this.infoButton_Click); // - // label1 + // currentTime // - this.label1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); - this.label1.AutoSize = true; - this.label1.Location = new System.Drawing.Point(14, 776); - this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(127, 17); - this.label1.TabIndex = 80; - this.label1.Text = "Current Path Time:"; + this.currentTime.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); + this.currentTime.AutoSize = true; + this.currentTime.Location = new System.Drawing.Point(11, 593); + this.currentTime.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.currentTime.Name = "currentTime"; + this.currentTime.Size = new System.Drawing.Size(70, 13); + this.currentTime.TabIndex = 80; + this.currentTime.Text = "Current Time:"; + // + // tableLayoutPanel2 + // + this.tableLayoutPanel2.ColumnCount = 1; + this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50F)); + this.tableLayoutPanel2.Controls.Add(this.radioRed, 0, 0); + this.tableLayoutPanel2.Controls.Add(this.radioBlue, 0, 1); + this.tableLayoutPanel2.Dock = System.Windows.Forms.DockStyle.Fill; + this.tableLayoutPanel2.Location = new System.Drawing.Point(3, 3); + this.tableLayoutPanel2.Name = "tableLayoutPanel2"; + this.tableLayoutPanel2.RowCount = 2; + this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50F)); + this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50F)); + this.tableLayoutPanel2.Size = new System.Drawing.Size(167, 62); + this.tableLayoutPanel2.TabIndex = 0; + // + // tableLayoutPanel3 + // + this.tableLayoutPanel3.ColumnCount = 1; + this.tableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50F)); + this.tableLayoutPanel3.Controls.Add(this.radioSpline, 0, 1); + this.tableLayoutPanel3.Controls.Add(this.radioLine, 0, 0); + this.tableLayoutPanel3.Dock = System.Windows.Forms.DockStyle.Fill; + this.tableLayoutPanel3.Location = new System.Drawing.Point(350, 3); + this.tableLayoutPanel3.Name = "tableLayoutPanel3"; + this.tableLayoutPanel3.RowCount = 2; + this.tableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50F)); + this.tableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50F)); + this.tableLayoutPanel3.Size = new System.Drawing.Size(169, 62); + this.tableLayoutPanel3.TabIndex = 1; // - // pathTimeLabel + // tableLayoutPanel4 // - this.pathTimeLabel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); - this.pathTimeLabel.AutoSize = true; - this.pathTimeLabel.Location = new System.Drawing.Point(147, 776); - this.pathTimeLabel.Name = "pathTimeLabel"; - this.pathTimeLabel.Size = new System.Drawing.Size(0, 17); - this.pathTimeLabel.TabIndex = 81; + this.tableLayoutPanel4.ColumnCount = 1; + this.tableLayoutPanel4.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50F)); + this.tableLayoutPanel4.Controls.Add(this.GridCheckBox, 0, 0); + this.tableLayoutPanel4.Controls.Add(this.showPathsCheckbox, 0, 1); + this.tableLayoutPanel4.Dock = System.Windows.Forms.DockStyle.Fill; + this.tableLayoutPanel4.Location = new System.Drawing.Point(176, 3); + this.tableLayoutPanel4.Name = "tableLayoutPanel4"; + this.tableLayoutPanel4.RowCount = 2; + this.tableLayoutPanel4.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50F)); + this.tableLayoutPanel4.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50F)); + this.tableLayoutPanel4.Size = new System.Drawing.Size(168, 62); + this.tableLayoutPanel4.TabIndex = 2; // // MotionProfiler // - this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 17F); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi; this.BackColor = System.Drawing.SystemColors.ControlLight; - this.ClientSize = new System.Drawing.Size(1285, 812); + this.ClientSize = new System.Drawing.Size(964, 621); this.Controls.Add(this.iconButton1); this.Controls.Add(this.downloadButton); this.Controls.Add(this.uploadButton); this.Controls.Add(this.previewButton); - this.Controls.Add(this.pathTimeLabel); - this.Controls.Add(this.label1); + this.Controls.Add(this.currentTime); this.Controls.Add(this.timeSinceUpload); this.Controls.Add(this.iconButton2); this.Controls.Add(this.playButton); @@ -1312,7 +1339,8 @@ private void InitializeComponent() this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); this.KeyPreview = true; this.MainMenuStrip = this.menuStrip1; - this.MinimumSize = new System.Drawing.Size(1050, 632); + this.Margin = new System.Windows.Forms.Padding(2); + this.MinimumSize = new System.Drawing.Size(792, 492); this.Name = "MotionProfiler"; this.RightToLeft = System.Windows.Forms.RightToLeft.No; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; @@ -1332,20 +1360,21 @@ private void InitializeComponent() ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).EndInit(); this.splitContainer1.ResumeLayout(false); this.tableLayoutPanel5.ResumeLayout(false); + this.tableLayoutPanel6.ResumeLayout(false); + this.tableLayoutPanel6.PerformLayout(); this.panel1.ResumeLayout(false); - this.panel1.PerformLayout(); - ((System.ComponentModel.ISupportInitialize)(this.trackBar)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.mainField)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.trackBar)).EndInit(); this.tableLayoutPanel1.ResumeLayout(false); + this.MoreData.ResumeLayout(false); + this.menuStrip1.ResumeLayout(false); + this.menuStrip1.PerformLayout(); this.tableLayoutPanel2.ResumeLayout(false); this.tableLayoutPanel2.PerformLayout(); this.tableLayoutPanel3.ResumeLayout(false); this.tableLayoutPanel3.PerformLayout(); this.tableLayoutPanel4.ResumeLayout(false); this.tableLayoutPanel4.PerformLayout(); - this.MoreData.ResumeLayout(false); - this.menuStrip1.ResumeLayout(false); - this.menuStrip1.PerformLayout(); this.ResumeLayout(false); this.PerformLayout(); @@ -1372,9 +1401,6 @@ private void InitializeComponent() private System.Windows.Forms.Button saveAllButton; private FontAwesome.Sharp.IconButton editPathButton; private System.Windows.Forms.ToolTip TestTooltip; - private System.Windows.Forms.DataGridViewTextBoxColumn x; - private System.Windows.Forms.DataGridViewTextBoxColumn y; - private System.Windows.Forms.DataGridViewTextBoxColumn Direction; private FontAwesome.Sharp.IconButton duplicateProfileButton; private FontAwesome.Sharp.IconButton shiftPathButton; private FontAwesome.Sharp.IconButton deletePointButton; @@ -1394,9 +1420,6 @@ private void InitializeComponent() private System.Windows.Forms.RadioButton radioRed; private System.Windows.Forms.TabControl MoreData; private System.Windows.Forms.TrackBar trackBar; - private System.Windows.Forms.TableLayoutPanel tableLayoutPanel2; - private System.Windows.Forms.TableLayoutPanel tableLayoutPanel3; - private System.Windows.Forms.TableLayoutPanel tableLayoutPanel4; private System.Windows.Forms.TableLayoutPanel tableLayoutPanel5; private System.Windows.Forms.Timer timer1; private FontAwesome.Sharp.IconButton playButton; @@ -1409,17 +1432,23 @@ private void InitializeComponent() private System.Windows.Forms.ToolStripMenuItem undoToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem redoToolStripMenuItem; private System.Windows.Forms.DataGridView profileTable; - private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn2; - private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn3; - private System.Windows.Forms.Label label1; - private System.Windows.Forms.Label pathTimeLabel; + private System.Windows.Forms.Label currentTime; private FontAwesome.Sharp.IconButton previewButton; private FontAwesome.Sharp.IconButton uploadButton; private FontAwesome.Sharp.IconButton downloadButton; private FontAwesome.Sharp.IconButton iconButton1; + private System.Windows.Forms.ToolStripMenuItem infoToolStripMenuItem; + private System.Windows.Forms.TableLayoutPanel tableLayoutPanel6; + private System.Windows.Forms.DataGridViewTextBoxColumn x; + private System.Windows.Forms.DataGridViewTextBoxColumn y; + private System.Windows.Forms.DataGridViewTextBoxColumn Direction; + private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn2; + private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn3; private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn5; private System.Windows.Forms.DataGridViewTextBoxColumn PathTime; - private System.Windows.Forms.ToolStripMenuItem infoToolStripMenuItem; + private System.Windows.Forms.TableLayoutPanel tableLayoutPanel4; + private System.Windows.Forms.TableLayoutPanel tableLayoutPanel2; + private System.Windows.Forms.TableLayoutPanel tableLayoutPanel3; } } diff --git a/Motion-Profile-Mapper/Motion-Profile-Mapper/Forms/MotionProfiler.cs b/Motion-Profile-Mapper/Motion-Profile-Mapper/Forms/MotionProfiler.cs index d49abbe..b4be821 100644 --- a/Motion-Profile-Mapper/Motion-Profile-Mapper/Forms/MotionProfiler.cs +++ b/Motion-Profile-Mapper/Motion-Profile-Mapper/Forms/MotionProfiler.cs @@ -19,7 +19,6 @@ using MotionProfileMapper.VelocityGenerate; using Menu = Forms.Menu; - /// /// Defines the /// @@ -97,6 +96,8 @@ public MotionProfiler(Menu menu) private void MainForm_Load(object sender, EventArgs e) { SetupMainField(); + splitContainer1.SplitterDistance = splitContainer1.Height-(int)(80 * this.CurrentAutoScaleDimensions.Width/96); + MotionProfiler_Resize(null, null); } @@ -131,10 +132,7 @@ private void SetupMainField() mainField.ChartAreas["field"].BackImageWrapMode = ChartImageWrapMode.Scaled; setBackground(!MotionProfileMapper.Properties.Settings.Default.defaultAllianceIsRed, false); - if(!MotionProfileMapper.Properties.Settings.Default.defaultAllianceIsRed) - { - radioBlue.Checked = true; - } + setAllianceMode(MotionProfileMapper.Properties.Settings.Default.defaultAllianceIsRed); } @@ -501,11 +499,8 @@ private void DrawPath(ProfilePath path, bool quickDraw) DrawPoint(point, path, ps.Contains(point)); } - if (path.ControlPoints.Count < 2) return; - path.generate(quickDraw); - kinematicsChart.Series["Position"].Points.Clear(); kinematicsChart.Series["Velocity"].Points.Clear(); kinematicsChart.Series["Acceleration"].Points.Clear(); @@ -527,7 +522,7 @@ private void DrawPath(ProfilePath path, bool quickDraw) - public void UpdateField() + public void UpdateField(bool doResetTrackBar=true) { if (skipUpdate) return; @@ -575,8 +570,8 @@ public void UpdateField() } setStatus("", false); - - resetTrackBar(); + if(doResetTrackBar) + resetTrackBar(); } @@ -821,7 +816,6 @@ private void selectProfile(int index = -1) if (index == -1 || selectedProfile.PathCount == 0) selectPath(); else selectPath(0); - if (!noSelectedProfile()) setAllianceMode(selectedProfile.isRed); UpdateField(); @@ -836,6 +830,7 @@ private void profileTable_RowEnter(object sender, DataGridViewCellEventArgs e) private void newProfileButton_Click(object sender, EventArgs e) { + skipPathSelectionChange = true; saveUndoState("New Profile",true, null, false); profiles.Add(new Profile()); skipSelectProfile = true; @@ -844,6 +839,7 @@ private void newProfileButton_Click(object sender, EventArgs e) selectProfile(profiles.Count - 1); profileTable.CurrentCell = profileTable.Rows[index].Cells[0]; profileTable.BeginEdit(false); + skipPathSelectionChange = false; } private void deleteProfileButton_Click(object sender, EventArgs e) @@ -864,7 +860,8 @@ private void deleteProfileButton_Click(object sender, EventArgs e) private void profileTable_CellDoubleClick(object sender, DataGridViewCellEventArgs e) { - profileTable.BeginEdit(false); + if(profileTable.CurrentCell!=null) + profileTable.BeginEdit(false); } private void profileTable_CellEndEdit(object sender, DataGridViewCellEventArgs e) @@ -880,15 +877,20 @@ private void editProfileButton_Click(object sender, EventArgs e) private void newPathButton_Click(object sender, EventArgs e) { if (noSelectedProfile()) return; - + skipPathSelectionChange = true; string newPathName = "Path " + (selectedProfile.Paths.Count + 1); if (Properties.Settings.Default.SnapNewPaths && selectedProfile.Paths.Count > 0) selectedProfile.newPath(newPathName, splineMode, selectedProfile.Paths.Last()); else selectedProfile.newPath(newPathName, splineMode); - int newIndex = pathTable.Rows.Add(newPathName); + skipPathSelectionChange = false; + pathTable.ClearSelection(); + pathTable.CurrentCell = null; + pathTable.Update(); selectPath(newIndex); + + pathTable.CurrentCell = pathTable.Rows[newIndex].Cells[0]; } @@ -899,7 +901,6 @@ private void deletePathButton_Click(object sender, EventArgs e) pathTable.ClearSelection(); return; } - saveUndoState("Delete Path"); int pathIndex = selectedProfile.Paths.IndexOf(selectedPath); @@ -990,10 +991,18 @@ private bool noPointsInPath() private void pathTable_RowEnter(object sender, DataGridViewCellEventArgs e) { + if (skipPathSelectionChange) + return; selectPath(e.RowIndex); } private void selectPath(int index = -1) + { + selectPath(true, index); + } + + bool skipPathSelectionChange = false; + private void selectPath(bool doResetTrackBar, int index = -1) { // -1 reselects current path i think ControlPointTable.Rows.Clear(); @@ -1009,6 +1018,7 @@ private void selectPath(int index = -1) skipUpdate = false; } + if (!noSelectedPath()) { @@ -1016,17 +1026,20 @@ private void selectPath(int index = -1) { ControlPointTable.Rows.Add(Math.Round(point.X, 3), Math.Round(point.Y, 3), point.Rotation); } + skipPathSelectionChange = true; pathTable.Rows[selectedProfile.Paths.IndexOf(selectedPath)].Selected = true; + skipPathSelectionChange = false; } if (!noPointsInPath()) selectPoint(ControlPointTable.Rows.Count - 1); - UpdateField(); + UpdateField(doResetTrackBar); } private void pathTable_CellDoubleClick(object sender, DataGridViewCellEventArgs e) { - pathTable.BeginEdit(false); + if(pathTable.CurrentCell!=null) + pathTable.BeginEdit(false); } private void showPathsCheckbox_CheckedChanged(object sender, EventArgs e) @@ -1047,6 +1060,7 @@ private void editPathButton_Click(object sender, EventArgs e) PathSettings settings = new PathSettings(selectedPath, pathTable.Rows[selectedProfile.Paths.IndexOf(selectedPath)].Cells[0]); settings.ShowDialog(); UpdateField(); + resetTrackBar(); } public void updateEditTime(Profile p) @@ -1121,6 +1135,7 @@ private void saveToRioButton_Click(object sender, EventArgs e) { setStatus("Profile(s) uploaded and verified successfully", false); timeOfUpload = DateTime.Now; + timer2.Start(); } else setStatus("Failed to verify uploaded file content", true); sftp.Disconnect(); @@ -1262,7 +1277,6 @@ private void setSplineMode(bool isSpline) radioLine.Checked = !isSpline; radioSpline.Checked = isSpline; } - private void setAllianceMode(bool isRed) { radioRed.Checked = isRed; @@ -1296,7 +1310,6 @@ private void MotionProfiler_FormClosed(object sender, FormClosedEventArgs e) private void resetTrackBar() { - //trackBar.Value = 0; trackBar_ValueChanged(null, null); stopTimer(); } @@ -1307,24 +1320,56 @@ private void trackBar_ValueChanged(object sender, EventArgs e) double percent = (double)trackBar.Value / (double)trackBar.Maximum; - if (selectedPath.gen == null) + List selectedPaths = new List(); + + foreach (ProfilePath p in selectedProfile.Paths) { - pathTimeLabel.Text = ""; - return; + if (!p.isEmpty()) + { + selectedPaths.Add(p); + } } - if (selectedPath.ControlPoints.Count < 2) + + if (selectedPaths.Count == 0) { - pathTimeLabel.Text = ""; + currentTime.Text = "Current Time:"; return; } - double time = selectedPath.gen.getDuration() * percent; + double duration = selectedPaths.Sum(p => (p.gen.getDuration())); + + double time = duration * percent; + + double accumTime = 0; + ProfilePath currentPath = null; + for (int i = 0; i < selectedPaths.Count; i++) + { + ProfilePath p = selectedPaths[i]; + if (p.gen.getDuration()+accumTime>=time) + { + currentPath = p; + break; + } + accumTime += p.gen.getDuration(); + } + + if (currentPath == null) + return; - pathTimeLabel.Text = string.Format("{0:N2} seconds", time); + if (currentPath != selectedPath && timer1.Enabled) + { + selectPath(false, selectedProfile.Paths.IndexOf(currentPath)); + skipPathSelectionChange = true; + pathTable.CurrentCell = pathTable.Rows[selectedProfile.Paths.IndexOf(currentPath)].Cells[0]; + skipPathSelectionChange = false; + } + - State s = selectedPath.gen.calculate(time); + currentTime.Text = string.Format("Current Time: {0:N2} seconds", time); + + State s = currentPath.gen.calculate(time - accumTime); PState ps = s.getPathState(); @@ -1377,13 +1422,29 @@ private void timer1_Tick(object sender, EventArgs e) } TimeSpan time = DateTime.Now - startTime; - if (time.TotalSeconds + timeOffset > selectedPath.gen.getDuration()) + + List selectedPaths = new List(); + foreach (ProfilePath p in selectedProfile.Paths) + { + if (!p.isEmpty()) + { + selectedPaths.Add(p); + } + + } + double duration = 0.0; + if (selectedPaths.Count != 0) + { + duration = selectedPaths.Sum(p => (p.gen.getDuration())); + } + + if (time.TotalSeconds + timeOffset > duration) { trackBar.Value = trackBar.Maximum; stopTimer(); return; } - int trackbarvalue = (int)(((time.TotalSeconds + timeOffset) / selectedPath.gen.getDuration()) * trackBar.Maximum); + int trackbarvalue = (int)(((time.TotalSeconds + timeOffset) / duration) * trackBar.Maximum); if (trackbarvalue <= trackBar.Maximum && trackbarvalue >= trackBar.Minimum) trackBar.Value = trackbarvalue; @@ -1456,25 +1517,25 @@ private void MotionProfiler_TabChange(object sender, EventArgs e) private void MotionProfiler_Resize(object sender, EventArgs e) { - double hw = fieldWidth / fieldHeight; - double wh = fieldHeight / fieldWidth; - int panel1Height = (int)(panel1.Height - 56); - if (panel1.Width <= panel1Height * hw) - { - mainField.Width = (int)(panel1.Width); + double hw = (fieldWidth / fieldHeight); + double wh = (fieldHeight / fieldWidth); + int panel1Height = (int)(panel1.Height); + if (panel1.Width <= panel1Height * hw) + { + mainField.Width = (int)(panel1.Width); - mainField.Height = (int)(panel1.Width * wh); + mainField.Height = (int)(panel1.Width * wh); - mainField.Location = new Point(panel1.Location.X + (int)(panel1.Width / 2.0) - mainField.Width / 2, panel1.Location.Y + (int)(panel1Height / 2.0) - panel1Height / 2 - 50); - } - if (panel1Height <= panel1.Width * wh) - { - mainField.Height = panel1Height; + mainField.Location = new Point(panel1.Location.X + (int)(panel1.Width / 2.0) - mainField.Width / 2, panel1.Location.Y + (int)(panel1Height / 2.0) - panel1Height / 2); + } + if (panel1Height <= panel1.Width * wh) + { + mainField.Height = panel1Height; - mainField.Width = (int)(panel1Height * hw); + mainField.Width = (int)(panel1Height * hw); - mainField.Location = new Point(panel1.Location.X + (int)(panel1.Width / 2.0) - mainField.Width / 2, panel1.Location.Y + (int)(panel1Height / 2.0) - panel1Height / 2 - 50); - } + mainField.Location = new Point(panel1.Location.X + (int)(panel1.Width / 2.0) - mainField.Width / 2, panel1.Location.Y + (int)(panel1Height / 2.0) - panel1Height / 2); + } } public static void saveUndoState(string reason, bool clearRedo = true, UndoHolder holder = null, bool selectPOI = true) @@ -1754,8 +1815,24 @@ private void ControlPointTable_RowEnter(object sender, DataGridViewCellEventArgs private void profileTable_SelectionChanged(object sender, EventArgs e) { Console.WriteLine("SelectionChange"); - if(profileTable.SelectedRows.Count>0) + if (profileTable.SelectedRows.Count > 0) + { + skipPathSelectionChange = true; selectProfile(profileTable.SelectedRows[0].Index); + skipPathSelectionChange = false; + } + } + + private void ControlPointTable_CellDoubleClick(object sender, DataGridViewCellEventArgs e) + { + if(ControlPointTable.CurrentCell!=null) + ControlPointTable.BeginEdit(false); + } + + private void pathTable_SelectionChanged(object sender, EventArgs e) + { + if(pathTable.CurrentCell!=null && !skipPathSelectionChange) + selectPath(pathTable.CurrentCell.RowIndex); } } } diff --git a/Motion-Profile-Mapper/Motion-Profile-Mapper/Forms/MotionProfiler.resx b/Motion-Profile-Mapper/Motion-Profile-Mapper/Forms/MotionProfiler.resx index 4da99b7..1134f45 100644 --- a/Motion-Profile-Mapper/Motion-Profile-Mapper/Forms/MotionProfiler.resx +++ b/Motion-Profile-Mapper/Motion-Profile-Mapper/Forms/MotionProfiler.resx @@ -139,7 +139,7 @@ 704, 21 - 59 + 41 diff --git a/Motion-Profile-Mapper/Motion-Profile-Mapper/Forms/Preview.Designer.cs b/Motion-Profile-Mapper/Motion-Profile-Mapper/Forms/Preview.Designer.cs index d8b8042..1d59e10 100644 --- a/Motion-Profile-Mapper/Motion-Profile-Mapper/Forms/Preview.Designer.cs +++ b/Motion-Profile-Mapper/Motion-Profile-Mapper/Forms/Preview.Designer.cs @@ -41,13 +41,17 @@ private void InitializeComponent() // // previewBox // + this.previewBox.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.previewBox.BackColor = System.Drawing.SystemColors.Control; this.previewBox.BorderStyle = System.Windows.Forms.BorderStyle.None; this.previewBox.Font = new System.Drawing.Font("Verdana", 10.2F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.previewBox.Location = new System.Drawing.Point(12, 76); + this.previewBox.Location = new System.Drawing.Point(9, 62); + this.previewBox.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); this.previewBox.Name = "previewBox"; this.previewBox.ReadOnly = true; - this.previewBox.Size = new System.Drawing.Size(572, 546); + this.previewBox.Size = new System.Drawing.Size(429, 444); this.previewBox.TabIndex = 0; this.previewBox.Text = ""; // @@ -55,9 +59,10 @@ private void InitializeComponent() // this.label1.AutoSize = true; this.label1.Font = new System.Drawing.Font("Verdana", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.label1.Location = new System.Drawing.Point(10, 42); + this.label1.Location = new System.Drawing.Point(8, 34); + this.label1.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(26, 25); + this.label1.Size = new System.Drawing.Size(19, 18); this.label1.TabIndex = 1; this.label1.Text = "X"; // @@ -65,9 +70,10 @@ private void InitializeComponent() // this.label2.AutoSize = true; this.label2.Font = new System.Drawing.Font("Verdana", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.label2.Location = new System.Drawing.Point(128, 42); + this.label2.Location = new System.Drawing.Point(96, 34); + this.label2.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(24, 25); + this.label2.Size = new System.Drawing.Size(19, 18); this.label2.TabIndex = 2; this.label2.Text = "Y"; // @@ -75,9 +81,10 @@ private void InitializeComponent() // this.label5.AutoSize = true; this.label5.Font = new System.Drawing.Font("Verdana", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.label5.Location = new System.Drawing.Point(228, 42); + this.label5.Location = new System.Drawing.Point(171, 34); + this.label5.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); this.label5.Name = "label5"; - this.label5.Size = new System.Drawing.Size(97, 25); + this.label5.Size = new System.Drawing.Size(78, 18); this.label5.TabIndex = 5; this.label5.Text = "Rotation"; // @@ -85,9 +92,10 @@ private void InitializeComponent() // this.label6.AutoSize = true; this.label6.Font = new System.Drawing.Font("Verdana", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.label6.Location = new System.Drawing.Point(10, 9); + this.label6.Location = new System.Drawing.Point(8, 7); + this.label6.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); this.label6.Name = "label6"; - this.label6.Size = new System.Drawing.Size(91, 25); + this.label6.Size = new System.Drawing.Size(71, 18); this.label6.TabIndex = 6; this.label6.Text = "Max Vel"; // @@ -95,9 +103,10 @@ private void InitializeComponent() // this.label7.AutoSize = true; this.label7.Font = new System.Drawing.Font("Verdana", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.label7.Location = new System.Drawing.Point(128, 9); + this.label7.Location = new System.Drawing.Point(96, 7); + this.label7.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); this.label7.Name = "label7"; - this.label7.Size = new System.Drawing.Size(94, 25); + this.label7.Size = new System.Drawing.Size(73, 18); this.label7.TabIndex = 7; this.label7.Text = "Max Acc"; // @@ -105,18 +114,19 @@ private void InitializeComponent() // this.label3.AutoSize = true; this.label3.Font = new System.Drawing.Font("Verdana", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.label3.Location = new System.Drawing.Point(342, 42); + this.label3.Location = new System.Drawing.Point(256, 34); + this.label3.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); this.label3.Name = "label3"; - this.label3.Size = new System.Drawing.Size(79, 25); + this.label3.Size = new System.Drawing.Size(63, 18); this.label3.TabIndex = 8; this.label3.Text = "Radius"; // // Preview // - this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 16F); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi; this.BackColor = System.Drawing.SystemColors.ControlLight; - this.ClientSize = new System.Drawing.Size(595, 634); + this.ClientSize = new System.Drawing.Size(446, 515); this.Controls.Add(this.label3); this.Controls.Add(this.label7); this.Controls.Add(this.label6); @@ -125,6 +135,7 @@ private void InitializeComponent() this.Controls.Add(this.label1); this.Controls.Add(this.previewBox); this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); + this.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); this.Name = "Preview"; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; this.Text = "Robot Data Preview"; diff --git a/Motion-Profile-Mapper/Motion-Profile-Mapper/Forms/Settings.Designer.cs b/Motion-Profile-Mapper/Motion-Profile-Mapper/Forms/Settings.Designer.cs index add48c2..383c620 100644 --- a/Motion-Profile-Mapper/Motion-Profile-Mapper/Forms/Settings.Designer.cs +++ b/Motion-Profile-Mapper/Motion-Profile-Mapper/Forms/Settings.Designer.cs @@ -107,7 +107,7 @@ private void InitializeComponent() this.ipaddress.ForeColor = System.Drawing.Color.Black; this.ipaddress.Location = new System.Drawing.Point(133, 38); this.ipaddress.Name = "ipaddress"; - this.ipaddress.Size = new System.Drawing.Size(316, 23); + this.ipaddress.Size = new System.Drawing.Size(316, 20); this.ipaddress.TabIndex = 1; // // username @@ -120,7 +120,7 @@ private void InitializeComponent() this.username.ForeColor = System.Drawing.Color.Black; this.username.Location = new System.Drawing.Point(133, 65); this.username.Name = "username"; - this.username.Size = new System.Drawing.Size(316, 23); + this.username.Size = new System.Drawing.Size(316, 20); this.username.TabIndex = 2; // // password @@ -133,7 +133,7 @@ private void InitializeComponent() this.password.ForeColor = System.Drawing.Color.Black; this.password.Location = new System.Drawing.Point(133, 92); this.password.Name = "password"; - this.password.Size = new System.Drawing.Size(316, 23); + this.password.Size = new System.Drawing.Size(316, 20); this.password.TabIndex = 3; // // riopath @@ -146,7 +146,7 @@ private void InitializeComponent() this.riopath.ForeColor = System.Drawing.Color.Black; this.riopath.Location = new System.Drawing.Point(133, 119); this.riopath.Name = "riopath"; - this.riopath.Size = new System.Drawing.Size(316, 23); + this.riopath.Size = new System.Drawing.Size(316, 20); this.riopath.TabIndex = 4; // // label1 @@ -156,7 +156,7 @@ private void InitializeComponent() this.label1.ForeColor = System.Drawing.Color.Black; this.label1.Location = new System.Drawing.Point(14, 40); this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(84, 17); + this.label1.Size = new System.Drawing.Size(69, 13); this.label1.TabIndex = 5; this.label1.Text = "IP Address"; this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; @@ -168,7 +168,7 @@ private void InitializeComponent() this.label2.ForeColor = System.Drawing.Color.Black; this.label2.Location = new System.Drawing.Point(14, 67); this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(78, 17); + this.label2.Size = new System.Drawing.Size(65, 13); this.label2.TabIndex = 6; this.label2.Text = "Username"; this.label2.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; @@ -180,7 +180,7 @@ private void InitializeComponent() this.label3.ForeColor = System.Drawing.Color.Black; this.label3.Location = new System.Drawing.Point(14, 94); this.label3.Name = "label3"; - this.label3.Size = new System.Drawing.Size(75, 17); + this.label3.Size = new System.Drawing.Size(61, 13); this.label3.TabIndex = 7; this.label3.Text = "Password"; // @@ -189,7 +189,7 @@ private void InitializeComponent() this.label4.AutoSize = true; this.label4.Location = new System.Drawing.Point(32, 100); this.label4.Name = "label4"; - this.label4.Size = new System.Drawing.Size(0, 17); + this.label4.Size = new System.Drawing.Size(0, 13); this.label4.TabIndex = 8; // // label5 @@ -199,7 +199,7 @@ private void InitializeComponent() this.label5.ForeColor = System.Drawing.Color.Black; this.label5.Location = new System.Drawing.Point(14, 121); this.label5.Name = "label5"; - this.label5.Size = new System.Drawing.Size(66, 17); + this.label5.Size = new System.Drawing.Size(55, 13); this.label5.TabIndex = 9; this.label5.Text = "File Path"; // @@ -239,7 +239,7 @@ private void InitializeComponent() this.label7.ForeColor = System.Drawing.Color.Black; this.label7.Location = new System.Drawing.Point(14, 150); this.label7.Name = "label7"; - this.label7.Size = new System.Drawing.Size(64, 17); + this.label7.Size = new System.Drawing.Size(54, 13); this.label7.TabIndex = 13; this.label7.Text = "INI Path"; // @@ -253,7 +253,7 @@ private void InitializeComponent() this.iniPath.ForeColor = System.Drawing.Color.Black; this.iniPath.Location = new System.Drawing.Point(133, 148); this.iniPath.Name = "iniPath"; - this.iniPath.Size = new System.Drawing.Size(316, 23); + this.iniPath.Size = new System.Drawing.Size(316, 20); this.iniPath.TabIndex = 12; // // checkBox1 @@ -264,7 +264,7 @@ private void InitializeComponent() this.checkBox1.ForeColor = System.Drawing.Color.Black; this.checkBox1.Location = new System.Drawing.Point(283, 177); this.checkBox1.Name = "checkBox1"; - this.checkBox1.Size = new System.Drawing.Size(166, 21); + this.checkBox1.Size = new System.Drawing.Size(127, 17); this.checkBox1.TabIndex = 14; this.checkBox1.Text = "Default alliance is red"; this.checkBox1.UseVisualStyleBackColor = true; @@ -289,7 +289,7 @@ private void InitializeComponent() this.label9.ForeColor = System.Drawing.Color.Black; this.label9.Location = new System.Drawing.Point(14, 228); this.label9.Name = "label9"; - this.label9.Size = new System.Drawing.Size(103, 17); + this.label9.Size = new System.Drawing.Size(87, 13); this.label9.TabIndex = 17; this.label9.Text = "INI Save Path"; // @@ -303,7 +303,7 @@ private void InitializeComponent() this.iniSavePath.ForeColor = System.Drawing.Color.Black; this.iniSavePath.Location = new System.Drawing.Point(133, 226); this.iniSavePath.Name = "iniSavePath"; - this.iniSavePath.Size = new System.Drawing.Size(281, 23); + this.iniSavePath.Size = new System.Drawing.Size(281, 20); this.iniSavePath.TabIndex = 16; // // label10 @@ -313,7 +313,7 @@ private void InitializeComponent() this.label10.ForeColor = System.Drawing.Color.Black; this.label10.Location = new System.Drawing.Point(14, 257); this.label10.Name = "label10"; - this.label10.Size = new System.Drawing.Size(113, 17); + this.label10.Size = new System.Drawing.Size(95, 13); this.label10.TabIndex = 19; this.label10.Text = "Java Save Path"; // @@ -327,7 +327,7 @@ private void InitializeComponent() this.javaSavePath.ForeColor = System.Drawing.Color.Black; this.javaSavePath.Location = new System.Drawing.Point(133, 255); this.javaSavePath.Name = "javaSavePath"; - this.javaSavePath.Size = new System.Drawing.Size(281, 23); + this.javaSavePath.Size = new System.Drawing.Size(281, 20); this.javaSavePath.TabIndex = 18; // // iconButton1 @@ -379,7 +379,7 @@ private void InitializeComponent() this.label11.ForeColor = System.Drawing.Color.Black; this.label11.Location = new System.Drawing.Point(14, 286); this.label11.Name = "label11"; - this.label11.Size = new System.Drawing.Size(102, 17); + this.label11.Size = new System.Drawing.Size(85, 13); this.label11.TabIndex = 23; this.label11.Text = "MP Save Path"; // @@ -393,7 +393,7 @@ private void InitializeComponent() this.mpSavePath.ForeColor = System.Drawing.Color.Black; this.mpSavePath.Location = new System.Drawing.Point(133, 284); this.mpSavePath.Name = "mpSavePath"; - this.mpSavePath.Size = new System.Drawing.Size(281, 23); + this.mpSavePath.Size = new System.Drawing.Size(281, 20); this.mpSavePath.TabIndex = 22; // // checkBox2 @@ -404,7 +404,7 @@ private void InitializeComponent() this.checkBox2.ForeColor = System.Drawing.Color.Black; this.checkBox2.Location = new System.Drawing.Point(273, 313); this.checkBox2.Name = "checkBox2"; - this.checkBox2.Size = new System.Drawing.Size(176, 21); + this.checkBox2.Size = new System.Drawing.Size(137, 17); this.checkBox2.TabIndex = 25; this.checkBox2.Text = "Auto check for updates"; this.checkBox2.UseVisualStyleBackColor = true; @@ -419,7 +419,7 @@ private void InitializeComponent() this.label16.Location = new System.Drawing.Point(424, 502); this.label16.Margin = new System.Windows.Forms.Padding(1, 0, 1, 0); this.label16.Name = "label16"; - this.label16.Size = new System.Drawing.Size(18, 14); + this.label16.Size = new System.Drawing.Size(16, 12); this.label16.TabIndex = 96; this.label16.Text = "m"; // @@ -433,7 +433,7 @@ private void InitializeComponent() this.label15.Location = new System.Drawing.Point(424, 471); this.label15.Margin = new System.Windows.Forms.Padding(1, 0, 1, 0); this.label15.Name = "label15"; - this.label15.Size = new System.Drawing.Size(18, 14); + this.label15.Size = new System.Drawing.Size(16, 12); this.label15.TabIndex = 95; this.label15.Text = "m"; // @@ -448,7 +448,7 @@ private void InitializeComponent() this.frameLengthInput.Location = new System.Drawing.Point(234, 499); this.frameLengthInput.Margin = new System.Windows.Forms.Padding(4); this.frameLengthInput.Name = "frameLengthInput"; - this.frameLengthInput.Size = new System.Drawing.Size(185, 23); + this.frameLengthInput.Size = new System.Drawing.Size(185, 20); this.frameLengthInput.TabIndex = 94; this.frameLengthInput.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; // @@ -460,7 +460,7 @@ private void InitializeComponent() this.label14.Location = new System.Drawing.Point(14, 501); this.label14.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label14.Name = "label14"; - this.label14.Size = new System.Drawing.Size(105, 17); + this.label14.Size = new System.Drawing.Size(85, 13); this.label14.TabIndex = 93; this.label14.Text = "Frame Length"; this.label14.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; @@ -476,7 +476,7 @@ private void InitializeComponent() this.frameWidthInput.Location = new System.Drawing.Point(234, 468); this.frameWidthInput.Margin = new System.Windows.Forms.Padding(4); this.frameWidthInput.Name = "frameWidthInput"; - this.frameWidthInput.Size = new System.Drawing.Size(185, 23); + this.frameWidthInput.Size = new System.Drawing.Size(185, 20); this.frameWidthInput.TabIndex = 92; this.frameWidthInput.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; // @@ -488,7 +488,7 @@ private void InitializeComponent() this.label13.Location = new System.Drawing.Point(14, 470); this.label13.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label13.Name = "label13"; - this.label13.Size = new System.Drawing.Size(98, 17); + this.label13.Size = new System.Drawing.Size(79, 13); this.label13.TabIndex = 91; this.label13.Text = "Frame Width"; this.label13.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; @@ -503,7 +503,7 @@ private void InitializeComponent() this.label12.Location = new System.Drawing.Point(424, 440); this.label12.Margin = new System.Windows.Forms.Padding(1, 0, 1, 0); this.label12.Name = "label12"; - this.label12.Size = new System.Drawing.Size(37, 14); + this.label12.Size = new System.Drawing.Size(32, 12); this.label12.TabIndex = 90; this.label12.Text = "m/s²"; // @@ -515,7 +515,7 @@ private void InitializeComponent() this.label17.Location = new System.Drawing.Point(14, 439); this.label17.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label17.Name = "label17"; - this.label17.Size = new System.Drawing.Size(206, 17); + this.label17.Size = new System.Drawing.Size(171, 13); this.label17.TabIndex = 89; this.label17.Text = "Max Centripetal Acceleration"; this.label17.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; @@ -531,7 +531,7 @@ private void InitializeComponent() this.defMaxCenAccInput.Location = new System.Drawing.Point(234, 437); this.defMaxCenAccInput.Margin = new System.Windows.Forms.Padding(4); this.defMaxCenAccInput.Name = "defMaxCenAccInput"; - this.defMaxCenAccInput.Size = new System.Drawing.Size(184, 23); + this.defMaxCenAccInput.Size = new System.Drawing.Size(184, 20); this.defMaxCenAccInput.TabIndex = 88; this.defMaxCenAccInput.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; // @@ -545,7 +545,7 @@ private void InitializeComponent() this.label18.Location = new System.Drawing.Point(424, 565); this.label18.Margin = new System.Windows.Forms.Padding(1, 0, 1, 0); this.label18.Name = "label18"; - this.label18.Size = new System.Drawing.Size(30, 14); + this.label18.Size = new System.Drawing.Size(27, 12); this.label18.TabIndex = 86; this.label18.Text = "m/s"; // @@ -559,7 +559,7 @@ private void InitializeComponent() this.label19.Location = new System.Drawing.Point(424, 534); this.label19.Margin = new System.Windows.Forms.Padding(1, 0, 1, 0); this.label19.Name = "label19"; - this.label19.Size = new System.Drawing.Size(37, 14); + this.label19.Size = new System.Drawing.Size(32, 12); this.label19.TabIndex = 85; this.label19.Text = "m/s²"; // @@ -573,7 +573,7 @@ private void InitializeComponent() this.label20.Location = new System.Drawing.Point(424, 380); this.label20.Margin = new System.Windows.Forms.Padding(1, 0, 1, 0); this.label20.Name = "label20"; - this.label20.Size = new System.Drawing.Size(30, 14); + this.label20.Size = new System.Drawing.Size(27, 12); this.label20.TabIndex = 84; this.label20.Text = "m/s"; // @@ -587,7 +587,7 @@ private void InitializeComponent() this.label21.Location = new System.Drawing.Point(424, 410); this.label21.Margin = new System.Windows.Forms.Padding(1, 0, 1, 0); this.label21.Name = "label21"; - this.label21.Size = new System.Drawing.Size(37, 14); + this.label21.Size = new System.Drawing.Size(32, 12); this.label21.TabIndex = 83; this.label21.Text = "m/s²"; // @@ -613,7 +613,7 @@ private void InitializeComponent() this.label23.Location = new System.Drawing.Point(14, 533); this.label23.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label23.Name = "label23"; - this.label23.Size = new System.Drawing.Size(201, 17); + this.label23.Size = new System.Drawing.Size(165, 13); this.label23.TabIndex = 80; this.label23.Text = "Max Rotational Acceleration"; // @@ -623,7 +623,7 @@ private void InitializeComponent() this.label24.Location = new System.Drawing.Point(38, 466); this.label24.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label24.Name = "label24"; - this.label24.Size = new System.Drawing.Size(0, 17); + this.label24.Size = new System.Drawing.Size(0, 13); this.label24.TabIndex = 79; // // label25 @@ -634,7 +634,7 @@ private void InitializeComponent() this.label25.Location = new System.Drawing.Point(14, 564); this.label25.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label25.Name = "label25"; - this.label25.Size = new System.Drawing.Size(170, 17); + this.label25.Size = new System.Drawing.Size(139, 13); this.label25.TabIndex = 78; this.label25.Text = "Max Rotational Velocity"; // @@ -646,7 +646,7 @@ private void InitializeComponent() this.label26.Location = new System.Drawing.Point(14, 409); this.label26.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label26.Name = "label26"; - this.label26.Size = new System.Drawing.Size(125, 17); + this.label26.Size = new System.Drawing.Size(104, 13); this.label26.TabIndex = 77; this.label26.Text = "Max Acceleration"; this.label26.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; @@ -659,7 +659,7 @@ private void InitializeComponent() this.label27.Location = new System.Drawing.Point(14, 379); this.label27.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label27.Name = "label27"; - this.label27.Size = new System.Drawing.Size(94, 17); + this.label27.Size = new System.Drawing.Size(78, 13); this.label27.TabIndex = 76; this.label27.Text = "Max Velocity"; this.label27.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; @@ -676,7 +676,7 @@ private void InitializeComponent() this.defMaxRotAccInput.Location = new System.Drawing.Point(234, 530); this.defMaxRotAccInput.Margin = new System.Windows.Forms.Padding(4); this.defMaxRotAccInput.Name = "defMaxRotAccInput"; - this.defMaxRotAccInput.Size = new System.Drawing.Size(185, 23); + this.defMaxRotAccInput.Size = new System.Drawing.Size(185, 20); this.defMaxRotAccInput.TabIndex = 75; this.defMaxRotAccInput.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; // @@ -692,7 +692,7 @@ private void InitializeComponent() this.defMaxRotVelInput.Location = new System.Drawing.Point(234, 561); this.defMaxRotVelInput.Margin = new System.Windows.Forms.Padding(4); this.defMaxRotVelInput.Name = "defMaxRotVelInput"; - this.defMaxRotVelInput.Size = new System.Drawing.Size(185, 23); + this.defMaxRotVelInput.Size = new System.Drawing.Size(185, 20); this.defMaxRotVelInput.TabIndex = 74; this.defMaxRotVelInput.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; // @@ -707,7 +707,7 @@ private void InitializeComponent() this.defMaxAccInput.Location = new System.Drawing.Point(234, 406); this.defMaxAccInput.Margin = new System.Windows.Forms.Padding(4); this.defMaxAccInput.Name = "defMaxAccInput"; - this.defMaxAccInput.Size = new System.Drawing.Size(184, 23); + this.defMaxAccInput.Size = new System.Drawing.Size(184, 20); this.defMaxAccInput.TabIndex = 73; this.defMaxAccInput.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; // @@ -722,7 +722,7 @@ private void InitializeComponent() this.defMaxVelInput.Location = new System.Drawing.Point(234, 375); this.defMaxVelInput.Margin = new System.Windows.Forms.Padding(4); this.defMaxVelInput.Name = "defMaxVelInput"; - this.defMaxVelInput.Size = new System.Drawing.Size(184, 23); + this.defMaxVelInput.Size = new System.Drawing.Size(184, 20); this.defMaxVelInput.TabIndex = 72; this.defMaxVelInput.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; // @@ -732,19 +732,19 @@ private void InitializeComponent() this.snapPathsCheckbox.AutoSize = true; this.snapPathsCheckbox.Font = new System.Drawing.Font("Verdana", 7.2F); this.snapPathsCheckbox.ForeColor = System.Drawing.Color.Black; - this.snapPathsCheckbox.Location = new System.Drawing.Point(324, 591); + this.snapPathsCheckbox.Location = new System.Drawing.Point(344, 591); this.snapPathsCheckbox.Name = "snapPathsCheckbox"; - this.snapPathsCheckbox.Size = new System.Drawing.Size(132, 18); + this.snapPathsCheckbox.Size = new System.Drawing.Size(112, 16); this.snapPathsCheckbox.TabIndex = 87; this.snapPathsCheckbox.Text = "Snap new paths"; this.snapPathsCheckbox.UseVisualStyleBackColor = true; // // Settings // - this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 17F); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi; this.BackColor = System.Drawing.SystemColors.ControlLight; - this.ClientSize = new System.Drawing.Size(478, 661); + this.ClientSize = new System.Drawing.Size(480, 669); this.Controls.Add(this.label16); this.Controls.Add(this.label15); this.Controls.Add(this.frameLengthInput); diff --git a/Motion-Profile-Mapper/Motion-Profile-Mapper/Forms/ShiftPath.Designer.cs b/Motion-Profile-Mapper/Motion-Profile-Mapper/Forms/ShiftPath.Designer.cs index 8721b56..dc7f59f 100644 --- a/Motion-Profile-Mapper/Motion-Profile-Mapper/Forms/ShiftPath.Designer.cs +++ b/Motion-Profile-Mapper/Motion-Profile-Mapper/Forms/ShiftPath.Designer.cs @@ -46,10 +46,10 @@ private void InitializeComponent() this.label9.BackColor = System.Drawing.SystemColors.ControlLight; this.label9.Font = new System.Drawing.Font("Verdana", 7.2F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.label9.ForeColor = System.Drawing.Color.Black; - this.label9.Location = new System.Drawing.Point(286, 19); + this.label9.Location = new System.Drawing.Point(214, 15); this.label9.Margin = new System.Windows.Forms.Padding(1, 0, 1, 0); this.label9.Name = "label9"; - this.label9.Size = new System.Drawing.Size(51, 14); + this.label9.Size = new System.Drawing.Size(44, 12); this.label9.TabIndex = 64; this.label9.Text = "meters"; // @@ -59,10 +59,10 @@ private void InitializeComponent() this.label10.BackColor = System.Drawing.SystemColors.ControlLight; this.label10.Font = new System.Drawing.Font("Verdana", 7.2F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.label10.ForeColor = System.Drawing.Color.Black; - this.label10.Location = new System.Drawing.Point(286, 45); + this.label10.Location = new System.Drawing.Point(214, 37); this.label10.Margin = new System.Windows.Forms.Padding(1, 0, 1, 0); this.label10.Name = "label10"; - this.label10.Size = new System.Drawing.Size(51, 14); + this.label10.Size = new System.Drawing.Size(44, 12); this.label10.TabIndex = 63; this.label10.Text = "meters"; // @@ -71,10 +71,9 @@ private void InitializeComponent() this.label2.AutoSize = true; this.label2.Font = new System.Drawing.Font("Verdana", 7.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.label2.ForeColor = System.Drawing.Color.Black; - this.label2.Location = new System.Drawing.Point(16, 44); - this.label2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label2.Location = new System.Drawing.Point(12, 36); this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(94, 17); + this.label2.Size = new System.Drawing.Size(77, 13); this.label2.TabIndex = 62; this.label2.Text = "Vertical shift"; this.label2.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; @@ -84,10 +83,9 @@ private void InitializeComponent() this.label1.AutoSize = true; this.label1.Font = new System.Drawing.Font("Verdana", 7.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.label1.ForeColor = System.Drawing.Color.Black; - this.label1.Location = new System.Drawing.Point(16, 18); - this.label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label1.Location = new System.Drawing.Point(12, 15); this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(115, 17); + this.label1.Size = new System.Drawing.Size(92, 13); this.label1.TabIndex = 61; this.label1.Text = "Horizontal shift"; this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; @@ -98,10 +96,9 @@ private void InitializeComponent() this.dyInput.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.dyInput.Font = new System.Drawing.Font("Verdana", 7.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.dyInput.ForeColor = System.Drawing.Color.Black; - this.dyInput.Location = new System.Drawing.Point(148, 41); - this.dyInput.Margin = new System.Windows.Forms.Padding(4); + this.dyInput.Location = new System.Drawing.Point(111, 33); this.dyInput.Name = "dyInput"; - this.dyInput.Size = new System.Drawing.Size(133, 23); + this.dyInput.Size = new System.Drawing.Size(100, 20); this.dyInput.TabIndex = 60; this.dyInput.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; this.dyInput.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.dyInput_KeyPress); @@ -112,10 +109,9 @@ private void InitializeComponent() this.dxInput.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.dxInput.Font = new System.Drawing.Font("Verdana", 7.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.dxInput.ForeColor = System.Drawing.Color.Black; - this.dxInput.Location = new System.Drawing.Point(148, 14); - this.dxInput.Margin = new System.Windows.Forms.Padding(4); + this.dxInput.Location = new System.Drawing.Point(111, 11); this.dxInput.Name = "dxInput"; - this.dxInput.Size = new System.Drawing.Size(133, 23); + this.dxInput.Size = new System.Drawing.Size(100, 20); this.dxInput.TabIndex = 59; this.dxInput.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; this.dxInput.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.dxInput_KeyPress); @@ -127,10 +123,9 @@ private void InitializeComponent() this.cancel.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.cancel.Font = new System.Drawing.Font("Verdana", 7.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.cancel.ForeColor = System.Drawing.Color.Black; - this.cancel.Location = new System.Drawing.Point(88, 76); - this.cancel.Margin = new System.Windows.Forms.Padding(4); + this.cancel.Location = new System.Drawing.Point(66, 62); this.cancel.Name = "cancel"; - this.cancel.Size = new System.Drawing.Size(120, 31); + this.cancel.Size = new System.Drawing.Size(90, 25); this.cancel.TabIndex = 66; this.cancel.Text = "Cancel"; this.cancel.UseVisualStyleBackColor = false; @@ -143,10 +138,9 @@ private void InitializeComponent() this.shiftButton.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.shiftButton.Font = new System.Drawing.Font("Verdana", 7.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.shiftButton.ForeColor = System.Drawing.Color.Black; - this.shiftButton.Location = new System.Drawing.Point(216, 76); - this.shiftButton.Margin = new System.Windows.Forms.Padding(4); + this.shiftButton.Location = new System.Drawing.Point(162, 62); this.shiftButton.Name = "shiftButton"; - this.shiftButton.Size = new System.Drawing.Size(120, 31); + this.shiftButton.Size = new System.Drawing.Size(90, 25); this.shiftButton.TabIndex = 65; this.shiftButton.Text = "Shift"; this.shiftButton.UseVisualStyleBackColor = false; @@ -154,10 +148,10 @@ private void InitializeComponent() // // ShiftPath // - this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 16F); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi; this.BackColor = System.Drawing.SystemColors.ControlLight; - this.ClientSize = new System.Drawing.Size(354, 119); + this.ClientSize = new System.Drawing.Size(266, 97); this.Controls.Add(this.cancel); this.Controls.Add(this.shiftButton); this.Controls.Add(this.label9); @@ -167,6 +161,7 @@ private void InitializeComponent() this.Controls.Add(this.dyInput); this.Controls.Add(this.dxInput); this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); + this.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); this.Name = "ShiftPath"; this.Text = "Shift Path"; this.ResumeLayout(false); diff --git a/Motion-Profile-Mapper/Motion-Profile-Mapper/SegmentedProfile/ProfilePath.cs b/Motion-Profile-Mapper/Motion-Profile-Mapper/SegmentedProfile/ProfilePath.cs index 6d5c0de..4768a80 100644 --- a/Motion-Profile-Mapper/Motion-Profile-Mapper/SegmentedProfile/ProfilePath.cs +++ b/Motion-Profile-Mapper/Motion-Profile-Mapper/SegmentedProfile/ProfilePath.cs @@ -31,7 +31,7 @@ public class ProfilePath List cpdistances = new List(); private bool isSpline = false; public SplinePath path = new SplinePath(); - public VelocityGeneration gen = null; + public VelocityGeneration gen = new VelocityGeneration(); public IInterpolation xsMap = null; public IInterpolation ysMap = null; @@ -238,15 +238,23 @@ public void generate(bool quickGen = false) sampleDistance = 0.2; } + gen = new VelocityGeneration(); + length = 0.0; + pointList.Clear(); + cpdistances.Clear(); + if (controlPoints.Count < 2) + { + cpdistances.Add(0.0); return; + } TrajectoryConstraint[] constraints = { new MaxAccelerationConstraint(this.maxAcc), new MaxVelocityConstraint(this.maxVel), new CentripetalAccelerationConstraint(this.maxCen) }; if (isSpline) { - pointList.Clear(); + path.GenSpline(this.controlPoints); length = path.getLength(); @@ -255,13 +263,11 @@ public void generate(bool quickGen = false) else { - pointList.Clear(); length = 0; List distances = new List(); List xs = new List(); List ys = new List(); - cpdistances.Clear(); cpdistances.Add(0.0); for (int i = 0; i < controlPoints.Count - 1; i++) diff --git a/Motion-Profile-Mapper/Motion-Profile-Mapper/VelocityGenerate/VelocityGeneration.cs b/Motion-Profile-Mapper/Motion-Profile-Mapper/VelocityGenerate/VelocityGeneration.cs index 9ce0067..679941c 100644 --- a/Motion-Profile-Mapper/Motion-Profile-Mapper/VelocityGenerate/VelocityGeneration.cs +++ b/Motion-Profile-Mapper/Motion-Profile-Mapper/VelocityGenerate/VelocityGeneration.cs @@ -14,7 +14,11 @@ public class VelocityGeneration private readonly double duration; private double[] pathStateStartTimes; - + public VelocityGeneration() + { + duration = 0; + pathStateStartTimes = null; + } public VelocityGeneration(ProfilePath path, TrajectoryConstraint[] trajectoryConstraints, double sampleDistance, double trajectoryStartingVelocity, double trajectoryEndingVelocity)