From b1cffdb16ca56905a2115aae715ef772f653992c Mon Sep 17 00:00:00 2001 From: Aleks Kissinger Date: Fri, 12 Oct 2018 17:57:51 +0200 Subject: fixed many glitches in style editor --- src/data/graphelementdata.cpp | 5 +++++ src/data/graphelementdata.h | 1 + src/data/graphelementproperty.h | 1 - src/data/style.cpp | 17 +++++++++++++++++ src/data/style.h | 1 + 5 files changed, 24 insertions(+), 1 deletion(-) (limited to 'src/data') diff --git a/src/data/graphelementdata.cpp b/src/data/graphelementdata.cpp index b478842..810ebd6 100644 --- a/src/data/graphelementdata.cpp +++ b/src/data/graphelementdata.cpp @@ -96,6 +96,11 @@ QString GraphElementData::property(QString key) } } +bool GraphElementData::hasProperty(QString key) +{ + return (indexOfKey(key) != -1); +} + bool GraphElementData::atom(QString atom) { return (indexOfKey(atom) != -1); diff --git a/src/data/graphelementdata.h b/src/data/graphelementdata.h index f48f228..23f0466 100644 --- a/src/data/graphelementdata.h +++ b/src/data/graphelementdata.h @@ -41,6 +41,7 @@ public: void setAtom(QString atom); void unsetAtom(QString atom); QString property(QString key); + bool hasProperty(QString key); bool atom(QString atom); int indexOfKey(QString key); bool removeRows(int row, int count, const QModelIndex &parent) override; diff --git a/src/data/graphelementproperty.h b/src/data/graphelementproperty.h index e9f82d0..4ebe104 100644 --- a/src/data/graphelementproperty.h +++ b/src/data/graphelementproperty.h @@ -53,7 +53,6 @@ private: QString _key; QString _value; bool _atom; - bool _keyMatch; }; #endif // GRAPHELEMENTPROPERTY_H diff --git a/src/data/style.cpp b/src/data/style.cpp index 7af95ca..d0f011d 100644 --- a/src/data/style.cpp +++ b/src/data/style.cpp @@ -106,6 +106,23 @@ QString Style::tikz() const return "\\tikzstyle{" + _name + "}=" + _data->tikz(); } +void Style::setArrowAtom(QString atom) +{ + _data->unsetAtom("-"); + _data->unsetAtom("->"); + _data->unsetAtom("-|"); + + _data->unsetAtom("<-"); + _data->unsetAtom("<->"); + _data->unsetAtom("<-|"); + + _data->unsetAtom("|-"); + _data->unsetAtom("|->"); + _data->unsetAtom("|-|"); + + _data->setAtom(atom); +} + void Style::setName(const QString &name) { _name = name; diff --git a/src/data/style.h b/src/data/style.h index 476af77..78e11dc 100644 --- a/src/data/style.h +++ b/src/data/style.h @@ -57,6 +57,7 @@ public: void setName(const QString &name); QString propertyWithDefault(QString prop, QString def, bool tikzitOverride=true) const; QString tikz() const; + void setArrowAtom(QString atom); // only relevant for node styles QColor fillColor(bool tikzitOverride=true) const; -- cgit v1.2.3