From: corredor <>
Date: Wed, 12 May 2010 08:10:36 +0000 (+0000)
Subject: Chango from GConnectorView to vtkGConnectorView ... The historique will be lost,... 
X-Git-Tag: v1_0_0~73
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=10186ea739d6c453d607c7a13c45c43167b39cb5;p=bbtkGEditor.git

Chango 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
---

diff --git a/lib/EditorGraphicBBS/bbsKernelEditorGraphic/wxVtkSceneManager.cxx b/lib/EditorGraphicBBS/bbsKernelEditorGraphic/wxVtkSceneManager.cxx
index c32ed02..3678d64 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();
-		GConnectorView* connectorView = new GConnectorView();
+		vtkvtkGConnectorView* connectorView = new vtkGConnectorView();
 		connectorModel->setGObjectType(type);
 
 		manContourModel->SetCloseContour(false);
@@ -483,7 +483,7 @@ namespace bbtk
 				GObjectController *desc = it->second;
 				if(desc->getGObjectType()==GCONNECTOR)
 				{
-					GConnectorView* vconn = (GConnectorView*)desc->getView();
+					vtkGConnectorView* vconn = (vtkGConnectorView*)desc->getView();
 					vconn->updateStartEndPoints();
 				}
 			}
@@ -1115,7 +1115,7 @@ namespace bbtk
 				}
 							
 				//----------
-				getline(inputStream,line);//PORT o #FIN_BOX
+				getline(inputStream,line);//PORT o FIN_BOX
 				std::string port=line.substr(0,4);
 				while(port=="PORT")
 				{
@@ -1188,7 +1188,7 @@ namespace bbtk
 				GConnectorController *tempp = (GConnectorController*)_controllers[idCon]; 
 
 				GConnectorModel *conMod = (GConnectorModel*)tempp->getModel();
-				GConnectorView *conView = (GConnectorView*)tempp->getView();
+				vtkGConnectorView *conView = (vtkGConnectorView*)tempp->getView();
 				tempp->endContourCreation();
 				conMod->setEndPort(endP);					
 				conView->updateStartEndPoints();
diff --git a/lib/EditorGraphicBBS/bbsKernelEditorGraphic/wxVtkSceneManager.h b/lib/EditorGraphicBBS/bbsKernelEditorGraphic/wxVtkSceneManager.h
index 5fb1a86..36a2168 100644
--- a/lib/EditorGraphicBBS/bbsKernelEditorGraphic/wxVtkSceneManager.h
+++ b/lib/EditorGraphicBBS/bbsKernelEditorGraphic/wxVtkSceneManager.h
@@ -47,7 +47,7 @@ Version:   $Revision$
 #include "GObjectsMVCFactory.h"
 #include "Observer.h"
 #include "GPortModel.h"
-#include "GConnectorView.h"
+#include "vtkGConnectorView.h"
 #include "GConnectorModel.h"
 #include "GConnectorController.h"
 #include "vtkGPortView.h"