From 46027296f75691cf150aa279a374da3adabf8c44 Mon Sep 17 00:00:00 2001 From: Jacob Palecki Date: Wed, 29 Jul 2020 14:21:33 -0700 Subject: Added skeleton for input fields --- grapher/Form1.Designer.cs | 245 ++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 228 insertions(+), 17 deletions(-) (limited to 'grapher/Form1.Designer.cs') diff --git a/grapher/Form1.Designer.cs b/grapher/Form1.Designer.cs index b39c887..296749c 100644 --- a/grapher/Form1.Designer.cs +++ b/grapher/Form1.Designer.cs @@ -28,49 +28,260 @@ /// private void InitializeComponent() { - 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(); + System.Windows.Forms.DataVisualization.Charting.ChartArea chartArea11 = new System.Windows.Forms.DataVisualization.Charting.ChartArea(); + System.Windows.Forms.DataVisualization.Charting.Legend legend11 = new System.Windows.Forms.DataVisualization.Charting.Legend(); + System.Windows.Forms.DataVisualization.Charting.Series series11 = new System.Windows.Forms.DataVisualization.Charting.Series(); this.AccelerationChart = new System.Windows.Forms.DataVisualization.Charting.Chart(); + this.comboBox1 = new System.Windows.Forms.ComboBox(); + this.textBox1 = new System.Windows.Forms.TextBox(); + this.label1 = new System.Windows.Forms.Label(); + this.textBox2 = new System.Windows.Forms.TextBox(); + this.label2 = new System.Windows.Forms.Label(); + this.textBox3 = new System.Windows.Forms.TextBox(); + this.label4 = new System.Windows.Forms.Label(); + this.textBox4 = new System.Windows.Forms.TextBox(); + this.label3 = new System.Windows.Forms.Label(); + this.textBox5 = new System.Windows.Forms.TextBox(); + this.label5 = new System.Windows.Forms.Label(); + this.textBox6 = new System.Windows.Forms.TextBox(); + this.textBox7 = new System.Windows.Forms.TextBox(); + this.label6 = new System.Windows.Forms.Label(); + this.textBox8 = new System.Windows.Forms.TextBox(); + this.label7 = new System.Windows.Forms.Label(); + this.textBox9 = new System.Windows.Forms.TextBox(); + this.label8 = new System.Windows.Forms.Label(); ((System.ComponentModel.ISupportInitialize)(this.AccelerationChart)).BeginInit(); this.SuspendLayout(); // // AccelerationChart // - chartArea1.AxisX.Title = "Speed (counts/ms)"; - chartArea1.AxisY.Title = "Sensitivity (magnitude ratio)"; - chartArea1.Name = "ChartArea1"; - this.AccelerationChart.ChartAreas.Add(chartArea1); - legend1.Name = "Legend1"; - this.AccelerationChart.Legends.Add(legend1); - this.AccelerationChart.Location = new System.Drawing.Point(0, 0); + chartArea11.AxisX.Title = "Speed (counts/ms)"; + chartArea11.AxisY.Title = "Sensitivity (magnitude ratio)"; + chartArea11.Name = "ChartArea1"; + this.AccelerationChart.ChartAreas.Add(chartArea11); + legend11.Name = "Legend1"; + this.AccelerationChart.Legends.Add(legend11); + this.AccelerationChart.Location = new System.Drawing.Point(162, 0); this.AccelerationChart.Name = "AccelerationChart"; - series1.ChartArea = "ChartArea1"; - series1.ChartType = System.Windows.Forms.DataVisualization.Charting.SeriesChartType.Line; - series1.Legend = "Legend1"; - series1.Name = "Accelerated Sensitivity"; - this.AccelerationChart.Series.Add(series1); - this.AccelerationChart.Size = new System.Drawing.Size(800, 312); + series11.ChartArea = "ChartArea1"; + series11.ChartType = System.Windows.Forms.DataVisualization.Charting.SeriesChartType.Line; + series11.Legend = "Legend1"; + series11.Name = "Accelerated Sensitivity"; + this.AccelerationChart.Series.Add(series11); + this.AccelerationChart.Size = new System.Drawing.Size(801, 312); this.AccelerationChart.TabIndex = 0; this.AccelerationChart.Text = "chart1"; // + // comboBox1 + // + this.comboBox1.FormattingEnabled = true; + this.comboBox1.Items.AddRange(new object[] { + "Off", + "Linear", + "Classic", + "Natural", + "Logarithmic", + "Sigmoid", + "Power"}); + this.comboBox1.Location = new System.Drawing.Point(15, 86); + this.comboBox1.Name = "comboBox1"; + this.comboBox1.Size = new System.Drawing.Size(132, 21); + this.comboBox1.TabIndex = 2; + this.comboBox1.Text = "Acceleration Type"; + this.comboBox1.SelectedIndexChanged += new System.EventHandler(this.comboBox1_SelectedIndexChanged); + // + // textBox1 + // + this.textBox1.Location = new System.Drawing.Point(96, 15); + this.textBox1.Name = "textBox1"; + this.textBox1.Size = new System.Drawing.Size(51, 20); + this.textBox1.TabIndex = 3; + // + // label1 + // + this.label1.AutoSize = true; + this.label1.Location = new System.Drawing.Point(15, 18); + this.label1.Name = "label1"; + this.label1.Size = new System.Drawing.Size(54, 13); + this.label1.TabIndex = 4; + this.label1.Text = "Sensitivity"; + this.label1.Click += new System.EventHandler(this.label1_Click); + // + // textBox2 + // + this.textBox2.Location = new System.Drawing.Point(96, 45); + this.textBox2.Name = "textBox2"; + this.textBox2.Size = new System.Drawing.Size(51, 20); + this.textBox2.TabIndex = 5; + // + // label2 + // + this.label2.AutoSize = true; + this.label2.Location = new System.Drawing.Point(22, 48); + this.label2.Name = "label2"; + this.label2.Size = new System.Drawing.Size(47, 13); + this.label2.TabIndex = 6; + this.label2.Text = "Rotation"; + // + // textBox3 + // + this.textBox3.Location = new System.Drawing.Point(96, 113); + this.textBox3.Name = "textBox3"; + this.textBox3.Size = new System.Drawing.Size(51, 20); + this.textBox3.TabIndex = 7; + this.textBox3.TextChanged += new System.EventHandler(this.textBox3_TextChanged); + // + // label4 + // + this.label4.AutoSize = true; + this.label4.Location = new System.Drawing.Point(15, 116); + this.label4.Name = "label4"; + this.label4.Size = new System.Drawing.Size(66, 13); + this.label4.TabIndex = 9; + this.label4.Text = "Acceleration"; + // + // textBox4 + // + this.textBox4.Location = new System.Drawing.Point(96, 140); + this.textBox4.Name = "textBox4"; + this.textBox4.Size = new System.Drawing.Size(51, 20); + this.textBox4.TabIndex = 10; + // + // label3 + // + this.label3.AutoSize = true; + this.label3.Location = new System.Drawing.Point(25, 143); + this.label3.Name = "label3"; + this.label3.Size = new System.Drawing.Size(26, 13); + this.label3.TabIndex = 11; + this.label3.Text = "Cap"; + // + // textBox5 + // + this.textBox5.Location = new System.Drawing.Point(96, 167); + this.textBox5.Name = "textBox5"; + this.textBox5.Size = new System.Drawing.Size(24, 20); + this.textBox5.TabIndex = 12; + // + // label5 + // + this.label5.AutoSize = true; + this.label5.Location = new System.Drawing.Point(25, 173); + this.label5.Name = "label5"; + this.label5.Size = new System.Drawing.Size(41, 13); + this.label5.TabIndex = 13; + this.label5.Text = "Weight"; + // + // textBox6 + // + this.textBox6.Location = new System.Drawing.Point(126, 167); + this.textBox6.Name = "textBox6"; + this.textBox6.Size = new System.Drawing.Size(21, 20); + this.textBox6.TabIndex = 14; + // + // textBox7 + // + this.textBox7.Location = new System.Drawing.Point(96, 219); + this.textBox7.Name = "textBox7"; + this.textBox7.Size = new System.Drawing.Size(51, 20); + this.textBox7.TabIndex = 15; + // + // label6 + // + this.label6.AutoSize = true; + this.label6.Location = new System.Drawing.Point(12, 222); + this.label6.Name = "label6"; + this.label6.Size = new System.Drawing.Size(78, 13); + this.label6.TabIndex = 16; + this.label6.Text = "Limit/Exponent"; + this.label6.Click += new System.EventHandler(this.label6_Click); + // + // textBox8 + // + this.textBox8.Location = new System.Drawing.Point(96, 245); + this.textBox8.Name = "textBox8"; + this.textBox8.Size = new System.Drawing.Size(51, 20); + this.textBox8.TabIndex = 17; + // + // label7 + // + this.label7.AutoSize = true; + this.label7.Location = new System.Drawing.Point(22, 248); + this.label7.Name = "label7"; + this.label7.Size = new System.Drawing.Size(47, 13); + this.label7.TabIndex = 18; + this.label7.Text = "Midpoint"; + // + // textBox9 + // + this.textBox9.Location = new System.Drawing.Point(96, 193); + this.textBox9.Name = "textBox9"; + this.textBox9.Size = new System.Drawing.Size(51, 20); + this.textBox9.TabIndex = 19; + // + // label8 + // + this.label8.AutoSize = true; + this.label8.Location = new System.Drawing.Point(25, 200); + this.label8.Name = "label8"; + this.label8.Size = new System.Drawing.Size(35, 13); + this.label8.TabIndex = 20; + this.label8.Text = "Offset"; + // // RawAcceleration // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(800, 310); + this.ClientSize = new System.Drawing.Size(963, 310); + this.Controls.Add(this.label8); + this.Controls.Add(this.textBox9); + this.Controls.Add(this.label7); + this.Controls.Add(this.textBox8); + this.Controls.Add(this.label6); + this.Controls.Add(this.textBox7); + this.Controls.Add(this.textBox6); + this.Controls.Add(this.label5); + this.Controls.Add(this.textBox5); + this.Controls.Add(this.label3); + this.Controls.Add(this.textBox4); + this.Controls.Add(this.label4); + this.Controls.Add(this.textBox3); + this.Controls.Add(this.label2); + this.Controls.Add(this.textBox2); + this.Controls.Add(this.label1); + this.Controls.Add(this.textBox1); + this.Controls.Add(this.comboBox1); this.Controls.Add(this.AccelerationChart); this.Name = "RawAcceleration"; this.Text = "Raw Acceleration Graph"; this.Load += new System.EventHandler(this.Form1_Load); ((System.ComponentModel.ISupportInitialize)(this.AccelerationChart)).EndInit(); this.ResumeLayout(false); + this.PerformLayout(); } #endregion private System.Windows.Forms.DataVisualization.Charting.Chart AccelerationChart; + private System.Windows.Forms.ComboBox comboBox1; + private System.Windows.Forms.TextBox textBox1; + private System.Windows.Forms.Label label1; + private System.Windows.Forms.TextBox textBox2; + private System.Windows.Forms.Label label2; + private System.Windows.Forms.TextBox textBox3; + private System.Windows.Forms.Label label4; + private System.Windows.Forms.TextBox textBox4; + private System.Windows.Forms.Label label3; + private System.Windows.Forms.TextBox textBox5; + private System.Windows.Forms.Label label5; + private System.Windows.Forms.TextBox textBox6; + private System.Windows.Forms.TextBox textBox7; + private System.Windows.Forms.Label label6; + private System.Windows.Forms.TextBox textBox8; + private System.Windows.Forms.Label label7; + private System.Windows.Forms.TextBox textBox9; + private System.Windows.Forms.Label label8; } } -- cgit v1.2.3 From 7d0f8a2028ef8977c68c92c9c0bba4272cc10773 Mon Sep 17 00:00:00 2001 From: Jacob Palecki Date: Wed, 29 Jul 2020 17:31:08 -0700 Subject: Rename elements and add write button --- grapher/Form1.Designer.cs | 211 ++++++++++++++++++++++++---------------------- 1 file changed, 110 insertions(+), 101 deletions(-) (limited to 'grapher/Form1.Designer.cs') diff --git a/grapher/Form1.Designer.cs b/grapher/Form1.Designer.cs index 296749c..ebf92f0 100644 --- a/grapher/Form1.Designer.cs +++ b/grapher/Form1.Designer.cs @@ -28,54 +28,55 @@ /// private void InitializeComponent() { - System.Windows.Forms.DataVisualization.Charting.ChartArea chartArea11 = new System.Windows.Forms.DataVisualization.Charting.ChartArea(); - System.Windows.Forms.DataVisualization.Charting.Legend legend11 = new System.Windows.Forms.DataVisualization.Charting.Legend(); - System.Windows.Forms.DataVisualization.Charting.Series series11 = new System.Windows.Forms.DataVisualization.Charting.Series(); + System.Windows.Forms.DataVisualization.Charting.ChartArea chartArea2 = new System.Windows.Forms.DataVisualization.Charting.ChartArea(); + System.Windows.Forms.DataVisualization.Charting.Legend legend2 = new System.Windows.Forms.DataVisualization.Charting.Legend(); + System.Windows.Forms.DataVisualization.Charting.Series series2 = new System.Windows.Forms.DataVisualization.Charting.Series(); this.AccelerationChart = new System.Windows.Forms.DataVisualization.Charting.Chart(); - this.comboBox1 = new System.Windows.Forms.ComboBox(); - this.textBox1 = new System.Windows.Forms.TextBox(); + this.accelTypeDrop = new System.Windows.Forms.ComboBox(); + this.sensitivityBox = new System.Windows.Forms.TextBox(); this.label1 = new System.Windows.Forms.Label(); - this.textBox2 = new System.Windows.Forms.TextBox(); + this.rotationBox = new System.Windows.Forms.TextBox(); this.label2 = new System.Windows.Forms.Label(); - this.textBox3 = new System.Windows.Forms.TextBox(); + this.accelerationBox = new System.Windows.Forms.TextBox(); this.label4 = new System.Windows.Forms.Label(); - this.textBox4 = new System.Windows.Forms.TextBox(); + this.capBox = new System.Windows.Forms.TextBox(); this.label3 = new System.Windows.Forms.Label(); - this.textBox5 = new System.Windows.Forms.TextBox(); + this.weightBoxFirst = new System.Windows.Forms.TextBox(); this.label5 = new System.Windows.Forms.Label(); - this.textBox6 = new System.Windows.Forms.TextBox(); - this.textBox7 = new System.Windows.Forms.TextBox(); + this.weightBoxSecond = new System.Windows.Forms.TextBox(); + this.limitBox = new System.Windows.Forms.TextBox(); this.label6 = new System.Windows.Forms.Label(); - this.textBox8 = new System.Windows.Forms.TextBox(); + this.midpointBox = new System.Windows.Forms.TextBox(); this.label7 = new System.Windows.Forms.Label(); - this.textBox9 = new System.Windows.Forms.TextBox(); + this.offsetBox = new System.Windows.Forms.TextBox(); this.label8 = new System.Windows.Forms.Label(); + this.writeButton = new System.Windows.Forms.Button(); ((System.ComponentModel.ISupportInitialize)(this.AccelerationChart)).BeginInit(); this.SuspendLayout(); // // AccelerationChart // - chartArea11.AxisX.Title = "Speed (counts/ms)"; - chartArea11.AxisY.Title = "Sensitivity (magnitude ratio)"; - chartArea11.Name = "ChartArea1"; - this.AccelerationChart.ChartAreas.Add(chartArea11); - legend11.Name = "Legend1"; - this.AccelerationChart.Legends.Add(legend11); + chartArea2.AxisX.Title = "Speed (counts/ms)"; + chartArea2.AxisY.Title = "Sensitivity (magnitude ratio)"; + chartArea2.Name = "ChartArea1"; + this.AccelerationChart.ChartAreas.Add(chartArea2); + legend2.Name = "Legend1"; + this.AccelerationChart.Legends.Add(legend2); this.AccelerationChart.Location = new System.Drawing.Point(162, 0); this.AccelerationChart.Name = "AccelerationChart"; - series11.ChartArea = "ChartArea1"; - series11.ChartType = System.Windows.Forms.DataVisualization.Charting.SeriesChartType.Line; - series11.Legend = "Legend1"; - series11.Name = "Accelerated Sensitivity"; - this.AccelerationChart.Series.Add(series11); + series2.ChartArea = "ChartArea1"; + series2.ChartType = System.Windows.Forms.DataVisualization.Charting.SeriesChartType.Line; + series2.Legend = "Legend1"; + series2.Name = "Accelerated Sensitivity"; + this.AccelerationChart.Series.Add(series2); this.AccelerationChart.Size = new System.Drawing.Size(801, 312); this.AccelerationChart.TabIndex = 0; this.AccelerationChart.Text = "chart1"; // - // comboBox1 + // accelTypeDrop // - this.comboBox1.FormattingEnabled = true; - this.comboBox1.Items.AddRange(new object[] { + this.accelTypeDrop.FormattingEnabled = true; + this.accelTypeDrop.Items.AddRange(new object[] { "Off", "Linear", "Classic", @@ -83,19 +84,18 @@ "Logarithmic", "Sigmoid", "Power"}); - this.comboBox1.Location = new System.Drawing.Point(15, 86); - this.comboBox1.Name = "comboBox1"; - this.comboBox1.Size = new System.Drawing.Size(132, 21); - this.comboBox1.TabIndex = 2; - this.comboBox1.Text = "Acceleration Type"; - this.comboBox1.SelectedIndexChanged += new System.EventHandler(this.comboBox1_SelectedIndexChanged); + this.accelTypeDrop.Location = new System.Drawing.Point(15, 86); + this.accelTypeDrop.Name = "accelTypeDrop"; + this.accelTypeDrop.Size = new System.Drawing.Size(132, 21); + this.accelTypeDrop.TabIndex = 2; + this.accelTypeDrop.Text = "Acceleration Type"; // - // textBox1 + // sensitivityBox // - this.textBox1.Location = new System.Drawing.Point(96, 15); - this.textBox1.Name = "textBox1"; - this.textBox1.Size = new System.Drawing.Size(51, 20); - this.textBox1.TabIndex = 3; + this.sensitivityBox.Location = new System.Drawing.Point(96, 15); + this.sensitivityBox.Name = "sensitivityBox"; + this.sensitivityBox.Size = new System.Drawing.Size(51, 20); + this.sensitivityBox.TabIndex = 3; // // label1 // @@ -105,14 +105,13 @@ this.label1.Size = new System.Drawing.Size(54, 13); this.label1.TabIndex = 4; this.label1.Text = "Sensitivity"; - this.label1.Click += new System.EventHandler(this.label1_Click); // - // textBox2 + // rotationBox // - this.textBox2.Location = new System.Drawing.Point(96, 45); - this.textBox2.Name = "textBox2"; - this.textBox2.Size = new System.Drawing.Size(51, 20); - this.textBox2.TabIndex = 5; + this.rotationBox.Location = new System.Drawing.Point(96, 45); + this.rotationBox.Name = "rotationBox"; + this.rotationBox.Size = new System.Drawing.Size(51, 20); + this.rotationBox.TabIndex = 5; // // label2 // @@ -123,13 +122,12 @@ this.label2.TabIndex = 6; this.label2.Text = "Rotation"; // - // textBox3 + // accelerationBox // - this.textBox3.Location = new System.Drawing.Point(96, 113); - this.textBox3.Name = "textBox3"; - this.textBox3.Size = new System.Drawing.Size(51, 20); - this.textBox3.TabIndex = 7; - this.textBox3.TextChanged += new System.EventHandler(this.textBox3_TextChanged); + this.accelerationBox.Location = new System.Drawing.Point(96, 113); + this.accelerationBox.Name = "accelerationBox"; + this.accelerationBox.Size = new System.Drawing.Size(51, 20); + this.accelerationBox.TabIndex = 7; // // label4 // @@ -140,12 +138,12 @@ this.label4.TabIndex = 9; this.label4.Text = "Acceleration"; // - // textBox4 + // capBox // - this.textBox4.Location = new System.Drawing.Point(96, 140); - this.textBox4.Name = "textBox4"; - this.textBox4.Size = new System.Drawing.Size(51, 20); - this.textBox4.TabIndex = 10; + this.capBox.Location = new System.Drawing.Point(96, 140); + this.capBox.Name = "capBox"; + this.capBox.Size = new System.Drawing.Size(51, 20); + this.capBox.TabIndex = 10; // // label3 // @@ -156,12 +154,12 @@ this.label3.TabIndex = 11; this.label3.Text = "Cap"; // - // textBox5 + // weightBoxFirst // - this.textBox5.Location = new System.Drawing.Point(96, 167); - this.textBox5.Name = "textBox5"; - this.textBox5.Size = new System.Drawing.Size(24, 20); - this.textBox5.TabIndex = 12; + this.weightBoxFirst.Location = new System.Drawing.Point(96, 167); + this.weightBoxFirst.Name = "weightBoxFirst"; + this.weightBoxFirst.Size = new System.Drawing.Size(24, 20); + this.weightBoxFirst.TabIndex = 12; // // label5 // @@ -172,19 +170,19 @@ this.label5.TabIndex = 13; this.label5.Text = "Weight"; // - // textBox6 + // weightBoxSecond // - this.textBox6.Location = new System.Drawing.Point(126, 167); - this.textBox6.Name = "textBox6"; - this.textBox6.Size = new System.Drawing.Size(21, 20); - this.textBox6.TabIndex = 14; + this.weightBoxSecond.Location = new System.Drawing.Point(126, 167); + this.weightBoxSecond.Name = "weightBoxSecond"; + this.weightBoxSecond.Size = new System.Drawing.Size(21, 20); + this.weightBoxSecond.TabIndex = 14; // - // textBox7 + // limitBox // - this.textBox7.Location = new System.Drawing.Point(96, 219); - this.textBox7.Name = "textBox7"; - this.textBox7.Size = new System.Drawing.Size(51, 20); - this.textBox7.TabIndex = 15; + this.limitBox.Location = new System.Drawing.Point(96, 219); + this.limitBox.Name = "limitBox"; + this.limitBox.Size = new System.Drawing.Size(51, 20); + this.limitBox.TabIndex = 15; // // label6 // @@ -194,14 +192,13 @@ this.label6.Size = new System.Drawing.Size(78, 13); this.label6.TabIndex = 16; this.label6.Text = "Limit/Exponent"; - this.label6.Click += new System.EventHandler(this.label6_Click); // - // textBox8 + // midpointBox // - this.textBox8.Location = new System.Drawing.Point(96, 245); - this.textBox8.Name = "textBox8"; - this.textBox8.Size = new System.Drawing.Size(51, 20); - this.textBox8.TabIndex = 17; + this.midpointBox.Location = new System.Drawing.Point(96, 245); + this.midpointBox.Name = "midpointBox"; + this.midpointBox.Size = new System.Drawing.Size(51, 20); + this.midpointBox.TabIndex = 17; // // label7 // @@ -212,12 +209,12 @@ this.label7.TabIndex = 18; this.label7.Text = "Midpoint"; // - // textBox9 + // offsetBox // - this.textBox9.Location = new System.Drawing.Point(96, 193); - this.textBox9.Name = "textBox9"; - this.textBox9.Size = new System.Drawing.Size(51, 20); - this.textBox9.TabIndex = 19; + this.offsetBox.Location = new System.Drawing.Point(96, 193); + this.offsetBox.Name = "offsetBox"; + this.offsetBox.Size = new System.Drawing.Size(51, 20); + this.offsetBox.TabIndex = 19; // // label8 // @@ -228,29 +225,40 @@ this.label8.TabIndex = 20; this.label8.Text = "Offset"; // + // writeButton + // + this.writeButton.Location = new System.Drawing.Point(28, 271); + this.writeButton.Name = "writeButton"; + this.writeButton.Size = new System.Drawing.Size(102, 23); + this.writeButton.TabIndex = 21; + this.writeButton.Text = "Write To Driver"; + this.writeButton.UseVisualStyleBackColor = true; + this.writeButton.Click += new System.EventHandler(this.writeButton_Click); + // // RawAcceleration // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.ClientSize = new System.Drawing.Size(963, 310); + this.Controls.Add(this.writeButton); this.Controls.Add(this.label8); - this.Controls.Add(this.textBox9); + this.Controls.Add(this.offsetBox); this.Controls.Add(this.label7); - this.Controls.Add(this.textBox8); + this.Controls.Add(this.midpointBox); this.Controls.Add(this.label6); - this.Controls.Add(this.textBox7); - this.Controls.Add(this.textBox6); + this.Controls.Add(this.limitBox); + this.Controls.Add(this.weightBoxSecond); this.Controls.Add(this.label5); - this.Controls.Add(this.textBox5); + this.Controls.Add(this.weightBoxFirst); this.Controls.Add(this.label3); - this.Controls.Add(this.textBox4); + this.Controls.Add(this.capBox); this.Controls.Add(this.label4); - this.Controls.Add(this.textBox3); + this.Controls.Add(this.accelerationBox); this.Controls.Add(this.label2); - this.Controls.Add(this.textBox2); + this.Controls.Add(this.rotationBox); this.Controls.Add(this.label1); - this.Controls.Add(this.textBox1); - this.Controls.Add(this.comboBox1); + this.Controls.Add(this.sensitivityBox); + this.Controls.Add(this.accelTypeDrop); this.Controls.Add(this.AccelerationChart); this.Name = "RawAcceleration"; this.Text = "Raw Acceleration Graph"; @@ -264,24 +272,25 @@ #endregion private System.Windows.Forms.DataVisualization.Charting.Chart AccelerationChart; - private System.Windows.Forms.ComboBox comboBox1; - private System.Windows.Forms.TextBox textBox1; + private System.Windows.Forms.ComboBox accelTypeDrop; + private System.Windows.Forms.TextBox sensitivityBox; private System.Windows.Forms.Label label1; - private System.Windows.Forms.TextBox textBox2; + private System.Windows.Forms.TextBox rotationBox; private System.Windows.Forms.Label label2; - private System.Windows.Forms.TextBox textBox3; + private System.Windows.Forms.TextBox accelerationBox; private System.Windows.Forms.Label label4; - private System.Windows.Forms.TextBox textBox4; + private System.Windows.Forms.TextBox capBox; private System.Windows.Forms.Label label3; - private System.Windows.Forms.TextBox textBox5; + private System.Windows.Forms.TextBox weightBoxFirst; private System.Windows.Forms.Label label5; - private System.Windows.Forms.TextBox textBox6; - private System.Windows.Forms.TextBox textBox7; + private System.Windows.Forms.TextBox weightBoxSecond; + private System.Windows.Forms.TextBox limitBox; private System.Windows.Forms.Label label6; - private System.Windows.Forms.TextBox textBox8; + private System.Windows.Forms.TextBox midpointBox; private System.Windows.Forms.Label label7; - private System.Windows.Forms.TextBox textBox9; + private System.Windows.Forms.TextBox offsetBox; private System.Windows.Forms.Label label8; + private System.Windows.Forms.Button writeButton; } } -- cgit v1.2.3 From 93d4d0fe6a356953b5dd78f60393f2a70a73afb3 Mon Sep 17 00:00:00 2001 From: Jacob Palecki Date: Wed, 29 Jul 2020 18:14:27 -0700 Subject: Take new data for most fields by pressing enter --- grapher/Form1.Designer.cs | 35 +++++++++++++++++++++-------------- 1 file changed, 21 insertions(+), 14 deletions(-) (limited to 'grapher/Form1.Designer.cs') diff --git a/grapher/Form1.Designer.cs b/grapher/Form1.Designer.cs index ebf92f0..d2aae7d 100644 --- a/grapher/Form1.Designer.cs +++ b/grapher/Form1.Designer.cs @@ -28,9 +28,9 @@ /// private void InitializeComponent() { - System.Windows.Forms.DataVisualization.Charting.ChartArea chartArea2 = new System.Windows.Forms.DataVisualization.Charting.ChartArea(); - System.Windows.Forms.DataVisualization.Charting.Legend legend2 = new System.Windows.Forms.DataVisualization.Charting.Legend(); - System.Windows.Forms.DataVisualization.Charting.Series series2 = new System.Windows.Forms.DataVisualization.Charting.Series(); + System.Windows.Forms.DataVisualization.Charting.ChartArea chartArea10 = new System.Windows.Forms.DataVisualization.Charting.ChartArea(); + System.Windows.Forms.DataVisualization.Charting.Legend legend10 = new System.Windows.Forms.DataVisualization.Charting.Legend(); + System.Windows.Forms.DataVisualization.Charting.Series series10 = new System.Windows.Forms.DataVisualization.Charting.Series(); this.AccelerationChart = new System.Windows.Forms.DataVisualization.Charting.Chart(); this.accelTypeDrop = new System.Windows.Forms.ComboBox(); this.sensitivityBox = new System.Windows.Forms.TextBox(); @@ -56,19 +56,19 @@ // // AccelerationChart // - chartArea2.AxisX.Title = "Speed (counts/ms)"; - chartArea2.AxisY.Title = "Sensitivity (magnitude ratio)"; - chartArea2.Name = "ChartArea1"; - this.AccelerationChart.ChartAreas.Add(chartArea2); - legend2.Name = "Legend1"; - this.AccelerationChart.Legends.Add(legend2); + chartArea10.AxisX.Title = "Speed (counts/ms)"; + chartArea10.AxisY.Title = "Sensitivity (magnitude ratio)"; + chartArea10.Name = "ChartArea1"; + this.AccelerationChart.ChartAreas.Add(chartArea10); + legend10.Name = "Legend1"; + this.AccelerationChart.Legends.Add(legend10); this.AccelerationChart.Location = new System.Drawing.Point(162, 0); this.AccelerationChart.Name = "AccelerationChart"; - series2.ChartArea = "ChartArea1"; - series2.ChartType = System.Windows.Forms.DataVisualization.Charting.SeriesChartType.Line; - series2.Legend = "Legend1"; - series2.Name = "Accelerated Sensitivity"; - this.AccelerationChart.Series.Add(series2); + series10.ChartArea = "ChartArea1"; + series10.ChartType = System.Windows.Forms.DataVisualization.Charting.SeriesChartType.Line; + series10.Legend = "Legend1"; + series10.Name = "Accelerated Sensitivity"; + this.AccelerationChart.Series.Add(series10); this.AccelerationChart.Size = new System.Drawing.Size(801, 312); this.AccelerationChart.TabIndex = 0; this.AccelerationChart.Text = "chart1"; @@ -96,6 +96,7 @@ this.sensitivityBox.Name = "sensitivityBox"; this.sensitivityBox.Size = new System.Drawing.Size(51, 20); this.sensitivityBox.TabIndex = 3; + this.sensitivityBox.KeyDown += new System.Windows.Forms.KeyEventHandler(this.sensitivityBox_KeyDown); // // label1 // @@ -112,6 +113,7 @@ this.rotationBox.Name = "rotationBox"; this.rotationBox.Size = new System.Drawing.Size(51, 20); this.rotationBox.TabIndex = 5; + this.rotationBox.KeyDown += new System.Windows.Forms.KeyEventHandler(this.rotationBox_KeyDown); // // label2 // @@ -128,6 +130,7 @@ this.accelerationBox.Name = "accelerationBox"; this.accelerationBox.Size = new System.Drawing.Size(51, 20); this.accelerationBox.TabIndex = 7; + this.accelerationBox.KeyDown += new System.Windows.Forms.KeyEventHandler(this.accelerationBox_KeyDown); // // label4 // @@ -144,6 +147,7 @@ this.capBox.Name = "capBox"; this.capBox.Size = new System.Drawing.Size(51, 20); this.capBox.TabIndex = 10; + this.capBox.KeyDown += new System.Windows.Forms.KeyEventHandler(this.capBox_KeyDown); // // label3 // @@ -183,6 +187,7 @@ this.limitBox.Name = "limitBox"; this.limitBox.Size = new System.Drawing.Size(51, 20); this.limitBox.TabIndex = 15; + this.limitBox.KeyDown += new System.Windows.Forms.KeyEventHandler(this.limitBox_KeyDown); // // label6 // @@ -199,6 +204,7 @@ this.midpointBox.Name = "midpointBox"; this.midpointBox.Size = new System.Drawing.Size(51, 20); this.midpointBox.TabIndex = 17; + this.midpointBox.KeyDown += new System.Windows.Forms.KeyEventHandler(this.midpointBox_KeyDown); // // label7 // @@ -215,6 +221,7 @@ this.offsetBox.Name = "offsetBox"; this.offsetBox.Size = new System.Drawing.Size(51, 20); this.offsetBox.TabIndex = 19; + this.offsetBox.KeyDown += new System.Windows.Forms.KeyEventHandler(this.offsetBox_KeyDown); // // label8 // -- cgit v1.2.3 From 621ab8d23d10c892a18c39234b24266fd90b90fa Mon Sep 17 00:00:00 2001 From: Jacob Palecki Date: Wed, 29 Jul 2020 19:35:57 -0700 Subject: Separate classes into files, add Field class for text box state --- grapher/Form1.Designer.cs | 29 ++++++++++++++--------------- 1 file changed, 14 insertions(+), 15 deletions(-) (limited to 'grapher/Form1.Designer.cs') diff --git a/grapher/Form1.Designer.cs b/grapher/Form1.Designer.cs index d2aae7d..978f3da 100644 --- a/grapher/Form1.Designer.cs +++ b/grapher/Form1.Designer.cs @@ -28,9 +28,9 @@ /// private void InitializeComponent() { - System.Windows.Forms.DataVisualization.Charting.ChartArea chartArea10 = new System.Windows.Forms.DataVisualization.Charting.ChartArea(); - System.Windows.Forms.DataVisualization.Charting.Legend legend10 = new System.Windows.Forms.DataVisualization.Charting.Legend(); - System.Windows.Forms.DataVisualization.Charting.Series series10 = new System.Windows.Forms.DataVisualization.Charting.Series(); + System.Windows.Forms.DataVisualization.Charting.ChartArea chartArea12 = new System.Windows.Forms.DataVisualization.Charting.ChartArea(); + System.Windows.Forms.DataVisualization.Charting.Legend legend12 = new System.Windows.Forms.DataVisualization.Charting.Legend(); + System.Windows.Forms.DataVisualization.Charting.Series series12 = new System.Windows.Forms.DataVisualization.Charting.Series(); this.AccelerationChart = new System.Windows.Forms.DataVisualization.Charting.Chart(); this.accelTypeDrop = new System.Windows.Forms.ComboBox(); this.sensitivityBox = new System.Windows.Forms.TextBox(); @@ -56,19 +56,19 @@ // // AccelerationChart // - chartArea10.AxisX.Title = "Speed (counts/ms)"; - chartArea10.AxisY.Title = "Sensitivity (magnitude ratio)"; - chartArea10.Name = "ChartArea1"; - this.AccelerationChart.ChartAreas.Add(chartArea10); - legend10.Name = "Legend1"; - this.AccelerationChart.Legends.Add(legend10); + chartArea12.AxisX.Title = "Speed (counts/ms)"; + chartArea12.AxisY.Title = "Sensitivity (magnitude ratio)"; + chartArea12.Name = "ChartArea1"; + this.AccelerationChart.ChartAreas.Add(chartArea12); + legend12.Name = "Legend1"; + this.AccelerationChart.Legends.Add(legend12); this.AccelerationChart.Location = new System.Drawing.Point(162, 0); this.AccelerationChart.Name = "AccelerationChart"; - series10.ChartArea = "ChartArea1"; - series10.ChartType = System.Windows.Forms.DataVisualization.Charting.SeriesChartType.Line; - series10.Legend = "Legend1"; - series10.Name = "Accelerated Sensitivity"; - this.AccelerationChart.Series.Add(series10); + series12.ChartArea = "ChartArea1"; + series12.ChartType = System.Windows.Forms.DataVisualization.Charting.SeriesChartType.Line; + series12.Legend = "Legend1"; + series12.Name = "Accelerated Sensitivity"; + this.AccelerationChart.Series.Add(series12); this.AccelerationChart.Size = new System.Drawing.Size(801, 312); this.AccelerationChart.TabIndex = 0; this.AccelerationChart.Text = "chart1"; @@ -130,7 +130,6 @@ this.accelerationBox.Name = "accelerationBox"; this.accelerationBox.Size = new System.Drawing.Size(51, 20); this.accelerationBox.TabIndex = 7; - this.accelerationBox.KeyDown += new System.Windows.Forms.KeyEventHandler(this.accelerationBox_KeyDown); // // label4 // -- cgit v1.2.3 From 769deb7d9f8fca973432e74d2a6fac8697091fc2 Mon Sep 17 00:00:00 2001 From: Jacob Palecki Date: Wed, 29 Jul 2020 20:10:18 -0700 Subject: All single-value boxes use fields --- grapher/Form1.Designer.cs | 4 ---- 1 file changed, 4 deletions(-) (limited to 'grapher/Form1.Designer.cs') diff --git a/grapher/Form1.Designer.cs b/grapher/Form1.Designer.cs index 978f3da..fcfa239 100644 --- a/grapher/Form1.Designer.cs +++ b/grapher/Form1.Designer.cs @@ -113,7 +113,6 @@ this.rotationBox.Name = "rotationBox"; this.rotationBox.Size = new System.Drawing.Size(51, 20); this.rotationBox.TabIndex = 5; - this.rotationBox.KeyDown += new System.Windows.Forms.KeyEventHandler(this.rotationBox_KeyDown); // // label2 // @@ -186,7 +185,6 @@ this.limitBox.Name = "limitBox"; this.limitBox.Size = new System.Drawing.Size(51, 20); this.limitBox.TabIndex = 15; - this.limitBox.KeyDown += new System.Windows.Forms.KeyEventHandler(this.limitBox_KeyDown); // // label6 // @@ -203,7 +201,6 @@ this.midpointBox.Name = "midpointBox"; this.midpointBox.Size = new System.Drawing.Size(51, 20); this.midpointBox.TabIndex = 17; - this.midpointBox.KeyDown += new System.Windows.Forms.KeyEventHandler(this.midpointBox_KeyDown); // // label7 // @@ -220,7 +217,6 @@ this.offsetBox.Name = "offsetBox"; this.offsetBox.Size = new System.Drawing.Size(51, 20); this.offsetBox.TabIndex = 19; - this.offsetBox.KeyDown += new System.Windows.Forms.KeyEventHandler(this.offsetBox_KeyDown); // // label8 // -- cgit v1.2.3 From 36abeecf953e0efcd1ec9dcafa4bd1c554e362f5 Mon Sep 17 00:00:00 2001 From: Jacob Palecki Date: Wed, 29 Jul 2020 21:03:02 -0700 Subject: Add FieldXY --- grapher/Form1.Designer.cs | 192 +++++++++++++++++++++++++++++++--------------- 1 file changed, 132 insertions(+), 60 deletions(-) (limited to 'grapher/Form1.Designer.cs') diff --git a/grapher/Form1.Designer.cs b/grapher/Form1.Designer.cs index fcfa239..c7be8c7 100644 --- a/grapher/Form1.Designer.cs +++ b/grapher/Form1.Designer.cs @@ -28,18 +28,18 @@ /// private void InitializeComponent() { - System.Windows.Forms.DataVisualization.Charting.ChartArea chartArea12 = new System.Windows.Forms.DataVisualization.Charting.ChartArea(); - System.Windows.Forms.DataVisualization.Charting.Legend legend12 = new System.Windows.Forms.DataVisualization.Charting.Legend(); - System.Windows.Forms.DataVisualization.Charting.Series series12 = new System.Windows.Forms.DataVisualization.Charting.Series(); + System.Windows.Forms.DataVisualization.Charting.ChartArea chartArea2 = new System.Windows.Forms.DataVisualization.Charting.ChartArea(); + System.Windows.Forms.DataVisualization.Charting.Legend legend2 = new System.Windows.Forms.DataVisualization.Charting.Legend(); + System.Windows.Forms.DataVisualization.Charting.Series series2 = new System.Windows.Forms.DataVisualization.Charting.Series(); this.AccelerationChart = new System.Windows.Forms.DataVisualization.Charting.Chart(); this.accelTypeDrop = new System.Windows.Forms.ComboBox(); - this.sensitivityBox = new System.Windows.Forms.TextBox(); + this.sensitivityBoxX = new System.Windows.Forms.TextBox(); this.label1 = new System.Windows.Forms.Label(); this.rotationBox = new System.Windows.Forms.TextBox(); this.label2 = new System.Windows.Forms.Label(); this.accelerationBox = new System.Windows.Forms.TextBox(); this.label4 = new System.Windows.Forms.Label(); - this.capBox = new System.Windows.Forms.TextBox(); + this.capBoxX = new System.Windows.Forms.TextBox(); this.label3 = new System.Windows.Forms.Label(); this.weightBoxFirst = new System.Windows.Forms.TextBox(); this.label5 = new System.Windows.Forms.Label(); @@ -51,25 +51,31 @@ this.offsetBox = new System.Windows.Forms.TextBox(); this.label8 = new System.Windows.Forms.Label(); this.writeButton = new System.Windows.Forms.Button(); + this.sensitivityBoxY = new System.Windows.Forms.TextBox(); + this.capBoxY = new System.Windows.Forms.TextBox(); + this.sensXYLock = new System.Windows.Forms.CheckBox(); + this.capXYLock = new System.Windows.Forms.CheckBox(); + this.weightXYLock = new System.Windows.Forms.CheckBox(); + this.LockXYLabel = new System.Windows.Forms.Label(); ((System.ComponentModel.ISupportInitialize)(this.AccelerationChart)).BeginInit(); this.SuspendLayout(); // // AccelerationChart // - chartArea12.AxisX.Title = "Speed (counts/ms)"; - chartArea12.AxisY.Title = "Sensitivity (magnitude ratio)"; - chartArea12.Name = "ChartArea1"; - this.AccelerationChart.ChartAreas.Add(chartArea12); - legend12.Name = "Legend1"; - this.AccelerationChart.Legends.Add(legend12); - this.AccelerationChart.Location = new System.Drawing.Point(162, 0); + chartArea2.AxisX.Title = "Speed (counts/ms)"; + chartArea2.AxisY.Title = "Sensitivity (magnitude ratio)"; + chartArea2.Name = "ChartArea1"; + this.AccelerationChart.ChartAreas.Add(chartArea2); + legend2.Name = "Legend1"; + this.AccelerationChart.Legends.Add(legend2); + this.AccelerationChart.Location = new System.Drawing.Point(242, 1); this.AccelerationChart.Name = "AccelerationChart"; - series12.ChartArea = "ChartArea1"; - series12.ChartType = System.Windows.Forms.DataVisualization.Charting.SeriesChartType.Line; - series12.Legend = "Legend1"; - series12.Name = "Accelerated Sensitivity"; - this.AccelerationChart.Series.Add(series12); - this.AccelerationChart.Size = new System.Drawing.Size(801, 312); + series2.ChartArea = "ChartArea1"; + series2.ChartType = System.Windows.Forms.DataVisualization.Charting.SeriesChartType.Line; + series2.Legend = "Legend1"; + series2.Name = "Accelerated Sensitivity"; + this.AccelerationChart.Series.Add(series2); + this.AccelerationChart.Size = new System.Drawing.Size(721, 312); this.AccelerationChart.TabIndex = 0; this.AccelerationChart.Text = "chart1"; // @@ -84,24 +90,23 @@ "Logarithmic", "Sigmoid", "Power"}); - this.accelTypeDrop.Location = new System.Drawing.Point(15, 86); + this.accelTypeDrop.Location = new System.Drawing.Point(14, 89); this.accelTypeDrop.Name = "accelTypeDrop"; - this.accelTypeDrop.Size = new System.Drawing.Size(132, 21); + this.accelTypeDrop.Size = new System.Drawing.Size(151, 21); this.accelTypeDrop.TabIndex = 2; this.accelTypeDrop.Text = "Acceleration Type"; // - // sensitivityBox + // sensitivityBoxX // - this.sensitivityBox.Location = new System.Drawing.Point(96, 15); - this.sensitivityBox.Name = "sensitivityBox"; - this.sensitivityBox.Size = new System.Drawing.Size(51, 20); - this.sensitivityBox.TabIndex = 3; - this.sensitivityBox.KeyDown += new System.Windows.Forms.KeyEventHandler(this.sensitivityBox_KeyDown); + this.sensitivityBoxX.Location = new System.Drawing.Point(95, 37); + this.sensitivityBoxX.Name = "sensitivityBoxX"; + this.sensitivityBoxX.Size = new System.Drawing.Size(32, 20); + this.sensitivityBoxX.TabIndex = 3; // // label1 // this.label1.AutoSize = true; - this.label1.Location = new System.Drawing.Point(15, 18); + this.label1.Location = new System.Drawing.Point(14, 40); this.label1.Name = "label1"; this.label1.Size = new System.Drawing.Size(54, 13); this.label1.TabIndex = 4; @@ -109,15 +114,15 @@ // // rotationBox // - this.rotationBox.Location = new System.Drawing.Point(96, 45); + this.rotationBox.Location = new System.Drawing.Point(95, 63); this.rotationBox.Name = "rotationBox"; - this.rotationBox.Size = new System.Drawing.Size(51, 20); + this.rotationBox.Size = new System.Drawing.Size(70, 20); this.rotationBox.TabIndex = 5; // // label2 // this.label2.AutoSize = true; - this.label2.Location = new System.Drawing.Point(22, 48); + this.label2.Location = new System.Drawing.Point(24, 66); this.label2.Name = "label2"; this.label2.Size = new System.Drawing.Size(47, 13); this.label2.TabIndex = 6; @@ -125,32 +130,31 @@ // // accelerationBox // - this.accelerationBox.Location = new System.Drawing.Point(96, 113); + this.accelerationBox.Location = new System.Drawing.Point(96, 116); this.accelerationBox.Name = "accelerationBox"; - this.accelerationBox.Size = new System.Drawing.Size(51, 20); + this.accelerationBox.Size = new System.Drawing.Size(70, 20); this.accelerationBox.TabIndex = 7; // // label4 // this.label4.AutoSize = true; - this.label4.Location = new System.Drawing.Point(15, 116); + this.label4.Location = new System.Drawing.Point(14, 119); this.label4.Name = "label4"; this.label4.Size = new System.Drawing.Size(66, 13); this.label4.TabIndex = 9; this.label4.Text = "Acceleration"; // - // capBox + // capBoxX // - this.capBox.Location = new System.Drawing.Point(96, 140); - this.capBox.Name = "capBox"; - this.capBox.Size = new System.Drawing.Size(51, 20); - this.capBox.TabIndex = 10; - this.capBox.KeyDown += new System.Windows.Forms.KeyEventHandler(this.capBox_KeyDown); + this.capBoxX.Location = new System.Drawing.Point(95, 142); + this.capBoxX.Name = "capBoxX"; + this.capBoxX.Size = new System.Drawing.Size(32, 20); + this.capBoxX.TabIndex = 10; // // label3 // this.label3.AutoSize = true; - this.label3.Location = new System.Drawing.Point(25, 143); + this.label3.Location = new System.Drawing.Point(30, 145); this.label3.Name = "label3"; this.label3.Size = new System.Drawing.Size(26, 13); this.label3.TabIndex = 11; @@ -158,15 +162,15 @@ // // weightBoxFirst // - this.weightBoxFirst.Location = new System.Drawing.Point(96, 167); + this.weightBoxFirst.Location = new System.Drawing.Point(95, 168); this.weightBoxFirst.Name = "weightBoxFirst"; - this.weightBoxFirst.Size = new System.Drawing.Size(24, 20); + this.weightBoxFirst.Size = new System.Drawing.Size(32, 20); this.weightBoxFirst.TabIndex = 12; // // label5 // this.label5.AutoSize = true; - this.label5.Location = new System.Drawing.Point(25, 173); + this.label5.Location = new System.Drawing.Point(24, 171); this.label5.Name = "label5"; this.label5.Size = new System.Drawing.Size(41, 13); this.label5.TabIndex = 13; @@ -174,22 +178,22 @@ // // weightBoxSecond // - this.weightBoxSecond.Location = new System.Drawing.Point(126, 167); + this.weightBoxSecond.Location = new System.Drawing.Point(134, 168); this.weightBoxSecond.Name = "weightBoxSecond"; - this.weightBoxSecond.Size = new System.Drawing.Size(21, 20); + this.weightBoxSecond.Size = new System.Drawing.Size(32, 20); this.weightBoxSecond.TabIndex = 14; // // limitBox // - this.limitBox.Location = new System.Drawing.Point(96, 219); + this.limitBox.Location = new System.Drawing.Point(95, 220); this.limitBox.Name = "limitBox"; - this.limitBox.Size = new System.Drawing.Size(51, 20); + this.limitBox.Size = new System.Drawing.Size(70, 20); this.limitBox.TabIndex = 15; // // label6 // this.label6.AutoSize = true; - this.label6.Location = new System.Drawing.Point(12, 222); + this.label6.Location = new System.Drawing.Point(14, 223); this.label6.Name = "label6"; this.label6.Size = new System.Drawing.Size(78, 13); this.label6.TabIndex = 16; @@ -197,15 +201,15 @@ // // midpointBox // - this.midpointBox.Location = new System.Drawing.Point(96, 245); + this.midpointBox.Location = new System.Drawing.Point(95, 246); this.midpointBox.Name = "midpointBox"; - this.midpointBox.Size = new System.Drawing.Size(51, 20); + this.midpointBox.Size = new System.Drawing.Size(70, 20); this.midpointBox.TabIndex = 17; // // label7 // this.label7.AutoSize = true; - this.label7.Location = new System.Drawing.Point(22, 248); + this.label7.Location = new System.Drawing.Point(21, 249); this.label7.Name = "label7"; this.label7.Size = new System.Drawing.Size(47, 13); this.label7.TabIndex = 18; @@ -213,15 +217,15 @@ // // offsetBox // - this.offsetBox.Location = new System.Drawing.Point(96, 193); + this.offsetBox.Location = new System.Drawing.Point(95, 194); this.offsetBox.Name = "offsetBox"; - this.offsetBox.Size = new System.Drawing.Size(51, 20); + this.offsetBox.Size = new System.Drawing.Size(70, 20); this.offsetBox.TabIndex = 19; // // label8 // this.label8.AutoSize = true; - this.label8.Location = new System.Drawing.Point(25, 200); + this.label8.Location = new System.Drawing.Point(30, 197); this.label8.Name = "label8"; this.label8.Size = new System.Drawing.Size(35, 13); this.label8.TabIndex = 20; @@ -229,7 +233,7 @@ // // writeButton // - this.writeButton.Location = new System.Drawing.Point(28, 271); + this.writeButton.Location = new System.Drawing.Point(47, 272); this.writeButton.Name = "writeButton"; this.writeButton.Size = new System.Drawing.Size(102, 23); this.writeButton.TabIndex = 21; @@ -237,11 +241,73 @@ this.writeButton.UseVisualStyleBackColor = true; this.writeButton.Click += new System.EventHandler(this.writeButton_Click); // + // sensitivityBoxY + // + this.sensitivityBoxY.Location = new System.Drawing.Point(133, 37); + this.sensitivityBoxY.Name = "sensitivityBoxY"; + this.sensitivityBoxY.Size = new System.Drawing.Size(32, 20); + this.sensitivityBoxY.TabIndex = 22; + // + // capBoxY + // + this.capBoxY.Location = new System.Drawing.Point(135, 142); + this.capBoxY.Name = "capBoxY"; + this.capBoxY.Size = new System.Drawing.Size(31, 20); + this.capBoxY.TabIndex = 23; + // + // sensXYLock + // + this.sensXYLock.AutoSize = true; + this.sensXYLock.Checked = true; + this.sensXYLock.CheckState = System.Windows.Forms.CheckState.Checked; + this.sensXYLock.Location = new System.Drawing.Point(188, 40); + this.sensXYLock.Name = "sensXYLock"; + this.sensXYLock.Size = new System.Drawing.Size(15, 14); + this.sensXYLock.TabIndex = 24; + this.sensXYLock.UseVisualStyleBackColor = true; + // + // capXYLock + // + this.capXYLock.AutoSize = true; + this.capXYLock.Checked = true; + this.capXYLock.CheckState = System.Windows.Forms.CheckState.Checked; + this.capXYLock.Location = new System.Drawing.Point(188, 145); + this.capXYLock.Name = "capXYLock"; + this.capXYLock.Size = new System.Drawing.Size(15, 14); + this.capXYLock.TabIndex = 25; + this.capXYLock.UseVisualStyleBackColor = true; + // + // weightXYLock + // + this.weightXYLock.AutoSize = true; + this.weightXYLock.Checked = true; + this.weightXYLock.CheckState = System.Windows.Forms.CheckState.Checked; + this.weightXYLock.Location = new System.Drawing.Point(188, 171); + this.weightXYLock.Name = "weightXYLock"; + this.weightXYLock.Size = new System.Drawing.Size(15, 14); + this.weightXYLock.TabIndex = 26; + this.weightXYLock.UseVisualStyleBackColor = true; + // + // LockXYLabel + // + this.LockXYLabel.AutoSize = true; + this.LockXYLabel.Location = new System.Drawing.Point(165, 21); + this.LockXYLabel.Name = "LockXYLabel"; + this.LockXYLabel.Size = new System.Drawing.Size(60, 13); + this.LockXYLabel.TabIndex = 27; + this.LockXYLabel.Text = "Lock X && Y"; + // // RawAcceleration // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(963, 310); + this.ClientSize = new System.Drawing.Size(963, 312); + this.Controls.Add(this.LockXYLabel); + this.Controls.Add(this.weightXYLock); + this.Controls.Add(this.capXYLock); + this.Controls.Add(this.sensXYLock); + this.Controls.Add(this.capBoxY); + this.Controls.Add(this.sensitivityBoxY); this.Controls.Add(this.writeButton); this.Controls.Add(this.label8); this.Controls.Add(this.offsetBox); @@ -253,13 +319,13 @@ this.Controls.Add(this.label5); this.Controls.Add(this.weightBoxFirst); this.Controls.Add(this.label3); - this.Controls.Add(this.capBox); + this.Controls.Add(this.capBoxX); this.Controls.Add(this.label4); this.Controls.Add(this.accelerationBox); this.Controls.Add(this.label2); this.Controls.Add(this.rotationBox); this.Controls.Add(this.label1); - this.Controls.Add(this.sensitivityBox); + this.Controls.Add(this.sensitivityBoxX); this.Controls.Add(this.accelTypeDrop); this.Controls.Add(this.AccelerationChart); this.Name = "RawAcceleration"; @@ -275,13 +341,13 @@ private System.Windows.Forms.DataVisualization.Charting.Chart AccelerationChart; private System.Windows.Forms.ComboBox accelTypeDrop; - private System.Windows.Forms.TextBox sensitivityBox; + private System.Windows.Forms.TextBox sensitivityBoxX; private System.Windows.Forms.Label label1; private System.Windows.Forms.TextBox rotationBox; private System.Windows.Forms.Label label2; private System.Windows.Forms.TextBox accelerationBox; private System.Windows.Forms.Label label4; - private System.Windows.Forms.TextBox capBox; + private System.Windows.Forms.TextBox capBoxX; private System.Windows.Forms.Label label3; private System.Windows.Forms.TextBox weightBoxFirst; private System.Windows.Forms.Label label5; @@ -293,6 +359,12 @@ private System.Windows.Forms.TextBox offsetBox; private System.Windows.Forms.Label label8; private System.Windows.Forms.Button writeButton; + private System.Windows.Forms.TextBox sensitivityBoxY; + private System.Windows.Forms.TextBox capBoxY; + private System.Windows.Forms.CheckBox sensXYLock; + private System.Windows.Forms.CheckBox capXYLock; + private System.Windows.Forms.CheckBox weightXYLock; + private System.Windows.Forms.Label LockXYLabel; } } -- cgit v1.2.3 From d7e1121eb62b9842f9d19bddaf3e633d3dbe0924 Mon Sep 17 00:00:00 2001 From: Jacob Palecki Date: Wed, 29 Jul 2020 21:26:13 -0700 Subject: Adde accel type switch --- grapher/Form1.Designer.cs | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-) (limited to 'grapher/Form1.Designer.cs') diff --git a/grapher/Form1.Designer.cs b/grapher/Form1.Designer.cs index c7be8c7..09a4da3 100644 --- a/grapher/Form1.Designer.cs +++ b/grapher/Form1.Designer.cs @@ -28,9 +28,9 @@ /// private void InitializeComponent() { - System.Windows.Forms.DataVisualization.Charting.ChartArea chartArea2 = new System.Windows.Forms.DataVisualization.Charting.ChartArea(); - System.Windows.Forms.DataVisualization.Charting.Legend legend2 = new System.Windows.Forms.DataVisualization.Charting.Legend(); - System.Windows.Forms.DataVisualization.Charting.Series series2 = new System.Windows.Forms.DataVisualization.Charting.Series(); + 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(); this.AccelerationChart = new System.Windows.Forms.DataVisualization.Charting.Chart(); this.accelTypeDrop = new System.Windows.Forms.ComboBox(); this.sensitivityBoxX = new System.Windows.Forms.TextBox(); @@ -62,19 +62,19 @@ // // AccelerationChart // - chartArea2.AxisX.Title = "Speed (counts/ms)"; - chartArea2.AxisY.Title = "Sensitivity (magnitude ratio)"; - chartArea2.Name = "ChartArea1"; - this.AccelerationChart.ChartAreas.Add(chartArea2); - legend2.Name = "Legend1"; - this.AccelerationChart.Legends.Add(legend2); + chartArea1.AxisX.Title = "Speed (counts/ms)"; + chartArea1.AxisY.Title = "Sensitivity (magnitude ratio)"; + chartArea1.Name = "ChartArea1"; + this.AccelerationChart.ChartAreas.Add(chartArea1); + legend1.Name = "Legend1"; + this.AccelerationChart.Legends.Add(legend1); this.AccelerationChart.Location = new System.Drawing.Point(242, 1); this.AccelerationChart.Name = "AccelerationChart"; - series2.ChartArea = "ChartArea1"; - series2.ChartType = System.Windows.Forms.DataVisualization.Charting.SeriesChartType.Line; - series2.Legend = "Legend1"; - series2.Name = "Accelerated Sensitivity"; - this.AccelerationChart.Series.Add(series2); + series1.ChartArea = "ChartArea1"; + series1.ChartType = System.Windows.Forms.DataVisualization.Charting.SeriesChartType.Line; + series1.Legend = "Legend1"; + series1.Name = "Accelerated Sensitivity"; + this.AccelerationChart.Series.Add(series1); this.AccelerationChart.Size = new System.Drawing.Size(721, 312); this.AccelerationChart.TabIndex = 0; this.AccelerationChart.Text = "chart1"; @@ -95,6 +95,7 @@ this.accelTypeDrop.Size = new System.Drawing.Size(151, 21); this.accelTypeDrop.TabIndex = 2; this.accelTypeDrop.Text = "Acceleration Type"; + this.accelTypeDrop.SelectedIndexChanged += new System.EventHandler(this.accelTypeDrop_SelectedIndexChanged); // // sensitivityBoxX // -- cgit v1.2.3 From 20ea6f85cb0af56c13dabbfc3f65383af8793c7c Mon Sep 17 00:00:00 2001 From: Jacob Palecki Date: Thu, 30 Jul 2020 00:32:48 -0700 Subject: Fix small bugs, add AccelOptions class --- grapher/Form1.Designer.cs | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) (limited to 'grapher/Form1.Designer.cs') diff --git a/grapher/Form1.Designer.cs b/grapher/Form1.Designer.cs index 09a4da3..b2bc052 100644 --- a/grapher/Form1.Designer.cs +++ b/grapher/Form1.Designer.cs @@ -1,4 +1,6 @@ -namespace grapher +using System.Linq; + +namespace grapher { partial class RawAcceleration { @@ -82,14 +84,7 @@ // accelTypeDrop // this.accelTypeDrop.FormattingEnabled = true; - this.accelTypeDrop.Items.AddRange(new object[] { - "Off", - "Linear", - "Classic", - "Natural", - "Logarithmic", - "Sigmoid", - "Power"}); + this.accelTypeDrop.Items.AddRange(AccelOptions.TypeToIndex.Keys.ToArray()); this.accelTypeDrop.Location = new System.Drawing.Point(14, 89); this.accelTypeDrop.Name = "accelTypeDrop"; this.accelTypeDrop.Size = new System.Drawing.Size(151, 21); -- cgit v1.2.3 From 3cbec32cfa91bad661bc126b517faf78458a27a6 Mon Sep 17 00:00:00 2001 From: Jacob Palecki Date: Thu, 30 Jul 2020 01:13:24 -0700 Subject: Fully use acceloptions --- grapher/Form1.Designer.cs | 101 ++++++++++++++++++++++++---------------------- 1 file changed, 53 insertions(+), 48 deletions(-) (limited to 'grapher/Form1.Designer.cs') diff --git a/grapher/Form1.Designer.cs b/grapher/Form1.Designer.cs index b2bc052..ac936d3 100644 --- a/grapher/Form1.Designer.cs +++ b/grapher/Form1.Designer.cs @@ -30,9 +30,9 @@ namespace grapher /// private void InitializeComponent() { - 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(); + System.Windows.Forms.DataVisualization.Charting.ChartArea chartArea3 = new System.Windows.Forms.DataVisualization.Charting.ChartArea(); + System.Windows.Forms.DataVisualization.Charting.Legend legend3 = new System.Windows.Forms.DataVisualization.Charting.Legend(); + System.Windows.Forms.DataVisualization.Charting.Series series3 = new System.Windows.Forms.DataVisualization.Charting.Series(); this.AccelerationChart = new System.Windows.Forms.DataVisualization.Charting.Chart(); this.accelTypeDrop = new System.Windows.Forms.ComboBox(); this.sensitivityBoxX = new System.Windows.Forms.TextBox(); @@ -40,16 +40,16 @@ namespace grapher this.rotationBox = new System.Windows.Forms.TextBox(); this.label2 = new System.Windows.Forms.Label(); this.accelerationBox = new System.Windows.Forms.TextBox(); - this.label4 = new System.Windows.Forms.Label(); + this.constantOneLabel = new System.Windows.Forms.Label(); this.capBoxX = new System.Windows.Forms.TextBox(); this.label3 = new System.Windows.Forms.Label(); this.weightBoxFirst = new System.Windows.Forms.TextBox(); this.label5 = new System.Windows.Forms.Label(); this.weightBoxSecond = new System.Windows.Forms.TextBox(); this.limitBox = new System.Windows.Forms.TextBox(); - this.label6 = new System.Windows.Forms.Label(); + this.constantTwoLabel = new System.Windows.Forms.Label(); this.midpointBox = new System.Windows.Forms.TextBox(); - this.label7 = new System.Windows.Forms.Label(); + this.constantThreeLabel = new System.Windows.Forms.Label(); this.offsetBox = new System.Windows.Forms.TextBox(); this.label8 = new System.Windows.Forms.Label(); this.writeButton = new System.Windows.Forms.Button(); @@ -64,19 +64,19 @@ namespace grapher // // AccelerationChart // - chartArea1.AxisX.Title = "Speed (counts/ms)"; - chartArea1.AxisY.Title = "Sensitivity (magnitude ratio)"; - chartArea1.Name = "ChartArea1"; - this.AccelerationChart.ChartAreas.Add(chartArea1); - legend1.Name = "Legend1"; - this.AccelerationChart.Legends.Add(legend1); + chartArea3.AxisX.Title = "Speed (counts/ms)"; + chartArea3.AxisY.Title = "Sensitivity (magnitude ratio)"; + chartArea3.Name = "ChartArea1"; + this.AccelerationChart.ChartAreas.Add(chartArea3); + legend3.Name = "Legend1"; + this.AccelerationChart.Legends.Add(legend3); this.AccelerationChart.Location = new System.Drawing.Point(242, 1); this.AccelerationChart.Name = "AccelerationChart"; - series1.ChartArea = "ChartArea1"; - series1.ChartType = System.Windows.Forms.DataVisualization.Charting.SeriesChartType.Line; - series1.Legend = "Legend1"; - series1.Name = "Accelerated Sensitivity"; - this.AccelerationChart.Series.Add(series1); + series3.ChartArea = "ChartArea1"; + series3.ChartType = System.Windows.Forms.DataVisualization.Charting.SeriesChartType.Line; + series3.Legend = "Legend1"; + series3.Name = "Accelerated Sensitivity"; + this.AccelerationChart.Series.Add(series3); this.AccelerationChart.Size = new System.Drawing.Size(721, 312); this.AccelerationChart.TabIndex = 0; this.AccelerationChart.Text = "chart1"; @@ -84,13 +84,11 @@ namespace grapher // accelTypeDrop // this.accelTypeDrop.FormattingEnabled = true; - this.accelTypeDrop.Items.AddRange(AccelOptions.TypeToIndex.Keys.ToArray()); this.accelTypeDrop.Location = new System.Drawing.Point(14, 89); this.accelTypeDrop.Name = "accelTypeDrop"; this.accelTypeDrop.Size = new System.Drawing.Size(151, 21); this.accelTypeDrop.TabIndex = 2; this.accelTypeDrop.Text = "Acceleration Type"; - this.accelTypeDrop.SelectedIndexChanged += new System.EventHandler(this.accelTypeDrop_SelectedIndexChanged); // // sensitivityBoxX // @@ -131,14 +129,15 @@ namespace grapher this.accelerationBox.Size = new System.Drawing.Size(70, 20); this.accelerationBox.TabIndex = 7; // - // label4 + // constantOneLabel // - this.label4.AutoSize = true; - this.label4.Location = new System.Drawing.Point(14, 119); - this.label4.Name = "label4"; - this.label4.Size = new System.Drawing.Size(66, 13); - this.label4.TabIndex = 9; - this.label4.Text = "Acceleration"; + this.constantOneLabel.AutoSize = true; + this.constantOneLabel.Location = new System.Drawing.Point(14, 119); + this.constantOneLabel.Name = "constantOneLabel"; + this.constantOneLabel.Size = new System.Drawing.Size(66, 13); + this.constantOneLabel.TabIndex = 9; + this.constantOneLabel.Text = "Acceleration"; + this.constantOneLabel.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; // // capBoxX // @@ -150,11 +149,13 @@ namespace grapher // label3 // this.label3.AutoSize = true; - this.label3.Location = new System.Drawing.Point(30, 145); + this.label3.Location = new System.Drawing.Point(24, 146); this.label3.Name = "label3"; this.label3.Size = new System.Drawing.Size(26, 13); this.label3.TabIndex = 11; this.label3.Text = "Cap"; + this.label3.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + this.label3.Click += new System.EventHandler(this.label3_Click); // // weightBoxFirst // @@ -171,6 +172,7 @@ namespace grapher this.label5.Size = new System.Drawing.Size(41, 13); this.label5.TabIndex = 13; this.label5.Text = "Weight"; + this.label5.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; // // weightBoxSecond // @@ -186,14 +188,15 @@ namespace grapher this.limitBox.Size = new System.Drawing.Size(70, 20); this.limitBox.TabIndex = 15; // - // label6 + // constantTwoLabel // - this.label6.AutoSize = true; - this.label6.Location = new System.Drawing.Point(14, 223); - this.label6.Name = "label6"; - this.label6.Size = new System.Drawing.Size(78, 13); - this.label6.TabIndex = 16; - this.label6.Text = "Limit/Exponent"; + this.constantTwoLabel.AutoSize = true; + this.constantTwoLabel.Location = new System.Drawing.Point(14, 223); + this.constantTwoLabel.Name = "constantTwoLabel"; + this.constantTwoLabel.Size = new System.Drawing.Size(78, 13); + this.constantTwoLabel.TabIndex = 16; + this.constantTwoLabel.Text = "Limit/Exponent"; + this.constantTwoLabel.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; // // midpointBox // @@ -202,14 +205,15 @@ namespace grapher this.midpointBox.Size = new System.Drawing.Size(70, 20); this.midpointBox.TabIndex = 17; // - // label7 + // constantThreeLabel // - this.label7.AutoSize = true; - this.label7.Location = new System.Drawing.Point(21, 249); - this.label7.Name = "label7"; - this.label7.Size = new System.Drawing.Size(47, 13); - this.label7.TabIndex = 18; - this.label7.Text = "Midpoint"; + this.constantThreeLabel.AutoSize = true; + this.constantThreeLabel.Location = new System.Drawing.Point(21, 249); + this.constantThreeLabel.Name = "constantThreeLabel"; + this.constantThreeLabel.Size = new System.Drawing.Size(47, 13); + this.constantThreeLabel.TabIndex = 18; + this.constantThreeLabel.Text = "Midpoint"; + this.constantThreeLabel.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; // // offsetBox // @@ -221,11 +225,12 @@ namespace grapher // label8 // this.label8.AutoSize = true; - this.label8.Location = new System.Drawing.Point(30, 197); + this.label8.Location = new System.Drawing.Point(24, 197); this.label8.Name = "label8"; this.label8.Size = new System.Drawing.Size(35, 13); this.label8.TabIndex = 20; this.label8.Text = "Offset"; + this.label8.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; // // writeButton // @@ -307,16 +312,16 @@ namespace grapher this.Controls.Add(this.writeButton); this.Controls.Add(this.label8); this.Controls.Add(this.offsetBox); - this.Controls.Add(this.label7); + this.Controls.Add(this.constantThreeLabel); this.Controls.Add(this.midpointBox); - this.Controls.Add(this.label6); + this.Controls.Add(this.constantTwoLabel); this.Controls.Add(this.limitBox); this.Controls.Add(this.weightBoxSecond); this.Controls.Add(this.label5); this.Controls.Add(this.weightBoxFirst); this.Controls.Add(this.label3); this.Controls.Add(this.capBoxX); - this.Controls.Add(this.label4); + this.Controls.Add(this.constantOneLabel); this.Controls.Add(this.accelerationBox); this.Controls.Add(this.label2); this.Controls.Add(this.rotationBox); @@ -342,16 +347,16 @@ namespace grapher private System.Windows.Forms.TextBox rotationBox; private System.Windows.Forms.Label label2; private System.Windows.Forms.TextBox accelerationBox; - private System.Windows.Forms.Label label4; + private System.Windows.Forms.Label constantOneLabel; private System.Windows.Forms.TextBox capBoxX; private System.Windows.Forms.Label label3; private System.Windows.Forms.TextBox weightBoxFirst; private System.Windows.Forms.Label label5; private System.Windows.Forms.TextBox weightBoxSecond; private System.Windows.Forms.TextBox limitBox; - private System.Windows.Forms.Label label6; + private System.Windows.Forms.Label constantTwoLabel; private System.Windows.Forms.TextBox midpointBox; - private System.Windows.Forms.Label label7; + private System.Windows.Forms.Label constantThreeLabel; private System.Windows.Forms.TextBox offsetBox; private System.Windows.Forms.Label label8; private System.Windows.Forms.Button writeButton; -- cgit v1.2.3 From 49bd00c71b223d12f1d85d5c1bae635d450403fd Mon Sep 17 00:00:00 2001 From: Jacob Palecki Date: Thu, 30 Jul 2020 20:15:12 -0700 Subject: Use options instead of fields --- grapher/Form1.Designer.cs | 136 +++++++++++++++++++++++----------------------- 1 file changed, 68 insertions(+), 68 deletions(-) (limited to 'grapher/Form1.Designer.cs') diff --git a/grapher/Form1.Designer.cs b/grapher/Form1.Designer.cs index ac936d3..decdeeb 100644 --- a/grapher/Form1.Designer.cs +++ b/grapher/Form1.Designer.cs @@ -30,28 +30,28 @@ namespace grapher /// private void InitializeComponent() { - System.Windows.Forms.DataVisualization.Charting.ChartArea chartArea3 = new System.Windows.Forms.DataVisualization.Charting.ChartArea(); - System.Windows.Forms.DataVisualization.Charting.Legend legend3 = new System.Windows.Forms.DataVisualization.Charting.Legend(); - System.Windows.Forms.DataVisualization.Charting.Series series3 = new System.Windows.Forms.DataVisualization.Charting.Series(); + 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(); this.AccelerationChart = new System.Windows.Forms.DataVisualization.Charting.Chart(); this.accelTypeDrop = new System.Windows.Forms.ComboBox(); this.sensitivityBoxX = new System.Windows.Forms.TextBox(); - this.label1 = new System.Windows.Forms.Label(); + this.sensitivityLabel = new System.Windows.Forms.Label(); this.rotationBox = new System.Windows.Forms.TextBox(); - this.label2 = new System.Windows.Forms.Label(); + this.rotationLabel = new System.Windows.Forms.Label(); this.accelerationBox = new System.Windows.Forms.TextBox(); this.constantOneLabel = new System.Windows.Forms.Label(); this.capBoxX = new System.Windows.Forms.TextBox(); - this.label3 = new System.Windows.Forms.Label(); + this.capLabel = new System.Windows.Forms.Label(); this.weightBoxFirst = new System.Windows.Forms.TextBox(); - this.label5 = new System.Windows.Forms.Label(); + this.weightLabel = new System.Windows.Forms.Label(); this.weightBoxSecond = new System.Windows.Forms.TextBox(); this.limitBox = new System.Windows.Forms.TextBox(); this.constantTwoLabel = new System.Windows.Forms.Label(); this.midpointBox = new System.Windows.Forms.TextBox(); this.constantThreeLabel = new System.Windows.Forms.Label(); this.offsetBox = new System.Windows.Forms.TextBox(); - this.label8 = new System.Windows.Forms.Label(); + this.offsetLabel = new System.Windows.Forms.Label(); this.writeButton = new System.Windows.Forms.Button(); this.sensitivityBoxY = new System.Windows.Forms.TextBox(); this.capBoxY = new System.Windows.Forms.TextBox(); @@ -64,19 +64,19 @@ namespace grapher // // AccelerationChart // - chartArea3.AxisX.Title = "Speed (counts/ms)"; - chartArea3.AxisY.Title = "Sensitivity (magnitude ratio)"; - chartArea3.Name = "ChartArea1"; - this.AccelerationChart.ChartAreas.Add(chartArea3); - legend3.Name = "Legend1"; - this.AccelerationChart.Legends.Add(legend3); + chartArea1.AxisX.Title = "Speed (counts/ms)"; + chartArea1.AxisY.Title = "Sensitivity (magnitude ratio)"; + chartArea1.Name = "ChartArea1"; + this.AccelerationChart.ChartAreas.Add(chartArea1); + legend1.Name = "Legend1"; + this.AccelerationChart.Legends.Add(legend1); this.AccelerationChart.Location = new System.Drawing.Point(242, 1); this.AccelerationChart.Name = "AccelerationChart"; - series3.ChartArea = "ChartArea1"; - series3.ChartType = System.Windows.Forms.DataVisualization.Charting.SeriesChartType.Line; - series3.Legend = "Legend1"; - series3.Name = "Accelerated Sensitivity"; - this.AccelerationChart.Series.Add(series3); + series1.ChartArea = "ChartArea1"; + series1.ChartType = System.Windows.Forms.DataVisualization.Charting.SeriesChartType.Line; + series1.Legend = "Legend1"; + series1.Name = "Accelerated Sensitivity"; + this.AccelerationChart.Series.Add(series1); this.AccelerationChart.Size = new System.Drawing.Size(721, 312); this.AccelerationChart.TabIndex = 0; this.AccelerationChart.Text = "chart1"; @@ -97,14 +97,14 @@ namespace grapher this.sensitivityBoxX.Size = new System.Drawing.Size(32, 20); this.sensitivityBoxX.TabIndex = 3; // - // label1 + // sensitivityLabel // - this.label1.AutoSize = true; - this.label1.Location = new System.Drawing.Point(14, 40); - this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(54, 13); - this.label1.TabIndex = 4; - this.label1.Text = "Sensitivity"; + this.sensitivityLabel.AutoSize = true; + this.sensitivityLabel.Location = new System.Drawing.Point(14, 40); + this.sensitivityLabel.Name = "sensitivityLabel"; + this.sensitivityLabel.Size = new System.Drawing.Size(54, 13); + this.sensitivityLabel.TabIndex = 4; + this.sensitivityLabel.Text = "Sensitivity"; // // rotationBox // @@ -113,14 +113,14 @@ namespace grapher this.rotationBox.Size = new System.Drawing.Size(70, 20); this.rotationBox.TabIndex = 5; // - // label2 + // rotationLabel // - this.label2.AutoSize = true; - this.label2.Location = new System.Drawing.Point(24, 66); - this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(47, 13); - this.label2.TabIndex = 6; - this.label2.Text = "Rotation"; + this.rotationLabel.AutoSize = true; + this.rotationLabel.Location = new System.Drawing.Point(24, 66); + this.rotationLabel.Name = "rotationLabel"; + this.rotationLabel.Size = new System.Drawing.Size(47, 13); + this.rotationLabel.TabIndex = 6; + this.rotationLabel.Text = "Rotation"; // // accelerationBox // @@ -146,16 +146,16 @@ namespace grapher this.capBoxX.Size = new System.Drawing.Size(32, 20); this.capBoxX.TabIndex = 10; // - // label3 + // capLabel // - this.label3.AutoSize = true; - this.label3.Location = new System.Drawing.Point(24, 146); - this.label3.Name = "label3"; - this.label3.Size = new System.Drawing.Size(26, 13); - this.label3.TabIndex = 11; - this.label3.Text = "Cap"; - this.label3.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; - this.label3.Click += new System.EventHandler(this.label3_Click); + this.capLabel.AutoSize = true; + this.capLabel.Location = new System.Drawing.Point(24, 146); + this.capLabel.Name = "capLabel"; + this.capLabel.Size = new System.Drawing.Size(26, 13); + this.capLabel.TabIndex = 11; + this.capLabel.Text = "Cap"; + this.capLabel.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + this.capLabel.Click += new System.EventHandler(this.label3_Click); // // weightBoxFirst // @@ -164,15 +164,15 @@ namespace grapher this.weightBoxFirst.Size = new System.Drawing.Size(32, 20); this.weightBoxFirst.TabIndex = 12; // - // label5 + // weightLabel // - this.label5.AutoSize = true; - this.label5.Location = new System.Drawing.Point(24, 171); - this.label5.Name = "label5"; - this.label5.Size = new System.Drawing.Size(41, 13); - this.label5.TabIndex = 13; - this.label5.Text = "Weight"; - this.label5.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + this.weightLabel.AutoSize = true; + this.weightLabel.Location = new System.Drawing.Point(24, 171); + this.weightLabel.Name = "weightLabel"; + this.weightLabel.Size = new System.Drawing.Size(41, 13); + this.weightLabel.TabIndex = 13; + this.weightLabel.Text = "Weight"; + this.weightLabel.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; // // weightBoxSecond // @@ -222,15 +222,15 @@ namespace grapher this.offsetBox.Size = new System.Drawing.Size(70, 20); this.offsetBox.TabIndex = 19; // - // label8 + // offsetLabel // - this.label8.AutoSize = true; - this.label8.Location = new System.Drawing.Point(24, 197); - this.label8.Name = "label8"; - this.label8.Size = new System.Drawing.Size(35, 13); - this.label8.TabIndex = 20; - this.label8.Text = "Offset"; - this.label8.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + this.offsetLabel.AutoSize = true; + this.offsetLabel.Location = new System.Drawing.Point(24, 197); + this.offsetLabel.Name = "offsetLabel"; + this.offsetLabel.Size = new System.Drawing.Size(35, 13); + this.offsetLabel.TabIndex = 20; + this.offsetLabel.Text = "Offset"; + this.offsetLabel.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; // // writeButton // @@ -310,22 +310,22 @@ namespace grapher this.Controls.Add(this.capBoxY); this.Controls.Add(this.sensitivityBoxY); this.Controls.Add(this.writeButton); - this.Controls.Add(this.label8); + this.Controls.Add(this.offsetLabel); this.Controls.Add(this.offsetBox); this.Controls.Add(this.constantThreeLabel); this.Controls.Add(this.midpointBox); this.Controls.Add(this.constantTwoLabel); this.Controls.Add(this.limitBox); this.Controls.Add(this.weightBoxSecond); - this.Controls.Add(this.label5); + this.Controls.Add(this.weightLabel); this.Controls.Add(this.weightBoxFirst); - this.Controls.Add(this.label3); + this.Controls.Add(this.capLabel); this.Controls.Add(this.capBoxX); this.Controls.Add(this.constantOneLabel); this.Controls.Add(this.accelerationBox); - this.Controls.Add(this.label2); + this.Controls.Add(this.rotationLabel); this.Controls.Add(this.rotationBox); - this.Controls.Add(this.label1); + this.Controls.Add(this.sensitivityLabel); this.Controls.Add(this.sensitivityBoxX); this.Controls.Add(this.accelTypeDrop); this.Controls.Add(this.AccelerationChart); @@ -343,22 +343,22 @@ namespace grapher private System.Windows.Forms.DataVisualization.Charting.Chart AccelerationChart; private System.Windows.Forms.ComboBox accelTypeDrop; private System.Windows.Forms.TextBox sensitivityBoxX; - private System.Windows.Forms.Label label1; + private System.Windows.Forms.Label sensitivityLabel; private System.Windows.Forms.TextBox rotationBox; - private System.Windows.Forms.Label label2; + private System.Windows.Forms.Label rotationLabel; private System.Windows.Forms.TextBox accelerationBox; private System.Windows.Forms.Label constantOneLabel; private System.Windows.Forms.TextBox capBoxX; - private System.Windows.Forms.Label label3; + private System.Windows.Forms.Label capLabel; private System.Windows.Forms.TextBox weightBoxFirst; - private System.Windows.Forms.Label label5; + private System.Windows.Forms.Label weightLabel; private System.Windows.Forms.TextBox weightBoxSecond; private System.Windows.Forms.TextBox limitBox; private System.Windows.Forms.Label constantTwoLabel; private System.Windows.Forms.TextBox midpointBox; private System.Windows.Forms.Label constantThreeLabel; private System.Windows.Forms.TextBox offsetBox; - private System.Windows.Forms.Label label8; + private System.Windows.Forms.Label offsetLabel; private System.Windows.Forms.Button writeButton; private System.Windows.Forms.TextBox sensitivityBoxY; private System.Windows.Forms.TextBox capBoxY; -- cgit v1.2.3 From 498e5c1a2fabed3ba5f1c00768d7050c5738e76e Mon Sep 17 00:00:00 2001 From: Jacob Palecki Date: Fri, 31 Jul 2020 10:46:23 -0700 Subject: Small refactoring, use new struct to store magnitudes --- grapher/Form1.Designer.cs | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) (limited to 'grapher/Form1.Designer.cs') diff --git a/grapher/Form1.Designer.cs b/grapher/Form1.Designer.cs index decdeeb..4e89ca8 100644 --- a/grapher/Form1.Designer.cs +++ b/grapher/Form1.Designer.cs @@ -30,9 +30,9 @@ namespace grapher /// private void InitializeComponent() { - 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(); + System.Windows.Forms.DataVisualization.Charting.ChartArea chartArea2 = new System.Windows.Forms.DataVisualization.Charting.ChartArea(); + System.Windows.Forms.DataVisualization.Charting.Legend legend2 = new System.Windows.Forms.DataVisualization.Charting.Legend(); + System.Windows.Forms.DataVisualization.Charting.Series series2 = new System.Windows.Forms.DataVisualization.Charting.Series(); this.AccelerationChart = new System.Windows.Forms.DataVisualization.Charting.Chart(); this.accelTypeDrop = new System.Windows.Forms.ComboBox(); this.sensitivityBoxX = new System.Windows.Forms.TextBox(); @@ -64,19 +64,19 @@ namespace grapher // // AccelerationChart // - chartArea1.AxisX.Title = "Speed (counts/ms)"; - chartArea1.AxisY.Title = "Sensitivity (magnitude ratio)"; - chartArea1.Name = "ChartArea1"; - this.AccelerationChart.ChartAreas.Add(chartArea1); - legend1.Name = "Legend1"; - this.AccelerationChart.Legends.Add(legend1); + chartArea2.AxisX.Title = "Speed (counts/ms)"; + chartArea2.AxisY.Title = "Sensitivity (magnitude ratio)"; + chartArea2.Name = "ChartArea1"; + this.AccelerationChart.ChartAreas.Add(chartArea2); + legend2.Name = "Legend1"; + this.AccelerationChart.Legends.Add(legend2); this.AccelerationChart.Location = new System.Drawing.Point(242, 1); this.AccelerationChart.Name = "AccelerationChart"; - series1.ChartArea = "ChartArea1"; - series1.ChartType = System.Windows.Forms.DataVisualization.Charting.SeriesChartType.Line; - series1.Legend = "Legend1"; - series1.Name = "Accelerated Sensitivity"; - this.AccelerationChart.Series.Add(series1); + series2.ChartArea = "ChartArea1"; + series2.ChartType = System.Windows.Forms.DataVisualization.Charting.SeriesChartType.Line; + series2.Legend = "Legend1"; + series2.Name = "Accelerated Sensitivity"; + this.AccelerationChart.Series.Add(series2); this.AccelerationChart.Size = new System.Drawing.Size(721, 312); this.AccelerationChart.TabIndex = 0; this.AccelerationChart.Text = "chart1"; -- cgit v1.2.3 From 827f860b80b5195315ac5b2b8dffb32cf532e0d1 Mon Sep 17 00:00:00 2001 From: Jacob Palecki Date: Fri, 31 Jul 2020 10:56:26 -0700 Subject: Add class for storing settings from file --- grapher/Form1.Designer.cs | 1 - 1 file changed, 1 deletion(-) (limited to 'grapher/Form1.Designer.cs') diff --git a/grapher/Form1.Designer.cs b/grapher/Form1.Designer.cs index 4e89ca8..667abf1 100644 --- a/grapher/Form1.Designer.cs +++ b/grapher/Form1.Designer.cs @@ -155,7 +155,6 @@ namespace grapher this.capLabel.TabIndex = 11; this.capLabel.Text = "Cap"; this.capLabel.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; - this.capLabel.Click += new System.EventHandler(this.label3_Click); // // weightBoxFirst // -- cgit v1.2.3