Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

BUG: 3028. Reverted previous commit since it broke Link logic.

git-svn-id: http://svn.slicer.org/Slicer4/trunk@21836 3bd1e089-480b-0410-8dfb-8563597acbee
  • Loading branch information...
commit bf1833912f0072197af4a61661e4e160e0b1661d 1 parent f1d42a9
alexy authored
Showing with 11 additions and 3 deletions.
  1. +11 −3 Libs/MRML/Widgets/qMRMLSliceControllerWidget.cxx
View
14 Libs/MRML/Widgets/qMRMLSliceControllerWidget.cxx
@@ -202,6 +202,8 @@ void qMRMLSliceControllerWidgetPrivate::setupPopupUi()
q, SLOT(setSliceModelMode2D()));
QObject::connect(this->actionSliceModelMode2D_Volumes, SIGNAL(triggered()),
q, SLOT(setSliceModelMode2D_Volumes()));
+ QObject::connect(this->actionSliceModelModeVolumes_2D, SIGNAL(triggered()),
+ q, SLOT(setSliceModelModeVolumes_2D()));
//QObject::connect(this->actionSliceModelModeCustom, SIGNAL(triggered()),
// q, SLOT(setSliceModelModeCustom()));
@@ -543,6 +545,7 @@ void qMRMLSliceControllerWidgetPrivate::setupSliceModelMenu()
this->SliceModelMenu->addAction(this->actionSliceModelModeVolumes);
this->SliceModelMenu->addAction(this->actionSliceModelMode2D);
this->SliceModelMenu->addAction(this->actionSliceModelMode2D_Volumes);
+ this->SliceModelMenu->addAction(this->actionSliceModelModeVolumes_2D);
//this->SliceModelMenu->addAction(this->actionSliceModelModeCustom);
this->SliceVisibilityButton->setCheckable(true);
@@ -816,6 +819,8 @@ void qMRMLSliceControllerWidgetPrivate::updateWidgetFromMRMLSliceNode()
vtkMRMLSliceNode::SliceResolutionMatch2DView);
this->actionSliceModelMode2D_Volumes->setChecked(this->MRMLSliceNode->GetSliceResolutionMode() ==
vtkMRMLSliceNode::SliceFOVMatch2DViewSpacingMatchVolumes);
+ this->actionSliceModelModeVolumes_2D->setChecked(this->MRMLSliceNode->GetSliceResolutionMode() ==
+ vtkMRMLSliceNode::SliceFOVMatchVolumesSpacingMatch2DView);
//this->actionSliceModelModeCustom->setChecked(this->MRMLSliceNode->GetSliceResolutionMode() ==
// vtkMRMLSliceNode::SliceResolutionCustom);
@@ -891,21 +896,18 @@ void qMRMLSliceControllerWidgetPrivate::updateWidgetFromMRMLSliceCompositeNode()
this->ForegroundComboBox->setCurrentNode(
q->mrmlScene()->GetNodeByID(this->MRMLSliceCompositeNode->GetForegroundVolumeID()));
this->ForegroundComboBox->blockSignals(wasBlocked);
- this->onForegroundLayerNodeSelected(q->mrmlScene()->GetNodeByID(this->MRMLSliceCompositeNode->GetForegroundVolumeID()));
// Update "background layer" node selector
wasBlocked = this->BackgroundComboBox->blockSignals(true);
this->BackgroundComboBox->setCurrentNode(
q->mrmlScene()->GetNodeByID(this->MRMLSliceCompositeNode->GetBackgroundVolumeID()));
this->BackgroundComboBox->blockSignals(wasBlocked);
- this->onBackgroundLayerNodeSelected(q->mrmlScene()->GetNodeByID(this->MRMLSliceCompositeNode->GetBackgroundVolumeID()));
// Update "label map" node selector
wasBlocked = this->LabelMapComboBox->blockSignals(true);
this->LabelMapComboBox->setCurrentNode(
q->mrmlScene()->GetNodeByID(this->MRMLSliceCompositeNode->GetLabelVolumeID()));
this->LabelMapComboBox->blockSignals(wasBlocked);
- this->onLabelMapNodeSelected(q->mrmlScene()->GetNodeByID(this->MRMLSliceCompositeNode->GetLabelVolumeID()));
// Label opacity
this->LabelMapOpacitySlider->setValue(this->MRMLSliceCompositeNode->GetLabelOpacity());
@@ -2085,6 +2087,12 @@ void qMRMLSliceControllerWidget::setSliceModelMode2D_Volumes()
}
//---------------------------------------------------------------------------
+void qMRMLSliceControllerWidget::setSliceModelModeVolumes_2D()
+{
+ this->setSliceModelMode(vtkMRMLSliceNode::SliceFOVMatchVolumesSpacingMatch2DView);
+}
+
+//---------------------------------------------------------------------------
void qMRMLSliceControllerWidget::setSliceModelModeCustom()
{
this->setSliceModelMode(vtkMRMLSliceNode::SliceResolutionCustom);
Please sign in to comment.
Something went wrong with that request. Please try again.