[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
gnue/reports/src/adapters/filters/Standard Base...
|
From: |
Jason Cater |
|
Subject: |
gnue/reports/src/adapters/filters/Standard Base... |
|
Date: |
Fri, 04 Apr 2003 18:26:07 -0500 |
CVSROOT: /cvsroot/gnue
Module name: gnue
Changes by: Jason Cater <address@hidden> 03/04/04 18:26:07
Modified files:
reports/src/adapters/filters/Standard/Base: ParserTypes.py
reports/src/adapters/filters/Standard/Base/Helpers:
Measurement.py
TextMeasurement.py
reports/src/adapters/filters/Standard/Base/psutils:
PrinterDefinition.py
reports/src/adapters/filters/Standard/Base/styles: Parser.py
reports/src/adapters/filters/Standard/etc: standard-styles.grs
Log message:
* More cleanup on styles / postscript support
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/reports/src/adapters/filters/Standard/Base/ParserTypes.py.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/reports/src/adapters/filters/Standard/Base/Helpers/Measurement.py.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/reports/src/adapters/filters/Standard/Base/Helpers/TextMeasurement.py.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/reports/src/adapters/filters/Standard/Base/psutils/PrinterDefinition.py.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/reports/src/adapters/filters/Standard/Base/styles/Parser.py.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/reports/src/adapters/filters/Standard/etc/standard-styles.grs.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
Patches:
Index: gnue/reports/src/adapters/filters/Standard/Base/Helpers/Measurement.py
diff -c
gnue/reports/src/adapters/filters/Standard/Base/Helpers/Measurement.py:1.1
gnue/reports/src/adapters/filters/Standard/Base/Helpers/Measurement.py:1.2
*** gnue/reports/src/adapters/filters/Standard/Base/Helpers/Measurement.py:1.1
Tue Mar 4 18:19:52 2003
--- gnue/reports/src/adapters/filters/Standard/Base/Helpers/Measurement.py
Fri Apr 4 18:26:07 2003
***************
*** 28,37 ****
--- 28,41 ----
# NOTES:
#
+ import string
+
class Measurement:
def __init__(self, value, allowAuto=0):
self.__allowAuto = allowAuto
+ value = string.lower(value)
+
if value in ("",None,'auto'):
if self.__allowAuto:
self.__value = None
***************
*** 43,62 ****
self.__value = value
self.auto = 0
! text = str(value).replace(' ','')
! if text[-1] in ('0','1','2','3','4','5','6','7','8','9'):
! value = float(text) / 72
! else:
! unit = text[-2:]
! text = text[:-2]
! try:
! value = float(text) / _conversionToInches[unit.lower()]
! except KeyError:
! print "Unknown unit of measurement: %s" % unit
! except ValueError:
! print "Invalid measurement: %s (%s)" % (text, unit)
! self.__inches = value
def __str__(self):
if self.auto:
--- 47,67 ----
self.__value = value
self.auto = 0
! text = str(value).replace(' ','')
!
! if text[-1] in ('0','1','2','3','4','5','6','7','8','9'):
! value = float(text) / 72
! else:
! unit = text[-2:]
! text = text[:-2]
! try:
! value = float(text) / _conversionToInches[unit.lower()]
! except KeyError:
! print "Unknown unit of measurement: %s" % unit
! except ValueError:
! print "Invalid measurement: %s (%s)" % (text, unit)
! self.__inches = value
def __str__(self):
if self.auto:
***************
*** 77,80 ****
return self.__inches
_conversionToInches = {'pt':72, 'in':1, 'cm':2.54,
! 'mm': 25.4, 'pc': 864}
\ No newline at end of file
--- 82,85 ----
return self.__inches
_conversionToInches = {'pt':72, 'in':1, 'cm':2.54,
! 'mm': 25.4, 'pc': 864}
Index:
gnue/reports/src/adapters/filters/Standard/Base/Helpers/TextMeasurement.py
diff -c
gnue/reports/src/adapters/filters/Standard/Base/Helpers/TextMeasurement.py:1.1
gnue/reports/src/adapters/filters/Standard/Base/Helpers/TextMeasurement.py:1.2
***
gnue/reports/src/adapters/filters/Standard/Base/Helpers/TextMeasurement.py:1.1
Thu Apr 3 21:50:03 2003
--- gnue/reports/src/adapters/filters/Standard/Base/Helpers/TextMeasurement.py
Fri Apr 4 18:26:07 2003
***************
*** 28,33 ****
--- 28,34 ----
#
from types import *
+ import string
from Measurement import Measurement
############################################################
***************
*** 40,50 ****
# o "xx%" -- Percentage of parent's measurement
# o "12em" -- Size relative to font's height (1em = regular font height)
# o "12ex" -- Size relative to the height of the letter 'x'
class TextMeasurement(Measurement):
def __init__(self, value, allowAuto=0):
! self.__value = value
! if value[-1:] == '%':
try:
self.__multiplier = float(value[:-1])/100
self.__mode = 'percent'
--- 41,59 ----
# o "xx%" -- Percentage of parent's measurement
# o "12em" -- Size relative to font's height (1em = regular font height)
# o "12ex" -- Size relative to the height of the letter 'x'
+ # o "single" -- Same as "auto" / single spacing
+ # o "double" -- Same as "auto * 2" / double spacing
class TextMeasurement(Measurement):
def __init__(self, value, allowAuto=0):
! self.__value = value = string.lower(value)
! if value == 'single':
! self.__mode = 'percent'
! self.__multiplier = 1
! elif value == 'double':
! self.__mode = 'percent'
! self.__multiplier = 2
! elif value[-1:] == '%':
try:
self.__multiplier = float(value[:-1])/100
self.__mode = 'percent'
***************
*** 63,69 ****
except ValueError:
raise "Invalid measurement format: %s" % value
else:
- print "elsing"
self.__mode = 'abs'
Measurement.__init__(self, value)
--- 72,77 ----
Index: gnue/reports/src/adapters/filters/Standard/Base/ParserTypes.py
diff -c gnue/reports/src/adapters/filters/Standard/Base/ParserTypes.py:1.1
gnue/reports/src/adapters/filters/Standard/Base/ParserTypes.py:1.2
*** gnue/reports/src/adapters/filters/Standard/Base/ParserTypes.py:1.1 Thu Apr
3 21:50:03 2003
--- gnue/reports/src/adapters/filters/Standard/Base/ParserTypes.py Fri Apr
4 18:26:07 2003
***************
*** 42,48 ****
return Measurement(value, allowAuto=0)
def textmeasurement(value):
! return Measurement(value, allowAuto=1)
def color(value):
return Color(value)
--- 42,48 ----
return Measurement(value, allowAuto=0)
def textmeasurement(value):
! return TextMeasurement(value, allowAuto=1)
def color(value):
return Color(value)
Index:
gnue/reports/src/adapters/filters/Standard/Base/psutils/PrinterDefinition.py
diff -c
gnue/reports/src/adapters/filters/Standard/Base/psutils/PrinterDefinition.py:1.3
gnue/reports/src/adapters/filters/Standard/Base/psutils/PrinterDefinition.py:1.4
***
gnue/reports/src/adapters/filters/Standard/Base/psutils/PrinterDefinition.py:1.3
Tue Mar 4 18:19:52 2003
---
gnue/reports/src/adapters/filters/Standard/Base/psutils/PrinterDefinition.py
Fri Apr 4 18:26:07 2003
***************
*** 22,28 ****
# FontMetrics.py
#
# DESCRIPTION:
! # Class that encapsulates a postscript printer description (ppd) file
#
# NOTES:
#
--- 22,28 ----
# FontMetrics.py
#
# DESCRIPTION:
! # Class that loads a Postscript Printer Description (PPD) file
#
# NOTES:
#
***************
*** 40,46 ****
handle = openResource(location)
close = 1
if close:
handle.close()
-
--- 40,54 ----
handle = openResource(location)
close = 1
+ currentUiOption = None
+ current
+
+ for line in handle.readlines():
+ line = line.strip()
+
+ # Skip blank lines and comments
+ if line[:2] in ('','*%'):
+ continue
if close:
handle.close()
Index: gnue/reports/src/adapters/filters/Standard/Base/styles/Parser.py
diff -c gnue/reports/src/adapters/filters/Standard/Base/styles/Parser.py:1.1
gnue/reports/src/adapters/filters/Standard/Base/styles/Parser.py:1.2
*** gnue/reports/src/adapters/filters/Standard/Base/styles/Parser.py:1.1
Thu Apr 3 21:50:03 2003
--- gnue/reports/src/adapters/filters/Standard/Base/styles/Parser.py Fri Apr
4 18:26:07 2003
***************
*** 70,78 ****
global xmlElements
- # Here due to some nasty recursive imports
- from Objects import *
-
if xmlElements == None:
#
--- 70,75 ----
***************
*** 92,98 ****
"name": {
'Required': 1,
'Typecast': GTypecast.name },
! "tags": {
'Required': 1,
'Typecast': GTypecast.names },
"font_family": {
--- 89,95 ----
"name": {
'Required': 1,
'Typecast': GTypecast.name },
! "objects": {
'Required': 1,
'Typecast': GTypecast.names },
"font_family": {
Index: gnue/reports/src/adapters/filters/Standard/etc/standard-styles.grs
diff -c gnue/reports/src/adapters/filters/Standard/etc/standard-styles.grs:1.2
gnue/reports/src/adapters/filters/Standard/etc/standard-styles.grs:1.3
*** gnue/reports/src/adapters/filters/Standard/etc/standard-styles.grs:1.2
Thu Apr 3 21:37:31 2003
--- gnue/reports/src/adapters/filters/Standard/etc/standard-styles.grs Fri Apr
4 18:26:07 2003
***************
*** 3,8 ****
--- 3,9 ----
<styles>
<textstyle
name="default"
+ objects="*"
font_family="Helvetica,Arial"
font_style="normal"
font_weight="normal"
***************
*** 11,18 ****
text_underline_color="black"
text_underline_size="0.5pt"
text_overline="none"
! text_overline_color="0.5pt"
! text_overline_size="none"
text_strikeout="none"
text_strikeout_color="black"
text_strikeout_size="0.5pt"
--- 12,19 ----
text_underline_color="black"
text_underline_size="0.5pt"
text_overline="none"
! text_overline_color="black"
! text_overline_size="0.5pt"
text_strikeout="none"
text_strikeout_color="black"
text_strikeout_size="0.5pt"
***************
*** 41,52 ****
/>
<textstyle name="bold"
font_weight="bold" />
<textstyle name="italics"
font_style="italics" />
! <textstyle name="section.freeflow"
font_family="serif" />
--- 42,56 ----
/>
<textstyle name="bold"
+ objects="*"
font_weight="bold" />
<textstyle name="italics"
+ objects="*"
font_style="italics" />
! <textstyle name="default"
! objects="section.freeflow"
font_family="serif" />
- gnue/reports/src/adapters/filters/Standard Base...,
Jason Cater <=