fix

RingOV · May 29, 2019 · 8701d40 · 8701d40
1 parent 2dd9a26
commit 8701d40
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/gis-weather.py b/gis-weather.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python3
 #
 #  gis_weather.py
-v = '0.8.2.84'
+v = '0.8.2.85'
 #  Copyright (C) 2013-2018 Alexander Koltsov <ringov@mail.ru>
 #
 #    This program is free software: you can redistribute it and/or modify
@@ -1505,7 +1505,13 @@ def draw_scaled_image_svg(self, cr, x, y, pix, w, h, ang = 0):
             cr.translate(-w//2, -h//2)
         else:
             cr.translate(x, y)
-        cr.scale(w/svg.props.width, h/svg.props.height)
+        k=1
+        if svg.props.width>svg.props.height:
+            k=svg.props.width/svg.props.height
+        if k==1:
+            cr.scale(w/svg.props.width, h/svg.props.height)
+        else:
+            cr.scale(w/svg.props.width, h/svg.props.height/k)
         svg.render_cairo(cr)
         cr.restore()
 

diff --git a/services/gismeteo.py b/services/gismeteo.py
@@ -278,7 +278,6 @@ def get_weather():
     sunrise = dt1.strftime('%H:%M')
     sunset = dt2.strftime('%H:%M')
     sun_duration = ':'.join(str(dt3).split(':')[:2])
-    print(sunrise, sunset, sun_duration)
 
     # temperature
     t_now = re.findall('<fact.*? t="(.*?)"',source)