Commit 2fc1edbb authored by Jan Möbius's avatar Jan Möbius

Smoother extension for respecting features

git-svn-id: http://www.openflipper.org/svnrepo/OpenFlipper/branches/Free@5349 383ad7c9-94d9-4d36-a494-682f7c89f535
parent 2631ef22
...@@ -12,12 +12,12 @@ ...@@ -12,12 +12,12 @@
// it under the terms of the GNU Lesser General Public License as published by // it under the terms of the GNU Lesser General Public License as published by
// the Free Software Foundation, either version 3 of the License, or // the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version. // (at your option) any later version.
// //
// OpenFlipper is distributed in the hope that it will be useful, // OpenFlipper is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of // but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU Lesser General Public License for more details. // GNU Lesser General Public License for more details.
// //
// You should have received a copy of the GNU Lesser General Public License // You should have received a copy of the GNU Lesser General Public License
// along with OpenFlipper. If not, see <http://www.gnu.org/licenses/>. // along with OpenFlipper. If not, see <http://www.gnu.org/licenses/>.
// //
...@@ -40,6 +40,7 @@ class SmootherObject : public PerObjectData ...@@ -40,6 +40,7 @@ class SmootherObject : public PerObjectData
public: public:
SmootherObject(TriMesh* _mesh); SmootherObject(TriMesh* _mesh);
~SmootherObject(); ~SmootherObject();
OpenMesh::Smoother::JacobiLaplaceSmootherT< TriMesh >* smoother; OpenMesh::Smoother::JacobiLaplaceSmootherT< TriMesh >* smoother;
}; };
...@@ -12,12 +12,12 @@ ...@@ -12,12 +12,12 @@
// it under the terms of the GNU Lesser General Public License as published by // it under the terms of the GNU Lesser General Public License as published by
// the Free Software Foundation, either version 3 of the License, or // the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version. // (at your option) any later version.
// //
// OpenFlipper is distributed in the hope that it will be useful, // OpenFlipper is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of // but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU Lesser General Public License for more details. // GNU Lesser General Public License for more details.
// //
// You should have received a copy of the GNU Lesser General Public License // You should have received a copy of the GNU Lesser General Public License
// along with OpenFlipper. If not, see <http://www.gnu.org/licenses/>. // along with OpenFlipper. If not, see <http://www.gnu.org/licenses/>.
// //
...@@ -57,7 +57,7 @@ ...@@ -57,7 +57,7 @@
/** \brief Initialize the toolbox /** \brief Initialize the toolbox
* *
* @param _widget reference to the toolbox * @param _widget reference to the toolbox
* @return was the toolbox successfully created? * @return was the toolbox successfully created?
*/ */
...@@ -79,7 +79,7 @@ initializeToolbox(QWidget*& _widget) ...@@ -79,7 +79,7 @@ initializeToolbox(QWidget*& _widget)
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
/** \brief Set the scripting slot descriptions /** \brief Set the scripting slot descriptions
* *
*/ */
void void
SmootherPlugin::pluginsInitialized(){ SmootherPlugin::pluginsInitialized(){
...@@ -97,8 +97,8 @@ SmootherPlugin::pluginsInitialized(){ ...@@ -97,8 +97,8 @@ SmootherPlugin::pluginsInitialized(){
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
/** \brief Smooth all target objects /** \brief Smooth all target objects
* *
* Parameters for the smoothing are retrieved from the toolbox * Parameters for the smoothing are retrieved from the toolbox
* *
*/ */
...@@ -153,7 +153,8 @@ slot_smooth() ...@@ -153,7 +153,8 @@ slot_smooth()
emit log(LOGWARN , "Unable to read distance error from LineEdit"); emit log(LOGWARN , "Unable to read distance error from LineEdit");
} }
data->smoother->initialize(component,continuity); data->smoother->initialize(component,continuity );
data->smoother->skip_features(tool_->respectFeatures->isChecked());
data->smoother->smooth( tool_->sB_iter->value() ); data->smoother->smooth( tool_->sB_iter->value() );
......
...@@ -164,6 +164,13 @@ ...@@ -164,6 +164,13 @@
</item> </item>
</layout> </layout>
</item> </item>
<item>
<widget class="QCheckBox" name="respectFeatures" >
<property name="text" >
<string>Respect Features</string>
</property>
</widget>
</item>
</layout> </layout>
</widget> </widget>
</item> </item>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment