Sorting image examples.

michielkauwatjoe · michielkauwatjoe · commit 3ceb591ad60c · 2020-10-26T10:45:20.000+01:00
diff --git a/Basics/E01_Basics/E00_HelloWorld.py b/Basics/E01_Basics/E00_HelloWorld.py
@@ -34,6 +34,7 @@
 
 def draw(contextName):
     context = getContext(contextName)
+    exportPath = '%s/%s-%s.pdf' % (EXPORT, FILENAME, doc.context.name)
     doc = Document(w=W, h=H, context=context)
     # Gets the first page from te document.
     page = doc[1]
@@ -55,9 +56,6 @@ def draw(contextName):
     textBox = newText('Hello World', parent=page, font=FONTNAME, fontSize=96,
             x=W/4, y=W/4, w=W/2, h=H/2, fill=f, **options)
 
-    # Export in _export folder that does not commit in Git. Force to export
-    # PDF.
-    exportPath = '%s/%s-%s.pdf' % (EXPORT, FILENAME, doc.context.name)
     doc.export(exportPath)
 
 for contextName in ('DrawBot', 'Flat'):
diff --git a/Basics/E01_Basics/E06_BasicElements.py b/Basics/E01_Basics/E06_BasicElements.py
@@ -116,9 +116,12 @@ def draw(contextName):
 
     newBezierCurve(closed=False, points=points, fill=getColor(5), **options)
     newGlyphPath(font['Q'], fill=getColor(6), **options)
-    page.solve()
+    #newImage()
+
 
-    # Export in _export folder that does not commit in Git. Force to export PDF.
+
+    # Sets alignmetns and saves the results as a PDF.
+    page.solve()
     doc.export(exportPath)
 
 
diff --git a/Basics/E06_Images/E00_ImagePosition.py b/Basics/E06_Images/E00_ImagePosition.py
@@ -13,26 +13,26 @@
 #
 #     E00_ImagePosition.py
 #
-#     Position an image element in the page.
-#
-import os # Import module that communicates with the file system.
-import sys
+#     Position an image element on the page.
 
+import os
+import sys
+from pagebot import getContext
+from pagebot.conditions import *
+from pagebot.constants import A4, LEFT, RIGHT, BOTTOM, TOP, EXPORT
 from pagebot.document import Document
+from pagebot.elements import *
 from pagebot.filepaths import getResourcesPath
+from pagebot.toolbox.transformer import path2FileName
 from pagebot.toolbox.units import pt, mm
-from pagebot import getContext
-from pagebot.constants import A4, LEFT, RIGHT, BOTTOM, TOP
-from pagebot.elements import *
-from pagebot.conditions import *
 
-def imagePosition(contextName):
-    context = getContext(contextName)
-    W, H = pt(400, 400)
-
-    P = pt(30) # Padding of the page
+FILENAME = path2FileName(__file__)
+W, H = pt(400, 400)
+P = pt(30) # Page padding.
 
-    EXPORT_PATH = '_export/00_ImagePosition-%s.pdf' % contextName
+def draw(contextName):
+    context = getContext(contextName)
+    exportPath = '%s/%s-%s.pdf' % (EXPORT, FILENAME, contextName)
 
     # Define the path where to find the example image.
     path = getResourcesPath() + "/images/cookbot1.jpg"
@@ -57,10 +57,7 @@ def imagePosition(contextName):
     newImage(path, x=page.w-P, y=page.h-P, h=page.ph/2, parent=page,
             xAlign=RIGHT, yAlign=TOP, fill=(1, 1, 0, 0.5), rotate=90)
 
-    doc.export(EXPORT_PATH)
+    doc.export(exportPath)
 
-for contextName in (
-    'DrawBot',
-    'Flat',
-    ):
-    imagePosition(contextName)
+for contextName in ('DrawBot', 'Flat'):
+    draw(contextName)
diff --git a/Basics/E06_Images/E05_ImageClippingValues.py b/Basics/E06_Images/E05_ImageClippingValues.py
diff --git a/Basics/E06_Images/E11_UseImageObjectFilters.md b/Basics/E06_Images/E11_UseImageObjectFilters.md
@@ -489,3 +489,4 @@ Transitions from one image to another by creating a circular wave that expands f
 ##swipeTransition(targetImage=None, extent=None, color=None, time=None, angle=None, width=None, opacity=None)
 Transitions from one image to another by simulating a swiping action.
 *Attributes: targetImage an Image object, extent a tuple (x, y, w, h), color RGBA tuple Color (r, g, b, a), time a float, angle a float in degrees, width a float, opacity a float.*
+* 
