Skip to content

Commit 303e3ae

Browse files
committed
Version v1.1-00
1 parent a6f4682 commit 303e3ae

File tree

3 files changed

+8
-11
lines changed

3 files changed

+8
-11
lines changed

xcsg/boost_command_line.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ boost_command_line::boost_command_line(int argc , char **argv)
5757
("obj", "OBJ output format (Wavefront format)")
5858
("off", "OFF output format (Geomview Object File Format)")
5959
("max_bool", po::value<size_t>(), "Max number of booleans allowed")
60-
("web", "web mode")
60+
("fullpath", "Show full file paths.")
6161
;
6262

6363
hidden.add_options()

xcsg/version.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#ifndef XCSG_VERSION_H
22
#define XCSG_VERSION_H
33

4-
#define XCSG_version "v1.0-06"
4+
#define XCSG_version "v1.1-00"
55

66
#endif // XCSG_VERSION_H

xcsg/xcsg_main.cpp

+6-9
Original file line numberDiff line numberDiff line change
@@ -66,9 +66,8 @@ bool xcsg_main::run()
6666
throw std::logic_error(sout.str());
6767
}
6868

69-
// determine if we run in web mode or not
70-
bool web_mode = m_cmd.count("web")>0;
71-
bool show_path = !web_mode;
69+
// determine if we shall display full file paths
70+
bool show_path = m_cmd.count("fullpath")>0;
7271

7372
cf_xmlTree tree;
7473
if(tree.read_xml(xcsg_file)) {
@@ -114,9 +113,8 @@ bool xcsg_main::run_xsolid(cf_xmlNode& node,const std::string& xcsg_file)
114113
std::shared_ptr<xsolid> obj = xcsg_factory::singleton().make_solid(node);
115114
if(obj.get()) {
116115

117-
// determine if we run in web mode or not
118-
bool web_mode = m_cmd.count("web")>0;
119-
bool show_path = !web_mode;
116+
// determine if we shall display full file paths
117+
bool show_path = m_cmd.count("fullpath")>0;
120118

121119
size_t nbool = obj->nbool();
122120
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)
208206
std::shared_ptr<xshape2d> obj = xcsg_factory::singleton().make_shape2d(node);
209207
if(obj.get()) {
210208

211-
// determine if we run in web mode or not
212-
bool web_mode = m_cmd.count("web")>0;
213-
bool show_path = !web_mode;
209+
// determine if we shall display full file paths
210+
bool show_path = m_cmd.count("fullpath")>0;
214211

215212
size_t nbool = obj->nbool();
216213
cout << "...completed CSG tree: " << nbool << " boolean operations to process." << endl;

0 commit comments

Comments
 (0)