Merge branch 'master' into master

commontk · Jul 25, 2021 · c298529 · c298529
2 parents 120b24c + ee50c56
commit c298529
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/Libs/Core/ctkUtils.cpp b/Libs/Core/ctkUtils.cpp
@@ -417,7 +417,7 @@ qint64 ctk::msecsTo(const QDateTime& t1, const QDateTime& t2)
 //------------------------------------------------------------------------------
 QString ctk::absolutePathFromInternal(const QString& internalPath, const QString& basePath)
 {
-  if (internalPath.isEmpty())
+  if (internalPath.isEmpty() || basePath.isEmpty())
   {
     return internalPath;
   }
@@ -435,7 +435,7 @@ QString ctk::absolutePathFromInternal(const QString& internalPath, const QString
 //------------------------------------------------------------------------------
 QString ctk::internalPathFromAbsolute(const QString& absolutePath, const QString& basePath)
 {
-  if (absolutePath.isEmpty())
+  if (absolutePath.isEmpty() || basePath.isEmpty())
   {
     return absolutePath;
   }

diff --git a/Libs/Visualization/VTK/Widgets/ctkVTKVolumePropertyWidget.cpp b/Libs/Visualization/VTK/Widgets/ctkVTKVolumePropertyWidget.cpp
@@ -218,6 +218,7 @@ void ctkVTKVolumePropertyWidget::updateFromVolumeProperty()
   vtkColorTransferFunction* colorTransferFunction = 0;
   vtkPiecewiseFunction* opacityFunction = 0;
   vtkPiecewiseFunction* gradientFunction = 0;
+  bool scalarColorMapping = true;
   if (d->VolumeProperty)
     {
     colorTransferFunction =
@@ -229,6 +230,7 @@ void ctkVTKVolumePropertyWidget::updateFromVolumeProperty()
     gradientFunction =
       d->VolumeProperty->GetGradientOpacity()->GetSize() ?
       d->VolumeProperty->GetGradientOpacity() : 0;
+    scalarColorMapping = d->VolumeProperty->GetIndependentComponents();
     }
 
   d->ScalarOpacityThresholdWidget->setPiecewiseFunction(
@@ -254,6 +256,10 @@ void ctkVTKVolumePropertyWidget::updateFromVolumeProperty()
   d->ScalarColorWidget->view()->setColorTransferFunctionToPlots(colorTransferFunction);
   d->GradientWidget->view()->setPiecewiseFunctionToPlots(gradientFunction);
 
+  // If color is specified by dependent components (RGBA volume) then do not show scalar color transfer
+  // function, because that function has no effect.
+  d->ScalarColorGroupBox->setVisible(scalarColorMapping);
+
   if (d->VolumeProperty)
     {
     d->InterpolationComboBox->setCurrentIndex(