Dev simbuilder fix (#199)

* output dir does not need to exist * fixed pytests
3dgeo-heidelberg · Mar 11, 2022 · 79b047a · 79b047a
1 parent 1191ee6
commit 79b047a
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 2 deletions.
diff --git a/pyhelios/simulation_builder.py b/pyhelios/simulation_builder.py
@@ -167,7 +167,8 @@ def setAssetsDir(self, assetsDir):
         self.assetsDir = assetsDir
 
     def setOutputDir(self, outputDir):
-        self.validateDir(outputDir)
+        # self.validateDir(outputDir)  # note: the output dir does not have to exist at this point
+        #                                      as it can be created by (py)helios when running it
         self.outputDir = outputDir
 
     def setNumThreads(self, numThreads):

diff --git a/pytests/test_flight_planner.py b/pytests/test_flight_planner.py
@@ -156,21 +156,25 @@ def test_write_legs_not_always_active():
 
     # expected
     expected_legs_xml = f'''
+        <!-- leg000 -->
         <leg>
             <platformSettings x="{waypoints[0, 0]}" y="{waypoints[0, 1]}" z="{altitude}" movePerSec_m="{speed}" />
             <scannerSettings template="{template_id}" trajectoryTimeInterval_s="0.05" />
         </leg>
         
+        <!-- leg001 -->
         <leg>
             <platformSettings x="{waypoints[1, 0]}" y="{waypoints[1, 1]}" z="{altitude}" movePerSec_m="{speed}" />
             <scannerSettings template="{template_id}" active="false" trajectoryTimeInterval_s="0.05" />
         </leg>
         
+        <!-- leg002 -->
         <leg>
             <platformSettings x="{waypoints[2, 0]}" y="{waypoints[2, 1]}" z="{altitude}" movePerSec_m="{speed}" />
             <scannerSettings template="{template_id}" trajectoryTimeInterval_s="0.05" />
         </leg>
         
+        <!-- leg003 -->
         <leg>
             <platformSettings x="{waypoints[3, 0]}" y="{waypoints[3, 1]}" z="{altitude}" movePerSec_m="{speed}" />
             <scannerSettings template="{template_id}" active="false" trajectoryTimeInterval_s="0.05" />

diff --git a/pytests/test_scene_writer.py b/pytests/test_scene_writer.py
@@ -87,7 +87,8 @@ def test_create_scenepart_obj_efilepath():
     obj_filter_expected = f'''
             <part>
                 <filter type="objloader">
-                    <param type="string" key="efilepath" value="{filepath} up="z" />
+                    <param type="string" key="efilepath" value="{filepath}" />
+                    <param type="string" key="up" value="z" />
                 </filter>
 
             </part>'''