Salome HOME
projects
/
modules
/
gui.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote branch 'origin/V7_dev'
[modules/gui.git]
/
src
/
SalomeApp
/
pluginsdemo
/
minmax_plugin.py
diff --git
a/src/SalomeApp/pluginsdemo/minmax_plugin.py
b/src/SalomeApp/pluginsdemo/minmax_plugin.py
old mode 100755
(executable)
new mode 100644
(file)
index
d5a1e60
..
59d143b
--- a/
src/SalomeApp/pluginsdemo/minmax_plugin.py
+++ b/
src/SalomeApp/pluginsdemo/minmax_plugin.py
@@
-1,5
+1,5
@@
# -*- coding: utf-8 -*-
# -*- coding: utf-8 -*-
-# Copyright (C) 2010-201
4
CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2010-201
6
CEA/DEN, EDF R&D, OPEN CASCADE
#
# This library is free software; you can redistribute it and/or
# modify it under the terms of the GNU Lesser General Public
#
# This library is free software; you can redistribute it and/or
# modify it under the terms of the GNU Lesser General Public
@@
-19,18
+19,15
@@
#
# Author : Guillaume Boulant (EDF)
#
# Author : Guillaume Boulant (EDF)
+from qtsalome import *
+
def minmax(context):
# get context study, studyId, salomeGui
study = context.study
studyId = context.studyId
sg = context.sg
def minmax(context):
# get context study, studyId, salomeGui
study = context.study
studyId = context.studyId
sg = context.sg
- from PyQt4.QtGui import QDialog
- from PyQt4.QtGui import QMessageBox
- from PyQt4.QtCore import Qt
- from PyQt4.QtCore import SIGNAL
-
- from minmax_dialog import Ui_Dialog
+ from minmax_ui import Ui_Dialog
import salome
import SMESH
import salome
import SMESH
@@
-86,7
+83,7
@@
def minmax(context):
self.clearLineEdit()
# Connect up the selectionChanged() event of the object browser.
self.clearLineEdit()
# Connect up the selectionChanged() event of the object browser.
- s
elf.connect(sg.getObjectBrowser(), SIGNAL("selectionChanged()"),
self.select)
+ s
g.getObjectBrowser().selectionChanged.connect(
self.select)
self.mm = None
self.ui.control.setFocus()
self.mm = None
self.ui.control.setFocus()
@@
-95,7
+92,7
@@
def minmax(context):
pass
def OnCancel(self):
pass
def OnCancel(self):
- s
elf.disconnect(sg.getObjectBrowser(), SIGNAL("selectionChanged()"),
self.select)
+ s
g.getObjectBrowser().selectionChanged.disconnect(
self.select)
self.reject()
pass
self.reject()
pass
@@
-106,7
+103,7
@@
def minmax(context):
self.ui.maxvalue.setText("")
def select(self):
self.ui.maxvalue.setText("")
def select(self):
- s
elf.disconnect(sg.getObjectBrowser(), SIGNAL("selectionChanged()"),
self.select)
+ s
g.getObjectBrowser().selectionChanged.disconnect(
self.select)
self.ui.control.clear()
self.ui.minvalue.setText("")
self.ui.maxvalue.setText("")
self.ui.control.clear()
self.ui.minvalue.setText("")
self.ui.maxvalue.setText("")
@@
-115,23
+112,20
@@
def minmax(context):
mm = study.FindObjectID(objId).GetObject()
mesh = None
try:
mm = study.FindObjectID(objId).GetObject()
mesh = None
try:
- mesh = mm.GetMEDMesh()
+ mm.Load()
+ mesh = mm
except:
except:
- #print "No mesh selected"
self.clearLineEdit()
mesh = None
pass
if mesh:
self.clearLineEdit()
mesh = None
pass
if mesh:
+ name = smeshBuilder.GetName( mm )
self.ui.mesh.setStyleSheet("")
self.ui.mesh.setStyleSheet("")
- self.ui.mesh.setText(mesh.getName())
- #print "Mesh selected: ", mesh.getName()
+ self.ui.mesh.setText( name )
self.mm = mm
e = self.mm.NbEdges()
f = self.mm.NbFaces()
v = self.mm.NbVolumes()
self.mm = mm
e = self.mm.NbEdges()
f = self.mm.NbFaces()
v = self.mm.NbVolumes()
- #print "NbEdges: ",e
- #print "NbFaces: ",f
- #print "NbVolumes: ",v
controls = []
if e:
controls += controls_1d
controls = []
if e:
controls += controls_1d
@@
-144,7
+138,7
@@
def minmax(context):
pass
self.ui.control.addItems(controls)
self.compute_minmax()
pass
self.ui.control.addItems(controls)
self.compute_minmax()
- s
elf.connect(sg.getObjectBrowser(), SIGNAL("selectionChanged()"),
self.select)
+ s
g.getObjectBrowser().selectionChanged.connect(
self.select)
pass
def helpMessage(self):
pass
def helpMessage(self):
@@
-162,20
+156,16
@@
Inputs:
pass
def compute_minmax(self):
pass
def compute_minmax(self):
- if self.mm:
- control = self.ui.control.currentText()
- #print "Compute control: ",control
+ control = self.ui.control.currentText()
+ if self.mm and control:
fun = smesh.GetFunctor(controls_dict[str(control)])
fun = smesh.GetFunctor(controls_dict[str(control)])
- fun.SetMesh(self.mm
.GetMesh()
)
- hist = fun.GetHistogram(1)
+ fun.SetMesh(self.mm)
+ hist = fun.GetHistogram(1
,False
)
maxVal = hist[0].max
minVal = hist[0].min
maxVal = hist[0].max
minVal = hist[0].min
- #print "Max value for %s: %f"%(control, maxVal)
- #print "Min value for %s: %f"%(control, minVal)
self.ui.maxvalue.setText("%f"%(maxVal))
self.ui.minvalue.setText("%f"%(minVal))
else:
self.ui.maxvalue.setText("%f"%(maxVal))
self.ui.minvalue.setText("%f"%(minVal))
else:
- print "Pas de maillage"
pass
pass
pass
pass
pass
pass