Updated Landing Form

CHANGED - Chart style now reflects the general color style used on the form CHANGED - Updated Assembly version
MarkoH17 · Apr 8, 2020 · bd2662c · bd2662c
1 parent db19ce4
commit bd2662c
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 10 deletions.
diff --git a/DataWrangler/Forms/Landing.Designer.cs b/DataWrangler/Forms/Landing.Designer.cs
diff --git a/DataWrangler/Forms/Landing.cs b/DataWrangler/Forms/Landing.cs
@@ -10,17 +10,16 @@
 using MetroFramework;
 using MetroFramework.Components;
 using MetroFramework.Controls;
+using MetroFramework.Drawing;
 using MetroFramework.Forms;
 
 namespace DataWrangler.Forms
 {
     public partial class Landing : MetroForm
     {
         private readonly MetroContextMenu _ctxMenuManage;
-        private readonly MetroToolTip _chartToolTip = new MetroToolTip();
         private readonly Dictionary<string, string> _dbSettings;
         private readonly UserAccount _user;
-        private Point? _chartPrevPosition = null;
 
         public Landing(Dictionary<string, string> dbSettings, UserAccount user)
         {
@@ -69,6 +68,8 @@ void AddPoint()
                     chartData.Series["Records By Type"].Points.Add(point);
                 }
 
+
+
                 if (statsBackgroundWorker != null && !statsBackgroundWorker.CancellationPending &&
                     !chartData.IsDisposed)
                     try
@@ -104,6 +105,7 @@ void SetSum()
                     try
                     {
                         lblRecCount.Invoke((Action) SetSum);
+                        statsBackgroundWorker.ReportProgress(90);
                         LoadChartData(recordCounts);
                         statsBackgroundWorker.ReportProgress(100);
                     }
@@ -213,7 +215,10 @@ private void StatsBackgroundWorkerOnProgressChanged(object sender, ProgressChang
                 spinner3.Visible = false;
             else if (e.ProgressPercentage == 40)
                 spinner2.Visible = false;
-            else if (e.ProgressPercentage == 100) spinner1.Visible = false;
+            else if (e.ProgressPercentage == 90)
+                spinner1.Visible = false;
+            else if (e.ProgressPercentage == 100)
+                chartData.Visible = true;
         }
 
         private void SwitchChartStyle()
@@ -228,6 +233,7 @@ private void SwitchChartStyle()
             chartData.ChartAreas[0].AxisY.MajorGrid.LineColor = foreColor;
             chartData.ChartAreas[0].AxisY.LabelStyle.ForeColor = foreColor;
             chartData.ChartAreas[0].AxisY.MajorTickMark.LineColor = foreColor;
+            chartData.Series[0].Color = MetroPaint.GetStyleColor(Style);
         }
 
         public void SwitchFormStyle()

diff --git a/DataWrangler/Properties/AssemblyInfo.cs b/DataWrangler/Properties/AssemblyInfo.cs
@@ -31,5 +31,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.1")]
-[assembly: AssemblyFileVersion("1.0.1")]
+[assembly: AssemblyVersion("1.0.2")]
+[assembly: AssemblyFileVersion("1.0.2")]