Skip to content

[image] Apply new factory registration mechanism #5773

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
fredroy merged 10 commits into from
Nov 25, 2025
Merged

[image] Apply new factory registration mechanism #5773

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
2fabb66
Apply new factory registration mechanism
hugtalbot Nov 10, 2025
19e91fb
Add test and toolbox from image plugin
hugtalbot Nov 11, 2025
ea646b8
Fix #if into #ifdef in initImage
hugtalbot Nov 13, 2025
36044be
Apply suggestions from code review
hugtalbot Nov 13, 2025
db93cc2
Apply suggestions from code review
hugtalbot Nov 14, 2025
c5b8958
add == 1 condition
hugtalbot Nov 17, 2025
b90f75a
add aanother if
hugtalbot Nov 17, 2025
791ec39
keep only ifdef SOFA_BUILD_TESTS
hugtalbot Nov 19, 2025
02d250a
fix compilation of image with eigenv5
fredroy Nov 20, 2025
d68cf6f
call registation when executing image_test
fredroy Nov 20, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
94 changes: 46 additions & 48 deletions applications/plugins/image/CollisionToCarvingEngine.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,49 +35,47 @@ namespace engine

using namespace defaulttype;

int CollisionToCarvingEngineClass = core::RegisterObject("Filter an image")
.add<CollisionToCarvingEngine<ImageUC,ImageUC > >(true)
.add<CollisionToCarvingEngine<ImageD ,ImageD > >()

.add<CollisionToCarvingEngine<ImageUC,ImageD > >()

.add<CollisionToCarvingEngine<ImageD,ImageUC > >()
.add<CollisionToCarvingEngine<ImageD,ImageB > >()
#if PLUGIN_IMAGE_COMPILE_SET == PLUGIN_IMAGE_COMPILE_SET_FULL
.add<CollisionToCarvingEngine<ImageC ,ImageC > >()
.add<CollisionToCarvingEngine<ImageI ,ImageI > >()
.add<CollisionToCarvingEngine<ImageUI,ImageUI > >()
.add<CollisionToCarvingEngine<ImageS ,ImageS > >()
.add<CollisionToCarvingEngine<ImageUS,ImageUS > >()
.add<CollisionToCarvingEngine<ImageL ,ImageL > >()
.add<CollisionToCarvingEngine<ImageUL,ImageUL > >()
.add<CollisionToCarvingEngine<ImageF ,ImageF > >()
.add<CollisionToCarvingEngine<ImageB ,ImageB > >()

.add<CollisionToCarvingEngine<ImageC ,ImageD > >()
.add<CollisionToCarvingEngine<ImageI ,ImageD > >()
.add<CollisionToCarvingEngine<ImageUI,ImageD > >()
.add<CollisionToCarvingEngine<ImageS ,ImageD > >()
.add<CollisionToCarvingEngine<ImageUS,ImageD > >()
.add<CollisionToCarvingEngine<ImageL ,ImageD > >()
.add<CollisionToCarvingEngine<ImageUL,ImageD > >()
.add<CollisionToCarvingEngine<ImageF ,ImageD > >()
.add<CollisionToCarvingEngine<ImageB ,ImageD > >()

