diff --git a/application/testing/CMakeLists.txt b/application/testing/CMakeLists.txt index 95bff0f206..ff6c382c97 100644 --- a/application/testing/CMakeLists.txt +++ b/application/testing/CMakeLists.txt @@ -1097,7 +1097,7 @@ if(F3D_PLUGIN_BUILD_ALEMBIC AND F3D_PLUGIN_BUILD_ASSIMP) endif() # Test bindings-list display -f3d_test(NAME TestBindingsList ARGS --bindings-list REGEXP "Any.5 Toggle Orthographic Projection") +f3d_test(NAME TestBindingsList ARGS --list-bindings REGEXP "Any.5 Toggle Orthographic Projection") # Test rendering backends # For some reason the sanitizer detects leaks because of EGL and OSMesa diff --git a/library/private/scene_impl.h b/library/private/scene_impl.h index bfe0cbb92c..3f0d4f5b3c 100644 --- a/library/private/scene_impl.h +++ b/library/private/scene_impl.h @@ -47,7 +47,9 @@ class scene_impl : public scene */ void SetInteractor(interactor_impl* interactor); - // Display available cameras in the log + /** + * Display available cameras in the log + */ void PrintImporterDescription(log::VerboseLevel level); private: diff --git a/library/src/scene_impl.cxx b/library/src/scene_impl.cxx index cd08ac0c5a..5303b23f1e 100644 --- a/library/src/scene_impl.cxx +++ b/library/src/scene_impl.cxx @@ -141,29 +141,29 @@ class scene_impl::internals scene_impl::internals::DisplayAllInfo(this->MetaImporter, this->Window); } - static void DisplayImporterDescription(vtkImporter* importer) + static void DisplayImporterDescription(log::VerboseLevel level, vtkImporter* importer) { vtkIdType availCameras = importer->GetNumberOfCameras(); if (availCameras <= 0) { - log::debug("No camera available"); + log::print(level, "No camera available"); } else { - log::debug("Camera(s) available are:"); + log::print(level, "Camera(s) available are:"); } for (int i = 0; i < availCameras; i++) { - log::debug(i, ": ", importer->GetCameraName(i)); + log::print(level, i, ": ", importer->GetCameraName(i)); } - log::debug(""); - log::debug(importer->GetOutputsDescription(), "\n"); + log::print(level, ""); + log::print(level, importer->GetOutputsDescription(), "\n"); } static void DisplayAllInfo(vtkImporter* importer, window_impl& window) { // Display output description - scene_impl::internals::DisplayImporterDescription(importer); + scene_impl::internals::DisplayImporterDescription(log::VerboseLevel::DEBUG, importer); // Display coloring information window.PrintColoringDescription(log::VerboseLevel::DEBUG); @@ -341,20 +341,6 @@ void scene_impl::SetInteractor(interactor_impl* interactor) void scene_impl::PrintImporterDescription(log::VerboseLevel level) { - vtkIdType availCameras = this->Internals->MetaImporter->GetNumberOfCameras(); - if (availCameras <= 0) - { - log::print(level, "No camera available"); - } - else - { - log::print(level, "Camera(s) available are:"); - } - for (int i = 0; i < availCameras; i++) - { - log::print(level, i, ": ", this->Internals->MetaImporter->GetCameraName(i)); - } - log::print(level, ""); - log::print(level, this->Internals->MetaImporter->GetOutputsDescription(), "\n"); + scene_impl::internals::DisplayImporterDescription(level, this->Internals->MetaImporter); } } diff --git a/testing/baselines/TestInteractionCheatsheetConfigFile.png b/testing/baselines/TestInteractionCheatsheetConfigFile.png index 28487654d6..452e42344f 100644 --- a/testing/baselines/TestInteractionCheatsheetConfigFile.png +++ b/testing/baselines/TestInteractionCheatsheetConfigFile.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e61704c15c482ae55509cfa254149e94aa994733deb282b8ac27d0fc73f1d97a -size 295 +oid sha256:3e98d82eaba786e8f2319773e1a61e397f9c098d9b83db9166015b745c06c901 +size 250941 diff --git a/testing/baselines/TestInteractionConsoleTypingSceneInfo.png b/testing/baselines/TestInteractionConsoleTypingSceneInfo.png index 7331d37104..bd5ba097d7 100644 --- a/testing/baselines/TestInteractionConsoleTypingSceneInfo.png +++ b/testing/baselines/TestInteractionConsoleTypingSceneInfo.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c7d059e48ff1b5563dddb4a5c6d39b9487d1a31d7730fef29328e5324a7b8f0f -size 293 +oid sha256:a37855f19a18d791efad08e012c3d74c2b90a881d920fa14e5ac75d7be026167 +size 18041