alarsyo/spot
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

dot: add an option to output id= attributes

Browse source 
This will be handy latter to develop widgets with interactive
highlighting of automata.

* spot/twaalgos/dot.cc: Implement it.
* bin/common_aoutput.cc, NEWS, doc/org/oaut.org,
doc/org/spot.css: Document it.
* tests/core/alternating.test, tests/core/readsave.test,
tests/core/sccdot.test: Test it.
This commit is contained in:
Alexandre Duret-Lutz 2021-09-02 22:43:22 +02:00
parent d5bbeceeb2
commit 4855d3c877
8 changed files with 230 additions and 112 deletions
Download patch file Download diff file Expand all files Collapse all files

48
spot/twaalgos/dot.cc
View file

@ -1,5 +1,5 @@
// -*- coding: utf-8 -*-
// Copyright (C) 2011, 2012, 2014-2020 Laboratoire de Recherche
// Copyright (C) 2011, 2012, 2014-2021 Laboratoire de Recherche
// et Développement de l'Epita (LRDE).
// Copyright (C) 2003, 2004 Laboratoire d'Informatique de Paris 6 (LIP6),
// département Systèmes Répartis Coopératifs (SRC), Université Pierre
@ -115,6 +115,8 @@ namespace spot
const char* nl_ = "\\n";
const char* label_pre_ = "label=\"";
char label_post_ = '"';
bool opt_id_ = false;
std::string opt_id_graph_;
const_twa_graph_ptr aut_;
std::string opt_font_;
@ -279,6 +281,18 @@ namespace spot
case 'h':
opt_vertical_ = false;
break;
case 'i':
if (*options == '(')
{
auto* end = strchr(++options, ')');
if (!end)
throw std::runtime_error
("unclosed \"i(...\" for print_dot()");
opt_id_graph_ = std::string(options, end - options);
options = end + 1;
}
opt_id_ = true;
break;
case 'k':
opt_state_labels_ = true;
break;
@ -516,8 +530,19 @@ namespace spot
os_ << 'T' << d << 'T' << dest;
else
os_ << d;
if (style && *style)
os_ << " [" << style << ']';
if ((style && *style) || opt_id_)
{
os_ << " [";
const char* sep = "";
if (style && *style)
{
os_ << style;
sep = ",";
}
if (opt_id_)
os_ << sep << "id=\"E" << dest << 'E' << d << '\"';
os_ << ']';
}
os_ << '\n';
}
univ = 2;
@ -628,6 +653,12 @@ namespace spot
<< "\"\n node [fontname=\"" << opt_font_
<< "\"]\n edge [fontname=\"" << opt_font_
<< "\"]\n";
if (opt_id_)
{
if (!opt_id_graph_.empty())
escape_str(os_ << " id=\"", opt_id_graph_) << "\"\n";
os_ << " node [id=\"S\\N\"]\n";
}
// Always copy the environment variable into a static string,
// so that we (1) look it up once, but (2) won't crash if the
// environment is changed.
@ -805,8 +836,15 @@ namespace spot
os_ << '#' << aut_->get_graph().index_of_edge(t);
os_ << '"';
}
if (opt_id_)
{
unsigned index = aut_->get_graph().index_of_edge(t);
os_ << ", id=\"E" << index << '"';
// Somehow \E must appear as \\E in tooltip in
// graphviz 2.43.0; this looks like a bug.
os_ << ", tooltip=\"\\\\E\\n#" << index << '"';
}
}
std::string highlight;
int color_num = -1;
if (highlight_edges_)
@ -966,6 +1004,8 @@ namespace spot
// May only occur if the call to
// determine_unknown_acceptance() above is removed.
os_ << " color=orange\n";
if (opt_id_)
os_ << " id=\"SCC" << i << "\"\n";
if (name_ || opt_show_acc_)
{