[Fawkes Git] branch/sschoenitz/state_timer: grapher.lua: Modifying of dot graph attributes

Sebastian Schoenitz sebastian.schoenitz at ima-zlw-ifu.rwth-aachen.de
Fri Apr 15 14:16:32 CEST 2016


Changes have been pushed for the project "Fawkes Robotics Software Framework".

Gitweb: http://git.fawkesrobotics.org/fawkes.git
Trac:   http://trac.fawkesrobotics.org

The branch, sschoenitz/state_timer has been updated
        to  4ea8f9d557439ca40e6894a6fd9aba5f7808791e (commit)
      from  16ac1f49ba873a306af3e8116648b3dd91da4f42 (commit)

http://git.fawkesrobotics.org/fawkes.git/sschoenitz/state_timer

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- *Log* ---------------------------------------------------------------
commit 4ea8f9d557439ca40e6894a6fd9aba5f7808791e
Author:     Sebastian Schoenitz <sebastian.schoenitz at ima-zlw-ifu.rwth-aachen.de>
AuthorDate: Fri Apr 15 14:04:52 2016 +0200
Commit:     Sebastian Schoenitz <sebastian.schoenitz at ima-zlw-ifu.rwth-aachen.de>
CommitDate: Fri Apr 15 14:04:52 2016 +0200

    grapher.lua: Modifying of dot graph attributes
    
    The graph attributes are modified such that the overall time in a state
    is displayed.

http://git.fawkesrobotics.org/fawkes.git/commit/4ea8f9d
http://trac.fawkesrobotics.org/changeset/4ea8f9d

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -


- *Summary* -----------------------------------------------------------
 src/lua/fawkes/fsm/grapher.lua |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)


- *Diffs* -------------------------------------------------------------

- *commit* 4ea8f9d557439ca40e6894a6fd9aba5f7808791e - - - - - - - - - -
Author:  Sebastian Schoenitz <sebastian.schoenitz at ima-zlw-ifu.rwth-aachen.de>
Date:    Fri Apr 15 14:04:52 2016 +0200
Subject: grapher.lua: Modifying of dot graph attributes

 src/lua/fawkes/fsm/grapher.lua |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)

_Diff for modified files_:
diff --git a/src/lua/fawkes/fsm/grapher.lua b/src/lua/fawkes/fsm/grapher.lua
index c9e6296..55d0349 100644
--- a/src/lua/fawkes/fsm/grapher.lua
+++ b/src/lua/fawkes/fsm/grapher.lua
@@ -134,6 +134,8 @@ local function generate_dotgraph(fsm, g, subgraph_name)
       gmod.setv(defnode, "penwidth", "2.0")
       gmod.setv(defnode, "shape", "rect")
       gmod.setv(defnode, "style", "rounded,filled")
+      --gmod.setv(defnode, "taillabel", "machwas")
+
 
       gmod.setv(defedge, "penwidth", "2.0")
 
@@ -357,6 +359,8 @@ local function generate_dotgraph(fsm, g, subgraph_name)
 		     gmod.setv(e, "style", "dashed")
 		  end
 		  if fsm.tracing then
+                     --print(tr.state.name)
+                     --print(states[tr.state.name].cumulative_time)
 		     local traced, traces = fsm:traced_trans(tr)
 		     if traced then
 			local sorted_indexes = {}
@@ -365,7 +369,8 @@ local function generate_dotgraph(fsm, g, subgraph_name)
 			end
 			table.sort(sorted_indexes)
 			if next(sorted_indexes) then
-			   local s = tostring(sorted_indexes[1])
+			   local s = "Time in state:"..tostring(state.cumulative_time).." msec.\\n".. tostring(sorted_indexes[1])
+                          -- print ("tr.state.name:"..tostring(tr.state.name)..", state.name"..state.name)
 			   for i=2,#sorted_indexes do
 			      s = s .. "," .. tostring(sorted_indexes[i])
 			   end




-- 
Fawkes Robotics Framework                 http://www.fawkesrobotics.org


More information about the fawkes-commits mailing list