@@ -193,7 +193,9 @@ LfpDisplayCanvas::LfpDisplayCanvas(LfpDisplayNode* processor_) :
193193 saturationThresholds.add (" 100" );
194194 saturationThresholds.add (" 1000" );
195195 saturationThresholds.add (" 5000" );
196- selectedSaturation = 3 ;
196+ saturationThresholds.add (" 6389" );
197+
198+ selectedSaturation = 5 ;
197199 selectedSaturationValue = saturationThresholds[selectedSaturation-1 ];
198200
199201
@@ -639,8 +641,8 @@ void LfpDisplayCanvas::comboBoxChanged(ComboBox* cb)
639641 }
640642 else if (vRange > voltageRanges[selectedChannelType][voltageRanges[selectedChannelType].size ()-1 ].getFloatValue ())
641643 {
642- cb->setSelectedId (voltageRanges[selectedChannelType].size (),dontSendNotification);
643- vRange = voltageRanges[selectedChannelType][voltageRanges[selectedChannelType].size ()-1 ].getFloatValue ();
644+ // cb->setSelectedId(voltageRanges[selectedChannelType].size(),dontSendNotification);
645+ // vRange = voltageRanges[selectedChannelType][voltageRanges[selectedChannelType].size()-1].getFloatValue();
644646 }
645647 else
646648 {
@@ -718,17 +720,18 @@ void LfpDisplayCanvas::comboBoxChanged(ComboBox* cb)
718720 }
719721 else
720722 {
721- float selectedSaturationValueFloat = cb->getText ().getFloatValue ();
723+ selectedSaturationValueFloat = cb->getText ().getFloatValue ();
722724 if (selectedSaturationValueFloat)
723725 {
726+ std::cout << " Setting saturation warning to to " << selectedSaturationValueFloat << std::endl;
724727 if (selectedSaturationValueFloat < 0 )
725728 {
726729 cb->setSelectedId (1 ,dontSendNotification);
727730 selectedSaturationValueFloat = saturationThresholds[0 ].getFloatValue ();
728731 }
729732 else
730733 {
731- cb->setText (String (selectedSaturationValueFloat),dontSendNotification);
734+ // cb->setText(String(selectedSaturationValueFloat),dontSendNotification);
732735 }
733736 }
734737 else
@@ -738,9 +741,9 @@ void LfpDisplayCanvas::comboBoxChanged(ComboBox* cb)
738741
739742 }
740743 }
741- selectedSpread = cb->getSelectedId ();
742- selectedSpreadValue = cb->getText ();
743- lfpDisplay->setChannelHeight ( lfpDisplay->getChannelHeight ());
744+ // selectedSpread = cb->getSelectedId();
745+ // selectedSpreadValue = cb->getText();
746+ // lfpDisplay->setChannelHeight( lfpDisplay->getChannelHeight());
744747 fullredraw = true ; // issue full redraw
745748 repaint ();
746749 refresh ();
@@ -1007,7 +1010,7 @@ void LfpDisplayCanvas::updateScreenBuffer()
10071010
10081011 if (nextpix <= dbi) { // at the end of the displaybuffer, this can occur and it causes the display to miss one pixel woth of sample - this circumvents that
10091012 // std::cout << "np " ;
1010- nextpix=dbi+ 1 ;
1013+ nextpix=dbi;
10111014 }
10121015
10131016 for (int j = dbi; j <= nextpix; j++)
0 commit comments