diff options
Diffstat (limited to 'src/dxfrotextrude.cc')
| -rw-r--r-- | src/dxfrotextrude.cc | 36 |
1 files changed, 1 insertions, 35 deletions
diff --git a/src/dxfrotextrude.cc b/src/dxfrotextrude.cc index 21718ac..ba0d420 100644 --- a/src/dxfrotextrude.cc +++ b/src/dxfrotextrude.cc @@ -30,6 +30,7 @@ #include "builtin.h" #include "polyset.h" #include "dxfdata.h" +#include "progress.h" #include "openscad.h" // get_fragments_from_r() #include <sys/types.h> @@ -112,17 +113,6 @@ void register_builtin_dxf_rotate_extrude() builtin_modules["rotate_extrude"] = new DxfRotateExtrudeModule(); } -static void report_func(const class AbstractNode*, void *vp, int mark) -{ - QProgressDialog *pd = (QProgressDialog*)vp; - int v = (int)((mark*100.0) / progress_report_count); - pd->setValue(v < 100 ? v : 99); - QString label; - label.sprintf("Rendering Polygon Mesh using CGAL (%d/%d)", mark, progress_report_count); - pd->setLabelText(label); - QApplication::processEvents(); -} - PolySet *DxfRotateExtrudeNode::render_polyset(render_mode_e rm) const { QString key = mk_cache_id(); @@ -137,24 +127,6 @@ PolySet *DxfRotateExtrudeNode::render_polyset(render_mode_e rm) const if (filename.isEmpty()) { #ifdef ENABLE_CGAL - QTime t; - QProgressDialog *pd; - - if (rm == RENDER_OPENCSG) - { - PRINT_NOCACHE("Processing uncached rotate_extrude outline..."); - QApplication::processEvents(); - - t.start(); - pd = new QProgressDialog("Rendering Polygon Mesh using CGAL...", QString(), 0, 100); - pd->setValue(0); - pd->setAutoClose(false); - pd->show(); - QApplication::processEvents(); - - progress_report_prep((AbstractNode*)this, report_func, pd); - } - CGAL_Nef_polyhedron N; N.dim = 2; foreach(AbstractNode * v, children) { @@ -164,12 +136,6 @@ PolySet *DxfRotateExtrudeNode::render_polyset(render_mode_e rm) const } dxf = new DxfData(N); - if (rm == RENDER_OPENCSG) { - progress_report_fin(); - int s = t.elapsed() / 1000; - PRINTF_NOCACHE("..rendering time: %d hours, %d minutes, %d seconds", s / (60*60), (s / 60) % 60, s % 60); - delete pd; - } #else // ENABLE_CGAL PRINT("WARNING: Found rotate_extrude() statement without dxf file but compiled without CGAL support!"); dxf = new DxfData(); |