.add<CollisionToCarvingEngine<ImageUS,ImageUC > >()
.add<CollisionToCarvingEngine<ImageUC,ImageUS > >()
.add<CollisionToCarvingEngine<ImageUC,ImageB > >()
.add<CollisionToCarvingEngine<ImageUS,ImageB > >()
void registerCollisionToCarvingEngine(sofa::core::ObjectFactory* factory)
{
factory->registerObjects(sofa::core::ObjectRegistrationData("Filter an image")
.add<CollisionToCarvingEngine<ImageUC,ImageUC > >(true)
.add<CollisionToCarvingEngine<ImageD, ImageD > >()
.add<CollisionToCarvingEngine<ImageUC,ImageD > >()
.add<CollisionToCarvingEngine<ImageD, ImageUC > >()
.add<CollisionToCarvingEngine<ImageD, ImageB > >()
#if PLUGIN_IMAGE_COMPILE_SET == PLUGIN_IMAGE_COMPILE_SET_FULL
.add<CollisionToCarvingEngine<ImageC ,ImageC > >()
.add<CollisionToCarvingEngine<ImageI ,ImageI > >()
.add<CollisionToCarvingEngine<ImageUI,ImageUI > >()
.add<CollisionToCarvingEngine<ImageS ,ImageS > >()
.add<CollisionToCarvingEngine<ImageUS,ImageUS > >()
.add<CollisionToCarvingEngine<ImageL ,ImageL > >()
.add<CollisionToCarvingEngine<ImageUL,ImageUL > >()
.add<CollisionToCarvingEngine<ImageF ,ImageF > >()
.add<CollisionToCarvingEngine<ImageB ,ImageB > >()

.add<CollisionToCarvingEngine<ImageC ,ImageD > >()
.add<CollisionToCarvingEngine<ImageI ,ImageD > >()
.add<CollisionToCarvingEngine<ImageUI,ImageD > >()
.add<CollisionToCarvingEngine<ImageS ,ImageD > >()
.add<CollisionToCarvingEngine<ImageUS,ImageD > >()
.add<CollisionToCarvingEngine<ImageL ,ImageD > >()
.add<CollisionToCarvingEngine<ImageUL,ImageD > >()
.add<CollisionToCarvingEngine<ImageF ,ImageD > >()
.add<CollisionToCarvingEngine<ImageB ,ImageD > >()

.add<CollisionToCarvingEngine<ImageUS,ImageUC > >()
.add<CollisionToCarvingEngine<ImageUC,ImageUS > >()
.add<CollisionToCarvingEngine<ImageUC,ImageB > >()
.add<CollisionToCarvingEngine<ImageUS,ImageB > >()
#endif // PLUGIN_IMAGE_COMPILE_SET == PLUGIN_IMAGE_COMPILE_SET_FULL
;


template class SOFA_IMAGE_API CollisionToCarvingEngine<ImageUC ,ImageUC >;
template class SOFA_IMAGE_API CollisionToCarvingEngine<ImageD ,ImageD >;

template class SOFA_IMAGE_API CollisionToCarvingEngine<ImageUC ,ImageD >;
);
}

template class SOFA_IMAGE_API CollisionToCarvingEngine<ImageD ,ImageUC >;
template class SOFA_IMAGE_API CollisionToCarvingEngine<ImageUC ,ImageUC >;
template class SOFA_IMAGE_API CollisionToCarvingEngine<ImageD ,ImageD >;
template class SOFA_IMAGE_API CollisionToCarvingEngine<ImageUC ,ImageD >;
template class SOFA_IMAGE_API CollisionToCarvingEngine<ImageD ,ImageUC >;
template class SOFA_IMAGE_API CollisionToCarvingEngine<ImageD ,ImageB >;

#if PLUGIN_IMAGE_COMPILE_SET == PLUGIN_IMAGE_COMPILE_SET_FULL
Expand All @@ -93,18 +91,18 @@ template class SOFA_IMAGE_API CollisionToCarvingEngine<ImageB ,ImageB >;

