From b463dfe88a3327bba89c31b32800ec2d68742db6 Mon Sep 17 00:00:00 2001 From: Ken Arroyo Ohori Date: Thu, 9 Feb 2017 14:46:02 -0600 Subject: [PATCH] Changed --kernel parameter to --opencascade. Was conflicting with positional options for input. --- src/ifcconvert/IfcConvert.cpp | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/ifcconvert/IfcConvert.cpp b/src/ifcconvert/IfcConvert.cpp index 5b9057a73b..b64e8b508f 100644 --- a/src/ifcconvert/IfcConvert.cpp +++ b/src/ifcconvert/IfcConvert.cpp @@ -202,7 +202,8 @@ int main(int argc, char** argv) { "Applies --include or --exclude also to the decomposition and/or containment (IsDecomposedBy, " "HasOpenings, FillsVoid, ContainedInStructure) of the filtered entity, e.g. " "--include --traverse --names \"Level 1\" includes entity with name \"Level 1\" and all of its children.") - ("kernel", "Geometry kernel to use ('opencascade' or 'cgal'). Defaults to 'cgal'."); +// ("kernel", "Geometry kernel to use ('opencascade' or 'cgal'). Defaults to 'cgal'.") + ("opencascade", "Use opencascade kernel rather than cgal."); std::string bounds; boost::program_options::options_description serializer_options("Serialization options"); @@ -286,10 +287,11 @@ int main(int argc, char** argv) { const bool traverse = vmap.count("traverse") != 0; const bool deflection_tolerance_specified = vmap.count("deflection-tolerance") != 0 ; - if (vmap.count("kernel") == 0) { - std::cerr << "Using default CGAL based kernel" << std::endl; - kernel = "cgal"; - } + if (vmap.count("opencascade") == 1) { + kernel = "opencascade"; + } else { + kernel = "cgal"; + } int bounding_width = -1, bounding_height = -1; if (vmap.count("bounds") == 1) {