(WIP) Fixed maps and image output

Wangview.ipynb

@@ -4,12 +4,13 @@
    "cell_type": "code",
    "execution_count": null,
    "metadata": {
-    "collapsed": true
+    "collapsed": false
    },
    "outputs": [],
    "source": [
     "from Wangview.Display import Display\n",
-    "import sys"
+    "import sys\n",
+    "import argparse"
    ]
   },
   {
@@ -21,12 +22,31 @@
    "outputs": [],
    "source": [
     "if __name__ == '__main__':\n",
-    "    import sys\n",
+    "    parser = argparse.ArgumentParser(description='Render random landscapes using Wangscape tiles')\n",
+    "    parser.add_argument('path', type=str, default='.', help='Path to the folder containing the tileset and metadata')\n",
+    "    parser.add_argument('-g', '--tile-groups', metavar='TILE_GROUPS.json', type=str, default='tile_groups.json', help='Name of the tile groups JSON file')\n",
+    "    parser.add_argument('-c', '--terrain-hypergraph', metavar='TERRAIN_HYPERGRAPH.json', type=str, default='terrain_hypergraph.json', help='Name of the terrain hypergraph JSON file')\n",
+    "    parser.add_argument('-t', '--tileset-data', metavar='TILESET_DATA.json', type=str, default='tilesets.json', help='Name of the tileset data JSON file')\n",
+    "    parser.add_argument('-f', '--fps', metavar='FPS', type=int, default=30, help='Maximum frames per second')\n",
+    "    map_parser = parser.add_mutually_exclusive_group()\n",
+    "    map_parser.add_argument('-s', '--size', type=int, dest='map_mode', nargs=2, metavar=('X','Y'), help='Size of the map display')\n",
+    "    map_parser.add_argument('-m', '--fixed-map', metavar='FIXED_MAP.json', type=str, dest='map_mode', help='Name of a JSON file with a fixed map')\n",
+    "    output_parser = parser.add_argument_group()\n",
+    "    output_parser.add_argument('-d', '--display', dest='output_mode', action='append_const', const=True, help='Display maps in a GUI interface')\n",
+    "    output_parser.add_argument('-o', '--output', metavar='OUTPUT.png', dest='output_mode', action='append', type=str, help='Name of the image file to write the scene to')\n",
+    "    parser.set_defaults(map_mode=[30,20], output_mode=[])\n",
+    "    args = parser.parse_args()\n",
     "    try:\n",
-    "        w = Display(*sys.argv[1:])\n",
+    "        w = Display(rel_path = args.path,\n",
+    "                    fn_tile_groups = args.tile_groups,\n",
+    "                    fn_terrain_hypergraph = args.terrain_hypergraph,\n",
+    "                    fn_tileset_data = args.tileset_data,\n",
+    "                    fps = args.fps,\n",
+    "                    map_mode = args.map_mode,\n",
+    "                    output_mode = args.output_mode)\n",
     "        w.run()\n",
     "    except (IndexError, FileNotFoundError):\n",
-    "        print('Usage: Wangview.py [path [tile_groups.json [terrain_hypergraph.json [tileset_data.json]]]]\\n')\n",
+    "        parser.print_help()\n",
     "        raise"
    ]
   }

Wangview.py

@@ -1,20 +1,33 @@
 
 # coding: utf-8
-
-# In[ ]:
-
 from Wangview.Display import Display
 import sys
-
-
-# In[ ]:
+import argparse
 
 if __name__ == '__main__':
-    import sys
+    parser = argparse.ArgumentParser(description='Render random landscapes using Wangscape tiles')
+    parser.add_argument('path', type=str, default='.', help='Path to the folder containing the tileset and metadata')
+    parser.add_argument('-g', '--tile-groups', metavar='TILE_GROUPS.json', type=str, default='tile_groups.json', help='Name of the tile groups JSON file')
+    parser.add_argument('-c', '--terrain-hypergraph', metavar='TERRAIN_HYPERGRAPH.json', type=str, default='terrain_hypergraph.json', help='Name of the terrain hypergraph JSON file')
+    parser.add_argument('-t', '--tileset-data', metavar='TILESET_DATA.json', type=str, default='tilesets.json', help='Name of the tileset data JSON file')
+    parser.add_argument('-f', '--fps', metavar='FPS', type=int, default=30, help='Maximum frames per second')
+    map_parser = parser.add_mutually_exclusive_group()
+    map_parser.add_argument('-s', '--size', type=int, dest='map_mode', nargs=2, metavar=('X','Y'), help='Size of the map display')
+    map_parser.add_argument('-m', '--fixed-map', metavar='FIXED_MAP.json', type=str, dest='map_mode', help='Name of a JSON file with a fixed map')
+    output_parser = parser.add_argument_group()
+    output_parser.add_argument('-d', '--display', dest='output_mode', action='append_const', const=True, help='Display maps in a GUI interface')
+    output_parser.add_argument('-o', '--output', metavar='OUTPUT.png', dest='output_mode', action='append', type=str, help='Name of the image file to write the scene to')
+    parser.set_defaults(map_mode=[30,20], output_mode=[])
+    args = parser.parse_args()
     try:
-        w = Display(*sys.argv[1:])
+        w = Display(rel_path = args.path,
+                    fn_tile_groups = args.tile_groups,
+                    fn_terrain_hypergraph = args.terrain_hypergraph,
+                    fn_tileset_data = args.tileset_data,
+                    fps = args.fps,
+                    map_mode = args.map_mode,
+                    output_mode = args.output_mode)
         w.run()
     except (IndexError, FileNotFoundError):
-        print('Usage: Wangview.py [path [tile_groups.json [terrain_hypergraph.json [tileset_data.json]]]]\n')
+        parser.print_help()
         raise
-