Updated doc + em backend graphviz upgrade & fix

EditorialModel/backend/graphviz.py

@@ -53,14 +53,16 @@ class EmBackendGraphviz(EmBackendDummy):
                 self.edges += cid+' -> '+self._component_id(c.em_class)+' [ style="dotted" ]\n'
                 for nat, sups in c.superiors().items():
                     for sup in sups:
-                        self.edges += cid+' -> '+self._component_id(sup)+' [ label="%s" color="green" ]'%nat
+                        self.edges += cid+' -> '+self._component_id(sup)+' [ label="%s" color="green" ]\n'%nat
             #dotfp.write("}\n")
             
+            """
             for rf in [ f for f in em.components(EmField) if f.fieldtype == 'rel2type']:
                 dotfp.write(self._component_node(rf, em))
                 cid = self._component_id(rf)
                 self.edges += cid+' -> '+self._component_id(rf.em_class)+'\n'
                 self.edges += cid+' -> '+self._component_id(em.component(rf.rel_to_type_id))+'\n'
+            """
 
             dotfp.write(self.edges)
 
@@ -72,12 +74,11 @@ class EmBackendGraphviz(EmBackendDummy):
         return 'emcomp%d'%c.uid
 
     def _component_node(self, c, em):
-        #ret = 'emcomp%d '%c.uid
         ret = "\t"+EmBackendGraphviz._component_id(c)
         cn = c.__class__.__name__
         rel_field = ""
         if cn == 'EmClass':
-            ret += '[ label="%s", shape="%s" ]'%(c.name.replace('"','\\"'), 'doubleoctagon')
+            ret += '[ label="EmClass %s", shape="%s" ]'%(c.name.replace('"','\\"'), 'doubleoctagon')
         elif cn == 'EmField':
             str_def = '[ label="Rel2Type {fname}|{{{records}}}", shape="record"]'
             records = ' | '.join([f.name for f in em.components('EmField') if f.rel_field_id == c.uid])
@@ -88,10 +89,8 @@ class EmBackendGraphviz(EmBackendDummy):
             cntref = 0
             first = True
             for f in [ f for f in c.fields() if f.name not in c.em_class.default_fields_list().keys()]:
-                if cn == 'EmType' and f.rel_field_id is None:
-                    
-                    #if not (f.rel_to_type_id is None):
-                    if isinstance(f, EditorialModel.fieldtypes.rel2type.EmFieldType):
+                if f.rel_field_id is None:
+                    if f.fieldtype == 'rel2type':
                         rel_node_id = '%s%s'%(EmBackendGraphviz._component_id(c), EmBackendGraphviz._component_id(em.component(f.rel_to_type_id)))
 
                         rel_node = '\t%s [ label="rel_to_type'%rel_node_id
@@ -105,7 +104,7 @@ class EmBackendGraphviz(EmBackendDummy):
                                     rel_node += '{ '
                                     first = False
                                 rel_node += rf.name
-                        rel_node += '}" shape="record" style="dashed"]\n'
+                        rel_node += '}" shape="record"]\n'
 
                         rel_field += rel_node
 
@@ -117,8 +116,7 @@ class EmBackendGraphviz(EmBackendDummy):
                     if first:
                         ret += ' { '
                         first = False
-                    #if not (f.rel_to_type_id is None):
-                    if isinstance(f, EditorialModel.fieldtypes.rel2type.EmFieldType):
+                    if f.fieldtype == 'rel2type':
                         ret += '<f%d> '%cntref
                         cntref += 1
                     ret += f.name

Lodel/__init__.py

@@ -32,6 +32,7 @@
 
 ## @page lodel2_arch Lodel2 architecture
 #
+# @tableofcontents
 #
 # @section lodel2_arch_basic Lodel2
 #
@@ -74,3 +75,5 @@
 # @image html graphviz/em_relations.png
 # @subsubsection lodel2_arch_edmod_fig_hierarchy Hierarchical relations between EmTypes given a classtype
 # @image html graphviz/em_types_hierarch.png
+# @subsubsection lodel2_arch_edmod_fig_em_example Example of editorial model
+# @image html graphviz/example_em_graph.png

doc/img/graphviz/example_em_graph.dot

@@ -0,0 +1,39 @@
+digraph G {
+	rankdir = BT
+subgraph cluster_classtype {
+style="invis"
+
+
+ctentity [ label="classtype entity" shape="tripleoctagon" ]
+
+
+ctentry [ label="classtype entry" shape="tripleoctagon" ]
+
+
+ctperson [ label="classtype person" shape="tripleoctagon" ]
+}
+subgraph cluster_class {
+style="invis"
+	emcomp1[ label="EmClass textes", shape="doubleoctagon" ]
+	emcomp2[ label="EmClass personnes", shape="doubleoctagon" ]
+	emcomp13[ label="EmClass publication", shape="doubleoctagon" ]
+}
+	emcomp5[ label="EmType article | { titre|<f0> auteur|soustitre}" shape="record" color="blue" ]
+	emcomp5emcomp6 [ label="rel_to_type | { adresse}" shape="record"]
+	emcomp6[ label="EmType personne | { nom|prenom}" shape="record" color="blue" ]
+	emcomp14[ label="EmType rubrique | { titre}" shape="record" color="blue" ]
+	emcomp19[ label="EmType numero | { titre}" shape="record" color="blue" ]
+emcomp1 -> ctentity [ style="dashed" ]
+emcomp2 -> ctperson [ style="dashed" ]
+emcomp13 -> ctentity [ style="dashed" ]
+emcomp5:f0 -> emcomp5emcomp6 [ color="purple" ]
+emcomp5emcomp6 -> emcomp6 [color="purple"]
+emcomp5 -> emcomp1 [ style="dotted" ]
+emcomp5 -> emcomp14 [ label="parent" color="green" ]
+emcomp6 -> emcomp2 [ style="dotted" ]
+emcomp14 -> emcomp13 [ style="dotted" ]
+emcomp14 -> emcomp14 [ label="parent" color="green" ]
+emcomp14 -> emcomp19 [ label="parent" color="green" ]
+emcomp19 -> emcomp13 [ style="dotted" ]
+
+}