fixed looseness/bend bug

2 files changed, 3 insertions, 4 deletions

diff --git a/src/data/edge.cpp b/src/data/edge.cpp
index afb1e57..864d5ed 100644
--- a/src/data/edge.cpp
+++ b/src/data/edge.cpp
@@ -254,8 +254,6 @@ void Edge::updateData()
     _data->unsetProperty("bend right");

     _data->unsetProperty("looseness");

 

-    // TODO: style handling?

-

     if (_basicBendMode) {

         if (_bend != 0) {

             QString bendKey;

@@ -280,7 +278,7 @@ void Edge::updateData()
     }

 

     if (_source == _target) _data->setAtom("loop");

-    if (!isSelfLoop() && !isStraight() && almostEqual(_weight, 0.4))

+    if (!isSelfLoop() && !isStraight() && !almostEqual(_weight, 0.4))

         _data->setProperty("looseness", QString::number(_weight*2.5, 'f', 2));

     if (_source->isBlankNode()) _sourceAnchor = "center";

     else _sourceAnchor = "";

diff --git a/src/data/graphelementdata.cpp b/src/data/graphelementdata.cpp
index f743bc5..cd09a6d 100644
--- a/src/data/graphelementdata.cpp
+++ b/src/data/graphelementdata.cpp
@@ -97,7 +97,8 @@ bool GraphElementData::hasProperty(QString key)
 

 bool GraphElementData::atom(QString atom)

 {

-    return (indexOfKey(atom) != -1);

+    int idx = indexOfKey(atom);

+    return (idx != -1 && _properties[idx].atom());

 }

 

 int GraphElementData::indexOfKey(QString key)