Version v1.1-00

arnholm · Nov 11, 2018 · 303e3ae · 303e3ae
1 parent a6f4682
commit 303e3ae
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 11 deletions.
diff --git a/xcsg/boost_command_line.cpp b/xcsg/boost_command_line.cpp
@@ -57,7 +57,7 @@ boost_command_line::boost_command_line(int argc , char **argv)
         ("obj",   "OBJ output format (Wavefront format)")
         ("off",   "OFF output format (Geomview Object File Format)")
         ("max_bool", po::value<size_t>(),  "Max number of booleans allowed")
-        ("web",   "web mode")
+        ("fullpath", "Show full file paths.")
          ;
 
    hidden.add_options()

diff --git a/xcsg/version.h b/xcsg/version.h
@@ -1,6 +1,6 @@
 #ifndef XCSG_VERSION_H
 #define XCSG_VERSION_H
 
-#define XCSG_version "v1.0-06"
+#define XCSG_version "v1.1-00"
 
 #endif // XCSG_VERSION_H
diff --git a/xcsg/xcsg_main.cpp b/xcsg/xcsg_main.cpp
@@ -66,9 +66,8 @@ bool xcsg_main::run()
       throw std::logic_error(sout.str());
    }
 
-   // determine if we run in web mode or not
-   bool web_mode  = m_cmd.count("web")>0;
-   bool show_path = !web_mode;
+   // determine if we shall display full file paths
+   bool show_path = m_cmd.count("fullpath")>0;
 
    cf_xmlTree tree;
    if(tree.read_xml(xcsg_file)) {
@@ -114,9 +113,8 @@ bool xcsg_main::run_xsolid(cf_xmlNode& node,const std::string& xcsg_file)
    std::shared_ptr<xsolid> obj = xcsg_factory::singleton().make_solid(node);
    if(obj.get()) {
 
-      // determine if we run in web mode or not
-      bool web_mode  = m_cmd.count("web")>0;
-      bool show_path = !web_mode;
+      // determine if we shall display full file paths
+      bool show_path = m_cmd.count("fullpath")>0;
 
       size_t nbool = obj->nbool();
       cout << "...completed CSG tree: " <<  nbool << " boolean operations to process." << endl;
@@ -208,9 +206,8 @@ bool xcsg_main::run_xshape2d(cf_xmlNode& node,const std::string& xcsg_file)
    std::shared_ptr<xshape2d> obj = xcsg_factory::singleton().make_shape2d(node);
    if(obj.get()) {
 
-      // determine if we run in web mode or not
-      bool web_mode  = m_cmd.count("web")>0;
-      bool show_path = !web_mode;
+      // determine if we shall display full file paths
+      bool show_path = m_cmd.count("fullpath")>0;
 
       size_t nbool = obj->nbool();
       cout << "...completed CSG tree: " <<  nbool << " boolean operations to process." << endl;