add option for row-ordering

Author: MarcG-TUE

package/cmtrace/cmtrace/graphics/tracesettings.py

@@ -32,7 +32,8 @@
  'graphics:alternate-color': True,
  'graphics:show-text-labels': True,
  'graphics:background-color': (255, 255, 255),
- 'graphics:row-background-color': (240, 240, 240)
+ 'graphics:row-background-color': (240, 240, 240),
+ 'structure:row-order': "by-first-firing"
 }
 
 # TODO: raise exception on invalid settings
@@ -424,6 +425,11 @@ def __get_subtree(self, node_label):
  result[key[len(node_label)+1:]] = val
  return result
 
+ def row_order(self):
+ """ returns the row ordering """
+ return self.__get_value('structure:row-order')
+
+
  def groups(self):
  """ returns the groups of actors that are drawn on a single row """
  if self.__includes_label('structure:groups'):

package/cmtrace/cmtrace/libtracetosvg.py

@@ -229,20 +229,32 @@ def create_gantt_fig(trace_filename, svg_filename, settings=None):
  print(f"Warning: actor {act} not found (missing scenario specification s@A?).")
  acts_list.append(None)
  else:
- acts_list = [actors[row]]
+ if not row in actors:
+ print(f"Warning: actor {row} not found.")
+ acts_list = [None]
+ else:
+ acts_list = [actors[row]]
  gantt_actors.append((row, acts_list))
  else:
  # make a default structure
  # gantt_actors: list of tuples with name, list of Actors
- #TODO: group same actor in different scenarios together
  c_idx = 0
  sorted_actors = sorted(actors.items(), key=lambda a: a[1].min_firing_time())
+ grouped_actors = {}
  for act_name, act in sorted_actors:
  parts = act_name.split(SCENARIO_SEPARATOR)
  act_name = parts[len(parts)-1]
- gantt_actors.append((act_name, [act]))
+ if act_name in grouped_actors:
+ g_idx = grouped_actors[act_name]
+ gantt_actors[g_idx][1].append(act)
+ else:
+ grouped_actors[act_name] = len(gantt_actors)
+ gantt_actors.append((act_name, [act]))
+ if settings.row_order() == "by-actor-name":
+ gantt_actors = sorted(gantt_actors, key=lambda a: a[0])
  c_idx = (c_idx + 1) % len(COLOR_PALETTE_FILLS)
 
+ # gantt_actors: list of tuples with name, list of Actors
  save_gantt_svg(gantt_actors, arrivals, outputs, svg_filename, settings=settings)
  convert_svg_to_pdf(svg_filename)
 

package/cmtrace/example/settings.yaml

@@ -48,6 +48,9 @@ layout:
  overlap-horizontal-offset: 10.0
 
 structure:
+ # order is one of the following: by-actor-name, by-first-firing
+ # it is ignored if rows are defined
+ row-order: by-first-firing
  # rows define the rows shown in the Gantt chart, referring to actors or actor groups defined in structure:groups
  rows: [A, B, C]
  # define groups of actors that can be referred on the row layout and in the color map