Report updates

svn: r1288

src/docgen/OpenDrawDoc.py

@@ -143,7 +143,7 @@ class OpenDrawDoc(DrawDoc.DrawDoc):
             self._write_meta_file()
             self._write_zip()
         except:
-            Errors.ReportError("Could not create %s" % self.filename)
+            raise Errors.ReportError("Could not create %s" % self.filename)
 
     def _write_zip(self):
         
@@ -244,7 +244,14 @@ class OpenDrawDoc(DrawDoc.DrawDoc):
 	    self.f.write('" style:family="graphics" ')
 	    self.f.write('style:parent-style-name="standard">\n')
 	    self.f.write('<style:properties ')
-            self.f.write('draw:fill-color="#%02x%02x%02x" ' % style.get_color())
+            if style.color[0] == 0 and style.color[1] == 0 and style.color[2] == 0:
+                self.f.write('draw:fill="solid" ')
+            else:
+                self.f.write('draw:fill="none" ')
+                
+            if style.get_line_style() == DrawDoc.DASHED:
+                self.f.write('draw:color="#cccccc" ')
+            
             if style.get_line_width():
                 self.f.write('draw:stroke="solid" ')
             else:
@@ -422,17 +429,54 @@ class OpenDrawDoc(DrawDoc.DrawDoc):
     def end_page(self):
 	self.f.write('</draw:page>\n')
 
+    def draw_path(self,style,path):
+        stype = self.draw_styles[style]
+
+        minx = 9e12
+        miny = 9e12
+        maxx = 0
+        maxy = 0
+
+        for point in path:
+            minx = min(point[0],minx)
+            miny = min(point[1],miny)
+            maxx = max(point[0],maxx)
+            maxy = max(point[1],maxy)
+
+        self.f.write('<draw:polygon draw:style-name="%s" draw:layer="layout" ' % style)
+        x = int((minx+self.lmargin)*1000)
+        y = int((miny+self.tmargin)*1000)
+        
+        self.f.write('svg:x="%d" svg:y="%d" ' % (x,y))
+        self.f.write('svg:viewBox="0 0 %d %d" ' % (int(maxx-minx)*1000,int(maxy-miny)*1000))
+        self.f.write('svg:width="%.4fcm" ' % (maxx-minx))
+        self.f.write('svg:height="%.4fcm" ' % (maxy-miny))
+        
+        point = path[0]
+        x1 = int((point[0]-minx)*1000)
+        y1 = int((point[1]-miny)*1000)
+        self.f.write('draw:points="%d,%d' % (x1,y1))
+
+        for point in path[1:]:
+            x1 = int((point[0]-minx)*1000)
+            y1 = int((point[1]-miny)*1000)
+            self.f.write(' %d,%d' % (x1,y1))
+        self.f.write('"/>\n')
+
     def draw_line(self,style,x1,y1,x2,y2):
         x1 = x1 + self.lmargin
         x2 = x2 + self.lmargin
         y1 = y1 + self.tmargin
         y2 = y2 + self.tmargin
+	box_style = self.draw_styles[style]
+
         self.f.write('<draw:line draw:style="')
         self.f.write(style)
         self.f.write('" svg:x1="%.3fcm" ' % x1)
         self.f.write('svg:y1="%.3fcm" ' % y1)
         self.f.write('svg:x2="%.3fcm" ' % x2)
-        self.f.write('svg:y2="%.3fcm"/>\n' % y2)
+        self.f.write('svg:y2="%.3fcm" ' % y2)
+        self.f.write('/>\n')
 
     def draw_text(self,style,text,x,y):
         x = x + self.lmargin

src/docgen/PSDrawDoc.py

@@ -126,7 +126,7 @@ class PSDrawDoc(DrawDoc.DrawDoc):
         self.f.write('(%s) show\n' % text)
         self.f.write('grestore\n')
 
-    def draw_path(self,style,path,fill):
+    def draw_path(self,style,path):
         stype = self.draw_styles[style]
         self.f.write('gsave\n')
         self.f.write('newpath\n')
@@ -146,7 +146,7 @@ class PSDrawDoc(DrawDoc.DrawDoc):
             y1 = point[1]+self.tmargin
             self.f.write('%f cm %f cm lineto\n' % self.translate(x1,y1))
         self.f.write('closepath\n')
-        if fill:
+        if self.color[0] == 0:
             self.f.write('fill\n')
         else:
             self.f.write('stroke\n')

src/docgen/PdfDrawDoc.py

@@ -103,7 +103,7 @@ class PdfDrawDoc(DrawDoc.DrawDoc):
         self.f.setLineWidth(stype.get_line_width())
  	self.f.rect(x1*cm,y1*cm,(x2-x1)*cm,(y2-y1)*cm,fill=0,stroke=1)
 
-    def draw_path(self,style,path,fill):
+    def draw_path(self,style,path):
         stype = self.draw_styles[style]
         if stype.get_line_style() == DrawDoc.SOLID:
             self.f.setDash([],0)
@@ -117,7 +117,13 @@ class PdfDrawDoc(DrawDoc.DrawDoc):
         for point in path[1:]:
             p.lineTo((point[0]+self.lmargin)*cm,(point[1]+self.tmargin)*cm)
         p.close()
-        self.f.drawPath(p,stroke=1,fill=fill)
+
+        fill = stype.get_color()
+        
+        if fill[0] == 0:
+            self.f.drawPath(p,stroke=1,fill=1)
+        else:
+            self.f.drawPath(p,stroke=1,fill=0)
 
     def draw_box(self,style,text,x,y):
         x = x + self.lmargin