diff --git a/src/musrgui/PGetAsymmetryRunBlockDialog.cpp b/src/musrgui/PGetAsymmetryRunBlockDialog.cpp index 311280e7..a26255a3 100644 --- a/src/musrgui/PGetAsymmetryRunBlockDialog.cpp +++ b/src/musrgui/PGetAsymmetryRunBlockDialog.cpp @@ -31,6 +31,7 @@ #include #include +#include #include "PGetAsymmetryRunBlockDialog.h" @@ -61,6 +62,192 @@ PGetAsymmetryRunBlockDialog::PGetAsymmetryRunBlockDialog() fT0Backward_lineEdit->setValidator( new QIntValidator(fT0Backward_lineEdit) ); } +//---------------------------------------------------------------------------------------------------- +/** + *

+ */ +QString PGetAsymmetryRunBlockDialog::GetRunHeaderInfo() +{ + QString str; + + str = "RUN " + fRunFileName_lineEdit->text() + " "; + str += fBeamline_lineEdit->text().upper() + " "; + str += fInstitute_comboBox->currentText() + " "; + str += fFileFormat_comboBox->currentText() + " (name beamline institute data-file-format)\n"; + + return str; +} + +//---------------------------------------------------------------------------------------------------- +/** + *

+ */ +QString PGetAsymmetryRunBlockDialog::GetAlphaParameter(bool &present) +{ + QString str = "alpha " + fAlpha_lineEdit->text() + "\n"; + + if (str.isEmpty()) + present = false; + else + present = true; + + return str; +} + +//---------------------------------------------------------------------------------------------------- +/** + *

+ */ +QString PGetAsymmetryRunBlockDialog::GetBetaParameter(bool &present) +{ + QString str = "beta " + fBeta_lineEdit->text() + "\n"; + + if (str.isEmpty()) + present = false; + else + present = true; + + return str; +} + +//---------------------------------------------------------------------------------------------------- +/** + *

