X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FAdditionComponent%2FAddition_Adder_Impl.cxx;h=d432bff2d4319a13a6ecdade8052b10267607b5a;hb=refs%2Ftags%2FV8_1_0rc2;hp=fdca3fa144c7772414646feb073dffb9d175c606;hpb=c599ae6a6f28dbab7e4e7d131419eddf30e23b0a;p=samples%2Fcomponent.git

diff --git a/src/AdditionComponent/Addition_Adder_Impl.cxx b/src/AdditionComponent/Addition_Adder_Impl.cxx
index fdca3fa..d432bff 100644
--- a/src/AdditionComponent/Addition_Adder_Impl.cxx
+++ b/src/AdditionComponent/Addition_Adder_Impl.cxx
@@ -1,32 +1,34 @@
-//  SuperVisionTest AddComponent : example of component that adds two numbers
+// Copyright (C) 2007-2016  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-//  Copyright (C) 2003  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS 
-// 
-//  This library is free software; you can redistribute it and/or 
-//  modify it under the terms of the GNU Lesser General Public 
-//  License as published by the Free Software Foundation; either 
-//  version 2.1 of the License. 
-// 
-//  This library is distributed in the hope that it will be useful, 
-//  but WITHOUT ANY WARRANTY; without even the implied warranty of 
-//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU 
-//  Lesser General Public License for more details. 
-// 
-//  You should have received a copy of the GNU Lesser General Public 
-//  License along with this library; if not, write to the Free Software 
-//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA 
-// 
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+// Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
 //
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
 //
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 //
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
+
+//  SuperVisionTest AddComponent : example of component that adds two numbers
 //  File   : AddComponent_Impl.cxx
 //  Author : Jean Rahuel, CEA
 //  Module : SuperVisionTest
-
+//
 #include <stdio.h>
+#ifndef WIN32
 #include <unistd.h>
+#endif
 #include <fstream>
 #include <sstream>
 #include <string>
@@ -38,6 +40,7 @@
 #include "SALOME_LifeCycleCORBA.hxx"
 
 #include "Addition_Adder_Impl.hxx"
+#include "COMPONENT_version.h"
 
 using namespace std;
 
@@ -65,6 +68,15 @@ Adder_Impl::Adder_Impl() {
   LastAddition = 0 ;
 }
 
+char* Adder_Impl::getVersion()
+{
+#if COMPONENT_DEVELOPMENT
+  return CORBA::string_dup(COMPONENT_VERSION_STR"dev");
+#else
+  return CORBA::string_dup(COMPONENT_VERSION_STR);
+#endif
+}
+
 Adder_Impl::~Adder_Impl() {
   beginService( "Adder_Impl::~Adder_Impl" );
   endService( "Adder_Impl::~Adder_Impl" );
@@ -85,9 +97,13 @@ CORBA::Double Adder_Impl::Add( CORBA::Double x , CORBA::Double y , CORBA::Double
   sendMessage(NOTIF_STEP, "Adder_Impl::Add is Computing");
 //  S = 1+(int) (15.0*rand()/(RAND_MAX+1.0));
   S = 5 ;
+#ifndef WIN32
   while ( S ) {
-    S = sleep(S);
+    S = sleep( S ) ;
   }
+#else
+  Sleep(S*1000);
+#endif
   MESSAGE( "Adder_Impl::Add( " <<  x << " , " << y << " , " << z
        << " ) returns " << -(x - y) << " after " << S << " seconds" )
   LastAddition = z ;
@@ -112,9 +128,13 @@ CORBA::Double Adder_Impl::AddAndCompare( CORBA::Double x , CORBA::Double y ,
   sendMessage(NOTIF_STEP, "Adder_Impl::AddAndCompare is Computing");
 //  S = 1+(int) (15.0*rand()/(RAND_MAX+1.0));
   S = 5 ;
+#ifndef WIN32
   while ( S ) {
-    S = sleep(S);
+    S = sleep( S ) ;
   }
+#else
+  Sleep(S*1000);
+#endif
   MESSAGE( "Adder_Impl::AddAndCompare( " <<  x << " , " << y << " , " << z
        << " ) returns " << -(x - y) << " after " << S << " seconds" )
   LastAddition = z ;
@@ -140,9 +160,13 @@ void Adder_Impl::SetLastResult( CORBA::Double z ) {
   int S;
 //  S = 1+(int) (15.0*rand()/(RAND_MAX+1.0));
   S = 5 ;
+#ifndef WIN32
   while ( S ) {
-    S = sleep(S);
+    S = sleep( S ) ;
   }
+#else
+  Sleep(S*1000);
+#endif
   LastAddition = z ;
   endService( " Adder_Impl::SetLastResult"  );
   return ;
@@ -154,19 +178,23 @@ void Adder_Impl::LastResult( CORBA::Double & z ) {
   int S;
 //  S = 1+(int) (15.0*rand()/(RAND_MAX+1.0));
   S = 5 ;
+#ifndef WIN32
   while ( S ) {
-    S = sleep(S);
+    S = sleep( S ) ;
   }
+#else
+  Sleep(S*1000);
+#endif
   z = LastAddition ;
   endService( " Adder_Impl::LastResult"  );
   return ;
 }
 
-Engines::Component_ptr Adder_Impl::LccAdditionInterface( char * aContainer ,
-                                                         char * aComponentName ) {
+Engines::EngineComponent_ptr Adder_Impl::LccAdditionInterface( char * aContainer ,
+                                                               char * aComponentName ) {
   beginService( "Adder_Impl::LccAddComponent" );
-  Engines::Component_ptr objComponent ;
-  objComponent = Engines::Component::_nil() ;
+  Engines::EngineComponent_ptr objComponent ;
+  objComponent = Engines::EngineComponent::_nil() ;
 
   ORB_INIT &init = *SINGLETON_<ORB_INIT>::Instance() ;
   ASSERT(SINGLETON_<ORB_INIT>::IsAlreadyExisting());
@@ -181,4 +209,3 @@ Engines::Component_ptr Adder_Impl::LccAdditionInterface( char * aContainer ,
   endService( "Adder_Impl::LccAddComponent"  );
   return objComponent ;
 }
-