template class SOFA_IMAGE_API CollisionToCarvingEngine<ImageC ,ImageD >;
template class SOFA_IMAGE_API CollisionToCarvingEngine<ImageI ,ImageD >;
template class SOFA_IMAGE_API CollisionToCarvingEngine<ImageUI ,ImageD >;
template class SOFA_IMAGE_API CollisionToCarvingEngine<ImageUI ,ImageD >;
template class SOFA_IMAGE_API CollisionToCarvingEngine<ImageS ,ImageD >;
template class SOFA_IMAGE_API CollisionToCarvingEngine<ImageUS ,ImageD >;
template class SOFA_IMAGE_API CollisionToCarvingEngine<ImageUS ,ImageD >;
template class SOFA_IMAGE_API CollisionToCarvingEngine<ImageL ,ImageD >;
template class SOFA_IMAGE_API CollisionToCarvingEngine<ImageUL ,ImageD >;
template class SOFA_IMAGE_API CollisionToCarvingEngine<ImageUL ,ImageD >;
template class SOFA_IMAGE_API CollisionToCarvingEngine<ImageF ,ImageD >;
template class SOFA_IMAGE_API CollisionToCarvingEngine<ImageB ,ImageD >;

template class SOFA_IMAGE_API CollisionToCarvingEngine<ImageUS ,ImageUC >;
template class SOFA_IMAGE_API CollisionToCarvingEngine<ImageUC ,ImageUS >;
template class SOFA_IMAGE_API CollisionToCarvingEngine<ImageUC ,ImageB >;
template class SOFA_IMAGE_API CollisionToCarvingEngine<ImageUS ,ImageB >;
template class SOFA_IMAGE_API CollisionToCarvingEngine<ImageUS ,ImageUC >;
template class SOFA_IMAGE_API CollisionToCarvingEngine<ImageUC ,ImageUS >;
template class SOFA_IMAGE_API CollisionToCarvingEngine<ImageUC ,ImageB >;
template class SOFA_IMAGE_API CollisionToCarvingEngine<ImageUS ,ImageB >;
#endif // PLUGIN_IMAGE_COMPILE_SET == PLUGIN_IMAGE_COMPILE_SET_FULL

} //
Expand Down
32 changes: 18 additions & 14 deletions applications/plugins/image/DepthMapToMeshEngine.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,21 +35,25 @@ namespace engine

using namespace defaulttype;

int DepthMapToMeshEngineClass = core::RegisterObject("Compute a mesh from a depth map image ")
.add<DepthMapToMeshEngine<ImageUC> >(true)
.add<DepthMapToMeshEngine<ImageD> >()
.add<DepthMapToMeshEngine<ImageB> >()
void registerDepthMapToMeshEngine(sofa::core::ObjectFactory* factory)
{
factory->registerObjects(sofa::core::ObjectRegistrationData("Compute a mesh from a depth map image")
.add<DepthMapToMeshEngine<ImageUC> >(true)
.add<DepthMapToMeshEngine<ImageD> >()
.add<DepthMapToMeshEngine<ImageB> >()
#if PLUGIN_IMAGE_COMPILE_SET == PLUGIN_IMAGE_COMPILE_SET_FULL
.add<DepthMapToMeshEngine<ImageC> >()
.add<DepthMapToMeshEngine<ImageI> >()
.add<DepthMapToMeshEngine<ImageUI> >()
.add<DepthMapToMeshEngine<ImageS> >()
.add<DepthMapToMeshEngine<ImageUS> >()
.add<DepthMapToMeshEngine<ImageL> >()
.add<DepthMapToMeshEngine<ImageUL> >()
.add<DepthMapToMeshEngine<ImageF> >()
#endif
;
.add<DepthMapToMeshEngine<ImageC> >()
.add<DepthMapToMeshEngine<ImageI> >()
.add<DepthMapToMeshEngine<ImageUI> >()
.add<DepthMapToMeshEngine<ImageS> >()
.add<DepthMapToMeshEngine<ImageUS> >()
.add<DepthMapToMeshEngine<ImageL> >()
.add<DepthMapToMeshEngine<ImageUL> >()
.add<DepthMapToMeshEngine<ImageF> >()
#endif
);
}


template class SOFA_IMAGE_API DepthMapToMeshEngine<ImageUC>;
template class SOFA_IMAGE_API DepthMapToMeshEngine<ImageD>;
Expand Down
30 changes: 17 additions & 13 deletions applications/plugins/image/GenerateImage.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,21 +35,25 @@ namespace engine

