Skip to content

Commit ae42eb3

Browse files
ethanbbethanbb
committed
Merge branch 'development' into dsp-common
2 parents 17cef13 + e509a30 commit ae42eb3

35 files changed

Lines changed: 13278 additions & 3615 deletions

‎Builds/Linux/build/libokFrontPanel.so‎

188 KB
Binary file not shown.

‎Builds/MacOSX/OpenEphys.xcworkspace/contents.xcworkspacedata‎

Lines changed: 3 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Builds/MacOSX/OpenEphys.xcworkspace/xcshareddata/xcschemes/All.xcscheme‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -179,6 +179,20 @@
179179
ReferencedContainer = "container:Plugins/LfpDisplayNode/LfpDisplayNode.xcodeproj">
180180
</BuildableReference>
181181
</BuildActionEntry>
182+
<BuildActionEntry
183+
buildForTesting = "YES"
184+
buildForRunning = "YES"
185+
buildForProfiling = "YES"
186+
buildForArchiving = "YES"
187+
buildForAnalyzing = "YES">
188+
<BuildableReference
189+
BuildableIdentifier = "primary"
190+
BlueprintIdentifier = "D3E60EE41CD19893003FDF5C"
191+
BuildableName = "LfpDisplayNodeAlpha.bundle"
192+
BlueprintName = "LfpDisplayNodeAlpha"
193+
ReferencedContainer = "container:Plugins/LfpDisplayNodeAlpha/LfpDisplayNodeAlpha.xcodeproj">
194+
</BuildableReference>
195+
</BuildActionEntry>
182196
<BuildActionEntry
183197
buildForTesting = "YES"
184198
buildForRunning = "YES"

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

