From 28f97b1a1f6ad92724c5787f9bbf225b9ed9b8c5 Mon Sep 17 00:00:00 2001
From: Gennady Pospelov <g.pospelov@fz-juelich.de>
Date: Mon, 27 Nov 2017 13:13:30 +0100
Subject: [PATCH] ScientificDoubleProperty removed from real time tuning tree
and SessionModel.
---
GUI/coregui/Models/ParameterTreeItems.cpp | 10 +---------
GUI/coregui/Models/ParameterTreeUtils.cpp | 10 ----------
GUI/coregui/Models/SessionXML.cpp | 17 -----------------
3 files changed, 1 insertion(+), 36 deletions(-)
diff --git a/GUI/coregui/Models/ParameterTreeItems.cpp b/GUI/coregui/Models/ParameterTreeItems.cpp
index b5ead6b0f17..165a8185637 100644
--- a/GUI/coregui/Models/ParameterTreeItems.cpp
+++ b/GUI/coregui/Models/ParameterTreeItems.cpp
@@ -53,16 +53,8 @@ void ParameterItem::propagateValueToLink(double newValue)
{
setValue(newValue);
- if (SessionItem *item = linkedItem()) {
- if(item->value().typeName() == Constants::ScientificDoublePropertyType) {
- ScientificDoubleProperty intensity = item->value().value<ScientificDoubleProperty>();
- intensity.setValue(newValue);
- item->setValue(intensity.getVariant());
-
- } else {
+ if (SessionItem *item = linkedItem())
item->setValue(newValue);
- }
- }
}
//! Returns corresponding linked item in MultiLayerItem/IsntrumentItem
diff --git a/GUI/coregui/Models/ParameterTreeUtils.cpp b/GUI/coregui/Models/ParameterTreeUtils.cpp
index 7ca29686ffe..80f9038f011 100644
--- a/GUI/coregui/Models/ParameterTreeUtils.cpp
+++ b/GUI/coregui/Models/ParameterTreeUtils.cpp
@@ -22,7 +22,6 @@
#include "MultiLayerItem.h"
#include "ParameterTreeItems.h"
#include "SampleModel.h"
-#include "ScientificDoubleProperty.h"
#include "GUIHelpers.h"
#include "FitParameterHelper.h"
#include "SampleModel.h"
@@ -238,11 +237,6 @@ void handleItem(SessionItem* tree, const SessionItem* source)
tree->setDisplayName(source->itemName());
double sourceValue = source->value().toDouble();
- if (source->value().typeName() == Constants::ScientificDoublePropertyType) {
- ScientificDoubleProperty intensity = source->value().value<ScientificDoubleProperty>();
- sourceValue = intensity.getValue();
- }
-
tree->setValue(QVariant(sourceValue));
QString path = ModelPath::getPathFromIndex(source->index());
int firstSlash = path.indexOf('/');
@@ -263,10 +257,6 @@ void handleItem(SessionItem* tree, const SessionItem* source)
SessionItem* branch
= tree->model()->insertNewItem(Constants::ParameterType, tree->index());
handleItem(branch, child);
- } else if (child->value().typeName() == Constants::ScientificDoublePropertyType) {
- SessionItem* branch
- = tree->model()->insertNewItem(Constants::ParameterType, tree->index());
- handleItem(branch, child);
}
} else if (child->modelType() == Constants::GroupItemType) {
diff --git a/GUI/coregui/Models/SessionXML.cpp b/GUI/coregui/Models/SessionXML.cpp
index 717d444f0a3..90a771628e6 100644
--- a/GUI/coregui/Models/SessionXML.cpp
+++ b/GUI/coregui/Models/SessionXML.cpp
@@ -20,7 +20,6 @@
#include "GroupItem.h"
#include "ItemFactory.h"
#include "MaterialProperty.h"
-#include "ScientificDoubleProperty.h"
#include "SessionModel.h"
#include "WarningMessageService.h"
#include <QtCore/QXmlStreamWriter>
@@ -118,12 +117,6 @@ void SessionWriter::writeVariant(QXmlStreamWriter *writer, QVariant variant, int
}
- else if (type_name == Constants::ScientificDoublePropertyType) {
- writer->writeAttribute(SessionXML::ParameterValueAttribute,
- variant.value<ScientificDoubleProperty>().getText());
-
- }
-
else if (type_name == Constants::GroupPropertyType) {
QString ff_name = variant.value<GroupProperty_t>()->currentType();
writer->writeAttribute(SessionXML::ParameterValueAttribute, ff_name);
@@ -304,16 +297,6 @@ QString SessionReader::readProperty(QXmlStreamReader *reader,
variant = combo_property.getVariant();
}
- else if (parameter_type == Constants::ScientificDoublePropertyType) {
- double parameter_value
- = reader->attributes().value(SessionXML::ParameterValueAttribute).toDouble();
-
- ScientificDoubleProperty scdouble_property(parameter_value);
- QVariant v;
- v.setValue(scdouble_property);
- variant = v;
- }
-
else if (parameter_type == Constants::GroupPropertyType) {
QString parameter_value
= reader->attributes().value(SessionXML::ParameterValueAttribute).toString();
--
GitLab