From 295b67895ca2df2e1fb8459ff32004670da5c3f5 Mon Sep 17 00:00:00 2001 From: Ethan Blackwood Date: Wed, 27 Dec 2017 17:18:26 -0500 Subject: [PATCH 1/2] Pulse Pal fixes for Windows (and in general) --- .../PulsePalOutput/PulsePalOutput.vcxproj | 2 ++ .../PulsePalOutput.vcxproj.filters | 16 ++++++++-------- .../PulsePalOutput/PulsePalOutputCanvas.cpp | 14 +++++++------- 3 files changed, 17 insertions(+), 15 deletions(-) diff --git a/Builds/VisualStudio2013/Plugins/PulsePalOutput/PulsePalOutput.vcxproj b/Builds/VisualStudio2013/Plugins/PulsePalOutput/PulsePalOutput.vcxproj index 72936ceb0..dbfad93df 100644 --- a/Builds/VisualStudio2013/Plugins/PulsePalOutput/PulsePalOutput.vcxproj +++ b/Builds/VisualStudio2013/Plugins/PulsePalOutput/PulsePalOutput.vcxproj @@ -120,11 +120,13 @@ + + diff --git a/Builds/VisualStudio2013/Plugins/PulsePalOutput/PulsePalOutput.vcxproj.filters b/Builds/VisualStudio2013/Plugins/PulsePalOutput/PulsePalOutput.vcxproj.filters index c4f60ae68..b50a693a6 100644 --- a/Builds/VisualStudio2013/Plugins/PulsePalOutput/PulsePalOutput.vcxproj.filters +++ b/Builds/VisualStudio2013/Plugins/PulsePalOutput/PulsePalOutput.vcxproj.filters @@ -1,4 +1,4 @@ - + @@ -24,15 +24,15 @@ Source Files - - Source Files - Source Files Source Files\serial + + Source Files + @@ -41,11 +41,11 @@ Source Files - - Source Files - Source Files\serial + + Source Files + - + \ No newline at end of file diff --git a/Source/Plugins/PulsePalOutput/PulsePalOutputCanvas.cpp b/Source/Plugins/PulsePalOutput/PulsePalOutputCanvas.cpp index 6daf32025..5a78cda88 100644 --- a/Source/Plugins/PulsePalOutput/PulsePalOutputCanvas.cpp +++ b/Source/Plugins/PulsePalOutput/PulsePalOutputCanvas.cpp @@ -76,7 +76,7 @@ void PulsePalOutputCanvas::paint (Graphics& g) else pulsePalLabel->setText(String("Pulse Pal: ") += String("NOT CONNECTED"), dontSendNotification); - for (int i; i < PULSEPALCHANNELS; i++) + for (int i = 0; i < PULSEPALCHANNELS; i++) { g.setColour(Colours::grey); g.fillRoundedRectangle(0.005*getWidth() + 0.25*i*getWidth(), 0.1*getHeight(), 0.23*getWidth(), 0.89*getHeight(), 4.0f); @@ -88,7 +88,7 @@ void PulsePalOutputCanvas::resized() { pulsePalLabel->setBounds(0.01*getWidth(), 0.02*getHeight(), 0.5*getWidth(),0.04*getHeight()); - for (int i; i < PULSEPALCHANNELS; i++) + for (int i = 0; i < PULSEPALCHANNELS; i++) { channelLabel[i]->setBounds(0.01*getWidth() + 0.25*i*getWidth(), 0.1*getHeight(), 0.1*getWidth(),0.04*getHeight()); @@ -130,7 +130,7 @@ void PulsePalOutputCanvas::resized() void PulsePalOutputCanvas::buttonClicked(Button* button) { - for (int i; i < PULSEPALCHANNELS; i++) + for (int i = 0; i < PULSEPALCHANNELS; i++) { if (button == biphasicButton[i]) { @@ -238,7 +238,7 @@ bool PulsePalOutputCanvas::keyPressed(const KeyPress &key, Component *originatin void PulsePalOutputCanvas::labelTextChanged(Label *label) { - for (int i; i < PULSEPALCHANNELS; i++) + for (int i = 0; i < PULSEPALCHANNELS; i++) { if (label == phase1EditLabel[i]) { @@ -402,7 +402,7 @@ void PulsePalOutputCanvas::labelTextChanged(Label *label) void PulsePalOutputCanvas::comboBoxChanged(ComboBox *combobox) { - for (int i; i < PULSEPALCHANNELS; i++) + for (int i = 0; i < PULSEPALCHANNELS; i++) if (combobox == triggerMode[i]) processor->setTriggerMode(i, combobox->getSelectedId() - 1); } @@ -410,7 +410,7 @@ void PulsePalOutputCanvas::comboBoxChanged(ComboBox *combobox) void PulsePalOutputCanvas::initButtons() { - for (int i; i < PULSEPALCHANNELS; i++) + for (int i = 0; i < PULSEPALCHANNELS; i++) { ScopedPointer biph = new UtilityButton("biphasic", Font("Small Text", 20, Font::plain)); biph->setRadius(3.0f); @@ -493,7 +493,7 @@ void PulsePalOutputCanvas::initLabels() pulsePalLabel->setColour(Label::textColourId, labelColour); addAndMakeVisible(pulsePalLabel); - for (int i; i < PULSEPALCHANNELS; i++) + for (int i = 0; i < PULSEPALCHANNELS; i++) { ScopedPointer