Skip to content
Snippets Groups Projects
Commit 1c20d920 authored by Stéphane Poirier's avatar Stéphane Poirier
Browse files

Adding try catch block to secure the program

parent 27599433
Branches
No related tags found
No related merge requests found
......@@ -2,6 +2,23 @@
Microsoft Visual Studio Solution File, Format Version 9.00
# Visual C++ Express 2005
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MechanicalGenericBender", "MechanicalGenericBender.vcproj", "{E7BB82E9-DEA1-4F5C-98C9-4774DA541A17}"
ProjectSection(ProjectDependencies) = postProject
{199DCF38-C8FC-4B43-9923-F1328A37B2F1} = {199DCF38-C8FC-4B43-9923-F1328A37B2F1}
{32DE925B-5488-4433-86E8-698681A4BF73} = {32DE925B-5488-4433-86E8-698681A4BF73}
{67460574-0988-455C-B406-2B82B65FF15E} = {67460574-0988-455C-B406-2B82B65FF15E}
{92A451A8-16E7-4838-BC4B-88DD746F8E7D} = {92A451A8-16E7-4838-BC4B-88DD746F8E7D}
{DAEED9CB-9E85-4217-A3F6-EE0C3610E474} = {DAEED9CB-9E85-4217-A3F6-EE0C3610E474}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Exceptions", "..\..\..\Libraries\Exceptions\msvc++8.0\Exceptions.vcproj", "{199DCF38-C8FC-4B43-9923-F1328A37B2F1}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "GenericBender", "..\..\..\Libraries\GenericBender\msvc++8.0\GenericBender.vcproj", "{92A451A8-16E7-4838-BC4B-88DD746F8E7D}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Interpolator", "..\..\..\Libraries\Interpolator\msvc++8.0\Interpolator.vcproj", "{DAEED9CB-9E85-4217-A3F6-EE0C3610E474}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Monochromator", "..\..\..\Libraries\Monochromator\msvc++8.0\Monochromator.vcproj", "{32DE925B-5488-4433-86E8-698681A4BF73}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Utils", "..\..\..\Libraries\Utils\msvc++8.0\Utils.vcproj", "{67460574-0988-455C-B406-2B82B65FF15E}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
......@@ -13,8 +30,28 @@ Global
{E7BB82E9-DEA1-4F5C-98C9-4774DA541A17}.Debug|Win32.Build.0 = Debug|Win32
{E7BB82E9-DEA1-4F5C-98C9-4774DA541A17}.Release|Win32.ActiveCfg = Release|Win32
{E7BB82E9-DEA1-4F5C-98C9-4774DA541A17}.Release|Win32.Build.0 = Release|Win32
{199DCF38-C8FC-4B43-9923-F1328A37B2F1}.Debug|Win32.ActiveCfg = Debug|Win32
{199DCF38-C8FC-4B43-9923-F1328A37B2F1}.Debug|Win32.Build.0 = Debug|Win32
{199DCF38-C8FC-4B43-9923-F1328A37B2F1}.Release|Win32.ActiveCfg = Release|Win32
{199DCF38-C8FC-4B43-9923-F1328A37B2F1}.Release|Win32.Build.0 = Release|Win32
{92A451A8-16E7-4838-BC4B-88DD746F8E7D}.Debug|Win32.ActiveCfg = Debug|Win32
{92A451A8-16E7-4838-BC4B-88DD746F8E7D}.Debug|Win32.Build.0 = Debug|Win32
{92A451A8-16E7-4838-BC4B-88DD746F8E7D}.Release|Win32.ActiveCfg = Release|Win32
{92A451A8-16E7-4838-BC4B-88DD746F8E7D}.Release|Win32.Build.0 = Release|Win32
{DAEED9CB-9E85-4217-A3F6-EE0C3610E474}.Debug|Win32.ActiveCfg = Debug|Win32
{DAEED9CB-9E85-4217-A3F6-EE0C3610E474}.Debug|Win32.Build.0 = Debug|Win32
{DAEED9CB-9E85-4217-A3F6-EE0C3610E474}.Release|Win32.ActiveCfg = Release|Win32
{DAEED9CB-9E85-4217-A3F6-EE0C3610E474}.Release|Win32.Build.0 = Release|Win32
{32DE925B-5488-4433-86E8-698681A4BF73}.Debug|Win32.ActiveCfg = Debug|Win32
{32DE925B-5488-4433-86E8-698681A4BF73}.Debug|Win32.Build.0 = Debug|Win32
{32DE925B-5488-4433-86E8-698681A4BF73}.Release|Win32.ActiveCfg = Release|Win32
{32DE925B-5488-4433-86E8-698681A4BF73}.Release|Win32.Build.0 = Release|Win32
{67460574-0988-455C-B406-2B82B65FF15E}.Debug|Win32.ActiveCfg = Debug|Win32
{67460574-0988-455C-B406-2B82B65FF15E}.Debug|Win32.Build.0 = Debug|Win32
{67460574-0988-455C-B406-2B82B65FF15E}.Release|Win32.ActiveCfg = Release|Win32
{67460574-0988-455C-B406-2B82B65FF15E}.Release|Win32.Build.0 = Release|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNCristal = FALSE
HideSolutionNode = FALSE
EndGlobalSection
EndGlobal
......@@ -39,7 +39,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="../src;&quot;$(SOLEIL_ROOT)/omniorb/include&quot;;&quot;$(SOLEIL_ROOT)/tango/include&quot;;&quot;$(SOLEIL_ROOT)/dev/include&quot;;&quot;$(SW_SUPPORT)/Utils/include&quot;;&quot;$(SW_SUPPORT)/GenericBender/include&quot;;&quot;$(SW_SUPPORT)/Monochromator/include&quot;;&quot;$(SW_SUPPORT)/Exceptions/include&quot;;&quot;$(SW_SUPPORT)/Interpolator/include&quot;;&quot;$(SW_SUPPORT)/GSL/include&quot;;&quot;$(SW_SUPPORT)/GratingMonochromator/include&quot;"
AdditionalIncludeDirectories="../src;&quot;$(SOLEIL_ROOT)/omniorb/include&quot;;&quot;$(SOLEIL_ROOT)/tango/include&quot;;&quot;$(SOLEIL_ROOT)/dev/include&quot;;&quot;$(SW_SUPPORT)/Utils/include&quot;;&quot;$(SW_SUPPORT)/GenericBender/include&quot;;&quot;$(SW_SUPPORT)/Monochromator/include&quot;;&quot;$(SW_SUPPORT)/Exceptions/include&quot;;&quot;$(SW_SUPPORT)/Interpolator/include&quot;;&quot;$(SW_SUPPORT)/GSL/include&quot;"
PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;WIN32;_DEBUG;_CONSOLE;LOG4TANGO_HAVE_INT64_T;LOG4TANGO_HAS_DLL;TANGO_HAS_DLL;HAS_TANGO_5"
MinimalRebuild="true"
BasicRuntimeChecks="3"
......@@ -60,7 +60,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="$(SW_SUPPORT)\GratingMonochromator\lib\libGratingMonochromatord.lib $(SW_SUPPORT)\Monochromator\lib\libMonochromatord.lib $(SW_SUPPORT)\GenericBender\lib\libGenericBenderd.lib $(SW_SUPPORT)\Interpolator\lib\libInterpolatord.lib $(SW_SUPPORT)\Utils\lib\libUtilsd.lib $(SW_SUPPORT)\Exceptions\lib\libExceptionsd.lib $(SW_SUPPORT)\GSL\lib\libGSLd.lib $(SW_SUPPORT)\GSL\lib\libGSLcblasd.lib $(SOLEIL_ROOT)\tango\lib\shared\log4tangod.lib $(SOLEIL_ROOT)\tango\lib\shared\tangod.lib $(SOLEIL_ROOT)\omniorb\lib\x86_win32\omniORB405_rtd.lib $(SOLEIL_ROOT)\omniorb\lib\x86_win32\omnithread30_rtd.lib $(SOLEIL_ROOT)\omniorb\lib\x86_win32\COS405_rtd.lib $(SOLEIL_ROOT)\omniorb\lib\x86_win32\omniDynamic405_rtd.lib user32.lib gdi32.lib advapi32.lib ws2_32.lib comctl32.lib"
AdditionalDependencies="$(SW_SUPPORT)\Monochromator\lib\libMonochromatord.lib $(SW_SUPPORT)\GenericBender\lib\libGenericBenderd.lib $(SW_SUPPORT)\Interpolator\lib\libInterpolatord.lib $(SW_SUPPORT)\Utils\lib\libUtilsd.lib $(SW_SUPPORT)\Exceptions\lib\libExceptionsd.lib $(SW_SUPPORT)\GSL\lib\libGSLd.lib $(SW_SUPPORT)\GSL\lib\libGSLcblasd.lib $(SOLEIL_ROOT)\tango\lib\shared\log4tangod.lib $(SOLEIL_ROOT)\tango\lib\shared\tangod.lib $(SOLEIL_ROOT)\omniorb\lib\x86_win32\omniORB405_rtd.lib $(SOLEIL_ROOT)\omniorb\lib\x86_win32\omnithread30_rtd.lib $(SOLEIL_ROOT)\omniorb\lib\x86_win32\COS405_rtd.lib $(SOLEIL_ROOT)\omniorb\lib\x86_win32\omniDynamic405_rtd.lib user32.lib gdi32.lib advapi32.lib ws2_32.lib comctl32.lib"
OutputFile="$(OutDir)\ds_$(ProjectName).exe"
LinkIncremental="2"
GenerateDebugInformation="true"
......@@ -115,7 +115,7 @@
/>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="../src;&quot;$(SOLEIL_ROOT)/omniorb/include&quot;;&quot;$(SOLEIL_ROOT)/tango/include&quot;;&quot;$(SOLEIL_ROOT)/dev/include&quot;;&quot;$(SW_SUPPORT)/Utils/include&quot;;&quot;$(SW_SUPPORT)/GenericBender/include&quot;;&quot;$(SW_SUPPORT)/Monochromator/include&quot;;&quot;$(SW_SUPPORT)/Exceptions/include&quot;;&quot;$(SW_SUPPORT)/Interpolator/include&quot;;&quot;$(SW_SUPPORT)/GSL/include&quot;;&quot;$(SW_SUPPORT)/GratingMonochromator/include&quot;"
AdditionalIncludeDirectories="../src;&quot;$(SOLEIL_ROOT)/omniorb/include&quot;;&quot;$(SOLEIL_ROOT)/tango/include&quot;;&quot;$(SOLEIL_ROOT)/dev/include&quot;;&quot;$(SW_SUPPORT)/Utils/include&quot;;&quot;$(SW_SUPPORT)/GenericBender/include&quot;;&quot;$(SW_SUPPORT)/Monochromator/include&quot;;&quot;$(SW_SUPPORT)/Exceptions/include&quot;;&quot;$(SW_SUPPORT)/Interpolator/include&quot;;&quot;$(SW_SUPPORT)/GSL/include&quot;"
PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;WIN32;NDEBUG;_CONSOLE;LOG4TANGO_HAVE_INT64_T;LOG4TANGO_HAS_DLL;TANGO_HAS_DLL;HAS_TANGO_5"
RuntimeLibrary="2"
UsePrecompiledHeader="0"
......@@ -134,7 +134,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="$(SW_SUPPORT)\GratingMonochromator\lib\libGratingMonochromator.lib $(SW_SUPPORT)\Monochromator\lib\libMonochromator.lib $(SW_SUPPORT)\GenericBender\lib\libGenericBender.lib $(SW_SUPPORT)\Interpolator\lib\libInterpolator.lib $(SW_SUPPORT)\Utils\lib\libUtils.lib $(SW_SUPPORT)\Exceptions\lib\libExceptions.lib $(SW_SUPPORT)\GSL\lib\libGSL.lib $(SW_SUPPORT)\GSL\lib\libGSLcblas.lib $(SOLEIL_ROOT)\tango\lib\shared\log4tango.lib $(SOLEIL_ROOT)\tango\lib\shared\tango.lib $(SOLEIL_ROOT)\omniorb\lib\x86_win32\omniORB405_rt.lib $(SOLEIL_ROOT)\omniorb\lib\x86_win32\omnithread30_rt.lib $(SOLEIL_ROOT)\omniorb\lib\x86_win32\COS405_rt.lib $(SOLEIL_ROOT)\omniorb\lib\x86_win32\omniDynamic405_rt.lib user32.lib gdi32.lib advapi32.lib ws2_32.lib comctl32.lib"
AdditionalDependencies="$(SW_SUPPORT)\Monochromator\lib\libMonochromator.lib $(SW_SUPPORT)\GenericBender\lib\libGenericBender.lib $(SW_SUPPORT)\Interpolator\lib\libInterpolator.lib $(SW_SUPPORT)\Utils\lib\libUtils.lib $(SW_SUPPORT)\Exceptions\lib\libExceptions.lib $(SW_SUPPORT)\GSL\lib\libGSL.lib $(SW_SUPPORT)\GSL\lib\libGSLcblas.lib $(SOLEIL_ROOT)\tango\lib\shared\log4tango.lib $(SOLEIL_ROOT)\tango\lib\shared\tango.lib $(SOLEIL_ROOT)\omniorb\lib\x86_win32\omniORB405_rt.lib $(SOLEIL_ROOT)\omniorb\lib\x86_win32\omnithread30_rt.lib $(SOLEIL_ROOT)\omniorb\lib\x86_win32\COS405_rt.lib $(SOLEIL_ROOT)\omniorb\lib\x86_win32\omniDynamic405_rt.lib user32.lib gdi32.lib advapi32.lib ws2_32.lib comctl32.lib"
OutputFile="$(OutDir)\ds_$(ProjectName).exe"
LinkIncremental="2"
GenerateDebugInformation="true"
......
This diff is collapsed.
......@@ -8,7 +8,7 @@
//
// $Author: stephpsoleil $
//
// $Revision: 1.10 $
// $Revision: 1.11 $
//
// $Log: not supported by cvs2svn $
//
......@@ -45,7 +45,7 @@
/**
* @author $Author: stephpsoleil $
* @version $Revision: 1.10 $
* @version $Revision: 1.11 $
*/
// Add your own constants definitions here.
......@@ -642,61 +642,10 @@ public :
double ReadBender4();
Tango::DevState ReadBender4State();
void WriteBender5(double dBender5);
double ReadBender5();
Tango::DevState ReadBender5State();
void WriteBender6(double dBender6);
double ReadBender6();
Tango::DevState ReadBender6State();
void WriteBender7(double dBender7);
double ReadBender7();
Tango::DevState ReadBender7State();
void WriteBender8(double dBender8);
double ReadBender8();
Tango::DevState ReadBender8State();
void WriteBender9(double dBender9);
double ReadBender9();
Tango::DevState ReadBender9State();
void WriteBender10(double dBender10);
double ReadBender10();
Tango::DevState ReadBender10State();
void WriteBender11(double dBender11);
double ReadBender11();
Tango::DevState ReadBender11State();
void WriteBender12(double dBender12);
double ReadBender12();
Tango::DevState ReadBender12State();
void WriteBender13(double dBender13);
double ReadBender13();
Tango::DevState ReadBender13State();
void WriteBender14(double dBender14);
double ReadBender14();
Tango::DevState ReadBender14State();
void WriteBender15(double dBender15);
double ReadBender15();
Tango::DevState ReadBender15State();
void WriteBender16(double dBender16);
double ReadBender16();
Tango::DevState ReadBender16State();
bool ReadAllProxiesStates();
void PutAllPointersToZero();
void deleteAllObjects();
Tango::DeviceProxyHelper* CreateProxy( std::string sPropertieMotorName,std::string sMotorDescription);
void WriteMotor( Tango::DeviceProxyHelper* mProxyToMotor,std::string sAttributeMotorName,std::string sExceptionDescription,double dMotorValue);
double ReadMotor( Tango::DeviceProxyHelper* mProxyToMotor,std::string sAttributeMotorName,std::string sExceptionDescription);
......@@ -713,7 +662,6 @@ public :
void store_value_as_property(Tango::DbData& dev_prop,Tango::DevString value,string property_name);
void store_value_as_property(Tango::DevString value, string property_name);
protected :
// Add your own data members here
//-----------------------------------------
......@@ -722,46 +670,15 @@ protected :
Tango::DeviceProxyHelper* _mProxyToBender3Motor;
Tango::DeviceProxyHelper* _mProxyToBender4Motor;
Tango::DeviceProxyHelper* _mProxyToBender5Motor;
Tango::DeviceProxyHelper* _mProxyToBender6Motor;
Tango::DeviceProxyHelper* _mProxyToBender7Motor;
Tango::DeviceProxyHelper* _mProxyToBender8Motor;
Tango::DeviceProxyHelper* _mProxyToBender9Motor;
Tango::DeviceProxyHelper* _mProxyToBender10Motor;
Tango::DeviceProxyHelper* _mProxyToBender11Motor;
Tango::DeviceProxyHelper* _mProxyToBender12Motor;
Tango::DeviceProxyHelper* _mProxyToBender13Motor;
Tango::DeviceProxyHelper* _mProxyToBender14Motor;
Tango::DeviceProxyHelper* _mProxyToBender15Motor;
Tango::DeviceProxyHelper* _mProxyToBender16Motor;
Tango::DevState _mBender1State;
Tango::DevState _mBender2State;
Tango::DevState _mBender3State;
Tango::DevState _mBender4State;
Tango::DevState _mBender5State;
Tango::DevState _mBender6State;
Tango::DevState _mBender7State;
Tango::DevState _mBender8State;
Tango::DevState _mBender9State;
Tango::DevState _mBender10State;
Tango::DevState _mBender11State;
Tango::DevState _mBender12State;
Tango::DevState _mBender13State;
Tango::DevState _mBender14State;
Tango::DevState _mBender15State;
Tango::DevState _mBender16State;
bool _bOneMotorBender;
bool _bTwoMotorsBender;
bool _bFourMotorsBender;
bool _bDivideByZeroException;
bool _bAllProxiesInitialized;
bool _bAllAttributesRead;
......@@ -780,21 +697,6 @@ protected :
double _dOldBender3;
double _dOldBender4;
double _dOldBender5;
double _dOldBender6;
double _dOldBender7;
double _dOldBender8;
double _dOldBender9;
double _dOldBender10;
double _dOldBender11;
double _dOldBender12;
double _dOldBender13;
double _dOldBender14;
double _dOldBender15;
double _dOldBender16;
bool _bRbenderIsOk;
bool _bRbenderInvIsOk;
};
......
static const char *RcsId = "$Header: /users/chaize/newsvn/cvsroot/Motion/MechanicalGenericBender/src/main.cpp,v 1.4 2007-06-05 12:04:55 stephpsoleil Exp $";
static const char *RcsId = "$Header: /users/chaize/newsvn/cvsroot/Motion/MechanicalGenericBender/src/main.cpp,v 1.5 2007-06-11 13:04:56 stephpsoleil Exp $";
//+=============================================================================
//
// file : main.cpp
......@@ -12,7 +12,7 @@ static const char *RcsId = "$Header: /users/chaize/newsvn/cvsroot/Motion/Mechani
//
// $Author: stephpsoleil $
//
// $Revision: 1.4 $ $
// $Revision: 1.5 $ $
//
// $Log: not supported by cvs2svn $
//
......@@ -69,6 +69,10 @@ int main(int argc,char *argv[])
cout << "Received a CORBA_Exception" << endl;
cout << "Exiting" << endl;
}
catch(...)
{
cout << "Unknow Error catched in main.cpp" << endl;
}
tg->server_cleanup();
return(0);
}
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment