An update will be applied December 9th, between 12PM and 1:00PM EST (UTC -5:00). The site may be slow during that time.

Commit 1bc6a7bb authored by alexy's avatar alexy
Browse files

BUG_FIXED: fixed qt widgets layout

git-svn-id: http://svn.slicer.org/Slicer4/trunk@12361 3bd1e089-480b-0410-8dfb-8563597acbee
parent 7bfdafcd
......@@ -13,51 +13,41 @@
<property name="windowTitle">
<string>Form</string>
</property>
<widget class="QWidget" name="horizontalLayoutWidget">
<property name="geometry">
<rect>
<x>20</x>
<y>40</y>
<width>321</width>
<height>80</height>
</rect>
</property>
<layout class="QHBoxLayout" name="horizontalLayout">
<item>
<widget class="QLabel" name="label">
<layout class="QHBoxLayout" name="horizontalLayout">
<item>
<widget class="QLabel" name="label">
<property name="text">
<string>Threshold: </string>
</property>
</widget>
</item>
<item>
<widget class="QComboBox" name="AutoManualComboBox">
<item>
<property name="text">
<string>Threshold: </string>
<string>Manual</string>
</property>
</widget>
</item>
<item>
<widget class="QComboBox" name="AutoManualComboBox">
<item>
<property name="text">
<string>Manual</string>
</property>
</item>
<item>
<property name="text">
<string>Auto</string>
</property>
</item>
<item>
<property name="text">
<string>Off</string>
</property>
</item>
</widget>
</item>
<item>
<widget class="qCTKRangeSlider" name="VolumeThresholdRangeSlider">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</item>
<item>
<property name="text">
<string>Auto</string>
</property>
</item>
<item>
<property name="text">
<string>Off</string>
</property>
</widget>
</item>
</layout>
</widget>
</item>
</widget>
</item>
<item>
<widget class="qCTKRangeSlider" name="VolumeThresholdRangeSlider">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
</widget>
</item>
</layout>
</widget>
<customwidgets>
<customwidget>
......
......@@ -13,46 +13,36 @@
<property name="windowTitle">
<string>Form</string>
</property>
<widget class="QWidget" name="horizontalLayoutWidget">
<property name="geometry">
<rect>
<x>20</x>
<y>40</y>
<width>321</width>
<height>80</height>
</rect>
</property>
<layout class="QHBoxLayout" name="horizontalLayout">
<item>
<widget class="QLabel" name="label">
<layout class="QHBoxLayout" name="horizontalLayout">
<item>
<widget class="QLabel" name="label">
<property name="text">
<string>Window/Level: </string>
</property>
</widget>
</item>
<item>
<widget class="QComboBox" name="AutoManualComboBox">
<item>
<property name="text">
<string>Window/Level: </string>
<string>Manual</string>
</property>
</widget>
</item>
<item>
<widget class="QComboBox" name="AutoManualComboBox">
<item>
<property name="text">
<string>Manual</string>
</property>
</item>
<item>
<property name="text">
<string>Auto</string>
</property>
</item>
</widget>
</item>
<item>
<widget class="qCTKRangeSlider" name="WindowLevelRangeSlider">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</item>
<item>
<property name="text">
<string>Auto</string>
</property>
</widget>
</item>
</layout>
</widget>
</item>
</widget>
</item>
<item>
<widget class="qCTKRangeSlider" name="WindowLevelRangeSlider">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
</widget>
</item>
</layout>
</widget>
<customwidgets>
<customwidget>
......
......@@ -6,8 +6,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>681</width>
<height>549</height>
<width>677</width>
<height>481</height>
</rect>
</property>
<property name="windowTitle">
......@@ -15,14 +15,10 @@
</property>
<layout class="QVBoxLayout" name="verticalLayout">
<item>
<layout class="QVBoxLayout" name="verticalLayout_2">
<item>
<widget class="qMRMLWindowLevelWidget" name="MRMLWindowLevelWidget"/>
</item>
<item>
<widget class="qMRMLVolumeThresholdWidget" name="MRMLVolumeThresholdWidget"/>
</item>
</layout>
<widget class="qMRMLVolumeThresholdWidget" name="MRMLVolumeThresholdWidget"/>
</item>
<item>
<widget class="qMRMLWindowLevelWidget" name="MRMLWindowLevelWidget"/>
</item>
</layout>
</widget>
......
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>qSlicerScalarVolumeDisplayWidget</class>
<class>qSlicerVolumeDisplayWidget</class>
<widget class="qSlicerWidget" name="qSlicerVolumeDisplayWidget">
<property name="geometry">
<rect>
......@@ -13,9 +13,16 @@
<property name="windowTitle">
<string>Form</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout">
</layout>
<layout class="QVBoxLayout" name="verticalLayout"/>
</widget>
<customwidgets>
<customwidget>
<class>qSlicerWidget</class>
<extends>QWidget</extends>
<header>qSlicerWidget.h</header>
<container>1</container>
</customwidget>
</customwidgets>
<resources/>
<connections/>
</ui>
......@@ -42,21 +42,15 @@
<property name="contentsFrameShape">
<enum>QFrame::StyledPanel</enum>
</property>
<widget class="QWidget" name="verticalLayoutWidget">
<property name="geometry">
<rect>
<x>0</x>
<y>30</y>
<width>651</width>
<height>151</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout_2">
<item>
<widget class="qSlicerVolumeDisplayWidget" name="VolumeDisplayWidget"/>
</item>
</layout>
</widget>
<layout class="QVBoxLayout" name="verticalLayout_3">
<item>
<layout class="QVBoxLayout" name="verticalLayout_2">
<item>
<widget class="qSlicerVolumeDisplayWidget" name="VolumeDisplayWidget" native="true"/>
</item>
</layout>
</item>
</layout>
</widget>
</item>
</layout>
......@@ -73,17 +67,17 @@
<extends>QWidget</extends>
<header>qMRMLNodeSelector.h</header>
</customwidget>
<customwidget>
<class>qMRMLWindowLevelWidget</class>
<extends>QWidget</extends>
<header>qMRMLWindowLevelWidget.h</header>
</customwidget>
<customwidget>
<class>qSlicerWidget</class>
<extends>QWidget</extends>
<header>qSlicerWidget.h</header>
<container>1</container>
</customwidget>
<customwidget>
<class>qSlicerVolumeDisplayWidget</class>
<extends>QWidget</extends>
<header>qSlicerVolumeDisplayWidget.h</header>
</customwidget>
</customwidgets>
<resources/>
<connections>
......
......@@ -38,7 +38,7 @@ void qSlicerScalarVolumeDisplayWidget::setMRMLVolumeNode(vtkMRMLScalarVolumeNode
if (volumeNode)
{
d->MRMLWindowLevelWidget->setMRMLVolumeNode(volumeNode);
d->MRMLVolumeThresholdWidget->setMRMLVolumeNode(volumeNode);
this->setEnabled(true);
}
}
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment