Commit 2c6aa6f9 authored by LorenzoMonti's avatar LorenzoMonti
Browse files

add conversion track from dbm to watt

parent 6448bafb
Loading
Loading
Loading
Loading
+12 −6
Original line number Diff line number Diff line
@@ -68,7 +68,7 @@ def measure(self, TNotebook1):
                
                Utils.clear_message(self, len(self._traces)) # only for UI
                try:
                    self.TextMeasure1.insert(tk.END, "\nTaking trace...\n")
                    self.TextMeasure1.insert(tk.END, "\nTaking trace...")
                    self._traces.append(self.instr.get_trace(1)) # Get trace
                    self.TextMeasure1.insert(tk.END, "\nData taken\n")
                    bp.beep(sound=1)
@@ -91,16 +91,22 @@ def measure(self, TNotebook1):

    def save_measures():

        # convert dBm in watts
        watt_traces = list()
        for trace in self._traces:
            watt_traces.append(np.array(list(Utils.getWatts(trace))))

        dMeasure, drMeasure, Pc, PcPlusM, HpPlusM, Ph, Yvalue = Utils.getCalculus(self._traces)
        # in order to have cloumns instead rows
        # get calculus
        dMeasure, drMeasure, Pc, PcPlusM, HpPlusM, Ph, Yvalue = Utils.getCalculus(watt_traces)
        # traspose rows in columns
        columns_trace = zip(self._traces[0], self._traces[1], self._traces[2], self._traces[3], self._traces[4], dMeasure, drMeasure, Pc, PcPlusM, HpPlusM, Ph, Yvalue) 

        # open file dialog
        file = filedialog.asksaveasfile(mode="w", defaultextension=".csv")
        
        if file is None:
            return

        # write CSV
        writer = csv.writer(file)        
        # titles
        writer.writerow(["RAW:Pc", "RAW:Pc + m", "RAW:Ph", "RAW:Ph + m", "RAW:Pc'", "dMeasure", "drMeasure", "Pc", "PcPlusM", "HpPlusM", "Ph", "Yvalue"])