From c810c6847f7c260a924839279cf1bd1a17aaf47e Mon Sep 17 00:00:00 2001
From: Oliver Gloth <ogloth@engits.com>
Date: Thu, 23 Aug 2012 12:41:00 +0200
Subject: [PATCH] added possibility to choose the reduction rate (vtkDecimate)

---
 src/libengrid/brlcadreader.cpp            |  1 +
 src/libengrid/createcadtesselation.cpp    |  3 +-
 src/libengrid/createcadtesselation.h      |  2 +
 src/libengrid/guibrlcadimportdialogue.cpp |  5 +-
 src/libengrid/guibrlcadimportdialogue.h   |  1 +
 src/libengrid/guibrlcadimportdialogue.ui  | 99 +++++++++++++++++++------------
 6 files changed, 72 insertions(+), 39 deletions(-)

diff --git a/src/libengrid/brlcadreader.cpp b/src/libengrid/brlcadreader.cpp
index 3079e9a..c902a11 100644
--- a/src/libengrid/brlcadreader.cpp
+++ b/src/libengrid/brlcadreader.cpp
@@ -296,6 +296,7 @@ void BrlcadReader::operate()
           brlcad_tess.setSmoothingIterations(dlg.smoothingIterations());
           brlcad_tess.setSmallestFeatureSize(dlg.smallestFeatureSize());
           brlcad_tess.setSmallestResolution(dlg.smallestResolution());
+          brlcad_tess.setTargetReduction(dlg.reduction());
           brlcad_tess();
         }
         BrlCadProjection *brl_proj = new BrlCadProjection(getFileName(), dlg.selectedObject());
diff --git a/src/libengrid/createcadtesselation.cpp b/src/libengrid/createcadtesselation.cpp
index 35edc88..ab272d2 100644
--- a/src/libengrid/createcadtesselation.cpp
+++ b/src/libengrid/createcadtesselation.cpp
@@ -37,6 +37,7 @@ CreateCadTesselation::CreateCadTesselation()
   m_PreservationType = 0;
   m_SmallestFeatureSize = 1e99;
   m_SmallestResolution = 0;
+  m_TargetReduction = 0;
 }
 
 void CreateCadTesselation::scan(bool create_grid, int interlaces)
@@ -267,7 +268,7 @@ void CreateCadTesselation::scan(bool create_grid, int interlaces)
     tri->SetInput(contour->GetOutput());
     EG_VTKSP(vtkDecimatePro, decimate);
     decimate->PreserveTopologyOn();
-    decimate->SetTargetReduction(1.0);
+    decimate->SetTargetReduction(m_TargetReduction);
     decimate->SetFeatureAngle(GeometryTools::deg2rad(45));
     decimate->SetInput(tri->GetOutput());
     decimate->Update();
diff --git a/src/libengrid/createcadtesselation.h b/src/libengrid/createcadtesselation.h
index 4880cdc..7cc5707 100644
--- a/src/libengrid/createcadtesselation.h
+++ b/src/libengrid/createcadtesselation.h
@@ -46,6 +46,7 @@ protected: // attributes
   int    m_PreservationType;
   double m_SmallestFeatureSize;
   double m_SmallestResolution;
+  double m_TargetReduction;
 
 protected: // methods
 
@@ -74,6 +75,7 @@ public: // methods
   bool preserveFluid() { return m_PreservationType == 2; }
   void setSmallestFeatureSize(double sfs) { m_SmallestFeatureSize = sfs; }
   void setSmallestResolution(double h) { m_SmallestResolution = h; }
+  void setTargetReduction(double tr) { m_TargetReduction = tr; }
 
 };
 
diff --git a/src/libengrid/guibrlcadimportdialogue.cpp b/src/libengrid/guibrlcadimportdialogue.cpp
index 86bb553..6696e90 100644
--- a/src/libengrid/guibrlcadimportdialogue.cpp
+++ b/src/libengrid/guibrlcadimportdialogue.cpp
@@ -118,4 +118,7 @@ QString GuiBrlCadImportDialogue::stlFileName()
   return m_StlFileName;
 }
 
-
+double GuiBrlCadImportDialogue::reduction()
+{
+  return 0.01*double(ui->horizontalSliderReduction->value());
+}
diff --git a/src/libengrid/guibrlcadimportdialogue.h b/src/libengrid/guibrlcadimportdialogue.h
index 3e9fd7d..8cad8f1 100644
--- a/src/libengrid/guibrlcadimportdialogue.h
+++ b/src/libengrid/guibrlcadimportdialogue.h
@@ -46,6 +46,7 @@ public:
   double  scanMemory();
   double  smallestFeatureSize();
   double  smallestResolution();
+  double  reduction();
   int     smoothingIterations();
   int     preservationType();
   QString stlFileName();
