Skip to content

Commit

Permalink
refs #3876 Ui layout changes.
Browse files Browse the repository at this point in the history 
 Fix cosmetic and sizing issues with the current gui
  • Loading branch information
@OwenArnold
OwenArnold committed Nov 9, 2011
1 parent e108194 commit 2ce351a
Show file tree
Hide file tree
Showing 5 changed files with 214 additions and 186 deletions.
358 changes: 188 additions & 170 deletions Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/CreateMDWorkspace.ui
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>1059</width>
<height>688</height>
<width>736</width>
<height>506</height>
</rect>
</property>
<property name="sizePolicy">
Expand All @@ -19,174 +19,192 @@
<property name="windowTitle">
<string>Form</string>
</property>
<widget class="QWidget" name="verticalLayoutWidget_2">
<property name="geometry">
<rect>
<x>20</x>
<y>20</y>
<width>1031</width>
<height>641</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout_2">
<item>
<layout class="QHBoxLayout" name="horizontalLayout">
<property name="sizeConstraint">
<enum>QLayout::SetNoConstraint</enum>
</property>
<item>
<layout class="QVBoxLayout" name="verticalLayout_4">
<item>
<layout class="QHBoxLayout" name="horizontalLayout_4">
<item>
<widget class="QPushButton" name="btn_add_workspace">
<property name="text">
<string>Add Workspace</string>
</property>
</widget>
</item>
<item>
<widget class="MantidQt::MantidWidgets::WorkspaceSelector" name="workspaceSelector"/>
</item>
<item>
<widget class="QPushButton" name="btn_remove_workspace">
<property name="text">
<string>Remove Workspace</string>
</property>
</widget>
</item>
</layout>
</item>
<item>
<widget class="QTableView" name="tableView">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Expanding">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="selectionBehavior">
<enum>QAbstractItemView::SelectRows</enum>
</property>
<property name="sortingEnabled">
<bool>true</bool>
</property>
</widget>
</item>
</layout>
</item>
<item>
<layout class="QVBoxLayout" name="verticalLayout">
<item>
<layout class="QHBoxLayout" name="horizontalLayout_2">
<item>
<layout class="QVBoxLayout" name="verticalLayout_3">
<item>
<layout class="QGridLayout" name="gridLayout_mandatory">
<item row="0" column="0">
<widget class="QGroupBox" name="groupBox_lattice">
<property name="title">
<string>Lattice Parameters</string>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QGroupBox" name="groupBox_orientation">
<property name="title">
<string>Crystal Orientation</string>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QGroupBox" name="groupBox_goniometeroffsets">
<property name="title">
<string>Goniometer Offsets</string>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QGroupBox" name="groupBox_logvalues">
<property name="title">
<string>Log Values</string>
</property>
</widget>
</item>
</layout>
</item>
<item>
<widget class="Line" name="line">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
</widget>
</item>
<item>
<layout class="QGridLayout" name="gridLayout_optional">
<item row="1" column="1" colspan="2">
<widget class="QGroupBox" name="groupBox_sample">
<property name="title">
<string>Sample</string>
</property>
</widget>
</item>
<item row="0" column="0" colspan="3">
<widget class="QGroupBox" name="groupBox_instrument">
<property name="title">
<string>Instrument</string>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QGroupBox" name="groupBox_chopper">
<property name="title">
<string>Chopper</string>
</property>
</widget>
</item>
</layout>
</item>
</layout>
</item>
</layout>
</item>
</layout>
</item>
</layout>
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout_3">
<item>
<widget class="QPushButton" name="btn_revert">
<property name="text">
<string>Revert All Changes</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="btn_apply_all">
<property name="text">
<string>Apply to All</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="btn_n_selected">
<property name="text">
<string>Apply to n-selected</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="btn_create">
<property name="text">
<string>Create MD Workspace</string>
</property>
</widget>
</item>
</layout>
</item>
</layout>
</widget>
<layout class="QVBoxLayout" name="verticalLayout_2">
<item>
<layout class="QHBoxLayout" name="mainLayout">
<property name="sizeConstraint">
<enum>QLayout::SetNoConstraint</enum>
</property>
<item>
<layout class="QVBoxLayout" name="overviewLayout">
<item>
<layout class="QHBoxLayout" name="overviewControlsLayout">
<item>
<widget class="QPushButton" name="btn_add_workspace">
<property name="text">
<string>Add Workspace</string>
</property>
</widget>
</item>
<item>
<widget class="MantidQt::MantidWidgets::WorkspaceSelector" name="workspaceSelector"/>
</item>
<item>
<widget class="QPushButton" name="btn_remove_workspace">
<property name="text">
<string>Remove Workspace</string>
</property>
</widget>
</item>
</layout>
</item>
<item>
<widget class="QTableView" name="tableView">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Expanding">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="selectionMode">
<enum>QAbstractItemView::NoSelection</enum>
</property>
<property name="selectionBehavior">
<enum>QAbstractItemView::SelectRows</enum>
</property>
<property name="showGrid">
<bool>true</bool>
</property>
<property name="sortingEnabled">
<bool>true</bool>
</property>
<property name="cornerButtonEnabled">
<bool>false</bool>
</property>
<attribute name="horizontalHeaderCascadingSectionResizes">
<bool>true</bool>
</attribute>
</widget>
</item>
</layout>
</item>
<item>
<layout class="QVBoxLayout" name="workspaceEditingLayout">
<item>
<layout class="QHBoxLayout" name="horizontalLayout_2">
<item>
<layout class="QVBoxLayout" name="verticalLayout_3">
<item>
<layout class="QVBoxLayout" name="verticalLayout_mandatory">
<item>
<layout class="QHBoxLayout" name="horizontalLayout_latticeCrystal">
<item>
<widget class="QGroupBox" name="groupBox_lattice">
<property name="title">
<string>Lattice Parameters</string>
</property>
<layout class="QHBoxLayout" name="horizontalLayout_5"/>
</widget>
</item>
<item>
<widget class="QGroupBox" name="groupBox_orientation">
<property name="title">
<string>Crystal Orientation</string>
</property>
</widget>
</item>
</layout>
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout_logValues_Goniometer">
<item>
<widget class="QGroupBox" name="groupBox_logvalues">
<property name="title">
<string>Log Values</string>
</property>
<layout class="QHBoxLayout" name="logValueLayout"/>
</widget>
</item>
<item>
<widget class="QGroupBox" name="groupBox_goniometeroffsets">
<property name="title">
<string>Goniometer Offsets</string>
</property>
</widget>
</item>
</layout>
</item>
</layout>
</item>
<item>
<widget class="Line" name="line">
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
</widget>
</item>
<item>
<layout class="QVBoxLayout" name="verticalLayout_optional">
<item>
<widget class="QGroupBox" name="groupBox_instrument">
<property name="title">
<string>Instrument</string>
</property>
</widget>
</item>
<item>
<widget class="QGroupBox" name="groupBox_chopper">
<property name="title">
<string>Chopper</string>
</property>
</widget>
</item>
<item>
<widget class="QGroupBox" name="groupBox_sample">
<property name="title">
<string>Sample</string>
</property>
</widget>
</item>
</layout>
</item>
</layout>
</item>
</layout>
</item>
</layout>
</item>
</layout>
</item>
<item>
<layout class="QHBoxLayout" name="controlButtonsLayout">
<item>
<widget class="QPushButton" name="btn_revert">
<property name="text">
<string>Revert All Changes</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="btn_apply_all">
<property name="text">
<string>Apply to All</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="btn_n_selected">
<property name="text">
<string>Apply to n-selected</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="btn_create">
<property name="text">
<string>Create</string>
</property>
</widget>
</item>
</layout>
</item>
</layout>
</widget>
<customwidgets>
<customwidget>
Expand Down
4 changes: 1 addition & 3 deletions Code/Mantid/MantidQt/CustomInterfaces/src/CreateMDWorkspace.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ namespace CustomInterfaces
{

//Add this class to the list of specialised dialogs in this namespace
//DECLARE_SUBWINDOW(CreateMDWorkspace); //TODO: Enable this to use it via mantid plot. Not ready for this yet!
DECLARE_SUBWINDOW(CreateMDWorkspace); //TODO: Enable this to use it via mantid plot. Not ready for this yet!

/*
Constructor taking a WorkspaceMementoCollection, which acts as the model.
Expand Down Expand Up @@ -142,9 +142,7 @@ void CreateMDWorkspace::addWorkspaceClicked()
m_approach = Approach_sptr(new InelasticISIS);
}

m_uiForm.groupBox_lattice->setLayout(new QGridLayout());
m_uiForm.groupBox_lattice->layout()->addWidget(m_approach->createLatticeView(LatticePresenter_sptr(new LatticePresenter(m_memento))));
m_uiForm.groupBox_logvalues->setLayout(new QGridLayout());
LogPresenter_sptr logPresenter = LogPresenter_sptr(new LogPresenter(m_memento));
m_uiForm.groupBox_logvalues->layout()->addWidget(m_approach->createLogView(logPresenter));
m_uiForm.groupBox_logvalues->layout()->addWidget(m_approach->createEditableLogView(logPresenter));
Expand Down

0 comments on commit 2ce351a

Please sign in to comment.