From: smh <smh@opencascade.com>
Date: Tue, 30 Mar 2004 14:52:33 +0000 (+0000)
Subject: Library for SALOME_Event object added
X-Git-Tag: mergeto_Event_Server_20Apr04~24
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=2891ae1a2167096adab07629031d8f9f630a6cd9;p=modules%2Fvisu.git

Library for SALOME_Event object added
---

diff --git a/src/VISU_I/Makefile.in b/src/VISU_I/Makefile.in
index abc4a5cb..59f715ef 100644
--- 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 1b0d1a3c..59f69286 100644
--- 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();