From 96b669eb6a1d7771f06a20774da5e0b6d209ea82 Mon Sep 17 00:00:00 2001 From: David Cox Date: Thu, 14 Jan 2010 13:39:01 -0500 Subject: [PATCH 1/2] Set a valid value for deferred for all stimuli, by default. Also removed an instance of ExpandableList in the ImageStimulus class, in favor of a vector --- Core/Stimuli/StandardStimuli.cpp | 39 ++++++++++++++------------------ Core/Stimuli/StandardStimuli.h | 6 ++--- Core/Stimuli/Stimulus.cpp | 2 ++ Core/Stimuli/Stimulus.h | 4 ++-- 4 files changed, 24 insertions(+), 27 deletions(-) diff --git a/Core/Stimuli/StandardStimuli.cpp b/Core/Stimuli/StandardStimuli.cpp index 2fc467f..30e0c64 100644 --- a/Core/Stimuli/StandardStimuli.cpp +++ b/Core/Stimuli/StandardStimuli.cpp @@ -885,25 +885,18 @@ ImageStimulus::ImageStimulus(std::string _tag, std::string _filename, shared_ptr _alpha) : BasicTransformStimulus(_tag, _xoffset, _yoffset, _xscale ,_yscale, _rot, _alpha) { -// fprintf(stderr,"Creating image stimulus (filename = %s)\n",_filename.c_str()); -// fflush(stderr); - + filename = _filename; - texture_maps = new ExpandableList(); - //image_loaded = false; - //il_image_name = 0; width = 0; height = 0; - // filename = _filename; - //image_loader = new OpenGLImageLoader(); } // for cloning ImageStimulus::ImageStimulus( std::string _tag, std::string _filename, - ExpandableList *_texture_maps, + const vector& _texture_maps, int _width, int _height, shared_ptr _xoffset, shared_ptr _yoffset, shared_ptr _xscale, @@ -917,8 +910,12 @@ ImageStimulus::ImageStimulus( std::string _tag, // actually copy the string... filename = _filename; - texture_maps = _texture_maps; - //image_loaded = false; + vector::const_iterator i; + for(i = _texture_maps.begin(); i != _texture_maps.end(); ++i){ + texture_maps.push_back(*i); + } + + //image_loaded = false; //il_image_name = 0; width = _width; height = _height; @@ -947,7 +944,6 @@ ImageStimulus::~ImageStimulus() { } - delete texture_maps; } @@ -963,15 +959,15 @@ Stimulus * ImageStimulus::frozenClone(){ ImageStimulus *clone = new ImageStimulus(tag, filename, - new ExpandableList(*texture_maps), + texture_maps, width, height, x_clone, y_clone, xs_clone, ys_clone, - r_clone, - a_clone); + r_clone, + a_clone); clone->setIsFrozen(true); @@ -994,10 +990,13 @@ void ImageStimulus::load(StimulusDisplay *display) { // TODO: this needs clean up. We are counting on all of the contexts // in the stimulus display to have the exact same history. Ideally, this // should be true, but we should eventually be robust in case it isn't - for(int i = 0; i < display->getNContexts(); i++){ + texture_maps.clear(); + + for(int i = 0; i < display->getNContexts(); i++){ display->setCurrent(i); GLuint texture_map = OpenGLImageLoader::load(filename, display, &width, &height); - texture_maps->addElement(i, texture_map); + + texture_maps.push_back(texture_map); // fprintf(stderr, "Loaded texture map %u into context %d\n", (unsigned int)texture_map, i);fflush(stderr); if(texture_map){ mprintf("Image loaded into texture_map %d", texture_map); @@ -1026,11 +1025,7 @@ void ImageStimulus::drawInUnitSquare(StimulusDisplay *display) { //glActiveTexture(GL_TEXTURE0); -// fprintf(stderr, "Binding texture %lu on context index %u (context %u)", -// *(texture_maps->getElement(display->getCurrentContextIndex())), -// display->getCurrentContextIndex(), -// (unsigned int)display->getCurrentContext());fflush(stderr); - glBindTexture(GL_TEXTURE_2D, *(texture_maps->getElement(display->getCurrentContextIndex()))); + glBindTexture(GL_TEXTURE_2D, texture_maps[display->getCurrentContextIndex()]); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR_MIPMAP_LINEAR); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR_MIPMAP_LINEAR); glEnable (GL_BLEND); diff --git a/Core/Stimuli/StandardStimuli.h b/Core/Stimuli/StandardStimuli.h index 702430c..7d2b4a3 100644 --- a/Core/Stimuli/StandardStimuli.h +++ b/Core/Stimuli/StandardStimuli.h @@ -118,7 +118,7 @@ class OpenGLImageLoader { class ImageStimulus : public BasicTransformStimulus { protected: std::string filename; - ExpandableList *texture_maps; + vector texture_maps; int width, height; // for debugging @@ -134,14 +134,14 @@ class ImageStimulus : public BasicTransformStimulus { shared_ptr _alpha); // constructor for cloning an existing image stimulus ImageStimulus(std::string _tag, std::string _filename, - ExpandableList *_texture_maps, + const vector& _texture_maps, int _width, int _height, shared_ptr _xoffset, shared_ptr _yoffset, shared_ptr _xscale, shared_ptr _yscale, - shared_ptr _rot, + shared_ptr _rot, shared_ptr _alpha); ImageStimulus(ImageStimulus& copy); diff --git a/Core/Stimuli/Stimulus.cpp b/Core/Stimuli/Stimulus.cpp index 042914c..fb74925 100644 --- a/Core/Stimuli/Stimulus.cpp +++ b/Core/Stimuli/Stimulus.cpp @@ -175,6 +175,7 @@ Stimulus::Stimulus(std::string _tag):Announcable(ANNOUNCE_STIMULUS_TAGNAME), has_thumbnail = false; thumbnail = NULL; + deferred = Stimulus::nondeferred_load; frozen = false; } @@ -187,6 +188,7 @@ Stimulus::Stimulus(const Stimulus& copy): visible = copy.visible; cached = copy.cached; has_thumbnail = copy.has_thumbnail; + deferred = copy.deferred; if(has_thumbnail) { // this should prevent a loop if someone set the thumbnail to // be itself diff --git a/Core/Stimuli/Stimulus.h b/Core/Stimuli/Stimulus.h index 5a3058a..aee36ba 100644 --- a/Core/Stimuli/Stimulus.h +++ b/Core/Stimuli/Stimulus.h @@ -189,8 +189,8 @@ class Stimulus : public Announcable, public mw::Component { bool hasThumbnail(); Stimulus * getThumbnail(); std::string gettag(); - int getDeferred(){ return deferred; } - void setDeferred(load_style _deferred){ deferred = _deferred; } + int getDeferred(){ return deferred; } + void setDeferred(load_style _deferred){ deferred = _deferred; } /** * announcement methods // JJD From e9975de7b9c1b63f12b122deedf0e54ebf7c7f44 Mon Sep 17 00:00:00 2001 From: David Cox Date: Thu, 14 Jan 2010 14:17:40 -0500 Subject: [PATCH 2/2] Added a method to initialize the OpenGLImage loader directly --- .../Conduits/tests/CodecAwareConduitTest.cpp | 2 +- .../tests/EventHandlerConduitTest.cpp | 2 +- .../Conduits/tests/SimpleConduitTest.cpp | 2 +- .../PythonConduitServerTest.cpp | 2 +- .../Serialization/tests/SerializationTest.cpp | 2 +- .../tests/IPCEventTransportTest.cpp | 2 +- Core/DataFiles/tests/DataFileTest.cpp | 2 +- Core/Events/tests/BufferManagerTest.cpp | 2 +- Core/Events/tests/ScarabEventTest.cpp | 2 +- .../tests/ExpandableListTest.cpp | 2 +- .../tests/LinkedListTest.cpp | 2 +- .../tests/PerlInterpreterTest.cpp | 2 +- Core/ParadigmComponents/tests/ActionTest.cpp | 2 +- .../tests/PlatformDependentServicesTest.cpp | 2 +- Core/RealtimeServices/tests/ClockTest.cpp | 2 +- Core/RealtimeServices/tests/SchedulerTest.cpp | 16 ++++++++++-- Core/RealtimeServices/tests/SchedulerTest.h | 12 ++++----- Core/RealtimeServices/tests/TimerTest.cpp | 2 +- Core/Scarab/tests/ScarabDataTest.cpp | 2 +- Core/Scarab/tests/ScarabFileTest.cpp | 2 +- Core/Scarab/tests/ScarabNetworkTest.cpp | 2 +- Core/Stimuli/StandardStimuli.cpp | 26 +++++++++++-------- Core/Stimuli/StandardStimuli.h | 3 ++- Core/Triggers/tests/TriggerTest.cpp | 2 +- .../tests/RegisteredSingletonTests.cpp | 2 +- Core/Variables/tests/GenericDataTest.cpp | 2 +- .../tests/ParsedExpressionVariableTest.cpp | 2 +- Core/Variables/tests/ScopedVariableTest.cpp | 2 +- .../Variables/tests/SelectionVariableTest.cpp | 2 +- .../tests/VariablePropertiesTest.cpp | 2 +- Core/Variables/tests/VariableTest.cpp | 2 +- Core/Variables/tests/VectorTest.cpp | 2 +- Core/XMLParser/XMLParserTest.cpp | 2 +- UnitTests/BoostMathExampleTest.cpp | 2 +- 34 files changed, 67 insertions(+), 50 deletions(-) diff --git a/Core/Communications/Conduits/tests/CodecAwareConduitTest.cpp b/Core/Communications/Conduits/tests/CodecAwareConduitTest.cpp index 177f7bc..c1ead54 100644 --- a/Core/Communications/Conduits/tests/CodecAwareConduitTest.cpp +++ b/Core/Communications/Conduits/tests/CodecAwareConduitTest.cpp @@ -13,7 +13,7 @@ #include "DummyEventTransport.h" #include "IPCEventTransport.h" -//CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( CodecAwareConduitTestFixture, "Unit Test" ); +CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( CodecAwareConduitTestFixture, "Unit Test" ); using namespace mw; diff --git a/Core/Communications/Conduits/tests/EventHandlerConduitTest.cpp b/Core/Communications/Conduits/tests/EventHandlerConduitTest.cpp index 1cc43f2..bbf4344 100644 --- a/Core/Communications/Conduits/tests/EventHandlerConduitTest.cpp +++ b/Core/Communications/Conduits/tests/EventHandlerConduitTest.cpp @@ -17,7 +17,7 @@ using namespace mw; -////CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( EventStreamConduitTestFixture, "Unit Test" ); +//CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( EventStreamConduitTestFixture, "Unit Test" ); void EventStreamConduitTestFixture::setUp(){ diff --git a/Core/Communications/Conduits/tests/SimpleConduitTest.cpp b/Core/Communications/Conduits/tests/SimpleConduitTest.cpp index 8246518..8f20bf3 100644 --- a/Core/Communications/Conduits/tests/SimpleConduitTest.cpp +++ b/Core/Communications/Conduits/tests/SimpleConduitTest.cpp @@ -14,7 +14,7 @@ using namespace mw; -//CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( SimpleConduitTestFixture, "Unit Test" ); +CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( SimpleConduitTestFixture, "Unit Test" ); void SimpleEventCollector::handleEvent(shared_ptr event){ boost::mutex::scoped_lock lock(last_event_lock); diff --git a/Core/Communications/PythonConduitServerTest.cpp b/Core/Communications/PythonConduitServerTest.cpp index 20fad87..7d5c6e2 100644 --- a/Core/Communications/PythonConduitServerTest.cpp +++ b/Core/Communications/PythonConduitServerTest.cpp @@ -28,7 +28,7 @@ using namespace mw; -////CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( PythonConduitServerTestFixture, "Unit Test" ); +//CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( PythonConduitServerTestFixture, "Unit Test" ); void PythonConduitServerTestFixture::setUp(){ diff --git a/Core/Communications/Serialization/tests/SerializationTest.cpp b/Core/Communications/Serialization/tests/SerializationTest.cpp index 4904cb6..10c492a 100644 --- a/Core/Communications/Serialization/tests/SerializationTest.cpp +++ b/Core/Communications/Serialization/tests/SerializationTest.cpp @@ -15,7 +15,7 @@ #include using namespace mw; -//CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( SerializationTestFixture, "Unit Test" ); +CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( SerializationTestFixture, "Unit Test" ); void SerializationTestFixture::setUp(){ diff --git a/Core/Communications/Transports/tests/IPCEventTransportTest.cpp b/Core/Communications/Transports/tests/IPCEventTransportTest.cpp index 3b2e058..7c7b785 100644 --- a/Core/Communications/Transports/tests/IPCEventTransportTest.cpp +++ b/Core/Communications/Transports/tests/IPCEventTransportTest.cpp @@ -11,7 +11,7 @@ #include "IPCEventTransport.h" using namespace mw; -//CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( IPCEventTransportTestFixture, "Unit Test" ); +CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( IPCEventTransportTestFixture, "Unit Test" ); void IPCEventTransportTestFixture::testOneThread(){ diff --git a/Core/DataFiles/tests/DataFileTest.cpp b/Core/DataFiles/tests/DataFileTest.cpp index 6f5d0d4..dbe3d4d 100644 --- a/Core/DataFiles/tests/DataFileTest.cpp +++ b/Core/DataFiles/tests/DataFileTest.cpp @@ -24,7 +24,7 @@ using namespace mw; #define BUFFER_HIGH_WATER_MARK 1 #define MAX_EVENTS_TO_BUFFER 10000 -//CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( DatumFileTestFixture, "Unit Test" ); +CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( DatumFileTestFixture, "Unit Test" ); //CPPUNIT_TEST_SUITE_REGISTRATION( DatumFileTestFixture ); #define dft_CPPUNIT_ASSERT_TS(x) dft_cppunit_lock->lock(); \ diff --git a/Core/Events/tests/BufferManagerTest.cpp b/Core/Events/tests/BufferManagerTest.cpp index bcc9862..acb4312 100644 --- a/Core/Events/tests/BufferManagerTest.cpp +++ b/Core/Events/tests/BufferManagerTest.cpp @@ -43,7 +43,7 @@ void bmt_assert(const std::string &message, const bool assertCondition); -//CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( BufferManagerTestFixture, "Unit Test" ); +CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( BufferManagerTestFixture, "Unit Test" ); void BufferManagerTestFixture::setUp() { shared_ptr shared_clock = Clock::instance(false); diff --git a/Core/Events/tests/ScarabEventTest.cpp b/Core/Events/tests/ScarabEventTest.cpp index 00e058b..1a86752 100644 --- a/Core/Events/tests/ScarabEventTest.cpp +++ b/Core/Events/tests/ScarabEventTest.cpp @@ -11,7 +11,7 @@ #include "EventBuffer.h" using namespace mw; -//CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( ScarabEventTestFixture, "Unit Test" ); +CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( ScarabEventTestFixture, "Unit Test" ); void ScarabEventTestFixture::setUp(){ diff --git a/Core/GenericStructures/tests/ExpandableListTest.cpp b/Core/GenericStructures/tests/ExpandableListTest.cpp index 08bc6d1..77e7b39 100644 --- a/Core/GenericStructures/tests/ExpandableListTest.cpp +++ b/Core/GenericStructures/tests/ExpandableListTest.cpp @@ -11,7 +11,7 @@ using namespace mw; -//CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( ExpandableListTestFixture, "Unit Test" ); +CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( ExpandableListTestFixture, "Unit Test" ); //CPPUNIT_TEST_SUITE_REGISTRATION( ExpandableListTestFixture ); void ExpandableListTestFixture::setUp(){} diff --git a/Core/GenericStructures/tests/LinkedListTest.cpp b/Core/GenericStructures/tests/LinkedListTest.cpp index 8c89572..c1e7418 100644 --- a/Core/GenericStructures/tests/LinkedListTest.cpp +++ b/Core/GenericStructures/tests/LinkedListTest.cpp @@ -10,7 +10,7 @@ #include "LinkedListTest.h" using namespace mw; -//CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( LinkedListTestFixture, "Unit Test" ); +CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( LinkedListTestFixture, "Unit Test" ); void LinkedListTestFixture::setUp(){ a = shared_ptr(new StimulusNode()); diff --git a/Core/Interpreters/tests/PerlInterpreterTest.cpp b/Core/Interpreters/tests/PerlInterpreterTest.cpp index 3b44316..a0ae628 100755 --- a/Core/Interpreters/tests/PerlInterpreterTest.cpp +++ b/Core/Interpreters/tests/PerlInterpreterTest.cpp @@ -10,5 +10,5 @@ #include "PerlInterpreterTest.h" using namespace mw; -//CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( PerlInterpreterTestFixture, "Unit Test" ); +CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( PerlInterpreterTestFixture, "Unit Test" ); //CPPUNIT_TEST_SUITE_REGISTRATION( PerlInterpreterTestFixture ); diff --git a/Core/ParadigmComponents/tests/ActionTest.cpp b/Core/ParadigmComponents/tests/ActionTest.cpp index 5744738..569019a 100644 --- a/Core/ParadigmComponents/tests/ActionTest.cpp +++ b/Core/ParadigmComponents/tests/ActionTest.cpp @@ -15,7 +15,7 @@ #include "CancelScheduledActionsAction.h" using namespace mw; -//CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( ActionTestFixture, "Unit Test" ); +CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( ActionTestFixture, "Unit Test" ); void ActionTestFixture::testSimpleAssignment1() { shared_ptrc1 = shared_ptr(new ConstantVariable(Datum(M_FLOAT, 7.62))); diff --git a/Core/PlatformDependent/tests/PlatformDependentServicesTest.cpp b/Core/PlatformDependent/tests/PlatformDependentServicesTest.cpp index 53f4caf..c6cb9c4 100644 --- a/Core/PlatformDependent/tests/PlatformDependentServicesTest.cpp +++ b/Core/PlatformDependent/tests/PlatformDependentServicesTest.cpp @@ -13,7 +13,7 @@ using namespace mw; -//CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( PlatformDependentServicesTestFixture, "Unit Test" ); +CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( PlatformDependentServicesTestFixture, "Unit Test" ); //CPPUNIT_TEST_SUITE_REGISTRATION( PlatformDependentServicesTestFixture ); diff --git a/Core/RealtimeServices/tests/ClockTest.cpp b/Core/RealtimeServices/tests/ClockTest.cpp index 8aa4959..ab061f6 100644 --- a/Core/RealtimeServices/tests/ClockTest.cpp +++ b/Core/RealtimeServices/tests/ClockTest.cpp @@ -11,7 +11,7 @@ #include "Clock.h" using namespace mw; -//CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( ClockTestFixture, "Unit Test" ); +CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( ClockTestFixture, "Unit Test" ); void ClockTestFixture::setUp() { shared_ptr shared_clock = Clock::instance(false); diff --git a/Core/RealtimeServices/tests/SchedulerTest.cpp b/Core/RealtimeServices/tests/SchedulerTest.cpp index e66b7a9..1bf66d9 100644 --- a/Core/RealtimeServices/tests/SchedulerTest.cpp +++ b/Core/RealtimeServices/tests/SchedulerTest.cpp @@ -12,7 +12,7 @@ using namespace mw; -//CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( SchedulerTestFixture, "Unit Test" ); +CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( SchedulerTestFixture, "Unit Test" ); void SchedulerTestFixture::setUp() { shared_ptr shared_scheduler = Scheduler::instance(false); @@ -352,7 +352,19 @@ void SchedulerTestFixture::reportLatencies(std::vector times_array, } n++; } - + +#define DO_CUMULATIVE 1 + if(DO_CUMULATIVE){ + less_than_10us += less_than_5us; + less_than_50us += less_than_10us; + less_than_100us += less_than_50us; + less_than_500us += less_than_100us; + less_than_1000us += less_than_500us; + less_than_5000us += less_than_1000us; + less_than_10000us += less_than_5000us; + less_than_15000us += less_than_10000us; + } + fprintf(stderr, "Latency Statistics...\n" "\t< 5us: %.4g\n" "\t< 10us: %.4g\n" diff --git a/Core/RealtimeServices/tests/SchedulerTest.h b/Core/RealtimeServices/tests/SchedulerTest.h index e2512c9..49a6200 100644 --- a/Core/RealtimeServices/tests/SchedulerTest.h +++ b/Core/RealtimeServices/tests/SchedulerTest.h @@ -16,7 +16,7 @@ namespace mw { #define N_SCHEDULED_EXECUTIONS 100 #define SLACK_MARGIN 5 -#define ACCEPTABLE_ERROR_US 10000 // 10 ms +#define ACCEPTABLE_ERROR_US 1000 // 100 us void *chaff_1(const MWTime interval); @@ -37,12 +37,12 @@ class SchedulerTestFixture : public FullCoreEnvironmentTestFixture { CPPUNIT_TEST_SUITE( SchedulerTestFixture ); -// CPPUNIT_TEST( testPeriod10HzNoPayload ); -// CPPUNIT_TEST( testPeriod100HzNoPayload ); -// CPPUNIT_TEST( testPeriod10HzNoPayloadChaffX4 ); + CPPUNIT_TEST( testPeriod10HzNoPayload ); + CPPUNIT_TEST( testPeriod100HzNoPayload ); + CPPUNIT_TEST( testPeriod10HzNoPayloadChaffX4 ); //CPPUNIT_TEST( testPeriod10HzNoPayloadChaffX20 ); -// CPPUNIT_TEST( testPeriod10HzSmallPayload ); -// CPPUNIT_TEST( testOneOffFiringSmallPayload ); + CPPUNIT_TEST( testPeriod10HzSmallPayload ); + CPPUNIT_TEST( testOneOffFiringSmallPayload ); CPPUNIT_TEST (testSchedulerLeaks); diff --git a/Core/RealtimeServices/tests/TimerTest.cpp b/Core/RealtimeServices/tests/TimerTest.cpp index 55992fe..2dcdff9 100644 --- a/Core/RealtimeServices/tests/TimerTest.cpp +++ b/Core/RealtimeServices/tests/TimerTest.cpp @@ -11,7 +11,7 @@ #include "MonkeyWorksCore/TrialBuildingBlocks.h" #include "MonkeyWorksCore/GlobalVariable.h" -////CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( TimerTestFixture, "Unit Test" ); +//CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( TimerTestFixture, "Unit Test" ); #include diff --git a/Core/Scarab/tests/ScarabDataTest.cpp b/Core/Scarab/tests/ScarabDataTest.cpp index ce24610..3262444 100644 --- a/Core/Scarab/tests/ScarabDataTest.cpp +++ b/Core/Scarab/tests/ScarabDataTest.cpp @@ -10,5 +10,5 @@ #include "ScarabDataTest.h" using namespace mw; -//CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( ScarabDataTestFixture, "Unit Test" ); +CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( ScarabDataTestFixture, "Unit Test" ); //CPPUNIT_TEST_SUITE_REGISTRATION( ScarabDataTestFixture ); diff --git a/Core/Scarab/tests/ScarabFileTest.cpp b/Core/Scarab/tests/ScarabFileTest.cpp index 333b7ce..8226b56 100644 --- a/Core/Scarab/tests/ScarabFileTest.cpp +++ b/Core/Scarab/tests/ScarabFileTest.cpp @@ -10,5 +10,5 @@ #include "ScarabFileTest.h" using namespace mw; -//CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( ScarabFileTestFixture, "Unit Test" ); +CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( ScarabFileTestFixture, "Unit Test" ); //CPPUNIT_TEST_SUITE_REGISTRATION( ScarabFileTestFixture ); \ No newline at end of file diff --git a/Core/Scarab/tests/ScarabNetworkTest.cpp b/Core/Scarab/tests/ScarabNetworkTest.cpp index 22c9c8f..b95cdff 100644 --- a/Core/Scarab/tests/ScarabNetworkTest.cpp +++ b/Core/Scarab/tests/ScarabNetworkTest.cpp @@ -10,5 +10,5 @@ #include "ScarabNetworkTest.h" using namespace mw; -//CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( ScarabNetworkTestFixture, "Unit Test" ); +CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( ScarabNetworkTestFixture, "Unit Test" ); //CPPUNIT_TEST_SUITE_REGISTRATION( ScarabNetworkTestFixture ); \ No newline at end of file diff --git a/Core/Stimuli/StandardStimuli.cpp b/Core/Stimuli/StandardStimuli.cpp index 30e0c64..b26f810 100644 --- a/Core/Stimuli/StandardStimuli.cpp +++ b/Core/Stimuli/StandardStimuli.cpp @@ -534,6 +534,20 @@ shared_ptr BlankScreenFactory::createObject(std::maplock(); + ilInit(); + ilutInit(); + ilutRenderer(ILUT_OPENGL); + ilutEnable(ILUT_OPENGL_CONV); + //lock->unlock(); + OpenGLImageLoader::initialized = true; +} + GLuint OpenGLImageLoader::load(std::string filename, StimulusDisplay *display, int *width, int *height) { @@ -785,17 +799,7 @@ GLuint OpenGLImageLoader::load(std::string filename, StimulusDisplay *display, fclose(test); if(1 || !OpenGLImageLoader::initialized) { - mprintf("initializing image loader facility"); - OpenGLImageLoader::lock = new Lockable(); - lock = OpenGLImageLoader::lock; - - //lock->lock(); - ilInit(); - ilutInit(); - ilutRenderer(ILUT_OPENGL); - ilutEnable(ILUT_OPENGL_CONV); - //lock->unlock(); - OpenGLImageLoader::initialized = true; + OpenGLImageLoader::initialize(); } diff --git a/Core/Stimuli/StandardStimuli.h b/Core/Stimuli/StandardStimuli.h index 7d2b4a3..c7686a8 100644 --- a/Core/Stimuli/StandardStimuli.h +++ b/Core/Stimuli/StandardStimuli.h @@ -110,7 +110,8 @@ class OpenGLImageLoader { static bool initialized; static Lockable *lock; - static GLuint load(std::string filename, StimulusDisplay *display, + static void initialize(); + static GLuint load(std::string filename, StimulusDisplay *display, int *width, int *height); }; diff --git a/Core/Triggers/tests/TriggerTest.cpp b/Core/Triggers/tests/TriggerTest.cpp index 804f23a..b3cb96f 100644 --- a/Core/Triggers/tests/TriggerTest.cpp +++ b/Core/Triggers/tests/TriggerTest.cpp @@ -10,5 +10,5 @@ #include "TriggerTest.h" using namespace mw; -//CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( TriggerTestFixture, "Unit Test" ); +CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( TriggerTestFixture, "Unit Test" ); //CPPUNIT_TEST_SUITE_REGISTRATION( TriggerTestFixture ); \ No newline at end of file diff --git a/Core/Utilities/tests/RegisteredSingletonTests.cpp b/Core/Utilities/tests/RegisteredSingletonTests.cpp index 667cced..b61b05e 100644 --- a/Core/Utilities/tests/RegisteredSingletonTests.cpp +++ b/Core/Utilities/tests/RegisteredSingletonTests.cpp @@ -17,7 +17,7 @@ SINGLETON_INSTANCE_STATIC_DECLARATION(Dummy) #define NUMBER_OF_SINGLETON_TEST_LOOPS 10 -//CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( RegisteredSingletonTestFixture, "Unit Test" ); +CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( RegisteredSingletonTestFixture, "Unit Test" ); void RegisteredSingletonTestFixture::setUp() { boost::shared_ptr dummy_instance = Dummy::instance(false); diff --git a/Core/Variables/tests/GenericDataTest.cpp b/Core/Variables/tests/GenericDataTest.cpp index 4047203..1895101 100644 --- a/Core/Variables/tests/GenericDataTest.cpp +++ b/Core/Variables/tests/GenericDataTest.cpp @@ -10,7 +10,7 @@ #include "GenericDataTest.h" using namespace mw; -//CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( GenericDataTestFixture, "Unit Test" ); +CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( GenericDataTestFixture, "Unit Test" ); //CPPUNIT_TEST_SUITE_REGISTRATION( GenericDataTestFixture ); diff --git a/Core/Variables/tests/ParsedExpressionVariableTest.cpp b/Core/Variables/tests/ParsedExpressionVariableTest.cpp index 13f1c33..8d021e2 100644 --- a/Core/Variables/tests/ParsedExpressionVariableTest.cpp +++ b/Core/Variables/tests/ParsedExpressionVariableTest.cpp @@ -14,7 +14,7 @@ #include "EventBuffer.h" using namespace mw; -//CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( ParsedExpressionVariableTestFixture, "Unit Test" ); +CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( ParsedExpressionVariableTestFixture, "Unit Test" ); void ParsedExpressionVariableTestFixture::testSimpleExpression() { diff --git a/Core/Variables/tests/ScopedVariableTest.cpp b/Core/Variables/tests/ScopedVariableTest.cpp index ccf31ea..cc3bd27 100644 --- a/Core/Variables/tests/ScopedVariableTest.cpp +++ b/Core/Variables/tests/ScopedVariableTest.cpp @@ -14,7 +14,7 @@ using namespace mw; -//CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( ScopedVariableTestFixture, "Unit Test" ); +CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( ScopedVariableTestFixture, "Unit Test" ); void ScopedVariableTestFixture::setUp(){ FullCoreEnvironmentTestFixture::setUp(); diff --git a/Core/Variables/tests/SelectionVariableTest.cpp b/Core/Variables/tests/SelectionVariableTest.cpp index ef60b7a..542b467 100644 --- a/Core/Variables/tests/SelectionVariableTest.cpp +++ b/Core/Variables/tests/SelectionVariableTest.cpp @@ -15,7 +15,7 @@ #include "Clock.h" using namespace mw; -//CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( SelectionVariableTestFixture, "Unit Test" ); +CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( SelectionVariableTestFixture, "Unit Test" ); //CPPUNIT_TEST_SUITE_REGISTRATION( SelectionVariableTestFixture ); diff --git a/Core/Variables/tests/VariablePropertiesTest.cpp b/Core/Variables/tests/VariablePropertiesTest.cpp index 72084ef..471756d 100644 --- a/Core/Variables/tests/VariablePropertiesTest.cpp +++ b/Core/Variables/tests/VariablePropertiesTest.cpp @@ -11,7 +11,7 @@ #include "EventBuffer.h" using namespace mw; -//CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( VariablePropertiesTestFixture, "Unit Test" ); +CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( VariablePropertiesTestFixture, "Unit Test" ); void VariablePropertiesTestFixture::setUp(){ // Create a variable registry diff --git a/Core/Variables/tests/VariableTest.cpp b/Core/Variables/tests/VariableTest.cpp index 6bc78b7..22598ca 100644 --- a/Core/Variables/tests/VariableTest.cpp +++ b/Core/Variables/tests/VariableTest.cpp @@ -12,7 +12,7 @@ #include "TrialBuildingBlocks.h" using namespace mw; -//CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( VariableTestFixture, "Unit Test" ); +CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( VariableTestFixture, "Unit Test" ); void VariableTestFixture::testSimpleConstant() { Datum seven_point_six_two(M_FLOAT, 7.62); diff --git a/Core/Variables/tests/VectorTest.cpp b/Core/Variables/tests/VectorTest.cpp index 5f016d5..aeeb6ad 100644 --- a/Core/Variables/tests/VectorTest.cpp +++ b/Core/Variables/tests/VectorTest.cpp @@ -10,5 +10,5 @@ #include "VectorTest.h" using namespace mw; -//CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( VectorTestFixture, "Unit Test" ); +CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( VectorTestFixture, "Unit Test" ); //CPPUNIT_TEST_SUITE_REGISTRATION( VectorTestFixture ); diff --git a/Core/XMLParser/XMLParserTest.cpp b/Core/XMLParser/XMLParserTest.cpp index 3df6021..9b17335 100644 --- a/Core/XMLParser/XMLParserTest.cpp +++ b/Core/XMLParser/XMLParserTest.cpp @@ -16,7 +16,7 @@ #include "MonkeyWorksCore/VariableSave.h" -//CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( mw::XMLParserTestFixture, "Unit Test" ); +CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( mw::XMLParserTestFixture, "Unit Test" ); void mw::XMLParserTestFixture::setUp() { mw::FullCoreEnvironmentTestFixture::setUp(); diff --git a/UnitTests/BoostMathExampleTest.cpp b/UnitTests/BoostMathExampleTest.cpp index ddf5e4b..bfc07dc 100644 --- a/UnitTests/BoostMathExampleTest.cpp +++ b/UnitTests/BoostMathExampleTest.cpp @@ -21,7 +21,7 @@ using namespace mw; -//CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( BoostMathExampleTestFixture, "Unit Test" ); +CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( BoostMathExampleTestFixture, "Unit Test" ); //CPPUNIT_TEST_SUITE_REGISTRATION( BoostMathExampleTestFixture );