More preprocessing power to the scripts.

MarcelloPerathoner · MarcelloPerathoner · commit eb2bf5132970 · 2018-12-04T14:52:41.000+01:00
diff --git a/dome1.lp b/dome1.lp
@@ -0,0 +1,60 @@
+0.129535 0.129535 0.983078
+-0.129535 0.129535 0.983078
+-0.129535 -0.129535 0.983078
+0.129535 -0.129535 0.983078
+0.332218 0.332218 0.882758
+0.000000 0.469828 0.882758
+-0.332218 0.332218 0.882758
+-0.469828 0.000000 0.882758
+-0.332218 -0.332218 0.882758
+-0.000000 -0.469828 0.882758
+0.332218 -0.332218 0.882758
+0.469828 -0.000000 0.882758
+0.502899 0.502899 0.702983
+0.272167 0.657069 0.702983
+0.000000 0.711207 0.702983
+-0.272167 0.657069 0.702983
+-0.502899 0.502899 0.702983
+-0.657069 0.272167 0.702983
+-0.711207 0.000000 0.702983
+-0.657069 -0.272167 0.702983
+-0.502899 -0.502899 0.702983
+-0.272167 -0.657069 0.702983
+-0.000000 -0.711207 0.702983
+0.272167 -0.657069 0.702983
+0.502899 -0.502899 0.702983
+0.657069 -0.272167 0.702983
+0.711207 -0.000000 0.702983
+0.657069 0.272167 0.702983
+0.633958 0.633958 0.442939
+0.343095 0.828306 0.442939
+0.000000 0.896552 0.442939
+-0.343095 0.828306 0.442939
+-0.633958 0.633958 0.442939
+-0.828306 0.343095 0.442939
+-0.896552 0.000000 0.442939
+-0.828306 -0.343095 0.442939
+-0.633958 -0.633958 0.442939
+-0.343095 -0.828306 0.442939
+-0.000000 -0.896552 0.442939
+0.343095 -0.828306 0.442939
+0.633958 -0.633958 0.442939
+0.828306 -0.343095 0.442939
+0.896552 -0.000000 0.442939
+0.828306 0.343095 0.442939
+0.696439 0.696439 0.173046
+0.376910 0.909942 0.173046
+0.000000 0.984914 0.173046
+-0.376910 0.909942 0.173046
+-0.696439 0.696439 0.173046
+-0.909942 0.376910 0.173046
+-0.984914 0.000000 0.173046
+-0.909942 -0.376910 0.173046
+-0.696439 -0.696439 0.173046
+-0.376910 -0.909942 0.173046
+-0.000000 -0.984914 0.173046
+0.376910 -0.909942 0.173046
+0.696439 -0.696439 0.173046
+0.909942 -0.376910 0.173046
+0.984914 -0.000000 0.173046
+0.909942 0.376910 0.173046
diff --git a/rti-builder/ptm-encoder.c b/rti-builder/ptm-encoder.c
@@ -158,20 +158,19 @@ int main (int argc, char *argv[]) {
                fflush (stderr); */
 
             char *path = malloc (strlen (dirname_lp) + strlen (filename) + 2);
-
             sprintf (path, "%s/%s", dirname_lp, filename);
+
             FILE *fp_jpeg;
             if ((fp_jpeg = fopen (path, "rb")) == NULL) {
                 fprintf (stderr, "can't open %s\n", path);
                 return 1;
             }
-            free (filename);
             free (path);
 
             decoder_t *decoder = malloc (sizeof (decoder_t));
             struct jpeg_decompress_struct *dinfo = &decoder->dinfo;
             decoder->fp = fp_jpeg;
-            decoder->filename = strdup (filename);
+            decoder->filename = filename;
             decoder->u = u;
             decoder->v = v;
             decoder->w = w;
diff --git a/scripts/image-converter.py b/scripts/image-converter.py
@@ -0,0 +1,137 @@
+#!/usr/bin/python3
+# -*- encoding: utf-8 -*-
+
+"""This script is a wrapper that can pass image files through a converter before
+calling the :ref:`ptm-encoder <ptm-encoder>`.
+
+With the help of this script you may crop / resize / rotate your images before
+processing them with the ptm-encoder.  Temporary files are created for the
+encoder, the original files are kept intact.
+
+Write a shell script and :command:`chmod +x` it.  The shell script must process
+the source image, apply all wanted transformations and save the destination
+image.  The source image path and filename will be $1 and the destination path
+and filename will be $2.  The destination will point to a temp directory.
+
+An example of a shell script follows:
+
+.. code-block:: shell
+
+   #!/bin/bash
+   convert "$1" -crop 2800x2800+2236+1064 -resize 2000x2000 "$2"
+
+An example of a command to build one PTM is then:
+
+.. code-block:: console
+
+   scripts/image-converter.py -f runs/a/convert.sh \\
+      bin/ptm-encoder -f PTM_FORMAT_JPEG_LRGB -o a.ptm runs/a/sample.lp
+
+Alternatively you can do without the shell script and put the contents of the
+script in the command line.  The placeholders "{source}" and "{dest}" will be
+replaced by the source and destination filenames.
+
+The command to build one PTM is then:
+
+.. code-block:: console
+
+   scripts/image-converter.py -e 'convert "{source}" -crop 2800x2800+2236+1064 -resize 2000x2000 "{dest}"' \\
+      bin/ptm-encoder -f PTM_FORMAT_JPEG_LRGB -o a.ptm runs/a/sample.lp
+
+"""
+
+import argparse
+import datetime
+import math
+import itertools
+import operator
+import os
+import shlex
+import shutil
+import subprocess
+import sys
+import tempfile
+import textwrap
+
+
+
+def build_parser ():
+    parser = argparse.ArgumentParser (
+        formatter_class=argparse.RawDescriptionHelpFormatter,
+        description=textwrap.dedent (__doc__)
+    )
+
+    parser.add_argument ('-v', '--verbose', dest='verbose', action='count',
+                         help='increase output verbosity', default=0)
+
+    group = parser.add_mutually_exclusive_group (required=True)
+    group.add_argument ('-e', '--exec', metavar='"COMMANDLINE"', type=str,
+                         help='execute COMMANDLINE with every image')
+    group.add_argument ('-f', '--file', metavar='SCRIPT-FILE', type=str,
+                         help='execute SCRIPT-FILE with every image')
+
+    parser.add_argument ('encoder', metavar="ENCODER",
+                         help='the PTM encoder executable')
+    parser.add_argument ('encoder_args', nargs=argparse.REMAINDER, metavar="...",
+                         help='arguments to the PTM encoder')
+
+    return parser
+
+
+class light (object):
+    def __init__ (self, s, source_dir, dest_dir):
+        self.filename, x, y, z = s.split ()
+        self.basename = os.path.basename (self.filename)
+        self.source = os.path.join (source_dir, self.basename)
+        self.dest   = os.path.join (dest_dir,   self.basename)
+        self.x = float (x)
+        self.y = float (y)
+        self.z = float (z)
+
+    def __str__ (self):
+        return "%s %f %f %f" % (self.basename, self.x, self.y, self.z)
+
+
+if __name__ == '__main__':
+
+    parser = build_parser ()
+    args = parser.parse_args ()
+
+    lights_fn  = args.encoder_args[-1]
+    source_dir = os.path.dirname (lights_fn)
+    dest_dir   = tempfile.mkdtemp ()
+
+    if args.file:
+        args.exec = "%s {source} {dest}" % args.file
+
+    lights = []
+    with open (lights_fn, 'r') as fp_lights:
+        for line in fp_lights:
+            try:
+                lights.append (light (line, source_dir, dest_dir))
+            except ValueError:
+                pass
+
+    lights_dest_fn = os.path.join (dest_dir, os.path.basename (lights_fn))
+
+    with open (lights_dest_fn, 'w') as fp_lights:
+        fp_lights.write (str (len (lights)) + "\n")
+        for light in lights:
+            fp_lights.write (str (light) + "\n")
+
+    processes = []
+    for light in lights:
+        arg = shlex.split (args.exec.format (source=light.source, dest=light.dest))
+        print (' '.join (arg))
+        processes.append (subprocess.Popen (arg))
+
+    for process in processes:
+        process.wait ()
+
+    args.encoder_args[-1] = lights_dest_fn
+
+    arg = [args.encoder] + shlex.split (' '.join (args.encoder_args))
+    print (' '.join (arg))
+    subprocess.call (arg)
+
+    shutil.rmtree (dest_dir)
diff --git a/scripts/image-filer.py b/scripts/image-filer.py
@@ -1,13 +1,17 @@
 #!/usr/bin/python3
 # -*- encoding: utf-8 -*-
 
-"""Group image runs and file them into subdirectories.
+"""Reads images from a camera's memory card or other flat directory structure,
+finds runs of images and files them into subdirectories.  A run is found by the
+:term:`EXIF` timestamp in the image files.
 
-Reads images from a camera's memory card or other flat directory structure, and
-groups them into subdirectories.  A group is found by the :term:`EXIF` timestamp
-in the image files.  The script also builds a :file:`sample.lp` file in the
-directory that contains a :ref:`light position map <sample.lp>` for the
-:ref:`PTM encoder <ptm-encoder>`.
+The script also builds a full :ref:`light position map <sample.lp>`
+:file:`sample.lp` from a light position skeleton file and files it alongside the
+images files.
+
+Some cameras put a maximum of 1000 pictures into a folder.  After that they
+automatically open a new folder.  If this happened during a shooting, include
+both directories on the commandline.  The script will sort it out for you.
 
 """
 
@@ -19,14 +23,11 @@
 import os
 import shutil
 import sys
+import textwrap
 
 from PIL import Image
 from PIL.ExifTags import TAGS, GPSTAGS
 
-DOME_DIAMETER = 490.0 - (2 * 13.0)
-RINGS = [ (4, 85.0), (8, 218.0), (16, 330.0), (16, 416.0), (16, 457.0) ]
-
-twopi = 2.0 * math.pi
 thres = datetime.timedelta (seconds = 5)
 
 
@@ -50,12 +51,18 @@ def pairwise (iterable):
 
 
 def build_parser ():
-    parser = argparse.ArgumentParser (description = __doc__)
+    parser = argparse.ArgumentParser (
+        formatter_class=argparse.RawDescriptionHelpFormatter,
+        description=textwrap.dedent (__doc__)
+    )
 
-    parser.add_argument('files', metavar='FILE', type=str, nargs='+',
-                        help='the image files to file (wildcards supported)')
     parser.add_argument ('-v', '--verbose', dest='verbose', action='count',
                          help='increase output verbosity', default=0)
+    parser.add_argument ('-l', '--lights', metavar='LP', type=str, default='skeleton.lp',
+                         help='the skeleton light positions file (default: skeleton.lp)')
+
+    parser.add_argument ('files', metavar='FILES', type=str, nargs='+',
+                         help='the image files to file (wildcards supported)')
     return parser
 
 
@@ -64,6 +71,14 @@ def build_parser ():
     parser = build_parser ()
     args = parser.parse_args ()
 
+    # read lights file
+    lights = []
+    with open (args.lights, 'r') as fp_lights:
+        for line in fp_lights:
+            x, y, z = line.split ()
+            lights.append ( (float (x), float (y), float (z)) )
+
+    # get timestamps from images
     files = [ (fn, get_datetime (fn)) for fn in args.files ]
     files.sort (key = operator.itemgetter (1)) # sort by time
 
@@ -78,25 +93,28 @@ def build_parser ():
             last_group.append (pair[0])
 
     for files in grouped_files:
-        i = 0
         run = 'runs/' + files[0][1].strftime ('%Y-%m-%d-%H-%M-%S')
         os.makedirs (run, exist_ok = True)
 
+        if len (files) < len (lights):
+            print ("error: not enough files in %s\n" % run)
+            break
+        if len (files) > len (lights):
+            print ("error: too many files in %s\n" % run)
+            break
+
         if args.verbose:
-            print ("filing into %s\n" % run)
+            print ("filing into %s" % run)
 
         with open ("%s/sample.lp" % run, 'w') as fp:
-            fp.write ("# run of %s\n" % files[0][1].isoformat ())
             fp.write ("%d\n" % len (files))
-            for num_leds, diameter in RINGS:
-                phi = 1.0 / 8.0 * twopi                 # start each ring at 45°
-                step_phi = -twopi / num_leds
-                dia = diameter / DOME_DIAMETER
-                z = math.sqrt (1 - dia ** 2)
-
-                for n in range (0, num_leds):
-                    filename = files[i][0]
-                    shutil.copy2 (filename, run)
-                    fp.write ("%s %f %f %f\n" % (os.path.basename (filename), dia * math.sin (phi), dia * math.cos (phi), z))
-                    phi += step_phi
-                    i += 1
+            for l, f in zip (lights, files):
+                filename = f[0]
+                x, y, z = l
+                shutil.copy2 (filename, run)
+                fp.write ("%s %f %f %f\n" % (os.path.basename (filename), x, y, z))
+                if args.verbose:
+                    print (".", end = '')
+
+        if args.verbose:
+            print ("")
diff --git a/scripts/lp-builder.py b/scripts/lp-builder.py
@@ -0,0 +1,52 @@
+#!/usr/bin/python3
+# -*- encoding: utf-8 -*-
+
+"""Build the light position file for Dome 1.
+
+Outputs to stdout a skeleton sample.lp file with light positions according to
+the Ø 50cm prototype dome at CCeH.
+
+This script is hard-coded to one specific dome but it may serve as example for
+writing a more general script for other domes.
+
+"""
+
+import argparse
+import math
+import sys
+
+DOME_DIAMETER = 490.0 - (2 * 13.0)
+RINGS = [ (4, 85.0), (8, 218.0), (16, 330.0), (16, 416.0), (16, 457.0) ]
+
+twopi = 2.0 * math.pi
+
+def build_parser ():
+    parser = argparse.ArgumentParser (description = __doc__)
+
+    parser.add_argument ('-a', '--angle', metavar='ANGLE', type=float, default=0.0,
+                         help='the rotation angle of the camera on the Dome (default 0°)')
+    parser.add_argument ('-v', '--verbose', dest='verbose', action='count',
+                         help='increase output verbosity', default=0)
+    return parser
+
+
+if __name__ == '__main__':
+
+    parser = build_parser ()
+    args = parser.parse_args ()
+
+    start_phi = twopi * 45.0 / 360.0          # start each ring at 45°
+    user_phi  = twopi * args.angle / 360.0    # rotated camera
+
+    # num_leds = sum ([x[0] for x in RINGS])
+    # sys.stdout.write ("%d\n" % num_leds)
+
+    for num_leds, diameter in RINGS:
+        phi = start_phi + user_phi
+        step_phi = -twopi / num_leds
+        dia = diameter / DOME_DIAMETER
+        z = math.sqrt (1 - dia ** 2)
+
+        for n in range (0, num_leds):
+            sys.stdout.write ("%f %f %f\n" % (dia * math.sin (phi), dia * math.cos (phi), z))
+            phi += step_phi
