From 4b73d98c11fc5f7b236894d4f7119c14eb7776ad Mon Sep 17 00:00:00 2001
From: Pavol Rusnak <stick@gk2.sk>
Date: Fri, 15 Apr 2011 00:25:29 +0200
Subject: [PATCH] start writing debugmodule

---
 software/.gitignore              |   2 +-
 software/Makefile                |  13 ++++++++-----
 software/main.py                 |   2 +-
 software/modules/.gitignore      |   1 +
 software/modules/ModuleA.py      |   3 +--
 software/modules/ModuleB.png     | Bin 2564 -> 0 bytes
 software/modules/ModuleB.py      |  12 ------------
 software/modules/ModuleDebug.png | Bin 0 -> 1694 bytes
 software/modules/ModuleDebug.py  |  14 ++++++++++++++
 software/modules/ModuleDebug.ui  |  29 +++++++++++++++++++++++++++++
 software/modules/__init__.py     |   4 ++--
 software/resources.qrc           |   2 +-
 12 files changed, 58 insertions(+), 24 deletions(-)
 delete mode 100644 software/modules/ModuleB.png
 delete mode 100644 software/modules/ModuleB.py
 create mode 100644 software/modules/ModuleDebug.png
 create mode 100644 software/modules/ModuleDebug.py
 create mode 100644 software/modules/ModuleDebug.ui

diff --git a/software/.gitignore b/software/.gitignore
index fdb230f..9fc9fb5 100644
--- a/software/.gitignore
+++ b/software/.gitignore
@@ -1,3 +1,3 @@
 *.pyc
-mainUi.py
+*Ui.py
 resources_rc.py
diff --git a/software/Makefile b/software/Makefile
index 971fd8b..5af1307 100644
--- a/software/Makefile
+++ b/software/Makefile
@@ -1,10 +1,13 @@
-all: edubrm mainUi.py resources_rc.py
+all: edubrm mainUi.py resources_rc.py modules/ModuleDebugUi.py
 
 mainUi.py: main.ui
-	pyuic4 main.ui -o mainUi.py
+	pyuic4 $< -o $@
 
-resources_rc.py:
-	pyrcc4 resources.qrc -o resources_rc.py
+resources_rc.py: resources.qrc
+	pyrcc4 $< -o $@
+
+modules/ModuleDebugUi.py: modules/ModuleDebug.ui
+	pyuic4 $< -o $@
 
 clean:
-	rm -f *.pyc modules/*.pyc mainUi.py resources_rc.py
+	rm -f *.pyc *Ui.py modules/*.pyc modules/*Ui.py resources_rc.py
diff --git a/software/main.py b/software/main.py
index 3a5719f..63f31c1 100644
--- a/software/main.py
+++ b/software/main.py
@@ -22,7 +22,7 @@ class ModuleButton(QPushButton):
         self.form.ui.btnExit.hide()
         self.form.ui.btnBack.show()
         self.form.ui.lblTitle.setText(self.mod.title)
-        self.mod.setup(self.form.ui.areaModule)
+        self.mod.setup(self.form.ui.areaModuleContents)
 
 class Main(QMainWindow):
     def __init__(self):
diff --git a/software/modules/.gitignore b/software/modules/.gitignore
index 0d20b64..8d28acb 100644
--- a/software/modules/.gitignore
+++ b/software/modules/.gitignore
@@ -1 +1,2 @@
 *.pyc
+*Ui.py
diff --git a/software/modules/ModuleA.py b/software/modules/ModuleA.py
index 7889c6f..7c0a871 100644
--- a/software/modules/ModuleA.py
+++ b/software/modules/ModuleA.py
@@ -2,11 +2,10 @@ from module import Module
 
 class ModuleA(Module):
 
-    title = "Acko"
+    title = 'Acko'
 
     def setup(self, area):
         print 'setup A'
-        print area
 
     def run(self):
         print 'run A'
diff --git a/software/modules/ModuleB.png b/software/modules/ModuleB.png
deleted file mode 100644
index 494d7850f984741a025370a072a80530ce982a1c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2564
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
aas3aq>(_GtC=h)B0000<MNUMnLSTaT#qt9H

diff --git a/software/modules/ModuleB.py b/software/modules/ModuleB.py
deleted file mode 100644
index 002e84b..0000000
--- a/software/modules/ModuleB.py
+++ /dev/null
@@ -1,12 +0,0 @@
-from module import Module
-
-class ModuleB(Module):
-
-    title = "Bcko"
-
-    def setup(self, area):
-        print 'setup B'
-        print area
-
-    def run(self):
-        print 'run B'
diff --git a/software/modules/ModuleDebug.png b/software/modules/ModuleDebug.png
new file mode 100644
index 0000000000000000000000000000000000000000..14cc6a0b28702f3f0adb94dbf2cdbd082199be47
GIT binary patch
literal 1694
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

literal 0
HcmV?d00001

diff --git a/software/modules/ModuleDebug.py b/software/modules/ModuleDebug.py
new file mode 100644
index 0000000..2c817be
--- /dev/null
+++ b/software/modules/ModuleDebug.py
@@ -0,0 +1,14 @@
+from module import Module
+from ModuleDebugUi import Ui_ModuleDebug
+
+class ModuleDebug(Module):
+
+    title = 'Debug'
+
+    def setup(self, area):
+        print 'setup Debug'
+        self.ui = Ui_ModuleDebug()
+        self.ui.setupUi(area)
+
+    def run(self):
+        print 'run Debug'
diff --git a/software/modules/ModuleDebug.ui b/software/modules/ModuleDebug.ui
new file mode 100644
index 0000000..75fc5a9
--- /dev/null
+++ b/software/modules/ModuleDebug.ui
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>ModuleDebug</class>
+ <widget class="QWidget" name="ModuleDebug">
+  <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="QCalendarWidget" name="calendarWidget">
+   <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/__init__.py b/software/modules/__init__.py
index 637b9f4..275a4fd 100644
--- a/software/modules/__init__.py
+++ b/software/modules/__init__.py
@@ -1,5 +1,5 @@
 from ModuleA import ModuleA
-from ModuleB import ModuleB
+from ModuleDebug import ModuleDebug
 
 def list():
-    return [ModuleA(),ModuleB()]
+    return [ModuleDebug(),ModuleA()]
diff --git a/software/resources.qrc b/software/resources.qrc
index 13d046b..3cefced 100644
--- a/software/resources.qrc
+++ b/software/resources.qrc
@@ -5,6 +5,6 @@
     <file>about.png</file>
     <file>icon.png</file>
     <file>modules/ModuleA.png</file>
-    <file>modules/ModuleB.png</file>
+    <file>modules/ModuleDebug.png</file>
   </qresource>
 </RCC>