From ef5fab9dc981e067982824485b07d28109541741 Mon Sep 17 00:00:00 2001
From: Alain Buteau <alain.buteau@synchrotron-soleil.fr>
Date: Mon, 18 Oct 2004 09:01:40 +0000
Subject: [PATCH] First code reread

---
 doc/DeviceServerUsersGuide_en.doc | Bin 265728 -> 267264 bytes
 include/SocketException.h         |   2 +-
 include/Waveform.h                |  14 +++++++-------
 src/AcquireWaveformLecroy.cpp     |  21 +++++++++++++++++----
 src/Waveform.cpp                  |  10 +++++++---
 5 files changed, 32 insertions(+), 15 deletions(-)

diff --git a/doc/DeviceServerUsersGuide_en.doc b/doc/DeviceServerUsersGuide_en.doc
index 1e326554700989fc867a58203d0a5d117e319df9..a0e08d2b000d998579dcc9d4f95179e151b84c82 100644
GIT binary patch
delta 13533
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
UBHP_LS#~l_eh^T)jE98@02XU88UO$Q

delta 13021
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
D58SrR

diff --git a/include/SocketException.h b/include/SocketException.h
index c450232..7f06595 100644
--- a/include/SocketException.h
+++ b/include/SocketException.h
@@ -18,7 +18,7 @@
 // ============================================================================
 // DEPENDENCIES
 // ============================================================================
-#include "..\include\LecroyException.h"
+#include "LecroyException.h"
 
 namespace lecroy {
 
diff --git a/include/Waveform.h b/include/Waveform.h
index 3698c53..a6d3ad4 100644
--- a/include/Waveform.h
+++ b/include/Waveform.h
@@ -113,13 +113,13 @@ public:
 	//- DTOR
 	~WaveForm_data();
 
-	std::string	get_channel_name		 (void) throw (lecroy::LecroyException);
-	void		set_channel_name		 (std::string);
-WAVEDESC_BLOCK *get_wavedesc_descriptor  (void) throw (lecroy::LecroyException);
-	void		get_waveform_data		 (void) throw (lecroy::LecroyException);	//- acquire the waveform data from the scope
-	short*		get_raw_waveform_data (void) throw (lecroy::LecroyException);	     //- return the ptr on sh_raw_waveform_data
-	double* 	get_vertical_scaled_waveform_data (void) throw (lecroy::LecroyException);
-	std::string	get_trigger_time_value	 (void) throw (lecroy::LecroyException);
+	std::string	get_channel_name					(void) throw (lecroy::LecroyException);
+	void		set_channel_name					(std::string);
+	WAVEDESC_BLOCK *get_wavedesc_descriptor			(void) throw (lecroy::WaveformException);
+	void		get_waveform_data					(void) throw (lecroy::LecroyException);	//- acquire the waveform data from the scope
+	short*		get_raw_waveform_data				(void) throw (lecroy::LecroyException);	     //- return the ptr on sh_raw_waveform_data
+	double* 	get_vertical_scaled_waveform_data	(void) throw (lecroy::LecroyException);
+	std::string	get_trigger_time_value				(void) throw (lecroy::LecroyException);
 
 	
 
diff --git a/src/AcquireWaveformLecroy.cpp b/src/AcquireWaveformLecroy.cpp
index a2b3b71..d55d749 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.4 2004-10-07 09:21:18 xavela Exp $";
+static const char *RcsId = "$Header: /users/chaize/newsvn/cvsroot/Instrumentation/AcquireWaveformLecroy/src/AcquireWaveformLecroy.cpp,v 1.5 2004-10-18 09:01:40 buteau Exp $";
 //+=============================================================================
 //
 // file :	  AcquireWaveformLecroy.cpp
@@ -11,11 +11,14 @@ static const char *RcsId = "$Header: /users/chaize/newsvn/cvsroot/Instrumentatio
 //
 // project :	  TANGO Device Server
 //
-// $Author: xavela $
+// $Author: buteau $
 //
-// $Revision: 1.4 $
+// $Revision: 1.5 $
 //
 // $Log: not supported by cvs2svn $
+// Revision 1.4  2004/10/07 09:21:18  xavela
+// xavier : no cout now.
+//
 // Revision 1.3  2004/10/05 13:11:11  xavela
 // Xavier : previous commit failed.
 //
@@ -231,6 +234,10 @@ void AcquireWaveformLecroy::init_device()
 		set_state(Tango::ON);
 		set_status("Ready to acquire waveform.");
 	}
