Thread: [brlcad-commits] SF.net SVN: brlcad:[66004] brlcad/trunk/src/libged (Page 10)

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 454-5900

Revision: 66004
          http://sourceforge.net/p/brlcad/code/66004
Author:   starseeker
Date:     2015-08-18 11:34:16 +0000 (Tue, 18 Aug 2015)
Log Message:
-----------
Commit patch #404 from Brad Hollister adding 'kill F' nmg subcommand

Modified Paths:
--------------
    brlcad/trunk/src/libged/CMakeLists.txt
    brlcad/trunk/src/libged/nmg.c

Added Paths:
-----------
    brlcad/trunk/src/libged/nmg_kill_f.c

Modified: brlcad/trunk/src/libged/CMakeLists.txt
===================================================================

--- brlcad/trunk/src/libged/CMakeLists.txt	2015-08-18 06:16:54 UTC (rev 66003)
+++ brlcad/trunk/src/libged/CMakeLists.txt	2015-08-18 11:34:16 UTC (rev 66004)
@@ -167,6 +167,7 @@
   nmg_fix_normals.c
   nmg_simplify.c
   nmg_kill_v.c
+  nmg_kill_f.c
   ocenter.c
   open.c
   orient.c
@@ -355,4 +356,3 @@
 # indent-tabs-mode: t
 # End:
 # ex: shiftwidth=2 tabstop=8
-

Modified: brlcad/trunk/src/libged/nmg.c
===================================================================
--- brlcad/trunk/src/libged/nmg.c	2015-08-18 06:16:54 UTC (rev 66003)
+++ brlcad/trunk/src/libged/nmg.c	2015-08-18 11:34:16 UTC (rev 66004)
@@ -38,6 +38,7 @@
 extern int ged_nmg_mm(struct ged *gedp, int argc, const char *argv[]);
 extern int ged_nmg_cmface(struct ged *gedp, int argc, const char *argv[]);
 extern int ged_nmg_kill_v(struct ged *gedp, int argc, const char *argv[]);
+extern int ged_nmg_kill_f(struct ged *gedp, int argc, const char *argv[]);
 
 int
 ged_nmg(struct ged *gedp, int argc, const char *argv[])
@@ -63,6 +64,11 @@
             "coordinates) and higher-order topology containing the vertex. "
             "When specifying vertex to be removed, user generally will display "
             "vertex coordinates in object via the MGED command labelvert.\n");
+    bu_vls_printf(gedp->ged_result_str, "\tkill F         -  removes the "
+                "faceuse and face geometry of the selected face (via its "
+                "index). When specifying the face to be removed, user generally "
+                "will display face indices in object via the MGED command "
+                "labelface.\n");
     return GED_HELP;
     }
 