+ */ +QString PGetAsymmetryRunBlockDialog::GetMap(bool &valid) +{ + QString str = fMap_lineEdit->text().stripWhiteSpace().remove(" "); + + // check if potentially proper map line + for (unsigned int i=0; itext() + "\n"; + + return str; +} + +//---------------------------------------------------------------------------------------------------- +/** + *

+ */ +QString PGetAsymmetryRunBlockDialog::GetBackground(bool &valid) +{ + QString str = ""; + + valid = true; + + // check that either backgr.fix or background is given, but not both + if (fBackgroundForwardStart_lineEdit->text().isEmpty() && fBackgroundForwardEnd_lineEdit->text().isEmpty() && + fBackgroundBackwardStart_lineEdit->text().isEmpty() && fBackgroundBackwardEnd_lineEdit->text().isEmpty() && + fBackgroundForwardFix_lineEdit->text().isEmpty() && fBackgroundBackwardFix_lineEdit->text().isEmpty()) { + valid = false; + str = "background 0 10 0 10\n"; + } else { + if (!fBackgroundForwardStart_lineEdit->text().isEmpty()) { // assume the rest is given, not fool prove but ... + str = "background "; + str += fBackgroundForwardStart_lineEdit->text() + " "; + str += fBackgroundForwardEnd_lineEdit->text() + " "; + str += fBackgroundBackwardStart_lineEdit->text() + " "; + str += fBackgroundBackwardEnd_lineEdit->text() + "\n"; + } + if (!fBackgroundForwardFix_lineEdit->text().isEmpty()) { // assume the rest is given, not fool prove but ... + str = "backgr.fix "; + str += fBackgroundForwardFix_lineEdit->text() + " "; + str += fBackgroundBackwardFix_lineEdit->text() + "\n"; + } + } + + return str; +} + +//---------------------------------------------------------------------------------------------------- +/** + *

+ */ +QString PGetAsymmetryRunBlockDialog::GetData(bool &valid) +{ + QString str = ""; + + if (fDataForwardStart_lineEdit->text().isEmpty() || fDataForwardEnd_lineEdit->text().isEmpty() || + fDataBackwardStart_lineEdit->text().isEmpty() || fDataBackwardEnd_lineEdit->text().isEmpty()) { + valid = false; + } else { + str = "data "; + str += fDataForwardStart_lineEdit->text() + " "; + str += fDataForwardEnd_lineEdit->text() + " "; + str += fDataBackwardStart_lineEdit->text() + " "; + str += fDataBackwardEnd_lineEdit->text() + "\n"; + valid = true; + } + + return str; +} + +//---------------------------------------------------------------------------------------------------- +/** + *

+ */ +QString PGetAsymmetryRunBlockDialog::GetT0(bool &present) +{ + QString str = ""; + + if (!fT0Forward_lineEdit->text().isEmpty() && !fT0Forward_lineEdit->text().isEmpty()) { + str = "t0 "; + str += fT0Forward_lineEdit->text() + " "; + str += fT0Backward_lineEdit->text() + "\n"; + present = true; + } else { + present = false; + } + + return str; +} + +//---------------------------------------------------------------------------------------------------- +/** + *

+ */ +QString PGetAsymmetryRunBlockDialog::GetFitRange(bool &valid) +{ + QString str = ""; + + if (fFitRangeStart_lineEdit->text().isEmpty() || fFitRangeEnd_lineEdit->text().isEmpty()) { + str += "fit 0.0 10.0\n"; + valid = false; + } else { + str += "fit "; + str += fFitRangeStart_lineEdit->text() + " "; + str += fFitRangeEnd_lineEdit->text() + "\n"; + valid = true; + } + + return str; +} + +//---------------------------------------------------------------------------------------------------- +/** + *

+ */ +QString PGetAsymmetryRunBlockDialog::GetPacking(bool &present) +{ + QString str = ""; + + if (fPacking_lineEdit->text().isEmpty()) { + present = false; + str += "packing 1\n"; + } else { + present = true; + str += "packing " + fPacking_lineEdit->text() + "\n\n"; + } + + return str; +} + //---------------------------------------------------------------------------------------------------- // END //---------------------------------------------------------------------------------------------------- diff --git a/src/musrgui/PGetAsymmetryRunBlockDialog.h b/src/musrgui/PGetAsymmetryRunBlockDialog.h index 4a0316ed..88a80c22 100644 --- a/src/musrgui/PGetAsymmetryRunBlockDialog.h +++ b/src/musrgui/PGetAsymmetryRunBlockDialog.h @@ -38,6 +38,18 @@ class PGetAsymmetryRunBlockDialog : public PGetAsymmetryRunBlockDialogBase { public: PGetAsymmetryRunBlockDialog(); + + QString GetRunHeaderInfo(); + QString GetAlphaParameter(bool &present); + QString GetBetaParameter(bool &present); + QString GetMap(bool &valid); + QString GetForward() { return QString("forward " + fForward_lineEdit->text() + "\n"); } + QString GetBackward() { return QString("backward " + fBackward_lineEdit->text() + "\n"); } + QString GetBackground(bool &valid); + QString GetData(bool &valid); + QString GetT0(bool &present); + QString GetFitRange(bool &valid); + QString GetPacking(bool &present); }; #endif // _PGETASYMMETRYRUNBLOCKDIALOG_H_ diff --git a/src/musrgui/PGetSingleHistoRunBlockDialog.cpp b/src/musrgui/PGetSingleHistoRunBlockDialog.cpp new file mode 100644 index 00000000..98c2f5e8 --- /dev/null +++ b/src/musrgui/PGetSingleHistoRunBlockDialog.cpp @@ -0,0 +1,169 @@ +/**************************************************************************** + + PGetSingleHistoRunBlockDialog.cpp + + Author: Andreas Suter + e-mail: andreas.suter@psi.ch + + $Id$ + +*****************************************************************************/ + +/*************************************************************************** + * Copyright (C) 2009 by Andreas Suter * + * andreas.suter@psi.ch * + * * + * This program is free software; you can redistribute it and/or modify * + * it under the terms of the GNU General Public License as published by * + * the Free Software Foundation; either version 2 of the License, or * + * (at your option) any later version. * + * * + * This program is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * + * GNU General Public License for more details. * + * * + * You should have received a copy of the GNU General Public License * + * along with this program; if not, write to the * + * Free Software Foundation, Inc., * + * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * + ***************************************************************************/ + +#include +#include +#include +#include + +#include "PGetSingleHistoRunBlockDialog.h" + +//---------------------------------------------------------------------------------------------------- +/** + *

+ */ +PGetSingleHistoRunBlockDialog::PGetSingleHistoRunBlockDialog() +{ + fForward_lineEdit->setValidator( new QIntValidator(fForward_lineEdit) ); + fNorm_lineEdit->setValidator( new QIntValidator(fNorm_lineEdit) ); +/* + fDataForwardStart_lineEdit->setValidator( new QIntValidator(fDataForwardStart_lineEdit) ); + fDataForwardEnd_lineEdit->setValidator( new QIntValidator(fDataForwardEnd_lineEdit) ); + fDataBackwardStart_lineEdit->setValidator( new QIntValidator(fDataBackwardStart_lineEdit) ); + fDataBackwardEnd_lineEdit->setValidator( new QIntValidator(fDataBackwardEnd_lineEdit) ); + fBackgroundForwardStart_lineEdit->setValidator( new QIntValidator(fBackgroundForwardStart_lineEdit) ); + fBackgroundForwardEnd_lineEdit->setValidator( new QIntValidator(fBackgroundForwardEnd_lineEdit) ); + fBackgroundBackwardStart_lineEdit->setValidator( new QIntValidator(fBackgroundBackwardStart_lineEdit) ); + fBackgroundBackwardEnd_lineEdit->setValidator( new QIntValidator(fBackgroundBackwardEnd_lineEdit) ); + fBackgroundForwardFix_lineEdit->setValidator( new QDoubleValidator(fBackgroundForwardFix_lineEdit) ); + fBackgroundBackwardFix_lineEdit->setValidator( new QDoubleValidator(fBackgroundBackwardFix_lineEdit) ); + fFitRangeStart_lineEdit->setValidator( new QDoubleValidator(fFitRangeStart_lineEdit) ); + fFitRangeEnd_lineEdit->setValidator( new QDoubleValidator(fFitRangeEnd_lineEdit) ); + fPacking_lineEdit->setValidator( new QIntValidator(fPacking_lineEdit) ); + fAlpha_lineEdit->setValidator( new QIntValidator(fAlpha_lineEdit) ); + fBeta_lineEdit->setValidator( new QIntValidator(fBeta_lineEdit) ); + fT0Forward_lineEdit->setValidator( new QIntValidator(fT0Forward_lineEdit) ); + fT0Backward_lineEdit->setValidator( new QIntValidator(fT0Backward_lineEdit) ); +*/ +} + +//---------------------------------------------------------------------------------------------------- +/** + *

+ */ +QString PGetSingleHistoRunBlockDialog::GetRunHeaderInfo() +{ + QString str=""; + + return str; +} + +//---------------------------------------------------------------------------------------------------- +/** + *

+ */ +QString PGetSingleHistoRunBlockDialog::GetMap(bool &valid) +{ + QString str=""; + + return str; +} + +//---------------------------------------------------------------------------------------------------- +/** + *

+ */ +QString PGetSingleHistoRunBlockDialog::GetData(bool &valid) +{ + QString str=""; + + return str; +} + +//---------------------------------------------------------------------------------------------------- +/** + *

+ */ +QString PGetSingleHistoRunBlockDialog::GetBackground(bool &valid) +{ + QString str=""; + + return str; +} + +//---------------------------------------------------------------------------------------------------- +/** + *

+ */ +QString PGetSingleHistoRunBlockDialog::GetFitRange(bool &valid) +{ + QString str=""; + + return str; +} + +//---------------------------------------------------------------------------------------------------- +/** + *

+ */ +QString PGetSingleHistoRunBlockDialog::GetPacking(bool &present) +{ + QString str=""; + + return str; +} + +//---------------------------------------------------------------------------------------------------- +/** + *

+ */ +QString PGetSingleHistoRunBlockDialog::GetT0(bool &present) +{ + QString str=""; + + return str; +} + +//---------------------------------------------------------------------------------------------------- +/** + *

+ */ +QString PGetSingleHistoRunBlockDialog::GetMuonLifetimeParam(bool &present) +{ + QString str=""; + + return str; +} + +//---------------------------------------------------------------------------------------------------- +/** + *

+ */ +QString PGetSingleHistoRunBlockDialog::GetLifetimeCorrection(bool &present) +{ + QString str=""; + + return str; +} + +//---------------------------------------------------------------------------------------------------- +// END +//---------------------------------------------------------------------------------------------------- diff --git a/src/musrgui/PGetSingleHistoRunBlockDialog.h b/src/musrgui/PGetSingleHistoRunBlockDialog.h new file mode 100644 index 00000000..0772ad46 --- /dev/null +++ b/src/musrgui/PGetSingleHistoRunBlockDialog.h @@ -0,0 +1,58 @@ +/**************************************************************************** + + PGetSingleHistoRunBlockDialog.h + + Author: Andreas Suter + e-mail: andreas.suter@psi.ch + + $Id$ + +*****************************************************************************/ + +/*************************************************************************** + * Copyright (C) 2009 by Andreas Suter * + * andreas.suter@psi.ch * + * * + * This program is free software; you can redistribute it and/or modify * + * it under the terms of the GNU General Public License as published by * + * the Free Software Foundation; either version 2 of the License, or * + * (at your option) any later version. * + * * + * This program is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * + * GNU General Public License for more details. * + * * + * You should have received a copy of the GNU General Public License * + * along with this program; if not, write to the * + * Free Software Foundation, Inc., * + * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * + ***************************************************************************/ + +#ifndef _PGETSINGLEHISTORUNBLOCKDIALOG_H_ +#define _PGETSINGLEHISTORUNBLOCKDIALOG_H_ + +#include +#include + +#include "forms/PGetSingleHistoRunBlockDialogBase.h" + +class PGetSingleHistoRunBlockDialog : public PGetSingleHistoRunBlockDialogBase +{ + public: + PGetSingleHistoRunBlockDialog(); + + QString GetRunHeaderInfo(); + QString GetMap(bool &valid); + QString GetForward() { return QString("forward " + fForward_lineEdit->text() + "\n"); } + QString GetNorm() { return QString("norm " + fNorm_lineEdit->text() + "\n"); } + QString GetData(bool &valid); + QString GetBackground(bool &valid); + QString GetFitRange(bool &valid); + QString GetPacking(bool &present); + QString GetT0(bool &present); + QString GetMuonLifetimeParam(bool &present); + QString GetLifetimeCorrection(bool &present); +}; + +#endif // _PGETSINGLEHISTORUNBLOCKDIALOG_H_ diff --git a/src/musrgui/PSubTextEdit.cpp b/src/musrgui/PSubTextEdit.cpp index 752b2947..50e95175 100644 --- a/src/musrgui/PSubTextEdit.cpp +++ b/src/musrgui/PSubTextEdit.cpp @@ -161,103 +161,90 @@ void PSubTextEdit::insertAsymRunBlock() PGetAsymmetryRunBlockDialog *dlg = new PGetAsymmetryRunBlockDialog(); if (dlg->exec() == QDialog::Accepted) { QString str, workStr; + bool valid = true, present = true; // check if there is already a run block present, necessary because of the '####' line // STILL MISSING // add run line - str += "RUN " + dlg->fRunFileName_lineEdit->text() + " "; - str += dlg->fBeamline_lineEdit->text().upper() + " "; - str += dlg->fInstitute_comboBox->currentText() + " "; - str += dlg->fFileFormat_comboBox->currentText() + " (name beamline institute data-file-format)\n"; + str += dlg->GetRunHeaderInfo(); // add fittype str += "fittype 2 (asymmetry fit)\n"; // add alpha if present - workStr = dlg->fAlpha_lineEdit->text(); - if (!workStr.isEmpty()) { - str += "alpha " + workStr + "\n"; + workStr = dlg->GetAlphaParameter(present); + if (present) { + str += workStr; } - // add beta if present - workStr = dlg->fBeta_lineEdit->text(); - if (!workStr.isEmpty()) { - str += "beta " + workStr + "\n"; + // add alpha if present + workStr = dlg->GetBetaParameter(present); + if (present) { + str += workStr; } // add map - str += "map " + dlg->fMap_lineEdit->text() + "\n"; + workStr = dlg->GetMap(valid); + if (valid) { + str += workStr; + } else { + QMessageBox::critical(this, "**ERROR**", + "Given map not valid, will add a default map line", + QMessageBox::Ok, QMessageBox::NoButton); + str += "map 0 0 0 0 0 0 0 0 0 0\n"; + } // add forward - str += "forward " + dlg->fForward_lineEdit->text() + "\n"; + str += dlg->GetForward(); // add backward - str += "backward " + dlg->fBackward_lineEdit->text() + "\n"; + str += dlg->GetBackward(); - // check that either background or background.fix is given - if (dlg->fBackgroundForwardStart_lineEdit->text().isEmpty() && dlg->fBackgroundForwardEnd_lineEdit->text().isEmpty() && - dlg->fBackgroundBackwardStart_lineEdit->text().isEmpty() && dlg->fBackgroundBackwardEnd_lineEdit->text().isEmpty() && - dlg->fBackgroundForwardFix_lineEdit->text().isEmpty() && dlg->fBackgroundBackwardFix_lineEdit->text().isEmpty()) { + // add background or backgr.fix + workStr = dlg->GetBackground(valid); + str += workStr; + if (!valid) { QMessageBox::critical(this, "**ERROR**", "Either Background or Background.Fix is needed!\nWill set Background to 0..10, please correct!", QMessageBox::Ok, QMessageBox::NoButton); - str += "background 0 10 0 10\n"; - } else { - if (!dlg->fBackgroundForwardStart_lineEdit->text().isEmpty()) { // assume the rest is given, not fool prove but ... - str += "background "; - str += dlg->fBackgroundForwardStart_lineEdit->text() + " "; - str += dlg->fBackgroundForwardEnd_lineEdit->text() + " "; - str += dlg->fBackgroundBackwardStart_lineEdit->text() + " "; - str += dlg->fBackgroundBackwardEnd_lineEdit->text() + "\n"; - } - if (!dlg->fBackgroundForwardFix_lineEdit->text().isEmpty()) { // assume the rest is given, not fool prove but ... - str += "backgr.fix "; - str += dlg->fBackgroundForwardFix_lineEdit->text() + " "; - str += dlg->fBackgroundBackwardFix_lineEdit->text() + "\n"; - } } // add data - if (dlg->fDataForwardStart_lineEdit->text().isEmpty() || dlg->fDataForwardEnd_lineEdit->text().isEmpty() || - dlg->fDataBackwardStart_lineEdit->text().isEmpty() || dlg->fDataBackwardEnd_lineEdit->text().isEmpty()) { + workStr = dlg->GetData(valid); + if (valid) { + str += workStr; + } else { QMessageBox::critical(this, "**ERROR**", "Not all Data entries are present.Fix is needed!\nWill not set anything!", QMessageBox::Ok, QMessageBox::NoButton); - } else { - str += "data "; - str += dlg->fDataForwardStart_lineEdit->text() + " "; - str += dlg->fDataForwardEnd_lineEdit->text() + " "; - str += dlg->fDataBackwardStart_lineEdit->text() + " "; - str += dlg->fDataBackwardEnd_lineEdit->text() + "\n"; } // add t0 if present - if (!dlg->fT0Forward_lineEdit->text().isEmpty() && !dlg->fT0Forward_lineEdit->text().isEmpty()) { - str += "t0 "; - str += dlg->fT0Forward_lineEdit->text() + " "; - str += dlg->fT0Backward_lineEdit->text() + "\n"; + workStr = dlg->GetT0(present); + if (present) { + str += workStr; + } else { + QMessageBox::warning(this, "**ERROR**", + "T0's not given, assume that they are present in the data file!", + QMessageBox::Ok, QMessageBox::NoButton); } // add fit range - if (dlg->fFitRangeStart_lineEdit->text().isEmpty() || dlg->fFitRangeEnd_lineEdit->text().isEmpty()) { + workStr = dlg->GetFitRange(valid); + str += workStr; + if (!valid) { QMessageBox::critical(this, "**ERROR**", "No valid fit range is given.Fix is needed!\nWill add a default one!", QMessageBox::Ok, QMessageBox::NoButton); - str += "fit 0.0 10.0\n"; - } else { - str += "fit "; - str += dlg->fFitRangeStart_lineEdit->text() + " "; - str += dlg->fFitRangeEnd_lineEdit->text() + "\n"; } // add packing - if (dlg->fPacking_lineEdit->text().isEmpty()) { + workStr = dlg->GetPacking(present); + str += workStr; + if (!present) { QMessageBox::critical(this, "**ERROR**", "No valid packing/binning is given.Fix is needed!\nWill add a default one!", QMessageBox::Ok, QMessageBox::NoButton); - str += "packing 1\n"; - } else { - str += "packing " + dlg->fPacking_lineEdit->text() + "\n\n"; } // insert Asymmetry Run Block at the current cursor position diff --git a/src/musrgui/forms/PGetSingleHistoRunBlockDialogBase.ui b/src/musrgui/forms/PGetSingleHistoRunBlockDialogBase.ui index 44b3f70b..8af3a79f 100644 --- a/src/musrgui/forms/PGetSingleHistoRunBlockDialogBase.ui +++ b/src/musrgui/forms/PGetSingleHistoRunBlockDialogBase.ui @@ -9,7 +9,7 @@ 0 0 442 - 595 + 593 @@ -222,22 +222,6 @@ - - - fOr_textLabel_2 - - - - 230 - 303 - 30 - 21 - - - - <b>OR</b> - - fRequiredEntries_groupBox @@ -247,7 +231,7 @@ 10 135 420 - 290 + 292 @@ -269,6 +253,115 @@ Map + + + fMap_lineEdit + + + + 70 + 20 + 340 + 24 + + + + 0 0 0 0 0 0 0 0 0 0 + + + + + fNorm_textLabel + + + + 10 + 83 + 71 + 20 + + + + Norm + + + + + fForward_textLabel + + + + 10 + 53 + 113 + 20 + + + + Forward Histo No + + + + + fForward_lineEdit + + + + 140 + 50 + 70 + 24 + + + + + + fNorm_lineEdit + + + + 140 + 80 + 70 + 24 + + + + Param No for the N0 + + + + + fBackgroundStart_lineEdit + + + + 140 + 200 + 70 + 24 + + + + histo start bkg bin + + + + + fFitRangeEnd_lineEdit + + + + 220 + 230 + 70 + 24 + + + + end in (us) + + fBackgroundFix_lineEdit @@ -303,34 +396,34 @@ - fBackgroundFix_textLabel + fBackground_textLabel 10 - 140 - 110 - 21 + 203 + 123 + 20 - Background Fix + Background Range - + - fDataEnd_lineEdit + fBackgroundFit_textLabel - 220 - 110 - 70 - 24 + 10 + 173 + 110 + 20 - - histo end bin + + Background Fit @@ -349,85 +442,31 @@ histo start bin - - - fHistoNo_textLabel - - - - 10 - 83 - 113 - 20 - - - - Histo No - - - fHistoNo_lineEdit + fPacking_lineEdit 140 - 80 + 260 70 24 - - - - fMap_lineEdit - - - - 70 - 20 - 340 - 24 - - - - 0 0 0 0 0 0 0 0 0 0 - - - - - fNorm_textLabel - - - - 10 - 53 - 71 - 20 - - - - Norm - - - - - fNorm_lineEdit + fBackgroundFit_lineEdit 140 - 50 + 170 70 24 - - Param No for the N0 - @@ -461,6 +500,22 @@ Packing/Binning + + + fOr_textLabel + + + + 220 + 140 + 30 + 21 + + + + <b>OR</b> + + fFitRange_textLabel @@ -477,52 +532,20 @@ Fit Range - + - fFitRangeEnd_lineEdit + fOr_textLabel_2 220 - 230 - 70 - 24 - - - - end in (us) - - - - - fBackground_textLabel - - - - 10 - 203 - 123 - 20 + 170 + 30 + 21 - Background Range - - - - - fBackgroundStart_lineEdit - - - - 140 - 200 - 70 - 24 - - - - histo start bkg bin + <b>OR</b> @@ -541,63 +564,37 @@ start in (us) - - - fPacking_lineEdit - - - - 140 - 260 - 70 - 24 - - - - fOr_textLabel - - - - 220 - 140 - 30 - 21 - - - - <b>OR</b> - - - - - fBackgroundFit_textLabel + fBackgroundFix_textLabel 10 - 173 + 140 110 - 20 + 21 - Background Fit + Background Fix - fBackgroundFit_lineEdit + fDataEnd_lineEdit - 140 - 170 + 220 + 110 70 24 + + histo end bin + @@ -607,7 +604,7 @@ 10 - 430 + 433 420 110 @@ -791,7 +788,7 @@ - 89504e470d0a1a0a0000000d4948445200000016000000160806000000c4b46c3b000000d549444154388db594510e84200c44a78653d1f34faf853fd66d2a2aa8fb1222697068cb80d0884cadda7c6e46392c1860c9010da2bd8d4629f1670140a3200869d536ad8a2d63cfc805bc7c338ac766b33eb4c279dadb5be1b72c5ab5c5d2f3028fcda6bff042f40dd2f3f119355477c7708fdd15a3eef8ecf0f2868f847bb733332c1c9d43a344f15e9bca51e25a3cde52493736d3e2d85cb27ff36861d0081ad18b15607b783a785cabb67d4da7bf5e890070f34eb5c245cee2c4cfebc533ca593e211ee2652bdef0bfd7ed4bb1e8f5a947688615932a98c849f587290000000049454e44ae426082 + 89504e470d0a1a0a0000000d4948445200000016000000160806000000c4b46c3b0000016249444154388d95544dae86200c9c1a169e471217707e5890d4f3b830e95b687d15e51349889982fd19a6252e0c6c001cb06e2b4637629abde0584b61aacf7bf0b06eebc5e88d5360b74fc18b9ed7f75bd82908210a01e0c204e33c8628029c99e8fd373ca853009023c3a530290d1a619abdf464aa7818dd682b3f232f8569ddd6cb594fa6578eab9f2f0f5105ede57888214ace692f3d33d591951602be719c72a2d18dc839512b93737de0989e74dcc2d3eca557d7371db7b0364daf3a865eceded41142949b8e7b38b32b86288fe7371d77bcb66d1ace4ceadcce9669f6a2f79dcdf0edbb1426752200c874ec8da6c37e6e2e0cfbadb798cd99c18571b11546ca090ed807cf85db23b2da6388a27ab7034a39d54a08403afc383c7514dab8a5e3a530a5431d4b667200e0c37f16e968efa70adede40a7e414bc3875663b4833d44a6adc548f59832dd3ce865fb8a9fbdaf1178e7f656ea724a59cba75fce5fb0774073f42f0dd40cc0000000049454e44ae426082 @@ -814,8 +811,8 @@ fInstitute_comboBox fFileFormat_comboBox fMap_lineEdit + fForward_lineEdit fNorm_lineEdit - fHistoNo_lineEdit fDataStart_lineEdit fDataEnd_lineEdit fBackgroundFix_lineEdit diff --git a/src/musrgui/musrgui.pro b/src/musrgui/musrgui.pro index c37ed290..0728ef39 100644 --- a/src/musrgui/musrgui.pro +++ b/src/musrgui/musrgui.pro @@ -21,6 +21,7 @@ HEADERS = PTextEdit.h \ PGetDefaultDialog.h \ PGetParameterDialog.h \ PGetAsymmetryRunBlockDialog.h \ + PGetSingleHistoRunBlockDialog.h \ PGetFourierDialog.h \ PMlog2DbDialog.h \ PGetPlotDialog.h @@ -33,6 +34,7 @@ SOURCES = PTextEdit.cpp \ PGetDefaultDialog.cpp \ PGetParameterDialog.cpp \ PGetAsymmetryRunBlockDialog.cpp \ + PGetSingleHistoRunBlockDialog.cpp \ PGetFourierDialog.cpp \ PGetPlotDialog.cpp \ PMlog2DbDialog.cpp \ @@ -44,6 +46,7 @@ FORMS = forms/PGetDefaultDialogBase.ui \ forms/PGetTitleDialog.ui \ forms/PGetParameterDialogBase.ui \ forms/PGetAsymmetryRunBlockDialogBase.ui \ + forms/PGetSingleHistoRunBlockDialogBase.ui \ forms/PGetFourierDialogBase.ui \ forms/PGetPlotDialogBase.ui \ forms/PMlog2DbDialogBase.ui