[gnue] r8077 - in trunk: gnue-designer/src/base gnue-designer/src/reports gnue-reports/src/adapters/filters/Char gnue-reports/src/adapters/filters/Char/char gnue-reports/src/base/layout

[btami]

Author: btami
Date: 2005-10-24 15:51:29 -0500 (Mon, 24 Oct 2005)
New Revision: 8077

Added:
   trunk/gnue-reports/src/adapters/filters/Char/LayoutParser.py
Modified:
   trunk/gnue-designer/src/base/Instance.py
   trunk/gnue-designer/src/reports/Incubator.py
   trunk/gnue-designer/src/reports/TreeView.py
   trunk/gnue-reports/src/adapters/filters/Char/__init__.py
   trunk/gnue-reports/src/adapters/filters/Char/char/CHParser.py
   trunk/gnue-reports/src/adapters/filters/Char/char/CHReport.py
   trunk/gnue-reports/src/base/layout/GRLayout.py
   trunk/gnue-reports/src/base/layout/GRLayoutElement.py
Log:
more preparing stuff to support reports layout tags in designer

Modified: trunk/gnue-designer/src/base/Instance.py
===================================================================
--- trunk/gnue-designer/src/base/Instance.py    2005-10-24 13:19:01 UTC (rev 
8076)
+++ trunk/gnue-designer/src/base/Instance.py    2005-10-24 20:51:29 UTC (rev 
8077)
@@ -407,19 +407,10 @@
 
     if object != self.rootObject:
 
-      # just a hack for designer.reports.TreeView.py (btami)
-      if object._xmlnamespace:
-        if object.name:
-          object._description = object.name + "(out:)"
-        else:
-          object._description = object._xmltag + "(out:)"
-
       # Assign an ID if none exists
       # TODO: in the future, I want to change these to id=".." instead of 
name=".."
       if hasattr(object, 'name'):
-        if (object.name == None or ( \
-            object.name[:3] == "__<" and \
-            object.name[-3:] == ">__")):
+        if object.name == None or object.name[:3] == "__G":
           object.name = self.getNextGenericName(object._type[2:])
         self.nameMappings[string.lower(object.name)] = object
         self.usedNames.append(object.name.lower())

Modified: trunk/gnue-designer/src/reports/Incubator.py
===================================================================
--- trunk/gnue-designer/src/reports/Incubator.py        2005-10-24 13:19:01 UTC 
(rev 8076)
+++ trunk/gnue-designer/src/reports/Incubator.py        2005-10-24 20:51:29 UTC 
(rev 8077)
@@ -39,7 +39,7 @@
 
   def createObject(self, rootObject, tag, parent, attributes={}, select=1):
     # Handle GRPassThru
-    if tag.find(':')+1:
+    if 0: #tag.find(':')+1:
       o = self._handlePassThru(rootObject, tag, parent, attributes, select)
       if o:
         self.instance.dispatchEvent('ObjectCreated',object=o, 
originator=__name__)

Modified: trunk/gnue-designer/src/reports/TreeView.py
===================================================================
--- trunk/gnue-designer/src/reports/TreeView.py 2005-10-24 13:19:01 UTC (rev 
8076)
+++ trunk/gnue-designer/src/reports/TreeView.py 2005-10-24 20:51:29 UTC (rev 
8077)
@@ -42,7 +42,6 @@
 
   def inventoryObject (self, object):
     if object != self.rootObject:
-      # TODO: icons for reports wanted (btami)
       icon = 'properties'
       parentTreeItem = object.getParent ()._treeItem
       if isinstance(object, GRParameters.GRParameters):

Added: trunk/gnue-reports/src/adapters/filters/Char/LayoutParser.py
===================================================================
--- trunk/gnue-reports/src/adapters/filters/Char/LayoutParser.py        
2005-10-24 13:19:01 UTC (rev 8076)
+++ trunk/gnue-reports/src/adapters/filters/Char/LayoutParser.py        
2005-10-24 20:51:29 UTC (rev 8077)
@@ -0,0 +1,5 @@
+from char import CHParser
+
+def getXMLelements():
+  return CHParser.getXMLelements()
+

Modified: trunk/gnue-reports/src/adapters/filters/Char/__init__.py
===================================================================
--- trunk/gnue-reports/src/adapters/filters/Char/__init__.py    2005-10-24 
13:19:01 UTC (rev 8076)
+++ trunk/gnue-reports/src/adapters/filters/Char/__init__.py    2005-10-24 
20:51:29 UTC (rev 8077)
@@ -1,4 +1 @@
-from char import CHParser
 
-class LayoutParser(CHParser):
-  pass

