Skip to content

Commit ca55480

Browse files
committed
removed unused argument in widget
1 parent 064226e commit ca55480

2 files changed

Lines changed: 24 additions & 41 deletions

File tree

src/napari_stress/_reconstruction/toolbox.py

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,6 @@ def _run(self):
179179
voxelsize=current_voxel_size,
180180
target_voxelsize=self.doubleSpinBox_target_voxelsize.value(),
181181
smoothing_sigma=self.doubleSpinBox_gaussian_blur.value(),
182-
n_smoothing_iterations=self.spinBox_n_smoothing.value(),
183182
n_tracing_iterations=self.spinBox_n_refinement_steps.value(),
184183
resampling_length=self.doubleSpinBox_sampling_length.value(),
185184
n_points=self.spinBox_n_vertices.value(),
@@ -208,7 +207,6 @@ def reconstruct_droplet(
208207
voxelsize: np.ndarray = None,
209208
target_voxelsize: float = 1.0,
210209
smoothing_sigma: float = 1.0,
211-
n_smoothing_iterations: int = 10,
212210
n_points: int = 512,
213211
n_tracing_iterations: int = 1,
214212
resampling_length: float = 5,
@@ -309,7 +307,7 @@ def reconstruct_droplet(
309307
# repeat tracing `n_tracing_iterations` times
310308
for _ in range(n_tracing_iterations):
311309
resampled_points = resample_pointcloud(
312-
traced_points, sampling_length=resampling_length
310+
traced_points[0], sampling_length=resampling_length
313311
)
314312

315313
traced_points, trace_vectors = (
@@ -321,6 +319,8 @@ def reconstruct_droplet(
321319
trace_length=trace_length,
322320
sampling_distance=sampling_distance,
323321
interpolation_method=interpolation_method,
322+
remove_outliers=remove_outliers,
323+
outlier_tolerance=outlier_tolerance,
324324
)
325325
)
326326
points = traced_points[0]
@@ -372,7 +372,6 @@ def reconstruct_droplet(
372372
"blending": "additive",
373373
"scale": [target_voxelsize] * 3,
374374
}
375-
layer_rescaled_image = (rescaled_image, properties, "image")
376375

377376
if return_intermediate_results:
378377
return [
@@ -381,7 +380,6 @@ def reconstruct_droplet(
381380
traced_points,
382381
trace_vectors,
383382
droplet_center,
384-
layer_rescaled_image,
385383
]
386384
else:
387385
return [

src/napari_stress/_reconstruction/toolbox.ui

Lines changed: 21 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -70,15 +70,15 @@
7070
<item row="1" column="0" colspan="2">
7171
<widget class="QToolBox" name="toolBox">
7272
<property name="currentIndex">
73-
<number>2</number>
73+
<number>1</number>
7474
</property>
7575
<widget class="QWidget" name="page_3">
7676
<property name="geometry">
7777
<rect>
7878
<x>0</x>
7979
<y>0</y>
8080
<width>855</width>
81-
<height>236</height>
81+
<height>258</height>
8282
</rect>
8383
</property>
8484
<attribute name="label">
@@ -174,7 +174,7 @@
174174
<x>0</x>
175175
<y>0</y>
176176
<width>855</width>
177-
<height>236</height>
177+
<height>258</height>
178178
</rect>
179179
</property>
180180
<attribute name="label">
@@ -194,34 +194,21 @@
194194
</property>
195195
</widget>
196196
</item>
197-
<item row="1" column="3">
198-
<widget class="QSpinBox" name="spinBox_n_vertices">
199-
<property name="minimum">
200-
<number>64</number>
201-
</property>
202-
<property name="maximum">
203-
<number>4096</number>
204-
</property>
205-
<property name="value">
206-
<number>256</number>
207-
</property>
208-
</widget>
209-
</item>
210-
<item row="2" column="1" colspan="2">
211-
<widget class="QLabel" name="label_2">
197+
<item row="0" column="1">
198+
<widget class="QLabel" name="label_16">
212199
<property name="text">
213-
<string>Surface smoothing iterations</string>
200+
<string>Image smoothing sigma</string>
214201
</property>
215202
</widget>
216203
</item>
217-
<item row="0" column="1">
218-
<widget class="QLabel" name="label_16">
204+
<item row="1" column="1" colspan="2">
205+
<widget class="QLabel" name="label">
219206
<property name="text">
220-
<string>Image smoothing sigma</string>
207+
<string>Initial number of points</string>
221208
</property>
222209
</widget>
223210
</item>
224-
<item row="3" column="2">
211+
<item row="2" column="2">
225212
<spacer name="verticalSpacer">
226213
<property name="orientation">
227214
<enum>Qt::Vertical</enum>
@@ -234,17 +221,16 @@
234221
</property>
235222
</spacer>
236223
</item>
237-
<item row="2" column="3">
238-
<widget class="QSpinBox" name="spinBox_n_smoothing">
239-
<property name="value">
240-
<number>15</number>
224+
<item row="1" column="3">
225+
<widget class="QSpinBox" name="spinBox_n_vertices">
226+
<property name="minimum">
227+
<number>64</number>
241228
</property>
242-
</widget>
243-
</item>
244-
<item row="1" column="1" colspan="2">
245-
<widget class="QLabel" name="label">
246-
<property name="text">
247-
<string>Initial number of points</string>
229+
<property name="maximum">
230+
<number>4096</number>
231+
</property>
232+
<property name="value">
233+
<number>256</number>
248234
</property>
249235
</widget>
250236
</item>
@@ -255,8 +241,8 @@
255241
<rect>
256242
<x>0</x>
257243
<y>0</y>
258-
<width>855</width>
259-
<height>408</height>
244+
<width>838</width>
245+
<height>348</height>
260246
</rect>
261247
</property>
262248
<attribute name="label">
@@ -484,7 +470,6 @@
484470
<tabstop>doubleSpinBox_target_voxelsize</tabstop>
485471
<tabstop>doubleSpinBox_gaussian_blur</tabstop>
486472
<tabstop>spinBox_n_vertices</tabstop>
487-
<tabstop>spinBox_n_smoothing</tabstop>
488473
<tabstop>spinBox_n_refinement_steps</tabstop>
489474
<tabstop>doubleSpinBox_sampling_length</tabstop>
490475
<tabstop>comboBox_fittype</tabstop>

0 commit comments

Comments
 (0)