Changed from GConnectorView to vtkGConnectorView ... The historique will be lost...

diff --git a/lib/EditorGraphicBBS/bbsKernelEditorGraphic/wxVtkSceneManager.cxx b/lib/EditorGraphicBBS/bbsKernelEditorGraphic/wxVtkSceneManager.cxx
index 3678d64f5b6e1b26891b48a13563adc4f61d42ef..9fd1e7cdda6f1239a074209b360f666b7acd476b 100644 (file)
--- a/lib/EditorGraphicBBS/bbsKernelEditorGraphic/wxVtkSceneManager.cxx
+++ b/lib/EditorGraphicBBS/bbsKernelEditorGraphic/wxVtkSceneManager.cxx
@@ -263,7 +263,7 @@ namespace bbtk
 
                GConnectorController* connectorcontroller = new GConnectorController();                         
                GConnectorModel* connectorModel = new GConnectorModel();
-               vtkvtkGConnectorView* connectorView = new vtkGConnectorView();
+               vtkGConnectorView* connectorView = new vtkGConnectorView();
                connectorModel->setGObjectType(type);
 
                manContourModel->SetCloseContour(false);

diff --git a/lib/EditorGraphicBBS/bbsVtkGUIEditorGraphic/GConnectorView.cxx b/lib/EditorGraphicBBS/bbsVtkGUIEditorGraphic/vtkGConnectorView.cxx
similarity index 86%
rename from lib/EditorGraphicBBS/bbsVtkGUIEditorGraphic/GConnectorView.cxx
rename to lib/EditorGraphicBBS/bbsVtkGUIEditorGraphic/vtkGConnectorView.cxx
index 574de5b2cc303a0f7402b5130f760db259a4b44d..f9b17a014d08a794bddccd52b366671e5e641a22 100644 (file)
--- a/lib/EditorGraphicBBS/bbsVtkGUIEditorGraphic/GConnectorView.cxx
+++ b/lib/EditorGraphicBBS/bbsVtkGUIEditorGraphic/vtkGConnectorView.cxx
@@ -30,11 +30,11 @@ Version:   $Revision$
 
 /**
 *  \file 
-*  \brief Class bbtk::GConnectorView 
+*  \brief Class bbtk::vtkGConnectorView 
 */
 
 
-#include "GConnectorView.h"
+#include "vtkGConnectorView.h"
 
 namespace bbtk
 {
@@ -42,33 +42,33 @@ namespace bbtk
 
        //=========================================================================
        
-       GConnectorView::GConnectorView()
+       vtkGConnectorView::vtkGConnectorView()
        {               
        }
 
        //=========================================================================
        
-       GConnectorView::~GConnectorView()
+       vtkGConnectorView::~vtkGConnectorView()
        {
        }
        
        //=========================================================================
        
-       void GConnectorView::setManualContourView(manualViewContour *viewContour)
+       void vtkGConnectorView::setManualContourView(manualViewContour *viewContour)
        {
                manViewContour = viewContour;
        }
 
        //=========================================================================
        
-       manualViewContour* GConnectorView::getManualContourView()
+       manualViewContour* vtkGConnectorView::getManualContourView()
        {
                return manViewContour;
        }
 
        //=========================================================================
        
-       void GConnectorView::updateStartEndPoints()
+       void vtkGConnectorView::updateStartEndPoints()
        {
                GConnectorModel* mod=(GConnectorModel*)_model;
                mod->updateStartEndPoints();

diff --git a/lib/EditorGraphicBBS/bbsVtkGUIEditorGraphic/GConnectorView.h b/lib/EditorGraphicBBS/bbsVtkGUIEditorGraphic/vtkGConnectorView.h
similarity index 88%
rename from lib/EditorGraphicBBS/bbsVtkGUIEditorGraphic/GConnectorView.h
rename to lib/EditorGraphicBBS/bbsVtkGUIEditorGraphic/vtkGConnectorView.h
index b5d4dc851259c247de89f9e3158c5fce0fe03ee4..7f4cc1888784e1948fb7e65f19399489aba1fefd 100644 (file)
--- a/lib/EditorGraphicBBS/bbsVtkGUIEditorGraphic/GConnectorView.h
+++ b/lib/EditorGraphicBBS/bbsVtkGUIEditorGraphic/vtkGConnectorView.h
@@ -32,16 +32,16 @@ Version:   $Revision$
 
 /**
 *  \file 
-*  \brief Class bbtk::GConnectorView : abstract black-box interface. 
+*  \brief Class bbtk::vtkGConnectorView : abstract black-box interface. 
 */
 
 /**
-* \class bbtk::GConnectorView
+* \class bbtk::vtkGConnectorView
 * \brief 
 */
 
-#ifndef __GConnectorView_h__
-#define __GConnectorView_h__
+#ifndef __vtkGConnectorView_h__
+#define __vtkGConnectorView_h__
 
 //Includes same project
 #include "vtkGObjectView.h"
@@ -57,14 +57,14 @@ Version:   $Revision$
 namespace bbtk
 {
 
-       class GConnectorView : public vtkGObjectView
+       class vtkGConnectorView : public vtkGObjectView
        {
 
        public: 
 
                //Constructors
-               GConnectorView();
-               ~GConnectorView();
+               vtkGConnectorView();
+               ~vtkGConnectorView();
                
                //Public methods
                void setManualContourView(manualViewContour* viewContour);