Add vanHateren data

navipy/scripts/blend_ongrid.py

@@ -2,28 +2,30 @@
 
 """
 import sys
-import argparse
 import os
 import inspect
 import pkg_resources
 import tempfile
+from navipy.scripts import parser_logger, args_to_logparam
 # Following need to be imported in blender as well
 import yaml
 import numpy as np
 from navipy.sensors.renderer import BlenderRender
 import navipy.maths.constants as mconst
+from navipy import logger
 
 
 importwithinblender = [
     'import yaml',
     'import numpy as np',
     'from navipy.sensors.renderer import BlenderRender',
-    'import navipy.maths.constants as mconst']
+    'import navipy.maths.constants as mconst',
+    'from navipy import logger']
 
 
 def parser_blend_ongrid():
     # Create command line options
-    parser = argparse.ArgumentParser()
+    parser = parser_logger()
     arghelp = 'Path to the environment (.blend) in which your agent lives'
     defaultworld = pkg_resources.resource_filename(
         'navipy', 'resources/twocylinders_world.blend')
@@ -52,18 +54,11 @@ def parser_blend_ongrid():
                         default=None,
                         help=arghelp)
 
-    arghelp = 'To display some stuff \n'
-    arghelp += ' * -v print command \n'
-    arghelp += ' * -vv print also script'
-    parser.add_argument('-v', '--verbose',
-                        action='count',
-                        default=0,
-                        help=arghelp)
-
     return parser
 
 
-def run(config_file, outputfile):
+def run(config_file, outputfile, level, logfile):
+    logger(level, logfile)
     renderer = BlenderRender()
     renderer.config_file = config_file
     try:
@@ -136,6 +131,7 @@ def main():
 
     # Fetch arguments
     args = parser_blend_ongrid().parse_args()
+    loglevel, logfile = args_to_logparam(args)
     # Some output
     print('-----')
     print('Config file:\n{}'.format(args.config_file))
@@ -154,8 +150,9 @@ def main():
             tfile.write(line.encode(encoding))
         tfile.write('\n\n'.encode(encoding))
         tfile.write('try:\n'.encode(encoding))
-        tfile.write('     run("{}","{}")\n'.format(
-            args.config_file, args.output_file).encode(encoding))
+        tfile.write('     run("{}","{}",{},"{}")\n'.format(
+            args.config_file, args.output_file, loglevel,
+            logfile).encode(encoding))
         tfile.write('     sys.exit(0)\n'.encode(encoding))
         tfile.write('except Exception:\n'.encode(encoding))
         tfile.write('     sys.exit(1)\n'.encode(encoding))

navipy/sensors/renderer.py

@@ -483,6 +483,7 @@ class BlenderRender(AbstractRender):
         .. note: A temporary file will be written on the harddrive,
                  due to API blender limitation
         """
+        self._logger.info('get image')
         # save image as a temporary file, and then loaded
         # sadly the rendered image pixels can not directly be access
         keyframe = bpy.context.scene.frame_current
@@ -492,6 +493,9 @@ class BlenderRender(AbstractRender):
                                 self.tmp_fileoutput['ext'])
         im_width, im_height = self.camera_resolution
         im = bpy.data.images.load(filename)
+        # remote image once we read it. To avoid storing all images
+        self._logger.debug('Delete file {}'.format(filename))
+        os.remove(filename)
         pixels = np.array(im.pixels)
         pixels = pixels.reshape([im_height, im_width, -1])
         # The last channel is the alpha channel
@@ -511,6 +515,7 @@ class BlenderRender(AbstractRender):
         .. todo: use @property
                      def distance(self)
         """
+        self._logger.info('get distances')
         # save image as a temporary file, and then loaded
         # sadly the rendered image pixels can not directly be access
         keyframe = bpy.context.scene.frame_current
@@ -520,6 +525,8 @@ class BlenderRender(AbstractRender):
                                 self.tmp_fileoutput['ext'])
         im_width, im_height = self.camera_resolution
         im = bpy.data.images.load(filename)
+        # remote image once we read it. To avoid storing all images
+        # somehow failing os.remove(filename)
         distance = np.array(im.pixels)
         distance = distance.reshape([im_height, im_width, -1])
         # Distance are channel independent