Skip to content

Some more Pulse Pal fixes #192

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
aacuevas merged 3 commits into from
Feb 5, 2018
Merged

Some more Pulse Pal fixes #192

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
295b678
Pulse Pal fixes for Windows (and in general)
ethanbb Dec 27, 2017
fbde02f
Merge branch 'development' of https://github.com/open-ephys/plugin-GU…
ethanbb Feb 5, 2018
0113eb6
Omit unnecessary visual studio change
ethanbb Feb 5, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions Source/Plugins/PulsePalOutput/PulsePalOutputCanvas.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -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());

Expand Down Expand Up @@ -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])
{
Expand Down Expand Up @@ -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])
{
Expand Down Expand Up @@ -402,15 +402,15 @@ 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);
}

void PulsePalOutputCanvas::initButtons()
{

for (int i; i < PULSEPALCHANNELS; i++)
for (int i = 0; i < PULSEPALCHANNELS; i++)
{
ScopedPointer<UtilityButton> biph = new UtilityButton("biphasic", Font("Small Text", 20, Font::plain));
biph->setRadius(3.0f);
Expand Down Expand Up @@ -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<Label> chan = new Label("s_phase1", "Channel "+String(i+1));
chan->setFont(Font(30));
Expand Down