using namespace defaulttype;

int GenerateImageClass = core::RegisterObject("Create an image with custom dimensions")
.add<GenerateImage<ImageUC> >(true)
.add<GenerateImage<ImageD> >()
.add<GenerateImage<ImageB> >()
void registerGenerateImage(sofa::core::ObjectFactory* factory)
{
factory->registerObjects(sofa::core::ObjectRegistrationData("Create an image with custom dimensions")
.add<GenerateImage<ImageUC> >(true)
.add<GenerateImage<ImageD> >()
.add<GenerateImage<ImageB> >()
#if PLUGIN_IMAGE_COMPILE_SET == PLUGIN_IMAGE_COMPILE_SET_FULL
.add<GenerateImage<ImageC> >()
.add<GenerateImage<ImageI> >()
.add<GenerateImage<ImageUI> >()
.add<GenerateImage<ImageS> >()
.add<GenerateImage<ImageUS> >()
.add<GenerateImage<ImageL> >()
.add<GenerateImage<ImageUL> >()
.add<GenerateImage<ImageF> >()
.add<GenerateImage<ImageC> >()
.add<GenerateImage<ImageI> >()
.add<GenerateImage<ImageUI> >()
.add<GenerateImage<ImageS> >()
.add<GenerateImage<ImageUS> >()
.add<GenerateImage<ImageL> >()
.add<GenerateImage<ImageUL> >()
.add<GenerateImage<ImageF> >()
#endif
;
);
}


template class SOFA_IMAGE_API GenerateImage<ImageUC>;
template class SOFA_IMAGE_API GenerateImage<ImageD>;
Expand Down
11 changes: 7 additions & 4 deletions applications/plugins/image/ImageCoordValuesFromPositions.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,10 +35,13 @@ namespace engine

using namespace defaulttype;

int ImageCoordValuesFromPositionsClass = core::RegisterObject("Get interpolated coordinates at sample locations in an image with 3 channels")
.add<ImageCoordValuesFromPositions<ImageD> >(true)
.add<ImageCoordValuesFromPositions<ImageF> >()
;
void registerImageCoordValuesFromPositions(sofa::core::ObjectFactory* factory)
{
factory->registerObjects(sofa::core::ObjectRegistrationData("Get interpolated coordinates at sample locations in an image with 3 channels")
.add<ImageCoordValuesFromPositions<ImageD> >(true)
.add<ImageCoordValuesFromPositions<ImageF> >());
}


template class SOFA_IMAGE_API ImageCoordValuesFromPositions<ImageD>;
template class SOFA_IMAGE_API ImageCoordValuesFromPositions<ImageF>;
Expand Down
12 changes: 7 additions & 5 deletions applications/plugins/image/ImageDataDisplay.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,11 +35,13 @@ namespace engine

using namespace defaulttype;

int ImageDataDisplayClass = core::RegisterObject("Store custom data in an image. A template input image with non zero voxels (where data will be stored) has to be provided")
.add<ImageDataDisplay<ImageUC, ImageD> >(true)
.add<ImageDataDisplay<ImageD, ImageD> >()
.add<ImageDataDisplay<ImageB, ImageD> >()
;
void registerImageDataDisplay(sofa::core::ObjectFactory* factory)
{
factory->registerObjects(sofa::core::ObjectRegistrationData("Store custom data in an image. A template input image with non zero voxels (where data will be stored) has to be provided")
.add<ImageDataDisplay<ImageUC, ImageD> >(true)
.add<ImageDataDisplay<ImageD, ImageD> >()
.add<ImageDataDisplay<ImageB, ImageD> >());
}

template class SOFA_IMAGE_API ImageDataDisplay<ImageUC, ImageD>;
template class SOFA_IMAGE_API ImageDataDisplay<ImageD, ImageD>;
Expand Down
29 changes: 16 additions & 13 deletions applications/plugins/image/ImageExporter.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,21 +37,24 @@ namespace misc

