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

option: automatically open mlog-file after fit; implementation + cosmetics

Browse Source
This commit is contained in:
nemu 2009-03-13 20:34:49 +00:00
parent ec42d3c247
commit 3c04fa2675
18 changed files with 399 additions and 278 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/musrgui/PAdmin.cpp
View File

@ -82,6 +82,8 @@ bool PAdminXMLParser::startElement( const QString&, const QString&,
fKeyWord = eMsrDefaultFilePath;
} else if (qName == "show_mlog") {
fKeyWord = eShowMlog;
} else if (qName == "open_mlog_after_fit") {
fKeyWord = eOpenMlogAfterFit;
}
return true;
@ -131,6 +133,12 @@ bool PAdminXMLParser::characters(const QString& str)
else
fAdmin->setShowMlog(true);
break;
case eOpenMlogAfterFit:
if (str == "n")
fAdmin->setOpenMlogAfterFit(false);
else
fAdmin->setOpenMlogAfterFit(true);
break;
default:
break;
}
@ -165,6 +173,7 @@ PAdmin::PAdmin()
fFileFormat = QString("");
fShowMlog = true;
fOpenMlogAfterFit = true;
// XML Parser part
QString path = getenv("MUSRFITPATH");

5
src/musrgui/PAdmin.h
View File

@ -47,7 +47,7 @@ class PAdminXMLParser : public QXmlDefaultHandler
private:
enum EAdminKeyWords {eEmpty, eExecPath, eDefaultSavePath, eBeamline, eInstitute, eFileFormat,
eMsrDefaultFilePath, eShowMlog};
eMsrDefaultFilePath, eShowMlog, eOpenMlogAfterFit};
bool startDocument();
bool startElement( const QString&, const QString&, const QString& ,
@ -75,6 +75,7 @@ class PAdmin
QString getFileFormat() { return fFileFormat; }
QString getMsrDefaultFilePath() { return fMsrDefaultFilePath; }
bool getShowMlog() { return fShowMlog; }
bool getOpenMlogAfterFit() { return fOpenMlogAfterFit; }
protected:
void setExecPath(const QString str) { fExecPath = str; }
@ -84,6 +85,7 @@ class PAdmin
void setFileFormat(const QString str) { fFileFormat = str; }
void setMsrDefaultFilePath(const QString str) { fMsrDefaultFilePath = str; }
void setShowMlog(const bool flag) { fShowMlog = flag; }
void setOpenMlogAfterFit(const bool flag) { fOpenMlogAfterFit = flag; }
private:
friend class PAdminXMLParser;
@ -97,6 +99,7 @@ class PAdmin
QString fMsrDefaultFilePath;
bool fShowMlog;
bool fOpenMlogAfterFit;
};
#endif // _PADMIN_H_

12
src/musrgui/PFitOutputHandler.cpp
View File

@ -50,6 +50,7 @@ PFitOutputHandler::PFitOutputHandler(QValueVector<QString> &cmd)
connect( quitButton, SIGNAL(clicked()),
this, SLOT(accept()) );
resize( 800, 500 );
quitButton->setFocus();
// QProcess related code
proc = new QProcess( this );
@ -94,17 +95,6 @@ void PFitOutputHandler::readFromStdErr()
output->append( proc->readStderr() );
}
//----------------------------------------------------------------------------------------------------
/**
* <p>
*/
/*
void PFitOutputHandler::scrollToTop()
{
output->setContentsPos( 0, 0 );
}
*/
//----------------------------------------------------------------------------------------------------
// END
//----------------------------------------------------------------------------------------------------

1
src/musrgui/PFitOutputHandler.h
View File

@ -54,7 +54,6 @@ public:
public slots:
void readFromStdOut();
void readFromStdErr();
// void scrollToTop();
private:
QProcess *proc;

7
src/musrgui/PPrefsDialog.cpp
View File

