Library for SALOME_Event object added

diff --git a/src/VISU_I/Makefile.in b/src/VISU_I/Makefile.in
index abc4a5cbc08c1edb0c28aebf342d0ccdf9054105..59f715ef5b4bf9cf093f7e14d200597f7451349f 100644 (file)
--- a/src/VISU_I/Makefile.in
+++ b/src/VISU_I/Makefile.in
@@ -54,7 +54,7 @@ CPPFLAGS += -ftemplate-depth-32 $(QT_INCLUDES) $(PYTHON_INCLUDES) $(OCC_INCLUDES
 
 LDFLAGS  += $(QT_MT_LIBS) $(VTK_LIBS) $(QWT_LIBS) -lSalomeNS -lTOOLSDS \
        -lSalomeContainer -lOpUtil -lSalomeGUI -lVTKViewer -lSalomeHDFPersist \
-       -lVisuConvertor -lVisuPipeLine -lVisuObject -lSalomeGenericObj \
+       -lVisuConvertor -lVisuPipeLine -lVisuObject -lSalomeGenericObj -lEvent \
        -L${KERNEL_ROOT_DIR}/lib/salome
 
 LIBS+= $(PYTHON_LIBS) $(MED2_LIBS) $(HDF5_LIBS) -lPlot2d \

diff --git a/src/VISU_I/VISU_Gen_i.cc b/src/VISU_I/VISU_Gen_i.cc
index 1b0d1a3c345a0d416c19f02855535e2365eef4c1..59f69286e1d9056971f825234332f144eb4438e9 100644 (file)
--- a/src/VISU_I/VISU_Gen_i.cc
+++ b/src/VISU_I/VISU_Gen_i.cc
@@ -58,8 +58,6 @@
 #include <qfileinfo.h>
 
 #include "SALOME_Event.hxx"
-#include <qwaitcondition.h>
-#define EVENT_TIMEOUT 300000
 
 using namespace std;
 
@@ -894,16 +892,15 @@ namespace VISU{
   /*! SAN & VSR : Test QT_EVENT 
     >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
   */
+  #define TEST_EVENT 1
   void VISU_Gen_i::DoSomething() {
-    static int myCounter = 0;
-    MESSAGE("VISU_Gen_i::DoSomething : "<<myMutex);
+    MESSAGE("VISU_Gen_i::DoSomething : myMutex = "<<myMutex);
     if(myMutex){
-      QWaitCondition wc;
-      QApplication::postEvent( qApp, new SALOME_Event( &wc ) );
-      if ( ! wc.wait( EVENT_TIMEOUT ) ) {
-       INFOS( "VISU_Gen_i::DoSomething  ERROR ! VISU_Gen is used from GUI." );
-      }
-      MESSAGE( "VISU_Gen_i::DoSomething : myCounter = " << ++myCounter ); 
+      MESSAGE( "VISU_Gen_i::DoSomething started" );
+      SALOME_Semaphore s;
+      QThread::postEvent( qApp, new SALOME_Event( TEST_EVENT, &s ) );
+      s += 1;
+      MESSAGE( "VISU_Gen_i::DoSomething completed" ); 
       return;
     }
     myVisuGen->DoSomething();