- Adds query into history
git-svn-id: http://galileo.dmi.unict.it/svn/relational/trunk@280 014f5005-505e-4b48-8d0a-63407b615a7c
This commit is contained in:
LtWorf
parent
6765e9c903
commit
6a93efd198
@ -36,6 +36,7 @@ class relForm(QtGui.QMainWindow):
|
||||
self.undo=None #UndoQueue for queries
|
||||
self.selectedRelation=None
|
||||
self.ui=ui
|
||||
self.qcounter=1
|
||||
|
||||
def load_query(self,*index):
|
||||
self.ui.txtQuery.setText(self.savedQ.itemData(index[0]).toString())
|
||||
@ -53,24 +54,24 @@ class relForm(QtGui.QMainWindow):
|
||||
self.ui.txtQuery.setText(QtCore.QString.fromUtf8(result))
|
||||
|
||||
#self.txtQuery.setText(result)
|
||||
def resumeHistory(self,item):
|
||||
print item
|
||||
|
||||
def execute(self):
|
||||
'''Executes the query'''
|
||||
|
||||
query=str(self.ui.txtQuery.text().toUtf8())
|
||||
res_rel=str(self.ui.txtResult.text())#result relation's name
|
||||
if len(res_rel)==0: #If no name is set use the default last_
|
||||
QtGui.QMessageBox.information(self,QtGui.QApplication.translate("Form", "Error"),QtGui.QApplication.translate("Form", "Missing destination relation."))
|
||||
return
|
||||
|
||||
try:
|
||||
|
||||
#self.ui.lstAttributes.addItem (j)
|
||||
#Converting string to utf8 and then from qstring to normal string
|
||||
query=str(self.ui.txtQuery.text().toUtf8())
|
||||
expr=parser.parse(query)#Converting expression to python code
|
||||
print query,"-->" , expr #Printing debug
|
||||
result=eval(expr,self.relations) #Evaluating the expression
|
||||
|
||||
#self.undo.insert(len(self.undo),self.txtQuery.text()) #Storing the query in undo list
|
||||
|
||||
res_rel=str(self.ui.txtResult.text())#result relation's name
|
||||
self.ui.txtResult.setText("") #Sets the result relation name to none
|
||||
if len(res_rel)==0: #If no name is set use the default last_
|
||||
res_rel="last_"
|
||||
|
||||
self.relations[res_rel]=result #Add the relation to the dictionary
|
||||
self.updateRelations() #update the list
|
||||
self.selectedRelation=result
|
||||
@ -78,6 +79,17 @@ class relForm(QtGui.QMainWindow):
|
||||
except Exception, e:
|
||||
print e
|
||||
QtGui.QMessageBox.information(None,QtGui.QApplication.translate("Form", "Error"),"%s\n%s" % (QtGui.QApplication.translate("Form", "Check your query!"),e.__str__()) )
|
||||
return
|
||||
#Query was executed normally
|
||||
history_item=QtCore.QString()
|
||||
history_item.append(self.ui.txtResult.text())
|
||||
history_item.append(u' = ')
|
||||
history_item.append(self.ui.txtQuery.text())
|
||||
self.ui.lstHistory.addItem (history_item)
|
||||
|
||||
self.qcounter+=1
|
||||
self.ui.txtResult.setText(QtCore.QString(u"_last%d"% self.qcounter)) #Sets the result relation name to none
|
||||
|
||||
def showRelation(self,rel):
|
||||
'''Shows the selected relation into the table'''
|
||||
self.ui.table.clear()
|
||||
|
||||
@ -1,8 +1,8 @@
|
||||
# -*- coding: utf-8 -*-
|
||||
|
||||
# Form implementation generated from reading ui file 'maingui.ui'
|
||||
# Form implementation generated from reading ui file 'relational_gui/maingui.ui'
|
||||
#
|
||||
# Created: Sun Mar 20 20:10:47 2011
|
||||
# Created: Sun Mar 20 21:59:01 2011
|
||||
# by: PyQt4 UI code generator 4.8.3
|
||||
#
|
||||
# WARNING! All changes made in this file will be lost!
|
||||
@ -25,12 +25,12 @@ class Ui_MainWindow(object):
|
||||
self.splitter_4 = QtGui.QSplitter(self.centralwidget)
|
||||
self.splitter_4.setOrientation(QtCore.Qt.Horizontal)
|
||||
self.splitter_4.setObjectName(_fromUtf8("splitter_4"))
|
||||
self.widget = QtGui.QWidget(self.splitter_4)
|
||||
self.widget.setObjectName(_fromUtf8("widget"))
|
||||
self.verticalLayout_11 = QtGui.QVBoxLayout(self.widget)
|
||||
self.layoutWidget = QtGui.QWidget(self.splitter_4)
|
||||
self.layoutWidget.setObjectName(_fromUtf8("layoutWidget"))
|
||||
self.verticalLayout_11 = QtGui.QVBoxLayout(self.layoutWidget)
|
||||
self.verticalLayout_11.setMargin(0)
|
||||
self.verticalLayout_11.setObjectName(_fromUtf8("verticalLayout_11"))
|
||||
self.groupBox_3 = QtGui.QGroupBox(self.widget)
|
||||
self.groupBox_3 = QtGui.QGroupBox(self.layoutWidget)
|
||||
self.groupBox_3.setObjectName(_fromUtf8("groupBox_3"))
|
||||
self.verticalLayout_5 = QtGui.QVBoxLayout(self.groupBox_3)
|
||||
self.verticalLayout_5.setObjectName(_fromUtf8("verticalLayout_5"))
|
||||
@ -41,7 +41,7 @@ class Ui_MainWindow(object):
|
||||
self.cmdSurvey.setObjectName(_fromUtf8("cmdSurvey"))
|
||||
self.verticalLayout_5.addWidget(self.cmdSurvey)
|
||||
self.verticalLayout_11.addWidget(self.groupBox_3)
|
||||
self.groupBox_4 = QtGui.QGroupBox(self.widget)
|
||||
self.groupBox_4 = QtGui.QGroupBox(self.layoutWidget)
|
||||
self.groupBox_4.setObjectName(_fromUtf8("groupBox_4"))
|
||||
self.verticalLayout_10 = QtGui.QVBoxLayout(self.groupBox_4)
|
||||
self.verticalLayout_10.setObjectName(_fromUtf8("verticalLayout_10"))
|
||||
@ -98,41 +98,41 @@ class Ui_MainWindow(object):
|
||||
self.table.setSizeIncrement(QtCore.QSize(0, 0))
|
||||
self.table.setObjectName(_fromUtf8("table"))
|
||||
self.table.headerItem().setText(0, _fromUtf8("Empty relation"))
|
||||
self.layoutWidget = QtGui.QWidget(self.splitter_2)
|
||||
self.layoutWidget.setObjectName(_fromUtf8("layoutWidget"))
|
||||
self.verticalLayout_6 = QtGui.QVBoxLayout(self.layoutWidget)
|
||||
self.layoutWidget1 = QtGui.QWidget(self.splitter_2)
|
||||
self.layoutWidget1.setObjectName(_fromUtf8("layoutWidget1"))
|
||||
self.verticalLayout_6 = QtGui.QVBoxLayout(self.layoutWidget1)
|
||||
self.verticalLayout_6.setSizeConstraint(QtGui.QLayout.SetMinimumSize)
|
||||
self.verticalLayout_6.setMargin(0)
|
||||
self.verticalLayout_6.setObjectName(_fromUtf8("verticalLayout_6"))
|
||||
self.horizontalLayout = QtGui.QHBoxLayout()
|
||||
self.horizontalLayout.setSizeConstraint(QtGui.QLayout.SetFixedSize)
|
||||
self.horizontalLayout.setObjectName(_fromUtf8("horizontalLayout"))
|
||||
self.cmdInsert = QtGui.QPushButton(self.layoutWidget)
|
||||
self.cmdInsert = QtGui.QPushButton(self.layoutWidget1)
|
||||
self.cmdInsert.setObjectName(_fromUtf8("cmdInsert"))
|
||||
self.horizontalLayout.addWidget(self.cmdInsert)
|
||||
self.cmdDelete = QtGui.QPushButton(self.layoutWidget)
|
||||
self.cmdDelete = QtGui.QPushButton(self.layoutWidget1)
|
||||
self.cmdDelete.setObjectName(_fromUtf8("cmdDelete"))
|
||||
self.horizontalLayout.addWidget(self.cmdDelete)
|
||||
self.verticalLayout_6.addLayout(self.horizontalLayout)
|
||||
self.listWidget = QtGui.QListWidget(self.layoutWidget)
|
||||
self.lstHistory = QtGui.QListWidget(self.layoutWidget1)
|
||||
sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Preferred)
|
||||
sizePolicy.setHorizontalStretch(0)
|
||||
sizePolicy.setVerticalStretch(0)
|
||||
sizePolicy.setHeightForWidth(self.listWidget.sizePolicy().hasHeightForWidth())
|
||||
self.listWidget.setSizePolicy(sizePolicy)
|
||||
self.listWidget.setMaximumSize(QtCore.QSize(16777215, 16777215))
|
||||
self.listWidget.setBaseSize(QtCore.QSize(0, 0))
|
||||
self.listWidget.setObjectName(_fromUtf8("listWidget"))
|
||||
self.verticalLayout_6.addWidget(self.listWidget)
|
||||
sizePolicy.setHeightForWidth(self.lstHistory.sizePolicy().hasHeightForWidth())
|
||||
self.lstHistory.setSizePolicy(sizePolicy)
|
||||
self.lstHistory.setMaximumSize(QtCore.QSize(16777215, 16777215))
|
||||
self.lstHistory.setBaseSize(QtCore.QSize(0, 0))
|
||||
self.lstHistory.setObjectName(_fromUtf8("lstHistory"))
|
||||
self.verticalLayout_6.addWidget(self.lstHistory)
|
||||
self.horizontalLayout_3 = QtGui.QHBoxLayout()
|
||||
self.horizontalLayout_3.setObjectName(_fromUtf8("horizontalLayout_3"))
|
||||
self.cmdOptimize = QtGui.QPushButton(self.layoutWidget)
|
||||
self.cmdOptimize = QtGui.QPushButton(self.layoutWidget1)
|
||||
self.cmdOptimize.setObjectName(_fromUtf8("cmdOptimize"))
|
||||
self.horizontalLayout_3.addWidget(self.cmdOptimize)
|
||||
self.cmdUndoOptimize = QtGui.QPushButton(self.layoutWidget)
|
||||
self.cmdUndoOptimize = QtGui.QPushButton(self.layoutWidget1)
|
||||
self.cmdUndoOptimize.setObjectName(_fromUtf8("cmdUndoOptimize"))
|
||||
self.horizontalLayout_3.addWidget(self.cmdUndoOptimize)
|
||||
self.cmdClearHistory = QtGui.QPushButton(self.layoutWidget)
|
||||
self.cmdClearHistory = QtGui.QPushButton(self.layoutWidget1)
|
||||
self.cmdClearHistory.setObjectName(_fromUtf8("cmdClearHistory"))
|
||||
self.horizontalLayout_3.addWidget(self.cmdClearHistory)
|
||||
self.verticalLayout_6.addLayout(self.horizontalLayout_3)
|
||||
@ -214,7 +214,7 @@ class Ui_MainWindow(object):
|
||||
|
||||
self.retranslateUi(MainWindow)
|
||||
QtCore.QObject.connect(self.cmdClearQuery, QtCore.SIGNAL(_fromUtf8("clicked()")), self.txtQuery.clear)
|
||||
QtCore.QObject.connect(self.cmdClearHistory, QtCore.SIGNAL(_fromUtf8("clicked()")), self.listWidget.clear)
|
||||
QtCore.QObject.connect(self.cmdClearHistory, QtCore.SIGNAL(_fromUtf8("clicked()")), self.lstHistory.clear)
|
||||
QtCore.QObject.connect(self.txtQuery, QtCore.SIGNAL(_fromUtf8("returnPressed()")), MainWindow.execute)
|
||||
QtCore.QObject.connect(self.cmdExecute, QtCore.SIGNAL(_fromUtf8("clicked()")), MainWindow.execute)
|
||||
QtCore.QObject.connect(self.cmdAbout, QtCore.SIGNAL(_fromUtf8("clicked()")), MainWindow.showAbout)
|
||||
@ -243,6 +243,7 @@ class Ui_MainWindow(object):
|
||||
QtCore.QObject.connect(self.lstRelations, QtCore.SIGNAL(_fromUtf8("itemDoubleClicked(QListWidgetItem*)")), MainWindow.printRelation)
|
||||
QtCore.QObject.connect(self.lstRelations, QtCore.SIGNAL(_fromUtf8("itemClicked(QListWidgetItem*)")), MainWindow.showAttributes)
|
||||
QtCore.QObject.connect(self.cmdClearQuery, QtCore.SIGNAL(_fromUtf8("clicked()")), self.txtQuery.setFocus)
|
||||
QtCore.QObject.connect(self.lstHistory, QtCore.SIGNAL(_fromUtf8("itemDoubleClicked(QListWidgetItem*)")), MainWindow.resumeHistory)
|
||||
QtCore.QMetaObject.connectSlotsByName(MainWindow)
|
||||
MainWindow.setTabOrder(self.cmdAbout, self.cmdSurvey)
|
||||
MainWindow.setTabOrder(self.cmdSurvey, self.cmdProduct)
|
||||
@ -261,8 +262,8 @@ class Ui_MainWindow(object):
|
||||
MainWindow.setTabOrder(self.cmdArrow, self.table)
|
||||
MainWindow.setTabOrder(self.table, self.cmdInsert)
|
||||
MainWindow.setTabOrder(self.cmdInsert, self.cmdDelete)
|
||||
MainWindow.setTabOrder(self.cmdDelete, self.listWidget)
|
||||
MainWindow.setTabOrder(self.listWidget, self.cmdOptimize)
|
||||
MainWindow.setTabOrder(self.cmdDelete, self.lstHistory)
|
||||
MainWindow.setTabOrder(self.lstHistory, self.cmdOptimize)
|
||||
MainWindow.setTabOrder(self.cmdOptimize, self.cmdUndoOptimize)
|
||||
MainWindow.setTabOrder(self.cmdUndoOptimize, self.cmdClearHistory)
|
||||
MainWindow.setTabOrder(self.cmdClearHistory, self.lstRelations)
|
||||
@ -309,13 +310,3 @@ class Ui_MainWindow(object):
|
||||
self.cmdClearQuery.setText(QtGui.QApplication.translate("MainWindow", "⌫", None, QtGui.QApplication.UnicodeUTF8))
|
||||
self.cmdExecute.setText(QtGui.QApplication.translate("MainWindow", "Execute", None, QtGui.QApplication.UnicodeUTF8))
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
import sys
|
||||
app = QtGui.QApplication(sys.argv)
|
||||
MainWindow = QtGui.QMainWindow()
|
||||
ui = Ui_MainWindow()
|
||||
ui.setupUi(MainWindow)
|
||||
MainWindow.show()
|
||||
sys.exit(app.exec_())
|
||||
|
||||
|
||||
@ -21,7 +21,7 @@
|
||||
<property name="orientation">
|
||||
<enum>Qt::Horizontal</enum>
|
||||
</property>
|
||||
<widget class="QWidget" name="">
|
||||
<widget class="QWidget" name="layoutWidget">
|
||||
<layout class="QVBoxLayout" name="verticalLayout_11">
|
||||
<item>
|
||||
<widget class="QGroupBox" name="groupBox_3">
|
||||
@ -215,7 +215,7 @@
|
||||
</layout>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QListWidget" name="listWidget">
|
||||
<widget class="QListWidget" name="lstHistory">
|
||||
<property name="sizePolicy">
|
||||
<sizepolicy hsizetype="Expanding" vsizetype="Preferred">
|
||||
<horstretch>0</horstretch>
|
||||
@ -440,7 +440,7 @@
|
||||
<tabstop>table</tabstop>
|
||||
<tabstop>cmdInsert</tabstop>
|
||||
<tabstop>cmdDelete</tabstop>
|
||||
<tabstop>listWidget</tabstop>
|
||||
<tabstop>lstHistory</tabstop>
|
||||
<tabstop>cmdOptimize</tabstop>
|
||||
<tabstop>cmdUndoOptimize</tabstop>
|
||||
<tabstop>cmdClearHistory</tabstop>
|
||||
@ -475,7 +475,7 @@
|
||||
<connection>
|
||||
<sender>cmdClearHistory</sender>
|
||||
<signal>clicked()</signal>
|
||||
<receiver>listWidget</receiver>
|
||||
<receiver>lstHistory</receiver>
|
||||
<slot>clear()</slot>
|
||||
<hints>
|
||||
<hint type="sourcelabel">
|
||||
@ -936,6 +936,22 @@
|
||||
</hint>
|
||||
</hints>
|
||||
</connection>
|
||||
<connection>
|
||||
<sender>lstHistory</sender>
|
||||
<signal>itemDoubleClicked(QListWidgetItem*)</signal>
|
||||
<receiver>MainWindow</receiver>
|
||||
<slot>resumeHistory(QListWidgetItem*)</slot>
|
||||
<hints>
|
||||
<hint type="sourcelabel">
|
||||
<x>349</x>
|
||||
<y>492</y>
|
||||
</hint>
|
||||
<hint type="destinationlabel">
|
||||
<x>399</x>
|
||||
<y>305</y>
|
||||
</hint>
|
||||
</hints>
|
||||
</connection>
|
||||
</connections>
|
||||
<slots>
|
||||
<slot>execute()</slot>
|
||||
@ -964,5 +980,6 @@
|
||||
<slot>printRelation()</slot>
|
||||
<slot>showAttributes()</slot>
|
||||
<slot>loadQuery()</slot>
|
||||
<slot>resumeHistory(QListWidgetItem*)</slot>
|
||||
</slots>
|
||||
</ui>
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user