change option type from vector<double> to int

f3d-app · Nov 30, 2024 · 5df8019 · 5df8019
1 parent 68a0dbc
commit 5df8019
Show file tree

Hide file tree

Showing 4 changed files with 41 additions and 10 deletions.
diff --git a/application/F3DOptionsTools.cxx b/application/F3DOptionsTools.cxx
@@ -136,7 +136,7 @@ static inline const std::array<CLIGroup, 8> CLIOptions = {{
       {"bar", "b", "Show scalar bar", "<bool>", "1" },
       {"colormap-file", "", "Specify a colormap image", "<filePath/filename/fileStem>", ""},
       {"colormap", "", "Specify a custom colormap (ignored if \"colormap-file\" is specified)", "<color_list>", ""},
-      {"colormap-discretization", "", "test colormap discretization", "<color_list>", ""},
+      {"colormap-discretization", "", "Specify the discretization of the colormap", "<int>", "-1"},
       {"volume", "v", "Show volume if the file is compatible", "<bool>", "1"},
       {"inverse", "i", "Inverse opacity function for volume rendering", "<bool>", "1"} } },
   {"Camera",

diff --git a/library/options.json b/library/options.json
@@ -247,8 +247,8 @@
         "default_value": "0.0, 0.0, 0.0, 0.0, 0.4, 0.9, 0.0, 0.0, 0.8, 0.9, 0.9, 0.0, 1.0, 1.0, 1.0, 1.0"
       },
       "discretization" : {
-        "type": "double_vector",
-        "default_value": "1.0, 1.0, 1.0, 1.0"
+        "type": "int",
+        "default_value": "-1"
       },
       "range": {
         "type": "double_vector"

diff --git a/vtkext/private/module/vtkF3DRenderer.cxx b/vtkext/private/module/vtkF3DRenderer.cxx
@@ -283,6 +283,9 @@ void vtkF3DRenderer::Initialize()
 
   this->GridInfo = "";
 
+  this->Discretization = -1;
+  this->DiscretizableColorTransferFunctionConfigured = false;
+
   this->AddActor2D(this->ScalarBarActor);
   this->ScalarBarActor->VisibilityOff();
 
@@ -2125,13 +2128,23 @@ void vtkF3DRenderer::SetColormap(const std::vector<double>& colormap)
   }
 }
 
-void vtkF3DRenderer::SetColorDiscretization(const std::vector<double>& discretization) {
-  auto logMsg = std::string("[Gapry PoC][Add CLI Options] " + std::string(__PRETTY_FUNCTION__));
-  F3DLog::Print(F3DLog::Severity::Warning, logMsg);
-  for(auto& e : discretization) {
-    F3DLog::Print(F3DLog::Severity::Warning, std::to_string(e) + std::string(" "));
+void vtkF3DRenderer::SetColorDiscretization(const int discretization) {
+  F3DLog::Print(F3DLog::Severity::Warning,
+    std::string("[Gapry PoC][Add CLI Options] ") + __PRETTY_FUNCTION__);
+
+  F3DLog::Print(F3DLog::Severity::Warning, 
+    std::string("[Gapry PoC][Add CLI Options] ") + 
+    "input discretization = " + std::to_string(discretization));
+
+  if(discretization >= 0 && discretization <= 255) {
+    this->Discretization = discretization;
+
+    vtkF3DMetaImporter::ColoringInfo info;
+    this->ConfigureRangeAndCTFForColoring(info);
+  } else {
+    F3DLog::Print(F3DLog::Severity::Error,
+      "The discretization value is between 0 and 255.");
   }
-  F3DLog::Print(F3DLog::Severity::Warning, std::string("\n"));
 }
 
 //----------------------------------------------------------------------------
@@ -2481,6 +2494,16 @@ void vtkF3DRenderer::ConfigureRangeAndCTFForColoring(
     return;
   }
 
+  // Set Discretization
+  if(this->Discretization >= 0 && !this->DiscretizableColorTransferFunctionConfigured) {
+    F3DLog::Print(F3DLog::Severity::Warning, 
+      std::string("[Gapry PoC][Add CLI Options] " ) + __PRETTY_FUNCTION__ + 
+      " discretization = " + std::to_string(this->Discretization));
+
+    this->DiscretizableColorTransferFunction->SetNumberOfValues(this->Discretization);
+    this->DiscretizableColorTransferFunctionConfigured = true;
+  }
+
   // Set range
   bool autoRange = true;
   if (this->UserScalarBarRange.has_value())

diff --git a/vtkext/private/module/vtkF3DRenderer.h b/vtkext/private/module/vtkF3DRenderer.h
@@ -14,6 +14,7 @@
 #include "vtkF3DMetaImporter.h"
 #include "vtkF3DUIActor.h"
 
+#include <vtkDiscretizableColorTransferFunction.h>
 #include <vtkLight.h>
 #include <vtkOpenGLRenderer.h>
 
@@ -282,7 +283,10 @@ class vtkF3DRenderer : public vtkOpenGLRenderer
    */
   void SetColormap(const std::vector<double>& colormap);
 
-  void SetColorDiscretization(const std::vector<double>& discretization);
+  /**
+   * Set the discretization of the colormap
+   */
+  void SetColorDiscretization(const int discretization);
 
   /**
    * Set the meta importer to recover coloring information from
@@ -559,6 +563,10 @@ class vtkF3DRenderer : public vtkOpenGLRenderer
   vtkF3DMetaImporter* Importer = nullptr;
   vtkMTimeType ImporterTimeStamp = 0;
 
+  vtkNew<vtkDiscretizableColorTransferFunction> DiscretizableColorTransferFunction;
+  bool DiscretizableColorTransferFunctionConfigured = false;
+  int Discretization = -1;
+
   vtkNew<vtkScalarBarActor> ScalarBarActor;
   bool ScalarBarActorConfigured = false;