Skip to content

Commit f05b030

Browse files
ethanbbethanbb
committed
Merge branch 'development' into dsp-common
2 parents 8d5cdcd + 295b678 commit f05b030

3 files changed

Lines changed: 17 additions & 15 deletions

File tree

‎Builds/VisualStudio2013/Plugins/PulsePalOutput/PulsePalOutput.vcxproj‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -120,11 +120,13 @@
120120
<ItemGroup>
121121
<ClCompile Include="..\..\..\..\Source\Plugins\PulsePalOutput\OpenEphysLib.cpp" />
122122
<ClCompile Include="..\..\..\..\Source\Plugins\PulsePalOutput\PulsePalOutput.cpp" />
123+
<ClCompile Include="..\..\..\..\Source\Plugins\PulsePalOutput\PulsePalOutputCanvas.cpp" />
123124
<ClCompile Include="..\..\..\..\Source\Plugins\PulsePalOutput\PulsePalOutputEditor.cpp" />
124125
<ClCompile Include="..\..\..\..\Source\Plugins\PulsePalOutput\serial\PulsePal.cpp" />
125126
</ItemGroup>
126127
<ItemGroup>
127128
<ClInclude Include="..\..\..\..\Source\Plugins\PulsePalOutput\PulsePalOutput.h" />
129+
<ClInclude Include="..\..\..\..\Source\Plugins\PulsePalOutput\PulsePalOutputCanvas.h" />
128130
<ClInclude Include="..\..\..\..\Source\Plugins\PulsePalOutput\PulsePalOutputEditor.h" />
129131
<ClInclude Include="..\..\..\..\Source\Plugins\PulsePalOutput\serial\PulsePal.h" />
130132
</ItemGroup>

‎Builds/VisualStudio2013/Plugins/PulsePalOutput/PulsePalOutput.vcxproj.filters‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<?xml version="1.0" encoding="utf-8"?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<ItemGroup>
44
<Filter Include="Source Files">
@@ -24,15 +24,15 @@
2424
<ClCompile Include="..\..\..\..\Source\Plugins\PulsePalOutput\PulsePalOutput.cpp">
2525
<Filter>Source Files</Filter>
2626
</ClCompile>
27-
<ClCompile Include="..\..\..\..\Source\Plugins\PulsePalOutput\PulsePalOutputCanvas.cpp">
28-
<Filter>Source Files</Filter>
29-
</ClCompile>
3027
<ClCompile Include="..\..\..\..\Source\Plugins\PulsePalOutput\PulsePalOutputEditor.cpp">
3128
<Filter>Source Files</Filter>
3229
</ClCompile>
3330
<ClCompile Include="..\..\..\..\Source\Plugins\PulsePalOutput\serial\PulsePal.cpp">
3431
<Filter>Source Files\serial</Filter>
3532
</ClCompile>
33+
<ClCompile Include="..\..\..\..\Source\Plugins\PulsePalOutput\PulsePalOutputCanvas.cpp">
34+
<Filter>Source Files</Filter>
35+
</ClCompile>
3636
</ItemGroup>
3737
<ItemGroup>
3838
<ClInclude Include="..\..\..\..\Source\Plugins\PulsePalOutput\PulsePalOutput.h">
@@ -41,11 +41,11 @@
4141
<ClInclude Include="..\..\..\..\Source\Plugins\PulsePalOutput\PulsePalOutputEditor.h">
4242
<Filter>Source Files</Filter>
4343
</ClInclude>
44-
<ClInclude Include="..\..\..\..\Source\Plugins\PulsePalOutput\PulsePalOutputCanvas.h">
45-
<Filter>Source Files</Filter>
46-
</ClInclude>
4744
<ClInclude Include="..\..\..\..\Source\Plugins\PulsePalOutput\serial\PulsePal.h">
4845
<Filter>Source Files\serial</Filter>
4946
</ClInclude>
47+
<ClInclude Include="..\..\..\..\Source\Plugins\PulsePalOutput\PulsePalOutputCanvas.h">
48+
<Filter>Source Files</Filter>
49+
</ClInclude>
5050
</ItemGroup>
51-
</Project>
51+
</Project>

‎Source/Plugins/PulsePalOutput/PulsePalOutputCanvas.cpp‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ void PulsePalOutputCanvas::paint (Graphics& g)
7676
else
7777
pulsePalLabel->setText(String("Pulse Pal: ") += String("NOT CONNECTED"), dontSendNotification);
7878

79-
for (int i; i < PULSEPALCHANNELS; i++)
79+
for (int i = 0; i < PULSEPALCHANNELS; i++)
8080
{
8181
g.setColour(Colours::grey);
8282
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()
8888
{
8989
pulsePalLabel->setBounds(0.01*getWidth(), 0.02*getHeight(), 0.5*getWidth(),0.04*getHeight());
9090

91-
for (int i; i < PULSEPALCHANNELS; i++)
91+
for (int i = 0; i < PULSEPALCHANNELS; i++)
9292
{
9393
channelLabel[i]->setBounds(0.01*getWidth() + 0.25*i*getWidth(), 0.1*getHeight(), 0.1*getWidth(),0.04*getHeight());
9494

@@ -130,7 +130,7 @@ void PulsePalOutputCanvas::resized()
130130

131131
void PulsePalOutputCanvas::buttonClicked(Button* button)
132132
{
133-
for (int i; i < PULSEPALCHANNELS; i++)
133+
for (int i = 0; i < PULSEPALCHANNELS; i++)
134134
{
135135
if (button == biphasicButton[i])
136136
{
@@ -238,7 +238,7 @@ bool PulsePalOutputCanvas::keyPressed(const KeyPress &key, Component *originatin
238238

239239
void PulsePalOutputCanvas::labelTextChanged(Label *label)
240240
{
241-
for (int i; i < PULSEPALCHANNELS; i++)
241+
for (int i = 0; i < PULSEPALCHANNELS; i++)
242242
{
243243
if (label == phase1EditLabel[i])
244244
{
@@ -402,15 +402,15 @@ void PulsePalOutputCanvas::labelTextChanged(Label *label)
402402

403403
void PulsePalOutputCanvas::comboBoxChanged(ComboBox *combobox)
404404
{
405-
for (int i; i < PULSEPALCHANNELS; i++)
405+
for (int i = 0; i < PULSEPALCHANNELS; i++)
406406
if (combobox == triggerMode[i])
407407
processor->setTriggerMode(i, combobox->getSelectedId() - 1);
408408
}
409409

410410
void PulsePalOutputCanvas::initButtons()
411411
{
412412

413-
for (int i; i < PULSEPALCHANNELS; i++)
413+
for (int i = 0; i < PULSEPALCHANNELS; i++)
414414
{
415415
ScopedPointer<UtilityButton> biph = new UtilityButton("biphasic", Font("Small Text", 20, Font::plain));
416416
biph->setRadius(3.0f);
@@ -493,7 +493,7 @@ void PulsePalOutputCanvas::initLabels()
493493
pulsePalLabel->setColour(Label::textColourId, labelColour);
494494
addAndMakeVisible(pulsePalLabel);
495495

496-
for (int i; i < PULSEPALCHANNELS; i++)
496+
for (int i = 0; i < PULSEPALCHANNELS; i++)
497497
{
498498
ScopedPointer<Label> chan = new Label("s_phase1", "Channel "+String(i+1));
499499
chan->setFont(Font(30));

0 commit comments

Comments
 (0)