LMU/musrfit
LMU/musrfit
5
0
Fork 0
Code Issues 6 Pull Requests Actions Packages Projects Releases 3 Activity

fixed fourier phase entry problem (MUSR-70)

Browse Source
This commit is contained in:
nemu 2009-06-09 11:16:39 +00:00
parent 51e257a276
commit 0e1f33cc23
4 changed files with 116 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
src/musrgui/PGetFourierDialog.cpp
View File

@ -34,6 +34,7 @@
#include <qvalidator.h> #include <qvalidator.h>
#include <qlineedit.h> #include <qlineedit.h>
#include <qbutton.h> #include <qbutton.h>
#include <qmessagebox.h>
#include "PGetFourierDialog.h" #include "PGetFourierDialog.h"
@ -45,11 +46,49 @@ PGetFourierDialog::PGetFourierDialog()
{ {
fFourierBlock = ""; fFourierBlock = "";
fFourierPower_lineEdit->setValidator( new QIntValidator(fFourierPower_lineEdit) ); fFourierPower_lineEdit->setValidator( new QIntValidator(fFourierPower_lineEdit) );
fPhase_lineEdit->setValidator( new QDoubleValidator(fPhase_lineEdit) );
fPhaseCorrectionRangeLow_lineEdit->setValidator( new QDoubleValidator(fPhaseCorrectionRangeLow_lineEdit) ); fPhaseCorrectionRangeLow_lineEdit->setValidator( new QDoubleValidator(fPhaseCorrectionRangeLow_lineEdit) );
fPhaseCorrectionRangeUp_lineEdit->setValidator( new QDoubleValidator(fPhaseCorrectionRangeUp_lineEdit) ); fPhaseCorrectionRangeUp_lineEdit->setValidator( new QDoubleValidator(fPhaseCorrectionRangeUp_lineEdit) );
fRangeLow_lineEdit->setValidator( new QDoubleValidator(fRangeLow_lineEdit) ); fRangeLow_lineEdit->setValidator( new QDoubleValidator(fRangeLow_lineEdit) );
fRangeUp_lineEdit->setValidator( new QDoubleValidator(fRangeUp_lineEdit) ); fRangeUp_lineEdit->setValidator( new QDoubleValidator(fRangeUp_lineEdit) );
connect( fPhase_lineEdit, SIGNAL( lostFocus() ), this, SLOT( checkPhaseParameter() ) );
}
//----------------------------------------------------------------------------------------------------
/**
* <p>
*/
void PGetFourierDialog::checkPhaseParameter()
{
QString str = fPhase_lineEdit->text();
if (str.isEmpty())
return;
bool ok;
double dval = str.toDouble(&ok);
int ival;
if (!ok) { // i.e. the phase entry is not a number. Check for parXX
str.stripWhiteSpace();
if (str.startsWith("par")) { //
str.remove("par");
ival = str.toInt(&ok);
if (!ok) {
fPhase_lineEdit->clear();
QMessageBox::critical(this, "**ERROR**",
"Allowed phase entries are either a parameter number,\n or an parXX entry, where XX is a parameter number",
QMessageBox::Ok, QMessageBox::NoButton);
fPhase_lineEdit->setFocus();
}
} else { // neither a parXX nor a number
fPhase_lineEdit->clear();
QMessageBox::critical(this, "**ERROR**",
"Allowed phase entries are either a parameter number,\n or an parXX entry, where XX is a parameter number",
QMessageBox::Ok, QMessageBox::NoButton);
fPhase_lineEdit->setFocus();
}
}
} }
//---------------------------------------------------------------------------------------------------- //----------------------------------------------------------------------------------------------------

1
src/musrgui/PGetFourierDialog.h
View File

@ -44,6 +44,7 @@ class PGetFourierDialog : public PGetFourierDialogBase
QString getFourierBlock() { return fFourierBlock; } QString getFourierBlock() { return fFourierBlock; }
private slots: private slots:
void checkPhaseParameter();
void fillFourierBlock(); void fillFourierBlock();
private: private:

39
src/musrgui/forms/PGetFourierDialogBase.ui
View File

