Skip to content
Snippets Groups Projects
Commit 645743fa authored by Wuttke, Joachim's avatar Wuttke, Joachim
Browse files

JobModelFunctions.cpp: restore

parent 983124d7
No related branches found
No related tags found
No related merge requests found
......@@ -266,16 +266,17 @@ void createFitContainers(JobItem* jobItem)
{
SessionModel* model = jobItem->model();
SessionItem* result = jobItem->getItem(JobItem::T_FIT_SUITE);
if (result != nullptr)
SessionItem* fitSuiteItem = jobItem->getItem(JobItem::T_FIT_SUITE);
if (fitSuiteItem != nullptr) {
throw GUIHelpers::Error("JobModel::createFitContainers() -> Error. Attempt to create "
"a second FitSuiteItem.");
}
fitSuiteItem = model->insertNewItem("FitSuite", jobItem->index(), -1, JobItem::T_FIT_SUITE);
SessionItem* result =
SessionItem* parsContainerItem =
fitSuiteItem->getItem(FitSuiteItem::T_FIT_PARAMETERS_CONTAINER);
if (result != nullptr) {
if (parsContainerItem != nullptr) {
throw GUIHelpers::Error("JobModel::createFitContainers() -> Error. Attempt to create "
"a second FitParameterContainer.");
}
......@@ -284,8 +285,8 @@ void createFitContainers(JobItem* jobItem)
FitSuiteItem::T_FIT_PARAMETERS_CONTAINER);
// Minimizer settings
SessionItem* result = fitSuiteItem->getItem(FitSuiteItem::T_MINIMIZER);
if (result != nullptr) {
SessionItem* minimizerContainerItem = fitSuiteItem->getItem(FitSuiteItem::T_MINIMIZER);
if (minimizerContainerItem != nullptr) {
throw GUIHelpers::Error("JobModel::createFitContainers() -> Error. Attempt to create "
"a second MinimizerContainer.");
}
......
......@@ -17913,11 +17913,6 @@ ba.ParameterDistribution(\"/Particle/Height\", distr_1, 10, 0.0, ba.RealLimits.l
%feature("docstring") pyfmt::printKvector "std::string pyfmt::printKvector(const kvector_t value)
";
 
%feature("docstring") pyfmt::isDefaultDirection "bool pyfmt::isDefaultDirection(const kvector_t direction)
returns true if it is (0, -1, 0) vector
";
%feature("docstring") pyfmt::indent "std::string pyfmt::indent(size_t width)
 
Returns a string of blanks with given width. By default the width equals standard offset in python files.
......@@ -17926,6 +17921,9 @@ Returns a string of blanks with given width. By default the width equals standar
%feature("docstring") pyfmt::printInt "std::string pyfmt::printInt(int value)
";
 
%feature("docstring") pyfmt::isDefaultDirection "bool pyfmt::isDefaultDirection(const kvector_t direction)
";
 
// File: namespacepyfmt2.xml
%feature("docstring") pyfmt2::representShape2D "std::string pyfmt2::representShape2D(const std::string &indent, const IShape2D *ishape, bool mask_value, std::function< std::string(double)> printValueFunc)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment