Commit e7f734bf authored by LorenzoMonti's avatar LorenzoMonti
Browse files

changes in measure tab 

CHANGE LIST

- add pipeline for every measure
- event bind for space key
- clear measures
- save trace data
parent 52585f49

mockup/multifeed_receiver_measure.glade

+16 −53
Original line number Diff line number Diff line
@@ -435,8 +435,8 @@ Reference level: -62.00 
            <property name="label" translatable="yes">Pc</property>

          </object>

          <packing>

            <property name="x">31</property>

            <property name="y">85</property>

            <property name="x">230</property>

            <property name="y">80</property>

          </packing>

        </child>

        <child>
@@ -447,7 +447,7 @@ Reference level: -62.00 
            <property name="label" translatable="yes">Pc+m</property>

          </object>

          <packing>

            <property name="x">31</property>

            <property name="x">230</property>

            <property name="y">175</property>

          </packing>

        </child>
@@ -460,7 +460,7 @@ Reference level: -62.00 
            <property name="label" translatable="yes">Ph</property>

          </object>

          <packing>

            <property name="x">31</property>

            <property name="x">230</property>

            <property name="y">265</property>

          </packing>

        </child>
@@ -473,7 +473,7 @@ Reference level: -62.00 
            <property name="label" translatable="yes">Ph+m</property>

          </object>

          <packing>

            <property name="x">31</property>

            <property name="x">230</property>

            <property name="y">355</property>

          </packing>

        </child>
@@ -486,73 +486,36 @@ Reference level: -62.00 
            <property name="label" translatable="yes">Pc</property>

          </object>

          <packing>

            <property name="x">31</property>

            <property name="x">230</property>

            <property name="y">445</property>

          </packing>

        </child>

        <child>

          <object class="GtkButton">

            <property name="label" translatable="yes">Get data</property>

            <property name="width-request">100</property>

            <property name="visible">True</property>

            <property name="can-focus">True</property>

            <property name="receives-default">True</property>

          </object>

          <packing>

            <property name="x">205</property>

            <property name="y">80</property>

          </packing>

        </child>

        <child>

          <object class="GtkButton">

            <property name="label" translatable="yes">Get data</property>

            <property name="width-request">100</property>

            <property name="visible">True</property>

            <property name="can-focus">True</property>

            <property name="receives-default">True</property>

          </object>

          <packing>

            <property name="x">205</property>

            <property name="y">170</property>

          </packing>

        </child>

        <child>

          <object class="GtkButton">

            <property name="label" translatable="yes">Get data</property>

            <property name="width-request">100</property>

            <property name="visible">True</property>

            <property name="can-focus">True</property>

            <property name="receives-default">True</property>

          </object>

          <packing>

            <property name="x">205</property>

            <property name="y">260</property>

          </packing>

        </child>

        <child>

          <object class="GtkButton">

            <property name="label" translatable="yes">Get data</property>

            <property name="width-request">100</property>

            <property name="label" translatable="yes">Clear measurements</property>

            <property name="width-request">172</property>

            <property name="height-request">34</property>

            <property name="visible">True</property>

            <property name="can-focus">True</property>

            <property name="receives-default">True</property>

          </object>

          <packing>

            <property name="x">205</property>

            <property name="y">347</property>

            <property name="x">92</property>

            <property name="y">536</property>

          </packing>

        </child>

        <child>

          <object class="GtkButton">

            <property name="label" translatable="yes">Get data</property>

            <property name="width-request">100</property>

            <property name="label" translatable="yes">Save measurements</property>

            <property name="width-request">167</property>

            <property name="height-request">34</property>

            <property name="visible">True</property>

            <property name="can-focus">True</property>

            <property name="receives-default">True</property>

          </object>

          <packing>

            <property name="x">205</property>

            <property name="y">440</property>

            <property name="x">300</property>

            <property name="y">537</property>

          </packing>

        </child>

      </object>

mockup/multifeed_receiver_measure.glade~

