From 137b9086a50f1413faf6eeb3e6fefc718a398d6b Mon Sep 17 00:00:00 2001 From: jean-pierre roux Date: Mon, 15 Mar 2010 14:36:32 +0000 Subject: [PATCH] const char * vs std::string --- .../widgets/figureCuttingCubeModel.cxx | 2 +- .../widgets/figureCuttingCubeModel.h | 3 +-- .../widgets/figureCuttingCylinderModel.cxx | 2 +- .../widgets/figureCuttingCylinderModel.h | 2 +- .../wxWindows/widgets/figureCuttingModel.cxx | 2 +- .../wxWindows/widgets/figureCuttingModel.h | 2 +- .../widgets/figureCuttingSphereModel.cxx | 2 +- .../widgets/figureCuttingSphereModel.h | 2 +- .../wxMaracasRenderImageTransformation.cpp | 6 ++--- .../widgets/wxVtkMPR3DViewCntrlPanel.cxx | 26 +++++++++---------- 10 files changed, 23 insertions(+), 26 deletions(-) diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/figureCuttingCubeModel.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/figureCuttingCubeModel.cxx index cf3696c..288c49a 100644 --- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/figureCuttingCubeModel.cxx +++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/figureCuttingCubeModel.cxx @@ -35,7 +35,7 @@ double figureCuttingCubeModel::GetTheoricVolume() // virtual } //---------------------------------------------------------------------------- -char *figureCuttingCubeModel::GetName() // virtual +const char *figureCuttingCubeModel::GetName() // virtual { return "Cube"; } diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/figureCuttingCubeModel.h b/lib/maracasVisuLib/src/interface/wxWindows/widgets/figureCuttingCubeModel.h index 0811bde..1cee805 100644 --- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/figureCuttingCubeModel.h +++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/figureCuttingCubeModel.h @@ -3,7 +3,6 @@ #include "figureCuttingModel.h" - class figureCuttingCubeModel : public figureCuttingModel { public: @@ -11,7 +10,7 @@ public: virtual ~figureCuttingCubeModel(); virtual bool IfPointInside(double x, double y, double z); virtual double GetTheoricVolume(); - virtual char *GetName(); + virtual const char *GetName(); private: protected: }; diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/figureCuttingCylinderModel.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/figureCuttingCylinderModel.cxx index 036e596..ee67d1b 100644 --- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/figureCuttingCylinderModel.cxx +++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/figureCuttingCylinderModel.cxx @@ -32,7 +32,7 @@ double figureCuttingCylinderModel::GetTheoricVolume() // virtual return piTMP*(_sx/2)*(_sz/2)*_sy; } //---------------------------------------------------------------------------- -char *figureCuttingCylinderModel::GetName() // virtual +const char *figureCuttingCylinderModel::GetName() // virtual { return "Cylinder"; } diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/figureCuttingCylinderModel.h b/lib/maracasVisuLib/src/interface/wxWindows/widgets/figureCuttingCylinderModel.h index d6e9eda..8d9b2f2 100644 --- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/figureCuttingCylinderModel.h +++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/figureCuttingCylinderModel.h @@ -10,7 +10,7 @@ public: virtual ~figureCuttingCylinderModel(); virtual bool IfPointInside(double x, double y, double z); virtual double GetTheoricVolume(); - virtual char *GetName(); + virtual const char *GetName(); private: protected: }; diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/figureCuttingModel.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/figureCuttingModel.cxx index 0d3caa7..314c903 100644 --- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/figureCuttingModel.cxx +++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/figureCuttingModel.cxx @@ -138,7 +138,7 @@ double figureCuttingModel::GetAngleTeta() return _teta; } //---------------------------------------------------------------------------- -char *figureCuttingModel::GetName() // virtual +const char *figureCuttingModel::GetName() // virtual { return "--"; } diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/figureCuttingModel.h b/lib/maracasVisuLib/src/interface/wxWindows/widgets/figureCuttingModel.h index 96cf5a0..6321552 100644 --- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/figureCuttingModel.h +++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/figureCuttingModel.h @@ -32,7 +32,7 @@ public: vtkTransform *GetVtkTransform(); // void SetVtkTransform(vtkTransform *matrix); virtual double GetTheoricVolume(); - virtual char *GetName(); + virtual const char *GetName(); private: double _px; diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/figureCuttingSphereModel.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/figureCuttingSphereModel.cxx index 0dcd603..7626f73 100644 --- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/figureCuttingSphereModel.cxx +++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/figureCuttingSphereModel.cxx @@ -34,7 +34,7 @@ double figureCuttingSphereModel::GetTheoricVolume() // virtual return (4.0/3.0) * piTMP * (_sx/2)*(_sy/2)*(_sz/2); } //---------------------------------------------------------------------------- -char *figureCuttingSphereModel::GetName() // virtual +const char *figureCuttingSphereModel::GetName() // virtual { return "Sphere"; } diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/figureCuttingSphereModel.h b/lib/maracasVisuLib/src/interface/wxWindows/widgets/figureCuttingSphereModel.h index 1a71283..0594701 100644 --- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/figureCuttingSphereModel.h +++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/figureCuttingSphereModel.h @@ -10,7 +10,7 @@ public: virtual ~figureCuttingSphereModel(); virtual bool IfPointInside(double x, double y, double z); virtual double GetTheoricVolume(); - virtual char *GetName(); + virtual const char *GetName(); private: protected: }; diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasRenderImageTransformation.cpp b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasRenderImageTransformation.cpp index 11f1d39..157d997 100644 --- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasRenderImageTransformation.cpp +++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasRenderImageTransformation.cpp @@ -59,9 +59,9 @@ void wxMaracasRenderImageTransformation::Translate(int tx, int ty, int tz, int r transformS2 ->PostMultiply(); transformS3 ->PostMultiply(); - printf("CPR: wxMaracasRenderImageTransformation::Translate-> %d\n", -(ext[1]-ext[0])*volspX ); - printf("CPR: wxMaracasRenderImageTransformation::Translate-> %d\n", -(ext[3]-ext[2])*surfspY); - printf("CPR: wxMaracasRenderImageTransformation::Translate-> %d\n", -(ext[5]-ext[4])*surfspZ); + printf("CPR: wxMaracasRenderImageTransformation::Translate-> %f\n", -(ext[1]-ext[0])*volspX ); + printf("CPR: wxMaracasRenderImageTransformation::Translate-> %f\n", -(ext[3]-ext[2])*surfspY); + printf("CPR: wxMaracasRenderImageTransformation::Translate-> %f\n", -(ext[5]-ext[4])*surfspZ); transformV ->Translate( -(ext[1]-ext[0])*volspX/2, -(ext[3]-ext[2])*volspY/2, -(ext[5]-ext[4])*volspZ/2 ); transformS1->Translate( -(ext[1]-ext[0])*surfspX/2, -(ext[3]-ext[2])*surfspY/2, -(ext[5]-ext[4])*surfspZ/2 ); diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtkMPR3DViewCntrlPanel.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtkMPR3DViewCntrlPanel.cxx index 11fb197..68c7ee1 100644 --- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtkMPR3DViewCntrlPanel.cxx +++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtkMPR3DViewCntrlPanel.cxx @@ -36,8 +36,8 @@ wxVtkMPR3DViewCntrlPanel::wxVtkMPR3DViewCntrlPanel(wxWindow *parent, wxVtkMPR3DV _positionZ = new wxSlider(panel,-1,maxZ/2,0,maxZ, wxDefaultPosition, wxSize(300,40), wxSL_HORIZONTAL | wxSL_LABELS); wxButton *btnColorTable = new wxButton (panel, -1, _T("Color Table") ); - _ckBoxXYZ = new wxCheckBox(panel,-1,_T("XYZ ")); - _ckBoxPlane = new wxCheckBox(panel,-1,_T("Plane")); + _ckBoxXYZ = new wxCheckBox(panel,-1,_T("Show XYZ axis ")); + _ckBoxPlane = new wxCheckBox(panel,-1,_T("Show Planes")); _ckFreePlaneX= new wxCheckBox(panel,-1,_T("free X"));; _ckFreePlaneY= new wxCheckBox(panel,-1,_T("free Y"));; @@ -62,16 +62,16 @@ wxVtkMPR3DViewCntrlPanel::wxVtkMPR3DViewCntrlPanel(wxWindow *parent, wxVtkMPR3DV _positionY->SetSize(400,20); _positionZ->SetSize(400,20); - Connect(ckBoxX->GetId() , wxEVT_COMMAND_CHECKBOX_CLICKED , (wxObjectEventFunction) &wxVtkMPR3DViewCntrlPanel::OnVisibleAxisX ); - Connect(_positionX->GetId() , wxEVT_COMMAND_SLIDER_UPDATED , (wxObjectEventFunction) &wxVtkMPR3DViewCntrlPanel::OnPositionX ); - Connect(ckBoxY->GetId() , wxEVT_COMMAND_CHECKBOX_CLICKED , (wxObjectEventFunction) &wxVtkMPR3DViewCntrlPanel::OnVisibleAxisY ); - Connect(_positionY->GetId() , wxEVT_COMMAND_SLIDER_UPDATED , (wxObjectEventFunction) &wxVtkMPR3DViewCntrlPanel::OnPositionY ); - Connect(ckBoxZ->GetId() , wxEVT_COMMAND_CHECKBOX_CLICKED , (wxObjectEventFunction) &wxVtkMPR3DViewCntrlPanel::OnVisibleAxisZ ); - Connect(_positionZ->GetId() , wxEVT_COMMAND_SLIDER_UPDATED , (wxObjectEventFunction) &wxVtkMPR3DViewCntrlPanel::OnPositionZ ); - Connect(btnColorTable->GetId() , wxEVT_COMMAND_BUTTON_CLICKED , (wxObjectEventFunction) &wxVtkMPR3DViewCntrlPanel::OnEditColorTable ); + Connect(ckBoxX->GetId(), wxEVT_COMMAND_CHECKBOX_CLICKED, (wxObjectEventFunction) &wxVtkMPR3DViewCntrlPanel::OnVisibleAxisX ); + Connect(_positionX->GetId(), wxEVT_COMMAND_SLIDER_UPDATED, (wxObjectEventFunction) &wxVtkMPR3DViewCntrlPanel::OnPositionX ); + Connect(ckBoxY->GetId(), wxEVT_COMMAND_CHECKBOX_CLICKED, (wxObjectEventFunction) &wxVtkMPR3DViewCntrlPanel::OnVisibleAxisY ); + Connect(_positionY->GetId(), wxEVT_COMMAND_SLIDER_UPDATED, (wxObjectEventFunction) &wxVtkMPR3DViewCntrlPanel::OnPositionY ); + Connect(ckBoxZ->GetId(), wxEVT_COMMAND_CHECKBOX_CLICKED, (wxObjectEventFunction) &wxVtkMPR3DViewCntrlPanel::OnVisibleAxisZ ); + Connect(_positionZ->GetId(), wxEVT_COMMAND_SLIDER_UPDATED, (wxObjectEventFunction) &wxVtkMPR3DViewCntrlPanel::OnPositionZ ); + Connect(btnColorTable->GetId(), wxEVT_COMMAND_BUTTON_CLICKED, (wxObjectEventFunction) &wxVtkMPR3DViewCntrlPanel::OnEditColorTable ); - Connect(_ckBoxXYZ->GetId() , wxEVT_COMMAND_CHECKBOX_CLICKED , (wxObjectEventFunction) &wxVtkMPR3DViewCntrlPanel::OnVisibleAxisXYZ ); - Connect(_ckBoxPlane->GetId() , wxEVT_COMMAND_CHECKBOX_CLICKED , (wxObjectEventFunction) &wxVtkMPR3DViewCntrlPanel::OnVisiblePlane ); + Connect(_ckBoxXYZ->GetId(), wxEVT_COMMAND_CHECKBOX_CLICKED, (wxObjectEventFunction) &wxVtkMPR3DViewCntrlPanel::OnVisibleAxisXYZ ); + Connect(_ckBoxPlane->GetId(), wxEVT_COMMAND_CHECKBOX_CLICKED, (wxObjectEventFunction) &wxVtkMPR3DViewCntrlPanel::OnVisiblePlane ); Connect(_ckFreePlaneX->GetId() , wxEVT_COMMAND_CHECKBOX_CLICKED , (wxObjectEventFunction) &wxVtkMPR3DViewCntrlPanel::OnVisibleFreePlaneX ); Connect(_ckFreePlaneY->GetId() , wxEVT_COMMAND_CHECKBOX_CLICKED , (wxObjectEventFunction) &wxVtkMPR3DViewCntrlPanel::OnVisibleFreePlaneY ); @@ -204,8 +204,6 @@ void wxVtkMPR3DViewCntrlPanel::UpdateControlPanel() int maxY = y1-y0;//basedata->GetMaxPositionY(); int maxZ = z1-z0;//basedata->GetMaxPositionZ();*/ - - //std::cout<<"wxVtkMPR3DViewCntrlPanel::UpdateControlPanel() maxX="<