From e091f37ca2b8411cb543776c11162b1ad7954d33 Mon Sep 17 00:00:00 2001 From: sidya82 Date: Tue, 23 Dec 2014 19:05:26 +0100 Subject: [PATCH] New changelist --- src/c/Acces.py | 18 ++--- src/c/Main.py | 19 +++-- src/c/Teleporteur.py | 3 - src/m/Parking.py | 29 +++++--- src/m/Place.py | 73 +++++++++++++++---- src/v/Borne.py | 114 +++++++++++++++++++++++++++++- src/v/Camera.py | 7 +- src/v/MainWindow.py | 54 +++++++------- src/v/Panneau.py | 6 +- src/v/Quitter.py | 163 +++++++++++++++++++++++++++++++++++++++++++ 10 files changed, 411 insertions(+), 75 deletions(-) create mode 100644 src/v/Quitter.py diff --git a/src/c/Acces.py b/src/c/Acces.py index b16794b..840e5b0 100644 --- a/src/c/Acces.py +++ b/src/c/Acces.py @@ -8,14 +8,16 @@ __author__ = 'sidya' class Acces: def __init__(self): - self.__parkings = {} - self.__clients = {} + self.__parking = Parking() + self.__camera = Camera() + self.__borne = Borne() + self.__panneau = Panneau() - def actionnerCamera(self, client): - pass + def actionnerCamera(self): + return self.__camera.donnerVoiture() - def actionnerPanneau(self): - pass + def majPanneau(self): + self.__panneau.afficherNbPlaceDisponible() - def lancerProcedureImmatr(self, voiture): - pass \ No newline at end of file + def lancerProcedureEntree(self,client): + self.__borne.afficher("Inserer votre carte ou valider") diff --git a/src/c/Main.py b/src/c/Main.py index bdb57fc..db456f8 100644 --- a/src/c/Main.py +++ b/src/c/Main.py @@ -1,16 +1,23 @@ -from PyQt4 import QtGui import sys + +from PyQt4 import QtGui + from src.v.MainWindow import Ui_MainWindow from src.c.log.log import Log + __author__ = 'sidya' class Main: def __init__(self): - #Init des logs + # Init des logs self.log = Log() + #Liste Clients et Parking + self.__clients = {} + self.__Parkings = {} + app = QtGui.QApplication(sys.argv) self.view = QtGui.QMainWindow() self.ui = Ui_MainWindow() @@ -18,20 +25,20 @@ class Main: #Chargement activité self.loadLastActivity() - + self.ui.addListeParkings(10) self.view.show() sys.exit(app.exec_()) - def activity(self,msg,lvl): - self.log.printL(msg,10) + def activity(self, msg, lvl): + self.log.printL(msg, lvl) self.ui.addItemActivite(self.activite.readlines()[-1]) def loadLastActivity(self): try: self.activite = open("log/activity.log", "r") - except IOError : + except IOError: self.activite = open("log/activity.log", "w") self.activite.close() self.activite = open("log/activity.log", "r") diff --git a/src/c/Teleporteur.py b/src/c/Teleporteur.py index bd83514..7b663ea 100644 --- a/src/c/Teleporteur.py +++ b/src/c/Teleporteur.py @@ -2,9 +2,6 @@ __author__ = 'sidya' class Teleporteur : - def __init__(self): - pass - def teleporterVoiture(self, voiture, place): pass diff --git a/src/m/Parking.py b/src/m/Parking.py index 81b03bf..a56f605 100644 --- a/src/m/Parking.py +++ b/src/m/Parking.py @@ -1,14 +1,15 @@ __author__ = 'sidya' -from src.m.Place import Place, TypePlace, ListeTypePlace +from src.m.Place import Place, ListeTypePlace class Parking: """ Definie un parking """ - def __init__(self, nbNiv, typePlacesParNiv): - #self.__nbPlacesParNiveau = placesParNiv + def __init__(self, nbNiv, typePlacesParNiv,nom): + self.__nom = nom + self.__nbPlacesParNiveau = typePlacesParNiv.nbPlaceTotal self.__prix = 10 self.__nbNiveaux = nbNiv self.__Places = {} @@ -16,21 +17,21 @@ class Parking: l = [] 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+1] = l + l.append(Place(i + 1, n, t.longueur, t.hauteur)) + self.__Places[n ] = l def recherchePlace(self, voiture): - trouve = False + place = None for i in range(0, self.__nbNiveaux): - if trouve : + if place != None: break l = [p for p in self.__Places[i].estLibre] - for p in l : - if p.dimValide(voiture.hauteur, voiture.longueur) : + for p in l: + if p.dimValide(voiture.hauteur, voiture.longueur): pass - trouve = True + place = p break - return trouve + return place def nbPlacesLibresNiveau(self, niveau): i = 0 @@ -39,6 +40,12 @@ class Parking: i += 1 return i + def nbPlacesLibresParking(self): + nbP = 0 + for i in range(0,self.__nbNiveaux) : + nbP += self.nbPlacesLibresNiveau(i) + return nbP + def addAbonnement(self, Abonnement): pass diff --git a/src/m/Place.py b/src/m/Place.py index 5d371ed..6730b1c 100644 --- a/src/m/Place.py +++ b/src/m/Place.py @@ -1,15 +1,21 @@ +import sys +import datetime + __author__ = 'sidya' -class Place : - def __init__(self,numero,niveau,longueur,hauteur): +class Place: + """ + Representation d'une place dans un parking + """ + def __init__(self, numero, niveau, longueur, hauteur): self.__numero = numero self.__niveau = niveau self.__longueur = longueur self.__hauteur = hauteur self.__estLibre = True self.__estReserver = False - + self.__Placement = None @property def estLibre(self): return self.__estLibre @@ -18,15 +24,36 @@ class Place : def estReserver(self): return self.__estReserver - def dimValide(self,h,l): - return h", None)) + self.pushButton_9.setText(_translate("Form", "Valider", None)) + + def delivrerTicket(self, client): pass diff --git a/src/v/Camera.py b/src/v/Camera.py index f6de542..046576c 100644 --- a/src/v/Camera.py +++ b/src/v/Camera.py @@ -2,6 +2,9 @@ __author__ = 'sidya' class Camera: - def __init__(self): - pass + def detecterVoiture(self): + return True + def donnerVoiture(self): + v = Voiture() # need classe voiture \o/ + return v diff --git a/src/v/MainWindow.py b/src/v/MainWindow.py index de4ec19..81a3789 100644 --- a/src/v/MainWindow.py +++ b/src/v/MainWindow.py @@ -2,13 +2,12 @@ # Form implementation generated from reading ui file 'main.ui' # -# Created: Wed Dec 10 16:36:07 2014 +# Created: Tue Dec 23 18:26:40 2014 # by: PyQt4 UI code generator 4.11.3 # # WARNING! All changes made in this file will be lost! from PyQt4 import QtCore, QtGui -from PyQt4.QtGui import QListWidgetItem try: _fromUtf8 = QtCore.QString.fromUtf8 @@ -27,7 +26,7 @@ except AttributeError: class Ui_MainWindow(object): def setupUi(self, MainWindow): MainWindow.setObjectName(_fromUtf8("MainWindow")) - MainWindow.resize(522, 412) + MainWindow.resize(553, 479) self.centralwidget = QtGui.QWidget(MainWindow) self.centralwidget.setObjectName(_fromUtf8("centralwidget")) self.tabWidget = QtGui.QTabWidget(self.centralwidget) @@ -38,9 +37,9 @@ class Ui_MainWindow(object): self.label = QtGui.QLabel(self.tab) self.label.setGeometry(QtCore.QRect(40, 10, 61, 15)) self.label.setObjectName(_fromUtf8("label")) - self.log = QtGui.QListWidget(self.tab) - self.log.setGeometry(QtCore.QRect(30, 40, 421, 241)) - self.log.setObjectName(_fromUtf8("log")) + self.listWidget = QtGui.QListWidget(self.tab) + self.listWidget.setGeometry(QtCore.QRect(60, 50, 431, 261)) + self.listWidget.setObjectName(_fromUtf8("listWidget")) self.tabWidget.addTab(self.tab, _fromUtf8("")) self.tab_2 = QtGui.QWidget() self.tab_2.setObjectName(_fromUtf8("tab_2")) @@ -92,18 +91,18 @@ class Ui_MainWindow(object): self.tabWidget.addTab(self.tab_2, _fromUtf8("")) self.tab_5 = QtGui.QWidget() self.tab_5.setObjectName(_fromUtf8("tab_5")) - self.tableView = QtGui.QTableView(self.tab_5) - self.tableView.setGeometry(QtCore.QRect(50, 40, 431, 201)) - self.tableView.setObjectName(_fromUtf8("tableView")) + self.tableWidget = QtGui.QTableWidget(self.tab_5) + self.tableWidget.setGeometry(QtCore.QRect(60, 20, 431, 351)) + self.tableWidget.setObjectName(_fromUtf8("tableWidget")) + self.tableWidget.setColumnCount(0) + self.tableWidget.setRowCount(0) self.tabWidget.addTab(self.tab_5, _fromUtf8("")) MainWindow.setCentralWidget(self.centralwidget) self.menubar = QtGui.QMenuBar(MainWindow) - self.menubar.setGeometry(QtCore.QRect(0, 0, 522, 25)) + self.menubar.setGeometry(QtCore.QRect(0, 0, 553, 25)) self.menubar.setObjectName(_fromUtf8("menubar")) - self.menuBorne = QtGui.QMenu(self.menubar) - self.menuBorne.setObjectName(_fromUtf8("menuBorne")) - self.menuBornes = QtGui.QMenu(self.menubar) - self.menuBornes.setObjectName(_fromUtf8("menuBornes")) + self.menuFichier = QtGui.QMenu(self.menubar) + self.menuFichier.setObjectName(_fromUtf8("menuFichier")) self.menuA_propos = QtGui.QMenu(self.menubar) self.menuA_propos.setObjectName(_fromUtf8("menuA_propos")) MainWindow.setMenuBar(self.menubar) @@ -124,21 +123,21 @@ class Ui_MainWindow(object): self.actionListe.setObjectName(_fromUtf8("actionListe")) self.actionAjouter = QtGui.QAction(MainWindow) self.actionAjouter.setObjectName(_fromUtf8("actionAjouter")) - self.menuBorne.addSeparator() - self.menuBorne.addAction(self.actionCharger) - self.menuBorne.addAction(self.actionSauvegarder) - self.menubar.addAction(self.menuBorne.menuAction()) - self.menubar.addAction(self.menuBornes.menuAction()) + self.actionQuitter = QtGui.QAction(MainWindow) + self.actionQuitter.setObjectName(_fromUtf8("actionQuitter")) + self.menuFichier.addAction(self.actionCharger) + self.menuFichier.addAction(self.actionSauvegarder) + self.menuFichier.addSeparator() + self.menuFichier.addAction(self.actionQuitter) + self.menubar.addAction(self.menuFichier.menuAction()) self.menubar.addAction(self.menuA_propos.menuAction()) self.retranslateUi(MainWindow) - self.tabWidget.setCurrentIndex(0) + self.tabWidget.setCurrentIndex(2) QtCore.QMetaObject.connectSlotsByName(MainWindow) - - def retranslateUi(self, MainWindow): - MainWindow.setWindowTitle(_translate("MainWindow", "MainWindow", None)) + MainWindow.setWindowTitle(_translate("MainWindow", "Administration", None)) self.label.setText(_translate("MainWindow", "Activité :", None)) self.tabWidget.setTabText(self.tabWidget.indexOf(self.tab), _translate("MainWindow", "Activite", None)) self.label_13.setText(_translate("MainWindow", "Nom :", None)) @@ -150,8 +149,7 @@ class Ui_MainWindow(object): 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.menuBorne.setTitle(_translate("MainWindow", "Fichier", None)) - self.menuBornes.setTitle(_translate("MainWindow", "Quitter", None)) + self.menuFichier.setTitle(_translate("MainWindow", "Fichier", None)) self.menuA_propos.setTitle(_translate("MainWindow", "A propos", None)) self.actionCharger.setText(_translate("MainWindow", "Charger", None)) self.actionSauvegarder.setText(_translate("MainWindow", "Sauvegarder", None)) @@ -160,9 +158,15 @@ class Ui_MainWindow(object): self.actionRechercher.setText(_translate("MainWindow", "Rechercher", None)) self.actionListe.setText(_translate("MainWindow", "Liste", None)) self.actionAjouter.setText(_translate("MainWindow", "Ajouter", None)) + self.actionQuitter.setText(_translate("MainWindow", "Quitter", None)) + + ################################NOT GENERATED#################################################### def addItemActivite(self, line) : self.log.addItem(line) + + def addListeParkings(self, parkings) : + self.comboBox.addItem("lol") \ No newline at end of file diff --git a/src/v/Panneau.py b/src/v/Panneau.py index 17108ae..64edb88 100644 --- a/src/v/Panneau.py +++ b/src/v/Panneau.py @@ -1,8 +1,6 @@ __author__ = 'sidya' -class Panneau: - def __init__(self): - pass +class Panneau: def afficherNbPlaceDisponible(self, parking): - pass \ No newline at end of file + print(parking.nbPlacesLibresParking()) \ No newline at end of file diff --git a/src/v/Quitter.py b/src/v/Quitter.py new file mode 100644 index 0000000..b629525 --- /dev/null +++ b/src/v/Quitter.py @@ -0,0 +1,163 @@ +# -*- coding: utf-8 -*- + +# Form implementation generated from reading ui file 'main.ui' +# +# Created: Wed Dec 10 16:47:28 2014 +# by: PyQt4 UI code generator 4.11.3 +# +# WARNING! All changes made in this file will be lost! + +from PyQt4 import QtCore, QtGui + +try: + _fromUtf8 = QtCore.QString.fromUtf8 +except AttributeError: + def _fromUtf8(s): + return s + +try: + _encoding = QtGui.QApplication.UnicodeUTF8 + def _translate(context, text, disambig): + return QtGui.QApplication.translate(context, text, disambig, _encoding) +except AttributeError: + def _translate(context, text, disambig): + return QtGui.QApplication.translate(context, text, disambig) + +class Ui_MainWindow(object): + def setupUi(self, MainWindow): + MainWindow.setObjectName(_fromUtf8("MainWindow")) + MainWindow.resize(522, 412) + self.centralwidget = QtGui.QWidget(MainWindow) + self.centralwidget.setObjectName(_fromUtf8("centralwidget")) + self.tabWidget = QtGui.QTabWidget(self.centralwidget) + self.tabWidget.setGeometry(QtCore.QRect(0, 0, 561, 441)) + self.tabWidget.setObjectName(_fromUtf8("tabWidget")) + self.tab = QtGui.QWidget() + self.tab.setObjectName(_fromUtf8("tab")) + self.label = QtGui.QLabel(self.tab) + self.label.setGeometry(QtCore.QRect(40, 10, 61, 15)) + self.label.setObjectName(_fromUtf8("label")) + self.log = QtGui.QListView(self.tab) + self.log.setGeometry(QtCore.QRect(30, 40, 421, 241)) + self.log.setObjectName(_fromUtf8("log")) + 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.formLayout_3.setObjectName(_fromUtf8("formLayout_3")) + self.label_13 = QtGui.QLabel(self.formLayoutWidget) + 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.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.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.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.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.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.pushButton = QtGui.QPushButton(self.tab_2) + self.pushButton.setGeometry(QtCore.QRect(290, 270, 81, 27)) + self.pushButton.setObjectName(_fromUtf8("pushButton")) + self.tabWidget.addTab(self.tab_2, _fromUtf8("")) + self.tab_5 = QtGui.QWidget() + self.tab_5.setObjectName(_fromUtf8("tab_5")) + self.tableView = QtGui.QTableView(self.tab_5) + self.tableView.setGeometry(QtCore.QRect(50, 40, 431, 201)) + self.tableView.setObjectName(_fromUtf8("tableView")) + self.tabWidget.addTab(self.tab_5, _fromUtf8("")) + MainWindow.setCentralWidget(self.centralwidget) + self.menubar = QtGui.QMenuBar(MainWindow) + self.menubar.setGeometry(QtCore.QRect(0, 0, 522, 25)) + self.menubar.setObjectName(_fromUtf8("menubar")) + self.menuBorne = QtGui.QMenu(self.menubar) + self.menuBorne.setObjectName(_fromUtf8("menuBorne")) + self.menuBornes = QtGui.QMenu(self.menubar) + self.menuBornes.setObjectName(_fromUtf8("menuBornes")) + self.menuA_propos = QtGui.QMenu(self.menubar) + self.menuA_propos.setObjectName(_fromUtf8("menuA_propos")) + MainWindow.setMenuBar(self.menubar) + self.statusbar = QtGui.QStatusBar(MainWindow) + self.statusbar.setObjectName(_fromUtf8("statusbar")) + MainWindow.setStatusBar(self.statusbar) + self.actionCharger = QtGui.QAction(MainWindow) + self.actionCharger.setObjectName(_fromUtf8("actionCharger")) + self.actionSauvegarder = QtGui.QAction(MainWindow) + self.actionSauvegarder.setObjectName(_fromUtf8("actionSauvegarder")) + self.actionAfficher = QtGui.QAction(MainWindow) + self.actionAfficher.setObjectName(_fromUtf8("actionAfficher")) + self.actionNouveau = QtGui.QAction(MainWindow) + self.actionNouveau.setObjectName(_fromUtf8("actionNouveau")) + self.actionRechercher = QtGui.QAction(MainWindow) + self.actionRechercher.setObjectName(_fromUtf8("actionRechercher")) + self.actionListe = QtGui.QAction(MainWindow) + self.actionListe.setObjectName(_fromUtf8("actionListe")) + self.actionAjouter = QtGui.QAction(MainWindow) + self.actionAjouter.setObjectName(_fromUtf8("actionAjouter")) + self.menuBorne.addSeparator() + self.menuBorne.addAction(self.actionCharger) + self.menuBorne.addAction(self.actionSauvegarder) + self.menubar.addAction(self.menuBorne.menuAction()) + self.menubar.addAction(self.menuBornes.menuAction()) + self.menubar.addAction(self.menuA_propos.menuAction()) + + self.retranslateUi(MainWindow) + self.tabWidget.setCurrentIndex(1) + QtCore.QMetaObject.connectSlotsByName(MainWindow) + + + + + def retranslateUi(self, MainWindow): + MainWindow.setWindowTitle(_translate("MainWindow", "MainWindow", None)) + self.label.setText(_translate("MainWindow", "Activité :", None)) + self.tabWidget.setTabText(self.tabWidget.indexOf(self.tab), _translate("MainWindow", "Activite", None)) + self.label_13.setText(_translate("MainWindow", "Nom :", None)) + self.label_14.setText(_translate("MainWindow", "Niveau :", None)) + 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.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.menuBorne.setTitle(_translate("MainWindow", "Fichier", None)) + self.menuBornes.setTitle(_translate("MainWindow", "Quitter", None)) + self.menuA_propos.setTitle(_translate("MainWindow", "A propos", None)) + self.actionCharger.setText(_translate("MainWindow", "Charger", None)) + self.actionSauvegarder.setText(_translate("MainWindow", "Sauvegarder", None)) + self.actionAfficher.setText(_translate("MainWindow", "Afficher", None)) + self.actionNouveau.setText(_translate("MainWindow", "Nouveau", None)) + self.actionRechercher.setText(_translate("MainWindow", "Rechercher", None)) + self.actionListe.setText(_translate("MainWindow", "Liste", None)) + self.actionAjouter.setText(_translate("MainWindow", "Ajouter", None)) +