diff --git a/Code/Mantid/Framework/CurveFitting/src/PlotPeakByLogValue.cpp b/Code/Mantid/Framework/CurveFitting/src/PlotPeakByLogValue.cpp index ffc5eb3865c30c483201418267574e59d946edbf..fed3dc03a8baedab197ff75b6a01ec72f58e6012 100644 --- a/Code/Mantid/Framework/CurveFitting/src/PlotPeakByLogValue.cpp +++ b/Code/Mantid/Framework/CurveFitting/src/PlotPeakByLogValue.cpp @@ -179,8 +179,8 @@ namespace Mantid // Fit the function API::IAlgorithm_sptr fit = createSubAlgorithm("Fit"); fit->initialize(); - //fit->setProperty("InputWorkspace",data.ws); - fit->setPropertyValue("InputWorkspace",data.ws->getName()); + fit->setProperty("InputWorkspace",data.ws); + //fit->setPropertyValue("InputWorkspace",data.ws->getName()); fit->setProperty("WorkspaceIndex",j); fit->setPropertyValue("Function",fun); fit->setPropertyValue("StartX",getPropertyValue("StartX")); @@ -292,7 +292,7 @@ namespace Mantid std::string propName = "OUTPUTWORKSPACE_" + boost::lexical_cast<std::string>(data.period); if (load->existsProperty(propName)) { - DataObjects::Workspace2D_sptr rws1 = load->getProperty(propName); + Workspace_sptr rws1 = load->getProperty(propName); out.ws = boost::dynamic_pointer_cast<DataObjects::Workspace2D>(rws1); } } diff --git a/Code/Mantid/MantidPlot/src/Mantid/SequentialFitDialog.cpp b/Code/Mantid/MantidPlot/src/Mantid/SequentialFitDialog.cpp index 841ace457445750b2fd0791c411e748af0bdecbb..2774714af12328afbb3256a97d7f25bfab10813a 100644 --- a/Code/Mantid/MantidPlot/src/Mantid/SequentialFitDialog.cpp +++ b/Code/Mantid/MantidPlot/src/Mantid/SequentialFitDialog.cpp @@ -349,10 +349,18 @@ void SequentialFitDialog::showPlot() QStringList colNames; colNames << t->name() + "_" + parName << t->name() + "_" + parName + "_Err"; MultiLayer* ml = m_fitBrowser->m_appWindow->multilayerPlot(t,colNames,ui.cbCurveType->currentIndex()); + // set plot titles Graph* g = ml->activeGraph(); if (g) { - g->setXAxisTitle(ui.cbLogValue->currentText()); + if (ui.ckbLogPlot->isChecked()) + { + g->setXAxisTitle(ui.cbLogValue->currentText()); + } + else + { + g->setXAxisTitle("Spectra"); + } g->setYAxisTitle(parName); g->setTitle(""); }