New changelist

This commit is contained in:
sidya82 2014-12-23 22:18:11 +01:00
parent e091f37ca2
commit 138ae3bc69
4 changed files with 263 additions and 179 deletions

View File

@ -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)

View File

@ -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) :

View File

@ -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")
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")

View File

@ -6,12 +6,12 @@
<rect>
<x>0</x>
<y>0</y>
<width>522</width>
<height>412</height>
<width>561</width>
<height>479</height>
</rect>
</property>
<property name="windowTitle">
<string>MainWindow</string>
<string>Administration</string>
</property>
<widget class="QWidget" name="centralwidget">
<widget class="QTabWidget" name="tabWidget">
@ -24,7 +24,7 @@
</rect>
</property>
<property name="currentIndex">
<number>0</number>
<number>1</number>
</property>
<widget class="QWidget" name="tab">
<attribute name="title">
@ -43,13 +43,13 @@
<string>Activité :</string>
</property>
</widget>
<widget class="QListView" name="log">
<widget class="QListWidget" name="listWidget">
<property name="geometry">
<rect>
<x>30</x>
<y>40</y>
<width>421</width>
<height>241</height>
<x>60</x>
<y>50</y>
<width>431</width>
<height>261</height>
</rect>
</property>
</widget>
@ -58,134 +58,145 @@
<attribute name="title">
<string>Parkings</string>
</attribute>
<widget class="QWidget" name="formLayoutWidget">
<property name="geometry">
<rect>
<x>100</x>
<y>80</y>
<width>311</width>
<height>151</height>
</rect>
</property>
<layout class="QFormLayout" name="formLayout_3">
<item row="0" column="0">
<widget class="QLabel" name="label_13">
<property name="text">
<string>Nom :</string>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QLabel" name="label_14">
<property name="text">
<string>Niveau :</string>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QLineEdit" name="lineEdit_11"/>
</item>
<item row="1" column="1">
<widget class="QLineEdit" name="lineEdit_12"/>
</item>
<item row="2" column="0">
<widget class="QLabel" name="label_15">
<property name="text">
<string>Place / niveau :</string>
</property>
</widget>
</item>
<item row="2" column="1">
<widget class="QLineEdit" name="lineEdit_13"/>
</item>
<item row="3" column="0">
<widget class="QLabel" name="label_16">
<property name="text">
<string>Place disponible :</string>
</property>
</widget>
</item>
<item row="3" column="1">
<widget class="QLineEdit" name="lineEdit_14"/>
</item>
<item row="4" column="0">
<widget class="QLabel" name="label_17">
<property name="text">
<string>Place Reserve Super Abo : </string>
</property>
</widget>
</item>
<item row="4" column="1">
<widget class="QLineEdit" name="lineEdit_15"/>
</item>
</layout>
</widget>
<widget class="QPushButton" name="pushButton_2">
<property name="geometry">
<rect>
<x>140</x>
<y>270</y>
<width>101</width>
<height>27</height>
</rect>
</property>
<property name="text">
<string>Creer/Modifier</string>
</property>
</widget>
<widget class="QComboBox" name="comboBox">
<property name="geometry">
<rect>
<x>100</x>
<y>40</y>
<width>321</width>
<height>27</height>
</rect>
</property>
</widget>
<widget class="QPushButton" name="pushButton">
<property name="geometry">
<rect>
<x>290</x>
<y>270</y>
<width>81</width>
<height>27</height>
</rect>
</property>
<property name="text">
<string>Supprimer</string>
</property>
</widget>
<zorder>label_2</zorder>
<zorder>lineEdit</zorder>
<zorder>label_6</zorder>
<zorder>label_5</zorder>
<zorder>lineEdit_3</zorder>
<zorder>label_4</zorder>
<zorder>lineEdit_4</zorder>
<zorder>lineEdit_5</zorder>
<zorder>label_3</zorder>
<zorder>lineEdit_2</zorder>
<zorder>formLayoutWidget</zorder>
<zorder>pushButton_2</zorder>
<zorder>comboBox</zorder>
<zorder>pushButton</zorder>
<layout class="QVBoxLayout" name="verticalLayout">
<item>
<widget class="QComboBox" name="comboBox"/>
</item>
<item>
<layout class="QFormLayout" name="formLayout_3">
<item row="0" column="0">
<widget class="QLabel" name="label_13">
<property name="text">
<string>Nom :</string>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QLabel" name="label_14">
<property name="text">
<string>Niveau :</string>
</property>
</widget>
</item>
<item row="2" column="0">
<widget class="QLabel" name="label_15">
<property name="text">
<string>Place / niveau :</string>
</property>
</widget>
</item>
<item row="3" column="0">
<widget class="QLabel" name="label_16">
<property name="text">
<string>Place disponible :</string>
</property>
</widget>
</item>
<item row="4" column="0">
<widget class="QLabel" name="label_17">
<property name="text">
<string>Place Reserve Super Abo : </string>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QLabel" name="label_2">
<property name="text">
<string>TextLabel</string>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QLabel" name="label_3">
<property name="text">
<string>TextLabel</string>
</property>
</widget>
</item>
<item row="2" column="1">
<widget class="QLabel" name="label_4">
<property name="text">
<string>TextLabel</string>
</property>
</widget>
</item>
<item row="3" column="1">
<widget class="QLabel" name="label_5">
<property name="text">
<string>TextLabel</string>
</property>
</widget>
</item>
<item row="4" column="1">
<widget class="QLabel" name="label_6">
<property name="text">
<string>TextLabel</string>
</property>
</widget>
</item>
</layout>
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout">
<item>
<widget class="QPushButton" name="pushButton_4">
<property name="text">
<string>Details Places</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="pushButton_3">
<property name="text">
<string>Borne</string>
</property>
</widget>
</item>
</layout>
</item>
<item>
<widget class="QPushButton" name="pushButton_5">
<property name="text">
<string>Créer</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="pushButton_2">
<property name="text">
<string>Modifier</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="pushButton">
<property name="text">
<string>Supprimer</string>
</property>
</widget>
</item>
</layout>
</widget>
<widget class="QWidget" name="tab_5">
<attribute name="title">
<string>Membres</string>
</attribute>
<widget class="QTableView" name="tableView">
<widget class="QTableWidget" name="tableWidget">
<property name="geometry">
<rect>
<x>50</x>
<y>40</y>
<x>60</x>
<y>20</y>
<width>431</width>
<height>201</height>
<height>351</height>
</rect>
</property>
</widget>
</widget>
<widget class="QWidget" name="tab_3">
<attribute name="title">
<string>Services</string>
</attribute>
</widget>
</widget>
</widget>
<widget class="QMenuBar" name="menubar">
@ -193,30 +204,26 @@
<rect>
<x>0</x>
<y>0</y>
<width>522</width>
<width>561</width>
<height>25</height>
</rect>
</property>
<widget class="QMenu" name="menuBorne">
<widget class="QMenu" name="menuFichier">
<property name="title">
<string>Fichier</string>
</property>
<addaction name="separator"/>
<addaction name="actionCharger"/>
<addaction name="actionSauvegarder"/>
</widget>
<widget class="QMenu" name="menuBornes">
<property name="title">
<string>Quitter</string>
</property>
<addaction name="separator"/>
<addaction name="actionQuitter"/>
</widget>
<widget class="QMenu" name="menuA_propos">
<property name="title">
<string>A propos</string>
</property>
<addaction name="action"/>
</widget>
<addaction name="menuBorne"/>
<addaction name="menuBornes"/>
<addaction name="menuFichier"/>
<addaction name="menuA_propos"/>
</widget>
<widget class="QStatusBar" name="statusbar"/>
@ -255,6 +262,16 @@
<string>Ajouter</string>
</property>
</action>
<action name="actionQuitter">
<property name="text">
<string>Quitter</string>
</property>
</action>
<action name="action">
<property name="text">
<string>?</string>
</property>
</action>
</widget>
<resources/>
<connections/>