@ -35,13 +35,18 @@
/**
* <p>
*/
PPrefsDialog::PPrefsDialog(const bool keep_mn2_output, const int dump_tag)
PPrefsDialog::PPrefsDialog(const bool keep_mn2_output, const bool open_mlog_after_fit, const int dump_tag)
{
if (keep_mn2_output)
fKeepMn2Output_checkBox->setChecked(true);
else
fKeepMn2Output_checkBox->setChecked(false);
if (open_mlog_after_fit)
fOpenMlogAfterFit_checkBox->setChecked(true);
else
fOpenMlogAfterFit_checkBox->setChecked(false);
if (dump_tag == 1) {
fDumpAscii_checkBox->setChecked(true);
fDumpRoot_checkBox->setChecked(false);

3
src/musrgui/PPrefsDialog.h
View File

@ -39,9 +39,10 @@
class PPrefsDialog : public PPrefsDialogBase
{
public:
PPrefsDialog(const bool keep_mn2_output, const int dump_tag);
PPrefsDialog(const bool keep_mn2_output, const bool open_mlog_after_fit, const int dump_tag);
bool keepMinuit2Output() { return fKeepMn2Output_checkBox->isChecked(); }
bool openMlogAfterFit() { return fOpenMlogAfterFit_checkBox->isChecked(); }
int getDump();
public slots:

27
src/musrgui/PTextEdit.cpp
View File

@ -104,6 +104,7 @@ PTextEdit::PTextEdit( QWidget *parent, const char *name )
fAdmin = new PAdmin();
fShowMlog = fAdmin->getShowMlog();
fOpenMlogAfterFit = fAdmin->getOpenMlogAfterFit();
fKeepMinuit2Output = false;
fDump = 0; // 0 = no dump, 1 = ascii dump, 2 = root dump
@ -868,6 +869,25 @@ void PTextEdit::musrFit()
PFitOutputHandler fitOutputHandler(cmd);
fitOutputHandler.setModal(true);
fitOutputHandler.exec();
if (fOpenMlogAfterFit) {
// get current file name and replace the msr-extension through mlog
str = fTabWidget->label(fTabWidget->currentPageIndex());
int idx = str.find(".msr");
if (idx > 0) {
str.replace(idx, 4, ".mlog");
}
// check if mlog-file is already open, and if yes close it
for (int i=0; i<fTabWidget->count(); i++) {
if (fTabWidget->label(i).find(str) >= 0) {
delete fTabWidget->page(i);
}
}
// open mlog files
load(str);
}
}
//----------------------------------------------------------------------------------------------------
@ -1007,10 +1027,6 @@ void PTextEdit::musrMlog2Db()
cmd.append(str);
}
for (unsigned int i=0; i<cmd.size(); i++)
cout << endl << ">> " << cmd[i].latin1();
cout << endl;
PFitOutputHandler fitOutputHandler(cmd);
fitOutputHandler.setModal(true);
fitOutputHandler.exec();
@ -1073,10 +1089,11 @@ void PTextEdit::musrT0()
*/
void PTextEdit::musrPrefs()
{
PPrefsDialog *dlg = new PPrefsDialog(fKeepMinuit2Output, fDump);
PPrefsDialog *dlg = new PPrefsDialog(fKeepMinuit2Output, fOpenMlogAfterFit, fDump);
if (dlg->exec() == QDialog::Accepted) {
fKeepMinuit2Output = dlg->keepMinuit2Output();
fOpenMlogAfterFit = dlg->openMlogAfterFit();
fDump = dlg->getDump();
}
}

1
src/musrgui/PTextEdit.h
View File

@ -101,6 +101,7 @@ private:
PAdmin *fAdmin;
bool fShowMlog;
bool fOpenMlogAfterFit;
bool fKeepMinuit2Output;
int fDump;

8
src/musrgui/forms/PGetAsymmetryRunBlockDialogBase.ui
View File

@ -15,6 +15,9 @@
<property name="caption">
<string>Get Asymmetry Run Block Parameters</string>
</property>
<property name="icon">
<pixmap>image0</pixmap>
</property>
<property name="sizeGripEnabled">
<bool>true</bool>
</property>
@ -844,6 +847,11 @@
</widget>
</widget>
</widget>
<images>
<image name="image0">
<data format="PNG" length="270">89504e470d0a1a0a0000000d4948445200000016000000160806000000c4b46c3b000000d549444154388db594510e84200c44a78653d1f34faf853fd66d2a2aa8fb1222697068cb80d0884cadda7c6e46392c1860c9010da2bd8d4629f1670140a3200869d536ad8a2d63cfc805bc7c338ac766b33eb4c279dadb5be1b72c5ab5c5d2f3028fcda6bff042f40dd2f3f119355477c7708fdd15a3eef8ecf0f2868f847bb733332c1c9d43a344f15e9bca51e25a3cde52493736d3e2d85cb27ff36861d0081ad18b15607b783a785cabb67d4da7bf5e890070f34eb5c245cee2c4cfebc533ca593e211ee2652bdef0bfd7ed4bb1e8f5a947688615932a98c849f587290000000049454e44ae426082</data>
</image>
</images>
<connections>
<connection>
<sender>fOk_button</sender>

11
src/musrgui/forms/PGetDefaultDialogBase.ui
View File

@ -15,9 +15,15 @@
<property name="caption">
<string>RUN</string>
</property>
<property name="icon">
<pixmap>image0</pixmap>
</property>
<property name="sizeGripEnabled">
<bool>true</bool>
</property>
<property name="modal">
<bool>true</bool>
</property>
<widget class="QLabel">
<property name="name">
<cstring>fRunFileName_textLabel</cstring>
@ -287,6 +293,11 @@
</property>
</widget>
</widget>
<images>
<image name="image0">
<data format="PNG" length="270">89504e470d0a1a0a0000000d4948445200000016000000160806000000c4b46c3b000000d549444154388db594510e84200c44a78653d1f34faf853fd66d2a2aa8fb1222697068cb80d0884cadda7c6e46392c1860c9010da2bd8d4629f1670140a3200869d536ad8a2d63cfc805bc7c338ac766b33eb4c279dadb5be1b72c5ab5c5d2f3028fcda6bff042f40dd2f3f119355477c7708fdd15a3eef8ecf0f2868f847bb733332c1c9d43a344f15e9bca51e25a3cde52493736d3e2d85cb27ff36861d0081ad18b15607b783a785cabb67d4da7bf5e890070f34eb5c245cee2c4cfebc533ca593e211ee2652bdef0bfd7ed4bb1e8f5a947688615932a98c849f587290000000049454e44ae426082</data>
</image>
</images>
<connections>
<connection>
<sender>buttonOk</sender>

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

@ -15,6 +15,9 @@
<property name="caption">
<string>Get Fourier</string>
</property>
<property name="icon">
<pixmap>image0</pixmap>
</property>
<property name="sizeGripEnabled">
<bool>true</bool>
</property>
@ -199,78 +202,6 @@
</rect>
</property>
</widget>
<widget class="QPushButton">
<property name="name">
<cstring>fCancel_button</cstring>
</property>
<property name="geometry">
<rect>
<x>11</x>
<y>251</y>
<width>75</width>
<height>26</height>
</rect>
</property>
<property name="text">
<string>&amp;Cancel</string>
</property>
<property name="accel">
<string></string>
</property>
<property name="autoDefault">
<bool>true</bool>
</property>
</widget>
<spacer>
<property name="name">
<cstring>Horizontal Spacing2</cstring>
</property>
<property name="orientation">
<enum>Horizontal</enum>
</property>
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="sizeHint">
<size>
<width>122</width>
<height>20</height>
</size>
</property>
<property name="geometry">
<rect>
<x>92</x>
<y>254</y>
<width>122</width>
<height>20</height>
</rect>
</property>
</spacer>
<widget class="QPushButton">
<property name="name">
<cstring>fOk_button</cstring>
</property>
<property name="geometry">
<rect>
<x>220</x>
<y>251</y>
<width>49</width>
<height>26</height>
</rect>
</property>
<property name="text">
<string>&amp;OK</string>
</property>
<property name="accel">
<string></string>
</property>
<property name="autoDefault">
<bool>true</bool>
</property>
<property name="default">
<bool>true</bool>
</property>
</widget>
<widget class="QComboBox">
<item>
<property name="text">
@ -406,7 +337,84 @@
<string>plot range end</string>
</property>
</widget>
<widget class="QPushButton">
<property name="name">
<cstring>fCancel_button</cstring>
</property>
<property name="geometry">
<rect>
<x>200</x>
<y>250</y>
<width>75</width>
<height>26</height>
</rect>
</property>
<property name="text">
<string>&amp;Cancel</string>
</property>
<property name="accel">
<string></string>
</property>
<property name="autoDefault">
<bool>true</bool>
</property>
</widget>
<widget class="QPushButton">
<property name="name">
<cstring>fOk_button</cstring>
</property>
<property name="geometry">
<rect>
<x>140</x>
<y>250</y>
<width>49</width>
<height>26</height>
</rect>
</property>
<property name="text">
<string>&amp;OK</string>
</property>
<property name="accel">
<string></string>
</property>
<property name="autoDefault">
<bool>true</bool>
</property>
<property name="default">
<bool>true</bool>
</property>
</widget>
<spacer>
<property name="name">
<cstring>Horizontal Spacing2</cstring>
</property>
<property name="orientation">
<enum>Horizontal</enum>
</property>
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="sizeHint">
<size>
<width>122</width>
<height>20</height>
</size>
</property>
<property name="geometry">
<rect>
<x>10</x>
<y>250</y>
<width>122</width>
<height>20</height>
</rect>
</property>
</spacer>
</widget>
<images>
<image name="image0">
<data format="PNG" length="270">89504e470d0a1a0a0000000d4948445200000016000000160806000000c4b46c3b000000d549444154388db594510e84200c44a78653d1f34faf853fd66d2a2aa8fb1222697068cb80d0884cadda7c6e46392c1860c9010da2bd8d4629f1670140a3200869d536ad8a2d63cfc805bc7c338ac766b33eb4c279dadb5be1b72c5ab5c5d2f3028fcda6bff042f40dd2f3f119355477c7708fdd15a3eef8ecf0f2868f847bb733332c1c9d43a344f15e9bca51e25a3cde52493736d3e2d85cb27ff36861d0081ad18b15607b783a785cabb67d4da7bf5e890070f34eb5c245cee2c4cfebc533ca593e211ee2652bdef0bfd7ed4bb1e8f5a947688615932a98c849f587290000000049454e44ae426082</data>
</image>
</images>
<connections>
<connection>
<sender>fOk_button</sender>

193
src/musrgui/forms/PGetParameterDialogBase.ui
View File

@ -15,9 +15,15 @@
<property name="caption">
<string>Get Parameter</string>
</property>
<property name="icon">
<pixmap>image0</pixmap>
</property>
<property name="sizeGripEnabled">
<bool>true</bool>
</property>
<property name="modal">
<bool>true</bool>
</property>
<widget class="QLineEdit">
<property name="name">
<cstring>fName_lineEdit</cstring>
@ -239,97 +245,6 @@
<number>1</number>
</property>
</widget>
<widget class="QPushButton">
<property name="name">
<cstring>fCancel_pushButton</cstring>
</property>
<property name="geometry">
<rect>
<x>11</x>
<y>391</y>
<width>75</width>
<height>26</height>
</rect>
</property>
<property name="text">
<string>&amp;Cancel</string>
</property>
<property name="accel">
<string></string>
</property>
<property name="autoDefault">
<bool>true</bool>
</property>
</widget>
<spacer>
<property name="name">
<cstring>Horizontal Spacing2</cstring>
</property>
<property name="orientation">
<enum>Horizontal</enum>
</property>
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="sizeHint">
<size>
<width>440</width>
<height>20</height>
</size>
</property>
<property name="geometry">
<rect>
<x>92</x>
<y>394</y>
<width>440</width>
<height>20</height>
</rect>
</property>
</spacer>
<widget class="QPushButton">
<property name="name">
<cstring>fAdd_pushButton</cstring>
</property>
<property name="geometry">
<rect>
<x>538</x>
<y>391</y>
<width>56</width>
<height>26</height>
</rect>
</property>
<property name="text">
<string>&amp;Add</string>
</property>
<property name="accel">
<string>Alt+A</string>
</property>
</widget>
<widget class="QPushButton">
<property name="name">
<cstring>fOk_PushButton</cstring>
</property>
<property name="geometry">
<rect>
<x>600</x>
<y>391</y>
<width>49</width>
<height>26</height>
</rect>
</property>
<property name="text">
<string>&amp;OK</string>
</property>
<property name="accel">
<string></string>
</property>
<property name="autoDefault">
<bool>true</bool>
</property>
<property name="default">
<bool>true</bool>
</property>
</widget>
<widget class="QTextEdit">
<property name="name">
<cstring>fParam_textEdit</cstring>
@ -356,7 +271,103 @@ FITPARAMETER
<enum>WidgetWidth</enum>
</property>
</widget>
<widget class="QPushButton">
<property name="name">
<cstring>fAdd_pushButton</cstring>
</property>
<property name="geometry">
<rect>
<x>10</x>
<y>390</y>
<width>56</width>
<height>26</height>
</rect>
</property>
<property name="text">
<string>&amp;Add</string>
</property>
<property name="accel">
<string>Alt+A</string>
</property>
</widget>
<spacer>
<property name="name">
<cstring>Horizontal Spacing2</cstring>
</property>
<property name="orientation">
<enum>Horizontal</enum>
</property>
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="sizeHint">
<size>
<width>410</width>
<height>20</height>
</size>
</property>
<property name="geometry">
<rect>
<x>80</x>
<y>390</y>
<width>410</width>
<height>20</height>
</rect>
</property>
</spacer>
<widget class="QPushButton">
<property name="name">
<cstring>fOk_PushButton</cstring>
</property>
<property name="geometry">
<rect>
<x>600</x>
<y>390</y>
<width>49</width>
<height>26</height>
</rect>
</property>
<property name="text">
<string>&amp;OK</string>
</property>
<property name="accel">
<string></string>
</property>
<property name="autoDefault">
<bool>true</bool>
</property>
<property name="default">
<bool>true</bool>
</property>
</widget>
<widget class="QPushButton">
<property name="name">
<cstring>fCancel_pushButton</cstring>
</property>
<property name="geometry">
<rect>
<x>520</x>
<y>390</y>
<width>75</width>
<height>26</height>
</rect>
</property>
<property name="text">
<string>&amp;Cancel</string>
</property>
<property name="accel">
<string></string>
</property>
<property name="autoDefault">
<bool>true</bool>
</property>
</widget>
</widget>
<images>
<image name="image0">
<data format="PNG" length="270">89504e470d0a1a0a0000000d4948445200000016000000160806000000c4b46c3b000000d549444154388db594510e84200c44a78653d1f34faf853fd66d2a2aa8fb1222697068cb80d0884cadda7c6e46392c1860c9010da2bd8d4629f1670140a3200869d536ad8a2d63cfc805bc7c338ac766b33eb4c279dadb5be1b72c5ab5c5d2f3028fcda6bff042f40dd2f3f119355477c7708fdd15a3eef8ecf0f2868f847bb733332c1c9d43a344f15e9bca51e25a3cde52493736d3e2d85cb27ff36861d0081ad18b15607b783a785cabb67d4da7bf5e890070f34eb5c245cee2c4cfebc533ca593e211ee2652bdef0bfd7ed4bb1e8f5a947688615932a98c849f587290000000049454e44ae426082</data>
</image>
</images>
<connections>
<connection>
<sender>fOk_PushButton</sender>

193
src/musrgui/forms/PGetPlotDialogBase.ui
View File

@ -15,9 +15,15 @@
<property name="caption">
<string>Get Plot</string>
</property>
<property name="icon">
<pixmap>image0</pixmap>
</property>
<property name="sizeGripEnabled">
<bool>true</bool>
</property>
<property name="modal">
<bool>true</bool>
</property>
<widget class="QLabel">
<property name="name">
<cstring>fYRange_textLabel</cstring>
@ -128,97 +134,6 @@
</rect>
</property>
</widget>
<widget class="QPushButton">
<property name="name">
<cstring>fCancel_button</cstring>
</property>
<property name="geometry">
<rect>
<x>11</x>
<y>271</y>
<width>75</width>
<height>26</height>
</rect>
</property>
<property name="text">
<string>&amp;Cancel</string>
</property>
<property name="accel">
<string></string>
</property>
<property name="autoDefault">
<bool>true</bool>
</property>
</widget>
<spacer>
<property name="name">
<cstring>Horizontal Spacing2</cstring>
</property>
<property name="orientation">
<enum>Horizontal</enum>
</property>
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="sizeHint">
<size>
<width>290</width>
<height>20</height>
</size>
</property>
<property name="geometry">
<rect>
<x>92</x>
<y>274</y>
<width>290</width>
<height>20</height>
</rect>
</property>
</spacer>
<widget class="QPushButton">
<property name="name">
<cstring>fAdd_pushButton</cstring>
</property>
<property name="geometry">
<rect>
<x>388</x>
<y>271</y>
<width>56</width>
<height>26</height>
</rect>
</property>
<property name="text">
<string>&amp;Add</string>
</property>
<property name="accel">
<string>Alt+A</string>
</property>
</widget>
<widget class="QPushButton">
<property name="name">
<cstring>fOk_button</cstring>
</property>
<property name="geometry">
<rect>
<x>450</x>
<y>271</y>
<width>49</width>
<height>26</height>
</rect>
</property>
<property name="text">
<string>&amp;OK</string>
</property>
<property name="accel">
<string></string>
</property>
<property name="autoDefault">
<bool>true</bool>
</property>
<property name="default">
<bool>true</bool>
</property>
</widget>
<widget class="QLineEdit">
<property name="name">
<cstring>fRunList_lineEdit</cstring>
@ -299,7 +214,103 @@
<string>end value</string>
</property>
</widget>
<widget class="QPushButton">
<property name="name">
<cstring>fCancel_button</cstring>
</property>
<property name="geometry">
<rect>
<x>370</x>
<y>270</y>
<width>75</width>
<height>26</height>
</rect>
</property>
<property name="text">
<string>&amp;Cancel</string>
</property>
<property name="accel">
<string></string>
</property>
<property name="autoDefault">
<bool>true</bool>
</property>
</widget>
<widget class="QPushButton">
<property name="name">
<cstring>fOk_button</cstring>
</property>
<property name="geometry">
<rect>
<x>450</x>
<y>270</y>
<width>49</width>
<height>26</height>
</rect>
</property>
<property name="text">
<string>&amp;OK</string>
</property>
<property name="accel">
<string></string>
</property>
<property name="autoDefault">
<bool>true</bool>
</property>
<property name="default">
<bool>true</bool>
</property>
</widget>
<spacer>
<property name="name">
<cstring>Horizontal Spacing2</cstring>
</property>
<property name="orientation">
<enum>Horizontal</enum>
</property>
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="sizeHint">
<size>
<width>290</width>
<height>20</height>
</size>
</property>
<property name="geometry">
<rect>
<x>72</x>
<y>274</y>
<width>290</width>
<height>20</height>
</rect>
</property>
</spacer>
<widget class="QPushButton">
<property name="name">
<cstring>fAdd_pushButton</cstring>
</property>
<property name="geometry">
<rect>
<x>10</x>
<y>270</y>
<width>56</width>
<height>26</height>
</rect>
</property>
<property name="text">
<string>&amp;Add</string>
</property>
<property name="accel">
<string>Alt+A</string>
</property>
</widget>
</widget>
<images>
<image name="image0">
<data format="PNG" length="270">89504e470d0a1a0a0000000d4948445200000016000000160806000000c4b46c3b000000d549444154388db594510e84200c44a78653d1f34faf853fd66d2a2aa8fb1222697068cb80d0884cadda7c6e46392c1860c9010da2bd8d4629f1670140a3200869d536ad8a2d63cfc805bc7c338ac766b33eb4c279dadb5be1b72c5ab5c5d2f3028fcda6bff042f40dd2f3f119355477c7708fdd15a3eef8ecf0f2868f847bb733332c1c9d43a344f15e9bca51e25a3cde52493736d3e2d85cb27ff36861d0081ad18b15607b783a785cabb67d4da7bf5e890070f34eb5c245cee2c4cfebc533ca593e211ee2652bdef0bfd7ed4bb1e8f5a947688615932a98c849f587290000000049454e44ae426082</data>
</image>
</images>
<connections>
<connection>
<sender>fOk_button</sender>

8
src/musrgui/forms/PGetSingleHistoRunBlockDialogBase.ui
View File

@ -15,6 +15,9 @@
<property name="caption">
<string>Get Single Histo Run Block Parameters</string>
</property>
<property name="icon">
<pixmap>image0</pixmap>
</property>
<property name="sizeGripEnabled">
<bool>true</bool>
</property>
@ -786,6 +789,11 @@
</hbox>
</widget>
</widget>
<images>
<image name="image0">
<data format="PNG" length="270">89504e470d0a1a0a0000000d4948445200000016000000160806000000c4b46c3b000000d549444154388db594510e84200c44a78653d1f34faf853fd66d2a2aa8fb1222697068cb80d0884cadda7c6e46392c1860c9010da2bd8d4629f1670140a3200869d536ad8a2d63cfc805bc7c338ac766b33eb4c279dadb5be1b72c5ab5c5d2f3028fcda6bff042f40dd2f3f119355477c7708fdd15a3eef8ecf0f2868f847bb733332c1c9d43a344f15e9bca51e25a3cde52493736d3e2d85cb27ff36861d0081ad18b15607b783a785cabb67d4da7bf5e890070f34eb5c245cee2c4cfebc533ca593e211ee2652bdef0bfd7ed4bb1e8f5a947688615932a98c849f587290000000049454e44ae426082</data>
</image>
</images>
<connections>
<connection>
<sender>fOk_button</sender>

8
src/musrgui/forms/PGetTitleDialog.ui
View File

@ -15,6 +15,9 @@
<property name="caption">
<string>Get Title</string>
</property>
<property name="icon">
<pixmap>image0</pixmap>
</property>
<property name="sizeGripEnabled">
<bool>true</bool>
</property>
@ -137,6 +140,11 @@
</hbox>
</widget>
</widget>
<images>
<image name="image0">
<data format="PNG" length="270">89504e470d0a1a0a0000000d4948445200000016000000160806000000c4b46c3b000000d549444154388db594510e84200c44a78653d1f34faf853fd66d2a2aa8fb1222697068cb80d0884cadda7c6e46392c1860c9010da2bd8d4629f1670140a3200869d536ad8a2d63cfc805bc7c338ac766b33eb4c279dadb5be1b72c5ab5c5d2f3028fcda6bff042f40dd2f3f119355477c7708fdd15a3eef8ecf0f2868f847bb733332c1c9d43a344f15e9bca51e25a3cde52493736d3e2d85cb27ff36861d0081ad18b15607b783a785cabb67d4da7bf5e890070f34eb5c245cee2c4cfebc533ca593e211ee2652bdef0bfd7ed4bb1e8f5a947688615932a98c849f587290000000049454e44ae426082</data>
</image>
</images>
<connections>
<connection>
<sender>buttonOk</sender>

5
src/musrgui/forms/PMusrGuiAbout.ui
View File

@ -18,6 +18,9 @@
<property name="icon">
<pixmap>image0</pixmap>
</property>
<property name="modal">
<bool>true</bool>
</property>
<widget class="QPushButton">
<property name="name">
<cstring>fOk_pushButton</cstring>
@ -88,7 +91,7 @@ Switzerland&lt;/p&gt;</string>
</widget>
<images>
<image name="image0">
<data format="PNG" length="415">89504e470d0a1a0a0000000d4948445200000016000000160806000000c4b46c3b0000016649444154388dad54c18dc4200c1ca33cd3409ea1801440ea870228c079d2007fee9138326cd865578784d0d8891986c1c491810c6006524e58e605eb660bae7144a6363f824dcaa90a5a551438e3abb345f2edf73d4c1c19292738b71702c09149332600e507e6468ae22a90723a8b5cc5648775b36584a960b3cc8b3ef9bdf31199524e554e3393623d6c9e7eae8ed76c3aac3180e28327e7f67204a627cdd6cd9efa77f28f1afbe069991784e0a9c7e41e5f684c4f3eeee175b365d41d2f3eee61b1e0a83bcca7dbbd3ffee00ee7f6a2b119d54c8fddede531ff1f1a5b678b5cfc536f9934c34f2bd4732f0048bdd81799aef83d3932f4dacea22607064746158b0c1f3c0c70361e1f3cb17ac629a73b0e0092afc49eebde428af104e0d50de863747c7c44267fb9e3084c13705e8490108695b60deeadd2255767cb24c5f4ed0b4339498bbbbe57c354c754bde11deefabe2dfc8dc6ef98874bc62330910f7ed8c7dfac7f004a406a2bc502fb0000000049454e44ae426082</data>
<data format="PNG" length="419">89504e470d0a1a0a0000000d4948445200000016000000160806000000c4b46c3b0000016a49444154388dad54318ec4200c1ca33c206de8d2e609e4fdf0045a3aa7e5075c9138322cec66578784d0d8891986c1c491810c6006524e58e715cb660bae7144a636ff049b945315b4aa2870c617678be4dbef47983832524e706e2f04802393664c00ca0fcc8d14c55520e57416b98ac90ecb66cb13a682cd3aaffae4f7ce47644a395539cd4c8a8db0e9fd5c1dafd9f4b1c6008a0f9e9cdbcb11987a9a2d9b3df51fe4bb1afbe0699d5784e069c4e41e5f684c3d1f8ff0b2d9f2d41d2f3e1e61b1e05377984fb77b7ffcc11dceed4563f354333d76b7976efe3f34b6ce16b9f85e6f9934c34f2bd4732f0048bdd81799aef83d3932f4dacea22607064746158b0c1f3c0c70361e1f3cb17ac629a73b0e0092afc49eebde428af104e0d50d18630c7c7c44267fb9e3084c13705e8490108695b60d1eadd2251767cb24c5f4ed0b4339498b87be57c354c754bde11d1efabe2dfc8dc6ef98874bc6233019dfe96ae28e117ec75cbae41fee1e436e55a431750000000049454e44ae426082</data>
</image>
</images>
<connections>

33
src/musrgui/forms/PPrefsDialogBase.ui
View File

@ -9,15 +9,21 @@
<x>0</x>
<y>0</y>
<width>541</width>
<height>186</height>
<height>206</height>
</rect>
</property>
<property name="caption">
<string>Preferences</string>
</property>
<property name="icon">
<pixmap>image0</pixmap>
</property>
<property name="sizeGripEnabled">
<bool>true</bool>
</property>
<property name="modal">
<bool>true</bool>
</property>
<widget class="QTabWidget">
<property name="name">
<cstring>fTabWidget</cstring>
@ -27,7 +33,7 @@
<x>10</x>
<y>20</y>
<width>520</width>
<height>110</height>
<height>130</height>
</rect>
</property>
<widget class="QWidget">
@ -94,6 +100,22 @@
<string>will generate a ROOT dump file after the fit with the data and the theory</string>
</property>
</widget>
<widget class="QCheckBox">
<property name="name">
<cstring>fOpenMlogAfterFit_checkBox</cstring>
</property>
<property name="geometry">
<rect>
<x>10</x>
<y>70</y>
<width>140</width>
<height>22</height>
</rect>
</property>
<property name="text">
<string>open mlog after fit</string>
</property>
</widget>
</widget>
</widget>
<widget class="QLayoutWidget">
@ -103,7 +125,7 @@
<property name="geometry">
<rect>
<x>10</x>
<y>140</y>
<y>160</y>
<width>520</width>
<height>33</height>
</rect>
@ -183,6 +205,11 @@
</hbox>
</widget>
</widget>
<images>
<image name="image0">
<data format="PNG" length="270">89504e470d0a1a0a0000000d4948445200000016000000160806000000c4b46c3b000000d549444154388db594510e84200c44a78653d1f34faf853fd66d2a2aa8fb1222697068cb80d0884cadda7c6e46392c1860c9010da2bd8d4629f1670140a3200869d536ad8a2d63cfc805bc7c338ac766b33eb4c279dadb5be1b72c5ab5c5d2f3028fcda6bff042f40dd2f3f119355477c7708fdd15a3eef8ecf0f2868f847bb733332c1c9d43a344f15e9bca51e25a3cde52493736d3e2d85cb27ff36861d0081ad18b15607b783a785cabb67d4da7bf5e890070f34eb5c245cee2c4cfebc533ca593e211ee2652bdef0bfd7ed4bb1e8f5a947688615932a98c849f587290000000049454e44ae426082</data>
</image>
</images>
<connections>
<connection>
<sender>buttonOk</sender>

1
src/musrgui/musrgui_startup.xml
View File

@ -9,6 +9,7 @@
<default_save_path>/mnt/home/nemu/analysis</default_save_path>
<msr_default_file_path>/home/nemu/analysis/musrfit/src/musrgui</msr_default_file_path>
<show_mlog>y</show_mlog>
<open_mlog_after_fit>y</open_mlog_after_fit>
</general>
<msr_file_defaults>
<beamline>mue4</beamline>