From 3c04fa2675e707c281f7807d205b2e67e49897d2 Mon Sep 17 00:00:00 2001 From: nemu Date: Fri, 13 Mar 2009 20:34:49 +0000 Subject: [PATCH] option: automatically open mlog-file after fit; implementation + cosmetics --- src/musrgui/PAdmin.cpp | 9 + src/musrgui/PAdmin.h | 5 +- src/musrgui/PFitOutputHandler.cpp | 12 +- src/musrgui/PFitOutputHandler.h | 1 - src/musrgui/PPrefsDialog.cpp | 7 +- src/musrgui/PPrefsDialog.h | 3 +- src/musrgui/PTextEdit.cpp | 27 ++- src/musrgui/PTextEdit.h | 1 + .../forms/PGetAsymmetryRunBlockDialogBase.ui | 8 + src/musrgui/forms/PGetDefaultDialogBase.ui | 11 + src/musrgui/forms/PGetFourierDialogBase.ui | 152 +++++++------- src/musrgui/forms/PGetParameterDialogBase.ui | 193 +++++++++--------- src/musrgui/forms/PGetPlotDialogBase.ui | 193 +++++++++--------- .../PGetSingleHistoRunBlockDialogBase.ui | 8 + src/musrgui/forms/PGetTitleDialog.ui | 8 + src/musrgui/forms/PMusrGuiAbout.ui | 5 +- src/musrgui/forms/PPrefsDialogBase.ui | 33 ++- src/musrgui/musrgui_startup.xml | 1 + 18 files changed, 399 insertions(+), 278 deletions(-) diff --git a/src/musrgui/PAdmin.cpp b/src/musrgui/PAdmin.cpp index 7922c146..987ce5af 100644 --- a/src/musrgui/PAdmin.cpp +++ b/src/musrgui/PAdmin.cpp @@ -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"); diff --git a/src/musrgui/PAdmin.h b/src/musrgui/PAdmin.h index b298cb3b..54762508 100644 --- a/src/musrgui/PAdmin.h +++ b/src/musrgui/PAdmin.h @@ -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_ diff --git a/src/musrgui/PFitOutputHandler.cpp b/src/musrgui/PFitOutputHandler.cpp index 916f71eb..341c2609 100644 --- a/src/musrgui/PFitOutputHandler.cpp +++ b/src/musrgui/PFitOutputHandler.cpp @@ -50,6 +50,7 @@ PFitOutputHandler::PFitOutputHandler(QValueVector &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() ); } -//---------------------------------------------------------------------------------------------------- -/** - *

- */ -/* -void PFitOutputHandler::scrollToTop() -{ - output->setContentsPos( 0, 0 ); -} -*/ - //---------------------------------------------------------------------------------------------------- // END //---------------------------------------------------------------------------------------------------- diff --git a/src/musrgui/PFitOutputHandler.h b/src/musrgui/PFitOutputHandler.h index cae42a5a..acc4f95f 100644 --- a/src/musrgui/PFitOutputHandler.h +++ b/src/musrgui/PFitOutputHandler.h @@ -54,7 +54,6 @@ public: public slots: void readFromStdOut(); void readFromStdErr(); -// void scrollToTop(); private: QProcess *proc; diff --git a/src/musrgui/PPrefsDialog.cpp b/src/musrgui/PPrefsDialog.cpp index a473e173..b7b9cb80 100644 --- a/src/musrgui/PPrefsDialog.cpp +++ b/src/musrgui/PPrefsDialog.cpp @@ -35,13 +35,18 @@ /** *

