diff --git a/src/c/Main.py b/src/c/Main.py
index db456f8..35150c6 100644
--- a/src/c/Main.py
+++ b/src/c/Main.py
@@ -4,7 +4,7 @@ from PyQt4 import QtGui
from src.v.MainWindow import Ui_MainWindow
from src.c.log.log import Log
-
+from src.m.Parking import Parking, ListeTypePlace
__author__ = 'sidya'
@@ -14,9 +14,16 @@ class Main:
# Init des logs
self.log = Log()
+ l = ListeTypePlace()
+ l.add(10, 11, 5)
+ l.add(7, 12, 5)
+ p = Parking(5, l,"lol")
+
#Liste Clients et Parking
- self.__clients = {}
- self.__Parkings = {}
+ self.__clients = []
+ self.__parkings = [p]
+
+
app = QtGui.QApplication(sys.argv)
self.view = QtGui.QMainWindow()
@@ -25,7 +32,7 @@ class Main:
#Chargement activité
self.loadLastActivity()
- self.ui.addListeParkings(10)
+ self.majListeParking()
self.view.show()
sys.exit(app.exec_())
@@ -46,3 +53,6 @@ class Main:
liste = self.activite.readlines()
for l in [l[:-1] for l in liste[-11:-1]]:
self.ui.addItemActivite(l)
+
+ def majListeParking(self):
+ self.ui.majListeParkings(self.__parkings)
diff --git a/src/m/Parking.py b/src/m/Parking.py
index a56f605..02b2316 100644
--- a/src/m/Parking.py
+++ b/src/m/Parking.py
@@ -18,7 +18,19 @@ class Parking:
for t in typePlacesParNiv.liste:
for i in range(0, t.nb):
l.append(Place(i + 1, n, t.longueur, t.hauteur))
- self.__Places[n ] = l
+ self.__Places[n] = l
+
+ @property
+ def nom(self):
+ return self.__nom
+
+ @property
+ def nbPlacesParNiveau(self):
+ return self.__nbPlacesParNiveau
+
+ @property
+ def nbNiveau(self):
+ return self.__nbNiveaux
def recherchePlace(self, voiture):
place = None
@@ -40,6 +52,7 @@ class Parking:
i += 1
return i
+ @property
def nbPlacesLibresParking(self):
nbP = 0
for i in range(0,self.__nbNiveaux) :
diff --git a/src/v/MainWindow.py b/src/v/MainWindow.py
index 81a3789..4ce0f41 100644
--- a/src/v/MainWindow.py
+++ b/src/v/MainWindow.py
@@ -2,7 +2,7 @@
# Form implementation generated from reading ui file 'main.ui'
#
-# Created: Tue Dec 23 18:26:40 2014
+# Created: Tue Dec 23 22:14:01 2014
# by: PyQt4 UI code generator 4.11.3
#
# WARNING! All changes made in this file will be lost!
@@ -26,7 +26,7 @@ except AttributeError:
class Ui_MainWindow(object):
def setupUi(self, MainWindow):
MainWindow.setObjectName(_fromUtf8("MainWindow"))
- MainWindow.resize(553, 479)
+ MainWindow.resize(561, 479)
self.centralwidget = QtGui.QWidget(MainWindow)
self.centralwidget.setObjectName(_fromUtf8("centralwidget"))
self.tabWidget = QtGui.QTabWidget(self.centralwidget)
@@ -43,51 +43,62 @@ class Ui_MainWindow(object):
self.tabWidget.addTab(self.tab, _fromUtf8(""))
self.tab_2 = QtGui.QWidget()
self.tab_2.setObjectName(_fromUtf8("tab_2"))
- self.formLayoutWidget = QtGui.QWidget(self.tab_2)
- self.formLayoutWidget.setGeometry(QtCore.QRect(100, 80, 311, 151))
- self.formLayoutWidget.setObjectName(_fromUtf8("formLayoutWidget"))
- self.formLayout_3 = QtGui.QFormLayout(self.formLayoutWidget)
- self.formLayout_3.setMargin(0)
+ self.verticalLayout = QtGui.QVBoxLayout(self.tab_2)
+ self.verticalLayout.setObjectName(_fromUtf8("verticalLayout"))
+ self.comboBox = QtGui.QComboBox(self.tab_2)
+ self.comboBox.setObjectName(_fromUtf8("comboBox"))
+ self.verticalLayout.addWidget(self.comboBox)
+ self.formLayout_3 = QtGui.QFormLayout()
self.formLayout_3.setObjectName(_fromUtf8("formLayout_3"))
- self.label_13 = QtGui.QLabel(self.formLayoutWidget)
+ self.label_13 = QtGui.QLabel(self.tab_2)
self.label_13.setObjectName(_fromUtf8("label_13"))
self.formLayout_3.setWidget(0, QtGui.QFormLayout.LabelRole, self.label_13)
- self.label_14 = QtGui.QLabel(self.formLayoutWidget)
+ self.label_14 = QtGui.QLabel(self.tab_2)
self.label_14.setObjectName(_fromUtf8("label_14"))
self.formLayout_3.setWidget(1, QtGui.QFormLayout.LabelRole, self.label_14)
- self.lineEdit_11 = QtGui.QLineEdit(self.formLayoutWidget)
- self.lineEdit_11.setObjectName(_fromUtf8("lineEdit_11"))
- self.formLayout_3.setWidget(0, QtGui.QFormLayout.FieldRole, self.lineEdit_11)
- self.lineEdit_12 = QtGui.QLineEdit(self.formLayoutWidget)
- self.lineEdit_12.setObjectName(_fromUtf8("lineEdit_12"))
- self.formLayout_3.setWidget(1, QtGui.QFormLayout.FieldRole, self.lineEdit_12)
- self.label_15 = QtGui.QLabel(self.formLayoutWidget)
+ self.label_15 = QtGui.QLabel(self.tab_2)
self.label_15.setObjectName(_fromUtf8("label_15"))
self.formLayout_3.setWidget(2, QtGui.QFormLayout.LabelRole, self.label_15)
- self.lineEdit_13 = QtGui.QLineEdit(self.formLayoutWidget)
- self.lineEdit_13.setObjectName(_fromUtf8("lineEdit_13"))
- self.formLayout_3.setWidget(2, QtGui.QFormLayout.FieldRole, self.lineEdit_13)
- self.label_16 = QtGui.QLabel(self.formLayoutWidget)
+ self.label_16 = QtGui.QLabel(self.tab_2)
self.label_16.setObjectName(_fromUtf8("label_16"))
self.formLayout_3.setWidget(3, QtGui.QFormLayout.LabelRole, self.label_16)
- self.lineEdit_14 = QtGui.QLineEdit(self.formLayoutWidget)
- self.lineEdit_14.setObjectName(_fromUtf8("lineEdit_14"))
- self.formLayout_3.setWidget(3, QtGui.QFormLayout.FieldRole, self.lineEdit_14)
- self.label_17 = QtGui.QLabel(self.formLayoutWidget)
+ self.label_17 = QtGui.QLabel(self.tab_2)
self.label_17.setObjectName(_fromUtf8("label_17"))
self.formLayout_3.setWidget(4, QtGui.QFormLayout.LabelRole, self.label_17)
- self.lineEdit_15 = QtGui.QLineEdit(self.formLayoutWidget)
- self.lineEdit_15.setObjectName(_fromUtf8("lineEdit_15"))
- self.formLayout_3.setWidget(4, QtGui.QFormLayout.FieldRole, self.lineEdit_15)
+ self.label_2 = QtGui.QLabel(self.tab_2)
+ self.label_2.setObjectName(_fromUtf8("label_2"))
+ self.formLayout_3.setWidget(0, QtGui.QFormLayout.FieldRole, self.label_2)
+ self.label_3 = QtGui.QLabel(self.tab_2)
+ self.label_3.setObjectName(_fromUtf8("label_3"))
+ self.formLayout_3.setWidget(1, QtGui.QFormLayout.FieldRole, self.label_3)
+ self.label_4 = QtGui.QLabel(self.tab_2)
+ self.label_4.setObjectName(_fromUtf8("label_4"))
+ self.formLayout_3.setWidget(2, QtGui.QFormLayout.FieldRole, self.label_4)
+ self.label_5 = QtGui.QLabel(self.tab_2)
+ self.label_5.setObjectName(_fromUtf8("label_5"))
+ self.formLayout_3.setWidget(3, QtGui.QFormLayout.FieldRole, self.label_5)
+ self.label_6 = QtGui.QLabel(self.tab_2)
+ self.label_6.setObjectName(_fromUtf8("label_6"))
+ self.formLayout_3.setWidget(4, QtGui.QFormLayout.FieldRole, self.label_6)
+ self.verticalLayout.addLayout(self.formLayout_3)
+ self.horizontalLayout = QtGui.QHBoxLayout()
+ self.horizontalLayout.setObjectName(_fromUtf8("horizontalLayout"))
+ self.pushButton_4 = QtGui.QPushButton(self.tab_2)
+ self.pushButton_4.setObjectName(_fromUtf8("pushButton_4"))
+ self.horizontalLayout.addWidget(self.pushButton_4)
+ self.pushButton_3 = QtGui.QPushButton(self.tab_2)
+ self.pushButton_3.setObjectName(_fromUtf8("pushButton_3"))
+ self.horizontalLayout.addWidget(self.pushButton_3)
+ self.verticalLayout.addLayout(self.horizontalLayout)
+ self.pushButton_5 = QtGui.QPushButton(self.tab_2)
+ self.pushButton_5.setObjectName(_fromUtf8("pushButton_5"))
+ self.verticalLayout.addWidget(self.pushButton_5)
self.pushButton_2 = QtGui.QPushButton(self.tab_2)
- self.pushButton_2.setGeometry(QtCore.QRect(140, 270, 101, 27))
self.pushButton_2.setObjectName(_fromUtf8("pushButton_2"))
- self.comboBox = QtGui.QComboBox(self.tab_2)
- self.comboBox.setGeometry(QtCore.QRect(100, 40, 321, 27))
- self.comboBox.setObjectName(_fromUtf8("comboBox"))
+ self.verticalLayout.addWidget(self.pushButton_2)
self.pushButton = QtGui.QPushButton(self.tab_2)
- self.pushButton.setGeometry(QtCore.QRect(290, 270, 81, 27))
self.pushButton.setObjectName(_fromUtf8("pushButton"))
+ self.verticalLayout.addWidget(self.pushButton)
self.tabWidget.addTab(self.tab_2, _fromUtf8(""))
self.tab_5 = QtGui.QWidget()
self.tab_5.setObjectName(_fromUtf8("tab_5"))
@@ -97,9 +108,12 @@ class Ui_MainWindow(object):
self.tableWidget.setColumnCount(0)
self.tableWidget.setRowCount(0)
self.tabWidget.addTab(self.tab_5, _fromUtf8(""))
+ self.tab_3 = QtGui.QWidget()
+ self.tab_3.setObjectName(_fromUtf8("tab_3"))
+ self.tabWidget.addTab(self.tab_3, _fromUtf8(""))
MainWindow.setCentralWidget(self.centralwidget)
self.menubar = QtGui.QMenuBar(MainWindow)
- self.menubar.setGeometry(QtCore.QRect(0, 0, 553, 25))
+ self.menubar.setGeometry(QtCore.QRect(0, 0, 561, 25))
self.menubar.setObjectName(_fromUtf8("menubar"))
self.menuFichier = QtGui.QMenu(self.menubar)
self.menuFichier.setObjectName(_fromUtf8("menuFichier"))
@@ -125,15 +139,18 @@ class Ui_MainWindow(object):
self.actionAjouter.setObjectName(_fromUtf8("actionAjouter"))
self.actionQuitter = QtGui.QAction(MainWindow)
self.actionQuitter.setObjectName(_fromUtf8("actionQuitter"))
+ self.action = QtGui.QAction(MainWindow)
+ self.action.setObjectName(_fromUtf8("action"))
self.menuFichier.addAction(self.actionCharger)
self.menuFichier.addAction(self.actionSauvegarder)
self.menuFichier.addSeparator()
self.menuFichier.addAction(self.actionQuitter)
+ self.menuA_propos.addAction(self.action)
self.menubar.addAction(self.menuFichier.menuAction())
self.menubar.addAction(self.menuA_propos.menuAction())
self.retranslateUi(MainWindow)
- self.tabWidget.setCurrentIndex(2)
+ self.tabWidget.setCurrentIndex(1)
QtCore.QMetaObject.connectSlotsByName(MainWindow)
def retranslateUi(self, MainWindow):
@@ -145,10 +162,19 @@ class Ui_MainWindow(object):
self.label_15.setText(_translate("MainWindow", "Place / niveau :", None))
self.label_16.setText(_translate("MainWindow", "Place disponible :", None))
self.label_17.setText(_translate("MainWindow", "Place Reserve Super Abo : ", None))
- self.pushButton_2.setText(_translate("MainWindow", "Creer/Modifier", None))
+ self.label_2.setText(_translate("MainWindow", "TextLabel", None))
+ self.label_3.setText(_translate("MainWindow", "TextLabel", None))
+ self.label_4.setText(_translate("MainWindow", "TextLabel", None))
+ self.label_5.setText(_translate("MainWindow", "TextLabel", None))
+ self.label_6.setText(_translate("MainWindow", "TextLabel", None))
+ self.pushButton_4.setText(_translate("MainWindow", "Details Places", None))
+ self.pushButton_3.setText(_translate("MainWindow", "Borne", None))
+ self.pushButton_5.setText(_translate("MainWindow", "Créer", None))
+ self.pushButton_2.setText(_translate("MainWindow", "Modifier", None))
self.pushButton.setText(_translate("MainWindow", "Supprimer", None))
self.tabWidget.setTabText(self.tabWidget.indexOf(self.tab_2), _translate("MainWindow", "Parkings", None))
self.tabWidget.setTabText(self.tabWidget.indexOf(self.tab_5), _translate("MainWindow", "Membres", None))
+ self.tabWidget.setTabText(self.tabWidget.indexOf(self.tab_3), _translate("MainWindow", "Services", None))
self.menuFichier.setTitle(_translate("MainWindow", "Fichier", None))
self.menuA_propos.setTitle(_translate("MainWindow", "A propos", None))
self.actionCharger.setText(_translate("MainWindow", "Charger", None))
@@ -159,14 +185,32 @@ class Ui_MainWindow(object):
self.actionListe.setText(_translate("MainWindow", "Liste", None))
self.actionAjouter.setText(_translate("MainWindow", "Ajouter", None))
self.actionQuitter.setText(_translate("MainWindow", "Quitter", None))
-
+ self.action.setText(_translate("MainWindow", "?", None))
################################NOT GENERATED####################################################
- def addItemActivite(self, line) :
+ def addItemActivite(self, line):
self.log.addItem(line)
- def addListeParkings(self, parkings) :
- self.comboBox.addItem("lol")
\ No newline at end of file
+ def majListeParkings(self, parkings):
+ self.__parkings = parkings
+ self.comboBox.currentIndexChanged['QString'].connect(self.selectParking)
+ self.comboBox.clear()
+ self.comboBox.addItem("Selectionner un parking")
+ for p in parkings:
+ self.comboBox.addItem(p.nom)
+
+ def selectParking(self):
+ self.label_2.clear()
+ self.label_3.clear()
+ self.label_4.clear()
+ self.label_5.clear()
+ self.label_6.clear()
+ if(self.comboBox.currentIndex() != 0) :
+ self.label_2.setText(self.__parkings[self.comboBox.currentIndex()-1].nom)
+ self.label_3.setText(str(self.__parkings[self.comboBox.currentIndex()-1].nbNiveau))
+ self.label_4.setText(str(self.__parkings[self.comboBox.currentIndex()-1].nbPlacesParNiveau))
+ self.label_5.setText(str(self.__parkings[self.comboBox.currentIndex()-1].nbPlacesLibresParking))
+ self.label_6.setText("lol")
diff --git a/ui/main.ui b/ui/main.ui
index f31fd83..1e8b0d9 100644
--- a/ui/main.ui
+++ b/ui/main.ui
@@ -6,12 +6,12 @@
0
0
- 522
- 412
+ 561
+ 479
- MainWindow
+ Administration
@@ -24,7 +24,7 @@
- 0
+ 1
@@ -43,13 +43,13 @@
Activité :
-
+
- 30
- 40
- 421
- 241
+ 60
+ 50
+ 431
+ 261
@@ -58,134 +58,145 @@
Parkings
-
-
-
- 100
- 80
- 311
- 151
-
-
-
- -
-
-
- Nom :
-
-
-
- -
-
-
- Niveau :
-
-
-
- -
-
-
- -
-
-
- -
-
-
- Place / niveau :
-
-
-
- -
-
-
- -
-
-
- Place disponible :
-
-
-
- -
-
-
- -
-
-
- Place Reserve Super Abo :
-
-
-
- -
-
-
-
-
-
-
-
- 140
- 270
- 101
- 27
-
-
-
- Creer/Modifier
-
-
-
-
-
- 100
- 40
- 321
- 27
-
-
-
-
-
-
- 290
- 270
- 81
- 27
-
-
-
- Supprimer
-
-
- label_2
- lineEdit
- label_6
- label_5
- lineEdit_3
- label_4
- lineEdit_4
- lineEdit_5
- label_3
- lineEdit_2
- formLayoutWidget
- pushButton_2
- comboBox
- pushButton
+
+ -
+
+
+ -
+
+
-
+
+
+ Nom :
+
+
+
+ -
+
+
+ Niveau :
+
+
+
+ -
+
+
+ Place / niveau :
+
+
+
+ -
+
+
+ Place disponible :
+
+
+
+ -
+
+
+ Place Reserve Super Abo :
+
+
+
+ -
+
+
+ TextLabel
+
+
+
+ -
+
+
+ TextLabel
+
+
+
+ -
+
+
+ TextLabel
+
+
+
+ -
+
+
+ TextLabel
+
+
+
+ -
+
+
+ TextLabel
+
+
+
+
+
+ -
+
+
-
+
+
+ Details Places
+
+
+
+ -
+
+
+ Borne
+
+
+
+
+
+ -
+
+
+ Créer
+
+
+
+ -
+
+
+ Modifier
+
+
+
+ -
+
+
+ Supprimer
+
+
+
+
Membres
-
+
- 50
- 40
+ 60
+ 20
431
- 201
+ 351
+
+
+ Services
+
+