using namespace defaulttype;

int ImageExporterClass = core::RegisterObject("Save an image")
.add<ImageExporter<ImageUC> >(true)
.add<ImageExporter<ImageD> >()
.add<ImageExporter<ImageB> >()
void registerImageExporter(sofa::core::ObjectFactory* factory)
{
factory->registerObjects(sofa::core::ObjectRegistrationData("Save an image")
.add<ImageExporter<ImageUC> >(true)
.add<ImageExporter<ImageD> >()
.add<ImageExporter<ImageB> >()
#if PLUGIN_IMAGE_COMPILE_SET == PLUGIN_IMAGE_COMPILE_SET_FULL
.add<ImageExporter<ImageC> >()
.add<ImageExporter<ImageI> >()
.add<ImageExporter<ImageUI> >()
.add<ImageExporter<ImageS> >()
.add<ImageExporter<ImageUS> >()
.add<ImageExporter<ImageL> >()
.add<ImageExporter<ImageUL> >()
.add<ImageExporter<ImageF> >()
.add<ImageExporter<ImageC> >()
.add<ImageExporter<ImageI> >()
.add<ImageExporter<ImageUI> >()
.add<ImageExporter<ImageS> >()
.add<ImageExporter<ImageUS> >()
.add<ImageExporter<ImageL> >()
.add<ImageExporter<ImageUL> >()
.add<ImageExporter<ImageF> >()
#endif
;
);
}

template class SOFA_IMAGE_API ImageExporter<ImageUC>;
template class SOFA_IMAGE_API ImageExporter<ImageD>;
Expand Down
70 changes: 35 additions & 35 deletions applications/plugins/image/ImageFilter.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,44 +35,44 @@ namespace engine

using namespace defaulttype;

int ImageFilterClass = core::RegisterObject("Filter an image")
.add<ImageFilter<ImageUC,ImageUC > >(true)
.add<ImageFilter<ImageD ,ImageD > >()

.add<ImageFilter<ImageUC,ImageD > >()

