Merge pull request #123 from greendreamer/reporting-examples

updated choosing mediabox

Author: JorjMcKie

reporting/examples/filmfestival-2tables/Reports.py

@@ -73,7 +73,7 @@ def make_story(self):
 
 
 class Options(object):
-    def __init__(self, cols=1, format="A4", newpage=True):
+    def __init__(self, cols=0, format=None, newpage=None):
         self.cols = cols
         self.format = format
         self.newpage = newpage
@@ -312,7 +312,7 @@ def __init__(
         self.archive = fitz.Archive(archive) if archive else fitz.Archive(".")
         self.HEADER_RECT = None
         self.FOOTER_RECT = None
-        self.default_option = Options()
+        self.default_option = Options(cols=1, format=mediabox, newpage=True)
 
         self.css = css if css else ""
 
@@ -359,7 +359,7 @@ def current_story(self):  # get current story to draw
     def check_cols(self):  # set current columns and determin if going new page or not
         _newpage = self.default_option.newpage
         if isinstance(self.get_current_section(), list):
-            if len(self.get_current_section()) != 2:
+            if len(self.get_current_section()) != 2 or self.sections[self.sindex][1].cols == 0:
                 self.COLS = self.default_option.cols
                 return _newpage
 
@@ -370,8 +370,13 @@ def check_cols(self):  # set current columns and determin if going new page or n
 
     def get_pagerect(self):  # get current page mediabox
         if isinstance(self.sections[self.sindex], list):  # if section has info
-            if len(self.sections[self.sindex]) != 2:  # don't have property
-                return fitz.paper_rect(self.default_option.format)
+            if len(self.sections[self.sindex]) != 2 or self.sections[self.sindex][1].format == None:  # don't have property
+                return fitz.Rect(
+                    0.0,
+                    0.0,
+                    self.default_option.format.width,
+                    self.default_option.format.height,
+                )
 
             if isinstance(self.sections[self.sindex][1].format, str):
                 return fitz.paper_rect(self.sections[self.sindex][1].format)

reporting/examples/filmfestival-2tables/filmfestival.py

@@ -55,7 +55,7 @@
 </table>
 """
 
-mediabox = fitz.paper_rect("A4")
+mediabox = fitz.paper_rect("letter")
 report = Report(mediabox, font_families={"sans-serif": "ubuntu", "serif": "ubuntu"})
 header = Block(html=HEADER, report=report)
 
@@ -143,6 +143,6 @@ def get_actor_items():
 report.header = [header]
 report.sections = [
     [film_items, Options(cols=1, format="A3", newpage=True)],
-    [actor_items, Options(format=Size(300, 600))],
+    [actor_items],
 ]
 report.run("output.pdf")

reporting/examples/filmfestival-2tables/output.pdf

@@ -73,7 +73,7 @@ def make_story(self):
 
 
 class Options(object):
-    def __init__(self, cols=1, format="A4", newpage=True):
+    def __init__(self, cols=0, format=None, newpage=None):
         self.cols = cols
         self.format = format
         self.newpage = newpage
@@ -312,7 +312,7 @@ def __init__(
         self.archive = fitz.Archive(archive) if archive else fitz.Archive(".")
         self.HEADER_RECT = None
         self.FOOTER_RECT = None
-        self.default_option = Options()
+        self.default_option = Options(cols=1, format=mediabox, newpage=True)
 
         self.css = css if css else ""
 
@@ -359,7 +359,7 @@ def current_story(self):  # get current story to draw
     def check_cols(self):  # set current columns and determin if going new page or not
         _newpage = self.default_option.newpage
         if isinstance(self.get_current_section(), list):
-            if len(self.get_current_section()) != 2:
+            if len(self.get_current_section()) != 2 or self.sections[self.sindex][1].cols == 0:
                 self.COLS = self.default_option.cols
                 return _newpage
 
@@ -370,8 +370,13 @@ def check_cols(self):  # set current columns and determin if going new page or n
 
     def get_pagerect(self):  # get current page mediabox
         if isinstance(self.sections[self.sindex], list):  # if section has info
-            if len(self.sections[self.sindex]) != 2:  # don't have property
-                return fitz.paper_rect(self.default_option.format)
+            if len(self.sections[self.sindex]) != 2 or self.sections[self.sindex][1].format == None:  # don't have property
+                return fitz.Rect(
+                    0.0,
+                    0.0,
+                    self.default_option.format.width,
+                    self.default_option.format.height,
+                )
 
             if isinstance(self.sections[self.sindex][1].format, str):
                 return fitz.paper_rect(self.sections[self.sindex][1].format)

reporting/examples/invoice/Reports.py

@@ -6,7 +6,7 @@
 from Reports import *
 
 # The following defines the overall report object
-mediabox = fitz.paper_rect("letter-l")
+mediabox = fitz.paper_rect("a4-l")
 report = Report(mediabox)
 
 # Predefined HTML to define the header for all pages
@@ -142,7 +142,7 @@ def fetch_rows():
 
 report.header = [logo, header]
 report.sections = [[prolog, Options(cols=1, format="letter-l")],
-                   [items, Options(newpage=False)]]
+                   [items, Options(format=Size(600, 600), newpage=False)]]
 
 # This generates the report and saves it to the given path name.
 report.run("output.pdf")

reporting/examples/invoice/invoicer.py

@@ -73,7 +73,7 @@ def make_story(self):
 
 
 class Options(object):
-    def __init__(self, cols=1, format="A4", newpage=True):
+    def __init__(self, cols=0, format=None, newpage=None):
         self.cols = cols
         self.format = format
         self.newpage = newpage
@@ -312,7 +312,7 @@ def __init__(
         self.archive = fitz.Archive(archive) if archive else fitz.Archive(".")
         self.HEADER_RECT = None
         self.FOOTER_RECT = None
-        self.default_option = Options()
+        self.default_option = Options(cols=1, format=mediabox, newpage=True)
 
         self.css = css if css else ""
 
@@ -359,7 +359,7 @@ def current_story(self):  # get current story to draw
     def check_cols(self):  # set current columns and determin if going new page or not
         _newpage = self.default_option.newpage
         if isinstance(self.get_current_section(), list):
-            if len(self.get_current_section()) != 2:
+            if len(self.get_current_section()) != 2 or self.sections[self.sindex][1].cols == 0:
                 self.COLS = self.default_option.cols
                 return _newpage
 
@@ -370,8 +370,13 @@ def check_cols(self):  # set current columns and determin if going new page or n
 
     def get_pagerect(self):  # get current page mediabox
         if isinstance(self.sections[self.sindex], list):  # if section has info
-            if len(self.sections[self.sindex]) != 2:  # don't have property
-                return fitz.paper_rect(self.default_option.format)
+            if len(self.sections[self.sindex]) != 2 or self.sections[self.sindex][1].format == None:  # don't have property
+                return fitz.Rect(
+                    0.0,
+                    0.0,
+                    self.default_option.format.width,
+                    self.default_option.format.height,
+                )
 
             if isinstance(self.sections[self.sindex][1].format, str):
                 return fitz.paper_rect(self.sections[self.sindex][1].format)

reporting/examples/invoice/output.pdf

@@ -73,7 +73,7 @@ def make_story(self):
 
 
 class Options(object):
-    def __init__(self, cols=1, format="A4", newpage=True):
+    def __init__(self, cols=0, format=None, newpage=None):
         self.cols = cols
         self.format = format
         self.newpage = newpage
@@ -312,7 +312,7 @@ def __init__(
         self.archive = fitz.Archive(archive) if archive else fitz.Archive(".")
         self.HEADER_RECT = None
         self.FOOTER_RECT = None
-        self.default_option = Options()
+        self.default_option = Options(cols=1, format=mediabox, newpage=True)
 
         self.css = css if css else ""
 
@@ -359,7 +359,7 @@ def current_story(self):  # get current story to draw
     def check_cols(self):  # set current columns and determin if going new page or not
         _newpage = self.default_option.newpage
         if isinstance(self.get_current_section(), list):
-            if len(self.get_current_section()) != 2:
+            if len(self.get_current_section()) != 2 or self.sections[self.sindex][1].cols == 0:
                 self.COLS = self.default_option.cols
                 return _newpage
 
@@ -370,8 +370,13 @@ def check_cols(self):  # set current columns and determin if going new page or n
 
     def get_pagerect(self):  # get current page mediabox
         if isinstance(self.sections[self.sindex], list):  # if section has info
-            if len(self.sections[self.sindex]) != 2:  # don't have property
-                return fitz.paper_rect(self.default_option.format)
+            if len(self.sections[self.sindex]) != 2 or self.sections[self.sindex][1].format == None:  # don't have property
+                return fitz.Rect(
+                    0.0,
+                    0.0,
+                    self.default_option.format.width,
+                    self.default_option.format.height,
+                )
 
             if isinstance(self.sections[self.sindex][1].format, str):
                 return fitz.paper_rect(self.sections[self.sindex][1].format)

reporting/examples/multi-format/Reports.py

@@ -73,7 +73,7 @@ def make_story(self):
 
 
 class Options(object):
-    def __init__(self, cols=1, format="A4", newpage=True):
+    def __init__(self, cols=0, format=None, newpage=None):
         self.cols = cols
         self.format = format
         self.newpage = newpage
@@ -312,7 +312,7 @@ def __init__(
         self.archive = fitz.Archive(archive) if archive else fitz.Archive(".")
         self.HEADER_RECT = None
         self.FOOTER_RECT = None
-        self.default_option = Options()
+        self.default_option = Options(cols=1, format=mediabox, newpage=True)
 
         self.css = css if css else ""
 
@@ -359,7 +359,7 @@ def current_story(self):  # get current story to draw
     def check_cols(self):  # set current columns and determin if going new page or not
         _newpage = self.default_option.newpage
         if isinstance(self.get_current_section(), list):
-            if len(self.get_current_section()) != 2:
+            if len(self.get_current_section()) != 2 or self.sections[self.sindex][1].cols == 0:
                 self.COLS = self.default_option.cols
                 return _newpage
 
@@ -370,8 +370,13 @@ def check_cols(self):  # set current columns and determin if going new page or n
 
     def get_pagerect(self):  # get current page mediabox
         if isinstance(self.sections[self.sindex], list):  # if section has info
-            if len(self.sections[self.sindex]) != 2:  # don't have property
-                return fitz.paper_rect(self.default_option.format)
+            if len(self.sections[self.sindex]) != 2 or self.sections[self.sindex][1].format == None:  # don't have property
+                return fitz.Rect(
+                    0.0,
+                    0.0,
+                    self.default_option.format.width,
+                    self.default_option.format.height,
+                )
 
             if isinstance(self.sections[self.sindex][1].format, str):
                 return fitz.paper_rect(self.sections[self.sindex][1].format)

reporting/examples/row-with-images/Reports.py

@@ -73,7 +73,7 @@ def make_story(self):
 
 
 class Options(object):
-    def __init__(self, cols=1, format="A4", newpage=True):
+    def __init__(self, cols=0, format=None, newpage=None):
         self.cols = cols
         self.format = format
         self.newpage = newpage
@@ -312,7 +312,7 @@ def __init__(
         self.archive = fitz.Archive(archive) if archive else fitz.Archive(".")
         self.HEADER_RECT = None
         self.FOOTER_RECT = None
-        self.default_option = Options()
+        self.default_option = Options(cols=1, format=mediabox, newpage=True)
 
         self.css = css if css else ""
 
@@ -359,7 +359,7 @@ def current_story(self):  # get current story to draw
     def check_cols(self):  # set current columns and determin if going new page or not
         _newpage = self.default_option.newpage
         if isinstance(self.get_current_section(), list):
-            if len(self.get_current_section()) != 2:
+            if len(self.get_current_section()) != 2 or self.sections[self.sindex][1].cols == 0:
                 self.COLS = self.default_option.cols
                 return _newpage
 
@@ -370,8 +370,13 @@ def check_cols(self):  # set current columns and determin if going new page or n
 
     def get_pagerect(self):  # get current page mediabox
         if isinstance(self.sections[self.sindex], list):  # if section has info
-            if len(self.sections[self.sindex]) != 2:  # don't have property
-                return fitz.paper_rect(self.default_option.format)
+            if len(self.sections[self.sindex]) != 2 or self.sections[self.sindex][1].format == None:  # don't have property
+                return fitz.Rect(
+                    0.0,
+                    0.0,
+                    self.default_option.format.width,
+                    self.default_option.format.height,
+                )
 
             if isinstance(self.sections[self.sindex][1].format, str):
                 return fitz.paper_rect(self.sections[self.sindex][1].format)