Merge pull request #3 from TAlonglong/fork/develop

Fork/develop

pydecorate/__init__.py

@@ -17,6 +17,3 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 from pydecorate.decorator_agg import DecoratorAGG
-
-
-

pydecorate/decorator_agg.py

@@ -34,6 +34,13 @@ def _load_default_font(self):
         font_path = resource_filename('pydecorate.fonts', 'DejaVuSerif.ttf')
         return aggdraw.Font('black', font_path, size=16)
 
+    def _load_font(self):
+        import aggdraw
+        try:
+            return aggdraw.Font(self.style['line'], self.style['font'], self.style['font_size'])
+        except IOError:
+            raise
+
     def add_text(self, txt, **kwargs):
         self._add_text(txt, **kwargs)
 

pydecorate/decorator_base.py

@@ -49,6 +49,7 @@
     'fill': 'black',
     'fill_opacity': 255,
     'font': None,
+    'font_size': 16,
     'start_border': [0, 0],
     'extend': False,
     'tick_marks': 1.0,
@@ -225,16 +226,35 @@ def _draw_text(self, draw, xy, txt, font, fill='black', align='cc', dry_run=Fals
 
         return tw, th
 
+    def _check_align(self):
+        if 'align' in self.style:
+            if 'top_bottom' in self.style['align']:
+                if self.style['align']['top_bottom'] == 'top':
+                    self.align_top()
+                elif self.style['align']['top_bottom'] == 'bottom':
+                    self.align_bottom()
+            if 'left_right' in self.style['align']:
+                if self.style['align']['left_right'] == 'left':
+                    self.align_left()
+                elif self.style['align']['left_right'] == 'right':
+                    self.align_right()
+
+    def _get_current_font(self):
+        if self.style['font'] is None:
+            self.style['font'] = self._load_default_font()
+        else:
+            self.style['font'] = self._load_font()
+
     def _add_text(self, txt, **kwargs):
         # synchronize kwargs into style
         self.set_style(**kwargs)
+        self._check_align()
 
         # draw object
         draw = self._get_canvas(self.image)
 
         # check for font object
-        if self.style['font'] is None:
-            self.style['font'] = self._load_default_font()
+        self._get_current_font()
 
         # image size
         x_size, y_size = self.image.size
@@ -306,6 +326,7 @@ def _draw_rectangle(self, draw, xys, **kwargs):
     def _add_logo(self, logo_path, **kwargs):
         # synchronize kwargs into style
         self.set_style(**kwargs)
+        self._check_align()
 
         # current xy and margins
         x = self.style['cursor'][0]

setup.py

@@ -45,15 +45,12 @@
                    "Operating System :: OS Independent",
                    "Programming Language :: Python",
                    "Topic :: Scientific/Engineering"],
-      url="http://code.google.com/p/pydecorate/",
-      # download_url="..."
+      url="https://github.com/pytroll/pydecorate",
       long_description=long_description,
       license='GPLv3',
-
       packages=['pydecorate'],
       include_package_data=True,
       package_data={'pydecorate': ['fonts/*.ttf']},
-
       # Project should use reStructuredText, so ensure that the docutils get
       # installed or upgraded on the target machine
       install_requires=['pillow', 'aggdraw'],
@@ -62,6 +59,4 @@
       # test_suite="",
       tests_require=['pytest', 'mock'],
       python_requires='>=2.7,!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*',
-
-      zip_safe=False
-      )
+      zip_safe=False)