CCF_100/relational
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

- Small fix and simplified code

Browse Source 
git-svn-id: http://galileo.dmi.unict.it/svn/relational/trunk@285 014f5005-505e-4b48-8d0a-63407b615a7c
This commit is contained in:
LtWorf 2011-03-21 16:10:22 +00:00
parent 4a6f2cc222
commit 9c65a60b22
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
relational_gui/guihandler.py
View File

@ -63,7 +63,7 @@ class relForm(QtGui.QMainWindow):
'''Executes the query''' '''Executes the query'''
query=str(self.ui.txtQuery.text().toUtf8()) query=str(self.ui.txtQuery.text().toUtf8())
res_rel=str(self.ui.txtResult.text())#result relation's name res_rel=str(self.ui.txtResult.text().toUtf8())#result relation's name
if not rtypes.is_valid_relation_name(res_rel): if not rtypes.is_valid_relation_name(res_rel):
QtGui.QMessageBox.information(self,QtGui.QApplication.translate("Form", "Error"),QtGui.QApplication.translate("Form", "Wrong name for destination relation.")) QtGui.QMessageBox.information(self,QtGui.QApplication.translate("Form", "Error"),QtGui.QApplication.translate("Form", "Wrong name for destination relation."))
@ -169,12 +169,10 @@ class relForm(QtGui.QMainWindow):
#Asking for file to load #Asking for file to load
if filename==None: if filename==None:
filename = QtGui.QFileDialog.getOpenFileName(self,QtGui.QApplication.translate("Form", "Load Relation"),"",QtGui.QApplication.translate("Form", "Relations (*.csv);;Old Relations (*.tlb);;Text Files (*.txt);;All Files (*)")) filename = QtGui.QFileDialog.getOpenFileName(self,QtGui.QApplication.translate("Form", "Load Relation"),"",QtGui.QApplication.translate("Form", "Relations (*.csv);;Old Relations (*.tlb);;Text Files (*.txt);;All Files (*)"))
filename=str(filename.toUtf8())
#Default relation's name #Default relation's name
f=str(filename.toUtf8()).split('/') #Split the full path f=filename.split('/') #Split the full path
else:
f=filename.split('/') #Split the full path
defname=f[len(f)-1].lower() #Takes only the lowercase filename defname=f[len(f)-1].lower() #Takes only the lowercase filename
if len(defname)==0: if len(defname)==0:
@ -191,13 +189,13 @@ class relForm(QtGui.QMainWindow):
#Patch provided by Angelo 'Havoc' Puglisi #Patch provided by Angelo 'Havoc' Puglisi
name=str(res[0].toUtf8()) name=str(res[0].toUtf8())
filename=str(filename.toUtf8())
if rtypes.is_valid_relation_name(name): if rtypes.is_valid_relation_name(name):
self.relations[name]=relation.relation(filename) self.relations[name]=relation.relation(filename)
self.updateRelations() self.updateRelations()
else: else:
QtGui.QMessageBox.information(self,QtGui.QApplication.translate("Form", "Error"),QtGui.QApplication.translate("Form", "Wrong name for destination relation: %s." % name)) QtGui.QMessageBox.information(self,QtGui.QApplication.translate("Form", "Error"),QtGui.QApplication.translate("Form", "Wrong name for destination relation: %s." % name))
def insertTuple(self): def insertTuple(self):
'''Shows an input dialog and inserts the inserted tuple into the selected relation''' '''Shows an input dialog and inserts the inserted tuple into the selected relation'''
res=QtGui.QInputDialog.getText(self, QtGui.QApplication.translate("Form", "New relation"),QtGui.QApplication.translate("Form", "Insert the values, comma separated"), res=QtGui.QInputDialog.getText(self, QtGui.QApplication.translate("Form", "New relation"),QtGui.QApplication.translate("Form", "Insert the values, comma separated"),