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

fixed stupid copy/paste error when switching to smart pointers in PMusrWiz.

Browse Source
This commit is contained in:
suter_a 2023-10-31 18:08:31 +01:00
parent 7a1f60d00f
commit 5b093208eb
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/musredit_qt5/musrWiz/PMusrWiz.cpp
View File

@ -464,19 +464,19 @@ PIntroPage::PIntroPage(PAdmin *admin, PMsrData *data, QWidget *parent) :
fMsrFileName->setToolTip("enter msr-file name or leave it empty."); fMsrFileName->setToolTip("enter msr-file name or leave it empty.");
fMsrFileName->setWhatsThis("If empty the file name will be generate,\nbased on the run number, the fit type\nand the type of measurement."); fMsrFileName->setWhatsThis("If empty the file name will be generate,\nbased on the run number, the fit type\nand the type of measurement.");
fYear = std::unique_ptr<QLineEdit>(); fYear = std::make_unique<QLineEdit>();
fYear->setValidator(new QIntValidator()); fYear->setValidator(new QIntValidator());
QDate date = QDate::currentDate(); QDate date = QDate::currentDate();
fYear->setText(QString("%1").arg(date.year())); fYear->setText(QString("%1").arg(date.year()));
fYear->setToolTip("year when the run took place."); fYear->setToolTip("year when the run took place.");
fYear->setWhatsThis("The year is used to generate\nthe RUN header information where\nmusrfit will look for the data."); fYear->setWhatsThis("The year is used to generate\nthe RUN header information where\nmusrfit will look for the data.");
fRunNumber = std::unique_ptr<QLineEdit>(); fRunNumber = std::make_unique<QLineEdit>();
fRunNumber->setValidator(new QIntValidator()); fRunNumber->setValidator(new QIntValidator());
fRunNumber->setText(QString("%1").arg(fMsrData->getRunNumber())); fRunNumber->setText(QString("%1").arg(fMsrData->getRunNumber()));
fRunNumber->setToolTip("enter the run number here."); fRunNumber->setToolTip("enter the run number here.");
fInstitute = std::unique_ptr<QComboBox>(); fInstitute = std::make_unique<QComboBox>();
QStringList list = fAdmin->getInstituteList(); // get list form the instrument_def's QStringList list = fAdmin->getInstituteList(); // get list form the instrument_def's
list.prepend("UnDef"); list.prepend("UnDef");
fInstitute->addItems(list); fInstitute->addItems(list);
@ -484,7 +484,7 @@ PIntroPage::PIntroPage(PAdmin *admin, PMsrData *data, QWidget *parent) :
if (idx != -1) if (idx != -1)
fInstitute->setCurrentIndex(idx); fInstitute->setCurrentIndex(idx);
fInstrument = std::unique_ptr<QComboBox>(); fInstrument = std::make_unique<QComboBox>();
list.clear(); list.clear();
list << fAdmin->getInstrumentList(fMsrData->getInstitute()); list << fAdmin->getInstrumentList(fMsrData->getInstitute());
list.prepend("UnDef"); list.prepend("UnDef");
@ -493,20 +493,20 @@ PIntroPage::PIntroPage(PAdmin *admin, PMsrData *data, QWidget *parent) :
if (idx != -1) if (idx != -1)
fInstrument->setCurrentIndex(idx); fInstrument->setCurrentIndex(idx);
fFitType = std::unique_ptr<QComboBox>(); fFitType = std::make_unique<QComboBox>();
list.clear(); list.clear();
list << "UnDef" << "Single Histo" << "Single Histo RRF" << "Asymmetry" << "Asymmetry RRF" << "Mu Minus" << "None muSR"; list << "UnDef" << "Single Histo" << "Single Histo RRF" << "Asymmetry" << "Asymmetry RRF" << "Mu Minus" << "None muSR";
fFitType->addItems(list); fFitType->addItems(list);
idx = fFitType->findText(fAdmin->getDefaultFitType()); idx = fFitType->findText(fAdmin->getDefaultFitType());
fFitType->setCurrentIndex(idx); fFitType->setCurrentIndex(idx);
fMeasurementType = std::unique_ptr<QComboBox>(); fMeasurementType = std::make_unique<QComboBox>();
list.clear(); list.clear();
list << "UnDef" << "ZF" << "TF" << "LF"; list << "UnDef" << "ZF" << "TF" << "LF";
fMeasurementType->addItems(list); fMeasurementType->addItems(list);
fMeasurementType->setCurrentIndex(fMsrData->getTypeOfMeasurement()); fMeasurementType->setCurrentIndex(fMsrData->getTypeOfMeasurement());
fT0 = std::unique_ptr<QComboBox>(); fT0 = std::make_unique<QComboBox>();
list.clear(); list.clear();
list << "from data file" << "call musrT0" << "enter here"; list << "from data file" << "call musrT0" << "enter here";
fT0->addItems(list); fT0->addItems(list);