From 3a112cd391fbad4c9a2a07ccf1993de1c72b576c Mon Sep 17 00:00:00 2001 From: Andreas Suter Date: Mon, 6 Feb 2017 09:19:19 +0100 Subject: [PATCH] only show N0 estimate dialog in chisq if fittype fits. --- src/musredit/PSubTextEdit.cpp | 25 +++++++++++++++++++++++++ src/musredit/PSubTextEdit.h | 1 + src/musredit/PTextEdit.cpp | 5 +++-- 3 files changed, 29 insertions(+), 2 deletions(-) diff --git a/src/musredit/PSubTextEdit.cpp b/src/musredit/PSubTextEdit.cpp index 5c47c10e..47cbd57c 100644 --- a/src/musredit/PSubTextEdit.cpp +++ b/src/musredit/PSubTextEdit.cpp @@ -62,6 +62,31 @@ PSubTextEdit::PSubTextEdit(PAdmin *admin, QWidget *parent) : { } +//---------------------------------------------------------------------------------------------------- +/** + * @brief PSubTextEdit::getFitType + * @return + */ +int PSubTextEdit::getFitType() +{ + QString str = toPlainText(); + int idx = str.indexOf("fittype"); + if (idx == -1) + return -1; + + bool ok; + for (int i=idx+7; iStarts the msr-title input dialog window. diff --git a/src/musredit/PSubTextEdit.h b/src/musredit/PSubTextEdit.h index cf8ca495..0c774f50 100644 --- a/src/musredit/PSubTextEdit.h +++ b/src/musredit/PSubTextEdit.h @@ -46,6 +46,7 @@ class PSubTextEdit : public QPlainTextEdit public: PSubTextEdit(PAdmin *admin = 0, QWidget *parent = 0); virtual ~PSubTextEdit() {} + int getFitType(); public slots: void insertTitle(); diff --git a/src/musredit/PTextEdit.cpp b/src/musredit/PTextEdit.cpp index 7d3e8db8..bcebc6a1 100644 --- a/src/musredit/PTextEdit.cpp +++ b/src/musredit/PTextEdit.cpp @@ -1700,7 +1700,8 @@ void PTextEdit::musrCalcChisq() return; int result = 0; - if (fAdmin->getEstimateN0Flag()) + int fittype = currentEditor()->getFitType(); + if (fAdmin->getEstimateN0Flag() && ((fittype==0) || (fittype==4))) result = QMessageBox::question(this, "Estimate N0 active", "Do you wish a chisq/mlh evaluation with an automatic N0 estimate?", QMessageBox::Yes, QMessageBox::No); @@ -1722,7 +1723,7 @@ void PTextEdit::musrCalcChisq() cmd.append(str); cmd.append(QFileInfo(*fFilenames.find( currentEditor())).fileName() ); cmd.append("--chisq-only"); - if (fAdmin->getEstimateN0Flag() && (result == QMessageBox::Yes)) + if (fAdmin->getEstimateN0Flag() && (result == QMessageBox::Yes) && ((fittype==0) || (fittype==4))) cmd.append("--estimateN0"); PFitOutputHandler fitOutputHandler(QFileInfo(*fFilenames.find( currentEditor() )).absolutePath(), cmd); fitOutputHandler.setModal(true);