diff options
| -rw-r--r-- | src/csgtermnormalizer.cc | 4 | ||||
| -rw-r--r-- | src/mainwin.cc | 27 |
2 files changed, 22 insertions, 9 deletions
diff --git a/src/csgtermnormalizer.cc b/src/csgtermnormalizer.cc index 7a59aa1..b63ae05 100644 --- a/src/csgtermnormalizer.cc +++ b/src/csgtermnormalizer.cc @@ -2,12 +2,16 @@ #include "csgterm.h" #include "printutils.h" +/*! + NB! for e.g. empty intersections, this can normalize a tree to nothing and return NULL. +*/ shared_ptr<CSGTerm> CSGTermNormalizer::normalize(const shared_ptr<CSGTerm> &root, size_t limit) { shared_ptr<CSGTerm> temp = root; while (1) { shared_ptr<CSGTerm> n = normalizePass(temp); + if (!n) return n; // If normalized to nothing if (temp == n) break; temp = n; diff --git a/src/mainwin.cc b/src/mainwin.cc index f70b451..2fd75c9 100644 --- a/src/mainwin.cc +++ b/src/mainwin.cc @@ -159,7 +159,7 @@ MainWindow::MainWindow(const QString &filename) this->openglbox = NULL; root_module = NULL; absolute_root_node = NULL; - root_chain = NULL; + this->root_chain = NULL; #ifdef ENABLE_CGAL this->root_N = NULL; this->cgalRenderer = NULL; @@ -781,10 +781,16 @@ void MainWindow::compileCSG(bool procevents) CSGTermNormalizer normalizer; size_t normalizelimit = 2 * Preferences::inst()->getValue("advanced/openCSGLimit").toUInt(); this->root_norm_term = normalizer.normalize(this->root_raw_term, normalizelimit); - assert(this->root_norm_term); - - root_chain = new CSGChain(); - root_chain->import(this->root_norm_term); + if (this->root_norm_term) { + this->root_chain = new CSGChain(); + this->root_chain->import(this->root_norm_term); + } + else { + this->root_chain = NULL; + PRINT("WARNING: CSG normalization resulted in an empty tree"); + if (procevents) + QApplication::processEvents(); + } if (highlight_terms.size() > 0) { @@ -812,12 +818,15 @@ void MainWindow::compileCSG(bool procevents) } } - if (root_chain->polysets.size() > Preferences::inst()->getValue("advanced/openCSGLimit").toUInt()) { - PRINTB("WARNING: Normalized tree has %d elements!", root_chain->polysets.size()); + if (this->root_chain && + (this->root_chain->polysets.size() > + Preferences::inst()->getValue("advanced/openCSGLimit").toUInt())) { + PRINTB("WARNING: Normalized tree has %d elements!", this->root_chain->polysets.size()); PRINT("WARNING: OpenCSG rendering has been disabled."); } else { - PRINTB("Normalized CSG tree has %d elements", root_chain->polysets.size()); + PRINTB("Normalized CSG tree has %d elements", + (this->root_chain ? this->root_chain->polysets.size() : 0)); this->opencsgRenderer = new OpenCSGRenderer(this->root_chain, this->highlights_chain, this->background_chain, @@ -1269,7 +1278,7 @@ void MainWindow::actionDisplayCSGProducts() e->setTabStopWidth(30); e->setWindowTitle("CSG Products Dump"); e->setReadOnly(true); - e->setPlainText(QString("\nCSG before normalization:\n%1\n\n\nCSG after normalization:\n%2\n\n\nCSG rendering chain:\n%3\n\n\nHighlights CSG rendering chain:\n%4\n\n\nBackground CSG rendering chain:\n%5\n").arg(root_raw_term ? QString::fromStdString(root_raw_term->dump()) : "N/A", root_norm_term ? QString::fromStdString(root_norm_term->dump()) : "N/A", root_chain ? QString::fromStdString(root_chain->dump()) : "N/A", highlights_chain ? QString::fromStdString(highlights_chain->dump()) : "N/A", background_chain ? QString::fromStdString(background_chain->dump()) : "N/A")); + e->setPlainText(QString("\nCSG before normalization:\n%1\n\n\nCSG after normalization:\n%2\n\n\nCSG rendering chain:\n%3\n\n\nHighlights CSG rendering chain:\n%4\n\n\nBackground CSG rendering chain:\n%5\n").arg(root_raw_term ? QString::fromStdString(root_raw_term->dump()) : "N/A", root_norm_term ? QString::fromStdString(root_norm_term->dump()) : "N/A", this->root_chain ? QString::fromStdString(this->root_chain->dump()) : "N/A", highlights_chain ? QString::fromStdString(highlights_chain->dump()) : "N/A", background_chain ? QString::fromStdString(background_chain->dump()) : "N/A")); e->show(); e->resize(600, 400); clearCurrentOutput(); |