X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FEditorGraphicBBS%2FbbsWxGUIEditorGraphic%2FwxVtkSceneManager.cxx;h=543f88a7e294196bfc96232d400a19e761475068;hb=0dfaa8eefbfad1092161af92ba548f1172ed6652;hp=ab0ef4e76d5a65f6e69cae0748be3c4bcef30c99;hpb=f4dd416d1d3a91b9d684f55a14d78c6b54f2725a;p=bbtkGEditor.git diff --git a/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/wxVtkSceneManager.cxx b/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/wxVtkSceneManager.cxx index ab0ef4e..543f88a 100644 --- a/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/wxVtkSceneManager.cxx +++ b/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/wxVtkSceneManager.cxx @@ -35,11 +35,14 @@ #include "wxVtkSceneManager.h" + #include #include + namespace bbtk { +cvs //========================================================================= wxVtkSceneManager::wxVtkSceneManager(wxGEditorTabPanel *parent, wxVtk3DBaseView *baseView, int idManager) { @@ -59,11 +62,13 @@ wxVtkSceneManager::wxVtkSceneManager(wxGEditorTabPanel *parent, if (_baseView != NULL) { //EED02JUIN2010 printf( - "RaC-EED 21-06-2010 %p wxVtkSceneManager::wxVtkSceneManager If you comment this line, the drag and drop functionnality is not initialized.\n", - this); -#ifdef __APPLE__ + "RaC-EED 21-06-2010 %p wxVtkSceneManager::wxVtkSceneManager If you comment this line, the drag and drop functionnality is not initialized.\n", this); + + #ifdef __APPLE__ + _baseView->GetWxVTKRenderWindowInteractor()->SetDropTarget((wxDropTarget*)parent); -#endif + + #endif configureBaseView(); _worldState = NOTHING_HAPPENS; @@ -530,7 +535,17 @@ int wxVtkSceneManager::createGConnector(GPortModel* startPort) { manContourView->SetColorNormalContour(0, 0, 1); manContourView->SetColorEditContour(0.5, 0.5, 0.5); manContourView->SetColorSelectContour(1, 0.8, 0); - manContourView->SetWidthLine(1); + + + /** + * JGRR AND CM + * Width increased from 2 to 5, it simplifies line handling and spline control :P + * @param WidthLine + */ + + manContourView->SetWidthLine( 5 ) ; + + manContourView->SetShowText(false); manContourControl->SetModelView(manContourModel, manContourView); @@ -1946,7 +1961,6 @@ void wxVtkSceneManager::loadDiagram(stringstream &inputStream) { std::string value(result); bbmod->setValueToInput(name, value); - getline(inputStream, line);//PORT o FIN_BOX port = line.substr(0, 4); } // while @@ -2556,6 +2570,7 @@ void wxVtkSceneManager::SetCbPackageName(std::string packagename) { } } + //========================================================================= std::string wxVtkSceneManager::GetCbPackageName() { return _cbPackageName; @@ -2595,6 +2610,7 @@ void wxVtkSceneManager::SetDescription(std::string description) { } } + //========================================================================= std::string wxVtkSceneManager::GetDescription() { return _Description; @@ -2605,5 +2621,4 @@ std::string wxVtkSceneManager::GetDescription() { } // EO namespace bbtk -// EOF - +// EOF