.add<ImageFilter<ImageD,ImageUC > >()
.add<ImageFilter<ImageD,ImageB > >()
.add<ImageFilter<ImageB ,ImageD > >()
.add<ImageFilter<ImageB ,ImageB > >()
void registerImageFilter(sofa::core::ObjectFactory* factory)
{
factory->registerObjects(sofa::core::ObjectRegistrationData("Filter an image")
.add<ImageFilter<ImageUC,ImageUC > >(true)
.add<ImageFilter<ImageD ,ImageD > >()
.add<ImageFilter<ImageUC,ImageD > >()
.add<ImageFilter<ImageD,ImageUC > >()
.add<ImageFilter<ImageD,ImageB > >()
.add<ImageFilter<ImageB ,ImageD > >()
.add<ImageFilter<ImageB ,ImageB > >()

#if PLUGIN_IMAGE_COMPILE_SET == PLUGIN_IMAGE_COMPILE_SET_FULL
.add<ImageFilter<ImageC ,ImageC > >()
.add<ImageFilter<ImageI ,ImageI > >()
.add<ImageFilter<ImageUI,ImageUI > >()
.add<ImageFilter<ImageS ,ImageS > >()
.add<ImageFilter<ImageUS,ImageUS > >()
.add<ImageFilter<ImageL ,ImageL > >()
.add<ImageFilter<ImageUL,ImageUL > >()
.add<ImageFilter<ImageF ,ImageF > >()

.add<ImageFilter<ImageC ,ImageD > >()
.add<ImageFilter<ImageI ,ImageD > >()
.add<ImageFilter<ImageUI,ImageD > >()
.add<ImageFilter<ImageS ,ImageD > >()
.add<ImageFilter<ImageUS,ImageD > >()
.add<ImageFilter<ImageL ,ImageD > >()
.add<ImageFilter<ImageUL,ImageD > >()
.add<ImageFilter<ImageF ,ImageD > >()

.add<ImageFilter<ImageUS,ImageUC > >()
.add<ImageFilter<ImageUC,ImageUS > >()
.add<ImageFilter<ImageUC,ImageB > >()
.add<ImageFilter<ImageUS,ImageB > >()
.add<ImageFilter<ImageS ,ImageB > >()
.add<ImageFilter<ImageS ,ImageUC > >()
.add<ImageFilter<ImageC ,ImageC > >()
.add<ImageFilter<ImageI ,ImageI > >()
.add<ImageFilter<ImageUI,ImageUI > >()
.add<ImageFilter<ImageS ,ImageS > >()
.add<ImageFilter<ImageUS,ImageUS > >()
.add<ImageFilter<ImageL ,ImageL > >()
.add<ImageFilter<ImageUL,ImageUL > >()
.add<ImageFilter<ImageF ,ImageF > >()
.add<ImageFilter<ImageC ,ImageD > >()
.add<ImageFilter<ImageI ,ImageD > >()
.add<ImageFilter<ImageUI,ImageD > >()
.add<ImageFilter<ImageS ,ImageD > >()
.add<ImageFilter<ImageUS,ImageD > >()
.add<ImageFilter<ImageL ,ImageD > >()
.add<ImageFilter<ImageUL,ImageD > >()
.add<ImageFilter<ImageF ,ImageD > >()
.add<ImageFilter<ImageUS,ImageUC > >()
.add<ImageFilter<ImageUC,ImageUS > >()
.add<ImageFilter<ImageUC,ImageB > >()
.add<ImageFilter<ImageUS,ImageB > >()
.add<ImageFilter<ImageS ,ImageB > >()
.add<ImageFilter<ImageS ,ImageUC > >()
#endif
;
);
}


template class SOFA_IMAGE_API ImageFilter<ImageUC ,ImageUC >;
template class SOFA_IMAGE_API ImageFilter<ImageD ,ImageD >;
Expand Down
29 changes: 16 additions & 13 deletions applications/plugins/image/ImageOperation.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,21 +35,24 @@ namespace engine

using namespace defaulttype;

int ImageOperationClass = core::RegisterObject("This class computes an image as an operation between two images")
.add<ImageOperation<ImageUC> >(true)
.add<ImageOperation<ImageD> >()
.add<ImageOperation<ImageB> >()
void registerImageOperation(sofa::core::ObjectFactory* factory)
{
factory->registerObjects(sofa::core::ObjectRegistrationData("This class computes an image as an operation between two images")
.add<ImageOperation<ImageUC> >(true)
.add<ImageOperation<ImageD> >()
.add<ImageOperation<ImageB> >()
#if PLUGIN_IMAGE_COMPILE_SET == PLUGIN_IMAGE_COMPILE_SET_FULL
.add<ImageOperation<ImageC> >()
.add<ImageOperation<ImageI> >()
.add<ImageOperation<ImageUI> >()
.add<ImageOperation<ImageS> >()
.add<ImageOperation<ImageUS> >()
.add<ImageOperation<ImageL> >()
.add<ImageOperation<ImageUL> >()
.add<ImageOperation<ImageF> >()
.add<ImageOperation<ImageC> >()
.add<ImageOperation<ImageI> >()
.add<ImageOperation<ImageUI> >()
.add<ImageOperation<ImageS> >()
.add<ImageOperation<ImageUS> >()
.add<ImageOperation<ImageL> >()
.add<ImageOperation<ImageUL> >()
.add<ImageOperation<ImageF> >()
#endif
;
);
}

template class SOFA_IMAGE_API ImageOperation<ImageUC>;
template class SOFA_IMAGE_API ImageOperation<ImageD>;
Expand Down
Loading