From 303e3ae72fbcc2646c22190fee2457fe2a12cc40 Mon Sep 17 00:00:00 2001 From: Carsten Arnholm Date: Sun, 11 Nov 2018 16:46:06 +0100 Subject: [PATCH] Version v1.1-00 --- xcsg/boost_command_line.cpp | 2 +- xcsg/version.h | 2 +- xcsg/xcsg_main.cpp | 15 ++++++--------- 3 files changed, 8 insertions(+), 11 deletions(-) diff --git a/xcsg/boost_command_line.cpp b/xcsg/boost_command_line.cpp index 656989b..983692f 100644 --- 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(), "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 index 9f6e689..085592e 100644 --- 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 index b980cca..8354be5 100644 --- 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 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 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;