Lines changed: 223 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,223 @@
1+
// !$*UTF8*$!
2+
{
3+
archiveVersion = 1;
4+
classes = {
5+
};
6+
objectVersion = 46;
7+
objects = {
8+
9+
/* Begin PBXBuildFile section */
10+
D3E60EF61CD198D2003FDF5C /* LfpDisplayCanvas.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D3E60EEF1CD198D2003FDF5C /* LfpDisplayCanvas.cpp */; };
11+
D3E60EF71CD198D2003FDF5C /* LfpDisplayEditor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D3E60EF11CD198D2003FDF5C /* LfpDisplayEditor.cpp */; };
12+
D3E60EF81CD198D2003FDF5C /* LfpDisplayNode.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D3E60EF31CD198D2003FDF5C /* LfpDisplayNode.cpp */; };
13+
D3E60EF91CD198D2003FDF5C /* OpenEphysLib.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D3E60EF51CD198D2003FDF5C /* OpenEphysLib.cpp */; };
14+
/* End PBXBuildFile section */
15+
16+
/* Begin PBXFileReference section */
17+
D3E60EE51CD19893003FDF5C /* LfpDisplayNodeAlpha.bundle */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = LfpDisplayNodeAlpha.bundle; sourceTree = BUILT_PRODUCTS_DIR; };
18+
D3E60EE81CD19893003FDF5C /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
19+
D3E60EEF1CD198D2003FDF5C /* LfpDisplayCanvas.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LfpDisplayCanvas.cpp; path = ../../../../Source/Plugins/LfpDisplayNodeAlpha/LfpDisplayCanvas.cpp; sourceTree = "<group>"; };
20+
D3E60EF01CD198D2003FDF5C /* LfpDisplayCanvas.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = LfpDisplayCanvas.h; path = ../../../../Source/Plugins/LfpDisplayNodeAlpha/LfpDisplayCanvas.h; sourceTree = "<group>"; };
21+
D3E60EF11CD198D2003FDF5C /* LfpDisplayEditor.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LfpDisplayEditor.cpp; path = ../../../../Source/Plugins/LfpDisplayNodeAlpha/LfpDisplayEditor.cpp; sourceTree = "<group>"; };
22+
D3E60EF21CD198D2003FDF5C /* LfpDisplayEditor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = LfpDisplayEditor.h; path = ../../../../Source/Plugins/LfpDisplayNodeAlpha/LfpDisplayEditor.h; sourceTree = "<group>"; };
23+
D3E60EF31CD198D2003FDF5C /* LfpDisplayNode.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LfpDisplayNode.cpp; path = ../../../../Source/Plugins/LfpDisplayNodeAlpha/LfpDisplayNode.cpp; sourceTree = "<group>"; };
24+
D3E60EF41CD198D2003FDF5C /* LfpDisplayNode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = LfpDisplayNode.h; path = ../../../../Source/Plugins/LfpDisplayNodeAlpha/LfpDisplayNode.h; sourceTree = "<group>"; };
25+
D3E60EF51CD198D2003FDF5C /* OpenEphysLib.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = OpenEphysLib.cpp; path = ../../../../Source/Plugins/LfpDisplayNodeAlpha/OpenEphysLib.cpp; sourceTree = "<group>"; };
26+
D3E60EFA1CD198E6003FDF5C /* Plugin_Debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Plugin_Debug.xcconfig; path = ../Config/Plugin_Debug.xcconfig; sourceTree = "<group>"; };
27+
D3E60EFB1CD198E6003FDF5C /* Plugin_Release.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Plugin_Release.xcconfig; path = ../Config/Plugin_Release.xcconfig; sourceTree = "<group>"; };
28+
/* End PBXFileReference section */
29+
30+
/* Begin PBXFrameworksBuildPhase section */
31+
D3E60EE21CD19893003FDF5C /* Frameworks */ = {
32+
isa = PBXFrameworksBuildPhase;
33+
buildActionMask = 2147483647;
34+
files = (
35+
);
36+
runOnlyForDeploymentPostprocessing = 0;
37+
};
38+
/* End PBXFrameworksBuildPhase section */
39+
40+
/* Begin PBXGroup section */
41+
D3E60EDC1CD19893003FDF5C = {
42+
isa = PBXGroup;
43+
children = (
44+
D3E60F001CD198E9003FDF5C /* Config */,
45+
D3E60EE71CD19893003FDF5C /* LfpDisplayNodeAlpha */,
46+
D3E60EE61CD19893003FDF5C /* Products */,
47+
);
48+
sourceTree = "<group>";
49+
};
50+
D3E60EE61CD19893003FDF5C /* Products */ = {
51+
isa = PBXGroup;
52+
children = (
53+
D3E60EE51CD19893003FDF5C /* LfpDisplayNodeAlpha.bundle */,
54+
);
55+
name = Products;
56+
sourceTree = "<group>";
57+
};
58+
D3E60EE71CD19893003FDF5C /* LfpDisplayNodeAlpha */ = {
59+
isa = PBXGroup;
60+
children = (
61+
D3E60EEE1CD19899003FDF5C /* Source */,
62+
D3E60EE81CD19893003FDF5C /* Info.plist */,
63+
);
64+
path = LfpDisplayNodeAlpha;
65+
sourceTree = "<group>";
66+
};
67+
D3E60EEE1CD19899003FDF5C /* Source */ = {
68+
isa = PBXGroup;
69+
children = (
70+
D3E60EEF1CD198D2003FDF5C /* LfpDisplayCanvas.cpp */,
71+
D3E60EF01CD198D2003FDF5C /* LfpDisplayCanvas.h */,
72+
D3E60EF11CD198D2003FDF5C /* LfpDisplayEditor.cpp */,
73+
D3E60EF21CD198D2003FDF5C /* LfpDisplayEditor.h */,
74+
D3E60EF31CD198D2003FDF5C /* LfpDisplayNode.cpp */,
75+
D3E60EF41CD198D2003FDF5C /* LfpDisplayNode.h */,
76+
D3E60EF51CD198D2003FDF5C /* OpenEphysLib.cpp */,
77+
);
78+
name = Source;
79+
path = ..;
80+
sourceTree = "<group>";
81+
};
82+
D3E60F001CD198E9003FDF5C /* Config */ = {
83+
isa = PBXGroup;
84+
children = (
85+
D3E60EFA1CD198E6003FDF5C /* Plugin_Debug.xcconfig */,
86+
D3E60EFB1CD198E6003FDF5C /* Plugin_Release.xcconfig */,
87+
);
88+
name = Config;
89+
sourceTree = "<group>";
90+
};
91+
/* End PBXGroup section */
92+
93+
/* Begin PBXNativeTarget section */
94+
D3E60EE41CD19893003FDF5C /* LfpDisplayNodeAlpha */ = {
95+
isa = PBXNativeTarget;
96+
buildConfigurationList = D3E60EEB1CD19893003FDF5C /* Build configuration list for PBXNativeTarget "LfpDisplayNodeAlpha" */;
97+
buildPhases = (
98+
D3E60EE11CD19893003FDF5C /* Sources */,
99+
D3E60EE21CD19893003FDF5C /* Frameworks */,
100+
D3E60EE31CD19893003FDF5C /* Resources */,
101+
);
102+
buildRules = (
103+
);
104+
dependencies = (
105+
);
106+
name = LfpDisplayNodeAlpha;
107+
productName = LfpDisplayNodeAlpha;
108+
productReference = D3E60EE51CD19893003FDF5C /* LfpDisplayNodeAlpha.bundle */;
109+
productType = "com.apple.product-type.bundle";
110+
};
111+
/* End PBXNativeTarget section */
112+
113+
/* Begin PBXProject section */
114+
D3E60EDD1CD19893003FDF5C /* Project object */ = {
115+
isa = PBXProject;
116+
attributes = {
117+
LastUpgradeCheck = 0730;
118+
ORGANIZATIONNAME = "open-ephys";
119+
TargetAttributes = {
120+
D3E60EE41CD19893003FDF5C = {
121+
CreatedOnToolsVersion = 7.0;
122+
};
123+
};
124+
};
125+
buildConfigurationList = D3E60EE01CD19893003FDF5C /* Build configuration list for PBXProject "LfpDisplayNodeAlpha" */;
126+
compatibilityVersion = "Xcode 3.2";
127+
developmentRegion = English;
128+
hasScannedForEncodings = 0;
129+
knownRegions = (
130+
en,
131+
);
132+
mainGroup = D3E60EDC1CD19893003FDF5C;
133+
productRefGroup = D3E60EE61CD19893003FDF5C /* Products */;
134+
projectDirPath = "";
135+
projectRoot = "";
136+
targets = (
137+
D3E60EE41CD19893003FDF5C /* LfpDisplayNodeAlpha */,
138+
);
139+
};
140+
/* End PBXProject section */
141+
142+
/* Begin PBXResourcesBuildPhase section */
143+
D3E60EE31CD19893003FDF5C /* Resources */ = {
144+
isa = PBXResourcesBuildPhase;
145+
buildActionMask = 2147483647;
146+
files = (
147+
);
148+
runOnlyForDeploymentPostprocessing = 0;
149+
};
150+
/* End PBXResourcesBuildPhase section */
151+
152+
/* Begin PBXSourcesBuildPhase section */
153+
D3E60EE11CD19893003FDF5C /* Sources */ = {
154+
isa = PBXSourcesBuildPhase;
155+
buildActionMask = 2147483647;
156+
files = (
157+
D3E60EF71CD198D2003FDF5C /* LfpDisplayEditor.cpp in Sources */,
158+
D3E60EF61CD198D2003FDF5C /* LfpDisplayCanvas.cpp in Sources */,
159+
D3E60EF81CD198D2003FDF5C /* LfpDisplayNode.cpp in Sources */,
160+
D3E60EF91CD198D2003FDF5C /* OpenEphysLib.cpp in Sources */,
161+
);
162+
runOnlyForDeploymentPostprocessing = 0;
163+
};
164+
/* End PBXSourcesBuildPhase section */
165+
166+
/* Begin XCBuildConfiguration section */
167+
D3E60EE91CD19893003FDF5C /* Debug */ = {
168+
isa = XCBuildConfiguration;
169+
baseConfigurationReference = D3E60EFA1CD198E6003FDF5C /* Plugin_Debug.xcconfig */;
170+
buildSettings = {
171+
};
172+
name = Debug;
173+
};
174+
D3E60EEA1CD19893003FDF5C /* Release */ = {
175+
isa = XCBuildConfiguration;
176+
baseConfigurationReference = D3E60EFB1CD198E6003FDF5C /* Plugin_Release.xcconfig */;
177+
buildSettings = {
178+
};
179+
name = Release;
180+
};
181+
D3E60EEC1CD19893003FDF5C /* Debug */ = {
182+
isa = XCBuildConfiguration;
183+
buildSettings = {
184+
INFOPLIST_FILE = LfpDisplayNodeAlpha/Info.plist;
185+
PRODUCT_BUNDLE_IDENTIFIER = "open-ephys.LfpDisplayNodeAlpha";
186+
PRODUCT_NAME = "$(TARGET_NAME)";
187+
};
188+
name = Debug;
189+
};
190+
D3E60EED1CD19893003FDF5C /* Release */ = {
191+
isa = XCBuildConfiguration;
192+
buildSettings = {
193+
INFOPLIST_FILE = LfpDisplayNodeAlpha/Info.plist;
194+
PRODUCT_BUNDLE_IDENTIFIER = "open-ephys.LfpDisplayNodeAlpha";
195+
PRODUCT_NAME = "$(TARGET_NAME)";
196+
};
197+
name = Release;
198+
};
199+
/* End XCBuildConfiguration section */
200+
201+
/* Begin XCConfigurationList section */
202+
D3E60EE01CD19893003FDF5C /* Build configuration list for PBXProject "LfpDisplayNodeAlpha" */ = {
203+
isa = XCConfigurationList;
204+
buildConfigurations = (
205+
D3E60EE91CD19893003FDF5C /* Debug */,
206+
D3E60EEA1CD19893003FDF5C /* Release */,
207+
);
208+
defaultConfigurationIsVisible = 0;
209+
defaultConfigurationName = Release;
210+
};
211+
D3E60EEB1CD19893003FDF5C /* Build configuration list for PBXNativeTarget "LfpDisplayNodeAlpha" */ = {
212+
isa = XCConfigurationList;
213+
buildConfigurations = (
214+
D3E60EEC1CD19893003FDF5C /* Debug */,
215+
D3E60EED1CD19893003FDF5C /* Release */,
216+
);
217+
defaultConfigurationIsVisible = 0;
218+
defaultConfigurationName = Release;
219+
};
220+
/* End XCConfigurationList section */
221+
};
222+
rootObject = D3E60EDD1CD19893003FDF5C /* Project object */;
223+
}

‎Builds/MacOSX/Plugins/LfpDisplayNodeAlpha/LfpDisplayNodeAlpha/Info.plist‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
3+
<plist version="1.0">
4+
<dict>
5+
<key>CFBundleDevelopmentRegion</key>
6+
<string>en</string>
7+
<key>CFBundleExecutable</key>
8+
<string>$(EXECUTABLE_NAME)</string>
9+
<key>CFBundleIdentifier</key>
10+
<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
11+
<key>CFBundleInfoDictionaryVersion</key>
12+
<string>6.0</string>
13+
<key>CFBundleName</key>
14+
<string>$(PRODUCT_NAME)</string>
15+
<key>CFBundlePackageType</key>
16+
<string>BNDL</string>
17+
<key>CFBundleShortVersionString</key>
18+
<string>1.0</string>
19+
<key>CFBundleSignature</key>
20+
<string>????</string>
21+
<key>CFBundleVersion</key>
22+
<string>1</string>
23+
<key>NSHumanReadableCopyright</key>
24+
<string>Copyright © 2016 open-ephys. All rights reserved.</string>
25+
<key>NSPrincipalClass</key>
26+
<string></string>
27+
</dict>
28+
</plist>

0 commit comments

Comments
 (0)