Skip to content

Commit c10ec93

Browse files
sept-ensept-en
committed
Merge pull request #24 from sept-en/development
Implemented TiledButtonGroupManager. Improved ChannelSelector class.
2 parents 127d99c + ad8ac52 commit c10ec93

21 files changed

Lines changed: 909 additions & 461 deletions

‎Builds/Linux/Makefile‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -120,6 +120,8 @@ OBJECTS := \
120120
$(OBJDIR)/DataWindow_83ce6754.o \
121121
$(OBJDIR)/SpikeObject_24e8c655.o \
122122
$(OBJDIR)/MatlabLikePlot_fb09c37f.o \
123+
$(OBJDIR)/TiledButtonGroupManager_e05788a6.o \
124+
$(OBJDIR)/LinearButtonGroupManager_ea5cb5bf.o \
123125
$(OBJDIR)/ButtonGroupManager_75d0fbfa.o \
124126
$(OBJDIR)/MaterialButtonLookAndFeel_d7d19ba2.o \
125127
$(OBJDIR)/MaterialSliderLookAndFeel_c97dd613.o \
@@ -514,6 +516,16 @@ $(OBJDIR)/MatlabLikePlot_fb09c37f.o: ../../Source/Processors/Visualization/Matla
514516
@echo "Compiling MatlabLikePlot.cpp"
515517
@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
516518

519+
$(OBJDIR)/TiledButtonGroupManager_e05788a6.o: ../../Source/UI/Utils/TiledButtonGroupManager.cpp
520+
-@mkdir -p $(OBJDIR)
521+
@echo "Compiling TiledButtonGroupManager.cpp"
522+
@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
523+
524+
$(OBJDIR)/LinearButtonGroupManager_ea5cb5bf.o: ../../Source/UI/Utils/LinearButtonGroupManager.cpp
525+
-@mkdir -p $(OBJDIR)
526+
@echo "Compiling LinearButtonGroupManager.cpp"
527+
@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
528+
517529
$(OBJDIR)/ButtonGroupManager_75d0fbfa.o: ../../Source/UI/Utils/ButtonGroupManager.cpp
518530
-@mkdir -p $(OBJDIR)
519531
@echo "Compiling ButtonGroupManager.cpp"

‎Builds/MacOSX/open-ephys.xcodeproj/project.pbxproj‎

Lines changed: 16 additions & 4 deletions
Large diffs are not rendered by default.

‎Builds/VisualStudio2012/open-ephys.vcxproj‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -324,6 +324,8 @@
324324
<ClCompile Include="..\..\Source\Processors\Visualization\DataWindow.cpp"/>
325325
<ClCompile Include="..\..\Source\Processors\Visualization\SpikeObject.cpp"/>
326326
<ClCompile Include="..\..\Source\Processors\Visualization\MatlabLikePlot.cpp"/>
327+
<ClCompile Include="..\..\Source\UI\Utils\TiledButtonGroupManager.cpp"/>
328+
<ClCompile Include="..\..\Source\UI\Utils\LinearButtonGroupManager.cpp"/>
327329
<ClCompile Include="..\..\Source\UI\Utils\ButtonGroupManager.cpp"/>
328330
<ClCompile Include="..\..\Source\UI\LookAndFeel\MaterialButtonLookAndFeel.cpp"/>
329331
<ClCompile Include="..\..\Source\UI\LookAndFeel\MaterialSliderLookAndFeel.cpp"/>
@@ -1542,6 +1544,8 @@
15421544
<ClInclude Include="..\..\Source\Processors\Visualization\SpikeObject.h"/>
15431545
<ClInclude Include="..\..\Source\Processors\Visualization\Visualizer.h"/>
15441546
<ClInclude Include="..\..\Source\Processors\Visualization\MatlabLikePlot.h"/>
1547+
<ClInclude Include="..\..\Source\UI\Utils\TiledButtonGroupManager.h"/>
1548+
<ClInclude Include="..\..\Source\UI\Utils\LinearButtonGroupManager.h"/>
15451549
<ClInclude Include="..\..\Source\UI\Utils\ButtonGroupManager.h"/>
15461550
<ClInclude Include="..\..\Source\UI\LookAndFeel\MaterialButtonLookAndFeel.h"/>
15471551
<ClInclude Include="..\..\Source\UI\LookAndFeel\MaterialSliderLookAndFeel.h"/>

