#2692 bbGEditor Feature New Normal - Name of the package in the box type for BBS...

diff --git a/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/InterpreterBBS.cxx b/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/InterpreterBBS.cxx
index 244c771ac8ebd7b772c8975d17e8a91a80501337..e32a02aae21b1eac2eeaf376b78d95d1bc679660 100644 (file)
--- 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 f29a4e8f3cd33b1a4ec76cd6f8058ca05634b88d..d334129e967a9914b7ba8011441538ad2a30d7bf 100644 (file)
--- 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();