Commit f060063e authored by LorenzoMonti's avatar LorenzoMonti
Browse files

Fix set_conf() in order to upload and update data correctly

parent 1b3e9743

src/Utils.py

+1 −1
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ def set_SPA_for_measure(ms2830a, config_file, manual_command): 
        # BW

        ms2830a.do_set_resolutionBW(config_file["resolution_bandwith"]) # 1Mhz

        log_list.append("Resolution Bandwith: " + str(ms2830a.do_get_resolutionBW()))

        ms2830a.do_set_videoBW(100)

        ms2830a.do_set_videoBW(config_file["video_bandwith"])

        log_list.append("Video bandwith:" + str(ms2830a.do_get_videoBW()))

        

        # AMPLITUDE

src/gui.py

+1 −1
Original line number Diff line number Diff line
@@ -92,7 +92,7 @@ class UserInterface: 
        #############################

        # TABS CREATION

        #############################

        connect_tab.connect(self, self.TNotebook1, config_interface, config_file)

        connect_tab.connect(self, self.TNotebook1, config_interface)

        configuration_tab.configuration(self, self.TNotebook1, config_interface, config_file)

        measure_tab.measure(self,self.TNotebook1)

src/tabs/configuration_tab.py

+2 −0
Original line number Diff line number Diff line
@@ -150,6 +150,8 @@ def configuration(self, TNotebook1, config_interface, config_file): 


    def set_conf():

        try:

            config_file = Utils.read_config_file("../config/config_MS2830A.json")

            config_interface = Utils.read_config_file("../config/config_interface.json")

            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, "\nConfiguration\n")

src/tabs/connect_tab.py

+1 −1
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ from tkinter import ttk 
import Utils

import logging



def connect(self, TNotebook1, config_interface, config_file):

def connect(self, TNotebook1, config_interface):



    ##################################

    # 	          TAB 1	        	 #