Add possibility to rotate photo for horizontal frame #63

MikeGawi · Apr 24, 2022 · 15e2de9 · 15e2de9
1 parent 5af5a90
commit 15e2de9
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 6 deletions.
diff --git a/config.cfg b/config.cfg
@@ -241,6 +241,10 @@ auto_orientation=0
 # Default:1 (horizontal)
 horizontal=1
 
+# Indicates if photo should be turned upside-down for horizontal frame position.
+# Default:0 (normal)
+turned=0
+
 # Frame rotation in vertical position.
 # Values: 90 (right) or 270 (left) degrees.
 # Default: 90

diff --git a/misc/config.default b/misc/config.default
@@ -241,6 +241,10 @@ auto_orientation=0
 # Default:1 (horizontal)
 horizontal=1
 
+# Indicates if photo should be turned upside-down for horizontal frame position.
+# Default:0 (normal)
+turned=0
+
 # Frame rotation in vertical position.
 # Values: 90 (right) or 270 (left) degrees.
 # Default: 90

diff --git a/misc/constants.py b/misc/constants.py
@@ -2,7 +2,7 @@
 
 class constants:
 
-	EPIFRAME_VERSION = 'v1.6.0'
+	EPIFRAME_VERSION = 'v1.7.0'
 	EPIFRAME_SECRET = 'ePiframeSecretlyLovesYourPhotos'
 
 	#minimal needed python version

diff --git a/modules/configmanager.py b/modules/configmanager.py
@@ -48,7 +48,8 @@ def load_settings(self):
 			configprop('grayscale', self, prop_type=configprop.BOOLEAN_TYPE, dependency=['display_type', displaymanager.get_hdmi()]),
 			configprop('colors_num', self, minvalue=1, notempty=False, prop_type=configprop.INTEGER_TYPE, dependency=['display_type', displaymanager.get_hdmi()]),
 			configprop('horizontal', self, prop_type=configprop.BOOLEAN_TYPE),
-			configprop('auto_orientation', self, prop_type=configprop.BOOLEAN_TYPE),			
+			configprop('auto_orientation', self, prop_type=configprop.BOOLEAN_TYPE),
+			configprop('turned', self, prop_type=configprop.BOOLEAN_TYPE, dependency='horizontal'),
 			configprop('rotation', self, prop_type=configprop.INTEGER_TYPE, dependency=['horizontal', '0'], possible=convertmanager.get_rotation()),
 			configprop('auto_gamma', self, prop_type=configprop.BOOLEAN_TYPE),
 			configprop('auto_level', self, prop_type=configprop.BOOLEAN_TYPE),

diff --git a/modules/convertmanager.py b/modules/convertmanager.py
@@ -5,8 +5,8 @@ class convertmanager:
 
 	__ERROR_VALUE_TEXT = 'Configuration background_color should be one of {}'
 
-	__INVERT_FLAG = "-negate"
-	__ROTATE_CODE = '-rotate {}'
+	__INVERT_FLAG = "-negate "
+	__ROTATE_CODE = '-rotate {} '
 	__BACK_COLORS = ["white", "black", "photo"]
 	__GRAYSCALE_FLAG = "-colorspace Gray "
 	__COLORS_FLAG = "-colors {} "
@@ -74,8 +74,10 @@ def __convert_option (self, origwidth:int, origheight:int, target:str, config, h
 		if int(option) > len(self.__CONVERT_OPTIONS) or int(option) < 1: option = 1
 
 		#space at the end as those flag are optional
-		negate = self.__INVERT_FLAG + " " if config.getint('invert_colors') == 1 else ''
-		rotate = self.__ROTATE_CODE.format(config.getint('rotation')) + " " if config.getint('horizontal') == 0 else ''		
+		negate = self.__INVERT_FLAG if config.getint('invert_colors') == 1 else ''
+		rotate = self.__ROTATE_CODE.format(config.getint('rotation')) if config.getint('horizontal') == 0 else ''	
+
+		if config.getint('horizontal') == 1 and config.getint('turned') == 1: rotate = self.__ROTATE_CODE.format(180)
 
 		back = back.strip().lower()