fixes for local hosting

Author: kylemcdonald

camamokjs/README.md

@@ -13,3 +13,12 @@ The server can also be started from the Lightleaks docker image by running
 ```
 bin/camamok
 ```
+
+## Running without Docker
+
+```
+nvm install 14
+nvm use 14
+npm install
+npm run dev
+```

camamokjs/src/CameraTriggerApp.svelte

@@ -31,7 +31,7 @@
 
   export const preferences = writable("camtriggerpreferences_v3", {
     cameraUrl: "http://192.168.1.2:8080",
-    proCamScanUrl: "http://host.docker.internal:8000",
+    proCamScanUrl: "http://localhost:8000", // should be host.docker.internal if running inside docker
     shutterSpeed: 0,
     captureDuration: 0,
   });
@@ -516,7 +516,7 @@
     </div>
   </div>
   <div class="panel-row">
-    <div class="box"><img style="max-width: 100%" src={previewSrc} /></div>
+    <div class="box"><img style="max-width: 100%" src={previewSrc} alt="preview" /></div>
   </div>
 </div>
 

python/src/imutil.py

@@ -70,14 +70,16 @@ def imwrite(filename, img):
     if len(img.shape) == 2:
         return cv2.imwrite(filename, img)
     if len(img.shape) == 3:
-        if img.shape[-1] == 3:
+        if img.shape[-1] == 1:
+            return cv2.imwrite(filename, img[:,:,0])
+        elif img.shape[-1] == 3:
             return cv2.imwrite(filename, img[...,::-1])
-        if img.shape[-1] == 4:
+        elif img.shape[-1] == 4:
             return cv2.imwrite(filename, img[...,(2,1,0,3)])
         else:
-            raise Exception('Unsupported number of channels')
+            raise Exception('Unsupported number of channels for shape', img.shape)
     else:
-        raise Exception('Unsupported image shape')
+        raise Exception('Unsupported image shape', img.shape)
 
 def downsample(img, scale=None, output_wh=None, max_side=None, min_side=None, block_size=None, mode=None):
     if max_side is not None: