Skip to content
Snippets Groups Projects
Commit 87086e17 authored by unknown's avatar unknown
Browse files

Merge branch 'master' into vs2012 

Conflicts:
	Builds/VisualStudio2012/open-ephys.vcxproj
	Builds/VisualStudio2012/open-ephys.vcxproj.filters
	Source/Processors/DataThreads/FPGAThread.cpp
	Source/Processors/ProcessorGraph.cpp
parents ec916fdc 6a04e270
Branches
Tags
No related merge requests found
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 2103 additions and 152 deletions
Builds/Linux/Makefile
+ 41
− 17
View file @ 87086e17
......@@ -20,7 +20,7 @@ ifeq ($(CONFIG),Debug)
CPPFLAGS := $(DEPFLAGS) -D "LINUX=1" -D "DEBUG=1" -D "_DEBUG=1" -D "JUCER_LINUX_MAKE_7346DA2A=1" -I "/usr/include" -I "/usr/include/freetype2"
CFLAGS += $(CPPFLAGS) $(TARGET_ARCH) -g -ggdb -O0
CXXFLAGS += $(CFLAGS) -export-dynamic -g -pg
LDFLAGS += -L$(BINDIR) -L$(LIBDIR) -L"/usr/X11R6/lib/" -L"../../JuceLibraryCode/bin" -lfreetype -lpthread -lrt -lX11 -lGL -lGLU -lXinerama -lasound -lftdi -lftgl -pg
LDFLAGS += -L$(BINDIR) -L$(LIBDIR) -L"/usr/X11R6/lib/" -L"../../JuceLibraryCode/bin" -lfreetype -lpthread -lrt -lX11 -lGL -lGLU -lXinerama -lasound -lftdi -lftgl -pg -ldl -lXext
LDDEPS :=
RESFLAGS := -D "LINUX=1" -D "DEBUG=1" -D "_DEBUG=1" -D "JUCER_LINUX_MAKE_7346DA2A=1" -I "/usr/include" -I "/usr/include/freetype2"
TARGET := open-ephys
......@@ -35,7 +35,7 @@ ifeq ($(CONFIG),Release)
CPPFLAGS := $(DEPFLAGS) -D "LINUX=1" -D "NDEBUG=1" -D "JUCER_LINUX_MAKE_7346DA2A=1" -I "/usr/include" -I "/usr/include/freetype2"
CFLAGS += $(CPPFLAGS) $(TARGET_ARCH) -O3
CXXFLAGS += $(CFLAGS) -export-dynamic -g -pg
LDFLAGS += -L$(BINDIR) -L$(LIBDIR) -L"/usr/X11R6/lib/" -L"../../JuceLibraryCode/bin" -lfreetype -lpthread -lrt -lX11 -lGL -lGLU -lXinerama -lasound -lftdi -lftgl -pg
LDFLAGS += -L$(BINDIR) -L$(LIBDIR) -L"/usr/X11R6/lib/" -L"../../JuceLibraryCode/bin" -lfreetype -lpthread -lrt -lX11 -lGL -lGLU -lXinerama -lasound -lftdi -lftgl -pg -ldl -lXext
LDDEPS :=
RESFLAGS := -D "LINUX=1" -D "NDEBUG=1" -D "JUCER_LINUX_MAKE_7346DA2A=1" -I "/usr/include" -I "/usr/include/freetype2"
TARGET := open-ephys
......@@ -63,6 +63,10 @@ OBJECTS := \
$(OBJDIR)/RootFinder_239a995f.o \
$(OBJDIR)/State_22979684.o \
$(OBJDIR)/AudioComponent_521bd9c9.o \
$(OBJDIR)/ofArduino_12f202a5.o \
$(OBJDIR)/ofSerial_c3b0a9e1.o \
$(OBJDIR)/EventDetector_4807aa7b.o \
$(OBJDIR)/FPGAOutput_73b5ffd4.o \
$(OBJDIR)/ArduinoOutput_391e90c4.o \
$(OBJDIR)/Parameter_ae008024.o \
$(OBJDIR)/SpikeDisplayNode_9c52e4ad.o \
......@@ -70,13 +74,11 @@ OBJECTS := \
$(OBJDIR)/LfpDisplayNode_30ef22fd.o \
$(OBJDIR)/Merger_2f90542e.o \
$(OBJDIR)/Splitter_6e27a57b.o \
$(OBJDIR)/StereotrodePlot_4710b8f1.o \
$(OBJDIR)/ElectrodePlot_7a206ec4.o \
$(OBJDIR)/SpikePlot_c1cf98bd.o \
$(OBJDIR)/BaseUIElement_ec903c4d.o \
$(OBJDIR)/GenericAxes_d802ed92.o \
$(OBJDIR)/PlotUtils_9ef52686.o \
$(OBJDIR)/ProjectionAxes_7c67c3e8.o \
$(OBJDIR)/TetrodePlot_b42fd798.o \
$(OBJDIR)/WaveAxes_8adc45d2.o \
$(OBJDIR)/SpikeObject_24e8c655.o \
$(OBJDIR)/SpikeDisplayCanvas_b208ff6e.o \
......@@ -86,6 +88,8 @@ OBJECTS := \
$(OBJDIR)/SpikeDetector_300d85e7.o \
$(OBJDIR)/AudioNode_94606ff3.o \
$(OBJDIR)/EventNode_95c842b7.o \
$(OBJDIR)/FPGAOutputEditor_cfe00f8a.o \
$(OBJDIR)/ArduinoOutputEditor_1118f008.o \
$(OBJDIR)/ChannelSelector_c1430874.o \
$(OBJDIR)/ParameterEditor_91f62ae8.o \
$(OBJDIR)/SpikeDisplayEditor_e1812c1.o \
......@@ -249,6 +253,26 @@ $(OBJDIR)/AudioComponent_521bd9c9.o: ../../Source/Audio/AudioComponent.cpp
@echo "Compiling AudioComponent.cpp"
@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
$(OBJDIR)/ofArduino_12f202a5.o: ../../Source/Processors/Serial/ofArduino.cpp
-@mkdir -p $(OBJDIR)
@echo "Compiling ofArduino.cpp"
@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
$(OBJDIR)/ofSerial_c3b0a9e1.o: ../../Source/Processors/Serial/ofSerial.cpp
-@mkdir -p $(OBJDIR)
@echo "Compiling ofSerial.cpp"
@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
$(OBJDIR)/EventDetector_4807aa7b.o: ../../Source/Processors/EventDetector.cpp
-@mkdir -p $(OBJDIR)
@echo "Compiling EventDetector.cpp"
@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
$(OBJDIR)/FPGAOutput_73b5ffd4.o: ../../Source/Processors/FPGAOutput.cpp
-@mkdir -p $(OBJDIR)
@echo "Compiling FPGAOutput.cpp"
@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
$(OBJDIR)/ArduinoOutput_391e90c4.o: ../../Source/Processors/ArduinoOutput.cpp
-@mkdir -p $(OBJDIR)
@echo "Compiling ArduinoOutput.cpp"
......@@ -284,14 +308,9 @@ $(OBJDIR)/Splitter_6e27a57b.o: ../../Source/Processors/Utilities/Splitter.cpp
@echo "Compiling Splitter.cpp"
@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
$(OBJDIR)/StereotrodePlot_4710b8f1.o: ../../Source/Processors/Visualization/SpikePlotting/StereotrodePlot.cpp
$(OBJDIR)/SpikePlot_c1cf98bd.o: ../../Source/Processors/Visualization/SpikePlotting/SpikePlot.cpp
-@mkdir -p $(OBJDIR)
@echo "Compiling StereotrodePlot.cpp"
@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
$(OBJDIR)/ElectrodePlot_7a206ec4.o: ../../Source/Processors/Visualization/SpikePlotting/ElectrodePlot.cpp
-@mkdir -p $(OBJDIR)
@echo "Compiling ElectrodePlot.cpp"
@echo "Compiling SpikePlot.cpp"
@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
$(OBJDIR)/BaseUIElement_ec903c4d.o: ../../Source/Processors/Visualization/SpikePlotting/BaseUIElement.cpp
......@@ -314,11 +333,6 @@ $(OBJDIR)/ProjectionAxes_7c67c3e8.o: ../../Source/Processors/Visualization/Spike
@echo "Compiling ProjectionAxes.cpp"
@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
$(OBJDIR)/TetrodePlot_b42fd798.o: ../../Source/Processors/Visualization/SpikePlotting/TetrodePlot.cpp
-@mkdir -p $(OBJDIR)
@echo "Compiling TetrodePlot.cpp"
@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
$(OBJDIR)/WaveAxes_8adc45d2.o: ../../Source/Processors/Visualization/SpikePlotting/WaveAxes.cpp
-@mkdir -p $(OBJDIR)
@echo "Compiling WaveAxes.cpp"
......@@ -364,6 +378,16 @@ $(OBJDIR)/EventNode_95c842b7.o: ../../Source/Processors/EventNode.cpp
@echo "Compiling EventNode.cpp"
@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
$(OBJDIR)/FPGAOutputEditor_cfe00f8a.o: ../../Source/Processors/Editors/FPGAOutputEditor.cpp
-@mkdir -p $(OBJDIR)
@echo "Compiling FPGAOutputEditor.cpp"
@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
$(OBJDIR)/ArduinoOutputEditor_1118f008.o: ../../Source/Processors/Editors/ArduinoOutputEditor.cpp
-@mkdir -p $(OBJDIR)
@echo "Compiling ArduinoOutputEditor.cpp"
@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
$(OBJDIR)/ChannelSelector_c1430874.o: ../../Source/Processors/Editors/ChannelSelector.cpp
-@mkdir -p $(OBJDIR)
@echo "Compiling ChannelSelector.cpp"
......
Builds/Linux/build/libokFrontPanel64.so
+ 0
− 0
View file @ 87086e17
No preview for this file type
Builds/Linux/build/pipetest.bit 0 → 100644
+ 0
− 0
View file @ 87086e17
File added
Builds/Linux/build/pipetest32.bit 0 → 100644
+ 0
− 0
View file @ 87086e17
File added
Builds/MacOSX/Info.plist 100644 → 100755
+ 0
− 0
View file @ 87086e17
File mode changed from 100644 to 100755
Builds/MacOSX/open-ephys.xcodeproj/project.pbxproj
+ 79
− 57
View file @ 87086e17
This diff is collapsed.
Builds/MacOSX/open-ephys.xcodeproj/project.xcworkspace/contents.xcworkspacedata 100644 → 100755
+ 0
− 0
View file @ 87086e17
File mode changed from 100644 to 100755
Builds/MacOSX/open-ephys.xcodeproj/project.xcworkspace/xcuserdata/Josh.xcuserdatad/UserInterfaceState.xcuserstate 100644 → 100755
+ 0
− 0
View file @ 87086e17
No preview for this file type
Builds/MacOSX/open-ephys.xcodeproj/project.xcworkspace/xcuserdata/Josh.xcuserdatad/WorkspaceSettings.xcsettings 100644 → 100755
+ 0
− 0
View file @ 87086e17
File mode changed from 100644 to 100755
Builds/MacOSX/open-ephys.xcodeproj/xcuserdata/Josh.xcuserdatad/xcschemes/open-ephys.xcscheme 100644 → 100755
+ 0
− 0
View file @ 87086e17
File mode changed from 100644 to 100755
Builds/MacOSX/open-ephys.xcodeproj/xcuserdata/Josh.xcuserdatad/xcschemes/xcschememanagement.plist 100644 → 100755
+ 0
− 0
View file @ 87086e17
File mode changed from 100644 to 100755
Builds/Test.xcworkspace/contents.xcworkspacedata 100644 → 100755
+ 0
− 0
View file @ 87086e17
File mode changed from 100644 to 100755
Builds/Test.xcworkspace/xcuserdata/Josh.xcuserdatad/UserInterfaceState.xcuserstate 100644 → 100755
+ 0
− 0
View file @ 87086e17
No preview for this file type
Builds/Test.xcworkspace/xcuserdata/Josh.xcuserdatad/WorkspaceSettings.xcsettings 100644 → 100755
+ 0
− 0
View file @ 87086e17
File mode changed from 100644 to 100755
Builds/VisualStudio2012/open-ephys.sln 100644 → 100755
+ 0
− 0
View file @ 87086e17
File mode changed from 100644 to 100755
Builds/VisualStudio2012/open-ephys.vcxproj
+ 7
− 7
View file @ 87086e17
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
......@@ -166,13 +166,11 @@
<ClCompile Include="..\..\Source\Processors\LfpDisplayNode.cpp" />
<ClCompile Include="..\..\Source\Processors\Utilities\Merger.cpp" />
<ClCompile Include="..\..\Source\Processors\Utilities\Splitter.cpp" />
<ClCompile Include="..\..\Source\Processors\Visualization\SpikePlotting\StereotrodePlot.cpp" />
<ClCompile Include="..\..\Source\Processors\Visualization\SpikePlotting\ElectrodePlot.cpp" />
<ClCompile Include="..\..\Source\Processors\Visualization\SpikePlotting\SpikePlot.cpp"/>
<ClCompile Include="..\..\Source\Processors\Visualization\SpikePlotting\BaseUIElement.cpp" />
<ClCompile Include="..\..\Source\Processors\Visualization\SpikePlotting\GenericAxes.cpp" />
<ClCompile Include="..\..\Source\Processors\Visualization\SpikePlotting\PlotUtils.cpp" />
<ClCompile Include="..\..\Source\Processors\Visualization\SpikePlotting\ProjectionAxes.cpp" />
<ClCompile Include="..\..\Source\Processors\Visualization\SpikePlotting\TetrodePlot.cpp" />
<ClCompile Include="..\..\Source\Processors\Visualization\SpikePlotting\WaveAxes.cpp" />
<ClCompile Include="..\..\Source\Processors\Visualization\SpikeObject.cpp" />
<ClCompile Include="..\..\Source\Processors\Visualization\SpikeDisplayCanvas.cpp" />
......@@ -182,6 +180,8 @@
<ClCompile Include="..\..\Source\Processors\SpikeDetector.cpp" />
<ClCompile Include="..\..\Source\Processors\AudioNode.cpp" />
<ClCompile Include="..\..\Source\Processors\EventNode.cpp" />
<ClCompile Include="..\..\Source\Processors\Editors\FPGAOutputEditor.cpp"/>
<ClCompile Include="..\..\Source\Processors\Editors\ArduinoOutputEditor.cpp"/>
<ClCompile Include="..\..\Source\Processors\Editors\ChannelSelector.cpp" />
<ClCompile Include="..\..\Source\Processors\Editors\ParameterEditor.cpp" />
<ClCompile Include="..\..\Source\Processors\Editors\SpikeDisplayEditor.cpp" />
......@@ -263,14 +263,12 @@
<ClInclude Include="..\..\Source\Processors\LfpDisplayNode.h" />
<ClInclude Include="..\..\Source\Processors\Utilities\Merger.h" />
<ClInclude Include="..\..\Source\Processors\Utilities\Splitter.h" />
<ClInclude Include="..\..\Source\Processors\Visualization\SpikePlotting\StereotrodePlot.h" />
<ClInclude Include="..\..\Source\Processors\Visualization\SpikePlotting\ElectrodePlot.h" />
<ClInclude Include="..\..\Source\Processors\Visualization\SpikePlotting\SpikePlot.h"/>
<ClInclude Include="..\..\Source\Processors\Visualization\SpikePlotting\BaseUIElement.h" />
<ClInclude Include="..\..\Source\Processors\Visualization\SpikePlotting\GenericAxes.h" />
<ClInclude Include="..\..\Source\Processors\Visualization\SpikePlotting\PlotUtils.h" />
<ClInclude Include="..\..\Source\Processors\Visualization\SpikePlotting\ProjectionAxes.h" />
<ClInclude Include="..\..\Source\Processors\Visualization\SpikePlotting\SimpleKeyEvent.h" />
<ClInclude Include="..\..\Source\Processors\Visualization\SpikePlotting\TetrodePlot.h" />
<ClInclude Include="..\..\Source\Processors\Visualization\SpikePlotting\WaveAxes.h" />
<ClInclude Include="..\..\Source\Processors\Visualization\SpikeObject.h" />
<ClInclude Include="..\..\Source\Processors\Visualization\SpikeDisplayCanvas.h" />
......@@ -281,6 +279,8 @@
<ClInclude Include="..\..\Source\Processors\SpikeDetector.h" />
<ClInclude Include="..\..\Source\Processors\AudioNode.h" />
<ClInclude Include="..\..\Source\Processors\EventNode.h" />
<ClInclude Include="..\..\Source\Processors\Editors\FPGAOutputEditor.h"/>
<ClInclude Include="..\..\Source\Processors\Editors\ArduinoOutputEditor.h"/>
<ClInclude Include="..\..\Source\Processors\Editors\ChannelSelector.h" />
<ClInclude Include="..\..\Source\Processors\Editors\ParameterEditor.h" />
<ClInclude Include="..\..\Source\Processors\Editors\SpikeDisplayEditor.h" />
......
Builds/VisualStudio2012/open-ephys.vcxproj.filters
+ 18
− 15
View file @ 87086e17
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<Filter Include="open-ephys">
......@@ -37,6 +37,9 @@
<Filter Include="open-ephys\Source\Processors">
<UniqueIdentifier>{3B2598F1-7B02-E3D4-A09B-367B20D97672}</UniqueIdentifier>
</Filter>
<Filter Include="open-ephys\Source\Processors\Serial">
<UniqueIdentifier>{BE825C10-A046-0824-C18C-358D08C18D78}</UniqueIdentifier>
</Filter>
<Filter Include="open-ephys\Source\Processors\Utilities">
<UniqueIdentifier>{A81F416A-5186-4D5E-E159-A4E41A74C9AB}</UniqueIdentifier>
</Filter>
......@@ -138,10 +141,7 @@
<ClCompile Include="..\..\Source\Processors\Utilities\Splitter.cpp">
<Filter>open-ephys\Source\Processors\Utilities</Filter>
</ClCompile>
<ClCompile Include="..\..\Source\Processors\Visualization\SpikePlotting\StereotrodePlot.cpp">
<Filter>open-ephys\Source\Processors\Visualization\SpikePlotting</Filter>
</ClCompile>
<ClCompile Include="..\..\Source\Processors\Visualization\SpikePlotting\ElectrodePlot.cpp">
<ClCompile Include="..\..\Source\Processors\Visualization\SpikePlotting\SpikePlot.cpp">
<Filter>open-ephys\Source\Processors\Visualization\SpikePlotting</Filter>
</ClCompile>
<ClCompile Include="..\..\Source\Processors\Visualization\SpikePlotting\BaseUIElement.cpp">
......@@ -156,9 +156,6 @@
<ClCompile Include="..\..\Source\Processors\Visualization\SpikePlotting\ProjectionAxes.cpp">
<Filter>open-ephys\Source\Processors\Visualization\SpikePlotting</Filter>
</ClCompile>
<ClCompile Include="..\..\Source\Processors\Visualization\SpikePlotting\TetrodePlot.cpp">
<Filter>open-ephys\Source\Processors\Visualization\SpikePlotting</Filter>
</ClCompile>
<ClCompile Include="..\..\Source\Processors\Visualization\SpikePlotting\WaveAxes.cpp">
<Filter>open-ephys\Source\Processors\Visualization\SpikePlotting</Filter>
</ClCompile>
......@@ -186,6 +183,12 @@
<ClCompile Include="..\..\Source\Processors\EventNode.cpp">
<Filter>open-ephys\Source\Processors</Filter>
</ClCompile>
<ClCompile Include="..\..\Source\Processors\Editors\FPGAOutputEditor.cpp">
<Filter>open-ephys\Source\Processors\Editors</Filter>
</ClCompile>
<ClCompile Include="..\..\Source\Processors\Editors\ArduinoOutputEditor.cpp">
<Filter>open-ephys\Source\Processors\Editors</Filter>
</ClCompile>
<ClCompile Include="..\..\Source\Processors\Editors\ChannelSelector.cpp">
<Filter>open-ephys\Source\Processors\Editors</Filter>
</ClCompile>
......@@ -425,10 +428,7 @@
<ClInclude Include="..\..\Source\Processors\Utilities\Splitter.h">
<Filter>open-ephys\Source\Processors\Utilities</Filter>
</ClInclude>
<ClInclude Include="..\..\Source\Processors\Visualization\SpikePlotting\StereotrodePlot.h">
<Filter>open-ephys\Source\Processors\Visualization\SpikePlotting</Filter>
</ClInclude>
<ClInclude Include="..\..\Source\Processors\Visualization\SpikePlotting\ElectrodePlot.h">
<ClInclude Include="..\..\Source\Processors\Visualization\SpikePlotting\SpikePlot.h">
<Filter>open-ephys\Source\Processors\Visualization\SpikePlotting</Filter>
</ClInclude>
<ClInclude Include="..\..\Source\Processors\Visualization\SpikePlotting\BaseUIElement.h">
......@@ -446,9 +446,6 @@
<ClInclude Include="..\..\Source\Processors\Visualization\SpikePlotting\SimpleKeyEvent.h">
<Filter>open-ephys\Source\Processors\Visualization\SpikePlotting</Filter>
</ClInclude>
<ClInclude Include="..\..\Source\Processors\Visualization\SpikePlotting\TetrodePlot.h">
<Filter>open-ephys\Source\Processors\Visualization\SpikePlotting</Filter>
</ClInclude>
<ClInclude Include="..\..\Source\Processors\Visualization\SpikePlotting\WaveAxes.h">
<Filter>open-ephys\Source\Processors\Visualization\SpikePlotting</Filter>
</ClInclude>
......@@ -479,6 +476,12 @@
<ClInclude Include="..\..\Source\Processors\EventNode.h">
<Filter>open-ephys\Source\Processors</Filter>
</ClInclude>
<ClInclude Include="..\..\Source\Processors\Editors\FPGAOutputEditor.h">
<Filter>open-ephys\Source\Processors\Editors</Filter>
</ClInclude>
<ClInclude Include="..\..\Source\Processors\Editors\ArduinoOutputEditor.h">
<Filter>open-ephys\Source\Processors\Editors</Filter>
</ClInclude>
<ClInclude Include="..\..\Source\Processors\Editors\ChannelSelector.h">
<Filter>open-ephys\Source\Processors\Editors</Filter>
</ClInclude>
......
JuceLibraryCode/BinaryData.cpp
+ 1945
− 52
View file @ 87086e17
This diff is collapsed.
JuceLibraryCode/BinaryData.h
+ 13
− 4
View file @ 87086e17
......@@ -46,6 +46,15 @@ namespace BinaryData
extern const char* silkscreen_ttf;
const int silkscreen_ttfSize = 18336;
extern const char* ArduinoIcon_png;
const int ArduinoIcon_pngSize = 56888;
extern const char* OpenEphysBoardLogoBlack_png;
const int OpenEphysBoardLogoBlack_pngSize = 36120;
extern const char* OpenEphysBoardLogoGray_png;
const int OpenEphysBoardLogoGray_pngSize = 35843;
extern const char* RadioButtons01_png;
const int RadioButtons01_pngSize = 818;
......@@ -59,7 +68,7 @@ namespace BinaryData
const int RadioButtons04_pngSize = 792;
extern const char* RadioButtons05_png;
const int RadioButtons05_pngSize = 942;
const int RadioButtons05_pngSize = 3561;
extern const char* RadioButtons_neutral01_png;
const int RadioButtons_neutral01_pngSize = 730;
......@@ -74,7 +83,7 @@ namespace BinaryData
const int RadioButtons_neutral04_pngSize = 654;
extern const char* RadioButtons_neutral05_png;
const int RadioButtons_neutral05_pngSize = 821;
const int RadioButtons_neutral05_pngSize = 3440;
extern const char* RadioButtons_selected01_png;
const int RadioButtons_selected01_pngSize = 761;
......@@ -89,7 +98,7 @@ namespace BinaryData
const int RadioButtons_selected04_pngSize = 727;
extern const char* RadioButtons_selected05_png;
const int RadioButtons_selected05_pngSize = 869;
const int RadioButtons_selected05_pngSize = 3463;
extern const char* RadioButtons_selected_over01_png;
const int RadioButtons_selected_over01_pngSize = 866;
......@@ -104,7 +113,7 @@ namespace BinaryData
const int RadioButtons_selected_over04_pngSize = 838;
extern const char* RadioButtons_selected_over05_png;
const int RadioButtons_selected_over05_pngSize = 977;
const int RadioButtons_selected_over05_pngSize = 3571;
extern const char* noise_wave_png;
const int noise_wave_pngSize = 19800;
......
Resources/DLLs/pipetest.bit
+ 0
− 0
View file @ 87086e17
No preview for this file type
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment