small modifications for cancel action to work correctly

diff --git a/src/Tools/salome_plugins.py b/src/Tools/salome_plugins.py
index ba7e9753e4e4bfb77773d0318982211f1543f8d5..d75b4a7b12d52078f214dd75fd191109e34a9749 100644 (file)
--- a/src/Tools/salome_plugins.py
+++ b/src/Tools/salome_plugins.py
@@ -25,6 +25,7 @@ def t_shape_fluid(context):
     import t_shape_builder
     import t_shape_dialog
     import xalome
+    from PyQt4.QtGui import QMessageBox
     activeStudy = context.study
     
     dialog = t_shape_dialog.TShapeDialog()
@@ -33,10 +34,12 @@ def t_shape_fluid(context):
     # closed using the Ok button, then the data are requested from the
     # gui and used to create the shape of the tube.
     dialog.exec_()
-    r1, r2, h1, h2 = dialog.getData()
-    shape = t_shape_builder.build_shape(activeStudy, r1, r2, h1, h2)
-    entry = xalome.addToStudy(activeStudy, shape, "T_shape_fluid" )
-    xalome.displayShape(entry)
+    if dialog.wasOk():
+      r1, r2, h1, h2 = dialog.getData()
+      QMessageBox.about(None, "Building in progress", "building shape, please be patient")
+      shape = t_shape_builder.build_shape(activeStudy, r1, r2, h1, h2)
+      entry = xalome.addToStudy(activeStudy, shape, "T_shape_fluid" )
+      xalome.displayShape(entry)
     #if dialog.wasOk():
         #radius, length, width = dialog.getData()
         #shape = tubebuilder.createGeometry(activeStudy, radius, length, width)

diff --git a/src/Tools/t_shape_dialog.py b/src/Tools/t_shape_dialog.py
index cfffe27af6e5a51569aa1810aa63c2dbe1bed865..6ac37c51fcc990960b77583b38f3e1edf477b51e 100644 (file)
--- a/src/Tools/t_shape_dialog.py
+++ b/src/Tools/t_shape_dialog.py
@@ -33,6 +33,7 @@ class TShapeDialog(QtGui.QDialog):
       self.ui = Ui_Dialog()
       self.ui.setupUi(self)
       self.show()
+      self._wasOk = False
    
     def accept(self):
       print "DATA ACCEPTED"
@@ -66,13 +67,12 @@ class TShapeDialog(QtGui.QDialog):
         ## We should test here the validity of values
         #QtGui.QDialog.accept(self)
 
-    #def reject(self):
-        #'''Callback function when dialog is rejected (click Cancel)'''
-        #self._wasOk = False
-        #QtGui.QDialog.reject(self)
+    def reject(self):
+        self._wasOk = False
+        QtGui.QDialog.reject(self)
 
-    #def wasOk(self):
-        #return self._wasOk
+    def wasOk(self):
+        return self._wasOk
 
     #def setData(self):
       #pass