Add alternate timescale units for seconds and millis

kmichaelfox · kmichaelfox · commit 096583bea94e · 2017-09-11T13:08:46.000-07:00
diff --git a/Source/Plugins/LfpDisplayNodeAlpha/LfpDisplayCanvas.cpp b/Source/Plugins/LfpDisplayNodeAlpha/LfpDisplayCanvas.cpp
@@ -1856,7 +1856,8 @@ void LfpTimescale::paint(Graphics& g)
 
     g.setColour(Colour(100,100,100));
 
-    g.drawText("ms:",5,0,100,getHeight(),Justification::left, false);
+    const String timeScaleUnitLabel = (timebase >= 2)?("s:"):("ms:");
+    g.drawText(timeScaleUnitLabel,5,0,100,getHeight(),Justification::left, false);
 
     const int steps = labels.size() + 1;
     for (int i = 1; i < steps; i++)
@@ -1961,7 +1962,7 @@ void LfpTimescale::setTimebase(float t)
     
     for (float i = labelIncrement; i < timebase; i += labelIncrement)
     {
-        String labelString = String(i * 1000.0f);
+        String labelString = String(i * ((timebase >= 2)?(1):(1000.0f)));
         labels.add(labelString.substring(0,6));
     }
 

Original file line number	Diff line number	Diff line change
`@@ -1856,7 +1856,8 @@ void LfpTimescale::paint(Graphics& g)`
`1856`	`1856`
`1857`	`1857`	`g.setColour(Colour(100,100,100));`
`1858`	`1858`
`1859`		`- g.drawText("ms:",5,0,100,getHeight(),Justification::left, false);`
	`1859`	`+ const String timeScaleUnitLabel = (timebase >= 2)?("s:"):("ms:");`
	`1860`	`+ g.drawText(timeScaleUnitLabel,5,0,100,getHeight(),Justification::left, false);`
`1860`	`1861`
`1861`	`1862`	`const int steps = labels.size() + 1;`
`1862`	`1863`	`for (int i = 1; i < steps; i++)`
`@@ -1961,7 +1962,7 @@ void LfpTimescale::setTimebase(float t)`
`1961`	`1962`
`1962`	`1963`	`for (float i = labelIncrement; i < timebase; i += labelIncrement)`
`1963`	`1964`	`{`
`1964`		`- String labelString = String(i * 1000.0f);`
	`1965`	`+ String labelString = String(i * ((timebase >= 2)?(1):(1000.0f)));`
`1965`	`1966`	`labels.add(labelString.substring(0,6));`
`1966`	`1967`	`}`
`1967`	`1968`