Merge branch 'KevinBoergens-master' into testing

aacuevas · aacuevas · commit 294aa10bf133 · 2018-09-17T06:13:56.000+02:00
diff --git a/Source/Plugins/RhythmNode/RHD2000Editor.cpp b/Source/Plugins/RhythmNode/RHD2000Editor.cpp
@@ -386,7 +386,7 @@ void FPGAchannelComponent::setImpedanceValues(float mag, float phase)
     if (impedance != nullptr)
     {
         if (mag > 10000)
-            impedance->setText(String(mag/1e6,2)+" mOhm, "+String((int)phase) + " deg",juce::NotificationType::dontSendNotification);
+            impedance->setText(String(mag/1e6,2)+" MOhm, "+String((int)phase) + " deg",juce::NotificationType::dontSendNotification);
         else if (mag > 1000)
             impedance->setText(String(mag/1e3,0)+" kOhm, "+String((int)phase) + " deg" ,juce::NotificationType::dontSendNotification);
         else

Original file line number	Diff line number	Diff line change
`@@ -386,7 +386,7 @@ void FPGAchannelComponent::setImpedanceValues(float mag, float phase)`
`386`	`386`	`if (impedance != nullptr)`
`387`	`387`	`{`
`388`	`388`	`if (mag > 10000)`
`389`		`- impedance->setText(String(mag/1e6,2)+" mOhm, "+String((int)phase) + " deg",juce::NotificationType::dontSendNotification);`
	`389`	`+ impedance->setText(String(mag/1e6,2)+" MOhm, "+String((int)phase) + " deg",juce::NotificationType::dontSendNotification);`
`390`	`390`	`else if (mag > 1000)`
`391`	`391`	`impedance->setText(String(mag/1e3,0)+" kOhm, "+String((int)phase) + " deg" ,juce::NotificationType::dontSendNotification);`
`392`	`392`	`else`