GUI improvements and bug fixes

GDET3 Laplace-Transformation.ipynb

@@ -69,9 +69,7 @@
    "source": [
     "# Achse wandert hoch - ient_axis?\n",
     "# update_signal todos beachten\n",
-    "# dirac spitzer!\n",
-    "# f statt omega\n",
-    "# Skript S. 18 2.2 P/N-Diagramm, 2 Cells versch. KBs, pn und t plotten"
+    "# dirac spitzer!"
    ]
   },
   {

src/funcs.py

@@ -191,7 +191,11 @@ def calc_laplace(t=np.linspace(-6, 6, num=1024), f = np.linspace(-6, 6, num=1024
             tmp = np.append(tmp, np.array(Polstellen[i] * np.ones(GradPolstellen[i])))
 
         p = np.poly(tmp)
-        A[-len(p):, col] = p
+
+        try:
+            A[-len(p):, col] = p
+        except TypeError:
+            A[-int(p):, col] = p
 
         for i in range(0, len(Polstellen)):
             for j in range(1, GradPolstellen[i] + 1):
@@ -255,12 +259,13 @@ def calc_laplace(t=np.linspace(-6, 6, num=1024), f = np.linspace(-6, 6, num=1024
             if a[0] > 0:
                 h = np.array(np.real(h), dtype=float)
                 h = mod.addDirac(h, a[0] * mod.dirac_fcn(t))
+                type = 'dirac'
 
     else:
-        print("Zaehlergrad größer als Nennergrad. Keine Partialbruchzerlegung möglich!")
+        #Zaehlergrad größer als Nennergrad. Keine Partialbruchzerlegung möglich
         h = np.array([np.NaN for x in t])
 
-    return h, H
+    return h, H, type
 
 def calc_dft(t, s, length, k_max):
     s_shifted = np.concatenate((s[int(length / 2):], s[:int(length / 2)]))

src/laplace/laplace_plot.py

@@ -108,11 +108,18 @@ class pzPlot():
 
         self.handles['axh'] = plt.subplot(gs[1, 0])
         self.handles['axh'].set_title('Impulsantwort', fontsize='16',fontweight='bold')
+        self.handles['axh'].set_xlabel(r'$\rightarrow \mathrm{t}$')
+        self.handles['axh'].set_ylabel(r'$\uparrow \mathrm{s(t)}$')
+        self.pbzErrortxt = self.handles['axh'].text(-4.5,
+                                                    0.55, # hässlich
+                                                    'Zählergrad größer als Nennergrad. \nKeine Partialbruchzerlegung möglich!',
+                                                    fontsize=12, visible = False)
         self.handles['lineh'], = self.handles['axh'].plot(self.t, self.t)
         ient_axis(self.handles['axh'])
         self.handles['axH'] = plt.subplot(gs[1, 1])
         self.handles['axH'].set_title('Übertragungsfunktion', fontsize='16', fontweight='bold')
-        self.handles['lineH'], = self.handles['axH'].plot(self.f, self.f)
+        self.handles['axH'].set_xlabel(r'$\rightarrow f$')
+        self.handles['axH'].set_ylabel(r'$\uparrow \mathrm{|S(f)|}$')
         ient_axis(self.handles['axH'])
         # TODO ient_axis für H ändern
         #self.handles['axH'].spines['bottom'].set_position('center')
@@ -378,17 +385,28 @@ class pzPlot():
         H0 = self.H0
 
         roc = self.roc['sigma']
-        s_t, S_f = func.calc_laplace(self.t, self.f, H0, poles, zeroes, poles_order, zeroes_order, roc)
 
-        # calculate extreme values, for ylims
-        s_t_extr = [np.amin(np.real(s_t)), np.amax(np.real(s_t))]
-        S_f_extr = [np.amin(np.real(S_f)), np.amax(np.real(S_f))]
+        s_t, S_f, signal_type = func.calc_laplace(self.t, self.f, H0, poles, zeroes, poles_order, zeroes_order, roc)
 
-        # set ylims
-        self.handles['axh'].set_ylim(s_t_extr[0] + s_t_extr[0] / 10, s_t_extr[1] + s_t_extr[1] / 10)
+        # process signals
+        if not np.isnan(s_t[0]): # if pbz was not successful
+            self.pbzErrortxt.set_visible(False)
+            if signal_type == '': # if signal does not contain any diracs -> set y-lims according to min, max in array
+                s_t_extr = [np.amin(np.real(s_t)), np.amax(np.real(s_t))]
+                self.handles['axh'].set_ylim(s_t_extr[0] + s_t_extr[0] / 10, s_t_extr[1] + s_t_extr[1] / 10)
+            elif signal_type == 'dirac': # if signal contains diracs -> plot dirac and set y-data
+                # TODO - plot dirac
+                _, value = func.findDirac(s_t)
+                self.handles['axh'].set_ylim(0, np.amax(value) + 0.2)
+
+        else:
+            self.handles['axh'].set_ylim(-1, 1)
+            self.pbzErrortxt.set_visible(True)
+
+        # TODO - schlecht, da rechenintensiv (workaround wegen inf in S_f -> nehme Maximalwert, der nicht unendlich ist)
+        S_f_extr = [np.amin(np.real(S_f)), np.nanmax(np.isfinite(np.real(S_f)) * np.real(S_f))]
         self.handles['axH'].set_ylim(S_f_extr[0] + S_f_extr[0] / 10, S_f_extr[1] + S_f_extr[1] / 10)
 
-        ient_axis(self.handles['axh'])
 
         # TODO - Eigene Funktion plottet s(t) nicht, was läuft hier schief?
         #plot(self.t, s_t, self.handles['axh'])