X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=sidebyside;f=lib%2FEditorGraphicBBS%2FbbsWxGUIEditorGraphic%2FwxVtkSceneManager.cxx;h=cf08b262520bf5eab10e9d8293b4422794f0d762;hb=ec7fc3bf3cc44da7cb9f9b840391c2f44c52a875;hp=3cb95f86f21e22778fb95e3f97f47a42029d7e57;hpb=ac275a79f43b892b4b5182f91b980ada0c8f4926;p=bbtkGEditor.git

diff --git a/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/wxVtkSceneManager.cxx b/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/wxVtkSceneManager.cxx
index 3cb95f8..cf08b26 100644
--- a/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/wxVtkSceneManager.cxx
+++ b/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/wxVtkSceneManager.cxx
@@ -830,17 +830,17 @@ printf("EED  wxVtkSceneManager::createGComplexBoxOutputPort 900-450\n");
 			} // isOverPort
 
 		} else {  //_worldState
-			
+
 			_worldState				= DRAG_OBJECTS;
 			_startDragging			= true;
-			
+
 			int shiftkey            = _vtkInteractorStyleBaseView->GetInteractor()->GetShiftKey();
 			int ctrlkey             = _vtkInteractorStyleBaseView->GetInteractor()->GetControlKey();
 			ctrlkey = ctrlkey + shiftkey;
-			
+
 			GObjectController *cont = GetGBlackBoxControlerPointedByMouse();
 
-			
+
 			if (GetGBlackBoxControlerPointedByMouse()!=NULL)
 			{
 				int state=cont->getView()->getState() ;
@@ -859,7 +859,7 @@ printf("EED  wxVtkSceneManager::createGComplexBoxOutputPort 900-450\n");
 
 		} // if _selectedObjects.size
 
-		
+
 		return true;
 	}
 
@@ -889,12 +889,12 @@ printf("EED  wxVtkSceneManager::createGComplexBoxOutputPort 900-450\n");
 		{
 			_worldState=NOTHING_HAPPENS;
 			//int lastId = _controllers.size()-1;
-			
+
 			GConnectorController *connector = (GConnectorController*)_controllers[_idConnectionInCreation];
 			connector->removeFromScene();
 			unregisterController(connector);
 			_controllers.erase(_idConnectionInCreation);
-			
+
 			std::map<int, GObjectController*>::iterator it;
 			for(it = _controllers.begin(); it != _controllers.end(); ++it)
 			{
@@ -903,10 +903,10 @@ printf("EED  wxVtkSceneManager::createGComplexBoxOutputPort 900-450\n");
 				desc->getView()->setState(NOTHING_HAPPENS);
 				desc->getModel()->notifyObservers(_idManager);
 			} // for
-		}// if		
+		}// if
 	}
-	
-	
+
+
 	//=========================================================================
 
 	bool wxVtkSceneManager::OnRightButtonUp()
@@ -1339,7 +1339,7 @@ printf("EED  wxVtkSceneManager::createGComplexBoxOutputPort 900-450\n");
 
 	//=========================================================================
 
-	std::string wxVtkSceneManager::saveComplexBoxBBS(std::string cbName,std::string cbAuthor,std::string cbCategory,std::string cbDescription)
+	std::string wxVtkSceneManager::saveComplexBoxBBS(std::string cbName,std::string paName,std::string cbAuthor,std::string cbCategory,std::string cbDescription)
 	{
 
 		std::vector<std::string> packages;
@@ -1400,7 +1400,7 @@ printf("EED  wxVtkSceneManager::createGComplexBoxOutputPort 900-450\n");
 
 		// Definition of a complex box
 		script+="define ";
-		script+=cbName;
+		script+=cbName+" "+paName;
 		script+="\n";
 		script+="\n";
 
@@ -1937,29 +1937,29 @@ printf("EED  wxVtkSceneManager::createGComplexBoxOutputPort 900-450\n");
 				std::string nameEndPort(result);
 
 				int idCon = configGConnetion(nameStartBox, nameStartPort, nameEndBox, nameEndPort);
-				
+
 				if (version!="1.0")
 				{
-					//Readding control points of the manualContour 
+					//Readding control points of the manualContour
 					//ups1
-					GConnectorController	*tempp	= (GConnectorController*)_controllers[idCon];				
+					GConnectorController	*tempp	= (GConnectorController*)_controllers[idCon];
 					GConnectorModel			*conMod	= (GConnectorModel*)tempp->getModel();
 					vtkGConnectorView		*conView= (vtkGConnectorView*)tempp->getView();
 					getline(inputStream,line); //NumberOfControlPoints:##
 					strcpy( conns, line.c_str() );
 					result = strtok( conns, delims );
 					result = strtok( NULL, delims );
-				
+
 					int numberOfControlPoints;
 					std::istringstream isCons(result);
 					isCons >> numberOfControlPoints;
-				
+
 					for (int ii=0;ii<numberOfControlPoints;ii++)
 					{
 						getline(inputStream,line); //XX:YY:ZZ
 						char connec[200];
 						strcpy( connec, line.c_str() );
-					
+
 						double px,py,pz;
 						result = strtok( connec, delims );
 						std::istringstream isPointX(result);
@@ -1970,16 +1970,16 @@ printf("EED  wxVtkSceneManager::createGComplexBoxOutputPort 900-450\n");
 						result = strtok( NULL, delims );
 						std::istringstream isPointZ(result);
 						isPointZ >> pz;
-					
+
 						conMod->getManualContourModel()->InsertPoint_id(ii+1,px,py,pz);
 						conView->getManualContourView()->AddPoint();
 					}
 				}// version !=1.0
-				
+
 			} // for numConns
 
         } // start
-		
+
 		refresh();
 	}
 	//=========================================================================
@@ -2426,7 +2426,34 @@ printf("EED  wxVtkSceneManager::createGComplexBoxOutputPort 900-450\n");
 
 	}
 
+
 	//=========================================================================
+    void wxVtkSceneManager::SetComplexBoxName(std::string cbName)
+    {
+        _complexBoxName=cbName;
+    }
+
+	//=========================================================================
+    std::string wxVtkSceneManager::GetComplexBoxName()
+    {
+        return _complexBoxName;
+    }
+
+
+	//=========================================================================
+    void wxVtkSceneManager::SetPackageName(std::string paName)
+    {
+        _packageName=paName;
+    }
+
+	//=========================================================================
+    std::string wxVtkSceneManager::GetPackageName()
+    {
+        return _packageName;
+    }
+
+	//=========================================================================
+
 
 }  // EO namespace bbtk