‎Builds/VisualStudio2012/open-ephys.vcxproj.filters‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -613,6 +613,12 @@
613613
<ClCompile Include="..\..\Source\Processors\Visualization\MatlabLikePlot.cpp">
614614
<Filter>open-ephys\Source\Processors\Visualization</Filter>
615615
</ClCompile>
616+
<ClCompile Include="..\..\Source\UI\Utils\TiledButtonGroupManager.cpp">
617+
<Filter>open-ephys\Source\UI\Utils</Filter>
618+
</ClCompile>
619+
<ClCompile Include="..\..\Source\UI\Utils\LinearButtonGroupManager.cpp">
620+
<Filter>open-ephys\Source\UI\Utils</Filter>
621+
</ClCompile>
616622
<ClCompile Include="..\..\Source\UI\Utils\ButtonGroupManager.cpp">
617623
<Filter>open-ephys\Source\UI\Utils</Filter>
618624
</ClCompile>
@@ -2124,6 +2130,12 @@
21242130
<ClInclude Include="..\..\Source\Processors\Visualization\MatlabLikePlot.h">
21252131
<Filter>open-ephys\Source\Processors\Visualization</Filter>
21262132
</ClInclude>
2133+
<ClInclude Include="..\..\Source\UI\Utils\TiledButtonGroupManager.h">
2134+
<Filter>open-ephys\Source\UI\Utils</Filter>
2135+
</ClInclude>
2136+
<ClInclude Include="..\..\Source\UI\Utils\LinearButtonGroupManager.h">
2137+
<Filter>open-ephys\Source\UI\Utils</Filter>
2138+
</ClInclude>
21272139
<ClInclude Include="..\..\Source\UI\Utils\ButtonGroupManager.h">
21282140
<Filter>open-ephys\Source\UI\Utils</Filter>
21292141
</ClInclude>

‎Builds/VisualStudio2013/open-ephys.sln‎

Lines changed: 5 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,21 @@
1-
Microsoft Visual Studio Solution File, Format Version 12.00
1+
Microsoft Visual Studio Solution File, Format Version 11.00
22
# Visual Studio 2013
3-
VisualStudioVersion = 12.0.40629.0
4-
MinimumVisualStudioVersion = 10.0.40219.1
5-
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "open-ephys", "open-ephys.vcxproj", "{9C924D66-7DEC-1AEF-B375-DB8666BFB909}"
3+
Project("{5A05F353-1D63-394C-DFB0-981BB2309002}") = "open-ephys", "open-ephys.vcxproj", "{9C924D66-7DEC-1AEF-B375-DB8666BFB909}"
64
EndProject
75
Global
86
GlobalSection(SolutionConfigurationPlatforms) = preSolution
97
Debug|Win32 = Debug|Win32
10-
Debug|x64 = Debug|x64
11-
Debug64|Win32 = Debug64|Win32
12-
Debug64|x64 = Debug64|x64
138
Release|Win32 = Release|Win32
14-
Release|x64 = Release|x64
15-
Release64|Win32 = Release64|Win32
9+
Debug64|x64 = Debug64|x64
1610
Release64|x64 = Release64|x64
1711
EndGlobalSection
1812
GlobalSection(ProjectConfigurationPlatforms) = postSolution
1913
{9C924D66-7DEC-1AEF-B375-DB8666BFB909}.Debug|Win32.ActiveCfg = Debug|Win32
2014
{9C924D66-7DEC-1AEF-B375-DB8666BFB909}.Debug|Win32.Build.0 = Debug|Win32
21-
{9C924D66-7DEC-1AEF-B375-DB8666BFB909}.Debug|x64.ActiveCfg = Debug|Win32
22-
{9C924D66-7DEC-1AEF-B375-DB8666BFB909}.Debug64|Win32.ActiveCfg = Debug64|x64
23-
{9C924D66-7DEC-1AEF-B375-DB8666BFB909}.Debug64|x64.ActiveCfg = Debug64|x64
24-
{9C924D66-7DEC-1AEF-B375-DB8666BFB909}.Debug64|x64.Build.0 = Debug64|x64
2515
{9C924D66-7DEC-1AEF-B375-DB8666BFB909}.Release|Win32.ActiveCfg = Release|Win32
2616
{9C924D66-7DEC-1AEF-B375-DB8666BFB909}.Release|Win32.Build.0 = Release|Win32
27-
{9C924D66-7DEC-1AEF-B375-DB8666BFB909}.Release|x64.ActiveCfg = Release|Win32
28-
{9C924D66-7DEC-1AEF-B375-DB8666BFB909}.Release64|Win32.ActiveCfg = Release64|x64
17+
{9C924D66-7DEC-1AEF-B375-DB8666BFB909}.Debug64|x64.ActiveCfg = Debug64|x64
18+
{9C924D66-7DEC-1AEF-B375-DB8666BFB909}.Debug64|x64.Build.0 = Debug64|x64
2919
{9C924D66-7DEC-1AEF-B375-DB8666BFB909}.Release64|x64.ActiveCfg = Release64|x64
3020
{9C924D66-7DEC-1AEF-B375-DB8666BFB909}.Release64|x64.Build.0 = Release64|x64
3121
EndGlobalSection

