Get borders fixed and nonsquare pixels

CDSherrill · CDSherrill · commit 1f04dd63dc8d · 2019-11-25T23:12:19.000-05:00
diff --git a/DIMENSIONS b/DIMENSIONS
@@ -1 +1,2 @@
 788x458
+should be 800x480
diff --git a/canvas-slideshow.js b/canvas-slideshow.js
@@ -48,13 +48,7 @@ function updateMainImage() {
     var sw = nw / cw;
     var sh = nh / ch;
     if (nh <= ch && nw <= cw) {
-      var wo = 10; // adjust for un-asked-for left border
-      var x = Math.floor((cw-nw)/2);
-      x = x - wo;
-      if (x < 0) {
-        x = 0;
-      }
-      context.drawImage(theImage,x,(ch-nh)/2,nw,nh);
+      context.drawImage(theImage,(cw-nw)/2,(ch-nh)/2,nw,nh);
     }
     else { // need to scale something to fit
       if (sw >= sh) {
diff --git a/canvas.html b/canvas.html
@@ -8,6 +8,14 @@
     canvas {
       border: 0px solid black;
     }
+    html, body, webview {
+      margin: 0;
+      padding: 0;
+      border: 0;
+      display: block;
+      width: 100%;
+      height: 100%;
+    }
     html {
       background-color: #000000;
     }
@@ -27,7 +35,7 @@
   <script src="canvas-slideshow.js"></script>
 </head>
 <body>
-<canvas id="mainimage" width="800" height="460"></canvas>
+<canvas id="mainimage" width="800" height="480"></canvas>
 </body>
 </html>
 
diff --git a/make-slidelist.py b/make-slidelist.py
@@ -11,8 +11,7 @@
 # do all searching inside this top level dir
 top_dir = '/home/pi/photo/'
 # look in these subdirectories of top_dir
-# subdirs = ['2017', '2016', '2015', '2014']
-subdirs = ['2017', '2016', '2015']
+subdirs = ['2019', '2018', '2017', '2016', '2015', '2014']
 # filename must end in one of these suffixes
 suffixes = ['.jpg', '.JPG', '.gif', '.GIF', '.png', '.PNG']
 # exclude any file that has these substrings
diff --git a/resize-pic-dir.py b/resize-pic-dir.py
@@ -11,14 +11,15 @@
 
 # max width and height of downsized pics
 max_width = 800
-max_height = 460
+max_height = 480
 # RPi touchscreen is 800x480 pixels in 155x86mm
 pixel_ratio = (800.0/155.0) / (480.0 / 86.0)
 
 # top-level dir to find the source pics...include trailing slash
 top_src_dir = '/mnt/photo/'
 # look in these subdirectories of top_src_dir
-src_subdirs = ['2017', '2016', '2015']
+src_subdirs = ['2019', '2018', '2017', '2016', '2015']
+#src_subdirs = ['test']
 
 # top-level dir to put the resized pics
 top_dst_dir = '/home/pi/photo/'
@@ -58,7 +59,7 @@
                   print("{} already exists".format(full_dst_name))
                   continue
                 print("{} -> \n  {}".format(full_src_name, full_dst_name))
-                command = "./resize-pic.py {} {} {} {} 7 7 {}".format(full_src_name, max_width, max_height, pixel_ratio, full_dst_name)
-                # print("command is {}".format(command))
+                command = "./resize-pic.py {} {} {} {:.4f} 7 7 {}".format(full_src_name, max_width, max_height, pixel_ratio, full_dst_name)
+                print("command is {}".format(command))
                 os.system(command)
 
diff --git a/resize-pic.py b/resize-pic.py
@@ -61,7 +61,7 @@
     if (src_width > src_height):
         dst_width = max_width
         scale = float(dst_width)/float(src_width)
-        dst_height = int(src_height*scale*pixel_ratio)
+        dst_height = int(src_height*scale/pixel_ratio)
 
         # if downscaled height fits within max_height, rescale and save
         if (dst_height <= max_height):
@@ -90,9 +90,9 @@
             src_height = cropped.height
             dst_height = max_height
             scale = float(dst_height)/float(src_height)
-            dst_width = int(src_width*scale/pixel_ratio)
+            dst_width = int(src_width*scale*pixel_ratio)
             src_img.resize(dst_width,dst_height)
-            print("Resized to {}x{}".format(dst_width,dst_height))
+            print("After crop resized to {}x{}".format(dst_width,dst_height))
             src_img.save(filename=outfilename)
         
     # if the pic is taller than wide:
@@ -103,7 +103,7 @@
         cropped = src_img[:,top_crop:(src_height-bottom_crop)]
         dst_height = max_height
         scale = float(dst_height)/float(cropped.height)
-        dst_width = int(src_width*scale/pixel_ratio)
+        dst_width = int(src_width*scale*pixel_ratio)
         cropped.resize(dst_width,dst_height)
         cropped.save(filename=outfilename)
 
