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

some minor bug fixes

Browse Source
This commit is contained in:
nemu 2009-03-22 16:19:08 +00:00
parent 201692410a
commit 98f05c3d3f
5 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/musrgui/PAdmin.cpp
View File

@ -159,6 +159,7 @@ bool PAdminXMLParser::characters(const QString& str)
else else
flag = false; flag = false;
fAdmin->setLifetimeCorrectionFlag(flag); fAdmin->setLifetimeCorrectionFlag(flag);
break;
case eMsrDefaultFilePath: case eMsrDefaultFilePath:
fAdmin->setMsrDefaultFilePath(QString(str.ascii()).stripWhiteSpace()); fAdmin->setMsrDefaultFilePath(QString(str.ascii()).stripWhiteSpace());
break; break;
@ -224,6 +225,7 @@ PAdmin::PAdmin()
{ {
fExecPath = QString(""); fExecPath = QString("");
fDefaultSavePath = QString(""); fDefaultSavePath = QString("");
fMsrDefaultFilePath = QString("");
fTheoFuncPixmapPath = QString(""); fTheoFuncPixmapPath = QString("");
fBeamline = QString(""); fBeamline = QString("");

3
src/musrgui/PAdmin.h
View File

@ -111,6 +111,7 @@ class PAdmin
QString fExecPath; QString fExecPath;
QString fDefaultSavePath; QString fDefaultSavePath;
QString fMsrDefaultFilePath;
QString fTheoFuncPixmapPath; QString fTheoFuncPixmapPath;
QString fBeamline; QString fBeamline;
@ -118,8 +119,6 @@ class PAdmin
QString fFileFormat; QString fFileFormat;
bool fLifetimeCorrection; bool fLifetimeCorrection;
QString fMsrDefaultFilePath;
QString fHelpMain; QString fHelpMain;
QValueVector<PTheory> fTheory; QValueVector<PTheory> fTheory;

4
src/musrgui/PGetAsymmetryRunBlockDialog.cpp
View File

@ -42,8 +42,8 @@
*/ */
PGetAsymmetryRunBlockDialog::PGetAsymmetryRunBlockDialog(const QString help, QWidget *parent, const char *name, PGetAsymmetryRunBlockDialog::PGetAsymmetryRunBlockDialog(const QString help, QWidget *parent, const char *name,
bool modal, WFlags f) : bool modal, WFlags f) :
fHelp(help), PGetAsymmetryRunBlockDialogBase(parent, name, modal, f),
PGetAsymmetryRunBlockDialogBase(parent, name, modal, f) fHelp(help)
{ {
fForward_lineEdit->setValidator( new QIntValidator(fForward_lineEdit) ); fForward_lineEdit->setValidator( new QIntValidator(fForward_lineEdit) );
fBackward_lineEdit->setValidator( new QIntValidator(fBackward_lineEdit) ); fBackward_lineEdit->setValidator( new QIntValidator(fBackward_lineEdit) );

6
src/musrgui/PTextEdit.cpp
View File

@ -248,8 +248,8 @@ void PTextEdit::setupMusrActions()
menuBar()->insertItem( tr( "&MusrFit" ), menu ); menuBar()->insertItem( tr( "&MusrFit" ), menu );
QAction *a; QAction *a;
a = new QAction( QPixmap::fromMimeSource( "musrasym.xpm" ), tr( "&Asymetry Default" ), ALT + Key_A, this, "musrGetAsymetryDefault" ); a = new QAction( QPixmap::fromMimeSource( "musrasym.xpm" ), tr( "&Asymmetry Default" ), ALT + Key_A, this, "musrGetAsymmetryDefault" );
connect( a, SIGNAL( activated() ), this, SLOT( musrGetAsymetryDefault() ) ); connect( a, SIGNAL( activated() ), this, SLOT( musrGetAsymmetryDefault() ) );
a->addTo( tb ); a->addTo( tb );
a->addTo( menu ); a->addTo( menu );
@ -659,7 +659,7 @@ void PTextEdit::textSize( const QString &p )
/** /**
* <p> * <p>
*/ */
void PTextEdit::musrGetAsymetryDefault() void PTextEdit::musrGetAsymmetryDefault()
{ {
QString runFileName, beamline, institute, fileFormat; QString runFileName, beamline, institute, fileFormat;

2
src/musrgui/PTextEdit.h
View File

@ -80,7 +80,7 @@ private slots:
void textFamily( const QString &f ); void textFamily( const QString &f );
void textSize( const QString &p ); void textSize( const QString &p );
void musrGetAsymetryDefault(); void musrGetAsymmetryDefault();
void musrGetSingleHistoDefault(); void musrGetSingleHistoDefault();
void musrCalcChisq(); void musrCalcChisq();
void musrFit(); void musrFit();