f3d-app · mwestphal · Apr 24, 2025 · Mar 23, 2025 · Mar 23, 2025 · Mar 24, 2025
diff --git a/application/testing/CMakeLists.txt b/application/testing/CMakeLists.txt
@@ -926,6 +926,13 @@ f3d_test(NAME TestInteractionConsoleAutoCompleteHide DATA BoxAnimated.gltf INTER
 f3d_test(NAME TestInteractionConsoleHistory DATA BoxAnimated.gltf INTERACTION UI) #Escape;ro;Tab;45;Enter;set_c;Tab;top;Enter;Up;Up;Enter;Up;Up;Up;Up;Down;Down;Down;Down
 f3d_test(NAME TestInteractionConsoleHistoryEmpty DATA BoxAnimated.gltf INTERACTION UI)#Escape;Up;Down
 f3d_test(NAME TestInteractionConsoleHistoryHide DATA BoxAnimated.gltf INTERACTION UI)#Escape;a;Enter;b;Enter;Up;Escape;Escape;Escape;Up
+f3d_test(NAME TestInteractionMinimalConsoleOpen DATA f3d.glb INTERACTION UI) #Colon
+f3d_test(NAME TestInteractionMinimalConsoleEscape DATA f3d.glb INTERACTION UI) #Colon;Escape
+f3d_test(NAME TestInteractionMinimalConsoleReturn DATA f3d.glb INTERACTION UI) #Colon;Return
+f3d_test(NAME TestInteractionMinimalConsoleValidCommand DATA f3d.glb INTERACTION UI) #Colon;set_camera top;Return
+f3d_test(NAME TestInteractionMinimalConsoleInvalidCommand DATA f3d.glb INTERACTION UI) #Colon;foo;Return
+f3d_test(NAME TestInteractionMinimalConsoleResize DATA f3d.glb INTERACTION UI) #Colon;foo;Return;Colon
+f3d_test(NAME TestInteractionMinimalConsoleBadgeRemains DATA f3d.glb INTERACTION UI) #Colon;foo;Return;Colon;Escape
 
 if (F3D_MODULE_TINYFILEDIALOGS)
 f3d_test(NAME TestInteractionFileOpen INTERACTION NO_BASELINE ENV CTEST_OPEN_DIALOG_FILE=${F3D_SOURCE_DIR}/testing/data/cow.vtp)

diff --git a/doc/libf3d/OPTIONS.md b/doc/libf3d/OPTIONS.md
@@ -103,6 +103,7 @@ See the [APIs](#APIs) details below for more info.
 |     ui.scalar_bar     |  bool<br>false<br>render   | Show _scalar bar_ of the coloring by data array.                                                                 |        \-\-bar         |
 |     ui.cheatsheet     |  bool<br>false<br>render   | Show a interaction cheatsheet                                                                                    |           -            |
 |      ui.console       |  bool<br>false<br>render   | Show the console                                                                                                 |           -            |
+|  ui.minimal_console   |  bool<br>false<br>render   | Show the minimal console. Useful to execute a quick command and exit.                                            |           -            |
 |      ui.filename      |  bool<br>false<br>render   | Display the _filename info content_ on top of the window.                                                        |      \-\-filename      |
 |   ui.filename_info    |   string<br>-<br>render    | Content of _filename info_ to display.                                                                           |           -            |
 |     ui.font_file      | path<br>optional<br>render | Use the provided FreeType compatible font file to display text.<br>Can be useful to display non-ASCII filenames. |     \-\-font-file      |

diff --git a/doc/user/INTERACTIONS.md b/doc/user/INTERACTIONS.md
@@ -73,7 +73,8 @@ Other hotkeys and interactions are available:
 
 - <kbd>H</kbd>: key to toggle the display of a cheat sheet showing all these hotkeys and their statuses.
 - <kbd>CTRL</kbd> + <kbd>Q</kbd>: close the window and quit F3D.
-- <kbd>Esc</kbd>: display/hide the console.
+- <kbd>Esc</kbd>: display the console or hide console/minimal console.
+- <kbd>:</kbd>: display the minimal console
 - <kbd>Space</kbd>: play the animation if any.
 - <kbd>&larr;</kbd>: load the previous file if any and reset the camera.
 - <kbd>&rarr;</kbd>: load the next file if any and reset the camera.

diff --git a/library/options.json b/library/options.json
@@ -178,6 +178,10 @@
       "type": "bool",
       "default_value": "false"
     },
+    "minimal_console": {
+      "type": "bool",
+      "default_value": "false"
+    },
     "dropzone": {
       "type": "bool",
       "default_value": "false"

diff --git a/library/src/interactor_impl.cxx b/library/src/interactor_impl.cxx
@@ -259,10 +259,17 @@ class interactor_impl::internals
       const char* commandWithArgs = static_cast<const char*>(data);
       self->Interactor.SetCommandBuffer(commandWithArgs);
     }
-    else if (event == vtkF3DConsoleOutputWindow::ShowEvent ||
-      event == vtkF3DConsoleOutputWindow::HideEvent)
+    else if (event == vtkF3DConsoleOutputWindow::ShowEvent)
     {
-      self->Options.ui.console = (event == vtkF3DConsoleOutputWindow::ShowEvent);
+      // Invoked when console badge is clicked
+      self->Options.ui.console = true;
+    }
+    else if (event == vtkF3DConsoleOutputWindow::HideEvent)
+    {
+      // Invoked when esc key is pressed while in minimal console or console display, or when
+      // something is submitted to minimal console
+      self->Options.ui.console = false;
+      self->Options.ui.minimal_console = false;
     }
 
     self->RenderRequested = true;
@@ -1153,6 +1160,7 @@ interactor& interactor_impl::initBindings()
 #if F3D_MODULE_UI
   this->addBinding({mod_t::NONE, "H"}, "toggle ui.cheatsheet", "Others", std::bind(docStr, "Toggle cheatsheet display"));
   this->addBinding({mod_t::NONE, "Escape"}, "toggle ui.console", "Others", std::bind(docStr, "Toggle console display"));
+  this->addBinding({mod_t::ANY, "Colon"}, "toggle ui.minimal_console", "Others", std::bind(docStr, "Toggle minimal console display"));
 #endif
   this->addBinding({mod_t::CTRL, "Q"}, "stop_interactor", "Others", std::bind(docStr, "Stop the interactor"));
   this->addBinding({mod_t::NONE, "Return"}, "reset_camera", "Others", std::bind(docStr, "Reset camera to initial parameters"));

diff --git a/library/src/window_impl.cxx b/library/src/window_impl.cxx
@@ -406,6 +406,7 @@ void window_impl::UpdateDynamicOptions()
   renderer->ShowMetaData(opt.ui.metadata);
   renderer->ShowCheatSheet(opt.ui.cheatsheet);
   renderer->ShowConsole(opt.ui.console);
+  renderer->ShowMinimalConsole(opt.ui.minimal_console);
   renderer->ShowDropZone(opt.ui.dropzone);
   renderer->SetDropZoneInfo(opt.ui.dropzone_info);
   renderer->ShowArmature(opt.render.armature.enable);

diff --git a/testing/baselines/TestInteractionMinimalConsoleBadgeRemains.png b/testing/baselines/TestInteractionMinimalConsoleBadgeRemains.png
diff --git a/testing/baselines/TestInteractionMinimalConsoleEscape.png b/testing/baselines/TestInteractionMinimalConsoleEscape.png
diff --git a/testing/baselines/TestInteractionMinimalConsoleInvalidCommand.png b/testing/baselines/TestInteractionMinimalConsoleInvalidCommand.png
diff --git a/testing/baselines/TestInteractionMinimalConsoleOpen.png b/testing/baselines/TestInteractionMinimalConsoleOpen.png
diff --git a/testing/baselines/TestInteractionMinimalConsoleResize.png b/testing/baselines/TestInteractionMinimalConsoleResize.png
diff --git a/testing/baselines/TestInteractionMinimalConsoleReturn.png b/testing/baselines/TestInteractionMinimalConsoleReturn.png
diff --git a/testing/baselines/TestInteractionMinimalConsoleValidCommand.png b/testing/baselines/TestInteractionMinimalConsoleValidCommand.png
diff --git a/testing/recordings/TestInteractionMinimalConsoleBadgeRemains.log b/testing/recordings/TestInteractionMinimalConsoleBadgeRemains.log
@@ -0,0 +1,38 @@
+# StreamVersion 1.2
+RenderEvent 0 0 0 0 0 0 0
+
+KeyPressEvent 0 0 1 0 1 Shift_L 0
+KeyPressEvent 0 0 1 58 1 colon 0
+CharEvent 0 0 1 58 1 colon 0
+KeyReleaseEvent 0 0 0 0 1 Shift_L 0
+KeyReleaseEvent 0 0 0 59 1 semicolon 0
+
+KeyPressEvent 0 0 0 102 1 f 0
+CharEvent 0 0 0 102 1 f 0
+KeyReleaseEvent 0 0 0 102 1 f 0
+
+KeyPressEvent 0 0 0 111 1 o 0
+CharEvent 0 0 0 111 1 o 0
+KeyReleaseEvent 0 0 0 111 1 o 0
+
+KeyPressEvent 0 0 0 111 1 o 0
+CharEvent 0 0 0 111 1 o 0
+KeyReleaseEvent 0 0 0 111 1 o 0
+
+KeyPressEvent 0 0 0 13 1 Return 0
+CharEvent 0 0 0 13 1 Return 0
+KeyReleaseEvent 0 0 0 13 1 Return 0
+
+TimerEvent 351 169 0 0 0 0 0
+
+KeyPressEvent 0 0 1 0 1 Shift_L 0
+KeyPressEvent 0 0 1 58 1 colon 0
+CharEvent 0 0 1 58 1 colon 0
+KeyReleaseEvent 0 0 0 0 1 Shift_L 0
+KeyReleaseEvent 0 0 0 59 1 semicolon 0
+
+KeyPressEvent 0 0 0 27 1 Escape 0
+CharEvent 0 0 0 27 1 Escape 0
+KeyReleaseEvent 0 0 0 27 1 Escape 0
+
+TimerEvent 351 169 0 0 0 0 0
diff --git a/testing/recordings/TestInteractionMinimalConsoleEscape.log b/testing/recordings/TestInteractionMinimalConsoleEscape.log
@@ -0,0 +1,10 @@
+# StreamVersion 1.2
+RenderEvent 0 0 0 0 0 0 0
+KeyPressEvent 0 0 1 0 1 Shift_L 0
+KeyPressEvent 0 0 1 58 1 colon 0
+CharEvent 0 0 1 58 1 colon 0
+KeyReleaseEvent 0 0 0 0 1 Shift_L 0
+KeyReleaseEvent 0 0 0 59 1 semicolon 0
+KeyPressEvent 0 0 0 27 1 Escape 0
+CharEvent 0 0 0 27 1 Escape 0
+KeyReleaseEvent 0 0 0 27 1 Escape 0
diff --git a/testing/recordings/TestInteractionMinimalConsoleInvalidCommand.log b/testing/recordings/TestInteractionMinimalConsoleInvalidCommand.log
@@ -0,0 +1,26 @@
+# StreamVersion 1.2
+RenderEvent 0 0 0 0 0 0 0
+
+KeyPressEvent 0 0 1 0 1 Shift_L 0
+KeyPressEvent 0 0 1 58 1 colon 0
+CharEvent 0 0 1 58 1 colon 0
+KeyReleaseEvent 0 0 0 0 1 Shift_L 0
+KeyReleaseEvent 0 0 0 59 1 semicolon 0
+
+KeyPressEvent 0 0 0 102 1 f 0
+CharEvent 0 0 0 102 1 f 0
+KeyReleaseEvent 0 0 0 102 1 f 0
+
+KeyPressEvent 0 0 0 111 1 o 0
+CharEvent 0 0 0 111 1 o 0
+KeyReleaseEvent 0 0 0 111 1 o 0
+
+KeyPressEvent 0 0 0 111 1 o 0
+CharEvent 0 0 0 111 1 o 0
+KeyReleaseEvent 0 0 0 111 1 o 0
+
+KeyPressEvent 0 0 0 13 1 Return 0
+CharEvent 0 0 0 13 1 Return 0
+KeyReleaseEvent 0 0 0 13 1 Return 0
+
+TimerEvent 351 169 0 0 0 0 0
diff --git a/testing/recordings/TestInteractionMinimalConsoleOpen.log b/testing/recordings/TestInteractionMinimalConsoleOpen.log
@@ -0,0 +1,6 @@
+# StreamVersion 1.2
+RenderEvent 0 0 0 0 0 0 0
+KeyPressEvent 0 0 1 0 1 Shift_L 0
+KeyPressEvent 0 0 1 58 1 colon 0
+KeyReleaseEvent 0 0 0 0 1 Shift_L 0
+KeyReleaseEvent 0 0 0 59 1 semicolon 0
diff --git a/testing/recordings/TestInteractionMinimalConsoleResize.log b/testing/recordings/TestInteractionMinimalConsoleResize.log
@@ -0,0 +1,34 @@
+# StreamVersion 1.2
+RenderEvent 0 0 0 0 0 0 0
+
+KeyPressEvent 0 0 1 0 1 Shift_L 0
+KeyPressEvent 0 0 1 58 1 colon 0
+CharEvent 0 0 1 58 1 colon 0
+KeyReleaseEvent 0 0 0 0 1 Shift_L 0
+KeyReleaseEvent 0 0 0 59 1 semicolon 0
+
+KeyPressEvent 0 0 0 102 1 f 0
+CharEvent 0 0 0 102 1 f 0
+KeyReleaseEvent 0 0 0 102 1 f 0
+
+KeyPressEvent 0 0 0 111 1 o 0
+CharEvent 0 0 0 111 1 o 0
+KeyReleaseEvent 0 0 0 111 1 o 0
+
+KeyPressEvent 0 0 0 111 1 o 0
+CharEvent 0 0 0 111 1 o 0
+KeyReleaseEvent 0 0 0 111 1 o 0
+
+KeyPressEvent 0 0 0 13 1 Return 0
+CharEvent 0 0 0 13 1 Return 0
+KeyReleaseEvent 0 0 0 13 1 Return 0
+
+TimerEvent 351 169 0 0 0 0 0
+
+KeyPressEvent 0 0 1 0 1 Shift_L 0
+KeyPressEvent 0 0 1 58 1 colon 0
+CharEvent 0 0 1 58 1 colon 0
+KeyReleaseEvent 0 0 0 0 1 Shift_L 0
+KeyReleaseEvent 0 0 0 59 1 semicolon 0
+
+TimerEvent 351 169 0 0 0 0 0
diff --git a/testing/recordings/TestInteractionMinimalConsoleReturn.log b/testing/recordings/TestInteractionMinimalConsoleReturn.log
@@ -0,0 +1,10 @@
+# StreamVersion 1.2
+RenderEvent 0 0 0 0 0 0 0
+KeyPressEvent 0 0 1 0 1 Shift_L 0
+KeyPressEvent 0 0 1 58 1 colon 0
+CharEvent 0 0 1 58 1 colon 0
+KeyReleaseEvent 0 0 0 0 1 Shift_L 0
+KeyReleaseEvent 0 0 0 59 1 semicolon 0
+KeyPressEvent 0 0 0 13 1 Return 0
+CharEvent 0 0 0 13 1 Return 0
+KeyReleaseEvent 0 0 0 13 1 Return 0
diff --git a/testing/recordings/TestInteractionMinimalConsoleValidCommand.log b/testing/recordings/TestInteractionMinimalConsoleValidCommand.log
@@ -0,0 +1,71 @@
+# StreamVersion 1.2
+RenderEvent 0 0 0 0 0 0 0
+
+KeyPressEvent 0 0 1 0 1 Shift_L 0
+KeyPressEvent 0 0 1 58 1 colon 0
+KeyReleaseEvent 0 0 0 0 1 Shift_L 0
+KeyReleaseEvent 0 0 0 59 1 semicolon 0
+
+KeyPressEvent 0 0 0 115 1 s 0
+CharEvent 0 0 0 115 1 s 0
+KeyReleaseEvent 0 0 0 115 1 s 0
+
+KeyPressEvent 0 0 0 101 1 e 0
+CharEvent 0 0 0 101 1 e 0
+KeyReleaseEvent 0 0 0 101 1 e 0
+
+KeyPressEvent 0 0 0 116 1 t 0
+CharEvent 0 0 0 116 1 t 0
+KeyReleaseEvent 0 0 0 116 1 t 0
+
+KeyPressEvent 0 0 1 0 1 Shift_L 0
+KeyPressEvent 0 0 1 95 1 underscore 0
+CharEvent 0 0 1 95 1 underscore 0
+KeyReleaseEvent 0 0 0 0 1 Shift_L 0
+KeyReleaseEvent 0 0 0 45 1 minus 0
+
+KeyPressEvent 0 0 0 99 1 c 0
+CharEvent 0 0 0 99 1 c 0
+KeyReleaseEvent 0 0 0 99 1 c 0
+
+KeyPressEvent 0 0 0 97 1 a 0
+CharEvent 0 0 0 97 1 a 0
+KeyReleaseEvent 0 0 0 97 1 a 0
+
+KeyPressEvent 0 0 0 109 1 m 0
+CharEvent 0 0 0 109 1 m 0
+KeyReleaseEvent 0 0 0 109 1 m 0
+
+KeyPressEvent 0 0 0 101 1 e 0
+CharEvent 0 0 0 101 1 e 0
+KeyReleaseEvent 0 0 0 101 1 e 0
+
+KeyPressEvent 0 0 0 114 1 r 0
+CharEvent 0 0 0 114 1 r 0
+KeyReleaseEvent 0 0 0 114 1 r 0
+
+KeyPressEvent 0 0 0 97 1 a 0
+CharEvent 0 0 0 97 1 a 0
+KeyReleaseEvent 0 0 0 97 1 a 0
+
+KeyPressEvent 0 0 0 32 1 space 0
+CharEvent 0 0 0 32 1 space 0
+KeyReleaseEvent 0 0 0 32 1 space 0
+
+KeyPressEvent 0 0 0 116 1 t 0
+CharEvent 0 0 0 116 1 t 0
+KeyReleaseEvent 0 0 0 116 1 t 0
+
+KeyPressEvent 0 0 0 111 1 o 0
+CharEvent 0 0 0 111 1 o 0
+KeyReleaseEvent 0 0 0 111 1 o 0
+
+KeyPressEvent 0 0 0 112 1 p 0
+CharEvent 0 0 0 112 1 p 0
+KeyReleaseEvent 0 0 0 112 1 p 0
+
+KeyPressEvent 0 0 0 13 1 Return 0
+CharEvent 0 0 0 13 1 Return 0
+KeyReleaseEvent 0 0 0 13 1 Return 0
+
+TimerEvent 351 169 0 0 0 0 0
diff --git a/vtkext/private/module/vtkF3DImguiActor.cxx b/vtkext/private/module/vtkF3DImguiActor.cxx
@@ -508,10 +508,10 @@ void vtkF3DImguiActor::RenderFpsCounter()
 }
 
 //----------------------------------------------------------------------------
-void vtkF3DImguiActor::RenderConsole()
+void vtkF3DImguiActor::RenderConsole(bool minimal)
 {
   vtkF3DImguiConsole* console = vtkF3DImguiConsole::SafeDownCast(vtkOutputWindow::GetInstance());
-  console->ShowConsole();
+  console->ShowConsole(minimal);
 }
 
 //----------------------------------------------------------------------------

diff --git a/vtkext/private/module/vtkF3DImguiActor.h b/vtkext/private/module/vtkF3DImguiActor.h
@@ -84,7 +84,7 @@ class vtkF3DImguiActor : public vtkF3DUIActor
   /**
    * Render the console widget
    */
-  void RenderConsole() override;
+  void RenderConsole(bool) override;
 
   /**
    * Render the console badge