Modified: trunk/gnue-reports/src/adapters/filters/Char/char/CHParser.py
===================================================================
--- trunk/gnue-reports/src/adapters/filters/Char/char/CHParser.py       
2005-10-24 13:19:01 UTC (rev 8076)
+++ trunk/gnue-reports/src/adapters/filters/Char/char/CHParser.py       
2005-10-24 20:51:29 UTC (rev 8077)
@@ -54,7 +54,7 @@
 #######################################################
 
 def loadFile(buffer, connections=None, initialize=0):
-  return GParser.loadXMLObject (buffer, xmlReportHandler, 'CHReport', 'report',
+  return GParser.loadXMLObject (buffer, xmlReportHandler, 'CHReport', 
'chreport',
            initialize, attributes={})
 
 
@@ -96,13 +96,13 @@
       'titlepage':    {
          'BaseClass': CHObjects.CHTitlePage,
          'SingleInstance': 1,
-         'ParentTags':  ('report',)
+         'ParentTags':  ('chreport',)
       },
 
       'summarypage':    {
          'BaseClass': CHObjects.CHSummaryPage,
          'SingleInstance': 1,
-         'ParentTags':  ('report',)
+         'ParentTags':  ('chreport',)
       },
 
       'pageheader':    {
@@ -114,7 +114,7 @@
                'Description': 'The height of the page header in text rows. ' }
           },
          'SingleInstance': 1,
-         'ParentTags':  ('report',)
+         'ParentTags':  ('chreport',)
       },
 
       'pagefooter':    {
@@ -126,7 +126,7 @@
                'Description': 'The height of the page footer in text rows. ' },
           },
          'SingleInstance': 1,
-         'ParentTags':  ('report',)
+         'ParentTags':  ('chreport',)
       },
 
       'groupheader':    {
@@ -137,7 +137,7 @@
                'Typecast': GTypecast.whole,
                'Description': 'The height of the group header in text rows. ' 
},
           },
-         'ParentTags':  ('report',)
+         'ParentTags':  ('chreport',)
       },
 
       'groupfooter':    {
@@ -148,7 +148,7 @@
                'Typecast': GTypecast.whole,
                'Description': 'The height of the group footer in text rows. ' 
},
           },
-         'ParentTags':  ('report',)
+         'ParentTags':  ('chreport',)
       },
 
       'detail':    {
@@ -160,7 +160,7 @@
                'Description': 'The height of the group footer in text rows. ' 
},
           },
          'SingleInstance': 1,
-         'ParentTags':  ('report',)
+         'ParentTags':  ('chreport',)
       },
 
       'label':    {
@@ -223,7 +223,7 @@
     }
 
 
-  return GParser.buildImportableTags('report',xmlElements)
+  return GParser.buildImportableTags('chreport',xmlElements)
 
 
 #######################################################

Modified: trunk/gnue-reports/src/adapters/filters/Char/char/CHReport.py
===================================================================
--- trunk/gnue-reports/src/adapters/filters/Char/char/CHReport.py       
2005-10-24 13:19:01 UTC (rev 8076)
+++ trunk/gnue-reports/src/adapters/filters/Char/char/CHReport.py       
2005-10-24 20:51:29 UTC (rev 8077)
@@ -38,7 +38,7 @@
 
 class CHReport(GRootObj, GRPassThru): 
   def __init__(self, parent=None):
-    GRootObj.__init__(self, 'report', CHParser.getXMLelements, CHParser)
+    GRootObj.__init__(self, 'chreport', CHParser.getXMLelements, CHParser)
     GRPassThru.__init__(self, parent, type='CHReport')
 
 

Modified: trunk/gnue-reports/src/base/layout/GRLayout.py
===================================================================
--- trunk/gnue-reports/src/base/layout/GRLayout.py      2005-10-24 13:19:01 UTC 
(rev 8076)
+++ trunk/gnue-reports/src/base/layout/GRLayout.py      2005-10-24 20:51:29 UTC 
(rev 8077)
@@ -50,7 +50,7 @@
 class GRLayout (GObj):
   def __init__(self, parent):
     GObj.__init__(self, parent, type='GRLayout')
-    self.name = "__%s__" % self
+    self.name = "__GR%s" % id(self)
     self._inits = (self.initialize,)
     self.suppressGNUeTags = 0
 

Modified: trunk/gnue-reports/src/base/layout/GRLayoutElement.py
===================================================================
--- trunk/gnue-reports/src/base/layout/GRLayoutElement.py       2005-10-24 
13:19:01 UTC (rev 8076)
+++ trunk/gnue-reports/src/base/layout/GRLayoutElement.py       2005-10-24 
20:51:29 UTC (rev 8077)
@@ -46,7 +46,7 @@
   def __init__(self, parent=None, type='GRLayoutElement'):
     GTriggerExtension.__init__(self)
     GObj.__init__(self, parent, type=type)
-    self.name = "__%s__" % self
+    self.name = "__GR%s" % id(self)
     self._source = None
     self._mymapper = None
     self._enabled = 1