From 8e3edc00fda3ac9a96895fb9db26c98c90d09b8b Mon Sep 17 00:00:00 2001 From: Sylvain Dupuy <sylvain.dupuy@synchrotron-soleil.fr> Date: Thu, 24 Apr 2008 13:08:44 +0000 Subject: [PATCH] no message --- src/AcquireWaveformLecroy.cpp | 10 +++++++--- src/AcquireWaveformLecroy.h | 12 ++++++++---- src/AcquireWaveformLecroyClass.cpp | 10 +++++++--- src/AcquireWaveformLecroyClass.h | 8 ++++++-- src/AcquireWaveformLecroyStateMachine.cpp | 10 +++++++--- src/ClassFactory.cpp | 14 +++++++++----- src/Makefile | 9 +++++++-- src/main.cpp | 10 +++++++--- 8 files changed, 58 insertions(+), 25 deletions(-) diff --git a/src/AcquireWaveformLecroy.cpp b/src/AcquireWaveformLecroy.cpp index 43ea127..d638378 100644 --- a/src/AcquireWaveformLecroy.cpp +++ b/src/AcquireWaveformLecroy.cpp @@ -1,4 +1,4 @@ -static const char *RcsId = "$Header: /users/chaize/newsvn/cvsroot/Instrumentation/AcquireWaveformLecroy/src/AcquireWaveformLecroy.cpp,v 1.10 2008-02-29 15:00:12 xavela Exp $"; +static const char *RcsId = "$Header: /users/chaize/newsvn/cvsroot/Instrumentation/AcquireWaveformLecroy/src/AcquireWaveformLecroy.cpp,v 1.11 2008-04-24 13:08:44 syldup Exp $"; //+============================================================================= // // file : AcquireWaveformLecroy.cpp @@ -11,11 +11,15 @@ static const char *RcsId = "$Header: /users/chaize/newsvn/cvsroot/Instrumentatio // // project : TANGO Device Server // -// $Author: xavela $ +// $Author: syldup $ // -// $Revision: 1.10 $ +// $Revision: 1.11 $ // // $Log: not supported by cvs2svn $ +// Revision 1.10 2008/02/29 15:00:12 xavela +// xavier: +// sleep added after a write +// // Revision 1.9 2008/02/28 09:02:05 xavela // xavier : // StateMachine file added !! (oups) diff --git a/src/AcquireWaveformLecroy.h b/src/AcquireWaveformLecroy.h index 9eaf778..d9f9682 100644 --- a/src/AcquireWaveformLecroy.h +++ b/src/AcquireWaveformLecroy.h @@ -6,11 +6,15 @@ // // project : Acquire_Waveform_Lecroy_Prj // -// $Author: xavela $ +// $Author: syldup $ // -// $Revision: 1.7 $ +// $Revision: 1.8 $ // // $Log: not supported by cvs2svn $ +// Revision 1.7 2008/02/28 09:02:05 xavela +// xavier : +// StateMachine file added !! (oups) +// // Revision 1.5 2004/10/18 13:17:49 xavela // xavier : add an attr waveArray2. // Sorts attr in expert and operator view with Pogo. @@ -53,8 +57,8 @@ #include "WaveformException.h" /** - * @author $Author: xavela $ - * @version $Revision: 1.7 $ $ + * @author $Author: syldup $ + * @version $Revision: 1.8 $ $ */ // Add your own constants definitions here. diff --git a/src/AcquireWaveformLecroyClass.cpp b/src/AcquireWaveformLecroyClass.cpp index c27c7be..9a8c747 100644 --- a/src/AcquireWaveformLecroyClass.cpp +++ b/src/AcquireWaveformLecroyClass.cpp @@ -1,4 +1,4 @@ -static const char *RcsId = "$Header: /users/chaize/newsvn/cvsroot/Instrumentation/AcquireWaveformLecroy/src/AcquireWaveformLecroyClass.cpp,v 1.7 2008-02-28 09:02:05 xavela Exp $"; +static const char *RcsId = "$Header: /users/chaize/newsvn/cvsroot/Instrumentation/AcquireWaveformLecroy/src/AcquireWaveformLecroyClass.cpp,v 1.8 2008-04-24 13:08:44 syldup Exp $"; static const char *TagName = "$Name: not supported by cvs2svn $"; @@ -18,11 +18,15 @@ static const char *RCSfile = "$RCSfile: AcquireWaveformLecroyClass.cpp,v $"; // // project : TANGO Device Server // -// $Author: xavela $ +// $Author: syldup $ // -// $Revision: 1.7 $ +// $Revision: 1.8 $ // // $Log: not supported by cvs2svn $ +// Revision 1.7 2008/02/28 09:02:05 xavela +// xavier : +// StateMachine file added !! (oups) +// // Revision 1.5 2004/10/18 13:17:49 xavela // xavier : add an attr waveArray2. // Sorts attr in expert and operator view with Pogo. diff --git a/src/AcquireWaveformLecroyClass.h b/src/AcquireWaveformLecroyClass.h index 3161fdc..4c8c2d7 100644 --- a/src/AcquireWaveformLecroyClass.h +++ b/src/AcquireWaveformLecroyClass.h @@ -10,11 +10,15 @@ // // project : TANGO Device Server // -// $Author: xavela $ +// $Author: syldup $ // -// $Revision: 1.7 $ +// $Revision: 1.8 $ // // $Log: not supported by cvs2svn $ +// Revision 1.7 2008/02/28 09:02:05 xavela +// xavier : +// StateMachine file added !! (oups) +// // Revision 1.5 2004/10/18 13:17:49 xavela // xavier : add an attr waveArray2. // Sorts attr in expert and operator view with Pogo. diff --git a/src/AcquireWaveformLecroyStateMachine.cpp b/src/AcquireWaveformLecroyStateMachine.cpp index 2171191..c959dda 100644 --- a/src/AcquireWaveformLecroyStateMachine.cpp +++ b/src/AcquireWaveformLecroyStateMachine.cpp @@ -1,4 +1,4 @@ -static const char *RcsId = "$Header: /users/chaize/newsvn/cvsroot/Instrumentation/AcquireWaveformLecroy/src/AcquireWaveformLecroyStateMachine.cpp,v 1.1 2008-02-28 09:02:05 xavela Exp $"; +static const char *RcsId = "$Header: /users/chaize/newsvn/cvsroot/Instrumentation/AcquireWaveformLecroy/src/AcquireWaveformLecroyStateMachine.cpp,v 1.2 2008-04-24 13:08:44 syldup Exp $"; //+============================================================================= // // file : AcquireWaveformLecroyStateMachine.cpp @@ -8,11 +8,15 @@ static const char *RcsId = "$Header: /users/chaize/newsvn/cvsroot/Instrumentatio // // project : TANGO Device Server // -// $Author: xavela $ +// $Author: syldup $ // -// $Revision: 1.1 $ +// $Revision: 1.2 $ // // $Log: not supported by cvs2svn $ +// Revision 1.1 2008/02/28 09:02:05 xavela +// xavier : +// StateMachine file added !! (oups) +// // // copyleft : European Synchrotron Radiation Facility // BP 220, Grenoble 38043 diff --git a/src/ClassFactory.cpp b/src/ClassFactory.cpp index 4ee815e..b1c4c3a 100644 --- a/src/ClassFactory.cpp +++ b/src/ClassFactory.cpp @@ -1,4 +1,4 @@ -static const char *RcsId = "$Header: /users/chaize/newsvn/cvsroot/Instrumentation/AcquireWaveformLecroy/src/ClassFactory.cpp,v 1.5 2008-02-28 09:02:05 xavela Exp $"; +static const char *RcsId = "$Header: /users/chaize/newsvn/cvsroot/Instrumentation/AcquireWaveformLecroy/src/ClassFactory.cpp,v 1.6 2008-04-24 13:08:44 syldup Exp $"; //+============================================================================= // // file : ClassFactory.cpp @@ -10,11 +10,15 @@ static const char *RcsId = "$Header: /users/chaize/newsvn/cvsroot/Instrumentatio // // project : TANGO Device Server // -// $Author: xavela $ +// $Author: syldup $ // -// $Revision: 1.5 $ +// $Revision: 1.6 $ // // $Log: not supported by cvs2svn $ +// Revision 1.5 2008/02/28 09:02:05 xavela +// xavier : +// StateMachine file added !! (oups) +// // Revision 1.4 2004/10/18 13:17:49 xavela // xavier : add an attr waveArray2. // Sorts attr in expert and operator view with Pogo. @@ -49,8 +53,8 @@ static const char *RcsId = "$Header: /users/chaize/newsvn/cvsroot/Instrumentatio /** * Create AcquireWaveformLecroyClass singleton and store it in DServer object. * - * @author $Author: xavela $ - * @version $Revision: 1.5 $ $ + * @author $Author: syldup $ + * @version $Revision: 1.6 $ $ */ void Tango::DServer::class_factory() diff --git a/src/Makefile b/src/Makefile index b979d2e..a58f3ca 100644 --- a/src/Makefile +++ b/src/Makefile @@ -14,15 +14,20 @@ # -# $Author: xavela $ +# $Author: syldup $ # -# $Revision: 1.4 $ +# $Revision: 1.5 $ # # $Log: not supported by cvs2svn $ +# Revision 1.4 2004/10/18 13:17:49 xavela +# xavier : add an attr waveArray2. +# Sorts attr in expert and operator view with Pogo. +# Inconsistencies removed. +# # Revision 1.3 2004/10/07 09:21:19 xavela # xavier : no cout now. # diff --git a/src/main.cpp b/src/main.cpp index bb4bdb2..410445b 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -1,4 +1,4 @@ -static const char *RcsId = "$Header: /users/chaize/newsvn/cvsroot/Instrumentation/AcquireWaveformLecroy/src/main.cpp,v 1.5 2008-02-28 09:02:05 xavela Exp $"; +static const char *RcsId = "$Header: /users/chaize/newsvn/cvsroot/Instrumentation/AcquireWaveformLecroy/src/main.cpp,v 1.6 2008-04-24 13:08:44 syldup Exp $"; //+============================================================================= // // file : main.cpp @@ -10,11 +10,15 @@ static const char *RcsId = "$Header: /users/chaize/newsvn/cvsroot/Instrumentatio // // project : TANGO Device Server // -// $Author: xavela $ +// $Author: syldup $ // -// $Revision: 1.5 $ $ +// $Revision: 1.6 $ $ // // $Log: not supported by cvs2svn $ +// Revision 1.5 2008/02/28 09:02:05 xavela +// xavier : +// StateMachine file added !! (oups) +// // Revision 1.4 2004/10/18 13:17:49 xavela // xavier : add an attr waveArray2. // Sorts attr in expert and operator view with Pogo. -- GitLab