From 5401986edda588fd40400f15b1c0382199d96d6f Mon Sep 17 00:00:00 2001
From: Pavol Rusnak <stick@gk2.sk>
Date: Sun, 1 May 2011 11:37:46 +0200
Subject: [PATCH] added dummy modules B and C

---
 software/Makefile            |   2 +-
 software/main.py             |   3 ++-
 software/modules/ModuleB.png | Bin 0 -> 1421 bytes
 software/modules/ModuleB.py  |  37 +++++++++++++++++++++++++++++++++++
 software/modules/ModuleB.ui  |  29 +++++++++++++++++++++++++++
 software/modules/ModuleC.png | Bin 0 -> 502 bytes
 software/modules/ModuleC.py  |  37 +++++++++++++++++++++++++++++++++++
 software/modules/ModuleC.ui  |  19 ++++++++++++++++++
 software/modules/__init__.py |   4 +++-
 software/resources.qrc       |   2 ++
 10 files changed, 130 insertions(+), 3 deletions(-)
 create mode 100644 software/modules/ModuleB.png
 create mode 100644 software/modules/ModuleB.py
 create mode 100644 software/modules/ModuleB.ui
 create mode 100644 software/modules/ModuleC.png
 create mode 100644 software/modules/ModuleC.py
 create mode 100644 software/modules/ModuleC.ui

