Fixes #21: Shows what type of linear object is being collected in man…

…ual segmentation mode.
matthewsholden · May 12, 2014 · 9648131 · 9648131
1 parent 50d8777
commit 9648131
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 3 deletions.
diff --git a/Widgets/qSlicerLORManualSegmentationWidget.cxx b/Widgets/qSlicerLORManualSegmentationWidget.cxx
@@ -130,6 +130,7 @@ void qSlicerLORManualSegmentationWidget
 ::widgetActivated()
 {
   Q_D(qSlicerLORManualSegmentationWidget);
+  this->updateWidget();
 }
 
 
@@ -142,6 +143,22 @@ ::widgetDeactivated()
   {
     this->LORNode->StopCollecting();
   }
+  this->updateWidget();
+}
+
+
+void qSlicerLORManualSegmentationWidget
+::SetAndObserveCollectNode( vtkMRMLNode* newCollectNode )
+{
+  Q_D(qSlicerLORManualSegmentationWidget);
+
+  this->widgetDeactivated();
+
+  this->Superclass::SetAndObserveCollectNode( newCollectNode );
+
+  this->qvtkConnect( this->CollectNode, vtkMRMLLinearTransformNode::TransformModifiedEvent, this, SLOT( updateWidget() ) );
+
+  this->widgetActivated();
 }
 
 
@@ -158,6 +175,7 @@ ::onCollectButtonToggled()
   {
     this->LORNode->StopCollecting();
   }
+  this->updateWidget();
 }
 
 
@@ -172,17 +190,25 @@ ::updateWidget()
     return;
   }
 
-  disconnect( d->CollectButton, SIGNAL( toggled( bool ) ), this, SLOT( onCollectButtonClicked() ) );
+  disconnect( d->CollectButton, SIGNAL( toggled( bool ) ), this, SLOT( onCollectButtonToggled() ) );
 
-  if ( this->LORNode->GetCollectState().compare( LORConstants::UNKNOWNDOF_COLLECT_STATE ) )
+  if ( this->LORNode->GetCollectState().compare( LORConstants::UNKNOWNDOF_COLLECT_STATE ) == 0 )
   {
     d->CollectButton->setChecked( true );
+    std::stringstream typeString;
+    typeString << "Collect (";
+    typeString << LORConstants::DOF_TO_STRING( this->LORNode->GetActivePositionBuffer()->GetDOF( this->LORNode->GetNoiseThreshold() ) );
+    typeString << ")";
+    d->CollectButton->setText( QString::fromStdString( typeString.str() ) );
   }
   else
   {
     d->CollectButton->setChecked( false );
+    std::stringstream typeString;
+    typeString << "Collect ()";
+    d->CollectButton->setText( QString::fromStdString( typeString.str() ) );
   }
 
-  connect( d->CollectButton, SIGNAL( toggled( bool ) ), this, SLOT( onCollectButtonClicked() ) );
+  connect( d->CollectButton, SIGNAL( toggled( bool ) ), this, SLOT( onCollectButtonToggled() ) );
 
 }
diff --git a/Widgets/qSlicerLORManualSegmentationWidget.h b/Widgets/qSlicerLORManualSegmentationWidget.h
@@ -50,6 +50,8 @@ qSlicerLORManualSegmentationWidget : public qSlicerLORCollectControlsWidget
   virtual std::string GetCollectNodeType();
   virtual std::string GetCollectModeName();
 
+  virtual void SetAndObserveCollectNode( vtkMRMLNode* newCollectNode );
+
 public slots:
 
   virtual void widgetActivated();