#3084 bbGEditor Bug New Normal - Color refresh for inputs and outputs

[bbtkGEditor.git] / lib / EditorGraphicBBS / bbsWxGUIEditorGraphic / bbtkwxGUIEditorGraphicBBS.cxx

diff --git a/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/bbtkwxGUIEditorGraphicBBS.cxx b/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/bbtkwxGUIEditorGraphicBBS.cxx
index 93596627446f3930b78bfa3236751bb5df35d858..8d57977bdddad8338abfda8f21e5a1c845e0ad81 100644 (file)
--- a/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/bbtkwxGUIEditorGraphicBBS.cxx
+++ b/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/bbtkwxGUIEditorGraphicBBS.cxx
@@ -111,18 +111,14 @@ wxGUIEditorGraphicBBS::wxGUIEditorGraphicBBS(wxFrame *parent)
 }
 
 //=========================================================================
-wxGUIEditorGraphicBBS::~wxGUIEditorGraphicBBS() {
-
-       printf("EED %p ~wxGUIEditorGraphicBBS()\n", this);
-
+wxGUIEditorGraphicBBS::~wxGUIEditorGraphicBBS() 
+{
        //EED02JUIN2010         delete _tabsMgr;
-
        _frameAUIMgr->UnInit();
        // FCY memory leaks
        delete _frameAUIMgr;
        delete _notebook;
        delete _tabsMgr;
-
 }
 
 //=========================================================================
@@ -141,6 +137,7 @@ void wxGUIEditorGraphicBBS::initToolbar() {
        wxBitmap bmp_undo(undo_xpm);
        wxBitmap bmp_redo(redo_xpm);
        wxBitmap bmp_editProperties(editProperties_xpm);
+       wxBitmap bmp_showTree(showTree_xpm);
        wxToolBar *toolbar = new wxToolBar(this, wxID_ANY);
 
        //Adds a tool btn to the toolbar
@@ -192,6 +189,8 @@ void wxGUIEditorGraphicBBS::initToolbar() {
        toolbar->AddSeparator();
        toolbar->AddTool(ID_EDITPROPERTIES, _T("Edit diagram properties"),bmp_editProperties, wxNullBitmap, wxITEM_NORMAL,      _T("Edit diagram properties"), _T("Edit diagram properties"));
        toolbar->EnableTool(ID_EDITPROPERTIES, false);
+
+       toolbar->AddTool(ID_SHOWTREE, _T("Show tree"),bmp_showTree, wxNullBitmap, wxITEM_NORMAL,        _T("Show tree"), _T("Show tree"));
        
        toolbar->EnableTool(ID_UNDO, false);
        toolbar->EnableTool(ID_REDO, false);
@@ -238,6 +237,7 @@ void wxGUIEditorGraphicBBS::initToolbar() {
        Connect(ID_REDO,wxEVT_COMMAND_TOOL_CLICKED,     wxCommandEventHandler(wxGUIEditorGraphicBBS::OnRedo));
        Connect(ID_CHANGENAME, wxEVT_COMMAND_RIGHT_CLICK, wxCommandEventHandler(wxGUIEditorGraphicBBS::OnChangeName));
        Connect(ID_EDITPROPERTIES,wxEVT_COMMAND_TOOL_CLICKED, wxCommandEventHandler(wxGUIEditorGraphicBBS::OnEditDiagramProperties));
+       Connect(ID_SHOWTREE,wxEVT_COMMAND_TOOL_CLICKED, wxCommandEventHandler(wxGUIEditorGraphicBBS::OnShowTree));
 
 }
 //=========================================================================
@@ -453,18 +453,50 @@ void wxGUIEditorGraphicBBS::displayBlackBoxInfo(std::string packageName, std::st
 {
        if (_actualPkgBrowserPkgName != packageName || _actualPkgBrowserBoxName != boxName) 
        {
+
                _actualPkgBrowserPkgName = packageName;
                _actualPkgBrowserBoxName = boxName;
 
 //EED 15 oct 2012              BlackBoxDescriptor::Pointer descriptor = GObjectsMVCFactory::getInstance()->getBlackBoxDescriptor(packageName, boxName);
                
                Package::Pointer k;
+//EED          ComplexBlackBoxDescriptor::Pointer descriptor;
+               BlackBoxDescriptor::Pointer descriptor;
+
+               std::map< std::string, BlackBoxDescriptor::Pointer> mapDesc;
+               k                       = _pkgBrowser->GetFactory()->GetPackage(_actualPkgBrowserPkgName);
+               mapDesc         = k->GetDescriptorMap();                
+               descriptor      = mapDesc[_actualPkgBrowserBoxName];
+/*
+               tree.treeTour(0);               
+
+               tree.deleteTree();
+
+               descriptor->GetBoxesInside(tree, 0);
+
+               //tree.treeTour(0);
+               //std::vector<std::string> boxesDiagram = _sceneM->boxesDiagram;
+               //for(int i=0;i<boxesDiagram.size();i++){
+               //      std::cout<<"caja: "<<boxesDiagram[i]<<std::endl;
+               //}             
+               
+               _actualPkgBrowserPkgName = "";
+               _actualPkgBrowserBoxName = "";
+*/
+               /*
+               Package::Pointer k;
                BlackBoxDescriptor::Pointer descriptor;
                std::map< std::string, BlackBoxDescriptor::Pointer> mapDesc;
                k                       = _pkgBrowser->GetFactory()->GetPackage(packageName);
+               std::vector<std::string> temp;
+               _pkgBrowser->GetFactory()->GetPackagesList(temp);
+               for(int ii = 0 ; ii < temp.size() ; ii++)
+               {
+                               std::cout << " packs "<< temp[ii]<< std::endl;
+               }
                mapDesc         = k->GetDescriptorMap();                
                descriptor      = mapDesc[boxName];
-               
+               */
                _pkgBrowser->WxGUIBlackBoxListUserOnSelected(descriptor.get());
        }
 }
@@ -590,13 +622,42 @@ void wxGUIEditorGraphicBBS::OnRedo(wxCommandEvent& event) {
 
 void wxGUIEditorGraphicBBS::OnChangeName(wxCommandEvent& event){
 }
+//=========================================================================
+
+void wxGUIEditorGraphicBBS::OnShowTree(wxCommandEvent& event){
+               std::cout <<  "wxGUIEditorGraphicBBS::OnShowTree"<<std::endl;
+if (_actualPkgBrowserPkgName !="" || _actualPkgBrowserBoxName != "") 
+       {
+               Package::Pointer k;
+//EED          ComplexBlackBoxDescriptor::Pointer descriptor;
+               BlackBoxDescriptor::Pointer descriptor;
+
+               std::map< std::string, BlackBoxDescriptor::Pointer> mapDesc;
+               k                       = _pkgBrowser->GetFactory()->GetPackage(_actualPkgBrowserPkgName);
+               mapDesc         = k->GetDescriptorMap();                
+               descriptor      = mapDesc[_actualPkgBrowserBoxName];
+
+               tree.treeTour(0);               
+
+               tree.deleteTree();
+
+               descriptor->GetBoxesInside(tree, 0);
+               
+               _actualPkgBrowserPkgName = "";
+               _actualPkgBrowserBoxName = "";
+       }
+else
+       {
+               std::cout<<"Select a Box"<<std::endl;
+       }
+}
 
 //=========================================================================
 
 void wxGUIEditorGraphicBBS::OnEditDiagramProperties(wxCommandEvent& event)
 {
        wxDiagramPropertiesEditionDialog* dialog =
-                               new wxDiagramPropertiesEditionDialog(this);
+                               new wxDiagramPropertiesEditionDialog(this, tree);
        dialog->Show();
 }
 
@@ -952,12 +1013,14 @@ void wxGUIEditorGraphicBBS::OnExportConsoleExecCommand(wxCommandEvent& event)
 
 //=========================================================================
 
-void wxGUIEditorGraphicBBS::refreshGUIControls() {
+void wxGUIEditorGraphicBBS::refreshGUIControls() 
+{
        std::string stundo;
        std::string stredo;
        //RaC2012 2ndHackFest Next line seems weird ... To keep in mind for other devels
        wxToolBar* toolbar = GetToolBar();
-       if (_tabsMgr->isActualDiagramComplexBox()) {
+       if (_tabsMgr->isActualDiagramComplexBox()) 
+       {
                toolbar->ToggleTool(ID_BTNCOMPLEXBOX, true);
                //toolbar->EnableTool(ID_ADDCOMPLEXBOXINPUT, true); RaC2012 2nd HackFest
                toolbar->EnableTool(ID_ADDCOMPLEXBOXOUTPUT, true);
@@ -1025,6 +1088,7 @@ void wxGUIEditorGraphicBBS::OpenDiagram(std::string filePathName, std::string fi
        }
        _tabsMgr->addNewTab( crea::std2wx(fileName) );
        _tabsMgr->loadDiagram(inputStream, filePathName);
+
        _tabsMgr->saveTempActualDiagram("load diagram");
        GetToolBar()->EnableTool(ID_UNDO, false);
        GetToolBar()->EnableTool(ID_UNDO, false);
@@ -1048,6 +1112,7 @@ void wxGUIEditorGraphicBBS::OnOpenDiagram(wxCommandEvent& event)
 //=========================================================================
 void wxGUIEditorGraphicBBS::OnClickBtnBox(wxCommandEvent& event) 
 {
+       std::cout<<"wxGUIEditorGraphicBBS::OnClickBtnBox"<<std::endl;
        BlackBoxDescriptor *bbDes = _pkgBrowser->GetActualSelected();
        if (bbDes != NULL) {
                std::string typeName = bbDes->GetTypeName();
@@ -1084,6 +1149,7 @@ void wxGUIEditorGraphicBBS::OnClickBtnExecutableBox(wxCommandEvent& event)
 //=========================================================================
 void wxGUIEditorGraphicBBS::OnClickBtnComplexBox(wxCommandEvent& event) 
 {
+       std::cout<<"wxGUIEditorGraphicBBS::OnClickBtnComplexBox"<<std::endl;
        wxToolBar* toolbar = GetToolBar();
        bool temp = toolbar->GetToolState(ID_BTNCOMPLEXBOX);
        if (temp) {
@@ -1094,18 +1160,28 @@ void wxGUIEditorGraphicBBS::OnClickBtnComplexBox(wxCommandEvent& event)
 }
 
 //=========================================================================
-
+//EED01
 void wxGUIEditorGraphicBBS::OnAddComplexBoxInput(wxCommandEvent& event) 
 {
        wxTextEntryDialog *nameDialog = new wxTextEntryDialog(this,
                        wxT("Name of input port"));
-       if (nameDialog->ShowModal() == wxID_OK) {
+       if (nameDialog->ShowModal() == wxID_OK) 
+        {
                wxString fileName = nameDialog->GetValue();
-               if (!fileName.IsEmpty()) {
+               if (!fileName.IsEmpty()) 
+                {
                        std::string portName = (const char*) (fileName.mb_str());
-                       _tabsMgr->addActualDiagramComplexInputPort(portName);
-               }
-       }
+                       if ( !boxNameExists(portName) )
+                       {
+                          _tabsMgr->addActualDiagramComplexInputPort(portName);
+                       } else {
+                          wxMessageDialog *dial = new wxMessageDialog(NULL,
+                                      wxT("Impossible to create Box. The name already exists. Please provide another name"),
+                                      wxT("Change name: name already exists"), wxOK | wxICON_EXCLAMATION | wxSTAY_ON_TOP);
+                          dial->ShowModal();
+                       }
+               } // if !fileName
+       } // if namaDialog
 }
 
 //=========================================================================
@@ -1113,13 +1189,24 @@ void wxGUIEditorGraphicBBS::OnAddComplexBoxOutput(wxCommandEvent& event)
 {
        wxTextEntryDialog *nameDialog = new wxTextEntryDialog(this,
                        wxT("Name of output port"));
-       if (nameDialog->ShowModal() == wxID_OK) {
+       if (nameDialog->ShowModal() == wxID_OK) 
+        {
                wxString fileName = nameDialog->GetValue();
-               if (!fileName.IsEmpty()) {
+               if (!fileName.IsEmpty()) 
+                {
                        std::string portName = (const char*) (fileName.mb_str());
+                       if ( !boxNameExists(portName) )
+                       {
                        _tabsMgr->addActualDiagramComplexOutputPort(portName);
-               }
-       }
+                       } else {
+                          wxMessageDialog *dial = new wxMessageDialog(NULL,
+                                      wxT("Impossible to create Box. The name already exists. Please provide another name"),
+                                      wxT("Change name: name already exists"), wxOK | wxICON_EXCLAMATION | wxSTAY_ON_TOP);
+                          dial->ShowModal();
+                       }
+
+               } // if !filename
+       } // namaDialog
 }
 
 //=========================================================================
@@ -1314,6 +1401,16 @@ void wxGUIEditorGraphicBBS::setCurrentDiagramCategory(std::string category)
        _tabsMgr->SetCategory(category);
 }
 
+//=========================================================================
+void wxGUIEditorGraphicBBS::setCurrentDiagramMessageKind(std::string kind){
+       _tabsMgr->SetMessageKind(kind); 
+}
+
+//=========================================================================
+void wxGUIEditorGraphicBBS::setCurrentDiagramMessageLevel(std::string level){
+       _tabsMgr->SetMessageLevel(level);       
+}
+
 //=========================================================================
 std::string wxGUIEditorGraphicBBS::getCurrentDiagramDescription()
 {
@@ -1332,7 +1429,16 @@ std::string wxGUIEditorGraphicBBS::getCurrentDiagramCategory()
        return _tabsMgr->GetCategory();
 }
 
-       
+//=========================================================================
+std::string wxGUIEditorGraphicBBS::getCurrentDiagramMessageKind(){
+       return _tabsMgr->GetMessageKind();
+}
+
+//=========================================================================
+std::string wxGUIEditorGraphicBBS::getCurrentDiagramMessageLevel(){
+       return _tabsMgr->GetMessageLevel();
+}
+
 //=========================================================================
 bool wxGUIEditorGraphicBBS::isCurrentDiagramComplexBox()
 {