call registation when executing image_test

Author: fredroy

applications/plugins/image/image_test/TestImageEngine.cpp

@@ -33,9 +33,23 @@ namespace engine
 {
 using namespace sofa::defaulttype;
 
-void registerTestImageEngine(sofa::core::ObjectFactory* factory)
-{
-    factory->registerObjects(sofa::core::ObjectRegistrationData("TestImageEngine to test engine with data image")
+template class TestImageEngine<ImageUC>;
+template class TestImageEngine<ImageD>;
+#ifdef BUILD_ALL_IMAGE_TYPES
+template class TestImageEngine<ImageC>;
+template class TestImageEngine<ImageI>;
+template class TestImageEngine<ImageUI>;
+template class TestImageEngine<ImageS>;
+template class TestImageEngine<ImageUS>;
+template class TestImageEngine<ImageL>;
+template class TestImageEngine<ImageUL>;
+template class TestImageEngine<ImageF>;
+template class TestImageEngine<ImageB>;
+#endif
+
+// register effectively TestImageEngine in the registry
+// it is done statically as it will be executed into the image_test executable
+bool res = sofa::core::ObjectFactory::getInstance()->registerObjects(sofa::core::ObjectRegistrationData("TestImageEngine to test engine with data image")
         .add<TestImageEngine<ImageUC> >(true)
         .add<TestImageEngine<ImageD> >()
 #ifdef BUILD_ALL_IMAGE_TYPES
@@ -50,22 +64,8 @@ void registerTestImageEngine(sofa::core::ObjectFactory* factory)
         .add<TestImageEngine<ImageB> >()
 #endif
     );
-}
 
 
-template class TestImageEngine<ImageUC>;
-template class TestImageEngine<ImageD>;
-#ifdef BUILD_ALL_IMAGE_TYPES
-template class TestImageEngine<ImageC>;
-template class TestImageEngine<ImageI>;
-template class TestImageEngine<ImageUI>;
-template class TestImageEngine<ImageS>;
-template class TestImageEngine<ImageUS>;
-template class TestImageEngine<ImageL>;
-template class TestImageEngine<ImageUL>;
-template class TestImageEngine<ImageF>;
-template class TestImageEngine<ImageB>;
-#endif
 } // namespace constraint
 
 } // namespace component

applications/plugins/image/initImage.cpp

@@ -62,10 +62,6 @@ namespace engine
     extern void registerDepthMapToMeshEngine(sofa::core::ObjectFactory* factory);
     extern void registerCollisionToCarvingEngine(sofa::core::ObjectFactory* factory);
 
-#ifdef SOFA_BUILD_TESTS
-    extern void registerTestImageEngine(sofa::core::ObjectFactory* factory);
-#endif
-
 #ifdef PLUGIN_IMAGE_COMPILE_GUI
     extern void registerContourImageToolBox(sofa::core::ObjectFactory* factory);
     extern void registerAverageCatchAllVector(sofa::core::ObjectFactory* factory);
@@ -176,13 +172,6 @@ void registerObjects(sofa::core::ObjectFactory* factory)
     sofa::component::engine::registerGenerateImage(factory);
     sofa::component::engine::registerDepthMapToMeshEngine(factory);
     sofa::component::engine::registerCollisionToCarvingEngine(factory);
-
-#ifdef SOFA_BUILD_TESTS
-    sofa::component::engine::registerTestImageEngine(factory);
-#endif
-
-#ifdef PLUGIN_IMAGE_COMPILE_GUI
-#endif
 }
 
 } // namespace sofa::component