const char * vs std::string

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/figureCuttingCubeModel.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/figureCuttingCubeModel.cxx
index cf3696c8bf70e2e1944a581dc13c13b4ba7891ae..288c49a15d7ce04c4b8ea1ea34b75811ed668ccc 100644 (file)
--- 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 0811bdedb288a57d548a51e8a94decbadcc56035..1cee8052e69b7c625ed0c986f920ed19ad3361b0 100644 (file)
--- 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 036e59653e62a192b7bd9791a43c33603362ad29..ee67d1b000106366865422a93e918f992d63c27f 100644 (file)
--- 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 d6e9edac70301c4ea1f4755a851d5156387720b1..8d9b2f2d01a06d800af1386f744cc7af66829cd8 100644 (file)
--- 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 0d3caa7a9693e176af65a352ffb365c35c294d63..314c9035bbd80e06a9517e95ea4b77dff49ef0e6 100644 (file)
--- 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 96cf5a07f4dadb9c82b450fd90761bdd27d1bb45..63215526e28472c42bde5e53501c73ac5296b8b5 100644 (file)
--- 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 0dcd603a975d892ada7ee786589e79aea3d14320..7626f73f88afbd8dc74e50882e7b5b017e802779 100644 (file)
--- 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 1a7128331c92af2075060d06b5e650b770bf1891..0594701d57abaf13b5570db95e6ef98a73e2dd33 100644 (file)
--- 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 11f1d3985dcb96a7f2478143e3da67fc12af10b4..157d9970660c307c95404b28820618ed500653d2 100644 (file)
--- 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 11fb1977d857f61982ccb0ce426d7fa9fd0fbb9a..68c7ee1b444a22f3bf7a5c7260d8de5654977cee 100644 (file)
--- 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="<<maxX<<" maxY="<<maxY<<" maxZ="<<maxZ<<std::endl;
                /*_positionX->SetRange(0,maxX);
                _positionY->SetRange(0,maxY);
@@ -560,4 +558,4 @@ void wxVtkMPR3DViewCntrlPanel::SetVisiblePlane(bool value)
 {
        _ckBoxPlane->SetValue(value);
        _wxvtkmpr3Dview->VisiblePlaneWidget(value);
-}
\ No newline at end of file
+}