Skip to content

Commit 5610198

Browse files
committed
Moved ChannelSelector's parser related components to the separate class.
* Created SlicerChannelSelectorComponent class which holds inside all ChannelSelector's parser related components and which takes responsibility for parsing selected range, etc. * Added possibility to collapse parser related components. * Added animations. * UI improvements. * Minor bugs fixes.
1 parent 27df95c commit 5610198

11 files changed

Lines changed: 421 additions & 250 deletions

File tree

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -430,6 +430,7 @@
430430
482A60A44EE6CB84FCB9DC88 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_AudioThumbnailBase.h"; path = "../../JuceLibraryCode/modules/juce_audio_utils/gui/juce_AudioThumbnailBase.h"; sourceTree = "SOURCE_ROOT"; };
431431
483ABD5C1CF789943AB4AFB6 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_ComponentPeer.h"; path = "../../JuceLibraryCode/modules/juce_gui_basics/windows/juce_ComponentPeer.h"; sourceTree = "SOURCE_ROOT"; };
432432
488D1B00C9E5FE4DAB035EDF = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = "juce_cryptography.mm"; path = "../../JuceLibraryCode/modules/juce_cryptography/juce_cryptography.mm"; sourceTree = "SOURCE_ROOT"; };
433+
489FFFB50604DA6AC9BE24AF = {isa = PBXFileReference; lastKnownFileType = image.png; name = "dropdown_arrow.png"; path = "../../Resources/Images/Buttons/dropdown_arrow.png"; sourceTree = "SOURCE_ROOT"; };
433434
48E4FA55FD4440AF44EEA437 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_linux_FileChooser.cpp"; path = "../../JuceLibraryCode/modules/juce_gui_basics/native/juce_linux_FileChooser.cpp"; sourceTree = "SOURCE_ROOT"; };
434435
48F6281AB92B232E5187D00C = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = SignalChainManager.h; path = ../../Source/UI/SignalChainManager.h; sourceTree = "SOURCE_ROOT"; };
435436
496180D5D96088CBB59035B1 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_DrawableShape.h"; path = "../../JuceLibraryCode/modules/juce_gui_basics/drawables/juce_DrawableShape.h"; sourceTree = "SOURCE_ROOT"; };
@@ -1324,6 +1325,7 @@
13241325
8AE2DDA47B2DFDEEEF69B12F,
13251326
DA0AE9F4A1DDC3555247216F, ); name = Icons; sourceTree = "<group>"; };
13261327
5B916D6239703986EFCDB624 = {isa = PBXGroup; children = (
1328+
489FFFB50604DA6AC9BE24AF,
13271329
C5D9C53AE4AE414244E1E19A,
13281330
A764EF4F46F472715B250E41,
13291331
05C35036E964AAD6024E0766,

Builds/VisualStudio2012/open-ephys.vcxproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2072,6 +2072,7 @@
20722072
<None Include="..\..\Resources\Images\Icons\DefaultDataSource.png"/>
20732073
<None Include="..\..\Resources\Images\Icons\FileReaderIcon.png"/>
20742074
<None Include="..\..\Resources\Images\Icons\IntanIcon.png"/>
2075+
<None Include="..\..\Resources\Images\Buttons\dropdown_arrow.png"/>
20752076
<None Include="..\..\Resources\Images\Buttons\muteoff.png"/>
20762077
<None Include="..\..\Resources\Images\Buttons\muteon.png"/>
20772078
<None Include="..\..\Resources\Images\Buttons\MergerA-01.png"/>

Builds/VisualStudio2012/open-ephys.vcxproj.filters

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3713,6 +3713,9 @@
37133713
<None Include="..\..\Resources\Images\Icons\IntanIcon.png">
37143714
<Filter>open-ephys\Resources\Images\Icons</Filter>
37153715
</None>
3716+
<None Include="..\..\Resources\Images\Buttons\dropdown_arrow.png">
3717+
<Filter>open-ephys\Resources\Images\Buttons</Filter>
3718+
</None>
37163719
<None Include="..\..\Resources\Images\Buttons\muteoff.png">
37173720
<Filter>open-ephys\Resources\Images\Buttons</Filter>
37183721
</None>

Builds/VisualStudio2013/open-ephys.vcxproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2076,6 +2076,7 @@
20762076
<None Include="..\..\Resources\Images\Icons\DefaultDataSource.png"/>
20772077
<None Include="..\..\Resources\Images\Icons\FileReaderIcon.png"/>
20782078
<None Include="..\..\Resources\Images\Icons\IntanIcon.png"/>
2079+
<None Include="..\..\Resources\Images\Buttons\dropdown_arrow.png"/>
20792080
<None Include="..\..\Resources\Images\Buttons\muteoff.png"/>
20802081
<None Include="..\..\Resources\Images\Buttons\muteon.png"/>
20812082
<None Include="..\..\Resources\Images\Buttons\MergerA-01.png"/>

Builds/VisualStudio2013/open-ephys.vcxproj.filters

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3713,6 +3713,9 @@
37133713
<None Include="..\..\Resources\Images\Icons\IntanIcon.png">
37143714
<Filter>open-ephys\Resources\Images\Icons</Filter>
37153715
</None>
3716+
<None Include="..\..\Resources\Images\Buttons\dropdown_arrow.png">
3717+
<Filter>open-ephys\Resources\Images\Buttons</Filter>
3718+
</None>
37163719
<None Include="..\..\Resources\Images\Buttons\muteoff.png">
37173720
<Filter>open-ephys\Resources\Images\Buttons</Filter>
37183721
</None>

JuceLibraryCode/BinaryData.cpp

Lines changed: 46 additions & 20 deletions
Large diffs are not rendered by default.

JuceLibraryCode/BinaryData.h

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -174,6 +174,9 @@ namespace BinaryData
174174
extern const char* IntanIcon_png;
175175
const int IntanIcon_pngSize = 16352;
176176

177+
extern const char* dropdown_arrow_png;
178+
const int dropdown_arrow_pngSize = 1295;
179+
177180
extern const char* muteoff_png;
178181
const int muteoff_pngSize = 532;
179182

@@ -208,7 +211,7 @@ namespace BinaryData
208211
extern const char* namedResourceList[];
209212

210213
// Number of elements in the namedResourceList array.
211-
const int namedResourceListSize = 65;
214+
const int namedResourceListSize = 66;
212215

213216
// If you provide the name of one of the binary resource variables above, this function will
214217
// return the corresponding data and its size (or a null pointer if the name isn't found).
1.26 KB
Loading

0 commit comments

Comments
 (0)