Skip to content
This repository was archived by the owner on May 2, 2023. It is now read-only.

Commit bd2662c

Browse files
committed
Updated Landing Form
CHANGED - Chart style now reflects the general color style used on the form CHANGED - Updated Assembly version
1 parent db19ce4 commit bd2662c

File tree

3 files changed

+17
-10
lines changed

3 files changed

+17
-10
lines changed

DataWrangler/Forms/Landing.Designer.cs

Lines changed: 6 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

DataWrangler/Forms/Landing.cs

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,17 +10,16 @@
1010
using MetroFramework;
1111
using MetroFramework.Components;
1212
using MetroFramework.Controls;
13+
using MetroFramework.Drawing;
1314
using MetroFramework.Forms;
1415

1516
namespace DataWrangler.Forms
1617
{
1718
public partial class Landing : MetroForm
1819
{
1920
private readonly MetroContextMenu _ctxMenuManage;
20-
private readonly MetroToolTip _chartToolTip = new MetroToolTip();
2121
private readonly Dictionary<string, string> _dbSettings;
2222
private readonly UserAccount _user;
23-
private Point? _chartPrevPosition = null;
2423

2524
public Landing(Dictionary<string, string> dbSettings, UserAccount user)
2625
{
@@ -69,6 +68,8 @@ void AddPoint()
6968
chartData.Series["Records By Type"].Points.Add(point);
7069
}
7170

71+
72+
7273
if (statsBackgroundWorker != null && !statsBackgroundWorker.CancellationPending &&
7374
!chartData.IsDisposed)
7475
try
@@ -104,6 +105,7 @@ void SetSum()
104105
try
105106
{
106107
lblRecCount.Invoke((Action) SetSum);
108+
statsBackgroundWorker.ReportProgress(90);
107109
LoadChartData(recordCounts);
108110
statsBackgroundWorker.ReportProgress(100);
109111
}
@@ -213,7 +215,10 @@ private void StatsBackgroundWorkerOnProgressChanged(object sender, ProgressChang
213215
spinner3.Visible = false;
214216
else if (e.ProgressPercentage == 40)
215217
spinner2.Visible = false;
216-
else if (e.ProgressPercentage == 100) spinner1.Visible = false;
218+
else if (e.ProgressPercentage == 90)
219+
spinner1.Visible = false;
220+
else if (e.ProgressPercentage == 100)
221+
chartData.Visible = true;
217222
}
218223

219224
private void SwitchChartStyle()
@@ -228,6 +233,7 @@ private void SwitchChartStyle()
228233
chartData.ChartAreas[0].AxisY.MajorGrid.LineColor = foreColor;
229234
chartData.ChartAreas[0].AxisY.LabelStyle.ForeColor = foreColor;
230235
chartData.ChartAreas[0].AxisY.MajorTickMark.LineColor = foreColor;
236+
chartData.Series[0].Color = MetroPaint.GetStyleColor(Style);
231237
}
232238

233239
public void SwitchFormStyle()

DataWrangler/Properties/AssemblyInfo.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,5 +31,5 @@
3131
// You can specify all the values or you can default the Build and Revision Numbers
3232
// by using the '*' as shown below:
3333
// [assembly: AssemblyVersion("1.0.*")]
34-
[assembly: AssemblyVersion("1.0.1")]
35-
[assembly: AssemblyFileVersion("1.0.1")]
34+
[assembly: AssemblyVersion("1.0.2")]
35+
[assembly: AssemblyFileVersion("1.0.2")]

0 commit comments

Comments
 (0)