Added console widget, added exception handling during device connection

Author: BogdoKhan

oscilloscope/forms/waveform.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-# Form implementation generated from reading ui file 'C:\Users\dkc1\Desktop\test-spec\test-spec\oscilloscope\forms/waveform.ui'
+# Form implementation generated from reading ui file 'C:\Users\dnwdc\OneDrive\Рабочий стол\!3_aspirant\Работа\RedPitaya_ServiceApp\multichannel-spec\oscilloscope\forms/waveform.ui'
 #
 # Created by: PyQt5 UI code generator 5.15.10
 #

oscilloscope/oscilloscope.py

@@ -43,7 +43,7 @@ def __init__(self, *args, obj=None, **kwargs):
         self.m_plot_oscilloscope.setLabel('bottom', 'Time, ns')        
 
         self.m_plot_oscilloscope.showGrid(x=True, y=True, alpha=0.5)
-        self.m_plot_oscilloscope.setTitle("Wave form")
+        self.m_plot_oscilloscope.setTitle("Waveform")
         #self.pl_trends.setAutoVisible(x=False, y=False)
         self.m_plot_oscilloscope.addLegend()
 

test.py

@@ -32,7 +32,7 @@
 import spectrometer.spmeters as spmeters
 
 from spectrometer.spmeter_base import SpectraDAQ
-from widgets.widgets import ConnectionWidget, DaqWidget
+from widgets.widgets import ConnectionWidget, DaqWidget, ConsoleWidget
 
 from transport import api, api_param
 from devices.devices import DeviceConn_MasterSlave, DevicesMap, Device, Channel, ChannelWindow, BoardsManager, BoardWindow
@@ -137,6 +137,7 @@ def setupUI(self):  #sets up UI in main window
         self.oscope_widget = oscope.OscilloscopeW()
         self.m_specWidget = spmeters.ChanSpectrometer()
         self.m_sumSpectrometer = spmeters.SumSpectrometer()
+        self.console_widget = ConsoleWidget()
 
         toolbar = QToolBar("Main toolbar")
         self.addToolBar(toolbar)
@@ -148,6 +149,8 @@ def setupUI(self):  #sets up UI in main window
         tabs_lyout.addTab(self.oscope_widget, "Oscilloscope")
         tabs_lyout.addTab(self.m_specWidget, "Spectrometer")
         tabs_lyout.addTab(self.m_sumSpectrometer, "SMeter (SUM)")
+        tabs_lyout.addTab(self.console_widget, "SCPI console")
+
 
         hlayout.addWidget(tabs_lyout)
         centerwidget = QWidget()
@@ -161,39 +164,44 @@ def connectDevice(self, window):  #sets connection configuration and connect to
         self.settings["ip"] = window.lne_ip_edit.text()
         self.transport_param["ip"] = self.settings["ip"]
         self.transport_param["port"] = self.settings["port"]
-        self.board.connect(self.settings)
-        self.board.transport.client.timeout = 20000     #large timeout for SCPI commands
+        try:
+            self.board.connect(self.settings)
+            self.board.transport.client.timeout = 20000     #large timeout for SCPI commands
+            #get uptime and connection status
+            uptime_seconds = self.board.transport.transaction([api_param.SCPI_GET_UPTIME], True)[1]
+        except:
+            print("Cannot establish connection to device!")
+        else:
+            window.setValuesAfterConnection(uptime_seconds, self.board.check_connect())     #update data in connection widget
 
-        #get uptime and connection status
-        uptime_seconds = self.board.transport.transaction([api_param.SCPI_GET_UPTIME], True)[1]
-        window.setValuesAfterConnection(uptime_seconds, self.board.check_connect())     #update data in connection widget
+            #if device was not connected previously, add it to the devices table,
+            #otherwise update information in devices table
+            if not self.settings["ip"] in self.devicesMap:
+                self.cwidget.setupData_onConnected(self.board.check_connect(), uptime_seconds, self.devicesMap, False)
+            else:
+                self.cwidget.setupData_onConnected(self.board.check_connect(), uptime_seconds, self.devicesMap, True)
 