+41 −53
Original line number Diff line number Diff line
@@ -367,6 +367,31 @@ Reference level: -62.00 
            <property name="y">541</property>

          </packing>

        </child>

        <child>

          <object class="GtkEntry">

            <property name="width-request">168</property>

            <property name="height-request">34</property>

            <property name="visible">True</property>

            <property name="can-focus">True</property>

          </object>

          <packing>

            <property name="x">250</property>

            <property name="y">39</property>

          </packing>

        </child>

        <child>

          <object class="GtkAccelLabel">

            <property name="width-request">104</property>

            <property name="height-request">20</property>

            <property name="visible">True</property>

            <property name="can-focus">False</property>

            <property name="label" translatable="yes">Manual command</property>

          </object>

          <packing>

            <property name="x">111</property>

            <property name="y">46</property>

          </packing>

        </child>

      </object>

      <packing>

        <property name="position">1</property>
@@ -410,8 +435,8 @@ Reference level: -62.00 
            <property name="label" translatable="yes">Pc</property>

          </object>

          <packing>

            <property name="x">31</property>

            <property name="y">85</property>

            <property name="x">230</property>

            <property name="y">80</property>

          </packing>

        </child>

        <child>
@@ -422,7 +447,7 @@ Reference level: -62.00 
            <property name="label" translatable="yes">Pc+m</property>

          </object>

          <packing>

            <property name="x">31</property>

            <property name="x">230</property>

            <property name="y">175</property>

          </packing>

        </child>
@@ -435,7 +460,7 @@ Reference level: -62.00 
            <property name="label" translatable="yes">Ph</property>

          </object>

          <packing>

            <property name="x">31</property>

            <property name="x">230</property>

            <property name="y">265</property>

          </packing>

        </child>
@@ -448,7 +473,7 @@ Reference level: -62.00 
            <property name="label" translatable="yes">Ph+m</property>

          </object>

          <packing>

            <property name="x">31</property>

            <property name="x">230</property>

            <property name="y">355</property>

          </packing>

        </child>
@@ -461,73 +486,36 @@ Reference level: -62.00 
            <property name="label" translatable="yes">Pc</property>

          </object>

          <packing>

            <property name="x">31</property>

            <property name="x">230</property>

            <property name="y">445</property>

          </packing>

        </child>

        <child>

          <object class="GtkButton">

            <property name="label" translatable="yes">Get data</property>

            <property name="width-request">100</property>

            <property name="visible">True</property>

            <property name="can-focus">True</property>

            <property name="receives-default">True</property>

          </object>

          <packing>

            <property name="x">205</property>

            <property name="y">80</property>

          </packing>

        </child>

        <child>

          <object class="GtkButton">

            <property name="label" translatable="yes">Get data</property>

            <property name="width-request">100</property>

            <property name="visible">True</property>

            <property name="can-focus">True</property>

            <property name="receives-default">True</property>

          </object>

          <packing>

            <property name="x">205</property>

            <property name="y">170</property>

          </packing>

        </child>

        <child>

          <object class="GtkButton">

            <property name="label" translatable="yes">Get data</property>

            <property name="width-request">100</property>

            <property name="visible">True</property>

            <property name="can-focus">True</property>

            <property name="receives-default">True</property>

          </object>

          <packing>

            <property name="x">205</property>

            <property name="y">260</property>

          </packing>

        </child>

        <child>

          <object class="GtkButton">

            <property name="label" translatable="yes">Get data</property>

            <property name="width-request">100</property>

            <property name="label" translatable="yes">Clear measurements</property>

            <property name="width-request">172</property>

            <property name="height-request">34</property>

            <property name="visible">True</property>

            <property name="can-focus">True</property>

            <property name="receives-default">True</property>

          </object>

          <packing>

            <property name="x">205</property>

            <property name="y">347</property>

            <property name="x">92</property>

            <property name="y">536</property>

          </packing>

        </child>

        <child>

          <object class="GtkButton">

            <property name="label" translatable="yes">Get data</property>

            <property name="width-request">100</property>

            <property name="label" translatable="yes">Save measurements</property>

            <property name="width-request">167</property>

            <property name="height-request">34</property>

            <property name="visible">True</property>

            <property name="can-focus">True</property>

            <property name="receives-default">True</property>

          </object>

          <packing>

            <property name="x">205</property>

            <property name="y">440</property>

            <property name="x">300</property>

            <property name="y">537</property>

          </packing>

        </child>

      </object>

