Skip to content

Commit

Permalink
Module UI and logic done, just some small fixing required
Browse files Browse the repository at this point in the history
  • Loading branch information
@HarryHeres
HarryHeres committed Nov 3, 2023
1 parent ba4ce2a commit a967227
Show file tree
Hide file tree
Showing 4 changed files with 227 additions and 52 deletions.
102 changes: 88 additions & 14 deletions SlicerBoneMorphing/Resources/UI/SlicerBoneMorphing.ui
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<x>0</x>
<y>0</y>
<width>564</width>
<height>912</height>
<height>1522</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout">
Expand All @@ -17,10 +17,10 @@
<string>Input</string>
</property>
<property name="checked">
<bool>false</bool>
<bool>true</bool>
</property>
<property name="collapsed">
<bool>true</bool>
<bool>false</bool>
</property>
<layout class="QFormLayout" name="formLayout">
<item row="0" column="0">
Expand Down Expand Up @@ -73,7 +73,12 @@
<string>Select a node that represents the target model (the one to be deformed)</string>
</property>
<property name="nodeTypes">
<stringlist notr="true"/>
<stringlist notr="true">
<string>vtkMRMLModelNode</string>
</stringlist>
</property>
<property name="showHidden">
<bool>true</bool>
</property>
<property name="hideChildNodeTypes">
<stringlist notr="true"/>
Expand All @@ -92,6 +97,9 @@
<string>Preprocessing parameters</string>
</property>
<property name="checked">
<bool>true</bool>
</property>
<property name="collapsed">
<bool>false</bool>
</property>
<layout class="QFormLayout" name="formLayout_16">
Expand Down Expand Up @@ -149,7 +157,17 @@
</widget>
</item>
<item row="2" column="1">
<widget class="QSpinBox" name="preprocessingNormalsEstimationMaxNeighboursSpinBox"/>
<widget class="QSpinBox" name="preprocessingNormalsEstimationMaxNeighboursSpinBox">
<property name="minimum">
<number>1</number>
</property>
<property name="maximum">
<number>1000</number>
</property>
<property name="value">
<number>100</number>
</property>
</widget>
</item>
<item row="3" column="0">
<widget class="QLabel" name="preprocessingFpfhRadiusLabel">
Expand All @@ -176,7 +194,17 @@
</widget>
</item>
<item row="4" column="1">
<widget class="QSpinBox" name="preprocessingFpfhMaxNeighboursSpinBox"/>
<widget class="QSpinBox" name="preprocessingFpfhMaxNeighboursSpinBox">
<property name="minimum">
<number>1</number>
</property>
<property name="maximum">
<number>1000</number>
</property>
<property name="value">
<number>30</number>
</property>
</widget>
</item>
</layout>
</widget>
Expand Down Expand Up @@ -279,10 +307,10 @@
<string>BCPD parameters</string>
</property>
<property name="checked">
<bool>false</bool>
<bool>true</bool>
</property>
<property name="collapsed">
<bool>true</bool>
<bool>false</bool>
</property>
<layout class="QFormLayout" name="formLayout_2">
<item row="0" column="0">
Expand Down Expand Up @@ -688,10 +716,10 @@
<string>Acceleration</string>
</property>
<property name="checked">
<bool>false</bool>
<bool>true</bool>
</property>
<property name="collapsed">
<bool>true</bool>
<bool>false</bool>
</property>
<layout class="QFormLayout" name="formLayout_7">
<item row="1" column="0">
Expand Down Expand Up @@ -966,10 +994,10 @@
<string>Convergence</string>
</property>
<property name="checked">
<bool>false</bool>
<bool>true</bool>
</property>
<property name="collapsed">
<bool>true</bool>
<bool>false</bool>
</property>
<layout class="QFormLayout" name="formLayout_12">
<item row="0" column="0">
Expand Down Expand Up @@ -1005,7 +1033,7 @@
<item row="1" column="1">
<widget class="QSpinBox" name="bcpdConvergenceMaxIterationsSpinBox">
<property name="minimum">
<number>10</number>
<number>1</number>
</property>
<property name="maximum">
<number>1000000</number>
Expand All @@ -1018,7 +1046,7 @@
<item row="2" column="1">
<widget class="QSpinBox" name="bcpdConvergenceMinIterationsSpinBox">
<property name="minimum">
<number>10</number>
<number>1</number>
</property>
<property name="maximum">
<number>1000</number>
Expand Down Expand Up @@ -1073,6 +1101,52 @@
</layout>
</widget>
</item>
<item>
<widget class="ctkCollapsibleButton" name="postprocessingCollapsibleButton">
<property name="text">
<string>Postprocessing parameters</string>
</property>
<property name="checked">
<bool>true</bool>
</property>
<layout class="QFormLayout" name="formLayout_19">
<item row="0" column="0">
<widget class="QLabel" name="postprocessingClusteringScalingLabel">
<property name="text">
<string>Clustering scaling:</string>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QDoubleSpinBox" name="postprocessingClusteringScalingDoubleSpinBox">
<property name="minimum">
<double>0.000000000000000</double>
</property>
<property name="value">
<double>1.000000000000000</double>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QLabel" name="processingSmoothingIterationsLabel">
<property name="text">
<string>Smoothing iterations: </string>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QSpinBox" name="processingSmoothingIterationsSpinBox">
<property name="minimum">
<number>10</number>
</property>
<property name="maximum">
<number>1000</number>
</property>
</widget>
</item>
</layout>
</widget>
</item>
<item>
<widget class="QPushButton" name="bcpdResetParametersPushButton">
<property name="text">
Expand Down
14 changes: 9 additions & 5 deletions SlicerBoneMorphing/src/logic/Constants.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@
## Convergence ##
BCPD_DEFAULT_VALUE_CONVERGENCE_TOLERANCE = 0.000001
BCPD_DEFAULT_VALUE_CONVERGENCE_MAX_ITERATIONS = 1000
BCPD_DEFAULT_VALUE_CONVERGENCE_MIN_ITERATIONS = 30
BCPD_DEFAULT_VALUE_CONVERGENCE_MIN_ITERATIONS = 1

