Skip to content

Commit

Permalink
Refs #7363. Bringing color map editor back.
Browse files Browse the repository at this point in the history
  • Loading branch information
Michael Reuter committed Mar 21, 2014
1 parent 1d2fe18 commit 5ada41d
Show file tree
Hide file tree
Showing 2 changed files with 91 additions and 55 deletions.
140 changes: 85 additions & 55 deletions ...id/Vates/VatesSimpleGui/ViewWidgets/inc/MantidVatesSimpleGuiViewWidgets/MdViewerWidget.ui
View file
Expand Up @@ -161,74 +161,98 @@
</layout>
</item>
<item>
<widget class="QSplitter" name="splitter_2">
<widget class="QSplitter" name="splitter_3">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<widget class="QSplitter" name="splitter">
<property name="handleWidth">
<number>3</number>
</property>
<widget class="QSplitter" name="splitter_2">
<property name="orientation">
<enum>Qt::Vertical</enum>
<enum>Qt::Horizontal</enum>
</property>
<widget class="pqPipelineBrowserWidget" name="pipelineBrowser" native="true">
<property name="minimumSize">
<size>
<width>150</width>
<height>50</height>
</size>
</property>
</widget>
<widget class="QTabWidget" name="propInfoTabs">
<property name="currentIndex">
<number>0</number>
<property name="handleWidth">
<number>3</number>
</property>
<widget class="QSplitter" name="splitter">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<widget class="QWidget" name="properties">
<attribute name="title">
<string>Properties</string>
</attribute>
<layout class="QVBoxLayout" name="verticalLayout_3">
<item>
<widget class="pqPropertiesPanel" name="propertiesPanel" native="true"/>
</item>
</layout>
<widget class="pqPipelineBrowserWidget" name="pipelineBrowser" native="true">
<property name="minimumSize">
<size>
<width>150</width>
<height>50</height>
</size>
</property>
</widget>
<widget class="QWidget" name="information">
<attribute name="title">
<string>Information</string>
</attribute>
<layout class="QVBoxLayout" name="verticalLayout_2">
<item>
<widget class="QScrollArea" name="scrollArea">
<property name="widgetResizable">
<bool>true</bool>
</property>
<widget class="QWidget" name="scrollAreaWidgetContents">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>98</width>
<height>28</height>
</rect>
<widget class="QTabWidget" name="propInfoTabs">
<property name="currentIndex">
<number>0</number>
</property>
<widget class="QWidget" name="properties">
<attribute name="title">
<string>Properties</string>
</attribute>
<layout class="QVBoxLayout" name="verticalLayout_3">
<item>
<widget class="pqPropertiesPanel" name="propertiesPanel" native="true"/>
</item>
</layout>
</widget>
<widget class="QWidget" name="information">
<attribute name="title">
<string>Information</string>
</attribute>
<layout class="QVBoxLayout" name="verticalLayout_2">
<item>
<widget class="QScrollArea" name="scrollArea">
<property name="widgetResizable">
<bool>true</bool>
</property>
<layout class="QVBoxLayout" name="verticalLayout">
<item>
<widget class="pqProxyInformationWidget" name="proxyInfo" native="true"/>
</item>
</layout>
<widget class="QWidget" name="scrollAreaWidgetContents">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>126</width>
<height>390</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout">
<item>
<widget class="pqProxyInformationWidget" name="proxyInfo" native="true"/>
</item>
</layout>
</widget>
</widget>
</widget>
</item>
</layout>
</item>
</layout>
</widget>
</widget>
</widget>
<widget class="QWidget" name="viewWidget" native="true">
<property name="minimumSize">
<size>
<width>800</width>
<height>600</height>
</size>
</property>
</widget>
</widget>
<widget class="QWidget" name="viewWidget" native="true">
<property name="minimumSize">
<size>
<width>800</width>
<height>600</height>
</size>
<widget class="QDockWidget" name="colorMapEditorDock">
<property name="windowTitle">
<string>Color Map Editor</string>
</property>
<widget class="pqColorMapEditor" name="colorMapEditorPanel">
<property name="minimumSize">
<size>
<width>400</width>
<height>0</height>
</size>
</property>
</widget>
</widget>
</widget>
</item>
Expand Down Expand Up @@ -299,6 +323,12 @@
<header>pqAxesToolbar.h</header>
<container>1</container>
</customwidget>
<customwidget>
<class>pqColorMapEditor</class>
<extends>QWidget</extends>
<header>pqColorMapEditor.h</header>
<container>1</container>
</customwidget>
</customwidgets>
<resources>
<include location="../../icons/ViewWidgetsIcons.qrc"/>
Expand Down
6 changes: 6 additions & 0 deletions Code/Mantid/Vates/VatesSimpleGui/ViewWidgets/src/MdViewerWidget.cpp
View file
Expand Up @@ -172,6 +172,7 @@ void MdViewerWidget::setupUiAndConnections()
{
this->ui.setupUi(this);
this->ui.splitter_2->setStretchFactor(1, 1);
this->ui.splitter_3->setStretchFactor(0, 1);
this->ui.statusBar->setSizeGripEnabled(false);

QObject::connect(this->ui.modeControlWidget,
Expand All @@ -183,6 +184,11 @@ void MdViewerWidget::setupUiAndConnections()
SIGNAL(clicked()),
this,
SLOT(onRotationPoint()));

/// Provide access to the color-editor panel for the application.
pqApplicationCore::instance()->registerManager(
"COLOR_EDITOR_PANEL", this->ui.colorMapEditorDock);
this->ui.colorMapEditorDock->hide();
}

/**
Expand Down

0 comments on commit 5ada41d

Please sign in to comment.