From a3c95f8a4a71a532a46804e8c4f213aa2188d73b Mon Sep 17 00:00:00 2001 From: Eduardo DAVILA Date: Fri, 14 Aug 2015 18:30:55 +0200 Subject: [PATCH 1/1] #2692 bbGEditor Feature New Normal - Name of the package in the box type for BBS files --- .../bbsWxGUIEditorGraphic/InterpreterBBS.cxx | 3 ++- .../bbsWxGUIEditorGraphic/wxVtkSceneManager.cxx | 5 +++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/InterpreterBBS.cxx b/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/InterpreterBBS.cxx index 244c771..e32a02a 100644 --- a/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/InterpreterBBS.cxx +++ b/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/InterpreterBBS.cxx @@ -111,7 +111,8 @@ namespace bbtk { _yGeneral = _yGeneral - 30; std::string packagename = _factory->GetPackageNameOfaBlackBox(boxType); - int idBox = _sceneManager->createGBlackBox( 0,0, packagename ,boxType); + std::string boxType2 = _factory->GetTypeNameOfaBlackBox(boxType); + int idBox = _sceneManager->createGBlackBox( 0,0, packagename ,boxType2); _countBoxes++; double px = _xGeneral + (_countBoxes%2)*100; double py = _yGeneral; diff --git a/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/wxVtkSceneManager.cxx b/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/wxVtkSceneManager.cxx index f29a4e8..d334129 100644 --- a/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/wxVtkSceneManager.cxx +++ b/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/wxVtkSceneManager.cxx @@ -1437,9 +1437,10 @@ std::string wxVtkSceneManager::getDiagramBBS(bool wln) { script += LineNumber(wln, lnNmbr); script += "new "; int id = boxes[i]; - GObjectController *control = _controllers[id]; - GBlackBoxModel *model = (GBlackBoxModel*) control->getModel(); + GObjectController *control = _controllers[id]; + GBlackBoxModel *model = (GBlackBoxModel*) control->getModel(); + script += model->getBBTKPackage()+":"; script += model->getBBTKType(); script += " "; script += model->getBBTKName(); -- 2.46.2