diff --git a/GUI/coregui/Views/Components/SampleDesigner/DesignerMimeData.cpp b/GUI/coregui/Views/Components/SampleDesigner/DesignerMimeData.cpp
index 446644ecbc89c995aa96d2bc378f9747af570864..59ab38fe1db89ac4ece6f895fcfe3924620dc6b1 100644
--- a/GUI/coregui/Views/Components/SampleDesigner/DesignerMimeData.cpp
+++ b/GUI/coregui/Views/Components/SampleDesigner/DesignerMimeData.cpp
@@ -13,6 +13,11 @@
#include "DesignerHelper.h"
+#if QT_VERSION < 0x050000
+#define QStringLiteral QString
+#endif
+
+
DesignerMimeData::DesignerMimeData(const QString &entryname, const QString &xmldescr, QDrag *drag)
: m_entryname(entryname)
, m_xmldescr(xmldescr)
diff --git a/GUI/coregui/Views/Components/SampleDesigner/MaterialBrowserModel.h b/GUI/coregui/Views/Components/SampleDesigner/MaterialBrowserModel.h
index 00acb6b2e899c95d95bcc5f416f52338802bc26d..46319c7b4ccd0f877c82938d0170fbdaf3c66050 100644
--- a/GUI/coregui/Views/Components/SampleDesigner/MaterialBrowserModel.h
+++ b/GUI/coregui/Views/Components/SampleDesigner/MaterialBrowserModel.h
@@ -4,6 +4,7 @@
#include <QAbstractTableModel>
#include <QMap>
+#include <QVector>
class IMaterial;
diff --git a/GUI/coregui/Views/Components/SampleDesigner/SamplePropertyEditor.cpp b/GUI/coregui/Views/Components/SampleDesigner/SamplePropertyEditor.cpp
index 35443901a0e2a116edf655ef1348ef43677fe0d5..b2772946423990336a035737f3591e3396eb1538 100644
--- a/GUI/coregui/Views/Components/SampleDesigner/SamplePropertyEditor.cpp
+++ b/GUI/coregui/Views/Components/SampleDesigner/SamplePropertyEditor.cpp
@@ -77,11 +77,11 @@ SamplePropertyEditor::SamplePropertyEditor(SampleDesignerInterface *sample_desig
layout->setMargin(0);
layout->addWidget(m_browser);
- //m_readOnlyManager = new QtVariantPropertyManager(this);
- m_readOnlyManager = new VariantManager(this);
+ m_readOnlyManager = new QtVariantPropertyManager(this);
+ //m_readOnlyManager = new VariantManager(this);
- //m_manager = new QtVariantPropertyManager(this);
- m_manager = new VariantManager(this);
+ m_manager = new QtVariantPropertyManager(this);
+ //m_manager = new VariantManager(this);
QtVariantEditorFactory *factory = new QtVariantEditorFactory(this);
diff --git a/GUI/coregui/Views/Components/SampleDesigner/SampleWidgetBox.cpp b/GUI/coregui/Views/Components/SampleDesigner/SampleWidgetBox.cpp
index 734d87d14c1cea8754eb3abdfb10c98f1506b267..9ba54ec455d588d7beb47baaf049495c49efa190 100644
--- a/GUI/coregui/Views/Components/SampleDesigner/SampleWidgetBox.cpp
+++ b/GUI/coregui/Views/Components/SampleDesigner/SampleWidgetBox.cpp
@@ -3,6 +3,10 @@
#include "styledbar.h"
#include <QVBoxLayout>
+#if QT_VERSION < 0x050000
+#define QStringLiteral QString
+#endif
+
SampleWidgetBox::SampleWidgetBox(SampleDesignerInterface *core, QWidget *parent)
: QWidget(parent)
diff --git a/GUI/coregui/Views/Components/SampleDesigner/VariantManager.cpp b/GUI/coregui/Views/Components/SampleDesigner/VariantManager.cpp
index 1334c43cb701ae6e021eb0d0ac8c8f649a407044..d417113d94eeb519ce716fbe7429b6688c2bdea3 100644
--- a/GUI/coregui/Views/Components/SampleDesigner/VariantManager.cpp
+++ b/GUI/coregui/Views/Components/SampleDesigner/VariantManager.cpp
@@ -91,75 +91,75 @@ QVariant VariantManager::value(const QtProperty *property) const
QString VariantManager::valueText(const QtProperty *property) const
{
- if (propertyToData.contains(property)) {
- QVariant v = propertyToData[property].value;
- //QPointF p = v.value<QPointF>();
- complex_t p = v.value<complex_t>();
-// return QString(tr("(%1, %2)").arg(QString::number(p.x()))
-// .arg(QString::number(p.y())));
- return QString(tr("(%1, %2)").arg(QString::number(p.real()))
- .arg(QString::number(p.imag())));
- }
+// if (propertyToData.contains(property)) {
+// QVariant v = propertyToData[property].value;
+// //QPointF p = v.value<QPointF>();
+// complex_t p = v.value<complex_t>();
+//// return QString(tr("(%1, %2)").arg(QString::number(p.x()))
+//// .arg(QString::number(p.y())));
+// return QString(tr("(%1, %2)").arg(QString::number(p.real()))
+// .arg(QString::number(p.imag())));
+// }
return QtVariantPropertyManager::valueText(property);
}
void VariantManager::setValue(QtProperty *property, const QVariant &val)
{
- if (propertyToData.contains(property)) {
-
- if (val.type() != qMetaTypeId<complex_t>() && !val.canConvert(qMetaTypeId<complex_t>()))
- return;
- //QPointF p = val.value<QPointF>();
- complex_t p = val.value<complex_t>();
-
- Data d = propertyToData[property];
- d.value.setValue(p);
- if (d.x)
- d.x->setValue(p.real());
- if (d.y)
- d.y->setValue(p.imag());
- propertyToData[property] = d;
- emit propertyChanged(property);
- emit valueChanged(property, p.real());
- return;
- }
+// if (propertyToData.contains(property)) {
+
+// if (val.type() != qMetaTypeId<complex_t>() && !val.canConvert(qMetaTypeId<complex_t>()))
+// return;
+// //QPointF p = val.value<QPointF>();
+// complex_t p = val.value<complex_t>();
+
+// Data d = propertyToData[property];
+// d.value.setValue(p);
+// if (d.x)
+// d.x->setValue(p.real());
+// if (d.y)
+// d.y->setValue(p.imag());
+// propertyToData[property] = d;
+// emit propertyChanged(property);
+// emit valueChanged(property, p.real());
+// return;
+// }
QtVariantPropertyManager::setValue(property, val);
}
void VariantManager::initializeProperty(QtProperty *property)
{
- if (propertyType(property) == qMetaTypeId<complex_t>()) {
- Data d;
+// if (propertyType(property) == qMetaTypeId<complex_t>()) {
+// Data d;
-// d.value = QPointF(0, 0);
- d.value.setValue(complex_t(1, 0));
+//// d.value = QPointF(0, 0);
+// d.value.setValue(complex_t(1, 0));
- VariantManager *that = (VariantManager *)this;
+// VariantManager *that = (VariantManager *)this;
- d.x = that->addProperty(QVariant::Double);
- d.x->setPropertyName(tr("real"));
- property->addSubProperty(d.x);
- xToProperty[d.x] = property;
+// d.x = that->addProperty(QVariant::Double);
+// d.x->setPropertyName(tr("real"));
+// property->addSubProperty(d.x);
+// xToProperty[d.x] = property;
- d.y = that->addProperty(QVariant::Double);
- d.y->setPropertyName(tr("imag"));
- property->addSubProperty(d.y);
- yToProperty[d.y] = property;
+// d.y = that->addProperty(QVariant::Double);
+// d.y->setPropertyName(tr("imag"));
+// property->addSubProperty(d.y);
+// yToProperty[d.y] = property;
- propertyToData[property] = d;
- }
+// propertyToData[property] = d;
+// }
QtVariantPropertyManager::initializeProperty(property);
}
void VariantManager::uninitializeProperty(QtProperty *property)
{
- if (propertyToData.contains(property)) {
- Data d = propertyToData[property];
- if (d.x)
- xToProperty.remove(d.x);
- if (d.y)
- yToProperty.remove(d.y);
- propertyToData.remove(property);
- }
+// if (propertyToData.contains(property)) {
+// Data d = propertyToData[property];
+// if (d.x)
+// xToProperty.remove(d.x);
+// if (d.y)
+// yToProperty.remove(d.y);
+// propertyToData.remove(property);
+// }
QtVariantPropertyManager::uninitializeProperty(property);
}
diff --git a/shared.pri b/shared.pri
index cfa5c631b8ecfd1b1dc77dfe640b314bd55873ce..c8b9b209f6fd60e780db111a19a65610eb37259f 100644
--- a/shared.pri
+++ b/shared.pri
@@ -35,7 +35,7 @@ LIBS += -lgsl -lgslcblas
# --- checking eigen headers ---
EIGEN_HEADERFILE = Eigen/Core
-EIGEN_HEADER_LOCATIONS = /opt/local/include /usr/local/include /usr/include
+EIGEN_HEADER_LOCATIONS = /opt/local/include /opt/local/include/eigen3 /usr/local/include /usr/include
for(dir, EIGEN_HEADER_LOCATIONS): isEmpty(EIGEN_INCLUDE): exists($${dir}/$${EIGEN_HEADERFILE}): EIGEN_INCLUDE = $${dir}
isEmpty(EIGEN_INCLUDE): message("Can't find" $${EIGEN_HEADERFILE} "in" $${EIGEN_HEADER_LOCATIONS})
INCLUDEPATH *= $${EIGEN_INCLUDE}