‎Builds/VisualStudio2013/open-ephys.vcxproj‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -328,6 +328,8 @@
328328
<ClCompile Include="..\..\Source\Processors\Visualization\DataWindow.cpp"/>
329329
<ClCompile Include="..\..\Source\Processors\Visualization\SpikeObject.cpp"/>
330330
<ClCompile Include="..\..\Source\Processors\Visualization\MatlabLikePlot.cpp"/>
331+
<ClCompile Include="..\..\Source\UI\Utils\TiledButtonGroupManager.cpp"/>
332+
<ClCompile Include="..\..\Source\UI\Utils\LinearButtonGroupManager.cpp"/>
331333
<ClCompile Include="..\..\Source\UI\Utils\ButtonGroupManager.cpp"/>
332334
<ClCompile Include="..\..\Source\UI\LookAndFeel\MaterialButtonLookAndFeel.cpp"/>
333335
<ClCompile Include="..\..\Source\UI\LookAndFeel\MaterialSliderLookAndFeel.cpp"/>
@@ -1546,6 +1548,8 @@
15461548
<ClInclude Include="..\..\Source\Processors\Visualization\SpikeObject.h"/>
15471549
<ClInclude Include="..\..\Source\Processors\Visualization\Visualizer.h"/>
15481550
<ClInclude Include="..\..\Source\Processors\Visualization\MatlabLikePlot.h"/>
1551+
<ClInclude Include="..\..\Source\UI\Utils\TiledButtonGroupManager.h"/>
1552+
<ClInclude Include="..\..\Source\UI\Utils\LinearButtonGroupManager.h"/>
15491553
<ClInclude Include="..\..\Source\UI\Utils\ButtonGroupManager.h"/>
15501554
<ClInclude Include="..\..\Source\UI\LookAndFeel\MaterialButtonLookAndFeel.h"/>
15511555
<ClInclude Include="..\..\Source\UI\LookAndFeel\MaterialSliderLookAndFeel.h"/>

‎Builds/VisualStudio2013/open-ephys.vcxproj.filters‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -613,6 +613,12 @@
613613
<ClCompile Include="..\..\Source\Processors\Visualization\MatlabLikePlot.cpp">
614614
<Filter>open-ephys\Source\Processors\Visualization</Filter>
615615
</ClCompile>
616+
<ClCompile Include="..\..\Source\UI\Utils\TiledButtonGroupManager.cpp">
617+
<Filter>open-ephys\Source\UI\Utils</Filter>
618+
</ClCompile>
619+
<ClCompile Include="..\..\Source\UI\Utils\LinearButtonGroupManager.cpp">
620+
<Filter>open-ephys\Source\UI\Utils</Filter>
621+
</ClCompile>
616622
<ClCompile Include="..\..\Source\UI\Utils\ButtonGroupManager.cpp">
617623
<Filter>open-ephys\Source\UI\Utils</Filter>
618624
</ClCompile>
@@ -2124,6 +2130,12 @@
21242130
<ClInclude Include="..\..\Source\Processors\Visualization\MatlabLikePlot.h">
21252131
<Filter>open-ephys\Source\Processors\Visualization</Filter>
21262132
</ClInclude>
2133+
<ClInclude Include="..\..\Source\UI\Utils\TiledButtonGroupManager.h">
2134+
<Filter>open-ephys\Source\UI\Utils</Filter>
2135+
</ClInclude>
2136+
<ClInclude Include="..\..\Source\UI\Utils\LinearButtonGroupManager.h">
2137+
<Filter>open-ephys\Source\UI\Utils</Filter>
2138+
</ClInclude>
21272139
<ClInclude Include="..\..\Source\UI\Utils\ButtonGroupManager.h">
21282140
<Filter>open-ephys\Source\UI\Utils</Filter>
21292141
</ClInclude>

