Skip to content

Commit 87368c8

Browse files
sept-ensept-en
committed
Merge branch 'development' of https://github.com/open-ephys/plugin-GUI into development
2 parents 43bbeed + 4f24c9e commit 87368c8

6 files changed

Lines changed: 32 additions & 7 deletions

File tree

‎Builds/MacOSX/Plugins/CAR/CAR.xcodeproj/project.pbxproj‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,14 @@
77
objects = {
88

99
/* Begin PBXBuildFile section */
10+
E15DCF7A1CA0676B00332C3A /* CAREditor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E15DCF781CA0676B00332C3A /* CAREditor.cpp */; };
1011
E1F558261C9B105C0035F88B /* CAR.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E1F558221C9B105C0035F88B /* CAR.cpp */; };
1112
E1F558281C9B105C0035F88B /* OpenEphysLib.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E1F558251C9B105C0035F88B /* OpenEphysLib.cpp */; };
1213
/* End PBXBuildFile section */
1314

1415
/* Begin PBXFileReference section */
16+
E15DCF781CA0676B00332C3A /* CAREditor.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CAREditor.cpp; sourceTree = "<group>"; };
17+
E15DCF791CA0676B00332C3A /* CAREditor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CAREditor.h; sourceTree = "<group>"; };
1518
E1F558141C9B0FCA0035F88B /* CAR.bundle */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = CAR.bundle; sourceTree = BUILT_PRODUCTS_DIR; };
1619
E1F558171C9B0FCA0035F88B /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
1720
E1F5581E1C9B10190035F88B /* Plugin.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Plugin.xcconfig; sourceTree = "<group>"; };
@@ -75,6 +78,8 @@
7578
children = (
7679
E1F558231C9B105C0035F88B /* CAR.h */,
7780
E1F558221C9B105C0035F88B /* CAR.cpp */,
81+
E15DCF791CA0676B00332C3A /* CAREditor.h */,
82+
E15DCF781CA0676B00332C3A /* CAREditor.cpp */,
7883
E1F558251C9B105C0035F88B /* OpenEphysLib.cpp */,
7984
);
8085
name = Source;
@@ -148,6 +153,7 @@
148153
buildActionMask = 2147483647;
149154
files = (
150155
E1F558281C9B105C0035F88B /* OpenEphysLib.cpp in Sources */,
156+
E15DCF7A1CA0676B00332C3A /* CAREditor.cpp in Sources */,
151157
E1F558261C9B105C0035F88B /* CAR.cpp in Sources */,
152158
);
153159
runOnlyForDeploymentPostprocessing = 0;

‎Builds/VisualStudio2013/Plugins/CommonAvgRef/CommonAvgRef.vcxproj‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -120,10 +120,12 @@
120120
</ItemDefinitionGroup>
121121
<ItemGroup>
122122
<ClCompile Include="..\..\..\..\Source\Plugins\CAR\CAR.cpp" />
123+
<ClCompile Include="..\..\..\..\Source\Plugins\CAR\CAREditor.cpp" />
123124
<ClCompile Include="..\..\..\..\Source\Plugins\CAR\OpenEphysLib.cpp" />
124125
</ItemGroup>
125126
<ItemGroup>
126127
<ClInclude Include="..\..\..\..\Source\Plugins\CAR\CAR.h" />
128+
<ClInclude Include="..\..\..\..\Source\Plugins\CAR\CAREditor.h" />
127129
</ItemGroup>
128130
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
129131
<ImportGroup Label="ExtensionTargets">

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,16 @@
2121
<ClCompile Include="..\..\..\..\Source\Plugins\CAR\OpenEphysLib.cpp">
2222
<Filter>Source Files</Filter>
2323
</ClCompile>
24+
<ClCompile Include="..\..\..\..\Source\Plugins\CAR\CAREditor.cpp">
25+
<Filter>Source Files</Filter>
26+
</ClCompile>
2427
</ItemGroup>
2528
<ItemGroup>
2629
<ClInclude Include="..\..\..\..\Source\Plugins\CAR\CAR.h">
2730
<Filter>Source Files</Filter>
2831
</ClInclude>
32+
<ClInclude Include="..\..\..\..\Source\Plugins\CAR\CAREditor.h">
33+
<Filter>Header Files</Filter>
34+
</ClInclude>
2935
</ItemGroup>
3036
</Project>