*/ -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); diff --git a/src/musrgui/PPrefsDialog.h b/src/musrgui/PPrefsDialog.h index 0b67289d..bb1671e3 100644 --- a/src/musrgui/PPrefsDialog.h +++ b/src/musrgui/PPrefsDialog.h @@ -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: diff --git a/src/musrgui/PTextEdit.cpp b/src/musrgui/PTextEdit.cpp index 781d8b1b..19683a40 100644 --- a/src/musrgui/PTextEdit.cpp +++ b/src/musrgui/PTextEdit.cpp @@ -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; icount(); 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[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(); } } diff --git a/src/musrgui/PTextEdit.h b/src/musrgui/PTextEdit.h index 487469a0..026eaf9f 100644 --- a/src/musrgui/PTextEdit.h +++ b/src/musrgui/PTextEdit.h @@ -101,6 +101,7 @@ private: PAdmin *fAdmin; bool fShowMlog; + bool fOpenMlogAfterFit; bool fKeepMinuit2Output; int fDump; diff --git a/src/musrgui/forms/PGetAsymmetryRunBlockDialogBase.ui b/src/musrgui/forms/PGetAsymmetryRunBlockDialogBase.ui index 08b4cc5c..420cbc57 100644 --- a/src/musrgui/forms/PGetAsymmetryRunBlockDialogBase.ui +++ b/src/musrgui/forms/PGetAsymmetryRunBlockDialogBase.ui @@ -15,6 +15,9 @@ Get Asymmetry Run Block Parameters + + image0 + true @@ -844,6 +847,11 @@ + + + 89504e470d0a1a0a0000000d4948445200000016000000160806000000c4b46c3b000000d549444154388db594510e84200c44a78653d1f34faf853fd66d2a2aa8fb1222697068cb80d0884cadda7c6e46392c1860c9010da2bd8d4629f1670140a3200869d536ad8a2d63cfc805bc7c338ac766b33eb4c279dadb5be1b72c5ab5c5d2f3028fcda6bff042f40dd2f3f119355477c7708fdd15a3eef8ecf0f2868f847bb733332c1c9d43a344f15e9bca51e25a3cde52493736d3e2d85cb27ff36861d0081ad18b15607b783a785cabb67d4da7bf5e890070f34eb5c245cee2c4cfebc533ca593e211ee2652bdef0bfd7ed4bb1e8f5a947688615932a98c849f587290000000049454e44ae426082 + + fOk_button diff --git a/src/musrgui/forms/PGetDefaultDialogBase.ui b/src/musrgui/forms/PGetDefaultDialogBase.ui index db2c6615..44869f83 100644 --- a/src/musrgui/forms/PGetDefaultDialogBase.ui +++ b/src/musrgui/forms/PGetDefaultDialogBase.ui @@ -15,9 +15,15 @@ RUN + + image0 + true + + true + fRunFileName_textLabel @@ -287,6 +293,11 @@ + + + 89504e470d0a1a0a0000000d4948445200000016000000160806000000c4b46c3b000000d549444154388db594510e84200c44a78653d1f34faf853fd66d2a2aa8fb1222697068cb80d0884cadda7c6e46392c1860c9010da2bd8d4629f1670140a3200869d536ad8a2d63cfc805bc7c338ac766b33eb4c279dadb5be1b72c5ab5c5d2f3028fcda6bff042f40dd2f3f119355477c7708fdd15a3eef8ecf0f2868f847bb733332c1c9d43a344f15e9bca51e25a3cde52493736d3e2d85cb27ff36861d0081ad18b15607b783a785cabb67d4da7bf5e890070f34eb5c245cee2c4cfebc533ca593e211ee2652bdef0bfd7ed4bb1e8f5a947688615932a98c849f587290000000049454e44ae426082 + + buttonOk diff --git a/src/musrgui/forms/PGetFourierDialogBase.ui b/src/musrgui/forms/PGetFourierDialogBase.ui index 44079352..521d23b8 100644 --- a/src/musrgui/forms/PGetFourierDialogBase.ui +++ b/src/musrgui/forms/PGetFourierDialogBase.ui @@ -15,6 +15,9 @@ Get Fourier + + image0 + true @@ -199,78 +202,6 @@ - - - fCancel_button - - - - 11 - 251 - 75 - 26 - - - - &Cancel - - - - - - true - - - - - Horizontal Spacing2 - - - Horizontal - - - Expanding - - - - 122 - 20 - - - - - 92 - 254 - 122 - 20 - - - - - - fOk_button - - - - 220 - 251 - 49 - 26 - - - - &OK - - - - - - true - - - true - - @@ -406,7 +337,84 @@ plot range end + + + fCancel_button + + + + 200 + 250 + 75 + 26 + + + + &Cancel + + + + + + true + + + + + fOk_button + + + + 140 + 250 + 49 + 26 + + + + &OK + + + + + + true + + + true + + + + + Horizontal Spacing2 + + + Horizontal + + + Expanding + + + + 122 + 20 + + + + + 10 + 250 + 122 + 20 + + + + + + 89504e470d0a1a0a0000000d4948445200000016000000160806000000c4b46c3b000000d549444154388db594510e84200c44a78653d1f34faf853fd66d2a2aa8fb1222697068cb80d0884cadda7c6e46392c1860c9010da2bd8d4629f1670140a3200869d536ad8a2d63cfc805bc7c338ac766b33eb4c279dadb5be1b72c5ab5c5d2f3028fcda6bff042f40dd2f3f119355477c7708fdd15a3eef8ecf0f2868f847bb733332c1c9d43a344f15e9bca51e25a3cde52493736d3e2d85cb27ff36861d0081ad18b15607b783a785cabb67d4da7bf5e890070f34eb5c245cee2c4cfebc533ca593e211ee2652bdef0bfd7ed4bb1e8f5a947688615932a98c849f587290000000049454e44ae426082 + + fOk_button diff --git a/src/musrgui/forms/PGetParameterDialogBase.ui b/src/musrgui/forms/PGetParameterDialogBase.ui index 11d47a49..305ddbd0 100644 --- a/src/musrgui/forms/PGetParameterDialogBase.ui +++ b/src/musrgui/forms/PGetParameterDialogBase.ui @@ -15,9 +15,15 @@ Get Parameter + + image0 + true + + true + fName_lineEdit @@ -239,97 +245,6 @@ 1 - - - fCancel_pushButton - - - - 11 - 391 - 75 - 26 - - - - &Cancel - - - - - - true - - - - - Horizontal Spacing2 - - - Horizontal - - - Expanding - - - - 440 - 20 - - - - - 92 - 394 - 440 - 20 - - - - - - fAdd_pushButton - - - - 538 - 391 - 56 - 26 - - - - &Add - - - Alt+A - - - - - fOk_PushButton - - - - 600 - 391 - 49 - 26 - - - - &OK - - - - - - true - - - true - - fParam_textEdit @@ -356,7 +271,103 @@ FITPARAMETER WidgetWidth + + + fAdd_pushButton + + + + 10 + 390 + 56 + 26 + + + + &Add + + + Alt+A + + + + + Horizontal Spacing2 + + + Horizontal + + + Expanding + + + + 410 + 20 + + + + + 80 + 390 + 410 + 20 + + + + + + fOk_PushButton + + + + 600 + 390 + 49 + 26 + + + + &OK + + + + + + true + + + true + + + + + fCancel_pushButton + + + + 520 + 390 + 75 + 26 + + + + &Cancel + + + + + + true + + + + + 89504e470d0a1a0a0000000d4948445200000016000000160806000000c4b46c3b000000d549444154388db594510e84200c44a78653d1f34faf853fd66d2a2aa8fb1222697068cb80d0884cadda7c6e46392c1860c9010da2bd8d4629f1670140a3200869d536ad8a2d63cfc805bc7c338ac766b33eb4c279dadb5be1b72c5ab5c5d2f3028fcda6bff042f40dd2f3f119355477c7708fdd15a3eef8ecf0f2868f847bb733332c1c9d43a344f15e9bca51e25a3cde52493736d3e2d85cb27ff36861d0081ad18b15607b783a785cabb67d4da7bf5e890070f34eb5c245cee2c4cfebc533ca593e211ee2652bdef0bfd7ed4bb1e8f5a947688615932a98c849f587290000000049454e44ae426082 + + fOk_PushButton diff --git a/src/musrgui/forms/PGetPlotDialogBase.ui b/src/musrgui/forms/PGetPlotDialogBase.ui index d1abd0e0..ac301b3a 100644 --- a/src/musrgui/forms/PGetPlotDialogBase.ui +++ b/src/musrgui/forms/PGetPlotDialogBase.ui @@ -15,9 +15,15 @@ Get Plot + + image0 + true + + true + fYRange_textLabel @@ -128,97 +134,6 @@ - - - fCancel_button - - - - 11 - 271 - 75 - 26 - - - - &Cancel - - - - - - true - - - - - Horizontal Spacing2 - - - Horizontal - - - Expanding - - - - 290 - 20 - - - - - 92 - 274 - 290 - 20 - - - - - - fAdd_pushButton - - - - 388 - 271 - 56 - 26 - - - - &Add - - - Alt+A - - - - - fOk_button - - - - 450 - 271 - 49 - 26 - - - - &OK - - - - - - true - - - true - - fRunList_lineEdit @@ -299,7 +214,103 @@ end value + + + fCancel_button + + + + 370 + 270 + 75 + 26 + + + + &Cancel + + + + + + true + + + + + fOk_button + + + + 450 + 270 + 49 + 26 + + + + &OK + + + + + + true + + + true + + + + + Horizontal Spacing2 + + + Horizontal + + + Expanding + + + + 290 + 20 + + + + + 72 + 274 + 290 + 20 + + + + + + fAdd_pushButton + + + + 10 + 270 + 56 + 26 + + + + &Add + + + Alt+A + + + + + 89504e470d0a1a0a0000000d4948445200000016000000160806000000c4b46c3b000000d549444154388db594510e84200c44a78653d1f34faf853fd66d2a2aa8fb1222697068cb80d0884cadda7c6e46392c1860c9010da2bd8d4629f1670140a3200869d536ad8a2d63cfc805bc7c338ac766b33eb4c279dadb5be1b72c5ab5c5d2f3028fcda6bff042f40dd2f3f119355477c7708fdd15a3eef8ecf0f2868f847bb733332c1c9d43a344f15e9bca51e25a3cde52493736d3e2d85cb27ff36861d0081ad18b15607b783a785cabb67d4da7bf5e890070f34eb5c245cee2c4cfebc533ca593e211ee2652bdef0bfd7ed4bb1e8f5a947688615932a98c849f587290000000049454e44ae426082 + + fOk_button diff --git a/src/musrgui/forms/PGetSingleHistoRunBlockDialogBase.ui b/src/musrgui/forms/PGetSingleHistoRunBlockDialogBase.ui index c698c150..44b3f70b 100644 --- a/src/musrgui/forms/PGetSingleHistoRunBlockDialogBase.ui +++ b/src/musrgui/forms/PGetSingleHistoRunBlockDialogBase.ui @@ -15,6 +15,9 @@ Get Single Histo Run Block Parameters + + image0 + true @@ -786,6 +789,11 @@ + + + 89504e470d0a1a0a0000000d4948445200000016000000160806000000c4b46c3b000000d549444154388db594510e84200c44a78653d1f34faf853fd66d2a2aa8fb1222697068cb80d0884cadda7c6e46392c1860c9010da2bd8d4629f1670140a3200869d536ad8a2d63cfc805bc7c338ac766b33eb4c279dadb5be1b72c5ab5c5d2f3028fcda6bff042f40dd2f3f119355477c7708fdd15a3eef8ecf0f2868f847bb733332c1c9d43a344f15e9bca51e25a3cde52493736d3e2d85cb27ff36861d0081ad18b15607b783a785cabb67d4da7bf5e890070f34eb5c245cee2c4cfebc533ca593e211ee2652bdef0bfd7ed4bb1e8f5a947688615932a98c849f587290000000049454e44ae426082 + + fOk_button diff --git a/src/musrgui/forms/PGetTitleDialog.ui b/src/musrgui/forms/PGetTitleDialog.ui index 22270c57..8387e4ac 100644 --- a/src/musrgui/forms/PGetTitleDialog.ui +++ b/src/musrgui/forms/PGetTitleDialog.ui @@ -15,6 +15,9 @@ Get Title + + image0 + true @@ -137,6 +140,11 @@ + + + 89504e470d0a1a0a0000000d4948445200000016000000160806000000c4b46c3b000000d549444154388db594510e84200c44a78653d1f34faf853fd66d2a2aa8fb1222697068cb80d0884cadda7c6e46392c1860c9010da2bd8d4629f1670140a3200869d536ad8a2d63cfc805bc7c338ac766b33eb4c279dadb5be1b72c5ab5c5d2f3028fcda6bff042f40dd2f3f119355477c7708fdd15a3eef8ecf0f2868f847bb733332c1c9d43a344f15e9bca51e25a3cde52493736d3e2d85cb27ff36861d0081ad18b15607b783a785cabb67d4da7bf5e890070f34eb5c245cee2c4cfebc533ca593e211ee2652bdef0bfd7ed4bb1e8f5a947688615932a98c849f587290000000049454e44ae426082 + + buttonOk diff --git a/src/musrgui/forms/PMusrGuiAbout.ui b/src/musrgui/forms/PMusrGuiAbout.ui index d3510835..b42bdf98 100644 --- a/src/musrgui/forms/PMusrGuiAbout.ui +++ b/src/musrgui/forms/PMusrGuiAbout.ui @@ -18,6 +18,9 @@ image0 + + true + fOk_pushButton @@ -88,7 +91,7 @@ Switzerland</p> - 89504e470d0a1a0a0000000d4948445200000016000000160806000000c4b46c3b0000016649444154388dad54c18dc4200c1ca33cd3409ea1801440ea870228c079d2007fee9138326cd865578784d0d8891986c1c491810c6006524e58e605eb660bae7144a6363f824dcaa90a5a551438e3abb345f2edf73d4c1c19292738b71702c09149332600e507e6468ae22a90723a8b5cc5648775b36584a960b3cc8b3ef9bdf31199524e554e3393623d6c9e7eae8ed76c3aac3180e28327e7f67204a627cdd6cd9efa77f28f1afbe069991784e0a9c7e41e5f684c4f3eeee175b365d41d2f3eee61b1e0a83bcca7dbbd3ffee00ee7f6a2b119d54c8fddede531ff1f1a5b678b5cfc536f9934c34f2bd4732f0048bdd81799aef83d3932f4dacea22607064746158b0c1f3c0c70361e1f3cb17ac629a73b0e0092afc49eebde428af104e0d50de863747c7c44267fb9e3084c13705e8490108695b60deeadd2255767cb24c5f4ed0b4339498bbbbe57c354c754bde11deefabe2dfc8dc6ef98874bc62330910f7ed8c7dfac7f004a406a2bc502fb0000000049454e44ae426082 + 89504e470d0a1a0a0000000d4948445200000016000000160806000000c4b46c3b0000016a49444154388dad54318ec4200c1ca33c206de8d2e609e4fdf0045a3aa7e5075c9138322cec66578784d0d8891986c1c491810c6006524e58e715cb660bae7144a636ff049b945315b4aa2870c617678be4dbef47983832524e706e2f04802393664c00ca0fcc8d14c55520e57416b98ac90ecb66cb13a682cd3aaffae4f7ce47644a395539cd4c8a8db0e9fd5c1dafd9f4b1c6008a0f9e9cdbcb11987a9a2d9b3df51fe4bb1afbe0699d5784e069c4e41e5f684c3d1f8ff0b2d9f2d41d2f3e1e61b1e05377984fb77b7ffcc11dceed4563f354333d76b7976efe3f34b6ce16b9f85e6f9934c34f2bd4732f0048bdd81799aef83d3932f4dacea22607064746158b0c1f3c0c70361e1f3cb17ac629a73b0e0092afc49eebde428af104e0d50d18630c7c7c44267fb9e3084c13705e8490108695b60d1eadd2251767cb24c5f4ed0b4339498b87be57c354c754bde11d1efabe2dfc8dc6ef98874bc6233019dfe96ae28e117ec75cbae41fee1e436e55a431750000000049454e44ae426082 diff --git a/src/musrgui/forms/PPrefsDialogBase.ui b/src/musrgui/forms/PPrefsDialogBase.ui index 94404ede..67bb5eb9 100644 --- a/src/musrgui/forms/PPrefsDialogBase.ui +++ b/src/musrgui/forms/PPrefsDialogBase.ui @@ -9,15 +9,21 @@ 0 0 541 - 186 + 206 Preferences + + image0 + true + + true + fTabWidget @@ -27,7 +33,7 @@ 10 20 520 - 110 + 130 @@ -94,6 +100,22 @@ will generate a ROOT dump file after the fit with the data and the theory + + + fOpenMlogAfterFit_checkBox + + + + 10 + 70 + 140 + 22 + + + + open mlog after fit + + @@ -103,7 +125,7 @@ 10 - 140 + 160 520 33 @@ -183,6 +205,11 @@ + + + 89504e470d0a1a0a0000000d4948445200000016000000160806000000c4b46c3b000000d549444154388db594510e84200c44a78653d1f34faf853fd66d2a2aa8fb1222697068cb80d0884cadda7c6e46392c1860c9010da2bd8d4629f1670140a3200869d536ad8a2d63cfc805bc7c338ac766b33eb4c279dadb5be1b72c5ab5c5d2f3028fcda6bff042f40dd2f3f119355477c7708fdd15a3eef8ecf0f2868f847bb733332c1c9d43a344f15e9bca51e25a3cde52493736d3e2d85cb27ff36861d0081ad18b15607b783a785cabb67d4da7bf5e890070f34eb5c245cee2c4cfebc533ca593e211ee2652bdef0bfd7ed4bb1e8f5a947688615932a98c849f587290000000049454e44ae426082 + + buttonOk diff --git a/src/musrgui/musrgui_startup.xml b/src/musrgui/musrgui_startup.xml index c0aa8aff..94589f2b 100644 --- a/src/musrgui/musrgui_startup.xml +++ b/src/musrgui/musrgui_startup.xml @@ -9,6 +9,7 @@ /mnt/home/nemu/analysis /home/nemu/analysis/musrfit/src/musrgui y + y mue4