Skip to content
Snippets Groups Projects
Commit 3a064e3f authored by Anders Markvardsen's avatar Anders Markvardsen
Browse files

SANS Getting fitting to work in display. Re #5387

parent 43ac9341
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/SANSPlotSpecial.ui
+ 114
− 109
View file @ 3a064e3f
<ui version="4.0" >
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>SANSPlotSpecial</class>
<widget class="QFrame" name="SANSPlotSpecial" >
<property name="geometry" >
<widget class="QFrame" name="SANSPlotSpecial">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
......@@ -9,107 +10,111 @@
<height>540</height>
</rect>
</property>
<property name="windowTitle" >
<property name="windowTitle">
<string>Display</string>
</property>
<property name="frameShape" >
<property name="frameShape">
<enum>QFrame::StyledPanel</enum>
</property>
<property name="frameShadow" >
<property name="frameShadow">
<enum>QFrame::Raised</enum>
</property>
<layout class="QVBoxLayout" name="verticalLayout" >
<layout class="QVBoxLayout" name="verticalLayout">
<item>
<layout class="QHBoxLayout" name="horizontalLayout" >
<layout class="QHBoxLayout" name="horizontalLayout">
<item>
<widget class="QGroupBox" name="gbPlotOptions" >
<property name="title" >
<widget class="QGroupBox" name="gbPlotOptions">
<property name="title">
<string>Plot Options</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout_2" >
<layout class="QVBoxLayout" name="verticalLayout_2">
<item>
<layout class="QHBoxLayout" name="layoutInput" >
<layout class="QHBoxLayout" name="layoutInput">
<item>
<widget class="QLabel" name="lbInput" >
<property name="text" >
<widget class="QLabel" name="lbInput">
<property name="text">
<string>Workspace</string>
</property>
</widget>
</item>
<item>
<widget class="MantidQt::MantidWidgets::WorkspaceSelector" name="wsInput" />
<widget class="MantidQt::MantidWidgets::WorkspaceSelector" name="wsInput"/>
</item>
</layout>
</item>
<item>
<layout class="QHBoxLayout" name="layoutBackground" >
<layout class="QHBoxLayout" name="layoutBackground">
<item>
<widget class="QLabel" name="lbBackground" >
<property name="text" >
<widget class="QLabel" name="lbBackground">
<property name="text">
<string>Background</string>
</property>
</widget>
</item>
<item>
<widget class="QComboBox" name="cbBackground" >
<widget class="QComboBox" name="cbBackground">
<item>
<property name="text" >
<property name="text">
<string>Value</string>
</property>
</item>
<item>
<property name="text" >
<property name="text">
<string>Workspace</string>
</property>
</item>
</widget>
</item>
<item>
<widget class="QStackedWidget" name="swBackground" >
<property name="sizePolicy" >
<sizepolicy vsizetype="Maximum" hsizetype="Preferred" >
<widget class="QStackedWidget" name="swBackground">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Maximum">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="currentIndex" >
<property name="currentIndex">
<number>0</number>
</property>
<widget class="QWidget" name="page" >
<property name="sizePolicy" >
<sizepolicy vsizetype="Maximum" hsizetype="Preferred" >
<widget class="QWidget" name="page">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Maximum">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<layout class="QVBoxLayout" name="verticalLayout_3" >
<property name="spacing" >
<layout class="QVBoxLayout" name="verticalLayout_3">
<property name="spacing">
<number>0</number>
</property>
<property name="margin" >
<property name="margin">
<number>0</number>
</property>
<item>
<widget class="QDoubleSpinBox" name="dsBackground" />
<widget class="QDoubleSpinBox" name="dsBackground">
<property name="decimals">
<number>3</number>
</property>
</widget>
</item>
</layout>
</widget>
<widget class="QWidget" name="page_2" >
<property name="sizePolicy" >
<sizepolicy vsizetype="Maximum" hsizetype="Preferred" >
<widget class="QWidget" name="page_2">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Maximum">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<layout class="QVBoxLayout" name="verticalLayout_4" >
<property name="spacing" >
<layout class="QVBoxLayout" name="verticalLayout_4">
<property name="spacing">
<number>0</number>
</property>
<property name="margin" >
<property name="margin">
<number>0</number>
</property>
<item>
<widget class="MantidQt::MantidWidgets::WorkspaceSelector" name="wsBackground" />
<widget class="MantidQt::MantidWidgets::WorkspaceSelector" name="wsBackground"/>
</item>
</layout>
</widget>
......@@ -118,18 +123,18 @@
</layout>
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout_3" >
<layout class="QHBoxLayout" name="horizontalLayout_3">
<item>
<widget class="QLabel" name="label_4" >
<property name="text" >
<widget class="QLabel" name="label_4">
<property name="text">
<string>Plot Type</string>
</property>
</widget>
</item>
<item>
<widget class="QComboBox" name="cbPlotType" >
<property name="sizePolicy" >
<sizepolicy vsizetype="Fixed" hsizetype="Expanding" >
<widget class="QComboBox" name="cbPlotType">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
......@@ -139,29 +144,29 @@
</layout>
</item>
<item>
<layout class="QHBoxLayout" name="layoutXAxis" >
<property name="spacing" >
<layout class="QHBoxLayout" name="layoutXAxis">
<property name="spacing">
<number>0</number>
</property>
<item>
<widget class="QLabel" name="label" >
<property name="sizePolicy" >
<sizepolicy vsizetype="Preferred" hsizetype="Maximum" >
<widget class="QLabel" name="label">
<property name="sizePolicy">
<sizepolicy hsizetype="Maximum" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text" >
<property name="text">
<string>X Axis:</string>
</property>
</widget>
</item>
<item>
<spacer name="horizontalSpacer_3" >
<property name="orientation" >
<spacer name="horizontalSpacer_3">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0" >
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
......@@ -172,29 +177,29 @@
</layout>
</item>
<item>
<layout class="QHBoxLayout" name="layoutYAxis" >
<property name="spacing" >
<layout class="QHBoxLayout" name="layoutYAxis">
<property name="spacing">
<number>0</number>
</property>
<item>
<widget class="QLabel" name="label_2" >
<property name="sizePolicy" >
<sizepolicy vsizetype="Preferred" hsizetype="Maximum" >
<widget class="QLabel" name="label_2">
<property name="sizePolicy">
<sizepolicy hsizetype="Maximum" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text" >
<property name="text">
<string>Y Axis:</string>
</property>
</widget>
</item>
<item>
<spacer name="horizontalSpacer_4" >
<property name="orientation" >
<spacer name="horizontalSpacer_4">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0" >
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
......@@ -205,32 +210,32 @@
</layout>
</item>
<item>
<widget class="QLabel" name="lbPlotOptionsError" >
<property name="sizePolicy" >
<sizepolicy vsizetype="Preferred" hsizetype="Maximum" >
<widget class="QLabel" name="lbPlotOptionsError">
<property name="sizePolicy">
<sizepolicy hsizetype="Maximum" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="styleSheet" >
<string notr="true" >color:rgb(255, 0, 0)</string>
<property name="styleSheet">
<string notr="true">color:rgb(255, 0, 0)</string>
</property>
<property name="text" >
<property name="text">
<string/>
</property>
<property name="wordWrap" >
<property name="wordWrap">
<bool>true</bool>
</property>
</widget>
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout_4" >
<layout class="QHBoxLayout" name="horizontalLayout_4">
<item>
<spacer name="horizontalSpacer" >
<property name="orientation" >
<spacer name="horizontalSpacer">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0" >
<property name="sizeHint" stdset="0">
<size>
<width>148</width>
<height>20</height>
......@@ -239,8 +244,8 @@
</spacer>
</item>
<item>
<widget class="QPushButton" name="pbPlot" >
<property name="text" >
<widget class="QPushButton" name="pbPlot">
<property name="text">
<string>Plot</string>
</property>
</widget>
......@@ -251,11 +256,11 @@
</widget>
</item>
<item>
<layout class="QVBoxLayout" name="verticalLayout_5" >
<layout class="QVBoxLayout" name="verticalLayout_5">
<item>
<widget class="QwtPlot" name="plotWindow" >
<property name="sizePolicy" >
<sizepolicy vsizetype="Expanding" hsizetype="Expanding" >
<widget class="QwtPlot" name="plotWindow">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Expanding">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
......@@ -263,13 +268,13 @@
</widget>
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout_5" >
<layout class="QHBoxLayout" name="horizontalLayout_5">
<item>
<spacer name="horizontalSpacer_5" >
<property name="orientation" >
<spacer name="horizontalSpacer_5">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0" >
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
......@@ -278,8 +283,8 @@
</spacer>
</item>
<item>
<widget class="QPushButton" name="pbResetRangeSelectors" >
<property name="text" >
<widget class="QPushButton" name="pbResetRangeSelectors">
<property name="text">
<string>Reset</string>
</property>
</widget>
......@@ -291,85 +296,85 @@
</layout>
</item>
<item>
<widget class="QTableWidget" name="tbDerived" >
<property name="sizePolicy" >
<sizepolicy vsizetype="Maximum" hsizetype="Expanding" >
<widget class="QTableWidget" name="tbDerived">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Maximum">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="rowCount" >
<property name="rowCount">
<number>3</number>
</property>
<property name="columnCount" >
<property name="columnCount">
<number>8</number>
</property>
<row/>
<row/>
<row/>
<column>
<property name="text" >
<property name="text">
<string>Item</string>
</property>
</column>
<column>
<property name="text" >
<property name="text">
<string>Result</string>
</property>
</column>
<column>
<property name="text" >
<property name="text">
<string>G Derived</string>
</property>
</column>
<column>
<property name="text" >
<property name="text">
<string>Result</string>
</property>
</column>
<column>
<property name="text" >
<property name="text">
<string>Unit</string>
</property>
</column>
<column>
<property name="text" >
<property name="text">
<string>I Derived</string>
</property>
</column>
<column>
<property name="text" >
<property name="text">
<string>Result</string>
</property>
</column>
<column>
<property name="text" >
<property name="text">
<string>Unit</string>
</property>
</column>
</widget>
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout_2" >
<layout class="QHBoxLayout" name="horizontalLayout_2">
<item>
<widget class="QPushButton" name="pbHelp" >
<property name="sizePolicy" >
<sizepolicy vsizetype="Fixed" hsizetype="Minimum" >
<widget class="QPushButton" name="pbHelp">
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text" >
<property name="text">
<string>?</string>
</property>
</widget>
</item>
<item>
<spacer name="horizontalSpacer_2" >
<property name="orientation" >
<spacer name="horizontalSpacer_2">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0" >
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
......@@ -378,8 +383,8 @@
</spacer>
</item>
<item>
<widget class="QPushButton" name="pbClearIDerived" >
<property name="text" >
<widget class="QPushButton" name="pbClearIDerived">
<property name="text">
<string>Clear I Derived</string>
</property>
</widget>
......
Code/Mantid/MantidQt/CustomInterfaces/src/SANSPlotSpecial.cpp
+ 5
− 4
View file @ 3a064e3f
......@@ -3,6 +3,7 @@
#include "MantidKernel/PhysicalConstants.h"
#include "MantidAPI/AlgorithmManager.h"
#include "MantidAPI/MatrixWorkspace.h"
#include "MantidAPI/IFunction.h"
#include "MantidQtMantidWidgets/RangeSelector.h"
......@@ -35,9 +36,9 @@ void SANSPlotSpecial::rangeChanged(double low, double high)
Mantid::API::IAlgorithm_sptr fit = Mantid::API::AlgorithmManager::Instance().create("Fit");
fit->initialize();
fit->setPropertyValue("Function", "name=UserFunction, Formula=Intercept+Gradient*x");
fit->setProperty<Mantid::API::MatrixWorkspace_sptr>("InputWorkspace", m_workspaceIQT);
fit->setPropertyValue("Output", "__sans_isis_display_linear");
fit->setPropertyValue("Function", "name=UserFunction, Formula=Intercept+Gradient*x");
fit->setProperty<double>("StartX", low);
fit->setProperty<double>("EndX", high);
fit->execute();
......@@ -52,12 +53,12 @@ void SANSPlotSpecial::rangeChanged(double low, double high)
m_linearCurve->setPen(fitPen);
m_uiForm.plotWindow->replot();
QStringList parValues = QString::fromStdString(fit->getPropertyValue("Parameters")).split(",", QString::SkipEmptyParts);
Mantid::API::IFunction_sptr func = fit->getProperty("Function");
double chisqrd = fit->getProperty("OutputChi2overDoF");
m_derivatives["Intercept"]->setText(parValues[0]);
m_derivatives["Gradient"]->setText(parValues[1]);
m_derivatives["Intercept"]->setText(QString::number(func->getParameter("Intercept")));
m_derivatives["Gradient"]->setText(QString::number(func->getParameter("Gradient")));
m_derivatives["Chi Squared"]->setText(QString::number(chisqrd));
calculateDerivatives();
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment