Revision: 71778 http://sourceforge.net/p/brlcad/code/71778 Author: starseeker Date: 2018-09-21 23:22:32 +0000 (Fri, 21 Sep 2018) Log Message: ----------- Make method options shorter, match printed labels when command is run
Modified Paths: -------------- brlcad/trunk/doc/docbook/system/mann/facetize.xml brlcad/trunk/src/libged/facetize.c Modified: brlcad/trunk/doc/docbook/system/mann/facetize.xml =================================================================== --- brlcad/trunk/doc/docbook/system/mann/facetize.xml 2018-09-21 23:11:03 UTC (rev 71777) +++ brlcad/trunk/doc/docbook/system/mann/facetize.xml 2018-09-21 23:22:32 UTC (rev 71778) @@ -25,13 +25,13 @@ <arg choice="opt" rep="norepeat">-r</arg> <arg choice="opt" rep="norepeat">-n</arg> <arg choice="opt" rep="norepeat">-T</arg> - <arg choice="opt" rep="norepeat">--nmgbool</arg> - <arg choice="opt" rep="norepeat">--continuation</arg> - <arg choice="opt" rep="norepeat">--poisson</arg> + <arg choice="opt" rep="norepeat">--NMG</arg> + <arg choice="opt" rep="norepeat">--CM</arg> + <arg choice="opt" rep="norepeat">--SPSR</arg> <arg choice="req" rep="norepeat"><replaceable>old_object new_object</replaceable></arg> </cmdsynopsis> <cmdsynopsis sepchar=" "> - <command>facetize --continuation</command> + <command>facetize --CM</command> <arg choice="opt" rep="norepeat">--feature-scale</arg> <arg choice="opt" rep="norepeat">--feature-size</arg> <arg choice="opt" rep="norepeat">--decimation-feature-size</arg> @@ -40,7 +40,7 @@ <arg choice="req" rep="norepeat"><replaceable>old_object new_object</replaceable></arg> </cmdsynopsis> <cmdsynopsis sepchar=" "> - <command>facetize --poisson</command> + <command>facetize --SPSR</command> <arg choice="opt" rep="norepeat">-d</arg> <arg choice="opt" rep="norepeat">-w</arg> <arg choice="opt" rep="norepeat">--samples-per-node</arg> @@ -133,7 +133,7 @@ any fallback conversion methods. </para> <para> - <prompt>mged></prompt> <userinput>facetize -r --nmgbool model model.f</userinput> + <prompt>mged></prompt> <userinput>facetize -r --NMG model model.f</userinput> </para> </example> @@ -163,8 +163,8 @@ the existing geometry. When it succeeds, NMG's output is generally the best quality output that can be produced by any of BRL-CAD's available facetization methods. If NMG booleans fail, a fall-back method based on Bloomenthal's continuation method (CM) polygonalizer will be attempted by default.Note - that if any of the methodology flags (<emphasis>--nmgbool</emphasis>,<emphasis>--continuation</emphasis>, - or <emphasis>--poisson</emphasis>) are explicitly enabled, the other methodologies will be disabled unless they + that if any of the methodology flags (<emphasis>--NMG</emphasis>,<emphasis>--CM</emphasis>, + or <emphasis>--SPSR</emphasis>) are explicitly enabled, the other methodologies will be disabled unless they too are explicitly enabled. </para> <para> @@ -199,7 +199,7 @@ Both NMG and CM assume a geometry hierarchy containing only valid solid objects. Both methods will refuse to process any tree containing recognizably non-solid objects, as these tend to cause run-time problems and generate invalid outputs. For non-solid - objects, the "--poisson" methodology may be enabled - it will apply the Kazhdan et. al. Screened Poisson Surface + objects, the "--SPSR" methodology may be enabled - it will apply the Kazhdan et. al. Screened Poisson Surface Reconstruction (SPSR) process to a pseudo-randomly sampled point set generated from <emphasis>old_object</emphasis>. This methodology may not cope well with the type of points sets generated from CAD geometry and is off by default in normal <command>facetize</command> processing, but it is also the only currently available Modified: brlcad/trunk/src/libged/facetize.c =================================================================== --- brlcad/trunk/src/libged/facetize.c 2018-09-21 23:11:03 UTC (rev 71777) +++ brlcad/trunk/src/libged/facetize.c 2018-09-21 23:22:32 UTC (rev 71778) @@ -2660,8 +2660,8 @@ ged_facetize(struct ged *gedp, int argc, const char *argv[]) { int ret = GED_OK; - static const char *usage = "Usage: facetize [ -nmhT | [--poisson] ] [old_obj1 | new_obj] [old_obj* ...] [old_objN | new_obj]\n"; - static const char *pusage = "Usage: facetize --poisson [-d #] [-w #] [ray sampling options] old_obj new_obj\n"; + static const char *usage = "Usage: facetize [ -nmhT | [--NMG] [--CM] [--SPSR] ] [old_obj1 | new_obj] [old_obj* ...] [old_objN | new_obj]\n"; + static const char *pusage = "Usage: facetize --SPSR [-d #] [-w #] [ray sampling options] old_obj new_obj\n"; int print_help = 0; int need_help = 0; struct _ged_facetize_opts *opts = _ged_facetize_opts_create(); @@ -2671,9 +2671,9 @@ BU_OPT(d[0], "h", "help", "", NULL, &print_help, "Print help and exit"); BU_OPT(d[1], "v", "verbose", "", &_ged_vopt, &(opts->verbosity), "Verbose output (multiple flags increase verbosity)"); BU_OPT(d[2], "q", "quiet", "", NULL, &(opts->quiet), "Suppress all output (overrides verbose flag)"); - BU_OPT(d[3], "", "nmgbool", "", NULL, &(opts->nmgbool), "Use the standard libnmg boolean mesh evaluation to create output (Default)"); - BU_OPT(d[4], "", "continuation", "", NULL, &(opts->continuation), "Use the Continuation Method to sample the object and create output"); - BU_OPT(d[5], "", "poisson", "", NULL, &(opts->screened_poisson), "Use raytraced points and SPSR to create output - run -h --poisson to see more options for this mode"); + BU_OPT(d[3], "", "NMG", "", NULL, &(opts->nmgbool), "Use the standard libnmg boolean mesh evaluation to create output (Default)"); + BU_OPT(d[4], "", "CM", "", NULL, &(opts->continuation), "Use the Continuation Method to sample the object and create output"); + BU_OPT(d[5], "", "SPSR", "", NULL, &(opts->screened_poisson), "Use raytraced points and SPSR to create output - run -h --SPSR to see more options for this mode"); BU_OPT(d[6], "n", "NMG", "", NULL, &(opts->make_nmg), "Create an N-Manifold Geometry (NMG) object (default is to create a triangular BoT mesh)"); BU_OPT(d[7], "", "TNURB", "", NULL, &(opts->nmg_use_tnurbs), "Create TNURB faces rather than planar approximations (experimental)"); BU_OPT(d[8], "T", "triangles", "", NULL, &(opts->triangulate), "Generate a NMG solid using only triangles (BoTs, the default output, can only use triangles - this option mimics that behavior for NMG output.)"); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. _______________________________________________ BRL-CAD Source Commits mailing list brlcad-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/brlcad-commits