diff --git a/software/Makefile b/software/Makefile
index dbea95b..6ed10de 100644
--- a/software/Makefile
+++ b/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 $@
diff --git a/software/main.py b/software/main.py
index 6258901..f88b4f9 100644
--- a/software/main.py
+++ b/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()
diff --git a/software/modules/ModuleB.png b/software/modules/ModuleB.png
new file mode 100644
index 0000000000000000000000000000000000000000..ef08925868d5e4ced9cabd473106745fd3fa1deb
GIT binary patch
literal 1421
zcmV;81#<d{P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800004b3#c}2nYxW
zd<bNS000F<Nkl<ZScUDDOKe=#8OML;KIhtV<3~N1KpxaQBv1s3NTG#NM4L#h6bb?b
z36NM-N(EGGAT5YRHhoB~#EL9XH&qsu8byVo2wEwK1rmu11=?VoIB^`C*h%aePkiUj
zeVqpjJ0Xvm$)r%Vi~gmftE2Cp@B7{F`_4TF{;&VC#MLhN>rc5xd(I1%Z9lA(Tx$%L
zV>>5}QG1(G{`!$uss2X*wr#_{IpvOfZgBs0)7_f~2Jd>vGCc#!PMV8UM_<=RN8gzm
zoy;E@4>+`E59(_Hc=1Qv=K8@eZn|Y;+omlKIg@Yv#`)Hc-2_q*qzM2?DWK`teDums
z==<Jw`O*G;a&CI+Pg)hf{nb7Wb@K1DGwj@nB|mh3xACq!pS|~qr(MenDCH@Wz|e_<
zh?}2446g^E9G##vz8hl<mDM*okM8)Tlg9B=`~R@(@fZ2W@2jWObFY0!(JGGJ4&a{9
zduj95tvfb7w%rZ$lvT|oJel+P;e*8UNAb?Qi+$qHsH1ym9Daj|u@6Wn(_gujwIzY?
zI;{WB19lvx8>59|{qIfaw_C+&R|4_!Rww$|uHC%@afGAfc|*Nc<I~Z%Xr4KOOwR%a
z;f9D+-(>CWKj4;;bvU*KfV3UXltOkr^JMDT`Wrjnq<LwemL>T4W>z6^TyF@GBya&h
z|KK3^{_sf(smOAP)&|G1@I43HvM&A#%fa;q!SNL)83Lxe0yw8~w1Bz(`{>$dSWCw*
zvbm0p>$I&Px_mu(|E-)J-AAWh?+754rZI>Ah;{#~h}HK&G=qs}AUg{x0hz3L3BV4(
zD`Wf$ro5iGKF5LAp2Ztj*C|A20JKD(dLQ|hEjZtO1yNpu7~BBD2HOL>2QcVt37IUC
zot>k4WIrblz0Lge7;!V@x{cTU`v6K`Fv)5dnSeNoncNF`9i;_vk`gylnn_CB%+Alx
zsgMRRZDUyN3<`%?x%&Lv$OKdhDg)8|AAC0LXUSQ^A|oyBEi<q<FoK<zI8m%;qIi(I
zOaCIw>!4-V!DH3K2hoiTHV3I&H(-?vFxe#lBiK#}qcum=?aaw<vnjcjN{~@95k`kN
zCdW1z3Wvn>Qa1rLB{-RROf`C$KI;%?P5P7~6MeMX32k~{04WSwFE@d~Vj&Mn-D}at
zuplcWS%Q=jDJ6|OCQchP(wI1F&`>eZ06?kEXHv%|)cVWj$@7fdb<xIPO#7y~+=uRH
z?+jqRT%2b)xtF80xd`k^`idF20HDap^JM^II)Bxr0LB<0+B9$5ZFnhwQfg($t1H2B
z2E_FAbbr?XQ&Up`Ag)xuZltuv7$X{u#wwuP6+je4B>=6vx>a@5N(Ly3q6GAG1u#E9
zUjQPGV|scnThq0C-zP6}v^G|fBsncEKrI2P)oQG@KKRKe|5QUm70Tt1c1_euLI}bz
zWO#U(>O$2NMKLuqGcymDUr5>==t?Q|ch~iPys)s~uUogqsZ@sXeIFsf7>(8%r4(9g
zq+EUqA@Dqpa&MVD&zYT_%d@PgkByCOUtC<A0jgYbGPMKH)oQgKMbYc7>-9`b9J_7u
z*kpmgb{t#yzE5vYFF`4w<d?84o1!R)<CxQ@=gs8t<7us0leOC7-U9~?JU=@-dl)zc
zT-McB%BuzRhhbRRuwlcNzP`Tu!Z5s32r;ab>b>ASBZP>hlxLzS`nXoBy+1xa{$7$K
zRp2xbwF}T~VJ#p4`hZ@*2fQE%N<~p1rIdgI3LpXMD?!sX{;nFJ70|f>%XKv?5Z(W!
b{ulHGG-8|+yPuIT00000NkvXXu0mjffOMtn

literal 0
HcmV?d00001

diff --git a/software/modules/ModuleB.py b/software/modules/ModuleB.py
new file mode 100644
index 0000000..d56fc67
--- /dev/null
+++ b/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()
diff --git a/software/modules/ModuleB.ui b/software/modules/ModuleB.ui
new file mode 100644
index 0000000..dafe69e
--- /dev/null
+++ b/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>
diff --git a/software/modules/ModuleC.png b/software/modules/ModuleC.png
new file mode 100644
index 0000000000000000000000000000000000000000..4e163d27c33cce2ad072236648bf3c03751d98b8
GIT binary patch
literal 502
zcmV<S0SW$zP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px$ut`KgR9M69mb*&>K@i4&7oVMAp$Li^-x@(nu@6MBu+YlRPD`8kY83nn1pfiG
zu(P%jK|~NCCJ5R{?4l^X0*PX5Ca@fLo4wqL&3&*;;O3k8GP|?05F*4sqvns}M}QF^
z3cLda6H*WGA#1RTr2W7aa16WxC1pJTNuW^|U`CvaK%K|rOF&*pm<KYzi%m!t=ynUT
zAx<fe$(NM`=Rh2=<eLS=fHnDJC7{(U(4jaScu1ZAeuTFV)M|VufGb_F8ws>xnB0<T
zm4H(@c$Ltg`|u^frVRzmihltZ_S-gN%06}(wpm&!y>HA*us7uZ=`f`TPE>nQs2CNS
zk)V|@E;c89?^{4jY}$}NB=!>c4zdE*hWzqPne}s5m(c`tc&xxckOE@LZ_^4C{SGxJ
z0Xg8&kbf&S8iW9^`wws@cCy+kM0|7rz@FGXV4;F<JFu&Bc#_^<2YNND#l|~QuHvL^
z5JlvmuFCu3#4UN7ZC>lvrj6UF45PA;6mS82+PFJz0^%M7%sKGufo*wqIdRT_MWESf
slm-b)hS-Q~MHaXRp2O#Nh!Af01?GQ&aa6I66951J07*qoM6N<$f>vMH7ytkO

literal 0
HcmV?d00001

diff --git a/software/modules/ModuleC.py b/software/modules/ModuleC.py
new file mode 100644
index 0000000..27c294a
--- /dev/null
+++ b/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()
diff --git a/software/modules/ModuleC.ui b/software/modules/ModuleC.ui
new file mode 100644
index 0000000..2e58528
--- /dev/null
+++ b/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>
diff --git a/software/modules/__init__.py b/software/modules/__init__.py
index 275a4fd..e4216d1 100644
--- a/software/modules/__init__.py
+++ b/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()]
diff --git a/software/resources.qrc b/software/resources.qrc
index 3cefced..0d9d433 100644
--- a/software/resources.qrc
+++ b/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>