Skip to content

Commit

Permalink
RE 6687 MantidEV menubar, clean up code -- 2
Browse files Browse the repository at this point in the history 
Added Doxygen comments to all methods.
Delete local thread pool in the destructor.

Refs #6687
  • Loading branch information
@DennisMikkelson
DennisMikkelson committed Mar 21, 2013
1 parent 916f765 commit ef3be18
Show file tree
Hide file tree
Showing 5 changed files with 655 additions and 123 deletions.
10 changes: 9 additions & 1 deletion Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/MantidEV.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -164,13 +164,21 @@ class RunEllipsoidIntegrate : public QRunnable
// START of the actual MantidEV Class ----------------------------------
//

/**
* The MantidEV class has slots that handle user input from the Qt GUI
* and then call methods in the MantidEVWorker class. Roughly speaking,
* MantidEV deals with the Qt GUI and MantideEVWorker deals with Mantid.
*/
class MantidEV : public API::UserSubWindow
{
Q_OBJECT

public:

/// Constructor
MantidEV(QWidget *parent = 0);

/// Destructor
~MantidEV();

/// The name of the interface as registered into the factory
Expand All @@ -188,7 +196,7 @@ private slots:
/// Slot for the find peaks tab's Apply button
void findPeaks_slot();

/// Slot for choosing a matrix file name
/// Slot for choosing a peaks file name
void getLoadPeaksFileName_slot();

/// Slot for the find UB tab's Apply button
Expand Down
220 changes: 110 additions & 110 deletions Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/MantidEV.ui
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
<item row="1" column="0">
<widget class="QTabWidget" name="MantidEV_tabwidg">
<property name="currentIndex">
<number>5</number>
<number>4</number>
</property>
<widget class="QWidget" name="SelectData">
<attribute name="title">
Expand Down Expand Up @@ -1069,6 +1069,115 @@
</property>
</widget>
</widget>
<widget class="QWidget" name="ChangeHKL">
<attribute name="title">
<string>Change HKL</string>
</attribute>
<widget class="QPushButton" name="ApplyChangeHKL_btn">
<property name="geometry">
<rect>
<x>430</x>
<y>520</y>
<width>115</width>
<height>28</height>
</rect>
</property>
<property name="text">
<string>Apply</string>
</property>
</widget>
<widget class="QLabel" name="HKL_Transfrom_lbl">
<property name="geometry">
<rect>
<x>20</x>
<y>30</y>
<width>431</width>
<height>18</height>
</rect>
</property>
<property name="text">
<string>Specify 3x3 Matrix to Apply to HKL</string>
</property>
</widget>
<widget class="QLabel" name="HKL_Tran_Row_1_lbl">
<property name="geometry">
<rect>
<x>50</x>
<y>70</y>
<width>291</width>
<height>24</height>
</rect>
</property>
<property name="text">
<string>HKL Transformation, Row 1</string>
</property>
</widget>
<widget class="QLineEdit" name="HKL_tran_row_1_ledt">
<property name="geometry">
<rect>
<x>350</x>
<y>70</y>
<width>291</width>
<height>24</height>
</rect>
</property>
<property name="text">
<string>1, 0, 0</string>
</property>
</widget>
<widget class="QLabel" name="HKL_Tran_Row_2_lbl">
<property name="geometry">
<rect>
<x>50</x>
<y>100</y>
<width>291</width>
<height>24</height>
</rect>
</property>
<property name="text">
<string>HKL Transformation, Row 2</string>
</property>
</widget>
<widget class="QLineEdit" name="HKL_tran_row_2_ledt">
<property name="geometry">
<rect>
<x>350</x>
<y>100</y>
<width>291</width>
<height>24</height>
</rect>
</property>
<property name="text">
<string>0, 1, 0</string>
</property>
</widget>
<widget class="QLabel" name="HKL_Tran_Row_3_lbl">
<property name="geometry">
<rect>
<x>50</x>
<y>130</y>
<width>291</width>
<height>24</height>
</rect>
</property>
<property name="text">
<string>HKL Transformation, Row 3</string>
</property>
</widget>
<widget class="QLineEdit" name="HKL_tran_row_3_ledt">
<property name="geometry">
<rect>
<x>350</x>
<y>130</y>
<width>291</width>
<height>24</height>
</rect>
</property>
<property name="text">
<string>0, 0, 1</string>
</property>
</widget>
</widget>
<widget class="QWidget" name="Integrate">
<attribute name="title">
<string>Integrate</string>
Expand Down Expand Up @@ -1399,115 +1508,6 @@
</property>
</widget>
</widget>
<widget class="QWidget" name="ChangeHKL">
<attribute name="title">
<string>Change HKL</string>
</attribute>
<widget class="QPushButton" name="ApplyChangeHKL_btn">
<property name="geometry">
<rect>
<x>430</x>
<y>520</y>
<width>115</width>
<height>28</height>
</rect>
</property>
<property name="text">
<string>Apply</string>
</property>
</widget>
<widget class="QLabel" name="HKL_Transfrom_lbl">
<property name="geometry">
<rect>
<x>20</x>
<y>30</y>
<width>431</width>
<height>18</height>
</rect>
</property>
<property name="text">
<string>Specify 3x3 Matrix to Apply to HKL</string>
</property>
</widget>
<widget class="QLabel" name="HKL_Tran_Row_1_lbl">
<property name="geometry">
<rect>
<x>50</x>
<y>70</y>
<width>291</width>
<height>24</height>
</rect>
</property>
<property name="text">
<string>HKL Transformation, Row 1</string>
</property>
</widget>
<widget class="QLineEdit" name="HKL_tran_row_1_ledt">
<property name="geometry">
<rect>
<x>350</x>
<y>70</y>
<width>291</width>
<height>24</height>
</rect>
</property>
<property name="text">
<string>1, 0, 0</string>
</property>
</widget>
<widget class="QLabel" name="HKL_Tran_Row_2_lbl">
<property name="geometry">
<rect>
<x>50</x>
<y>100</y>
<width>291</width>
<height>24</height>
</rect>
</property>
<property name="text">
<string>HKL Transformation, Row 2</string>
</property>
</widget>
<widget class="QLineEdit" name="HKL_tran_row_2_ledt">
<property name="geometry">
<rect>
<x>350</x>
<y>100</y>
<width>291</width>
<height>24</height>
</rect>
</property>
<property name="text">
<string>0, 1, 0</string>
</property>
</widget>
<widget class="QLabel" name="HKL_Tran_Row_3_lbl">
<property name="geometry">
<rect>
<x>50</x>
<y>130</y>
<width>291</width>
<height>24</height>
</rect>
</property>
<property name="text">
<string>HKL Transformation, Row 3</string>
</property>
</widget>
<widget class="QLineEdit" name="HKL_tran_row_3_ledt">
<property name="geometry">
<rect>
<x>350</x>
<y>130</y>
<width>291</width>
<height>24</height>
</rect>
</property>
<property name="text">
<string>0, 0, 1</string>
</property>
</widget>
</widget>
</widget>
</item>
</layout>
Expand Down
5 changes: 5 additions & 0 deletions Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/MantidEVWorker.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,12 @@ class DLLExport MantidEVWorker
{

public:

/// Default constructor
MantidEVWorker();


/// Default destructor
~MantidEVWorker();


Expand Down

0 comments on commit ef3be18

Please sign in to comment.