Fixes #28: Can remove "blank" linear objects from the collection from…

… the right-click context menu.
matthewsholden · May 15, 2014 · f404e9b · f404e9b
1 parent 6f66194
commit f404e9b
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 1 deletion.
diff --git a/Resources/Icons/LinearObjectRemoveBlank.png b/Resources/Icons/LinearObjectRemoveBlank.png
diff --git a/Resources/qSlicerLinearObjectRegistrationModule.qrc b/Resources/qSlicerLinearObjectRegistrationModule.qrc
@@ -5,6 +5,7 @@
     <file>Icons/LinearObjectDown.png</file>
     <file>Icons/LinearObjectDelete.png</file>
     <file>Icons/LinearObjectRemoveBuffer.png</file>
+    <file>Icons/LinearObjectRemoveBlank.png</file>
     <file>Icons/LinearObjectMerge.png</file>
   </qresource>
 </RCC>
diff --git a/Widgets/qSlicerLinearObjectCollectionWidget.cxx b/Widgets/qSlicerLinearObjectCollectionWidget.cxx
@@ -385,13 +385,16 @@ ::onCollectionTableContextMenu(const QPoint& position)
   downAction->setIcon( QIcon( ":/Icons/LinearObjectDown.png" ) );
   QAction* removeBufferAction = new QAction( "Remove position buffer", collectionMenu );
   removeBufferAction->setIcon( QIcon( ":/Icons/LinearObjectRemoveBuffer.png" ) );
+  QAction* removeBlankAction = new QAction( "Remove blank linear object(s)", collectionMenu );
+  removeBlankAction->setIcon( QIcon( ":/Icons/LinearObjectRemoveBlank.png" ) );
   QAction* mergeAction = new QAction( "Merge linear objects", collectionMenu );
   mergeAction->setIcon( QIcon( ":/Icons/LinearObjectMerge.png" ) );
 
   collectionMenu->addAction( deleteAction );
   collectionMenu->addAction( upAction );
   collectionMenu->addAction( downAction );
   collectionMenu->addAction( removeBufferAction );
+  collectionMenu->addAction( removeBlankAction );
   collectionMenu->addAction( mergeAction );
 
   QAction* selectedAction = collectionMenu->exec( globalPosition );
@@ -442,12 +445,17 @@ ::onCollectionTableContextMenu(const QPoint& position)
 
   if ( selectedAction == removeBufferAction )
   {
-	if ( currentCollection->GetLinearObject( currentIndex ) != NULL )
+	  if ( currentCollection->GetLinearObject( currentIndex ) != NULL )
     {
       currentCollection->GetLinearObject( currentIndex )->SetPositionBuffer( NULL );
     }
   }
 
+  if ( selectedAction == removeBlankAction )
+  {
+    currentCollection->ShuffleOutNull();
+  }
+
   if ( selectedAction == mergeAction )
   {
     QItemSelectionModel* selectionModel = d->CollectionTableWidget->selectionModel();