style checks

f3d-app · Oct 5, 2024 · 169e102 · 169e102
1 parent 5fdb09e
commit 169e102
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 7 deletions.
diff --git a/application/F3DStarter.cxx b/application/F3DStarter.cxx
@@ -1363,7 +1363,8 @@ int F3DStarter::AddFile(const fs::path& path, bool quiet)
       {
         if (this->Internals->AppOptions.MultiFileMode != "single")
         {
-          f3d::log::warn("Unrecognized multi-file-mode: ", this->Internals->AppOptions.MultiFileMode, ". Assuming \"single\" mode.");
+          f3d::log::warn("Unrecognized multi-file-mode: ",
+            this->Internals->AppOptions.MultiFileMode, ". Assuming \"single\" mode.");
         }
         this->Internals->FilesGroups.emplace_back(std::vector<fs::path>{ tmpPath });
       }

diff --git a/application/testing/CMakeLists.txt b/application/testing/CMakeLists.txt
@@ -944,11 +944,11 @@ f3d_test(NAME TestNonExistentConfigFileStem DATA cow.vtp CONFIG "dummy" REGEXP "
 f3d_test(NAME TestInvalidConfigFile DATA cow.vtp CONFIG ${F3D_SOURCE_DIR}/testing/configs/invalid.json REGEXP "Unable to parse the configuration file" NO_BASELINE)
 
 # Test invalid multifile mode
-f3d_test(NAME TestInvalidMultiFile DATA mb/recursive ARGS --multi-file-mode=allo REGEXP "Unrecognized multi-file-mode: allo. Assuming "single" mode." NO_BASELINE)
+f3d_test(NAME TestInvalidMultiFile DATA mb/recursive ARGS --multi-file-mode=add REGEXP "Unrecognized multi-file-mode: add. Assuming \"single\" mode." NO_BASELINE)
 
-# Test unamed cameras/animation
-f3d_test(NAME TestVerboseUnamedCamera DATA Cameras.gltf ARGS --verbose REGEXP "1: unamed_1" NO_BASELINE)
-f3d_test(NAME TestVerboseUnamedAnimation DATA BoxAnimated.gltf ARGS --verbose REGEXP "0: unamed_0" NO_BASELINE)
+# Test unnamed cameras/animation
+f3d_test(NAME TestVerboseUnnamedCamera DATA Cameras.gltf ARGS --verbose REGEXP "1: unnamed_1" NO_BASELINE)
+f3d_test(NAME TestVerboseUnnamedAnimation DATA BoxAnimated.gltf ARGS --verbose REGEXP "0: unnamed_0" NO_BASELINE)
 
 # Test invalid value in config file
 f3d_test(NAME TestConfigFileInvalidValue DATA cow.vtp CONFIG ${F3D_SOURCE_DIR}/testing/configs/invalid_value.json REGEXP "must be a string, a boolean or a number" NO_BASELINE)

diff --git a/vtkext/private/module/vtkF3DMetaImporter.cxx b/vtkext/private/module/vtkF3DMetaImporter.cxx
@@ -489,7 +489,7 @@ std::string vtkF3DMetaImporter::GetAnimationName(vtkIdType animationIndex)
       std::string name = importer.first->GetAnimationName(localAnimationIndex);
       if (name.empty())
       {
-        name = "unamed_" + std::to_string(animationIndex);
+        name = "unnamed_" + std::to_string(animationIndex);
       }
       return name;
     }
@@ -578,7 +578,7 @@ std::string vtkF3DMetaImporter::GetCameraName(vtkIdType camIndex)
       std::string name = importer.first->GetCameraName(localCameraIndex);
       if (name.empty())
       {
-        name = "unamed_" + std::to_string(camIndex);
+        name = "unnamed_" + std::to_string(camIndex);
       }
       return name;
     }