fix issue 13 -o outputFile argument to geomPipeline.py

Author: qingfengxia

.github/workflows/docker-ci.yml

@@ -77,9 +77,12 @@ jobs:
         make 2>&1 | tee clang_tidy_build_results.log
         make package
         ls *.${{ matrix.package_suffix }}
+        if hash dpkg 2>/dev/null; then  dpkg -i *.${{ matrix.package_suffix }}; fi
+        if hash rpm 2>/dev/null; then  rpm -Uhv *.${{ matrix.package_suffix }}; fi
         # copy the package to $GITHUB_WORKSPACE, pointer to host path, is not possible, while upload from ${{ github.workspace }} is fine
         mv *.${{ matrix.package_suffix }} ${{ env.PROJECT_NAME }}-${{ env.PROJECT_VERSION }}_${{ matrix.os }}.${{ matrix.package_suffix }}
 
+
     ###################  testing ##########################
     - name: Run unit tests
       working-directory: ${{ github.workspace }}/build

scripts/run_all_tests.sh

@@ -42,7 +42,7 @@ then
 fi
 geomPipeline.py detect ../data/test_geometry/test_geometry.stp --verbosity WARNING
 # run `geomPipeline.py` to generate a config.json file for test_*.py below
-geomPipeline.py ../data/test_geometry/test_geometry.stp --verbosity WARNING
+geomPipeline.py ../data/test_geometry/test_geometry.stp -o test_geometry_result.brep
 # test manifest.json input file type
 geomPipeline.py check ../data/test_geometry/test_geometry_manifest.json --verbosity WARNING
 if [ ! $? -eq 0 ] ; then   echo "Error during geometry test" ;  exit 1 ; fi

src/python/geomPipeline.py

@@ -67,7 +67,7 @@ def __str__(self):
 
 def geom_add_argument(parser):
     parser.add_argument(
-        "--metadata", nargs=1, help="input metadata file, only for brep input geometry"
+        "--metadata", help="input metadata file, only for brep input geometry"
     )
 
     # set the global parameters
@@ -112,21 +112,26 @@ def geom_add_argument(parser):
 outputFile = case_name + "_processed.brep"  # saved to case output folder
 if args.outputFile:
     outputFile = args.outputFile
+    print("args.outputFile = ", args.outputFile)
+
+# output metadata filename
+outputMetadataFile = outputFile[: outputFile.rfind(".")] + "_metadata.json"
 
 ################################ geom arg ##############################
-hasInputMetadataFile = True
+hasInputMetadataFile = False
 if args.metadata:
     if os.path.exists(args.metadata):
         inputMetadataFile = args.metadata
+        hasInputMetadataFile = True
     else:
         raise IOError("input metadata file does not exist: ", args.metadata)
 else:
     if inputFile.find(".brep") > 0 or inputFile.find(".brp"):
         inputMetadataFile = inputFile[: inputFile.rfind(".")] + "_metadata.json"
-    else:
-        hasInputMetadataFile = False
+        if os.path.exists(inputMetadataFile):
+            hasInputMetadataFile = True
 
-globalTolerance = 0.001
+globalTolerance = 0.001  # length unit is mm
 if args.tolerance:
     globalTolerance = args.tolerance
 
@@ -138,8 +143,6 @@ def geom_add_argument(parser):
 if args.ignore_failed != None and args.ignore_failed:
     ignoreFailed = True
 
-# output metadata filename
-outputMetadataFile = case_name + "_processed" + "_metadata.json"
 
 if debugging > 0:
     print("action on the geometry is ", args.action)

src/python/pppPipelineController.py

@@ -47,14 +47,14 @@ def ppp_add_argument(parser):
 
     # optional arguments
     parser.add_argument(
-        "-o", "--outputFile", nargs=1, help="output file name (without folder path)"
+        "-o", "--outputFile", help="output file name (without folder path)"
     )
+    # do not use "nargs=1" it will return args.outputFile as a list instead of string
     parser.add_argument(
-        "--workingDir", nargs=1, help="working folder path, by default pwd"
+        "--workingDir", help="working folder path, by default pwd"
     )
     parser.add_argument(
         "--outputDir",
-        nargs=1,
         help="output folder path, by default a subfolder in workingDir",
     )
 
@@ -250,6 +250,7 @@ def __init__(self):
         pass
 
     def config(self):
+        # this must be override by derived class
 
         parser = argparse.ArgumentParser(usage=USAGE)
         parser = ppp_add_argument(parser)

src/python/pppStartPipeline.py

@@ -51,7 +51,7 @@ def ppp_start_pipeline(config_file_name):
         p.process()
     else:
         import subprocess
-        result = subprocess.check_output([ppp_executable, config_file_name])
+        result = subprocess.check_output([ppp_geom_executable, config_file_name])
         print(result)