Second code reread. Minor modifications

src/AcquireWaveformLecroy.cpp

-static const char *RcsId = "$Header: /users/chaize/newsvn/cvsroot/Instrumentation/AcquireWaveformLecroy/src/AcquireWaveformLecroy.cpp,v 1.6 2004-10-18 13:17:49 xavela Exp $";
+static const char *RcsId = "$Header: /users/chaize/newsvn/cvsroot/Instrumentation/AcquireWaveformLecroy/src/AcquireWaveformLecroy.cpp,v 1.7 2004-10-22 13:24:47 buteau Exp $";
 //+=============================================================================
 //
 // file :	  AcquireWaveformLecroy.cpp
@@ -11,11 +11,16 @@ static const char *RcsId = "$Header: /users/chaize/newsvn/cvsroot/Instrumentatio
 //
 // project :	  TANGO Device Server
 //
-// $Author: xavela $
+// $Author: buteau $
 //
-// $Revision: 1.6 $
+// $Revision: 1.7 $
 //
 // $Log: not supported by cvs2svn $
+// Revision 1.6  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.5  2004/10/18 09:01:40  buteau
 // First code reread
 //
@@ -317,7 +322,7 @@ void AcquireWaveformLecroy::always_executed_hook()
 		Tango::DevFailed df = lecroy_to_tango_exception(we);
 		
 		Tango::Except::re_throw_exception(df,
-			(const char*) "GET_DATA_FAILED",
+			(const char*) "COMMUNICATION_BROKEN",
 			(const char*) "Cannot call get_waveform_data.",
 			(const char*) "AcquireWaveformLecroy::always_executed_hook()",
 			Tango::ERR

src/Waveform.cpp

@@ -58,7 +58,7 @@ std::string  WaveForm_data::get_channel_name( ) throw (lecroy::WaveformException
 	if(channel_name != "")
 		return channel_name;
 	else
-		throw lecroy::WaveformException("DESCRIPTOR_MEMORY_ ", 
+		throw lecroy::WaveformException("DATA_OUT_OF_RANGE ", 
 										"get_channel_name( ) failed : channel_name is not initialized.",
 										"WaveForm_data::get_channel_name( ).");
 }
@@ -129,19 +129,10 @@ short	OFFSET_STRUCT = 0;
 	
 	//- delete previous scaled data
 	if(vertical_scaled_waveform_data)
-	{
-		try
 	{
 			delete [] vertical_scaled_waveform_data;
 			vertical_scaled_waveform_data = 0;
 	}
-		catch(const lecroy::WaveformException &)
-		{
-			throw lecroy::WaveformException("MEMORY_DESALLOCATION", 
-											"The pointer (vertical_scaled_waveform_data) for the receive data can't be desallocated before the read operation.",
-											"WaveForm_data::get_waveform_data( ).");
-		}
-	}
 
 	//- allocate memory for the receive data (WaveDesc + data)
 	ptrRawData = new char[MAX_WAVEFORM_DATA_LENGTH];
@@ -237,7 +228,6 @@ 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 ( )
 {