Commit defd8062 authored by Yumin Yuan's avatar Yumin Yuan
Browse files

ENH: minor GUI changes

parent eef7e6bf
......@@ -407,22 +407,6 @@
</item>
</layout>
</item>
<item row="13" column="0" colspan="4">
<spacer name="verticalSpacer">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::MinimumExpanding</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>10</height>
</size>
</property>
</spacer>
</item>
</layout>
</widget>
<widget class="QWidget" name="LegendPage">
......@@ -915,6 +899,22 @@
</widget>
</widget>
</item>
<item>
<spacer name="verticalSpacer">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::Expanding</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>10</height>
</size>
</property>
</spacer>
</item>
<item>
<layout class="QHBoxLayout">
<item>
......@@ -960,14 +960,14 @@
</widget>
<customwidgets>
<customwidget>
<class>pqStandardColorButton</class>
<extends>QToolButton</extends>
<header>pqStandardColorButton.h</header>
<class>pqColorChooserButton</class>
<extends>QPushButton</extends>
<header>pqColorChooserButton.h</header>
</customwidget>
<customwidget>
<class>pqColorChooserButton</class>
<class>pqStandardColorButton</class>
<extends>QToolButton</extends>
<header>pqColorChooserButton.h</header>
<header>pqStandardColorButton.h</header>
</customwidget>
</customwidgets>
<tabstops>
......
......@@ -1428,6 +1428,9 @@ void pqColorScaleEditor::initColorScale()
this->Form->frameOpacity->setVisible(1);
this->ColorMapViewer->setSizePolicy(
QSizePolicy::Expanding, QSizePolicy::Fixed);
this->Form->verticalSpacer->changeSize(20, 10,
QSizePolicy::Expanding, QSizePolicy::Ignored);
this->addRepClientOpacityFunction();
this->Form->Listener->Connect(
......@@ -1440,9 +1443,11 @@ void pqColorScaleEditor::initColorScale()
}
else
{
this->ColorMapViewer->setSizePolicy(
QSizePolicy::Expanding, QSizePolicy::Expanding);
//this->ColorMapViewer->setSizePolicy(
// QSizePolicy::Expanding, QSizePolicy::Expanding);
this->Form->frameOpacity->setVisible(0);
this->Form->verticalSpacer->changeSize(20, 10,
QSizePolicy::Expanding, QSizePolicy::Expanding);
}
this->setOpacityControlsVisibility(usingOpacity);
......@@ -2032,10 +2037,14 @@ void pqColorScaleEditor::addRepClientOpacityFunction()
if(range[0]==range[1])
{
this->Form->frameOpacity->setVisible(0);
this->Form->verticalSpacer->changeSize(20, 10,
QSizePolicy::Expanding, QSizePolicy::Expanding);
}
else
{
this->Form->frameOpacity->setVisible(1);
this->Form->verticalSpacer->changeSize(20, 10,
QSizePolicy::Expanding, QSizePolicy::Ignored);
}
vtkPiecewiseFunction* otf = vtkPiecewiseFunction::SafeDownCast(
this->OpacityFunction->getProxy()->GetClientSideObject());
......
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