commit-gnue
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

gnue/reports doc/report-notes.txt src/adapters/...


From: Jason Cater
Subject: gnue/reports doc/report-notes.txt src/adapters/...
Date: Wed, 08 Jan 2003 21:08:10 -0500

CVSROOT:        /cvsroot/gnue
Module name:    gnue
Changes by:     Jason Cater <address@hidden>    03/01/08 21:08:10

Modified files:
        reports/doc    : report-notes.txt 
        reports/src/adapters/filters/Standard/_base: Parser.py 
Added files:
        reports/src/adapters/filters/Standard/_base: Helpers.py 

Log message:
        * Started on getting GNUe:Reports:Standard into a GParser-able format.
        * Implemented Measurement() and Color() classes

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/reports/doc/report-notes.txt.diff?tr1=1.11&tr2=1.12&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/reports/src/adapters/filters/Standard/_base/Helpers.py?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/reports/src/adapters/filters/Standard/_base/Parser.py.diff?tr1=1.3&tr2=1.4&r1=text&r2=text

Patches:
Index: gnue/reports/doc/report-notes.txt
diff -c gnue/reports/doc/report-notes.txt:1.11 
gnue/reports/doc/report-notes.txt:1.12
*** gnue/reports/doc/report-notes.txt:1.11      Tue Jan  7 18:53:07 2003
--- gnue/reports/doc/report-notes.txt   Wed Jan  8 21:08:10 2003
***************
*** 36,49 ****
  
    <section positioning="below|right|marginleft|margintop|absolute|named"
           relation="<sectionname>|<formanchor>"
!          mode="freeform|tabular|crosstab|(bar|pie|line)chart"
  
           marginleft="<measurement>|auto"
           marginright="<measurement>|auto"
           margintop="<measurement>|auto"
           marginbottom="<measurement>|auto"
!          marginvert="<measurement>|auto"
!          marginhoriz="<measurement>|auto"
  
           columns="2"
  
--- 36,50 ----
  
    <section positioning="below|right|marginleft|margintop|absolute|named"
           relation="<sectionname>|<formanchor>"
!          mode="freeflow|tabular|crosstab|(bar|pie|line)chart"
  
           marginleft="<measurement>|auto"
           marginright="<measurement>|auto"
           margintop="<measurement>|auto"
           marginbottom="<measurement>|auto"
!          
!          spacingvert="<measurement>|auto"
!          spacinghoriz="<measurement>|auto"
  
           columns="2"
  
***************
*** 56,62 ****
           # But the "styles" must have something to "implement"
           shaderows="3"
           shadebackground="10%"
!          border="<top>;<left>;<bot>;<right>;<vert>;<horiz>"
           background="10%|#e0e0e0e|gray"
          >
      <header repeat="none|page|column|all"/>
--- 57,68 ----
           # But the "styles" must have something to "implement"
           shaderows="3"
           shadebackground="10%"
!          bordertop="<measurement>|auto"
!          borderleft="<measurement>|auto"
!          borderbot="<measurement>|auto"
!          borderright="<measurement>|auto"
!          bordervert="<measurement>|auto"
!          borderhoriz="<measurement>|auto"
           background="10%|#e0e0e0e|gray"
          >
      <header repeat="none|page|column|all"/>
***************
*** 208,216 ****
     (Could be: <rec><cell>Cat 3</cell><cell>Total</cell><cell>57</cell></rec>)
  
  ---------------------------------------------------------------------
! Section as a freeform, #1
  
! <section mode="freeform">
  <details>
  <p>
  <t style="field">12/30/02</t>
--- 214,222 ----
     (Could be: <rec><cell>Cat 3</cell><cell>Total</cell><cell>57</cell></rec>)
  
  ---------------------------------------------------------------------
! Section as a freeflow, #1
  
! <section mode="freeflow">
  <details>
  <p>
  <t style="field">12/30/02</t>
Index: gnue/reports/src/adapters/filters/Standard/_base/Parser.py
diff -c gnue/reports/src/adapters/filters/Standard/_base/Parser.py:1.3 
gnue/reports/src/adapters/filters/Standard/_base/Parser.py:1.4
*** gnue/reports/src/adapters/filters/Standard/_base/Parser.py:1.3      Tue Jan 
 7 18:53:07 2003
--- gnue/reports/src/adapters/filters/Standard/_base/Parser.py  Wed Jan  8 
21:08:10 2003
***************
*** 30,35 ****
--- 30,36 ----
  
  
  from gnue.common import GDataSource, GTypecast, GParser, GTrigger
+ from Helpers import measurement
  import copy, types
  
  
***************
*** 88,122 ****
              'description':       {
                 'Typecast': GTypecast.text } } ,
           'ParentTags':  None },
! 
!       'parameters':   {
!          'BaseClass': GRParameters.GRParameters ,
!          'SingleInstance': 1,
!          'ParentTags':  ('report',)},
! 
!       'parameter':    {
!          'BaseClass': GRParameters.GRParameter,
           'Attributes': {
!             'name':          {
!                'Required': 1,
!                'Unique': 1,
!                'Typecast': GTypecast.name },
!             'required':    {
!                'Typecast': GTypecast.boolean,
!                'Default': 0 },
!             'limited':     {
!                'Typecast': GTypecast.boolean,
!                'Default': 0 },
!             'default':     {
!                'Typecast': GTypecast.text },
!             'description': {
!                'Required': 1,
!                'Typecast': GTypecast.text },
!             'source':      {
!                'Typecast': GTypecast.name },
!             'type':        {
!                'Typecast': GTypecast.name,
!                'Default': "char" } },
           'ParentTags':  ('parameters',) },
  
        'sortoptions':  {
--- 89,185 ----
              'description':       {
                 'Typecast': GTypecast.text } } ,
           'ParentTags':  None },
