From 066e10b43998a3b236a60549f99794255871fce9 Mon Sep 17 00:00:00 2001
From: corredor <>
Date: Wed, 12 May 2010 08:17:07 +0000
Subject: [PATCH] Changed from GConnectorView to vtkGConnectorView ... The
 historique will be lost, but it is necessary to make the change. The actual
 version works as the one presented in the second project exposition

---
 .../bbsKernelEditorGraphic/wxVtkSceneManager.cxx   |  2 +-
 .../{GConnectorView.cxx => vtkGConnectorView.cxx}  | 14 +++++++-------
 .../{GConnectorView.h => vtkGConnectorView.h}      | 14 +++++++-------
 3 files changed, 15 insertions(+), 15 deletions(-)
 rename lib/EditorGraphicBBS/bbsVtkGUIEditorGraphic/{GConnectorView.cxx => vtkGConnectorView.cxx} (86%)
 rename lib/EditorGraphicBBS/bbsVtkGUIEditorGraphic/{GConnectorView.h => vtkGConnectorView.h} (88%)

diff --git a/lib/EditorGraphicBBS/bbsKernelEditorGraphic/wxVtkSceneManager.cxx b/lib/EditorGraphicBBS/bbsKernelEditorGraphic/wxVtkSceneManager.cxx
index 3678d64..9fd1e7c 100644
--- 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 574de5b..f9b17a0 100644
--- 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 b5d4dc8..7f4cc18 100644
--- 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);
-- 
2.45.1