From 3fc15547356ca82f63d5668f4ee41bc9285a24f3 Mon Sep 17 00:00:00 2001 From: Alain Buteau <alain.buteau@synchrotron-soleil.fr> Date: Fri, 22 Oct 2004 13:24:47 +0000 Subject: [PATCH] Second code reread. Minor modifications --- doc/DeviceServerUsersGuide_en.doc | Bin 267264 -> 268800 bytes src/AcquireWaveformLecroy.cpp | 17 +++++++++++------ src/Waveform.cpp | 12 +----------- 3 files changed, 12 insertions(+), 17 deletions(-) diff --git a/doc/DeviceServerUsersGuide_en.doc b/doc/DeviceServerUsersGuide_en.doc index a0e08d2b000d998579dcc9d4f95179e151b84c82..2a16c9042b86be1b45ca2445c13d173eeada2b9a 100644 GIT binary patch delta 7626 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 D)&wX! delta 7521 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 diff --git a/src/AcquireWaveformLecroy.cpp b/src/AcquireWaveformLecroy.cpp index ee08502..989b847 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.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 @@ -375,8 +380,8 @@ void AcquireWaveformLecroy::read_attr_hardware(vector<long> &attr_list) { //- 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]; + attr_rawWaveformData_read = new Tango::DevShort[data_length]; + attr_verticalScaledData_read = new Tango::DevDouble[data_length]; } catch(std::bad_alloc) { diff --git a/src/Waveform.cpp b/src/Waveform.cpp index b3a4304..b272435 100644 --- a/src/Waveform.cpp +++ b/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( )."); } @@ -130,17 +130,8 @@ 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) @@ -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 ( ) { -- GitLab