!   
!   <section positioning="below|right|marginleft|margintop|absolute|named"
!          relation="<sectionname>|<formanchor>"
!          mode="freeflow|tabular|crosstab|(bar|pie|line)chart"
! 
!          
!          marginleft="<measurement>|auto"
!          marginright="<measurement>|auto"
!          margintop="<measurement>|auto"
!          marginbottom="<measurement>|auto"
!          spacinghoriz="<measurement>|auto"
!          spacingvert="<measurement>|auto"
! 
!          columns="2"
! 
!          break="never|always|conditional"
!          breaklevel="page|column"
! 
!          style="..."
! 
!          # The following *should* typically only be defined with style=, not 
by attributes
!          # But the "styles" must have something to "implement"
!          shaderows="3"
!          shadebackground="10%"
!          borderhoriz="<top>;<left>;<bot>;<right>;<vert>;<horiz>"
!          background="10%|#e0e0e0e|gray"
!         >
!          
!       'section':    {
!          'BaseClass': GRParameters.GRSection,
           'Attributes': {
!             'positioning':    {
!                'ValueSet': { 
!                     'below': {}, 
!                     'right': {}, 
!                     'marginleft': {}, 
!                     'margintop': {}, 
!                     'absolute': {}, 
!                     'named': {} },                    
!                'Typecast': GTypecast.name, 
!                'Default': 'below' },
!             'relation':    {
!                'Typecast': GTypecast.name },
!             'mode':     {
!                'ValueSet': { 
!                     'freeflow': {}, 
!                     'tabular': {}, 
!                     'crosstab': {}, 
!                     'margintop': {}, 
!                     'barchart': {}, 
!                     'horizbarchart': {}, 
!                     'stackedbarchart': {}, 
!                     'stackedhorizbarchart': {}, 
!                     'piechart': {}, 
!                     'linechart': {} },
!                'Typecast': GTypecast.name, 
!                'Default': 'freeflow' },
!             'columns': {
!                'Typecast': GTypecast.whole, 
!                'Default': 1 },
!             'break':    {
!                'ValueSet': { 
!                     'never': {}, 
!                     'always': {}, 
!                     'conditional': {} },
!                'Typecast': GTypecast.name, 
!                'Default': 'never' },
!             'breaklevel':    {
!                'ValueSet': { 
!                     'page': {}, 
!                     'column': {} },
!                'Typecast': GTypecast.name, 
!                'Default': 'page' },
!             'marginleft':      {
!                'Typecast': measurement, 
!                'Default': '0' },
!             'marginright':      {
!                'Typecast': measurement, 
!                'Default': '0' },
!             'margintop':      {
!                'Typecast': measurement, 
!                'Default': '0' },
!             'marginbottom':      {
!                'Typecast': measurement, 
!                'Default': '0' },
!             'spacingvert':      {
!                'Typecast': measurement, 
!                'Default': '0' },
!             'spacinghoriz':      {
!                'Typecast': measurement, 
!                'Default': '0'  } } },
           'ParentTags':  ('parameters',) },
  
        'sortoptions':  {
***************
*** 248,273 ****
           'ParentTags':  ('report',) },
      }
  
      #
!     # Add DataSource elements
!     #
!     xmlElements.update(
!        GDataSource.getXMLelements(
!           {'datasource':   {
!                'BaseClass': GRSources.GRDataSource,
!                'ParentTags':  ('sources',) },
!            'cparam': {
!                'BaseClass': GRParameters.GRConditionParam }
!           }))
! 
!     #
!     # Add trigger elements
      #
!     xmlElements.update(
!       GTrigger.getXMLelements(
!         updates={'trigger':{
!                    'ParentTags': ('report',)},
!                 }))
  
  
  
--- 311,363 ----
           'ParentTags':  ('report',) },
      }
  
+     borderTypes = { 
+        'none': {}, 
+        'single': {},
+        'double': {},
+        'dot': {},
+        'dash': {}, 
+        'dashdot': {}, 
+        'dashdotdot': {}, 
+        'thinthick': {}, 
+        'thickthin': {}, 
+        'thinthickthin': {}, 
+     }
+     
+     borderStyles = {
+             'breaklevel':    {
+                'Typecast': color, 
+                'Default': 'none' },
+             'borderleft':      {
+                'Typecast': GTypecast.name, 
+                'ValueSet': borderTypes, 
+                'Default': 'none' },
+             'marginright':      {
+                'Typecast': measurement, 
+                'Default': '0' },
+             'margintop':      {
+                'Typecast': measurement, 
+                'Default': '0' },
+             'marginbottom':      {
+                'Typecast': measurement, 
+                'Default': '0' },
+             'spacingvert':      {
+                'Typecast': measurement, 
+                'Default': '0' },
+             'spacinghoriz':      {
+                'Typecast': measurement, 
+                'Default': '0' },
+             'style':        {
+                'Typecast': GTypecast.name } 
+     }
+     
      #
!     # Add styles to stylable stuff
      #
!     for tag in ('section',): 
!       xmlElements[tag]['Attributes'].update( borderStyles )
!                 
!     
  
  
  




reply via email to

[Prev in Thread] Current Thread [Next in Thread]