Remove points

CMake/telesculptor-external-fletch.cmake

@@ -49,7 +49,7 @@ endif()
 ExternalProject_Add(fletch
   PREFIX ${TELESCULPTOR_BINARY_DIR}
   GIT_REPOSITORY "https://github.com/Kitware/fletch.git"
-  GIT_TAG 94870a290a06db845e80816863bb6d1b9cb12085
+  GIT_TAG 30d2c3ba713f23ab64f2bea94f0afab3c035c160
   #GIT_SHALLOW 1
   SOURCE_DIR ${TELESCULPTOR_EXTERNAL_DIR}/fletch
   BINARY_DIR ${TELESCULPTOR_EXTERNAL_DIR}/fletch-build
@@ -99,7 +99,7 @@ ExternalProject_Add(fletch
     -Dfletch_ENABLE_SuiteSparse:BOOL=${TELESCULPTOR_ENABLE_FLETCH_CERES}
     -Dfletch_ENABLE_TinyXML:BOOL=OFF
     -Dfletch_ENABLE_VTK:BOOL=${TELESCULPTOR_ENABLE_FLETCH_VTK}
-    -DVTK_SELECT_VERSION:STRING=9.0
+    -DVTK_SELECT_VERSION:STRING=9.1
     -Dfletch_ENABLE_VXL:BOOL=ON
     -Dfletch_ENABLE_YAMLcpp:BOOL=OFF
     -Dfletch_ENABLE_ZLib:BOOL=${TELESCULPTOR_ENABLE_FLETCH_ZLIB}

CMake/telesculptor-external-kwiver.cmake

@@ -18,7 +18,7 @@ ExternalProject_Add(kwiver
   BINARY_DIR ${TELESCULPTOR_EXTERNAL_DIR}/kwiver-build
   STAMP_DIR ${TELESCULPTOR_STAMP_DIR}
   GIT_REPOSITORY "https://github.com/Kitware/kwiver.git"
-  GIT_TAG 08dbcd8a59a6930ac6f1639c2db8a94c12dfd96e
+  GIT_TAG 345f7f2b919698fbc1d0b5bd73b5376d7667320c
   #GIT_SHALLOW 1
   CMAKE_CACHE_ARGS
     -DBUILD_SHARED_LIBS:BOOL=ON

gui/ColorizeSurfaceOptions.cxx

@@ -48,8 +48,8 @@ class ColorizeSurfaceOptionsPrivate
   kv::frame_id_t currentFrame = -1;
 
   double occlusionThreshold = 1;
-  bool removeOccluded = true;
-  bool removeMasked = true;
+  bool colorOccluded = false;
+  bool colorMasked = false;
   bool insideColorize = false;
   const int INVALID_FRAME = -2;
   kwiver::vital::frame_id_t lastColorizedFrame = INVALID_FRAME;
@@ -98,12 +98,12 @@ ColorizeSurfaceOptions::ColorizeSurfaceOptions(
 
   connect(d->UI.doubleSpinBoxOcclusionThreshold, &QDoubleSpinBox::editingFinished,
           this, &ColorizeSurfaceOptions::updateOcclusionThreshold);
-  connect(d->UI.checkBoxRemoveOccluded,
+  connect(d->UI.checkBoxColorOccluded,
           &QCheckBox::stateChanged,
-          this, &ColorizeSurfaceOptions::removeOccludedChanged);
-  connect(d->UI.checkBoxRemoveMasked,
+          this, &ColorizeSurfaceOptions::colorOccludedChanged);
+  connect(d->UI.checkBoxColorMasked,
           &QCheckBox::stateChanged,
-          this, &ColorizeSurfaceOptions::removeMaskedChanged);
+          this, &ColorizeSurfaceOptions::colorMaskedChanged);
 
   d->krtdFile = QString();
   d->frameFile = QString();
@@ -127,17 +127,17 @@ void ColorizeSurfaceOptions::setOcclusionThreshold(double occlusionThreshold)
 }
 
 //-----------------------------------------------------------------------------
-void ColorizeSurfaceOptions::setRemoveOccluded(double removeOccluded)
+void ColorizeSurfaceOptions::setColorOccluded(double colorOccluded)
 {
   QTE_D();
-  d->removeOccluded = removeOccluded;
+  d->colorOccluded = colorOccluded;
 }
 
 //-----------------------------------------------------------------------------
-void ColorizeSurfaceOptions::setRemoveMasked(double removeMasked)
+void ColorizeSurfaceOptions::setColorMasked(double colorMasked)
 {
   QTE_D();
-  d->removeMasked = removeMasked;
+  d->colorMasked = colorMasked;
 }
 
 //-----------------------------------------------------------------------------
@@ -225,7 +225,7 @@ void ColorizeSurfaceOptions::setMaskConfig(
   if (d->UI.radioButtonAllFrames->isEnabled())
   {
     this->forceColorize();
-    d->UI.checkBoxRemoveMasked->setEnabled(! d->maskPath.empty());
+    d->UI.checkBoxColorMasked->setEnabled(! d->maskPath.empty());
   }
 }
 
@@ -275,8 +275,8 @@ void ColorizeSurfaceOptions::enableMenu(bool state)
   d->UI.radioButtonAllFrames->setEnabled(state);
   d->UI.radioButtonCurrentFrame->setEnabled(state);
   d->UI.doubleSpinBoxOcclusionThreshold->setEnabled(state);
-  d->UI.checkBoxRemoveOccluded->setEnabled(state);
-  d->UI.checkBoxRemoveMasked->setEnabled(state && ! d->maskPath.empty());
+  d->UI.checkBoxColorOccluded->setEnabled(state);
+  d->UI.checkBoxColorMasked->setEnabled(state && ! d->maskPath.empty());
 }
 
 //-----------------------------------------------------------------------------
@@ -348,11 +348,10 @@ void ColorizeSurfaceOptions::colorize()
                            d->cameras);
 
       coloration->set_input(volume);
-      coloration->set_output(volume);
       coloration->set_frame_sampling(d->UI.spinBoxFrameSampling->value());
       coloration->set_occlusion_threshold(d->occlusionThreshold);
-      coloration->set_remove_occluded(d->removeOccluded);
-      coloration->set_remove_masked(d->removeMasked);
+      coloration->set_color_occluded(d->colorOccluded);
+      coloration->set_color_masked(d->colorMasked);
       coloration->set_frame(d->lastColorizedFrame);
       coloration->set_all_frames(false);
       connect(coloration, &MeshColoration::resultReady,
@@ -383,12 +382,13 @@ void ColorizeSurfaceOptions::meshColorationHandleResult(
   {
     vtkPolyData* volume = coloration->get_output();
     volume->GetPointData()->SetActiveScalars("mean");
+    d->volumeActor->GetMapper()->SetInputDataObject(volume);
     d->UI.comboBoxColorDisplay->setCurrentIndex(
       d->UI.comboBoxColorDisplay->findText("mean"));
     d->UI.comboBoxColorDisplay->setEnabled(true);
     emit colorModeChanged(d->UI.buttonGroup->checkedButton()->text());
   }
-  d->UI.checkBoxRemoveOccluded->setEnabled(coloration);
+  d->UI.checkBoxColorOccluded->setEnabled(coloration);
   d->UI.doubleSpinBoxOcclusionThreshold->setEnabled(coloration);
 }
 
@@ -430,15 +430,15 @@ void ColorizeSurfaceOptions::updateOcclusionThreshold()
 }
 
 //-----------------------------------------------------------------------------
-void ColorizeSurfaceOptions::removeOccludedChanged(int removeOccluded)
+void ColorizeSurfaceOptions::colorOccludedChanged(int colorOccluded)
 {
-  this->setRemoveOccluded(removeOccluded);
+  this->setColorOccluded(colorOccluded);
   this->forceColorize();
 }
 
 //-----------------------------------------------------------------------------
-void ColorizeSurfaceOptions::removeMaskedChanged(int removeMasked)
+void ColorizeSurfaceOptions::colorMaskedChanged(int colorMasked)
 {
-  this->setRemoveMasked(removeMasked);
+  this->setColorMasked(colorMasked);
   this->forceColorize();
 }

gui/ColorizeSurfaceOptions.h

@@ -34,8 +34,8 @@ class ColorizeSurfaceOptions : public QWidget
 
   void setCurrentFrame(kwiver::vital::frame_id_t frame);
   void setOcclusionThreshold(double occlusionThreshold);
-  void setRemoveOccluded(double removeOccluded);
-  void setRemoveMasked(double removeMasked);
+  void setColorOccluded(double colorOccluded);
+  void setColorMasked(double colorMasked);
   double getOcclusionThreshold();
   void setActor(vtkActor* actor);
   void setVideoConfig(std::string const& path,
@@ -65,8 +65,8 @@ public slots:
   void allFrameSelected();
   void currentFrameSelected();
   void updateOcclusionThreshold();
-  void removeOccludedChanged(int removeOccluded);
-  void removeMaskedChanged(int removeMasked);
+  void colorOccludedChanged(int colorOccluded);
+  void colorMaskedChanged(int colorMasked);
 
 private:
 

gui/ColorizeSurfaceOptions.ui

@@ -103,15 +103,15 @@
     </widget>
    </item>
    <item row="3" column="0">
-    <widget class="QCheckBox" name="checkBoxRemoveOccluded">
+    <widget class="QCheckBox" name="checkBoxColorOccluded">
      <property name="enabled">
       <bool>false</bool>
      </property>
      <property name="text">
-      <string>Remove occluded surface color</string>
+      <string>Color occluded surface</string>
      </property>
      <property name="checked">
-      <bool>true</bool>
+      <bool>false</bool>
      </property>
     </widget>
    </item>
@@ -142,15 +142,15 @@
     </widget>
    </item>
    <item row="2" column="0">
-    <widget class="QCheckBox" name="checkBoxRemoveMasked">
+    <widget class="QCheckBox" name="checkBoxColorMasked">
      <property name="enabled">
       <bool>false</bool>
      </property>
      <property name="text">
-      <string>Remove masked surface color</string>
+      <string>Color masked surface</string>
      </property>
      <property name="checked">
-      <bool>true</bool>
+      <bool>false</bool>
      </property>
     </widget>
    </item>

gui/WorldView.cxx

@@ -1811,10 +1811,7 @@ void WorldView::saveFusedMeshFrameColors(const QString &path, bool occlusion)
   coloration->set_frame_sampling(d->volumeOptions->getFrameSampling());
   double occlusionThreshold = d->volumeOptions->getOcclusionThreshold();
   coloration->set_occlusion_threshold(occlusionThreshold);
-  coloration->set_remove_occluded(occlusion);
-  vtkSmartPointer<vtkPolyData> meshFrameColors = vtkSmartPointer<vtkPolyData>::New();
-  meshFrameColors->CopyStructure(d->mesh);
-  coloration->set_output(meshFrameColors);
+  coloration->set_color_occluded(occlusion);
   coloration->set_frame(-1);
   coloration->set_all_frames(true);
   connect(coloration, &MeshColoration::resultReady,