diff --git a/src/libengrid/guibrlcadimportdialogue.ui b/src/libengrid/guibrlcadimportdialogue.ui
index ea3d4f5..84c67c6 100644
--- a/src/libengrid/guibrlcadimportdialogue.ui
+++ b/src/libengrid/guibrlcadimportdialogue.ui
@@ -14,20 +14,13 @@
    <string>Dialog</string>
   </property>
   <layout class="QGridLayout" name="gridLayout_2">
-   <item row="7" column="0" colspan="2">
-    <widget class="QDialogButtonBox" name="buttonBox">
-     <property name="orientation">
-      <enum>Qt::Horizontal</enum>
-     </property>
-     <property name="standardButtons">
-      <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
-     </property>
-    </widget>
-   </item>
-   <item row="3" column="1">
-    <widget class="QLineEdit" name="lineEditSmallestFeature">
+   <item row="4" column="0">
+    <widget class="QLabel" name="label_7">
      <property name="text">
-      <string>1e99</string>
+      <string>use available STL file</string>
+     </property>
+     <property name="alignment">
+      <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
      </property>
     </widget>
    </item>
@@ -47,20 +40,27 @@
      </property>
     </widget>
    </item>
-   <item row="0" column="0" colspan="2">
-    <widget class="QListWidget" name="listWidget"/>
+   <item row="4" column="1">
+    <widget class="QCheckBox" name="checkBoxSTL">
+     <property name="enabled">
+      <bool>false</bool>
+     </property>
+     <property name="text">
+      <string/>
+     </property>
+    </widget>
    </item>
-   <item row="1" column="0">
-    <widget class="QLabel" name="label">
+   <item row="2" column="0">
+    <widget class="QLabel" name="label_8">
      <property name="text">
-      <string>maximal scan memory [Gb]</string>
+      <string>smallest resolution</string>
      </property>
      <property name="alignment">
       <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
      </property>
     </widget>
    </item>
-   <item row="6" column="0" colspan="2">
+   <item row="7" column="0" colspan="2">
     <widget class="QGroupBox" name="groupBox">
      <property name="title">
       <string>smoothing</string>
@@ -153,55 +153,80 @@
      </property>
     </widget>
    </item>
-   <item row="4" column="1">
-    <widget class="QCheckBox" name="checkBoxSTL">
-     <property name="enabled">
-      <bool>false</bool>
-     </property>
+   <item row="2" column="1">
+    <widget class="QLineEdit" name="lineEditMinResolution">
      <property name="text">
-      <string/>
+      <string>0</string>
      </property>
     </widget>
    </item>
-   <item row="4" column="0">
-    <widget class="QLabel" name="label_7">
+   <item row="0" column="0" colspan="2">
+    <widget class="QListWidget" name="listWidget"/>
+   </item>
+   <item row="1" column="0">
+    <widget class="QLabel" name="label">
      <property name="text">
-      <string>use available STL file</string>
+      <string>maximal scan memory [Gb]</string>
      </property>
      <property name="alignment">
       <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
      </property>
     </widget>
    </item>
-   <item row="2" column="0">
-    <widget class="QLabel" name="label_8">
+   <item row="8" column="0" colspan="2">
+    <widget class="QDialogButtonBox" name="buttonBox">
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="standardButtons">
+      <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
+     </property>
+    </widget>
+   </item>
+   <item row="3" column="1">
+    <widget class="QLineEdit" name="lineEditSmallestFeature">
      <property name="text">
-      <string>smallest resolution</string>
+      <string>1e99</string>
      </property>
-     <property name="alignment">
-      <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+    </widget>
+   </item>
+   <item row="5" column="1">
+    <widget class="QSlider" name="horizontalSliderReduction">
+     <property name="maximum">
+      <number>100</number>
+     </property>
+     <property name="value">
+      <number>100</number>
+     </property>
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
      </property>
     </widget>
    </item>
-   <item row="2" column="1">
-    <widget class="QLineEdit" name="lineEditMinResolution">
+   <item row="5" column="0">
+    <widget class="QLabel" name="label_9">
      <property name="text">
-      <string>0</string>
+      <string>triangle reduction</string>
+     </property>
+     <property name="alignment">
+      <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
      </property>
     </widget>
    </item>
   </layout>
  </widget>
  <tabstops>
-  <tabstop>listWidget</tabstop>
   <tabstop>doubleSpinBoxMemory</tabstop>
+  <tabstop>lineEditMinResolution</tabstop>
   <tabstop>lineEditSmallestFeature</tabstop>
   <tabstop>checkBoxSTL</tabstop>
+  <tabstop>horizontalSliderReduction</tabstop>
   <tabstop>spinBoxSmoothing</tabstop>
   <tabstop>radioButtonNoPreservation</tabstop>
   <tabstop>radioButtonSolidPreservation</tabstop>
   <tabstop>radioButtonFluidPreservation</tabstop>
   <tabstop>buttonBox</tabstop>
+  <tabstop>listWidget</tabstop>
  </tabstops>
  <resources/>
  <connections>
-- 
2.11.4.GIT