## Normalization ##
BCPD_DEFAULT_VALUE_NORMALIZATION_OPTIONS = BcpdNormalizationOptions.X.value
Expand All @@ -91,7 +91,7 @@
PREPROCESSING_KEY_MAX_NN_NORMALS = "mnnn"
PREPROCESSING_KEY_MAX_NN_FPFH = "mnf"

PREPROCESSING_DEFAULT_VALUE_DOWNSAMPLING_DISTANCE_THRESHOLD = 55
PREPROCESSING_DEFAULT_VALUE_DOWNSAMPLING_DISTANCE_THRESHOLD = 0.1
PREPROCESSING_DEFAULT_VALUE_RADIUS_NORMAL_SCALE = 4
PREPROCESSING_DEFAULT_VALUE_RADIUS_FEATURE_SCALE = 10
PREPROCESSING_DEFAULT_VALUE_MAX_NN_NORMALS = 30
Expand All @@ -108,9 +108,13 @@
REGISTRATION_DEFAULT_VALUE_MAX_ITERATIONS = 30
REGISTRATION_DEFAULT_VALUE_ICP_DISTANCE_THRESHOLD = 1

CLUSTERING_VOXEL_SCALING = 3
SMOOTHING_ITERATIONS = 2
FILTERING_ITEARTIONS = 100
### POSTPROCESSING PARAMETERS ###
POSTPROCESSING_KEY = "postprocessing"
POSTPROCESSING_KEY_CLUSTERING_SCALING = "cs"
POSTPROCESSING_KEY_SMOOTHING_ITERATIONS = "sis"

POSTPROCESSING_DEFAULT_VALUE_CLUSTERING_SCALING = 1
POSTPROCESSING_DEFAULT_VALUE_SMOOTHING_ITERATIONS = 10

### MAX VALUES ###
BCPD_MAX_VALUE_KAPPA = 1000
Loading

0 comments on commit a967227

Please sign in to comment.