fix some error handling

msvc/8.0/ds_ImgCalibration.sln

@@ -3,17 +3,14 @@ Microsoft Visual Studio Solution File, Format Version 9.00
 # Visual C++ Express 2005
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ds_ImgCalibration", "ds_ImgCalibration.vcproj", "{F9E43EEF-3DDA-49C4-B2EF-D8C52F0B2B02}"
 	ProjectSection(ProjectDependencies) = postProject
-		{4936F10A-A503-4564-BB81-07155C49B7F1} = {4936F10A-A503-4564-BB81-07155C49B7F1}
-		{E3A67539-D737-41BF-A545-255F0A1E723F} = {E3A67539-D737-41BF-A545-255F0A1E723F}
+		{5CEA0DCF-675C-4C40-AF4E-D4FB4FEB9BFF} = {5CEA0DCF-675C-4C40-AF4E-D4FB4FEB9BFF}
 		{4A0EAE6E-A3A4-4035-B373-4A7D3E4B082A} = {4A0EAE6E-A3A4-4035-B373-4A7D3E4B082A}
+		{4936F10A-A503-4564-BB81-07155C49B7F1} = {4936F10A-A503-4564-BB81-07155C49B7F1}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "YAT_Static", "..\..\..\..\Libraries\YAT\msvc\8.0\YAT_Static.vcproj", "{4A0EAE6E-A3A4-4035-B373-4A7D3E4B082A}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "YAT_Static", "..\..\..\..\Libraries\YAT\msvc\8.0\YAT_Static.vcproj", "{5CEA0DCF-675C-4C40-AF4E-D4FB4FEB9BFF}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "YAT4Tango_Static", "..\..\..\..\Libraries\YAT4tango\msvc\8.0\YAT4tango_Static.vcproj", "{E3A67539-D737-41BF-A545-255F0A1E723F}"
-	ProjectSection(ProjectDependencies) = postProject
-		{4A0EAE6E-A3A4-4035-B373-4A7D3E4B082A} = {4A0EAE6E-A3A4-4035-B373-4A7D3E4B082A}
-	EndProjectSection
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "YAT4Tango_Static", "..\..\..\..\Libraries\YAT4tango\msvc\8.0\YAT4tango_Static.vcproj", "{4A0EAE6E-A3A4-4035-B373-4A7D3E4B082A}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ISL_Static", "..\..\..\..\Libraries\ISL\msvc\8.0\ISL_Static.vcproj", "{4936F10A-A503-4564-BB81-07155C49B7F1}"
 EndProject
@@ -27,14 +24,14 @@ Global
 		{F9E43EEF-3DDA-49C4-B2EF-D8C52F0B2B02}.Debug|Win32.Build.0 = Debug|Win32
 		{F9E43EEF-3DDA-49C4-B2EF-D8C52F0B2B02}.Release|Win32.ActiveCfg = Release|Win32
 		{F9E43EEF-3DDA-49C4-B2EF-D8C52F0B2B02}.Release|Win32.Build.0 = Release|Win32
+		{5CEA0DCF-675C-4C40-AF4E-D4FB4FEB9BFF}.Debug|Win32.ActiveCfg = Debug|Win32
+		{5CEA0DCF-675C-4C40-AF4E-D4FB4FEB9BFF}.Debug|Win32.Build.0 = Debug|Win32
+		{5CEA0DCF-675C-4C40-AF4E-D4FB4FEB9BFF}.Release|Win32.ActiveCfg = Release|Win32
+		{5CEA0DCF-675C-4C40-AF4E-D4FB4FEB9BFF}.Release|Win32.Build.0 = Release|Win32
 		{4A0EAE6E-A3A4-4035-B373-4A7D3E4B082A}.Debug|Win32.ActiveCfg = Debug|Win32
 		{4A0EAE6E-A3A4-4035-B373-4A7D3E4B082A}.Debug|Win32.Build.0 = Debug|Win32
 		{4A0EAE6E-A3A4-4035-B373-4A7D3E4B082A}.Release|Win32.ActiveCfg = Release|Win32
 		{4A0EAE6E-A3A4-4035-B373-4A7D3E4B082A}.Release|Win32.Build.0 = Release|Win32
-		{E3A67539-D737-41BF-A545-255F0A1E723F}.Debug|Win32.ActiveCfg = Debug|Win32
-		{E3A67539-D737-41BF-A545-255F0A1E723F}.Debug|Win32.Build.0 = Debug|Win32
-		{E3A67539-D737-41BF-A545-255F0A1E723F}.Release|Win32.ActiveCfg = Release|Win32
-		{E3A67539-D737-41BF-A545-255F0A1E723F}.Release|Win32.Build.0 = Release|Win32
 		{4936F10A-A503-4564-BB81-07155C49B7F1}.Debug|Win32.ActiveCfg = Debug|Win32
 		{4936F10A-A503-4564-BB81-07155C49B7F1}.Debug|Win32.Build.0 = Debug|Win32
 		{4936F10A-A503-4564-BB81-07155C49B7F1}.Release|Win32.ActiveCfg = Release|Win32

