Skip to content

Commit

Permalink
Refactoring and add remaining UI options
Browse files Browse the repository at this point in the history 
Refs #10903
  • Loading branch information
@DanNixon
DanNixon committed Mar 16, 2015
1 parent 3257e8a commit 374617a
Show file tree
Hide file tree
Showing 8 changed files with 393 additions and 200 deletions.
8 changes: 4 additions & 4 deletions Code/Mantid/MantidQt/CustomInterfaces/CMakeLists.txt
View file
Expand Up @@ -2,7 +2,7 @@ set ( SRC_FILES
src/DataComparison.cpp
src/DirectConvertToEnergy.cpp
src/Homer.cpp
src/Indirect/AbsCorr.cpp
src/Indirect/AbsorptionCorrections.cpp
src/Indirect/ApplyCorr.cpp
src/Indirect/CalcCorr.cpp
src/Indirect/ConvFit.cpp
Expand Down Expand Up @@ -85,7 +85,7 @@ set ( INC_FILES
inc/MantidQtCustomInterfaces/DllConfig.h
inc/MantidQtCustomInterfaces/Homer.h
inc/MantidQtCustomInterfaces/Indirect/IDATab.h
inc/MantidQtCustomInterfaces/Indirect/AbsCorr.h
inc/MantidQtCustomInterfaces/Indirect/AbsorptionCorrections.h
inc/MantidQtCustomInterfaces/Indirect/ApplyCorr.h
inc/MantidQtCustomInterfaces/Indirect/CalcCorr.h
inc/MantidQtCustomInterfaces/Indirect/ConvFit.h
Expand Down Expand Up @@ -175,7 +175,7 @@ set ( MOC_FILES inc/MantidQtCustomInterfaces/Background.h
inc/MantidQtCustomInterfaces/DirectConvertToEnergy.h
inc/MantidQtCustomInterfaces/Homer.h
inc/MantidQtCustomInterfaces/Indirect/IDATab.h
inc/MantidQtCustomInterfaces/Indirect/AbsCorr.h
inc/MantidQtCustomInterfaces/Indirect/AbsorptionCorrections.h
inc/MantidQtCustomInterfaces/Indirect/ApplyCorr.h
inc/MantidQtCustomInterfaces/Indirect/CalcCorr.h
inc/MantidQtCustomInterfaces/Indirect/ConvFit.h
Expand Down Expand Up @@ -244,7 +244,7 @@ set ( MOC_FILES inc/MantidQtCustomInterfaces/Background.h
set ( UI_FILES inc/MantidQtCustomInterfaces/AddWorkspace.ui
inc/MantidQtCustomInterfaces/DataComparison.ui
inc/MantidQtCustomInterfaces/DirectConvertToEnergy.ui
inc/MantidQtCustomInterfaces/Indirect/AbsCorr.ui
inc/MantidQtCustomInterfaces/Indirect/AbsorptionCorrections.ui
inc/MantidQtCustomInterfaces/Indirect/ApplyCorr.ui
inc/MantidQtCustomInterfaces/Indirect/CalcCorr.ui
inc/MantidQtCustomInterfaces/Indirect/ConvFit.ui
Expand Down
34 changes: 0 additions & 34 deletions Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/AbsCorr.h
View file

This file was deleted.

34 changes: 34 additions & 0 deletions ...d/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/AbsorptionCorrections.h
View file
@@ -0,0 +1,34 @@
#ifndef MANTIDQTCUSTOMINTERFACESIDA_ABSORPTIONCORRECTIONS_H_
#define MANTIDQTCUSTOMINTERFACESIDA_ABSORPTIONCORRECTIONS_H_

#include "ui_AbsorptionCorrections.h"
#include "IDATab.h"

namespace MantidQt
{
namespace CustomInterfaces
{
namespace IDA
{
class DLLExport AbsorptionCorrections : public IDATab
{
Q_OBJECT

public:
AbsorptionCorrections(QWidget * parent = 0);

private:
virtual void setup();
virtual void run();
virtual bool validate();
virtual void loadSettings(const QSettings & settings);

private:
Ui::AbsorptionCorrections m_uiForm;

};
} // namespace IDA
} // namespace CustomInterfaces
} // namespace MantidQt

#endif /* MANTIDQTCUSTOMINTERFACESIDA_ABSORPTIONCORRECTIONS_H_ */
207 changes: 196 additions & 11 deletions ...tidQtCustomInterfaces/Indirect/AbsCorr.ui → ...erfaces/Indirect/AbsorptionCorrections.ui
View file
@@ -1,19 +1,19 @@
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>AbsCorr</class>
<widget class="QWidget" name="AbsCorr">
<class>AbsorptionCorrections</class>
<widget class="QWidget" name="AbsorptionCorrections">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>594</width>
<height>456</height>
<height>697</height>
</rect>
</property>
<property name="windowTitle">
<string>Form</string>
<string>Absoprtion Corrections</string>
</property>
<layout class="QVBoxLayout" name="layoutAbsF2P">
<layout class="QVBoxLayout" name="loAbsorptionCorrections">
<item>
<widget class="QGroupBox" name="gbInput">
<property name="title">
Expand Down Expand Up @@ -140,9 +140,180 @@
</item>
<item>
<widget class="QStackedWidget" name="swShapeDetails">
<widget class="QWidget" name="pgFlatPlate"/>
<widget class="QWidget" name="pgAnnulus"/>
<widget class="QWidget" name="pgCylinder"/>
<property name="currentIndex">
<number>0</number>
</property>
<widget class="QWidget" name="pgFlatPlate">
<layout class="QGridLayout" name="loFlatPlate">
<property name="margin">
<number>0</number>
</property>
<item row="0" column="0">
<widget class="QLabel" name="lbFlatSampleHeight">
<property name="text">
<string>Sample Height:</string>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QLabel" name="lbFlatSampleWidth">
<property name="text">
<string>Sample Width:</string>
</property>
</widget>
</item>
<item row="2" column="0">
<widget class="QLabel" name="lbFlatSampleThickness">
<property name="text">
<string>Sample Thickness:</string>
</property>
</widget>
</item>
<item row="3" column="0">
<widget class="QLabel" name="lbFlatElementSize">
<property name="text">
<string>Element Size:</string>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QDoubleSpinBox" name="spFlatSampleHeight">
<property name="suffix">
<string> cm</string>
</property>
<property name="singleStep">
<double>0.100000000000000</double>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QDoubleSpinBox" name="spFlatSampleWidth">
<property name="suffix">
<string> cm</string>
</property>
<property name="singleStep">
<double>0.100000000000000</double>
</property>
</widget>
</item>
<item row="2" column="1">
<widget class="QDoubleSpinBox" name="spFlatSampleThickness">
<property name="suffix">
<string> cm</string>
</property>
<property name="singleStep">
<double>0.100000000000000</double>
</property>
</widget>
</item>
<item row="3" column="1">
<widget class="QDoubleSpinBox" name="spFlatElementSize">
<property name="singleStep">
<double>0.100000000000000</double>
</property>
</widget>
</item>
</layout>
</widget>
<widget class="QWidget" name="pgAnnulus">
<layout class="QGridLayout" name="loAnnulus">
<property name="margin">
<number>0</number>
</property>
<item row="0" column="0">
<widget class="QLabel" name="lbAnnCanInnerRadius">
<property name="text">
<string>Can Inner Radius:</string>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QLabel" name="lbAnnSampleInnerRadius">
<property name="text">
<string>Sample Inner Radius:</string>
</property>
</widget>
</item>
<item row="2" column="0">
<widget class="QLabel" name="lbAnnSampleOuterRadius">
<property name="text">
<string>Sample Outer Radius:</string>
</property>
</widget>
</item>
<item row="3" column="0">
<widget class="QLabel" name="lbAnnCanOuterRadius">
<property name="text">
<string>Can Outer Radius:</string>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QDoubleSpinBox" name="spAnnCanInnerRadius">
<property name="suffix">
<string> cm</string>
</property>
<property name="singleStep">
<double>0.100000000000000</double>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QDoubleSpinBox" name="spAnnSampleInnerRadius">
<property name="suffix">
<string> cm</string>
</property>
<property name="singleStep">
<double>0.100000000000000</double>
</property>
</widget>
</item>
<item row="2" column="1">
<widget class="QDoubleSpinBox" name="spAnnSampleOuterRadius">
<property name="suffix">
<string> cm</string>
</property>
<property name="singleStep">
<double>0.100000000000000</double>
</property>
</widget>
</item>
<item row="3" column="1">
<widget class="QDoubleSpinBox" name="spAnnCanOuterRadius">
<property name="suffix">
<string> cm</string>
</property>
<property name="singleStep">
<double>0.100000000000000</double>
</property>
</widget>
</item>
</layout>
</widget>
<widget class="QWidget" name="pgCylinder">
<layout class="QGridLayout" name="loCylinder">
<property name="margin">
<number>0</number>
</property>
<item row="0" column="0">
<widget class="QLabel" name="lbCylSampleRadius">
<property name="text">
<string>Sample Radius:</string>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QDoubleSpinBox" name="spCylSampleRadius">
<property name="suffix">
<string> cm</string>
</property>
<property name="singleStep">
<double>0.100000000000000</double>
</property>
</widget>
</item>
</layout>
</widget>
</widget>
</item>
</layout>
Expand All @@ -164,7 +335,7 @@
<item row="0" column="1">
<widget class="QDoubleSpinBox" name="spSampleNumberDensity">
<property name="suffix">
<string>A^-3</string>
<string> A^-3</string>
</property>
<property name="singleStep">
<double>0.100000000000000</double>
Expand All @@ -182,7 +353,14 @@
</widget>
</item>
<item row="1" column="1">
<widget class="QLineEdit" name="leSampleChemicalFormula"/>
<widget class="QLineEdit" name="leSampleChemicalFormula">
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
</widget>
</item>
</layout>
</widget>
Expand All @@ -197,7 +375,14 @@
</property>
<layout class="QGridLayout" name="gridLayout_2">
<item row="2" column="1">
<widget class="QLineEdit" name="leCanChemicalFormula"/>
<widget class="QLineEdit" name="leCanChemicalFormula">
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
</widget>
</item>
<item row="2" column="0">
<widget class="QLabel" name="lbCanChemicalFormula">
Expand Down
3 changes: 2 additions & 1 deletion ...id/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/IndirectDataAnalysis.h
View file
Expand Up @@ -31,7 +31,8 @@ namespace IDA
FURY_FIT,
CONV_FIT,
CALC_CORR,
APPLY_CORR
APPLY_CORR,
ABSORPTION_CORRECTIONS
};

// Number of decimal places in property browsers.
Expand Down

0 comments on commit 374617a

Please sign in to comment.