Merge remote-tracking branch 'upstream/master'

aacuevas · aacuevas · commit 389d75a2e7e6 · 2016-03-01T17:20:50.000+01:00
diff --git a/Source/Plugins/LfpDisplayNode/LfpDisplayCanvas.cpp b/Source/Plugins/LfpDisplayNode/LfpDisplayCanvas.cpp
@@ -576,7 +576,8 @@ void LfpDisplayCanvas::comboBoxChanged(ComboBox* cb)
 
 int LfpDisplayCanvas::getChannelHeight()
 {
-    return spreads[spreadSelection->getSelectedId()-1].getIntValue();
+    //return spreads[spreadSelection->getSelectedId()-1].getIntValue(); // is not set correctly after the mouse wheel was used to change hieghts
+    return (int)spreadSelection->getText().getIntValue(); // instead, get value from textbox directly
 }
 
 

Original file line number	Diff line number	Diff line change
`@@ -576,7 +576,8 @@ void LfpDisplayCanvas::comboBoxChanged(ComboBox* cb)`
`576`	`576`
`577`	`577`	`int LfpDisplayCanvas::getChannelHeight()`
`578`	`578`	`{`
`579`		`- return spreads[spreadSelection->getSelectedId()-1].getIntValue();`
	`579`	`+ //return spreads[spreadSelection->getSelectedId()-1].getIntValue(); // is not set correctly after the mouse wheel was used to change hieghts`
	`580`	`+ return (int)spreadSelection->getText().getIntValue(); // instead, get value from textbox directly`
`580`	`581`	`}`
`581`	`582`
`582`	`583`