Skip to content

Commit

Permalink
Update polyhedron demo with ball_radius np in Adaptive_sizing_field
Browse files Browse the repository at this point in the history
  • Loading branch information
@ipadjen
ipadjen committed Sep 9, 2023
1 parent 78b066e commit 9102274
Show file tree
Hide file tree
Showing 3 changed files with 191 additions and 108 deletions.
7 changes: 3 additions & 4 deletions Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/Adaptive_sizing_field.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -85,10 +85,9 @@ class Adaptive_sizing_field : public Sizing_field_base<PolygonMesh>
* \cgalNamedParamsBegin
* \cgalParamNBegin{ball_radius}
* \cgalParamDescription{a scalar value specifying the radius used for expanding curvature measures
* by summing measures of faces inside a ball of this radius centered at the
* vertex expanded from. The summed face measures are weighted by their
* inclusion ratio inside this ball.}
* \cgalParamDescription{a scalar value specifying the radius used for expanding curvature measures.
* It can potentially smooth the curvature and consequently the sizing field in the
* case of noisy input.}
* \cgalParamDescription{a scalar value specifying the radius used for expanding curvature measures.
* It can effectively smooth the curvature field and consequently the sizing field.}
* \cgalParamType{`Base::FT`}
Expand Down
219 changes: 128 additions & 91 deletions Polyhedron/demo/Polyhedron/Plugins/PMP/Isotropic_remeshing_dialog.ui
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<x>0</x>
<y>0</y>
<width>381</width>
<height>545</height>
<height>620</height>
</rect>
</property>
<property name="windowTitle">
Expand Down Expand Up @@ -59,7 +59,68 @@
<property name="title">
<string>Isotropic remeshing</string>
</property>
<layout class="QGridLayout" name="gridLayout_2" rowstretch="0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0" columnstretch="0,0">
<layout class="QGridLayout" name="gridLayout_2" rowstretch="0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0" columnstretch="0,0">
<item row="15" column="1">
<widget class="QCheckBox" name="curvSmooth_checkbox">
<property name="text">
<string/>
</property>
</widget>
</item>
<item row="13" column="0" alignment="Qt::AlignRight">
<widget class="QLabel" name="minEdgeLength_label">
<property name="text">
<string>Minimum edge length</string>
</property>
</widget>
</item>
<item row="25" column="1">
<widget class="QCheckBox" name="smooth1D_checkbox">
<property name="text">
<string/>
</property>
</widget>
</item>
<item row="22" column="1">
<widget class="QSpinBox" name="nbSmoothing_spinbox">
<property name="minimum">
<number>0</number>
</property>
<property name="maximum">
<number>100</number>
</property>
<property name="value">
<number>1</number>
</property>
</widget>
</item>
<item row="12" column="0" alignment="Qt::AlignRight">
<widget class="QLabel" name="errorTol_label">
<property name="text">
<string>Error tolerance</string>
</property>
</widget>
</item>
<item row="24" column="1">
<widget class="QCheckBox" name="protect_checkbox">
<property name="text">
<string/>
</property>
<property name="checked">
<bool>true</bool>
</property>
</widget>
</item>
<item row="12" column="1">
<widget class="DoubleEdit" name="errorTol_edit">
<property name="text">
<string/>
</property>
<property name="placeholderText">
<string>0.00</string>
</property>
</widget>
</item>
<item row="3" column="0">
<layout class="QHBoxLayout" name="horizontalLayout_2">
<property name="spacing">
Expand Down Expand Up @@ -109,7 +170,7 @@
</item>
</layout>
</item>
<item row="15" column="0">
<item row="17" column="0">
<spacer name="verticalSpacer">
<property name="orientation">
<enum>Qt::Vertical</enum>
Expand All @@ -122,87 +183,17 @@
</property>
</spacer>
</item>
<item row="18" column="0" colspan="2">
<spacer name="verticalSpacer_3">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::Maximum</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>24</height>
</size>
</property>
</spacer>
</item>
<item row="12" column="0" alignment="Qt::AlignRight">
<widget class="QLabel" name="errorTol_label">
<property name="text">
<string>Error tolerance</string>
</property>
</widget>
</item>
<item row="12" column="1">
<widget class="DoubleEdit" name="errorTol_edit">
<property name="text">
<string/>
</property>
<property name="placeholderText">
<string>0.00</string>
</property>
</widget>
</item>
<item row="13" column="0" alignment="Qt::AlignRight">
<widget class="QLabel" name="minEdgeLength_label">
<property name="text">
<string>Minimum edge length</string>
</property>
</widget>
</item>
<item row="20" column="1">
<widget class="QCheckBox" name="smooth1D_checkbox">
<property name="text">
<string/>
</property>
</widget>
</item>
<item row="17" column="1">
<widget class="QSpinBox" name="nbSmoothing_spinbox">
<property name="minimum">
<number>0</number>
</property>
<property name="maximum">
<number>100</number>
</property>
<property name="value">
<number>1</number>
</property>
</widget>
</item>
<item row="19" column="1">
<widget class="QCheckBox" name="protect_checkbox">
<property name="text">
<string/>
</property>
<property name="checked">
<bool>true</bool>
</property>
</widget>
</item>
<item row="17" column="0">
<widget class="QLabel" name="nbSmoothing_label">
<item row="25" column="0">
<widget class="QLabel" name="smooth1D_label">
<property name="text">
<string>Number of Smoothing iterations</string>
<string>Allow 1D smoothing along borders</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
</widget>
</item>
<item row="19" column="0">
<item row="24" column="0">
<widget class="QLabel" name="protect_label">
<property name="text">
<string>Protect borders/selected edges</string>
Expand All @@ -212,24 +203,14 @@
</property>
</widget>
</item>
<item row="21" column="1">
<item row="26" column="1">
<widget class="QCheckBox" name="preserveDuplicates_checkbox">
<property name="text">
<string/>
</property>
</widget>
</item>
<item row="20" column="0">
<widget class="QLabel" name="smooth1D_label">
<property name="text">
<string>Allow 1D smoothing along borders</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
</widget>
</item>
<item row="21" column="0">
<item row="26" column="0">
<widget class="QLabel" name="preserveDuplicates_label">
<property name="text">
<string>Preserve duplicated edges</string>
Expand All @@ -239,7 +220,7 @@
</property>
</widget>
</item>
<item row="16" column="1">
<item row="21" column="1">
<widget class="QSpinBox" name="nbIterations_spinbox">
<property name="minimumSize">
<size>
Expand All @@ -252,7 +233,7 @@
</property>
</widget>
</item>
<item row="16" column="0">
<item row="21" column="0">
<widget class="QLabel" name="nbIterations_label">
<property name="text">
<string>Number of Main iterations</string>
Expand All @@ -265,6 +246,22 @@
</property>
</widget>
</item>
<item row="23" column="0" colspan="2">
<spacer name="verticalSpacer_3">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::Maximum</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>24</height>
</size>
</property>
</spacer>
</item>
<item row="11" column="0">
<widget class="QLabel" name="edgeLength_label">
<property name="text">
Expand Down Expand Up @@ -312,6 +309,46 @@
</property>
</widget>
</item>
<item row="22" column="0">
<widget class="QLabel" name="nbSmoothing_label">
<property name="text">
<string>Number of Smoothing iterations</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
</widget>
</item>
<item row="16" column="0">
<widget class="QLabel" name="curvSmoothBallR_label">
<property name="text">
<string>Ball radius</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
</widget>
</item>
<item row="15" column="0">
<widget class="QLabel" name="curvSmooth_label">
<property name="text">
<string>Curvature smoothing</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
</widget>
</item>
<item row="16" column="1">
<widget class="DoubleEdit" name="curvSmoothBallR_edit">
<property name="placeholderText">
<string>-1</string>
</property>
<property name="clearButtonEnabled">
<bool>false</bool>
</property>
</widget>
</item>
</layout>
</widget>
</item>
Expand Down
Loading

0 comments on commit 9102274

Please sign in to comment.