msvc/8.0/ds_ImgCalibration.vcproj

@@ -61,9 +61,9 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="omniORB407_rtd.lib omniDynamic407_rtd.lib COS407_rtd.lib omnithread32_rtd.lib tangod.lib log4tangod.lib comctl32.lib ws2_32.lib user32.lib gdi32.lib advapi32.lib"
+				AdditionalDependencies="omniORB410_rtd.lib omniDynamic410_rtd.lib COS410_rtd.lib omnithread33_rtd.lib tangod.lib log4tangod.lib comctl32.lib ws2_32.lib user32.lib gdi32.lib advapi32.lib cxcored.lib cvd.lib highguid.lib"
 				LinkIncremental="2"
-				AdditionalLibraryDirectories="&quot;$(SOLEIL_ROOT)\msvc8\omniorb\lib&quot;;&quot;$(SOLEIL_ROOT)\msvc8\log4tango\lib\shared&quot;;&quot;$(SOLEIL_ROOT)\msvc8\tango\lib\shared&quot;"
+				AdditionalLibraryDirectories="&quot;$(SOLEIL_ROOT)\msvc8\omniorb\lib&quot;;&quot;$(SOLEIL_ROOT)\msvc8\log4tango\lib\shared&quot;;&quot;$(SOLEIL_ROOT)\msvc8\tango\lib\shared&quot;;&quot;$(SOLEIL_ROOT)\sw-support\OpenCV\lib\shared\msvc-6.0&quot;"
 				IgnoreAllDefaultLibraries="false"
 				IgnoreDefaultLibraryNames="MSVCRT"
 				GenerateDebugInformation="true"
@@ -140,7 +140,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="omniORB407_rt.lib omniDynamic407_rt.lib COS407_rt.lib omnithread32_rt.lib tango.lib log4tango.lib comctl32.lib ws2_32.lib user32.lib gdi32.lib advapi32.lib"
+				AdditionalDependencies="omniORB410_rt.lib omniDynamic410_rt.lib COS410_rt.lib omnithread33_rt.lib tango.lib log4tango.lib comctl32.lib ws2_32.lib user32.lib gdi32.lib advapi32.lib"
 				LinkIncremental="1"
 				AdditionalLibraryDirectories="&quot;$(SOLEIL_ROOT)\msvc8\omniorb\lib&quot;;&quot;$(SOLEIL_ROOT)\msvc8\log4tango\lib\shared&quot;;&quot;$(SOLEIL_ROOT)\msvc8\tango\lib\shared&quot;"
 				GenerateDebugInformation="true"

src/ImgCalibration.cpp

-static const char *RcsId = "$Header: /users/chaize/newsvn/cvsroot/Calculation/ImgCalibration/src/ImgCalibration.cpp,v 1.2 2007-08-01 14:53:41 julien_malik Exp $";
+static const char *RcsId = "$Header: /users/chaize/newsvn/cvsroot/Calculation/ImgCalibration/src/ImgCalibration.cpp,v 1.3 2007-11-21 10:30:55 julien_malik Exp $";
 //+=============================================================================
 //
 // file :         ImgCalibration.cpp
@@ -13,7 +13,7 @@ static const char *RcsId = "$Header: /users/chaize/newsvn/cvsroot/Calculation/Im
 //
 // $Author: julien_malik $
 //
-// $Revision: 1.2 $
+// $Revision: 1.3 $
 //
 // $Log: not supported by cvs2svn $
 //
@@ -830,9 +830,10 @@ void ImgCalibration::write_sourcePattern(Tango::WAttribute &attr)
   {
     this->dev_task->wait_msg_handled(msg, kCOMMAND_TIMEOUT);
   }
-	catch (Tango::DevFailed &ex)
+  catch (yat::Exception &ex)
   {
-    RETHROW_DEVFAILED(ex,
+    yat4tango::YATDevFailed df(ex);
+    RETHROW_DEVFAILED(df,
                       "SOFTWARE_FAILURE",
                       "Error while posting a CALIBRATE message",
                       "ImgCalibration::write_sourcePattern");

src/ImgCalibrationTask.cpp

@@ -399,7 +399,7 @@ throw (yat::Exception)
           }
           SAFE_DELETE_PTR(image);
         }
-        catch(Tango::DevFailed&)
+        catch(yat::Exception&)
         {
           SAFE_DELETE_PTR(image);
           if (this->mode_ == MODE_ONESHOT)