requirements.txt

+1 −0
Original line number Diff line number Diff line
@@ -7,3 +7,4 @@ tk 
numpy

pandas

seaborn

beepy
 
 No newline at end of file

src/Utils.py

+23 −0
Original line number Diff line number Diff line
@@ -71,3 +71,26 @@ def write_config_file(filename, confDict): 
        json_obj = json.dumps(confDict, indent=4)

        with open(filename, 'w') as file:

                file.write(json_obj)



def clear_message(self, trace_number):

        if(trace_number == 0):

                self.Message1.configure(background="green", font=("Helvetica",24))

        elif(trace_number == 1):

                self.Message1.configure(background="#d9d9d9", font=("Helvetica",10))

                self.Message2.configure(background="green", font=("Helvetica",24))

        elif(trace_number == 2):

                self.Message2.configure(background="#d9d9d9", font=("Helvetica",10))

                self.Message3.configure(background="green", font=("Helvetica",24))

        elif(trace_number == 3):

                self.Message3.configure(background="#d9d9d9", font=("Helvetica",10))

                self.Message4.configure(background="green", font=("Helvetica",24))

        elif(trace_number == 4):

                self.Message4.configure(background="#d9d9d9", font=("Helvetica",10))

                self.Message5.configure(background="green", font=("Helvetica",24))



def clear_background(self):

        self.Message1.configure(background="#d9d9d9", font=("Helvetica", 10))

        self.Message2.configure(background="#d9d9d9", font=("Helvetica", 10))

        self.Message3.configure(background="#d9d9d9", font=("Helvetica", 10))

        self.Message4.configure(background="#d9d9d9", font=("Helvetica", 10))

        self.Message5.configure(background="#d9d9d9", font=("Helvetica", 10))
 
 No newline at end of file

src/tabs/configuration_tab.py

+8 −4
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ from logging import disable 
from tkinter import Tk

import Anritsu_MS2830A as SPA

import Utils

import logging



try:

    import Tkinter as tk
@@ -181,8 +182,12 @@ def configuration(self, TNotebook1, config_interface, config_file): 
        try:

            Utils.write_config_file("../config/config_MS2830A.json", config_file)

            self.Text1.insert(tk.END, "Configuration file written successfully \n")

            logging.info(__name__ + ' : Configuration file written successfully')



        except:

            self.Text1.insert(tk.END, "Error writing configuration file \n")

            logging.error(__name__ + ' : Error writing configuration file')



        

    self.Button1 = tk.Button(self.TNotebook1_t2)

    self.Button1.place(relx=0.035, rely=y_button, height=h_button, width=w_button)
@@ -191,9 +196,8 @@ def configuration(self, TNotebook1, config_interface, config_file): 
    self.Button1.configure(text='''Write configuration''')



    def set_conf():

        global instr

        instr = SPA.Anritsu_MS2830A("Anritsu_MS2830A",config_interface[self.selected_interface.get()])

        log_list = Utils.set_SPA_for_measure(instr, config_file, self.Entry10.get())

        self.instr = SPA.Anritsu_MS2830A("Anritsu_MS2830A",config_interface[self.selected_interface.get()])

        log_list = Utils.set_SPA_for_measure(self.instr, config_file, self.Entry10.get())

        self.Text1.insert(tk.END, "Configuration\n")

        for l in log_list:

            self.Text1.insert(tk.END, l + "\n")
@@ -206,7 +210,7 @@ def configuration(self, TNotebook1, config_interface, config_file): 
    self.Button2.configure(text='''Set configuration''')



    def plot_data():

        trace = instr.get_trace(1) # Get trace

        trace = self.instr.get_trace(1) # Get trace

        Utils.plot_lineplot(trace)

        self.Text1.insert(tk.END, "Data plotted\n")