Production de screenshots.

4 files changed, 34 insertions, 40 deletions

diff --git a/.gitignore b/.gitignore
index 27574e8..a08513d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 # Le fichier généré à partir de analyseur_de_spectre_a_balayage.grc
 analyseur_de_spectre_a_balayage.py
-
+illustration_bande_limitee.py
+implementation_balayage_en_frequence.py
diff --git a/illustration_bande_limitee.grc b/illustration_bande_limitee.grc
index 897b726..0565df3 100644
--- a/illustration_bande_limitee.grc
+++ b/illustration_bande_limitee.grc
@@ -164,8 +164,8 @@ blocks:
     width8: '1'
     width9: '1'
     wintype: window.WIN_RECTANGULAR
-    ymax: '-25'
-    ymin: '-55'
+    ymax: '-20'
+    ymin: '-50'
   states:
     bus_sink: false
     bus_source: false
diff --git a/implementation_balayage_en_frequence.grc b/implementation_balayage_en_frequence.grc
index 5d47d5c..a09bfdf 100644
--- a/implementation_balayage_en_frequence.grc
+++ b/implementation_balayage_en_frequence.grc
@@ -227,7 +227,7 @@ blocks:
     label7: Signal 7
     label8: Signal 8
     label9: Signal 9
-    legend: 'True'
+    legend: 'False'
     marker1: '-1'
     marker10: '-1'
     marker2: '-1'
diff --git a/simple_spectrum_analyser_scope.py b/simple_spectrum_analyser_scope.py
index 3343751..5f568ac 100644
--- a/simple_spectrum_analyser_scope.py
+++ b/simple_spectrum_analyser_scope.py
@@ -49,6 +49,10 @@ def plot_spectrum(x_1, x_2, data_1, data_2, i, i_last, ax, canvas):
     ax.set_xlim(x_lim), ax.set_ylim(y_lim)

     ax.xaxis.set_major_formatter('{x:.3f}')

     ax.set_xlabel('MHz')

+    if in_dB is True:

+      ax.set_ylabel('Relative power (dB)')

+    else:

+      ax.set_ylabel('Relative power')

 

     ax.plot(x_1[0:i], data_1[0:i], 'r')

     j = np.searchsorted(x_2, x_1[i - 1])

@@ -141,7 +145,8 @@ if __name__ == "__main__":
                     data = sock.recv(zmq.NOBLOCK)

 

                     # ld = len(data)

-                    # print(u"Longueur des data = {:} : {:}".format(ld, data), file=sys.stderr)

+                    # print(u"Longueur des data = {:} : {:}".format(ld, data),

+                    #       file=sys.stderr)

                     # data_hex = ''.join('\\x{:02x}'.format(x) for x in data)

                     # print(data_hex, file=sys.stderr)

                     

@@ -160,15 +165,11 @@ if __name__ == "__main__":
                         pow_val_old = pow_val

                         if in_dB is True:

                             pow_val = 10*np.log10(pow_val)

-                            print(f"pow_val lin = {pow_val_old}", file=sys.stderr)

-                            print(f"pow_val = {pow_val}", file=sys.stderr)

                         else:

                             pass

                     else:

                         continue

 

-                    print(f"  pow_val = {pow_val}", file=sys.stderr)

-

                     if range_set is False:

                         freq_l, freq_h = start_freq, start_freq + span

                         freq_old = freq_val

@@ -207,37 +208,29 @@ if __name__ == "__main__":
                             # format(i, i_last, n), file=sys.stderr)

 

                 except zmq.ZMQError:

-                    print(u"ZMQ error", file=sys.stderr)

+                    # print(u"ZMQ error", file=sys.stderr)

                     continue

 

-        if update is True:

-            print(f"      pow_val = {pow_val}", file=sys.stderr)

-

-            if range_set is False:

-                pow_min, pow_max = pow_val, pow_val

-                ax.set_xlim([freq_l/1e6, freq_h/1e6])

-                if in_dB is True:

-                  ax.set_ylim([pow_max - 10, pow_max + 10])

-                else:

-                  ax.set_ylim([pow_max/10, pow_max*10])

-                range_set = True

-            elif (pow_val < pow_min):

-                pow_min = pow_val

-                ax.set_ylim([pow_min, pow_max])

-            elif (pow_val > pow_max):

-                print(f"    pow_val lin = {pow_val_old}", file=sys.stderr)

-                print(f"    pow_val = {pow_val}", file=sys.stderr)

-                pow_max = pow_val

-                ax.set_ylim([pow_min, pow_max])

-                print(f"    pow_max = {pow_max}", file=sys.stderr)

-

-            print(f"pow_min = {pow_min:.3f}, pow_max = {pow_max:.3f}",

-              file=sys.stderr)

-

-            pong_or_ping = (ping_or_pong + 1)%2

-            surf = plot_spectrum(f[ping_or_pong]/1e6, f[pong_or_ping]/1e6,

-                power[ping_or_pong], power[pong_or_ping], i, i_last, ax, canvas)

-            screen.blit(surf, (0, 0))

-            pygame.display.update()

-            update = False

+            if update is True:

+                if range_set is False:

+                    pow_min, pow_max = pow_val, pow_val

+                    ax.set_xlim([freq_l/1e6, freq_h/1e6])

+                    if in_dB is True:

+                      ax.set_ylim([pow_max - 10, pow_max + 10])

+                    else:

+                      ax.set_ylim([pow_max/10, pow_max*10])

+                    range_set = True

+                elif (pow_val < pow_min):

+                    pow_min = pow_val

+                    ax.set_ylim([pow_min, pow_max])

+                elif (pow_val > pow_max):

+                    pow_max = pow_val

+                    ax.set_ylim([pow_min, pow_max])

+

+                pong_or_ping = (ping_or_pong + 1)%2

+                surf = plot_spectrum(f[ping_or_pong]/1e6, f[pong_or_ping]/1e6,

+                    power[ping_or_pong], power[pong_or_ping], i, i_last, ax, canvas)

+                screen.blit(surf, (0, 0))

+                pygame.display.update()

+                update = False