summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAleks Kissinger <aleks0@gmail.com>2019-01-06 18:02:17 +0100
committerAleks Kissinger <aleks0@gmail.com>2019-01-06 18:02:17 +0100
commit6fe55641057153e1a8f4da2e377150acd8a8cbd3 (patch)
tree4dd3c6e77ca8699e5ee6f108124ed986842b1f06
parentad519c0f0dfab503d41a59d7129fb9a6c9682860 (diff)
fixed looseness/bend bug
-rw-r--r--src/data/edge.cpp4
-rw-r--r--src/data/graphelementdata.cpp3
-rw-r--r--src/gui/latexprocess.cpp1
-rw-r--r--tex/sample/sample.tikzstyles2
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