diff options
| -rw-r--r-- | grapher/Constants/Constants.cs | 4 | ||||
| -rw-r--r-- | grapher/Form1.Designer.cs | 212 | ||||
| -rw-r--r-- | grapher/Form1.cs | 12 | ||||
| -rw-r--r-- | grapher/Models/Serialized/RawAccelSettings.cs | 8 |
4 files changed, 118 insertions, 118 deletions
diff --git a/grapher/Constants/Constants.cs b/grapher/Constants/Constants.cs index 5a05863..c207b6d 100644 --- a/grapher/Constants/Constants.cs +++ b/grapher/Constants/Constants.cs @@ -84,10 +84,10 @@ namespace grapher /// <summary> Default text to be displayed on write button. </summary> public const string WriteButtonDefaultText = "Apply"; - /// <summary> Default text to be displayed on write button. </summary> + /// <summary> Default text to be displayed on toggle button. </summary> public const string ToggleButtonDefaultText = "Toggle"; - /// <summary> Default text to be displayed on write button. </summary> + /// <summary> Default text to be displayed on button delay. </summary> public const string ButtonDelayText = "Delay"; /// <summary> Title of sensitivity chart. </summary> diff --git a/grapher/Form1.Designer.cs b/grapher/Form1.Designer.cs index c6221b0..a6ae754 100644 --- a/grapher/Form1.Designer.cs +++ b/grapher/Form1.Designer.cs @@ -70,7 +70,7 @@ namespace grapher System.Windows.Forms.DataVisualization.Charting.Series series21 = new System.Windows.Forms.DataVisualization.Charting.Series(); System.Windows.Forms.DataVisualization.Charting.Title title6 = new System.Windows.Forms.DataVisualization.Charting.Title(); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(RawAcceleration)); - this.panel1 = new System.Windows.Forms.Panel(); + this.optionsPanel = new System.Windows.Forms.Panel(); this.toggleButton = new System.Windows.Forms.CheckBox(); this.scaleLabelY = new System.Windows.Forms.Label(); this.ScaleActiveYLabel = new System.Windows.Forms.Label(); @@ -161,16 +161,16 @@ namespace grapher this.toolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem(); this.wholeVectorToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.byVectorComponentToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.panel2 = new System.Windows.Forms.Panel(); + this.chartsPanel = new System.Windows.Forms.Panel(); this.GainChartY = new System.Windows.Forms.DataVisualization.Charting.Chart(); this.VelocityChartY = new System.Windows.Forms.DataVisualization.Charting.Chart(); this.AccelerationChartY = new System.Windows.Forms.DataVisualization.Charting.Chart(); this.GainChart = new System.Windows.Forms.DataVisualization.Charting.Chart(); this.VelocityChart = new System.Windows.Forms.DataVisualization.Charting.Chart(); this.AccelerationChart = new System.Windows.Forms.DataVisualization.Charting.Chart(); - this.panel1.SuspendLayout(); + this.optionsPanel.SuspendLayout(); this.menuStrip1.SuspendLayout(); - this.panel2.SuspendLayout(); + this.chartsPanel.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.GainChartY)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.VelocityChartY)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.AccelerationChartY)).BeginInit(); @@ -179,87 +179,87 @@ namespace grapher ((System.ComponentModel.ISupportInitialize)(this.AccelerationChart)).BeginInit(); this.SuspendLayout(); // - // panel1 - // - this.panel1.AutoSize = true; - this.panel1.Controls.Add(this.toggleButton); - this.panel1.Controls.Add(this.scaleLabelY); - this.panel1.Controls.Add(this.ScaleActiveYLabel); - this.panel1.Controls.Add(this.scaleBoxY); - this.panel1.Controls.Add(this.ScaleActiveXLabel); - this.panel1.Controls.Add(this.scaleLabelX); - this.panel1.Controls.Add(this.scaleBoxX); - this.panel1.Controls.Add(this.expLabelY); - this.panel1.Controls.Add(this.ExpActiveYLabel); - this.panel1.Controls.Add(this.expBoxY); - this.panel1.Controls.Add(this.ExpActiveXLabel); - this.panel1.Controls.Add(this.expLabelX); - this.panel1.Controls.Add(this.expBoxX); - this.panel1.Controls.Add(this.ActiveValueTitleY); - this.panel1.Controls.Add(this.AccelTypeActiveLabelY); - this.panel1.Controls.Add(this.OptionSetYTitle); - this.panel1.Controls.Add(this.OptionSetXTitle); - this.panel1.Controls.Add(this.constantThreeLabelY); - this.panel1.Controls.Add(this.limitLabelY); - this.panel1.Controls.Add(this.offsetLabelY); - this.panel1.Controls.Add(this.weightLabelY); - this.panel1.Controls.Add(this.capLabelY); - this.panel1.Controls.Add(this.constantOneLabelY); - this.panel1.Controls.Add(this.ByComponentXYLock); - this.panel1.Controls.Add(this.MidpointActiveYLabel); - this.panel1.Controls.Add(this.LimitActiveYLabel); - this.panel1.Controls.Add(this.OffsetActiveYLabel); - this.panel1.Controls.Add(this.AccelerationActiveLabelY); - this.panel1.Controls.Add(this.accelTypeDropY); - this.panel1.Controls.Add(this.midpointBoxY); - this.panel1.Controls.Add(this.limitBoxY); - this.panel1.Controls.Add(this.offsetBoxY); - this.panel1.Controls.Add(this.accelerationBoxY); - this.panel1.Controls.Add(this.MidpointActiveXLabel); - this.panel1.Controls.Add(this.LimitActiveXLabel); - this.panel1.Controls.Add(this.OffsetActiveXLabel); - this.panel1.Controls.Add(this.CapActiveYLabel); - this.panel1.Controls.Add(this.WeightActiveYLabel); - this.panel1.Controls.Add(this.WeightActiveXLabel); - this.panel1.Controls.Add(this.CapActiveXLabel); - this.panel1.Controls.Add(this.AccelerationActiveLabelX); - this.panel1.Controls.Add(this.AccelTypeActiveLabelX); - this.panel1.Controls.Add(this.RotationActiveLabel); - this.panel1.Controls.Add(this.SensitivityActiveYLabel); - this.panel1.Controls.Add(this.SensitivityActiveXLabel); - this.panel1.Controls.Add(this.ActiveValueTitle); - this.panel1.Controls.Add(this.MouseLabel); - this.panel1.Controls.Add(this.LockXYLabel); - this.panel1.Controls.Add(this.sensXYLock); - this.panel1.Controls.Add(this.capBoxY); - this.panel1.Controls.Add(this.sensitivityBoxY); - this.panel1.Controls.Add(this.writeButton); - this.panel1.Controls.Add(this.offsetLabelX); - this.panel1.Controls.Add(this.offsetBoxX); - this.panel1.Controls.Add(this.constantThreeLabelX); - this.panel1.Controls.Add(this.midpointBoxX); - this.panel1.Controls.Add(this.limitLabelX); - this.panel1.Controls.Add(this.limitBoxX); - this.panel1.Controls.Add(this.weightBoxY); - this.panel1.Controls.Add(this.weightLabelX); - this.panel1.Controls.Add(this.weightBoxX); - this.panel1.Controls.Add(this.capLabelX); - this.panel1.Controls.Add(this.capBoxX); - this.panel1.Controls.Add(this.constantOneLabelX); - this.panel1.Controls.Add(this.accelerationBoxX); - this.panel1.Controls.Add(this.rotationLabel); - this.panel1.Controls.Add(this.rotationBox); - this.panel1.Controls.Add(this.sensitivityLabel); - this.panel1.Controls.Add(this.sensitivityBoxX); - this.panel1.Controls.Add(this.accelTypeDropX); - this.panel1.Controls.Add(this.menuStrip1); - this.panel1.Dock = System.Windows.Forms.DockStyle.Left; - this.panel1.Location = new System.Drawing.Point(0, 0); - this.panel1.MinimumSize = new System.Drawing.Size(2, 333); - this.panel1.Name = "panel1"; - this.panel1.Size = new System.Drawing.Size(483, 956); - this.panel1.TabIndex = 34; - this.panel1.Paint += new System.Windows.Forms.PaintEventHandler(this.panel1_Paint); + // optionsPanel + // + this.optionsPanel.AutoSize = true; + this.optionsPanel.Controls.Add(this.toggleButton); + this.optionsPanel.Controls.Add(this.scaleLabelY); + this.optionsPanel.Controls.Add(this.ScaleActiveYLabel); + this.optionsPanel.Controls.Add(this.scaleBoxY); + this.optionsPanel.Controls.Add(this.ScaleActiveXLabel); + this.optionsPanel.Controls.Add(this.scaleLabelX); + this.optionsPanel.Controls.Add(this.scaleBoxX); + this.optionsPanel.Controls.Add(this.expLabelY); + this.optionsPanel.Controls.Add(this.ExpActiveYLabel); + this.optionsPanel.Controls.Add(this.expBoxY); + this.optionsPanel.Controls.Add(this.ExpActiveXLabel); + this.optionsPanel.Controls.Add(this.expLabelX); + this.optionsPanel.Controls.Add(this.expBoxX); + this.optionsPanel.Controls.Add(this.ActiveValueTitleY); + this.optionsPanel.Controls.Add(this.AccelTypeActiveLabelY); + this.optionsPanel.Controls.Add(this.OptionSetYTitle); + this.optionsPanel.Controls.Add(this.OptionSetXTitle); + this.optionsPanel.Controls.Add(this.constantThreeLabelY); + this.optionsPanel.Controls.Add(this.limitLabelY); + this.optionsPanel.Controls.Add(this.offsetLabelY); + this.optionsPanel.Controls.Add(this.weightLabelY); + this.optionsPanel.Controls.Add(this.capLabelY); + this.optionsPanel.Controls.Add(this.constantOneLabelY); + this.optionsPanel.Controls.Add(this.ByComponentXYLock); + this.optionsPanel.Controls.Add(this.MidpointActiveYLabel); + this.optionsPanel.Controls.Add(this.LimitActiveYLabel); + this.optionsPanel.Controls.Add(this.OffsetActiveYLabel); + this.optionsPanel.Controls.Add(this.AccelerationActiveLabelY); + this.optionsPanel.Controls.Add(this.accelTypeDropY); + this.optionsPanel.Controls.Add(this.midpointBoxY); + this.optionsPanel.Controls.Add(this.limitBoxY); + this.optionsPanel.Controls.Add(this.offsetBoxY); + this.optionsPanel.Controls.Add(this.accelerationBoxY); + this.optionsPanel.Controls.Add(this.MidpointActiveXLabel); + this.optionsPanel.Controls.Add(this.LimitActiveXLabel); + this.optionsPanel.Controls.Add(this.OffsetActiveXLabel); + this.optionsPanel.Controls.Add(this.CapActiveYLabel); + this.optionsPanel.Controls.Add(this.WeightActiveYLabel); + this.optionsPanel.Controls.Add(this.WeightActiveXLabel); + this.optionsPanel.Controls.Add(this.CapActiveXLabel); + this.optionsPanel.Controls.Add(this.AccelerationActiveLabelX); + this.optionsPanel.Controls.Add(this.AccelTypeActiveLabelX); + this.optionsPanel.Controls.Add(this.RotationActiveLabel); + this.optionsPanel.Controls.Add(this.SensitivityActiveYLabel); + this.optionsPanel.Controls.Add(this.SensitivityActiveXLabel); + this.optionsPanel.Controls.Add(this.ActiveValueTitle); + this.optionsPanel.Controls.Add(this.MouseLabel); + this.optionsPanel.Controls.Add(this.LockXYLabel); + this.optionsPanel.Controls.Add(this.sensXYLock); + this.optionsPanel.Controls.Add(this.capBoxY); + this.optionsPanel.Controls.Add(this.sensitivityBoxY); + this.optionsPanel.Controls.Add(this.writeButton); + this.optionsPanel.Controls.Add(this.offsetLabelX); + this.optionsPanel.Controls.Add(this.offsetBoxX); + this.optionsPanel.Controls.Add(this.constantThreeLabelX); + this.optionsPanel.Controls.Add(this.midpointBoxX); + this.optionsPanel.Controls.Add(this.limitLabelX); + this.optionsPanel.Controls.Add(this.limitBoxX); + this.optionsPanel.Controls.Add(this.weightBoxY); + this.optionsPanel.Controls.Add(this.weightLabelX); + this.optionsPanel.Controls.Add(this.weightBoxX); + this.optionsPanel.Controls.Add(this.capLabelX); + this.optionsPanel.Controls.Add(this.capBoxX); + this.optionsPanel.Controls.Add(this.constantOneLabelX); + this.optionsPanel.Controls.Add(this.accelerationBoxX); + this.optionsPanel.Controls.Add(this.rotationLabel); + this.optionsPanel.Controls.Add(this.rotationBox); + this.optionsPanel.Controls.Add(this.sensitivityLabel); + this.optionsPanel.Controls.Add(this.sensitivityBoxX); + this.optionsPanel.Controls.Add(this.accelTypeDropX); + this.optionsPanel.Controls.Add(this.menuStrip1); + this.optionsPanel.Dock = System.Windows.Forms.DockStyle.Left; + this.optionsPanel.Location = new System.Drawing.Point(0, 0); + this.optionsPanel.MinimumSize = new System.Drawing.Size(2, 333); + this.optionsPanel.Name = "optionsPanel"; + this.optionsPanel.Size = new System.Drawing.Size(483, 956); + this.optionsPanel.TabIndex = 34; + this.optionsPanel.Paint += new System.Windows.Forms.PaintEventHandler(this.optionsPanel_Paint); // // toggleButton // @@ -1027,20 +1027,20 @@ namespace grapher this.byVectorComponentToolStripMenuItem.Size = new System.Drawing.Size(154, 22); this.byVectorComponentToolStripMenuItem.Text = "By Component"; // - // panel2 - // - this.panel2.AutoScroll = true; - this.panel2.Controls.Add(this.GainChartY); - this.panel2.Controls.Add(this.VelocityChartY); - this.panel2.Controls.Add(this.AccelerationChartY); - this.panel2.Controls.Add(this.GainChart); - this.panel2.Controls.Add(this.VelocityChart); - this.panel2.Controls.Add(this.AccelerationChart); - this.panel2.Dock = System.Windows.Forms.DockStyle.Fill; - this.panel2.Location = new System.Drawing.Point(483, 0); - this.panel2.Name = "panel2"; - this.panel2.Size = new System.Drawing.Size(1401, 956); - this.panel2.TabIndex = 35; + // chartsPanel + // + this.chartsPanel.AutoScroll = true; + this.chartsPanel.Controls.Add(this.GainChartY); + this.chartsPanel.Controls.Add(this.VelocityChartY); + this.chartsPanel.Controls.Add(this.AccelerationChartY); + this.chartsPanel.Controls.Add(this.GainChart); + this.chartsPanel.Controls.Add(this.VelocityChart); + this.chartsPanel.Controls.Add(this.AccelerationChart); + this.chartsPanel.Dock = System.Windows.Forms.DockStyle.Fill; + this.chartsPanel.Location = new System.Drawing.Point(483, 0); + this.chartsPanel.Name = "chartsPanel"; + this.chartsPanel.Size = new System.Drawing.Size(1401, 956); + this.chartsPanel.TabIndex = 35; // // GainChartY // @@ -1284,18 +1284,18 @@ namespace grapher this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.ClientSize = new System.Drawing.Size(1884, 956); - this.Controls.Add(this.panel2); - this.Controls.Add(this.panel1); + this.Controls.Add(this.chartsPanel); + this.Controls.Add(this.optionsPanel); this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); this.Name = "RawAcceleration"; this.Text = "Raw Accel"; this.Load += new System.EventHandler(this.Form1_Load); this.Paint += new System.Windows.Forms.PaintEventHandler(this.RawAcceleration_Paint); - this.panel1.ResumeLayout(false); - this.panel1.PerformLayout(); + this.optionsPanel.ResumeLayout(false); + this.optionsPanel.PerformLayout(); this.menuStrip1.ResumeLayout(false); this.menuStrip1.PerformLayout(); - this.panel2.ResumeLayout(false); + this.chartsPanel.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.GainChartY)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.VelocityChartY)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.AccelerationChartY)).EndInit(); @@ -1308,7 +1308,7 @@ namespace grapher } #endregion - private System.Windows.Forms.Panel panel1; + private System.Windows.Forms.Panel optionsPanel; private System.Windows.Forms.CheckBox toggleButton; private System.Windows.Forms.Label scaleLabelY; private System.Windows.Forms.Label ScaleActiveYLabel; @@ -1399,7 +1399,7 @@ namespace grapher private System.Windows.Forms.ToolStripMenuItem toolStripMenuItem1; private System.Windows.Forms.ToolStripMenuItem wholeVectorToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem byVectorComponentToolStripMenuItem; - private System.Windows.Forms.Panel panel2; + private System.Windows.Forms.Panel chartsPanel; private System.Windows.Forms.DataVisualization.Charting.Chart GainChartY; private System.Windows.Forms.DataVisualization.Charting.Chart VelocityChartY; private System.Windows.Forms.DataVisualization.Charting.Chart AccelerationChartY; diff --git a/grapher/Form1.cs b/grapher/Form1.cs index a0d2fae..446618b 100644 --- a/grapher/Form1.cs +++ b/grapher/Form1.cs @@ -157,20 +157,20 @@ namespace grapher public void ResetAutoScroll() { - panel2.AutoScrollPosition = Constants.Origin; + chartsPanel.AutoScrollPosition = Constants.Origin; } public void DoResize() { ResetAutoScroll(); - var wa = Screen.PrimaryScreen.WorkingArea; - var pref2 = panel2.GetPreferredSize(Constants.MaxSize); + var workingArea = Screen.PrimaryScreen.WorkingArea; + var chartsPreferredSize = chartsPanel.GetPreferredSize(Constants.MaxSize); Size = new Size { - Width = Math.Min(wa.Width - Location.X, panel1.Size.Width + pref2.Width), - Height = Math.Min(wa.Height - Location.Y, pref2.Height + 48) + Width = Math.Min(workingArea.Width - Location.X, optionsPanel.Size.Width + chartsPreferredSize.Width), + Height = Math.Min(workingArea.Height - Location.Y, chartsPreferredSize.Height + 48) }; } @@ -181,7 +181,7 @@ namespace grapher #endregion Method - private void panel1_Paint(object sender, PaintEventArgs e) + private void optionsPanel_Paint(object sender, PaintEventArgs e) { } diff --git a/grapher/Models/Serialized/RawAccelSettings.cs b/grapher/Models/Serialized/RawAccelSettings.cs index e0362ff..818bfb6 100644 --- a/grapher/Models/Serialized/RawAccelSettings.cs +++ b/grapher/Models/Serialized/RawAccelSettings.cs @@ -55,16 +55,16 @@ namespace grapher.Models.Serialized { RawAccelSettings settings = null; - JObject jo = JObject.Parse(File.ReadAllText(file)); - if (jo.ContainsKey(DriverSettings.Key)) + JObject settingsJObject = JObject.Parse(File.ReadAllText(file)); + if (settingsJObject.ContainsKey(DriverSettings.Key)) { - settings = jo.ToObject<RawAccelSettings>(JsonSerializer.Create(SerializerSettings)); + settings = settingsJObject.ToObject<RawAccelSettings>(JsonSerializer.Create(SerializerSettings)); } else { settings = new RawAccelSettings { - AccelerationSettings = jo.ToObject<DriverSettings>(), + AccelerationSettings = settingsJObject.ToObject<DriverSettings>(), GUISettings = DefaultGUISettingsSupplier() }; } |