From 6fe55641057153e1a8f4da2e377150acd8a8cbd3 Mon Sep 17 00:00:00 2001
From: Aleks Kissinger <aleks0@gmail.com>
Date: Sun, 6 Jan 2019 18:02:17 +0100
Subject: fixed looseness/bend bug

---
 src/data/edge.cpp             | 4 +---
 src/data/graphelementdata.cpp | 3 ++-
 src/gui/latexprocess.cpp      | 1 +
 tex/sample/sample.tikzstyles  | 2 +-
 4 files changed, 5 insertions(+), 5 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)
diff --git a/src/gui/latexprocess.cpp b/src/gui/latexprocess.cpp
index 8d720d5..426ea4a 100644
--- a/src/gui/latexprocess.cpp
+++ b/src/gui/latexprocess.cpp
@@ -107,6 +107,7 @@ void LatexProcess::makePreview(QString tikz)
     QTextStream tex(&f);
     tex << "\\documentclass{article}\n";
     tex << "\\usepackage{tikzit}\n";
+    tex << "\\tikzstyle{every picure}=[dotpic]\n";
     tex << "\\usepackage[graphics,active,tightpage]{preview}\n";
     tex << "\\PreviewEnvironment{tikzpicture}\n";
 
diff --git a/tex/sample/sample.tikzstyles b/tex/sample/sample.tikzstyles
index 20a2bbc..f32728c 100644
--- a/tex/sample/sample.tikzstyles
+++ b/tex/sample/sample.tikzstyles
@@ -6,7 +6,7 @@
 % Node styles
 \tikzstyle{red node}=[fill=red, tikzit category=nodes, shape=circle, draw=black]
 \tikzstyle{blue node}=[fill=blue, shape=circle, draw=black, tikzit category=nodes]
-\tikzstyle{blue node 2}=[tikzit fill=green, fill=blue, shape=circle, draw=black, tikzit category=nodes]
+\tikzstyle{green node}=[tikzit fill=green, fill=green, shape=circle, draw=black, tikzit category=nodes]
 \tikzstyle{yellow square}=[draw=black, fill=yellow, shape=rectangle]
 
 % Edge styles
-- 
cgit v1.2.3