diff --git a/GUI/Models/ComponentUtils.cpp b/GUI/Models/ComponentUtils.cpp index 3350c9a9c62875fd0782358e58f5bb6f12d38743..81293ac793af580bee94694ce7bac12a16663fe9 100644 --- a/GUI/Models/ComponentUtils.cpp +++ b/GUI/Models/ComponentUtils.cpp @@ -15,6 +15,7 @@ #include "GUI/Models/ComponentUtils.h" #include "GUI/Models/AxesItems.h" #include "GUI/Models/MaterialDataItems.h" +#include "GUI/Models/VectorItem.h" namespace { QList<const SessionItem*> groupItems(const SessionItem& item); @@ -24,7 +25,7 @@ const QStringList& GUI::Model::ComponentUtils::propertyRelatedTypes() { static const QStringList result = {"Property", "GroupProperty", - "Vector", + VectorItem::M_TYPE, BasicAxisItem::M_TYPE, AmplitudeAxisItem::M_TYPE, MaterialRefractiveDataItem::M_TYPE}; diff --git a/GUI/Models/FilterPropertyProxy.cpp b/GUI/Models/FilterPropertyProxy.cpp index 4da875680a7d2d26a04ce9b1e0760736510ebca9..4abc490842bcd47b1579613b9371987854f31c1a 100644 --- a/GUI/Models/FilterPropertyProxy.cpp +++ b/GUI/Models/FilterPropertyProxy.cpp @@ -14,6 +14,7 @@ #include "GUI/Models/FilterPropertyProxy.h" #include "GUI/Models/SessionModel.h" +#include "GUI/Models/VectorItem.h" int FilterPropertyProxy::columnCount(const QModelIndex& parent) const { @@ -36,7 +37,7 @@ bool FilterPropertyProxy::filterAcceptsRow(int sourceRow, const QModelIndex& sou if (!sourceParent.isValid()) return true; const QString modelType = index.data(SessionFlags::ModelTypeRole).toString(); - if (modelType == "Property" || modelType == "GroupProperty" || modelType == "Vector") + if (modelType == "Property" || modelType == "GroupProperty" || modelType == VectorItem::M_TYPE) return false; return true; //! sourceModel()->data(index, Qt::DisplayRole).isValid(); diff --git a/GUI/Models/ItemCatalog.cpp b/GUI/Models/ItemCatalog.cpp index 7fc9e9efca568e034aa88ebae7d81e69347dcd79..8bc37d7fb0cae1c62d3251266bda429a3beddf7f 100644 --- a/GUI/Models/ItemCatalog.cpp +++ b/GUI/Models/ItemCatalog.cpp @@ -91,7 +91,7 @@ ItemCatalog::ItemCatalog() addItem<FootprintNoneItem>(); addItem<FootprintGaussianItem>(); addItem<FootprintSquareItem>(); - add("Vector", create_new<VectorItem>); + addItem<VectorItem>(); add("Property", create_new<PropertyItem>); add("AnisoPyramid", create_new<AnisoPyramidItem>); diff --git a/GUI/Models/VectorItem.cpp b/GUI/Models/VectorItem.cpp index d8e604cd7804dad5972975ebbd626854d7a4251a..69c32cb9cfdc6e6e6c3ce534e289507cf88841de 100644 --- a/GUI/Models/VectorItem.cpp +++ b/GUI/Models/VectorItem.cpp @@ -18,7 +18,9 @@ const QString VectorItem::P_X = "X"; const QString VectorItem::P_Y = "Y"; const QString VectorItem::P_Z = "Z"; -VectorItem::VectorItem() : SessionItem("Vector") +const QString VectorItem::M_TYPE = "Vector"; + +VectorItem::VectorItem() : SessionItem(M_TYPE) { addProperty(P_X, 0.0)->setLimits(RealLimits::limitless()).setToolTip("x-coordinate"); addProperty(P_Y, 0.0)->setLimits(RealLimits::limitless()).setToolTip("y-coordinate"); diff --git a/GUI/Models/VectorItem.h b/GUI/Models/VectorItem.h index f5fd475e7e4ce9a0aadedf52a5492c9eb3e90033..e4419fabb496505801bde10c62b07cba44dadd3f 100644 --- a/GUI/Models/VectorItem.h +++ b/GUI/Models/VectorItem.h @@ -24,6 +24,9 @@ public: static const QString P_X; static const QString P_Y; static const QString P_Z; + + static const QString M_TYPE; + VectorItem(); double x() const;