@ -254,25 +254,6 @@
<string>If &lt;b&gt;no&lt;/b&gt; Fourier power is given. The Fourier transform will be done on the number of bins (N) given. If a Fourier power (FP) &gt; N is given, zero padding will be applied, i.e. filling the data vector &gt; N with zeros up to 2^FP.</string> <string>If &lt;b&gt;no&lt;/b&gt; Fourier power is given. The Fourier transform will be done on the number of bins (N) given. If a Fourier power (FP) &gt; N is given, zero padding will be applied, i.e. filling the data vector &gt; N with zeros up to 2^FP.</string>
</property> </property>
</widget> </widget>
<widget class="QLineEdit">
<property name="name">
<cstring>fPhase_lineEdit</cstring>
</property>
<property name="geometry">
<rect>
<x>140</x>
<y>140</y>
<width>100</width>
<height>24</height>
</rect>
</property>
<property name="text">
<string>0.0</string>
</property>
<property name="toolTip" stdset="0">
<string>phased used to calculate Re/Im Parts, given in (°)</string>
</property>
</widget>
<widget class="QLineEdit"> <widget class="QLineEdit">
<property name="name"> <property name="name">
<cstring>fPhaseCorrectionRangeLow_lineEdit</cstring> <cstring>fPhaseCorrectionRangeLow_lineEdit</cstring>
@ -409,6 +390,25 @@
</rect> </rect>
</property> </property>
</spacer> </spacer>
<widget class="QLineEdit">
<property name="name">
<cstring>fPhase_lineEdit</cstring>
</property>
<property name="geometry">
<rect>
<x>140</x>
<y>140</y>
<width>100</width>
<height>24</height>
</rect>
</property>
<property name="text">
<string>0.0</string>
</property>
<property name="toolTip" stdset="0">
<string>phased used to calculate Re/Im Parts, given in (°)</string>
</property>
</widget>
</widget> </widget>
<images> <images>
<image name="image0"> <image name="image0">
@ -450,6 +450,7 @@
</tabstops> </tabstops>
<slots> <slots>
<slot>fillFourierBlock()</slot> <slot>fillFourierBlock()</slot>
<slot access="private">checkPhaseParameter()</slot>
</slots> </slots>
<layoutdefaults spacing="6" margin="11"/> <layoutdefaults spacing="6" margin="11"/>
</UI> </UI>

94
src/musrgui/forms/PMsr2DataDialogBase.ui
View File

@ -401,6 +401,54 @@
</property> </property>
</widget> </widget>
</widget> </widget>
<widget class="QGroupBox">
<property name="name">
<cstring>fDbOutputFileName_groupBox</cstring>
</property>
<property name="geometry">
<rect>
<x>10</x>
<y>325</y>
<width>580</width>
<height>65</height>
</rect>
</property>
<property name="title">
<string>Data output file name</string>
</property>
<widget class="QLineEdit">
<property name="name">
<cstring>fDbOutputFileName_lineEdit</cstring>
</property>
<property name="geometry">
<rect>
<x>170</x>
<y>25</y>
<width>350</width>
<height>24</height>
</rect>
</property>
<property name="toolTip" stdset="0">
<string>e.g. MyPrefectFitCollection.db</string>
</property>
</widget>
<widget class="QLabel">
<property name="name">
<cstring>fDbOutputFileName_textLabel</cstring>
</property>
<property name="geometry">
<rect>
<x>10</x>
<y>30</y>
<width>160</width>
<height>20</height>
</rect>
</property>
<property name="text">
<string>Data Output File Name</string>
</property>
</widget>
</widget>
<widget class="QGroupBox"> <widget class="QGroupBox">
<property name="name"> <property name="name">
<cstring>fOptions_groupBox</cstring> <cstring>fOptions_groupBox</cstring>
@ -511,52 +559,20 @@
<string>will recreate the db-file. Default (unchecked) will append data</string> <string>will recreate the db-file. Default (unchecked) will append data</string>
</property> </property>
</widget> </widget>
</widget> <widget class="QCheckBox">
<widget class="QGroupBox">
<property name="name">
<cstring>fDbOutputFileName_groupBox</cstring>
</property>
<property name="geometry">
<rect>
<x>10</x>
<y>325</y>
<width>580</width>
<height>65</height>
</rect>
</property>
<property name="title">
<string>Data output file name</string>
</property>
<widget class="QLineEdit">
<property name="name"> <property name="name">
<cstring>fDbOutputFileName_lineEdit</cstring> <cstring>fOpenAfterFitting_checkBox</cstring>
</property> </property>
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>170</x> <x>230</x>
<y>25</y> <y>70</y>
<width>350</width> <width>170</width>
<height>24</height> <height>22</height>
</rect>
</property>
<property name="toolTip" stdset="0">
<string>e.g. MyPrefectFitCollection.db</string>
</property>
</widget>
<widget class="QLabel">
<property name="name">
<cstring>fDbOutputFileName_textLabel</cstring>
</property>
<property name="geometry">
<rect>
<x>10</x>
<y>30</y>
<width>160</width>
<height>20</height>
</rect> </rect>
</property> </property>
<property name="text"> <property name="text">
<string>Data Output File Name</string> <string>Open Files after Fitting</string>
</property> </property>
</widget> </widget>
</widget> </widget>