@@ -82,7 +88,12 @@
         ged_nmg_cmface(gedp, argc, argv);
     }
     else if( BU_STR_EQUAL( "kill", subcmd ) ) {
-        ged_nmg_kill_v(gedp, argc, argv);
+        const char* opt = argv[2];
+        if ( BU_STR_EQUAL( "V", opt ) ) {
+            ged_nmg_kill_v(gedp, argc, argv);
+        } else if ( BU_STR_EQUAL( "F", opt ) ) {
+            ged_nmg_kill_f(gedp, argc, argv);
+        }
     }
     else {
         bu_vls_printf(gedp->ged_result_str, "%s is not a subcommand.", subcmd );

Added: brlcad/trunk/src/libged/nmg_kill_f.c
===================================================================
--- brlcad/trunk/src/libged/nmg_kill_f.c	                        (rev 0)
+++ brlcad/trunk/src/libged/nmg_kill_f.c	2015-08-18 11:34:16 UTC (rev 66004)
@@ -0,0 +1,148 @@
+/*                         N M G _ K I L L _ F. C
+ * BRL-CAD
+ *
+ * Copyright (c) 2015 United States Government as represented by
+ * the U.S. Army Research Laboratory.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public License
+ * version 2.1 as published by the Free Software Foundation.
+ *
+ * This library is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this file; see the file named COPYING for more
+ * information.
+ */
+/** @file libged/nmg_kill_f.c
+ *
+ * The kill F subcommand for nmg top-level command.
+ *
+ */
+
+#include "common.h"
+
+#include <string.h>
+
+#include "bu/cmd.h"
+#include "rt/geom.h"
+
+#include "./ged_private.h"
+
+void remove_face(const struct model* m, long int fid)
+{
+    struct nmgregion *r;
+    struct shell *s;
+    struct faceuse *fu;
+    struct face *f;
+
+    NMG_CK_MODEL(m);
+
+    for (BU_LIST_FOR(r, nmgregion, &m->r_hd)) {
+       NMG_CK_REGION(r);
+
+       if (r->ra_p) {
+           NMG_CK_REGION_A(r->ra_p);
+       }
+
+       for (BU_LIST_FOR(s, shell, &r->s_hd)) {
+           NMG_CK_SHELL(s);
+
+           if (s->sa_p) {
+               NMG_CK_SHELL_A(s->sa_p);
+           }
+
+           /* Faces in shell */
+           for (BU_LIST_FOR(fu, faceuse, &s->fu_hd)) {
+               NMG_CK_FACEUSE(fu);
+               f = fu->f_p;
+               NMG_CK_FACE(f);
+
+               if ( fid == f->index ) {
+                   /* this kills both facesuses using the face,
+                    * and the face itself.
+                    */
+                   nmg_kfu(fu);
+               }
+           }
+       }
+    }
+}
+
+int
+ged_nmg_kill_f(struct ged* gedp, int argc, const char* argv[])
+{
+    struct rt_db_internal internal;
+    struct directory *dp;
+    struct model* m;
+    const char* name;
+    long int fid;
+
+    static const char *usage = "kill F id";
+
+    GED_CHECK_DATABASE_OPEN(gedp, GED_ERROR);
+    GED_CHECK_DRAWABLE(gedp, GED_ERROR);
+    GED_CHECK_READ_ONLY(gedp, GED_ERROR);
+    GED_CHECK_ARGC_GT_0(gedp, argc, GED_ERROR);
+
+    /* initialize result */
+    bu_vls_trunc(gedp->ged_result_str, 0);
+
+    /* must be wanting help */
+    if (argc < 4) {
+        bu_vls_printf(gedp->ged_result_str, "Usage: %s %s", argv[0], usage);
+        return GED_HELP;
+    }
+
+    /* attempt to resolve and verify */
+    name = argv[0];
+
+    if ( (dp=db_lookup(gedp->ged_wdbp->dbip, name, LOOKUP_QUIET))
+        == RT_DIR_NULL ) {
+        bu_vls_printf(gedp->ged_result_str, "%s does not exist\n", name);
+        return GED_ERROR;
+    }
+
+    if (rt_db_get_internal(&internal, dp, gedp->ged_wdbp->dbip,
+        bn_mat_identity, &rt_uniresource) < 0) {
+        bu_vls_printf(gedp->ged_result_str, "rt_db_get_internal() error\n");
+        return GED_ERROR;
+    }
+
+    if (internal.idb_type != ID_NMG) {
+        bu_vls_printf(gedp->ged_result_str, "%s is not an NMG solid\n", name);
+        rt_db_free_internal(&internal);
+        return GED_ERROR;
+    }
+
+    /* get face index from command line */
+    fid = (long int)atoi(argv[3]);
+
+    m = (struct model *)internal.idb_ptr;
+    NMG_CK_MODEL(m);
+
+    remove_face(m, fid);
+
+    if ( wdb_put_internal(gedp->ged_wdbp, name, &internal, 1.0) < 0 ) {
+        bu_vls_printf(gedp->ged_result_str, "wdb_put_internal(%s)", argv[1]);
+        rt_db_free_internal(&internal);
+        return GED_ERROR;
+    }
+
+    rt_db_free_internal(&internal);
+
+    return GED_OK;
+}
+
+/*
+ * Local Variables:
+ * tab-width: 8
+ * mode: C
+ * indent-tabs-mode: t
+ * c-file-style: "stroustrup"
+ * End:
+ * ex: shiftwidth=4 tabstop=8
+ */


Property changes on: brlcad/trunk/src/libged/nmg_kill_f.c
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.





Thread: [brlcad-commits] SF.net SVN: brlcad:[66004] brlcad/trunk/src/libged (Page 10)

Open Source Solid Modeling CAD

brlcad-commits