+
+	/*	AB le constructeur de WaveForm_data ne lance pas d'exception WaveformException
+	// ce catch est donc inutile
+
 	catch(const lecroy::WaveformException &we)
 	{
 		set_state(Tango::ALARM);
@@ -244,6 +251,7 @@ void AcquireWaveformLecroy::init_device()
 			Tango::PANIC
 			);
 	}
+	*/
 }
 
 
@@ -307,6 +315,8 @@ void AcquireWaveformLecroy::always_executed_hook()
 	//- Get the waveform data and description( ADC resolution, horizontal and vertical infos, data length ...)
 	try
 	{
+		// First do a real read on the hardware
+		// 
 		waveform_ptr->get_waveform_data();
 		set_state(Tango::ON);
 		set_status("Waveform data acquired.");
@@ -375,10 +385,13 @@ void AcquireWaveformLecroy::read_attr_hardware(vector<long> &attr_list)
 	try
 	{
 		//- allocate memory for the two attributes
+		DEBUG_STREAM << "data_length = " << data_length << endl;
 		attr_rawWaveformData_read = new Tango::DevShort[data_length];
 		attr_verticalScaledData_read = new Tango::DevDouble[data_length];
-		cout << "data_length = " << data_length << endl;
 	}
+	//AB le new Tango::DevShort ne peut pas �chouer pour cause de DevFailed
+	// ==> on ne passera jamais dans ton catch
+	// Soit tu le supprimes, soit tu mets un catch (std::bad_alloc) 
 	catch(Tango::DevFailed &te)
 	{
 		set_state(Tango::ALARM);
diff --git a/src/Waveform.cpp b/src/Waveform.cpp
index 0e72c23..0951cce 100644
--- a/src/Waveform.cpp
+++ b/src/Waveform.cpp
@@ -25,7 +25,7 @@ WaveForm_data::WaveForm_data(std::string ch_name)
 	channel_name = ch_name;
 	sh_raw_waveform_data = NULL;
 	vertical_scaled_waveform_data = NULL;
-	trigger_time_value = "Not avaiable";
+	trigger_time_value = "Not available";
 	//- the memory allocation is done in the get_waveform_data( ) method
 	ptrRawData = 0;
 }
@@ -33,7 +33,6 @@ WaveForm_data::WaveForm_data(std::string ch_name)
 WaveForm_data::~WaveForm_data()
 {
 	if(ptrRawData)
-
 	{
 		delete [] ptrRawData;
 		ptrRawData = 0;
@@ -52,7 +51,7 @@ WaveForm_data::~WaveForm_data()
 }
 
 //- Method to return the channel name
-std::string  WaveForm_data::get_channel_name( ) throw (lecroy::LecroyException)
+std::string  WaveForm_data::get_channel_name( ) throw (lecroy::WaveformException)
 {
 	std::string error = " channel_name is not initialized !";
 
@@ -174,6 +173,9 @@ short	OFFSET_STRUCT = 0;
 	{
 		SocketLecroy::get_instance( )->TCP_ReadDevice(ptrRawData,length,&response_length);
 	}
+	//AB  A quoi sert le catch ici 
+	// si tu ne traitespas l''exception , alors il ne sert � rien de faire un catch 
+
 	catch(const lecroy::SocketException &)
 	{
 		throw;
@@ -253,6 +255,8 @@ double* WaveForm_data::get_vertical_scaled_waveform_data( ) throw (lecroy::Lecro
 }
 
 //- Method to return the trigger time of the acquired waveform
+//AB cette methode ne fait pas de throw ==> la signature est fausse
+
 std::string	WaveForm_data::get_trigger_time_value ( ) throw (lecroy::LecroyException)
 {
 	
-- 
GitLab