linker fix & reformat

f3d-app · Dec 26, 2024 · 7cbaa64 · 7cbaa64
1 parent 5fabb66
commit 7cbaa64
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 7 deletions.
diff --git a/library/src/interactor_impl.cxx b/library/src/interactor_impl.cxx
@@ -7,7 +7,11 @@
 #include "window_impl.h"
 
 #include "vtkF3DConsoleOutputWindow.h"
+
+#if F3D_MODULE_UI
 #include "vtkF3DImguiConsole.h"
+#endif
+
 #include "vtkF3DInteractorEventRecorder.h"
 #include "vtkF3DInteractorStyle.h"
 #include "vtkF3DRenderer.h"
@@ -608,13 +612,14 @@ interactor& interactor_impl::initCommands()
     [&](const std::vector<std::string>& args)
     {
       check_args(args, 0, "clear");
-
+#if F3D_MODULE_UI
       vtkF3DImguiConsole* console =
         vtkF3DImguiConsole::SafeDownCast(vtkOutputWindow::GetInstance());
       if (console)
       {
         console->Clear();
       }
+#endif
     });
   this->addCommand("print",
     [&](const std::vector<std::string>& args)
@@ -994,7 +999,7 @@ interactor& interactor_impl::removeBinding(const interaction_bind_t& bind)
   // Look for the group of the removed bind
   std::string group;
   for (auto it = this->Internals->GroupedBinds.begin(); it != this->Internals->GroupedBinds.end();
-    it++)
+       it++)
   {
     if (it->second == bind)
     {

diff --git a/library/testing/TestSDKInteractorCommand.cxx b/library/testing/TestSDKInteractorCommand.cxx
@@ -3,7 +3,6 @@
 #include <engine.h>
 #include <interactor.h>
 #include <options.h>
-#include <vtkF3DImguiConsole.h>
 
 int TestSDKInteractorCommand(int argc, char* argv[])
 {
@@ -26,10 +25,8 @@ int TestSDKInteractorCommand(int argc, char* argv[])
   test("triggerCommand reset optional", options.render.hdri.file.has_value() == false);
 
   // Test clear
-  vtkF3DImguiConsole* console = vtkF3DImguiConsole::SafeDownCast(vtkOutputWindow::GetInstance());
-  const size_t beforeSize = console->GetLogsSize();
-  inter.triggerCommand("clear");
-  test("triggerCommand clear", console->GetLogsSize() == 0 && beforeSize > 0);
+  inter.triggerCommand("print_scene_info");
+  test("triggerCommand clear", (inter.triggerCommand("clear") == true));
 
   // Test toggle
   inter.triggerCommand("toggle model.scivis.cells");