Skip to content

Commit dbeec83

Browse files
committed
fixed 2D image z-averaging
1 parent b87c36b commit dbeec83

File tree

2 files changed

+11
-9
lines changed

2 files changed

+11
-9
lines changed

saenopy/gui/solver/modules/exporter/Exporter.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -256,8 +256,8 @@ class Null:
256256
self.input_arrows = QtShortCuts.QInputChoice(None, "arrows", "piv", values=["None", "piv", "target deformations", "fitted deformations", "fitted forces"])
257257
self.input_arrows.valueChanged.connect(self.update_display)
258258
self.input_arrows.valueChanged.connect(self.hide_arrow)
259-
self.input_average_range = QtShortCuts.QInputNumber(None, "averaging z thickness", min=0, max=0,
260-
step=10)
259+
self.input_average_range = QtShortCuts.QInputNumber(None, "averaging z thickness +/-", min=0, max=0,
260+
step=10, unit="µm")
261261
self.input_average_range.valueChanged.connect(self.update_display)
262262
QtShortCuts.currentLayout().addStretch()
263263

saenopy/gui/solver/modules/exporter/ExporterRender2D.py

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ def project_data(R, field, skip=1):
132132
max_length = scale_max * params_arrows["arrow_scale"]
133133

134134
if is3D:
135-
z_center = (params["averaging_size"] - result.stacks[0].shape[2] / 2) * display_image[1][2] * 1e-6
135+
z_center = (params["stack"]["z"] - result.stacks[0].shape[2] / 2) * display_image[1][2] * 1e-6
136136
z_min = z_center - params["averaging_size"] * 1e-6
137137
z_max = z_center + params["averaging_size"] * 1e-6
138138

@@ -145,12 +145,14 @@ def project_data(R, field, skip=1):
145145
length = np.linalg.norm(field, axis=1)
146146
angle = np.arctan2(field[:, 1], field[:, 0])
147147
field = pd.DataFrame(np.hstack((length[:, None], angle[:, None])), columns=["length", "angle"])
148-
pil_image = add_quiver(pil_image, R, field.length, field.angle, max_length=max_length, cmap=colormap,
149-
alpha=alpha,
150-
scale=im_scale * aa_scale,
151-
width=params["2D_arrows"]["width"],
152-
headlength=params["2D_arrows"]["headlength"],
153-
headheight=params["2D_arrows"]["headheight"])
148+
# safety check if all arrows where filtered out
149+
if R.shape[0] != 0:
150+
pil_image = add_quiver(pil_image, R, field.length, field.angle, max_length=max_length, cmap=colormap,
151+
alpha=alpha,
152+
scale=im_scale * aa_scale,
153+
width=params["2D_arrows"]["width"],
154+
headlength=params["2D_arrows"]["headlength"],
155+
headheight=params["2D_arrows"]["headheight"])
154156
if return_scale:
155157
return pil_image, {"scale_max": scale_max, "colormap": colormap}
156158
return pil_image

0 commit comments

Comments
 (0)