-        #if device was not connected previously, add it to the devices table,
-        #otherwise update information in devices table
-        if not self.settings["ip"] in self.devicesMap:
-            self.cwidget.setupData_onConnected(self.board.check_connect(), uptime_seconds, self.devicesMap, False)
-        else:
-            self.cwidget.setupData_onConnected(self.board.check_connect(), uptime_seconds, self.devicesMap, True)
-
-        isConnected = self.board.check_connect()
-        print("Connection:", isConnected)
-
-        if window.isTableDevices and isConnected:   #if current connection manager is with TableDevices and device is connected
-            #fill table with connected devices
-            #assign board in devices table to currently connected device
-            device = self.devicesMap[self.settings["ip"]]
-            if device.board == None:
-                device.board = self.board
-                device.board.transport.client.write('sp:channels?')
-                numChannels = int(device.board.transport.client.read_raw().decode('utf-8').rstrip())
-                device.nChannels = numChannels
-                device.channels = [None] * numChannels
-
-            self.buildBoardTab(device)              #create tab widget with channels for board
-
-            for deviceIP in self.devicesMap:
-                self.devicesMap[deviceIP].board.transport.client.write('*IDN?')
-                print("{0}: {1}".format(deviceIP, self.devicesMap[deviceIP].board.transport.client.read_raw().decode('utf-8').rstrip()))
+            isConnected = self.board.check_connect()
+            print("Connection:", isConnected)
+
+            if window.isTableDevices and isConnected:   #if current connection manager is with TableDevices and device is connected
+                #fill table with connected devices
+                #assign board in devices table to currently connected device
+                device = self.devicesMap[self.settings["ip"]]
+                if device.board == None:
+                    device.board = self.board
+                    device.board.transport.client.write('sp:channels?')
+                    numChannels = int(device.board.transport.client.read_raw().decode('utf-8').rstrip())
+                    device.nChannels = numChannels
+                    device.channels = [None] * numChannels
+
+                self.buildBoardTab(device)              #create tab widget with channels for board
+
+                self.console_widget.lbl_deviceIP.setText(self.settings["ip"])   #update device IP in console tab
+
+                for deviceIP in self.devicesMap:
+                    self.devicesMap[deviceIP].board.transport.client.write('*IDN?')
+                    print("{0}: {1}".format(deviceIP, self.devicesMap[deviceIP].board.transport.client.read_raw().decode('utf-8').rstrip()))
 
     def removeDevice(self, window):             #removes device from table
         for i in range(self.boards_mgr.count()):

widgets/widgets.py

@@ -8,7 +8,8 @@
 from PyQt5.QtWidgets import (
     QLabel,QPushButton, QWidget, 
     QVBoxLayout, QHBoxLayout, 
-    QTabWidget, QToolBar, QCheckBox, QGridLayout, QLineEdit
+    QTabWidget, QToolBar, QCheckBox, QGridLayout, QLineEdit,
+    QTextEdit, QSpacerItem, QSizePolicy
 )
 from PyQt5.QtCore import (
     pyqtSignal, Qt, pyqtSlot
@@ -17,6 +18,8 @@
 from transport import api, api_param
 from devices.devices import DeviceConn_MasterSlave, DevicesMap, Device, Channel, ChannelWindow, BoardsManager, BoardWindow
 
+from pyqtgraph import PlotWidget
+
 
 class ConnectionWidget(QWidget):
     def __init__(self):
@@ -150,3 +153,50 @@ def recalcTicks(self):
     def recalcFrames(self):
         self.nFrames = int(float(self.lne_full_daq_time.text())*1000/float(self.lne_single_daq_time.text()))
         self.lbl_full_daq_frames.setText(str(self.nFrames))
+
+class ConsoleWidget(QWidget):
+    def __init__(self):
+        super().__init__()
+        self.setupUI()
+
+    def setupUI(self):
+        layout = QGridLayout()
+
+        self.txt_output = QTextEdit()
+        self.txt_output.setMinimumHeight(300)
+        self.txt_output.setSizePolicy(QSizePolicy.Expanding, QSizePolicy.Expanding)
+
+        self.lbl_help = QLabel("To change the connected device, click Connect on leftmost Devices area")
+
+        self.lne_query = QLineEdit()
+        self.lne_query.setText("")
+        self.lbl_query = QLabel("SCPI query")
+        self.btn_query = QPushButton("Send query")
+        self.btn_response = QPushButton("Read response")
+        self.btn_plot = QPushButton("Plot data")
+
+        self.m_plotData = PlotWidget()
+        self.m_plotData.setMinimumHeight(350)
+        self.m_plotData.setMinimumWidth(450)
+
+        self.lbl_currentDevice = QLabel("Current device IP:")
+        self.lbl_deviceIP = QLabel("0.0.0.0")
+
+        layout.addWidget(self.txt_output, 0, 0, 3, -1)
+
+        layout.addWidget(self.lbl_help, 4, 0, 1, -1)
+        layout.addWidget(self.lbl_currentDevice, 5, 0, 1, 1)
+        layout.addWidget(self.lbl_deviceIP, 5, 1, 1, 1)
+
+        layout.addWidget(self.lbl_query, 6, 0, 1, 1)
+        layout.addWidget(self.lne_query, 6, 1, 1, -1)
+        layout.addWidget(self.btn_query, 7, 1, 1, 1)
+        layout.addWidget(self.btn_response, 7, 2, 1, 1)
+        layout.addWidget(self.btn_plot, 7, 3, 1, 1)
+
+        layout.addWidget(self.m_plotData, 8, 0, -1, -1)
+        layout.setVerticalSpacing(0)
+
+        self.setLayout(layout)
+        self.setMinimumHeight(600)
+        self.setMinimumWidth(450)