BUG: fix crash issue 77

Punzo · Feb 9, 2018 · d34feae · d34feae
1 parent e6c550d
commit d34feae
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 2 deletions.
diff --git a/AstroVolume/Widgets/qSlicerAstroVolumeModuleWidget.cxx b/AstroVolume/Widgets/qSlicerAstroVolumeModuleWidget.cxx
@@ -597,6 +597,7 @@ void qSlicerAstroVolumeModuleWidget::setMRMLScene(vtkMRMLScene* scene)
   vtkMRMLScene *presetsScene = astroVolumeLogic->GetPresetsScene();
   d->PresetsNodeComboBox->setMRMLScene(presetsScene);
   d->PresetsNodeComboBox->setCurrentNodeIndex(-1);
+  this->onMRMLVolumeNodeDisplayThresholdModified(true);
 }
 
 //-----------------------------------------------------------------------------
@@ -3701,8 +3702,14 @@ void qSlicerAstroVolumeModuleWidget::onMRMLDisplayROINodeModified(vtkObject* sen
     {
     return;
     }
+
   vtkMRMLAnnotationROINode* ROINode =
       vtkMRMLAnnotationROINode::SafeDownCast(sender);
+  if (!ROINode)
+    {
+    return;
+    }
+
   if(ROINode->GetDisplayVisibility())
     {
     d->ROICropDisplayCheckBox->setChecked(true);
@@ -4787,7 +4794,12 @@ void qSlicerAstroVolumeModuleWidget::onMRMLVolumeNodeModified()
   d->DegreeUnitButton->blockSignals(DegreeState);
   d->SexagesimalUnitButton->blockSignals(SexagesimalState);
 
-  vtkMRMLUnitNode* unitNode = d->selectionNode->GetUnitNode("intensity");
+  vtkMRMLUnitNode* unitNode = NULL;
+  if (d->selectionNode)
+    {
+    unitNode = d->selectionNode->GetUnitNode("intensity");
+    }
+
   std::string MIN = d->astroVolumeNode->GetAttribute("SlicerAstro.DATAMIN");
   std::string MAX = d->astroVolumeNode->GetAttribute("SlicerAstro.DATAMAX");
   if (unitNode)

diff --git a/AstroVolume/qSlicerAstroVolumeModule.cxx b/AstroVolume/qSlicerAstroVolumeModule.cxx
@@ -426,7 +426,22 @@ void qSlicerAstroVolumeModule::setup()
   qSlicerSegmentEditorEffectFactory::instance()->registerEffect(new qSlicerSegmentEditorAstroCloudLassoEffect());
   qSlicerSegmentEditorEffectFactory::instance()->registerEffect(new qSlicerSegmentEditorAstroContoursEffect());
 
-  // Find DarkBrightChartColorsID
+  // Set Default ColorNodeTable
+  defaultNode = vtkMRMLColorTableNode::SafeDownCast
+      (this->mrmlScene()->GetDefaultNodeByClass("vtkMRMLPlotChartNode"));
+  if (!defaultNode)
+    {
+    vtkMRMLNode *foo = this->mrmlScene()->CreateNodeByClass("vtkMRMLColorTableNode");
+    defaultNode.TakeReference(foo);
+    this->mrmlScene()->AddDefaultNode(defaultNode);
+    }
+  vtkMRMLColorTableNode *colorTableDefaultNode = vtkMRMLColorTableNode::SafeDownCast(defaultNode);
+  colorTableDefaultNode->SetAttribute("SlicerAstro.AddFunctions", "on");
+  colorTableDefaultNode->SetAttribute("SlicerAstro.Reverse", "on");
+  colorTableDefaultNode->SetAttribute("SlicerAstro.Inverse", "on");
+  colorTableDefaultNode->SetAttribute("SlicerAstro.Log", "on");
+
+  // Modify ColorNodeTable already allocated and find DarkBrightChartColorsID
   std::string DarkBrightChartColorsID;
   vtkSmartPointer<vtkCollection> ColorTableNodeCol = vtkSmartPointer<vtkCollection>::Take(
       this->mrmlScene()->GetNodesByClass("vtkMRMLColorTableNode"));
@@ -438,6 +453,12 @@ void qSlicerAstroVolumeModule::setup()
       {
       continue;
       }
+
+    tempColorTableNode->SetAttribute("SlicerAstro.AddFunctions", "on");
+    tempColorTableNode->SetAttribute("SlicerAstro.Reverse", "on");
+    tempColorTableNode->SetAttribute("SlicerAstro.Inverse", "on");
+    tempColorTableNode->SetAttribute("SlicerAstro.Log", "on");
+
     if (!strcmp(tempColorTableNode->GetName(), "DarkBrightChartColors"))
       {
       DarkBrightChartColorsID = tempColorTableNode->GetID();