added dummy modules B and C

software/Makefile

@@ -1,4 +1,4 @@
-all: edubrm mainUi.py resources_rc.py modules/ModuleAUi.py modules/ModuleDebugUi.py
+all: edubrm mainUi.py resources_rc.py modules/ModuleAUi.py modules/ModuleBUi.py modules/ModuleCUi.py modules/ModuleDebugUi.py
 
 mainUi.py: main.ui
 	pyuic4 $< -o $@

software/main.py

@@ -18,6 +18,8 @@ class ModuleButton(QPushButton):
         self.clicked.connect(self.on_clicked)
 
     def on_clicked(self):
+        # reinit because of the widget
+        self.mod.__init__()
         self.form.ui.areaChoose.hide()
         self.form.ui.btnExit.hide()
         self.form.ui.btnBack.show()
@@ -44,7 +46,6 @@ class Main(QMainWindow):
     def on_btnBack_clicked(self):
         self.mod.stop()
         self.ui.lblTitle.setText('EduBRM')
-        # TODO: erase everything from self.ui.areaModule
         self.ui.areaChoose.show()
         self.ui.areaModule.hide()
         self.ui.btnExit.show()

software/modules/ModuleB.py

@@ -0,0 +1,37 @@
+from PyQt4.QtGui import QWidget
+from PyQt4.QtCore import pyqtSlot
+from PyQt4.QtCore import SIGNAL
+from PyQt4.QtCore import QObject
+from PyQt4.QtCore import QTimer
+from ModuleBUi import Ui_ModuleB
+from device import Device
+
+class ModuleBWidget(QWidget):
+
+    def __init__(self):
+        QWidget.__init__(self)
+        self.ui = Ui_ModuleB()
+        self.ui.setupUi(self)
+
+        self.timer = QTimer()
+        QObject.connect(self.timer, SIGNAL("timeout()"), self.read_inputs)
+
+    def read_inputs(self):
+        pass
+#        r = self.dev.read()
+#        v = r[0]/1023.0 * 3.3
+#        self.ui.labelV.setText('{:0.3f} V'.format(v))
+#        self.ui.progressV.setValue(1000*v)
+
+class ModuleB():
+
+    def __init__(self):
+        self.title = 'Simple DC circuit'
+        self.widget = ModuleBWidget()
+
+    def start(self):
+        self.widget.dev = Device()
+        self.widget.timer.start(50)
+
+    def stop(self):
+        self.widget.timer.stop()

software/modules/ModuleB.ui

@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>ModuleB</class>
+ <widget class="QWidget" name="ModuleB">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>781</width>
+    <height>531</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Form</string>
+  </property>
+  <widget class="QWidget" name="widgetImg" native="true">
+   <property name="geometry">
+    <rect>
+     <x>10</x>
+     <y>10</y>
+     <width>761</width>
+     <height>511</height>
+    </rect>
+   </property>
+  </widget>
+ </widget>
+ <resources/>
+ <connections/>
+</ui>

software/modules/ModuleC.py

@@ -0,0 +1,37 @@
+from PyQt4.QtGui import QWidget
+from PyQt4.QtCore import pyqtSlot
+from PyQt4.QtCore import SIGNAL
+from PyQt4.QtCore import QObject
+from PyQt4.QtCore import QTimer
+from ModuleCUi import Ui_ModuleC
+from device import Device
+
+class ModuleCWidget(QWidget):
+
+    def __init__(self):
+        QWidget.__init__(self)
+        self.ui = Ui_ModuleC()
+        self.ui.setupUi(self)
+
+        self.timer = QTimer()
+        QObject.connect(self.timer, SIGNAL("timeout()"), self.read_inputs)
+
+    def read_inputs(self):
+        pass
+#        r = self.dev.read()
+#        v = r[0]/1023.0 * 3.3
+#        self.ui.labelV.setText('{:0.3f} V'.format(v))
+#        self.ui.progressV.setValue(1000*v)
+
+class ModuleC():
+
+    def __init__(self):
+        self.title = 'L/C/LC circuit'
+        self.widget = ModuleCWidget()
+
+    def start(self):
+        self.widget.dev = Device()
+        self.widget.timer.start(50)
+
+    def stop(self):
+        self.widget.timer.stop()

software/modules/ModuleC.ui

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>ModuleC</class>
+ <widget class="QWidget" name="ModuleC">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>781</width>
+    <height>531</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Form</string>
+  </property>
+ </widget>
+ <resources/>
+ <connections/>
+</ui>

software/modules/__init__.py

@@ -1,5 +1,7 @@
 from ModuleA import ModuleA
+from ModuleB import ModuleB
+from ModuleC import ModuleC
 from ModuleDebug import ModuleDebug
 
 def list():
-    return [ModuleDebug(),ModuleA()]
+    return [ModuleA(),ModuleB(),ModuleC(),ModuleDebug()]

software/resources.qrc

@@ -5,6 +5,8 @@
     <file>about.png</file>
     <file>icon.png</file>
     <file>modules/ModuleA.png</file>
+    <file>modules/ModuleB.png</file>
+    <file>modules/ModuleC.png</file>
     <file>modules/ModuleDebug.png</file>
   </qresource>
 </RCC>