Revision: 64357
http://sourceforge.net/p/brlcad/code/64357
Author: starseeker
Date: 2015-03-10 19:03:17 +0000 (Tue, 10 Mar 2015)
Log Message:
-----------
clear some debug printing
Modified Paths:
--------------
brlcad/trunk/src/libbrep/shape_recognition.cpp
brlcad/trunk/src/libbrep/shape_recognition_sphere.cpp
brlcad/trunk/src/librt/test_shape_recognition.cpp
Modified: brlcad/trunk/src/libbrep/shape_recognition.cpp
===================================================================
--- brlcad/trunk/src/libbrep/shape_recognition.cpp 2015-03-10 18:38:29 UTC
(rev 64356)
+++ brlcad/trunk/src/libbrep/shape_recognition.cpp 2015-03-10 19:03:17 UTC
(rev 64357)
@@ -113,18 +113,15 @@
if (new_obj->fil_cnt > 0) {
int bool_op = subbrep_determine_boolean(new_obj);
if (bool_op == -1) {
- std::cout << bu_vls_addr(new_obj->key) << " is
subtracted\n";
new_obj->params->bool_op = '-';
}
if (bool_op == 1) {
- std::cout << bu_vls_addr(new_obj->key) << " is unioned\n";
new_obj->params->bool_op = 'u';
}
if (bool_op == 0) {
std::cout << "Error - ambiguous result for boolean test -
need to subdivide shape.\n";
}
} else {
- std::cout << bu_vls_addr(new_obj->key) << " is unioned\n";
new_obj->params->bool_op = 'u';
}
@@ -165,8 +162,6 @@
std::multimap<const char *, long *> ps;
for (unsigned int i = 0; i < BU_PTBL_LEN(subbreps); i++) {
struct subbrep_object_data *obj = (struct subbrep_object_data
*)BU_PTBL_GET(subbreps, i);
- std::cout << "Checking " << bu_vls_addr(obj->key) << "\n";
- std::cout << " op is: " << obj->params->bool_op << "\n";
if (obj->params->bool_op == '-') {
int found_parent = 0;
for (unsigned int j = 0; j < BU_PTBL_LEN(subbreps); j++) {
@@ -176,7 +171,6 @@
if (pobj->fol[l] == obj->fil[k]) {
found_parent = 1;
ps.insert(std::make_pair(bu_vls_addr(pobj->key),
(long *)obj));
- bu_log("%s is the parent of %s\n",
bu_vls_addr(pobj->key), bu_vls_addr(obj->key));
break;
}
if (found_parent) break;
@@ -198,10 +192,8 @@
std::pair <std::multimap<const char *, long *>::iterator,
std::multimap<const char *, long *>::iterator > ret;
ret = ps.equal_range(bu_vls_addr(obj->key));
bu_ptbl_ins(subbreps_tree, (long *)obj);
- std::cout << "unioning " << bu_vls_addr(obj->key) << "\n";
for (std::multimap<const char *, long *>::iterator it = ret.first;
it != ret.second; it++) {
struct subbrep_object_data *sub_obj = (struct
subbrep_object_data *)it->second;
- std::cout << "subtracting " << bu_vls_addr(sub_obj->key) << "
from " << bu_vls_addr(obj->key) << "\n";
bu_ptbl_ins(subbreps_tree, (long *)sub_obj);
}
}
Modified: brlcad/trunk/src/libbrep/shape_recognition_sphere.cpp
===================================================================
--- brlcad/trunk/src/libbrep/shape_recognition_sphere.cpp 2015-03-10
18:38:29 UTC (rev 64356)
+++ brlcad/trunk/src/libbrep/shape_recognition_sphere.cpp 2015-03-10
19:03:17 UTC (rev 64357)
@@ -221,11 +221,8 @@
// is determined later.
int negative = negative_sphere(data, *spherical_surfaces.begin(),
sph_tol);
- bu_log("parent boolean: %c\n", data->parent->params->bool_op);
-
if (data->parent->params->bool_op == '-') negative = -1 * negative;
-
switch (negative) {
case -1:
data->params->bool_op = '-';
@@ -255,7 +252,6 @@
if (!data->parent->planar_obj) {
subbrep_planar_init(data);
}
- std::cout << "add sph plane\n";
subbrep_add_planar_face(data->parent, &back_plane, &sph_verts,
negative);
}
@@ -337,7 +333,7 @@
}
- return 0;
+ return 1;
}
if (verts.size() >= 3) {
Modified: brlcad/trunk/src/librt/test_shape_recognition.cpp
===================================================================
--- brlcad/trunk/src/librt/test_shape_recognition.cpp 2015-03-10 18:38:29 UTC
(rev 64356)
+++ brlcad/trunk/src/librt/test_shape_recognition.cpp 2015-03-10 19:03:17 UTC
(rev 64357)
@@ -314,12 +314,14 @@
for (int i = 0; i < depth; i++)
bu_vls_printf(&spacer, " ");
//std::cout << bu_vls_addr(&spacer) << "Making shape for " <<
bu_vls_addr(data->key) << "\n";
+#if 0
if (data->planar_obj && data->planar_obj->local_brep) {
struct bu_vls brep_name = BU_VLS_INIT_ZERO;
bu_vls_sprintf(&brep_name, "planar_%s.s", bu_vls_addr(data->key));
mk_brep(wdbp, bu_vls_addr(&brep_name), data->planar_obj->local_brep);
bu_vls_free(&brep_name);
}
+#endif
if (data->type == BREP) {
if (data->local_brep) {
struct bu_vls brep_name = BU_VLS_INIT_ZERO;
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Dive into the World of Parallel Programming The Go Parallel Website, sponsored
by Intel and developed in partnership with Slashdot Media, is your hub for all
things parallel software development, from weekly thought leadership blogs to
news, videos, case studies, tutorials and more. Take a look and join the
conversation now. http://goparallel.sourceforge.net/
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
