Skip to content

Commit 39987b4

Browse files
sept-ensept-en
committed
Buttons managers: improvements and minor bugs fixes
1 parent 81813a2 commit 39987b4

11 files changed

Lines changed: 92 additions & 25 deletions

File tree

‎Builds/Linux/Makefile‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -118,6 +118,7 @@ OBJECTS := \
118118
$(OBJDIR)/DataWindow_83ce6754.o \
119119
$(OBJDIR)/SpikeObject_24e8c655.o \
120120
$(OBJDIR)/MatlabLikePlot_fb09c37f.o \
121+
$(OBJDIR)/TiledButtonGroupManager_e05788a6.o \
121122
$(OBJDIR)/LinearButtonGroupManager_ea5cb5bf.o \
122123
$(OBJDIR)/ButtonGroupManager_75d0fbfa.o \
123124
$(OBJDIR)/MaterialButtonLookAndFeel_d7d19ba2.o \
@@ -503,6 +504,11 @@ $(OBJDIR)/MatlabLikePlot_fb09c37f.o: ../../Source/Processors/Visualization/Matla
503504
@echo "Compiling MatlabLikePlot.cpp"
504505
@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
505506

507+
$(OBJDIR)/TiledButtonGroupManager_e05788a6.o: ../../Source/UI/Utils/TiledButtonGroupManager.cpp
508+
-@mkdir -p $(OBJDIR)
509+
@echo "Compiling TiledButtonGroupManager.cpp"
510+
@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
511+
506512
$(OBJDIR)/LinearButtonGroupManager_ea5cb5bf.o: ../../Source/UI/Utils/LinearButtonGroupManager.cpp
507513
-@mkdir -p $(OBJDIR)
508514
@echo "Compiling LinearButtonGroupManager.cpp"

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

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,7 @@
8888
1B620FC17AAECA4C5DE741E2 = {isa = PBXBuildFile; fileRef = 66463AB11EA4D6341C32F27E; };
8989
19BB86C918F89D1377F8A0E1 = {isa = PBXBuildFile; fileRef = 5894D40A0E8FA6E9B3EBF9D9; };
9090
89223664B6CB2A912E36B091 = {isa = PBXBuildFile; fileRef = F115ED75E977A54AAF036B2C; };
91+
97B42624998C8E4E2A5C9BA7 = {isa = PBXBuildFile; fileRef = C25C0DDD703C77F4FDCE4DE6; };
9192
EE60D8FC7DCEC9C9AE545F4D = {isa = PBXBuildFile; fileRef = 6F201AA651C426427E515AF2; };
9293
43BDE8C7A1D17FC0CD2EF00D = {isa = PBXBuildFile; fileRef = 0BD711FD3C982C60B294F311; };
9394
5A43E4E1547CBD9C2A635AEE = {isa = PBXBuildFile; fileRef = 3A3EFEB7D30A6E75D5A1D1B1; };
@@ -542,6 +543,7 @@
542543
617F5DFAAE97F48FA996A781 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_DrawableRectangle.h"; path = "../../JuceLibraryCode/modules/juce_gui_basics/drawables/juce_DrawableRectangle.h"; sourceTree = "SOURCE_ROOT"; };
543544
61B0CBF705D5FC0431776286 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_OpenGLShaderProgram.cpp"; path = "../../JuceLibraryCode/modules/juce_opengl/opengl/juce_OpenGLShaderProgram.cpp"; sourceTree = "SOURCE_ROOT"; };
544545
627956A7A1CB15251D02C8C5 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_ScopedXLock.h"; path = "../../JuceLibraryCode/modules/juce_events/native/juce_ScopedXLock.h"; sourceTree = "SOURCE_ROOT"; };
546+
6397CF41ED94FBCD411C5E02 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = TiledButtonGroupManager.h; path = ../../Source/UI/Utils/TiledButtonGroupManager.h; sourceTree = "SOURCE_ROOT"; };
545547
63AF6BE7FE2A9E7882743B4F = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = "juce_mac_Network.mm"; path = "../../JuceLibraryCode/modules/juce_core/native/juce_mac_Network.mm"; sourceTree = "SOURCE_ROOT"; };
546548
63F4150ABBA43B2215230034 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_IIRFilter.h"; path = "../../JuceLibraryCode/modules/juce_audio_basics/effects/juce_IIRFilter.h"; sourceTree = "SOURCE_ROOT"; };
547549
642325267C5F1AC2F65B647D = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_AnimatedPositionBehaviours.h"; path = "../../JuceLibraryCode/modules/juce_gui_basics/layout/juce_AnimatedPositionBehaviours.h"; sourceTree = "SOURCE_ROOT"; };
@@ -981,6 +983,7 @@
981983
C1B540E49C0EBA03ACDBBDFB = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = RBJ.h; path = ../../Source/Processors/Dsp/RBJ.h; sourceTree = "SOURCE_ROOT"; };
982984
C1E1CCE5796B40E0A45FB021 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_AudioThumbnail.h"; path = "../../JuceLibraryCode/modules/juce_audio_utils/gui/juce_AudioThumbnail.h"; sourceTree = "SOURCE_ROOT"; };
983985
C209C7633D01E525231EE894 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_GlyphArrangement.cpp"; path = "../../JuceLibraryCode/modules/juce_graphics/fonts/juce_GlyphArrangement.cpp"; sourceTree = "SOURCE_ROOT"; };
986+
C25C0DDD703C77F4FDCE4DE6 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = TiledButtonGroupManager.cpp; path = ../../Source/UI/Utils/TiledButtonGroupManager.cpp; sourceTree = "SOURCE_ROOT"; };
984987
C2746A86EC16D3EA9FAC2C1D = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_XmlElement.cpp"; path = "../../JuceLibraryCode/modules/juce_core/xml/juce_XmlElement.cpp"; sourceTree = "SOURCE_ROOT"; };
985988
C29E664781AA2396C8D59543 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = "juce_events.mm"; path = "../../JuceLibraryCode/modules/juce_events/juce_events.mm"; sourceTree = "SOURCE_ROOT"; };
986989
C2D1409D20E154E43569C725 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_ImagePreviewComponent.cpp"; path = "../../JuceLibraryCode/modules/juce_gui_basics/filebrowser/juce_ImagePreviewComponent.cpp"; sourceTree = "SOURCE_ROOT"; };
@@ -1148,23 +1151,24 @@
11481151
E7ACE8C1456403A574236451 = {isa = PBXFileReference; lastKnownFileType = file; name = "cpmono-bold-serialized"; path = "../../Resources/Fonts/cpmono-bold-serialized"; sourceTree = "SOURCE_ROOT"; };
11491152
E7EE416EF527C7506B499070 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_BigInteger.h"; path = "../../JuceLibraryCode/modules/juce_core/maths/juce_BigInteger.h"; sourceTree = "SOURCE_ROOT"; };
11501153
E835BEB3C42E4B241804BE13 = {isa = PBXFileReference; lastKnownFileType = file; name = "cpmono-light-serialized"; path = "../../Resources/Fonts/cpmono-light-serialized"; sourceTree = "SOURCE_ROOT"; };
1154+
E8964C0BE264A55753BC6B7B = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_linux_Midi.cpp"; path = "../../JuceLibraryCode/modules/juce_audio_devices/native/juce_linux_Midi.cpp"; sourceTree = "SOURCE_ROOT"; };
11511155
E8D51D470C9955D7D03D5469 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = ChebyshevII.h; path = ../../Source/Processors/Dsp/ChebyshevII.h; sourceTree = "SOURCE_ROOT"; };
11521156
E91923510CB2280C3A3B9E9C = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_LocalisedStrings.h"; path = "../../JuceLibraryCode/modules/juce_core/text/juce_LocalisedStrings.h"; sourceTree = "SOURCE_ROOT"; };
1153-
E93BE115650B1CB80EACB841 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = EditorViewportButtons.h; path = ../../Source/UI/EditorViewportButtons.h; sourceTree = "SOURCE_ROOT"; };
1154-
E97684DCE824DEDA6683C6CD = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_Synthesiser.cpp"; path = "../../JuceLibraryCode/modules/juce_audio_basics/synthesisers/juce_Synthesiser.cpp"; sourceTree = "SOURCE_ROOT"; };
1155-
EA2FC92CECD1EDA1F07DC59C = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_TooltipWindow.h"; path = "../../JuceLibraryCode/modules/juce_gui_basics/windows/juce_TooltipWindow.h"; sourceTree = "SOURCE_ROOT"; };
11561157
EA354D7D8E48D461415D52D8 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_JPEGLoader.cpp"; path = "../../JuceLibraryCode/modules/juce_graphics/image_formats/juce_JPEGLoader.cpp"; sourceTree = "SOURCE_ROOT"; };
11571158
EA9518CDEA7049C21D5CE2D5 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_Process.h"; path = "../../JuceLibraryCode/modules/juce_core/threads/juce_Process.h"; sourceTree = "SOURCE_ROOT"; };
1158-
EAB2319C7AA57E06A2247CDF = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_BorderSize.h"; path = "../../JuceLibraryCode/modules/juce_graphics/geometry/juce_BorderSize.h"; sourceTree = "SOURCE_ROOT"; };
1159+
EAB6A66678B122C578B16445 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_HighResolutionTimer.h"; path = "../../JuceLibraryCode/modules/juce_core/threads/juce_HighResolutionTimer.h"; sourceTree = "SOURCE_ROOT"; };
1160+
EF3F9AA8D70E1D4D55F13182 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_AudioThumbnail.cpp"; path = "../../JuceLibraryCode/modules/juce_audio_utils/gui/juce_AudioThumbnail.cpp"; sourceTree = "SOURCE_ROOT"; };
11591161
F5A00ACFA3D76168F22F1205 = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = System/Library/Frameworks/Cocoa.framework; sourceTree = SDKROOT; };
11601162
99E1BC08B886CFDD2CCFD462 = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "open-ephys.app"; sourceTree = "BUILT_PRODUCTS_DIR"; };
11611163
E39CC410838072043E3C30DC = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = OriginalRecording.cpp; path = ../../Source/Processors/RecordNode/OriginalRecording.cpp; sourceTree = "SOURCE_ROOT"; };
1162-
E8964C0BE264A55753BC6B7B = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_linux_Midi.cpp"; path = "../../JuceLibraryCode/modules/juce_audio_devices/native/juce_linux_Midi.cpp"; sourceTree = "SOURCE_ROOT"; };
11631164
E91A272EF06892937CB4B9CE = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_ComponentDragger.cpp"; path = "../../JuceLibraryCode/modules/juce_gui_basics/mouse/juce_ComponentDragger.cpp"; sourceTree = "SOURCE_ROOT"; };
1165+
E93BE115650B1CB80EACB841 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = EditorViewportButtons.h; path = ../../Source/UI/EditorViewportButtons.h; sourceTree = "SOURCE_ROOT"; };
11641166
E946426F95E0240683CB3337 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_DrawablePath.h"; path = "../../JuceLibraryCode/modules/juce_gui_basics/drawables/juce_DrawablePath.h"; sourceTree = "SOURCE_ROOT"; };
1167+
E97684DCE824DEDA6683C6CD = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_Synthesiser.cpp"; path = "../../JuceLibraryCode/modules/juce_audio_basics/synthesisers/juce_Synthesiser.cpp"; sourceTree = "SOURCE_ROOT"; };
1168+
EA2FC92CECD1EDA1F07DC59C = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_TooltipWindow.h"; path = "../../JuceLibraryCode/modules/juce_gui_basics/windows/juce_TooltipWindow.h"; sourceTree = "SOURCE_ROOT"; };
11651169
EA73332E3D5AEC04ADDFBB2A = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_AudioDataConverters.h"; path = "../../JuceLibraryCode/modules/juce_audio_basics/buffers/juce_AudioDataConverters.h"; sourceTree = "SOURCE_ROOT"; };
1170+
EAB2319C7AA57E06A2247CDF = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_BorderSize.h"; path = "../../JuceLibraryCode/modules/juce_graphics/geometry/juce_BorderSize.h"; sourceTree = "SOURCE_ROOT"; };
11661171
EAB637B566FEBBDADA654262 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_VSTMidiEventList.h"; path = "../../JuceLibraryCode/modules/juce_audio_processors/format_types/juce_VSTMidiEventList.h"; sourceTree = "SOURCE_ROOT"; };
1167-
EAB6A66678B122C578B16445 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_HighResolutionTimer.h"; path = "../../JuceLibraryCode/modules/juce_core/threads/juce_HighResolutionTimer.h"; sourceTree = "SOURCE_ROOT"; };
11681172
EAC262A83CD2BEA14542AE89 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_StringPool.h"; path = "../../JuceLibraryCode/modules/juce_core/text/juce_StringPool.h"; sourceTree = "SOURCE_ROOT"; };
11691173
EAC7A64301F0BF2C5E33A1F9 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_InterprocessConnectionServer.cpp"; path = "../../JuceLibraryCode/modules/juce_events/interprocess/juce_InterprocessConnectionServer.cpp"; sourceTree = "SOURCE_ROOT"; };
11701174
EAEA49B9394D802B79CA8164 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_StringPairArray.h"; path = "../../JuceLibraryCode/modules/juce_core/text/juce_StringPairArray.h"; sourceTree = "SOURCE_ROOT"; };
@@ -1184,7 +1188,6 @@
11841188
EEA51B7EF1CF19028C6672E0 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_DocumentWindow.cpp"; path = "../../JuceLibraryCode/modules/juce_gui_basics/windows/juce_DocumentWindow.cpp"; sourceTree = "SOURCE_ROOT"; };
11851189
EEFC66D2DF5FD66B4D83B22F = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_Component.h"; path = "../../JuceLibraryCode/modules/juce_gui_basics/components/juce_Component.h"; sourceTree = "SOURCE_ROOT"; };
11861190
EF059B26886B32000BCF8CFF = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_MouseInputSource.h"; path = "../../JuceLibraryCode/modules/juce_gui_basics/mouse/juce_MouseInputSource.h"; sourceTree = "SOURCE_ROOT"; };
1187-
EF3F9AA8D70E1D4D55F13182 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_AudioThumbnail.cpp"; path = "../../JuceLibraryCode/modules/juce_audio_utils/gui/juce_AudioThumbnail.cpp"; sourceTree = "SOURCE_ROOT"; };
11881191
EF4A6E0E1232071252ACCD7B = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_RelativeParallelogram.h"; path = "../../JuceLibraryCode/modules/juce_gui_basics/positioning/juce_RelativeParallelogram.h"; sourceTree = "SOURCE_ROOT"; };
11891192
EF610B2A17D9B1C0D24DCE67 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_android_JNIHelpers.h"; path = "../../JuceLibraryCode/modules/juce_core/native/juce_android_JNIHelpers.h"; sourceTree = "SOURCE_ROOT"; };
11901193
EF7B66764093D950724EFE70 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_OpenGLShaderProgram.h"; path = "../../JuceLibraryCode/modules/juce_opengl/opengl/juce_OpenGLShaderProgram.h"; sourceTree = "SOURCE_ROOT"; };
@@ -1512,6 +1515,8 @@
15121515
E2624A71F15AE5C96B34505B,
15131516
C4B85C0286AC2510730355E3, ); name = Processors; sourceTree = "<group>"; };
15141517
9FD23BB71495B921F7AC315C = {isa = PBXGroup; children = (
1518+
C25C0DDD703C77F4FDCE4DE6,
1519+
6397CF41ED94FBCD411C5E02,
15151520
6F201AA651C426427E515AF2,
15161521
C6B404239BFB396294D92170,
15171522
0BD711FD3C982C60B294F311,
@@ -2814,6 +2819,7 @@
28142819
1B620FC17AAECA4C5DE741E2,
28152820
19BB86C918F89D1377F8A0E1,
28162821
89223664B6CB2A912E36B091,
2822+
97B42624998C8E4E2A5C9BA7,
28172823
EE60D8FC7DCEC9C9AE545F4D,
28182824
43BDE8C7A1D17FC0CD2EF00D,
28192825
5A43E4E1547CBD9C2A635AEE,

‎Builds/VisualStudio2012/open-ephys.vcxproj‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -322,6 +322,7 @@
322322
<ClCompile Include="..\..\Source\Processors\Visualization\DataWindow.cpp"/>
323323
<ClCompile Include="..\..\Source\Processors\Visualization\SpikeObject.cpp"/>
324324
<ClCompile Include="..\..\Source\Processors\Visualization\MatlabLikePlot.cpp"/>
325+
<ClCompile Include="..\..\Source\UI\Utils\TiledButtonGroupManager.cpp"/>
325326
<ClCompile Include="..\..\Source\UI\Utils\LinearButtonGroupManager.cpp"/>
326327
<ClCompile Include="..\..\Source\UI\Utils\ButtonGroupManager.cpp"/>
327328
<ClCompile Include="..\..\Source\UI\LookAndFeel\MaterialButtonLookAndFeel.cpp"/>
@@ -1538,6 +1539,7 @@
15381539
<ClInclude Include="..\..\Source\Processors\Visualization\SpikeObject.h"/>
15391540
<ClInclude Include="..\..\Source\Processors\Visualization\Visualizer.h"/>
15401541
<ClInclude Include="..\..\Source\Processors\Visualization\MatlabLikePlot.h"/>
1542+
<ClInclude Include="..\..\Source\UI\Utils\TiledButtonGroupManager.h"/>
15411543
<ClInclude Include="..\..\Source\UI\Utils\LinearButtonGroupManager.h"/>
15421544
<ClInclude Include="..\..\Source\UI\Utils\ButtonGroupManager.h"/>
15431545
<ClInclude Include="..\..\Source\UI\LookAndFeel\MaterialButtonLookAndFeel.h"/>

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -607,6 +607,9 @@
607607
<ClCompile Include="..\..\Source\Processors\Visualization\MatlabLikePlot.cpp">
608608
<Filter>open-ephys\Source\Processors\Visualization</Filter>
609609
</ClCompile>
610+
<ClCompile Include="..\..\Source\UI\Utils\TiledButtonGroupManager.cpp">
611+
<Filter>open-ephys\Source\UI\Utils</Filter>
612+
</ClCompile>
610613
<ClCompile Include="..\..\Source\UI\Utils\LinearButtonGroupManager.cpp">
611614
<Filter>open-ephys\Source\UI\Utils</Filter>
612615
</ClCompile>
@@ -2112,6 +2115,9 @@
21122115
<ClInclude Include="..\..\Source\Processors\Visualization\MatlabLikePlot.h">
21132116
<Filter>open-ephys\Source\Processors\Visualization</Filter>
21142117
</ClInclude>
2118+
<ClInclude Include="..\..\Source\UI\Utils\TiledButtonGroupManager.h">
2119+
<Filter>open-ephys\Source\UI\Utils</Filter>
2120+
</ClInclude>
21152121
<ClInclude Include="..\..\Source\UI\Utils\LinearButtonGroupManager.h">
21162122
<Filter>open-ephys\Source\UI\Utils</Filter>
21172123
</ClInclude>

‎Builds/VisualStudio2013/open-ephys.vcxproj‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -326,6 +326,7 @@
326326
<ClCompile Include="..\..\Source\Processors\Visualization\DataWindow.cpp"/>
327327
<ClCompile Include="..\..\Source\Processors\Visualization\SpikeObject.cpp"/>
328328
<ClCompile Include="..\..\Source\Processors\Visualization\MatlabLikePlot.cpp"/>
329+
<ClCompile Include="..\..\Source\UI\Utils\TiledButtonGroupManager.cpp"/>
329330
<ClCompile Include="..\..\Source\UI\Utils\LinearButtonGroupManager.cpp"/>
330331
<ClCompile Include="..\..\Source\UI\Utils\ButtonGroupManager.cpp"/>
331332
<ClCompile Include="..\..\Source\UI\LookAndFeel\MaterialButtonLookAndFeel.cpp"/>
@@ -1542,6 +1543,7 @@
15421543
<ClInclude Include="..\..\Source\Processors\Visualization\SpikeObject.h"/>
15431544
<ClInclude Include="..\..\Source\Processors\Visualization\Visualizer.h"/>
15441545
<ClInclude Include="..\..\Source\Processors\Visualization\MatlabLikePlot.h"/>
1546+
<ClInclude Include="..\..\Source\UI\Utils\TiledButtonGroupManager.h"/>
15451547
<ClInclude Include="..\..\Source\UI\Utils\LinearButtonGroupManager.h"/>
15461548
<ClInclude Include="..\..\Source\UI\Utils\ButtonGroupManager.h"/>
15471549
<ClInclude Include="..\..\Source\UI\LookAndFeel\MaterialButtonLookAndFeel.h"/>

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -607,6 +607,9 @@
607607
<ClCompile Include="..\..\Source\Processors\Visualization\MatlabLikePlot.cpp">
608608
<Filter>open-ephys\Source\Processors\Visualization</Filter>
609609
</ClCompile>
610+
<ClCompile Include="..\..\Source\UI\Utils\TiledButtonGroupManager.cpp">
611+
<Filter>open-ephys\Source\UI\Utils</Filter>
612+
</ClCompile>
610613
<ClCompile Include="..\..\Source\UI\Utils\LinearButtonGroupManager.cpp">
611614
<Filter>open-ephys\Source\UI\Utils</Filter>
612615
</ClCompile>
@@ -2112,6 +2115,9 @@
21122115
<ClInclude Include="..\..\Source\Processors\Visualization\MatlabLikePlot.h">
21132116
<Filter>open-ephys\Source\Processors\Visualization</Filter>
21142117
</ClInclude>
2118+
<ClInclude Include="..\..\Source\UI\Utils\TiledButtonGroupManager.h">
2119+
<Filter>open-ephys\Source\UI\Utils</Filter>
2120+
</ClInclude>
21152121
<ClInclude Include="..\..\Source\UI\Utils\LinearButtonGroupManager.h">
21162122
<Filter>open-ephys\Source\UI\Utils</Filter>
21172123
</ClInclude>

‎Source/UI/Utils/ButtonGroupManager.cpp‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,12 @@ ButtonGroupManager::ButtonGroupManager()
4141
}
4242

4343

44+
ButtonGroupManager::~ButtonGroupManager()
45+
{
46+
m_buttons.clear();
47+
}
48+
49+
4450
void ButtonGroupManager::paint (Graphics& g)
4551
{
4652
auto floatLocalBounds = getLocalBounds().toFloat();
@@ -75,6 +81,14 @@ int ButtonGroupManager::getNumButtons() const
7581
}
7682

7783

84+
Button* ButtonGroupManager::getButtonAt (int index) const
85+
{
86+
jassert (index >= 0 && index < m_buttons.size());
87+
88+
return m_buttons[index];
89+
}
90+
91+
7892
bool ButtonGroupManager::isRadioButtonMode() const
7993
{
8094
return m_isRadioButtonMode;
@@ -103,6 +117,7 @@ void ButtonGroupManager::removeButton (int index)
103117
if (index < 0
104118
|| index >= m_buttons.size())
105119
{
120+
jassertfalse;
106121
return;
107122
}
108123

‎Source/UI/Utils/ButtonGroupManager.h‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ class PLUGIN_API ButtonGroupManager : public Component
3939
{
4040
public:
4141
ButtonGroupManager();
42+
virtual ~ButtonGroupManager();
4243

4344
//==============================================================================
4445
/** A set of colour IDs to use to change the colour of various aspects of the button.
@@ -71,6 +72,9 @@ class PLUGIN_API ButtonGroupManager : public Component
7172
/** Returns the number of stored buttons. */
7273
int getNumButtons() const;
7374

75+
/** Returns the button at the given index */
76+
Button* getButtonAt (int index) const;
77+
7478
/** Return whether all managed buttons are in the radiobutton mode now */
7579
bool isRadioButtonMode() const;
7680

0 commit comments

Comments
 (0)