Skip to content

Commit e2fc7ec

Browse files
author
JongChern
committed
update, ecgtohr combobox and window size adjustment for linux
1 parent 2101770 commit e2fc7ec

File tree

2 files changed

+250
-140
lines changed

2 files changed

+250
-140
lines changed

ShimmerCapture/Control.cs

Lines changed: 17 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -201,6 +201,13 @@ private void ControlForm_Load(object sender, EventArgs e)
201201

202202
this.Resize += new System.EventHandler(this.FormResize);
203203

204+
if (usingLinux)
205+
{
206+
ZedGraphControl1.Size = new System.Drawing.Size(this.Size.Width - 1000, ZedGraphControl1.Size.Height);
207+
ZedGraphControl2.Size = new System.Drawing.Size(this.Size.Width - 1000, ZedGraphControl2.Size.Height);
208+
ZedGraphControl3.Size = new System.Drawing.Size(this.Size.Width - 1000, ZedGraphControl3.Size.Height);
209+
}
210+
204211
CheckBoxArrayGroup1 = new CheckBox[30] { checkBox1, checkBox2, checkBox3, checkBox4, checkBox5, checkBox6,
205212
checkBox7, checkBox8, checkBox9, checkBox10, checkBox11, checkBox12, checkBox13, checkBox14,
206213
checkBox15, checkBox16, checkBox17, checkBox18, checkBox19, checkBox20, checkBox21,
@@ -348,11 +355,13 @@ private void FormResize(object sender, EventArgs e)
348355
int scale3 = 400;
349356
if (usingLinux)
350357
{
358+
System.Console.WriteLine("Using Linux");
351359
scale1 = 400;
352360
scale2 = 195;
353361
scale3 = 450;
354362
}
355363

364+
System.Console.WriteLine("FORM RESIZE");
356365
/*
357366
for (int i = 0; i < 30; i++)
358367
{
@@ -369,10 +378,10 @@ private void FormResize(object sender, EventArgs e)
369378
CheckBoxArrayGroup3[i].Location = new System.Drawing.Point(this.Size.Width - scale2, CheckBoxArrayGroup3[i].Location.Y);
370379
}
371380
}
372-
*/
373-
//ZedGraphControl1.Size = new System.Drawing.Size(this.Size.Width - scale3, ZedGraphControl1.Size.Height);
374-
//ZedGraphControl2.Size = new System.Drawing.Size(this.Size.Width - scale3, ZedGraphControl2.Size.Height);
375-
//ZedGraphControl3.Size = new System.Drawing.Size(this.Size.Width - scale3, ZedGraphControl3.Size.Height);
381+
382+
ZedGraphControl1.Size = new System.Drawing.Size(this.Size.Width - scale3, ZedGraphControl1.Size.Height);
383+
ZedGraphControl2.Size = new System.Drawing.Size(this.Size.Width - scale3, ZedGraphControl2.Size.Height);
384+
ZedGraphControl3.Size = new System.Drawing.Size(this.Size.Width - scale3, ZedGraphControl3.Size.Height);*/
376385
}
377386

378387
private void CheckBoxArrayGroup1_CheckedChanged(object sender, EventArgs e)
@@ -1004,6 +1013,7 @@ public void DrawingData(string[] signalName, string[] formats, double[] data)
10041013

10051014
if (usingLinux)
10061015
{
1016+
System.Console.WriteLine("Using Linux");
10071017
factor = 500;
10081018
}
10091019

@@ -1035,6 +1045,7 @@ public void DrawingData(string[] signalName, string[] formats, double[] data)
10351045
}
10361046
if (usingLinux)
10371047
{
1048+
System.Console.WriteLine("Using Linux");
10381049
factor = 250;
10391050
}
10401051
if (CountXAxisDataPoints % factor == 0)
@@ -1065,6 +1076,7 @@ public void DrawingData(string[] signalName, string[] formats, double[] data)
10651076
}
10661077
if (usingLinux)
10671078
{
1079+
System.Console.WriteLine("Using Linux");
10681080
factor = 100;
10691081
}
10701082
if (CountXAxisDataPoints % factor == 0)
@@ -1095,6 +1107,7 @@ public void DrawingData(string[] signalName, string[] formats, double[] data)
10951107
}
10961108
if (usingLinux)
10971109
{
1110+
System.Console.WriteLine("Using Linux");
10981111
factor = 50;
10991112
}
11001113
if (CountXAxisDataPoints % factor == 0)

0 commit comments

Comments
 (0)