From 265fd20d7c367f6441490e1fb4d7b3b9554f4c52 Mon Sep 17 00:00:00 2001 From: jsiegle <joshs@alleninstitute.org> Date: Mon, 27 Oct 2014 14:35:33 -0700 Subject: [PATCH] Change default display settings for LfpDisplayCanvas --- .../Processors/LfpDisplayNode/LfpDisplayCanvas.cpp | 12 ++++++------ Source/Processors/RecordNode/RecordNode.cpp | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Source/Processors/LfpDisplayNode/LfpDisplayCanvas.cpp b/Source/Processors/LfpDisplayNode/LfpDisplayCanvas.cpp index c49e4b7d2..1540782c3 100755 --- a/Source/Processors/LfpDisplayNode/LfpDisplayCanvas.cpp +++ b/Source/Processors/LfpDisplayNode/LfpDisplayCanvas.cpp @@ -114,7 +114,7 @@ LfpDisplayCanvas::LfpDisplayCanvas(LfpDisplayNode* processor_) : voltageRanges[ADC_CHANNEL].add("2.0"); voltageRanges[ADC_CHANNEL].add("5.0"); voltageRanges[ADC_CHANNEL].add("10.0"); - selectedVoltageRange[ADC_CHANNEL] = 4; + selectedVoltageRange[ADC_CHANNEL] = 8; rangeGain[ADC_CHANNEL] = 1; //V rangeSteps[ADC_CHANNEL] = 0.1; //in V rangeUnits.add("V"); @@ -133,8 +133,8 @@ LfpDisplayCanvas::LfpDisplayCanvas(LfpDisplayNode* processor_) : timebases.add("5.0"); timebases.add("10.0"); timebases.add("20.0"); - selectedTimebase=2; - selectedTimebaseValue=timebases[selectedTimebase-1]; + selectedTimebase = 4; + selectedTimebaseValue = timebases[selectedTimebase-1]; spreads.add("10"); spreads.add("20"); @@ -147,7 +147,7 @@ LfpDisplayCanvas::LfpDisplayCanvas(LfpDisplayNode* processor_) : spreads.add("90"); spreads.add("100"); selectedSpread = 5; - selectedSpreadValue=spreads[selectedSpread-1]; + selectedSpreadValue = spreads[selectedSpread-1]; colorGroupings.add("1"); colorGroupings.add("2"); @@ -1406,7 +1406,7 @@ void LfpDisplay::toggleSingleChannel(int chan) setChannelHeight(newHeight, false); setSize(getWidth(), numChans*getChannelHeight()); viewport->setScrollBarsShown(false,false); - //viewport->setViewPosition(Point<int>(0,chan*newHeight)); + viewport->setViewPosition(Point<int>(0,chan*newHeight)); for (int n = 0; n < numChans; n++) { if (n != chan) channelInfo[n]->setEnabledState(false); @@ -1984,4 +1984,4 @@ void LfpViewport::visibleAreaChanged(const Rectangle<int>& newVisibleArea) { canvas->fullredraw = true; canvas->refresh(); -} +} diff --git a/Source/Processors/RecordNode/RecordNode.cpp b/Source/Processors/RecordNode/RecordNode.cpp index 1fb823f7c..26ef2deb9 100755 --- a/Source/Processors/RecordNode/RecordNode.cpp +++ b/Source/Processors/RecordNode/RecordNode.cpp @@ -422,7 +422,7 @@ void RecordNode::handleEvent(int eventType, MidiMessage& event, int samplePositi { const uint8* dataptr = event.getRawData(); - // // double-check buffer contents:s + // // double-check buffer contents: // std::cout << (int) *(dataptr + 11) << " " << // (int) *(dataptr + 10) << " " << // (int) *(dataptr + 9) << " " << -- GitLab