diff --git a/CMakeLists.txt b/CMakeLists.txt index 79aae86..59423d0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -5,3 +5,4 @@ cmake_minimum_required(VERSION 3.12) find_package(Sofa.Config) # Load SofaMacros sofa_add_subdirectory(application Regression_test Regression_test) +sofa_add_subdirectory(application SofaRegressionProgram SofaRegressionProgram) diff --git a/SofaRegressionProgram/CMakeLists.txt b/SofaRegressionProgram/CMakeLists.txt new file mode 100644 index 0000000..f278a16 --- /dev/null +++ b/SofaRegressionProgram/CMakeLists.txt @@ -0,0 +1,6 @@ +cmake_minimum_required(VERSION 3.22) +project(SofaRegressionProgram) + +set(REGRESSION_PROGRAM_INSTALL_DIR plugins/SofaRegressionProgram) +install(FILES SofaRegressionProgram.py DESTINATION ${REGRESSION_PROGRAM_INSTALL_DIR}) +install(DIRECTORY tools DESTINATION ${REGRESSION_PROGRAM_INSTALL_DIR}) diff --git a/SofaRegressionProgram.py b/SofaRegressionProgram/SofaRegressionProgram.py similarity index 98% rename from SofaRegressionProgram.py rename to SofaRegressionProgram/SofaRegressionProgram.py index 691d6ab..62a54bb 100644 --- a/SofaRegressionProgram.py +++ b/SofaRegressionProgram/SofaRegressionProgram.py @@ -60,7 +60,7 @@ def write_sets_references(self, id_set=0): def write_all_sets_references(self): nbr_sets = len(self.scene_sets) - pbar_sets = pbh.ProgressBarHandler(total=self.nbr_sets, disable=args.disable_progress_bar) + pbar_sets = pbh.ProgressBarHandler(total=nbr_sets, disable=self.disable_progress_bar) pbar_sets.set_description("Write All sets") nbr_scenes = 0 diff --git a/tools/ProgressBarHandler.py b/SofaRegressionProgram/tools/ProgressBarHandler.py similarity index 100% rename from tools/ProgressBarHandler.py rename to SofaRegressionProgram/tools/ProgressBarHandler.py diff --git a/tools/ReferenceFileIO.py b/SofaRegressionProgram/tools/ReferenceFileIO.py similarity index 100% rename from tools/ReferenceFileIO.py rename to SofaRegressionProgram/tools/ReferenceFileIO.py diff --git a/tools/RegressionHelper.py b/SofaRegressionProgram/tools/RegressionHelper.py similarity index 100% rename from tools/RegressionHelper.py rename to SofaRegressionProgram/tools/RegressionHelper.py diff --git a/tools/RegressionSceneData.py b/SofaRegressionProgram/tools/RegressionSceneData.py similarity index 100% rename from tools/RegressionSceneData.py rename to SofaRegressionProgram/tools/RegressionSceneData.py diff --git a/tools/RegressionSceneList.py b/SofaRegressionProgram/tools/RegressionSceneList.py similarity index 98% rename from tools/RegressionSceneList.py rename to SofaRegressionProgram/tools/RegressionSceneList.py index d370b31..6c8c196 100644 --- a/tools/RegressionSceneList.py +++ b/SofaRegressionProgram/tools/RegressionSceneList.py @@ -109,7 +109,7 @@ def write_references(self, id_scene, print_log = False): def write_all_references(self): nbr_scenes = len(self.scenes_data_sets) - pbar_scenes = pbh.ProgressBarHandler(total=self.nbr_scenes, disable=self.disable_progress_bar) + pbar_scenes = pbh.ProgressBarHandler(total=nbr_scenes, disable=self.disable_progress_bar) pbar_scenes.set_description("Write all scenes from: " + self.file_path) for i in range(0, nbr_scenes):