‎Source/Plugins/CAR/CAR.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ void CAR::setReferenceChannelState (int channel, bool newState)
124124
if (! newState)
125125
m_referenceChannels.removeFirstMatchingValue (channel);
126126
else
127-
m_referenceChannels.add (channel);
127+
m_referenceChannels.addIfNotAlreadyThere (channel);
128128
}
129129

130130

‎Source/Plugins/CAR/CAREditor.cpp‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,17 +36,19 @@ static const Font FONT_LABELS ("Default", 13.f, Font::plain);
3636
CAREditor::CAREditor (GenericProcessor* parentProcessor, bool useDefaultParameterEditors)
3737
: GenericEditor (parentProcessor, useDefaultParameterEditors)
3838
, m_currentChannelsView (REFERENCE_CHANNELS)
39-
, m_channelSelectorButtonManager (new ButtonGroupManager)
39+
, m_channelSelectorButtonManager (new LinearButtonGroupManager)
4040
, m_gainSlider (new ParameterSlider (0.0, 100.0, 100.0, FONT_LABELS))
4141
{
4242
TextButton* referenceChannelsButton = new TextButton ("Reference", "Switch to reference channels");
43+
referenceChannelsButton->setClickingTogglesState (true);
4344
referenceChannelsButton->setToggleState (true, dontSendNotification);
4445
referenceChannelsButton->setColour (TextButton::buttonColourId, Colour (0x0));
4546
referenceChannelsButton->setColour (TextButton::buttonOnColourId, Colour (0x0));
4647
referenceChannelsButton->setColour (TextButton::textColourOffId, COLOUR_PRIMARY);
4748
referenceChannelsButton->setColour (TextButton::textColourOnId, COLOUR_ACCENT);
4849

4950
TextButton* affectedChannelsButton = new TextButton ("Affected", "Switch to affected channels");
51+
affectedChannelsButton->setClickingTogglesState (true);
5052
affectedChannelsButton->setColour (TextButton::buttonColourId, Colour (0x0));
5153
affectedChannelsButton->setColour (TextButton::buttonOnColourId, Colour (0x0));
5254
affectedChannelsButton->setColour (TextButton::textColourOffId, COLOUR_PRIMARY);
@@ -57,9 +59,9 @@ CAREditor::CAREditor (GenericProcessor* parentProcessor, bool useDefaultParamete
5759
m_channelSelectorButtonManager->setRadioButtonMode (true);
5860
m_channelSelectorButtonManager->setButtonListener (this);
5961
m_channelSelectorButtonManager->setButtonsLookAndFeel (m_materialButtonLookAndFeel);
60-
m_channelSelectorButtonManager->setBackgroundColour (Colours::white);
61-
m_channelSelectorButtonManager->setOutlineColour (Colour (0x0));
62-
m_channelSelectorButtonManager->setAccentColour (COLOUR_ACCENT);
62+
m_channelSelectorButtonManager->setColour (ButtonGroupManager::backgroundColourId, Colours::white);
63+
m_channelSelectorButtonManager->setColour (ButtonGroupManager::outlineColourId, Colour (0x0));
64+
m_channelSelectorButtonManager->setColour (LinearButtonGroupManager::accentColourId, COLOUR_ACCENT);
6365
addAndMakeVisible (m_channelSelectorButtonManager);
6466

6567
m_gainSlider->setColour (Slider::rotarySliderFillColourId, Colour::fromRGB (255, 193, 7));

‎Source/Plugins/CAR/CAREditor.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,8 +64,8 @@ class CAREditor : public GenericEditor
6464

6565
ChannelsType m_currentChannelsView;
6666

67-
ScopedPointer<ButtonGroupManager> m_channelSelectorButtonManager;
68-
ScopedPointer<ParameterSlider> m_gainSlider;
67+
ScopedPointer<LinearButtonGroupManager> m_channelSelectorButtonManager;
68+
ScopedPointer<ParameterSlider> m_gainSlider;
6969

7070
// LookAndFeel
7171
SharedResourcePointer<MaterialButtonLookAndFeel> m_materialButtonLookAndFeel;

0 commit comments

Comments
 (0)