From 8a68e5d783d6048bf53ed3e3e869072edbcb3fb8 Mon Sep 17 00:00:00 2001
From: weisse02 <andreas.weissenbrunner@ptb.de>
Date: Mon, 24 Oct 2022 18:20:36 +0200
Subject: [PATCH] some litle changes in draw_meter
---
Flow_class.py | 4 ++--
GUI_Elbow.py | 24 ++++++++++++------------
2 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/Flow_class.py b/Flow_class.py
index 66799ba..f21fd7c 100644
--- a/Flow_class.py
+++ b/Flow_class.py
@@ -235,8 +235,8 @@ class Elbow_profile():
# self.splineint_uy.append(interpol.RectBivariateSpline(self.dist,self.Rk,self.dl,pod_y["coeffs"][:,:,i].T,kx= polydeg,ky=polydeg ))
# self.splineint_uz.append(interpol.RectBivariateSpline(self.dist,self.Rk,self.dl,pod_z["coeffs"][:,:,i].T,kx= polydeg,ky=polydeg ))
self.regint_ux.append(interpol.RegularGridInterpolator((self.Rk,self.dl,self.dist), coeffs_x[:,:,:,i] ))
- self.regint_uy.append(interpol.RegularGridInterpolator((self.Rk,self.dl,self.dist), coeffs_y[:,:,:,i]))
- self.regint_uz.append(interpol.RegularGridInterpolator((self.Rk,self.dl,self.dist), coeffs_z[:,:,:,i]))
+ self.regint_uy.append(interpol.RegularGridInterpolator((self.Rk,self.dl,self.dist), coeffs_y[:,:,:,i] ))
+ self.regint_uz.append(interpol.RegularGridInterpolator((self.Rk,self.dl,self.dist), coeffs_z[:,:,:,i] ))
#
#
del pod_x
diff --git a/GUI_Elbow.py b/GUI_Elbow.py
index dfa3a3d..ac972d1 100644
--- a/GUI_Elbow.py
+++ b/GUI_Elbow.py
@@ -608,8 +608,8 @@ class mainPanel(wx.Panel):
#
print(rc)
#
- self.regint_mean = interpol.RegularGridInterpolator((flow.Rk,flow.dist,flow.phi[:,0]),self.fm_mean)
- self.regint_std = interpol.RegularGridInterpolator((flow.Rk,flow.dist,flow.phi[:,0]),self.fm_std)
+ self.regint_mean = interpol.RegularGridInterpolator((flow.Rk,flow.dl,flow.dist,flow.phi[:,0]),self.fm_mean)
+ self.regint_std = interpol.RegularGridInterpolator((flow.Rk,flow.dl,flow.dist,flow.phi[:,0]),self.fm_std)
self.draw_meter()
#
def draw_meter(self):
@@ -622,8 +622,8 @@ class mainPanel(wx.Panel):
if plot_over == 0: # this is "distance"
x = flow.dist
if self.fm_mean.any():
- y = self.regint_mean((self.Rc,flow.dist,self.phi))
- y_u = self.regint_std((self.Rc,flow.dist,self.phi))
+ y = self.regint_mean((self.Rc,self.dl,flow.dist,self.phi))
+ y_u = self.regint_std((self.Rc,self.dl,flow.dist,self.phi))
else:
y = self.regint_fm((self.Rc,flow.dist,self.phi))
xlabel = "distance in z/D"
@@ -633,10 +633,10 @@ class mainPanel(wx.Panel):
elif plot_over == 1: # this is "Rc"
x = flow.Rk
if self.fm_mean.any():
- y = self.regint_mean((flow.Rk,self.dist,self.phi))
- y_u = self.regint_std((flow.Rk,self.dist,self.phi))
+ y = self.regint_mean((flow.Rk,self.dl,self.dist,self.phi))
+ y_u = self.regint_std((flow.Rk,self.dl,self.dist,self.phi))
else:
- y = self.regint_fm((flow.Rk,self.dist,self.phi))
+ y = self.regint_fm((flow.Rk,self.dl,self.dist,self.phi))
xlabel = "curvature radius in Rc/D"
# the selected x-value from the sliders
x_selected = self.Rc
@@ -644,10 +644,10 @@ class mainPanel(wx.Panel):
elif plot_over == 2: # this is "phi"
x = flow.phi[:,0]/pi*180
if self.fm_mean.any():
- y = self.regint_mean((self.Rc,self.dist,flow.phi[:,0]))
- y_u = self.regint_std((self.Rc,self.dist,flow.phi[:,0]))
+ y = self.regint_mean((self.Rc,self.dl,self.dist,flow.phi[:,0]))
+ y_u = self.regint_std((self.Rc,self.dl,self.dist,flow.phi[:,0]))
else:
- y = self.regint_fm((self.Rc,self.dist,flow.phi[:,0]))
+ y = self.regint_fm((self.Rc,self.dl,self.dist,flow.phi[:,0]))
xlabel = "angle in grad"
# the selected x-value from the sliders
x_selected = self.phi/pi*180
@@ -702,8 +702,8 @@ class mainPanel(wx.Panel):
#
ux,uy,uz = flow.get_profile(self.Rc,self.dl,self.dist, addfully = not self.diffcheck )
- print("uz.shape")
- print(uz.shape)
+ # print("uz.shape")
+ # print(uz.shape)
# uz = uz.reshape(flow.xm.shape)
#
cs = self.ax0.contourf(flow.xm,flow.ym, uz ,cmap= "jet",levels=levels, extend='both')
--
GitLab