Skip to content
This repository has been archived by the owner on Mar 17, 2021. It is now read-only.

Commit

Permalink
added trace argument to setModel
Browse files Browse the repository at this point in the history
git-svn-id: http://svn.code.sf.net/p/tango-cs/code/gui/taurus/trunk@21681 4e9c00fd-8f2e-0410-aa12-93ce3db5e235
  • Loading branch information
sergi_rubio committed Dec 12, 2012
1 parent b2635e9 commit f9d28d3
Showing 1 changed file with 20 additions and 12 deletions.
32 changes: 20 additions & 12 deletions lib/taurus/qt/qtgui/graphic/jdraw/jdraw_view.py
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@
import os
import traceback
import subprocess
import taurus
from taurus.qt import Qt
from taurus.core import DeviceNameValidator,AttributeNameValidator
from taurus.qt.qtgui.graphic.taurusgraphic import parseTangoUri
Expand Down Expand Up @@ -142,6 +143,7 @@ def selectGraphicItem(self,item_name):

@Qt.pyqtSignature("graphicItemSelected(QString)")
def graphicItemSelected(self,item_name):
self.info(' => graphicItemSelected(QString)(%s)'%item_name)
self.emit(Qt.SIGNAL("graphicItemSelected(QString)"),item_name)

@Qt.pyqtSignature("graphicSceneClicked(QPoint)")
Expand Down Expand Up @@ -298,11 +300,13 @@ def defaultPanelClass():
return obj

@Qt.pyqtSignature("setModel(QString)")
def setModel(self, model, alias = None, delayed = False):
def setModel(self, model, alias = None, delayed = False, trace = False):
self.modelName = str(model)
self._currF = str(model)
if alias is not None: self.setAlias(alias)
self.debug('setModel(%s)'%model)
ll = taurus.getLogLevel()
if trace: taurus.setLogLevel(taurus.Debug)
self.info('setModel("%s")'%model)
if self._currF:
#filename = str(self._currFile.absoluteFilePath())
filename = self._currF
Expand Down Expand Up @@ -330,6 +334,8 @@ def setModel(self, model, alias = None, delayed = False):
self.fitting(True)
else:
self.setScene(None)
self.info('out of setModel()')
taurus.setLogLevel(ll)

#def destroy(destroyWindow=True,destroySubWindows=True):
def closeEvent(self,event):
Expand All @@ -348,20 +354,20 @@ def setModels(self):
def getModel(self):
return self._currF

@classmethod
def getQtDesignerPluginInfo(cls):
ret = TaurusBaseWidget.getQtDesignerPluginInfo()
ret['group'] = 'Taurus Display'
ret['module'] = 'taurus.qt.qtgui.graphic'
ret['icon'] = ":/designer/graphicsview.png"
return ret
#@classmethod
#def getQtDesignerPluginInfo(cls):
#ret = TaurusBaseWidget.getQtDesignerPluginInfo()
#ret['group'] = 'Taurus Display'
#ret['module'] = 'taurus.qt.qtgui.graphic'
#ret['icon'] = ":/designer/graphicsview.png"
#return ret

model = Qt.pyqtProperty("QString", getModel, setModel)
#model = Qt.pyqtProperty("QString", getModel, setModel)


#!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
def jdraw_view_main():
import sys
import sys,time
import taurus.qt.qtgui.graphic
taurus.setLogLevel(taurus.Info)
app = Qt.QApplication(sys.argv)
Expand All @@ -373,13 +379,15 @@ def jdraw_view_main():
#for m in sys.argv[1:]:
#tv=TaurusJDrawSynopticsView(container, designMode=False)
#tv.setModel(m)
print '%s init()'%(time.ctime())
form = taurus.qt.qtgui.graphic.TaurusJDrawSynopticsView(designMode=False)
form.show()
print '%s setModel(%s)'%(time.ctime(),sys.argv[1])
form.setModel(sys.argv[1])
form.setWindowTitle(sys.argv[1].rsplit('.',1)[0])
#def kk(*args):print("\tgraphicItemSelected(%s)"%str(args))
#form.connect(form,Qt.SIGNAL("graphicItemSelected(QString)"), kk)
print '%s fitting()'%time.ctime()
form.fitting()
sys.exit(app.exec_())

Expand Down

0 comments on commit f9d28d3

Please sign in to comment.