‎Builds/VisualStudio2013/open-ephys.sln‎

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,31 @@
1-
Microsoft Visual Studio Solution File, Format Version 11.00
1+
Microsoft Visual Studio Solution File, Format Version 12.00
22
# Visual Studio 2013
3-
Project("{5A05F353-1D63-394C-DFB0-981BB2309002}") = "open-ephys", "open-ephys.vcxproj", "{9C924D66-7DEC-1AEF-B375-DB8666BFB909}"
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}"
46
EndProject
57
Global
68
GlobalSection(SolutionConfigurationPlatforms) = preSolution
79
Debug|Win32 = Debug|Win32
8-
Release|Win32 = Release|Win32
10+
Debug|x64 = Debug|x64
11+
Debug64|Win32 = Debug64|Win32
912
Debug64|x64 = Debug64|x64
13+
Release|Win32 = Release|Win32
14+
Release|x64 = Release|x64
15+
Release64|Win32 = Release64|Win32
1016
Release64|x64 = Release64|x64
1117
EndGlobalSection
1218
GlobalSection(ProjectConfigurationPlatforms) = postSolution
1319
{9C924D66-7DEC-1AEF-B375-DB8666BFB909}.Debug|Win32.ActiveCfg = Debug|Win32
1420
{9C924D66-7DEC-1AEF-B375-DB8666BFB909}.Debug|Win32.Build.0 = Debug|Win32
15-
{9C924D66-7DEC-1AEF-B375-DB8666BFB909}.Release|Win32.ActiveCfg = Release|Win32
16-
{9C924D66-7DEC-1AEF-B375-DB8666BFB909}.Release|Win32.Build.0 = Release|Win32
21+
{9C924D66-7DEC-1AEF-B375-DB8666BFB909}.Debug|x64.ActiveCfg = Debug|Win32
22+
{9C924D66-7DEC-1AEF-B375-DB8666BFB909}.Debug64|Win32.ActiveCfg = Debug64|x64
1723
{9C924D66-7DEC-1AEF-B375-DB8666BFB909}.Debug64|x64.ActiveCfg = Debug64|x64
1824
{9C924D66-7DEC-1AEF-B375-DB8666BFB909}.Debug64|x64.Build.0 = Debug64|x64
25+
{9C924D66-7DEC-1AEF-B375-DB8666BFB909}.Release|Win32.ActiveCfg = Release|Win32
26+
{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
1929
{9C924D66-7DEC-1AEF-B375-DB8666BFB909}.Release64|x64.ActiveCfg = Release64|x64
2030
{9C924D66-7DEC-1AEF-B375-DB8666BFB909}.Release64|x64.Build.0 = Release64|x64
2131
EndGlobalSection

‎Source/Processors/Editors/ChannelSelector.h‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@ class PLUGIN_API ChannelSelector : public Component
5555
class PLUGIN_API Listener
5656
{
5757
public:
58+
virtual ~Listener() { }
5859
virtual void channelSelectionChanged (int channel, bool newState) = 0;
5960
};
6061

‎Source/UI/Utils/ButtonGroupManager.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,8 @@ ButtonGroupManager::ButtonGroupManager()
4242
: m_isRadioButtonMode (true)
4343
, m_isShowDividers (true)
4444
, m_selectedButtonIdx (0)
45-
, m_currentButtonLineX (0.f)
4645
, m_desiredButtonLineX (0.f)
46+
, m_currentButtonLineX (0.f)
4747
, m_animationStepX (0.f)
4848
, m_buttonListener (nullptr)
4949
, m_backgroundColour (Colour (0x0))
@@ -71,7 +71,7 @@ void ButtonGroupManager::paint (Graphics& g)
7171

7272
void ButtonGroupManager::paintOverChildren (Graphics& g)
7373
{
74-
const int width = getWidth();
74+
//const int width = getWidth();
7575
const int height = getHeight();
7676

7777
// Draw dividers between buttons

0 commit comments

Comments
 (0)