Bug #1689

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

diff --git a/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/wxBlackBoxEditionDialog.cxx b/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/wxBlackBoxEditionDialog.cxx
index d080363abb24c79ad2c57842fe62180ac928a3af..1f5688306f53dcd211178fac626abd0d39f93558 100644 (file)
--- a/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/wxBlackBoxEditionDialog.cxx
+++ b/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/wxBlackBoxEditionDialog.cxx
@@ -40,7 +40,8 @@ namespace bbtk
 {
        //=========================================================================
 
-       wxBlackBoxEditionDialog::wxBlackBoxEditionDialog(wxGUIEditorGraphicBBS *parent,GBlackBoxModel *model):wxDialog(parent,wxID_ANY,_T(""), wxDefaultPosition, wxSize(520, 640),wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER) 
+       wxBlackBoxEditionDialog::wxBlackBoxEditionDialog(wxGUIEditorGraphicBBS *parent,GBlackBoxModel *model)
+               :wxDialog(parent,wxID_ANY,_T(""), wxDefaultPosition, wxSize(520, 640),wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER) 
        {
                _model=model;
                _parent = parent;
@@ -85,12 +86,22 @@ namespace bbtk
 
         wxScrolledWindow *scrollWin = new wxScrolledWindow( this, -1, wxDefaultPosition,  wxSize(200,200), wxVSCROLL);
 
+               wxString boxtype( crea::std2wx( _model->getBBTKType() ) );
+               
                wxStaticText *textBoxName = new wxStaticText(scrollWin, -1, wxT("Box Name"));
+               wxStaticText *textBoxType = new wxStaticText(scrollWin, -1, boxtype+wxT(": ") );
                wxTextCtrl *valueBoxName  = new wxTextCtrl(scrollWin, -1, _T(""), wxDefaultPosition,wxSize(300,25));
                _initBoxName = _model->getBBTKName();
                valueBoxName->SetValue(crea::std2wx(_initBoxName));
                _boxName = valueBoxName ;
 
+               wxBoxSizer *boxnameSizer        = new wxBoxSizer(wxHORIZONTAL);
+               boxnameSizer->Add(textBoxType,0,wxEXPAND,5);
+               boxnameSizer->Add(valueBoxName,0,wxEXPAND,5);
+               boxnameSizer->Add( new wxStaticText(scrollWin, -1, wxT(" ")) ,0,wxCENTRE|wxEXPAND,5);
+
+               
+               
                wxStaticText *text = new wxStaticText(scrollWin, -1, wxT("Input Ports"));
                wxFont font(11, wxDEFAULT, wxNORMAL, wxBOLD);
                text->SetFont(font);
@@ -106,15 +117,22 @@ namespace bbtk
                for(int i = 0;i<(int)lstInputs.size();i++)
                {
                        sizer->AddGrowableRow(i);
-                       GPortModel* port        = lstInputs[i];
-                       std::string type        = port->getBBTKType();
-                       wxStaticText *lblName   = new wxStaticText(scrollWin, -1, std2wx(port->getBBTKName()),wxDefaultPosition,wxSize(100,25));
-                       wxStaticText *lblType   = new wxStaticText(scrollWin, -1, std2wx(type),wxDefaultPosition,wxSize(250,25));
-                       wxTextCtrl *txtValue    = new wxTextCtrl(scrollWin, -1, _T(""),wxDefaultPosition,wxSize(300,25));
-
+                       GPortModel              *port       = lstInputs[i];
+                       std::string              type           = port->getBBTKType();
+                       wxStaticText    *lblName        = new wxStaticText(scrollWin, -1, std2wx(port->getBBTKName()),wxDefaultPosition,wxSize(100,25));
+                       wxStaticText    *lblType        = new wxStaticText(scrollWin, -1, std2wx(type),wxDefaultPosition,wxSize(250,25));
+                       wxTextCtrl              *txtValue   = new wxTextCtrl(scrollWin, -1, _T(""),wxDefaultPosition,wxSize(300,25));
+
+                       lblName->SetToolTip(  std2wx(port->getBBTKDescription()) );
+                       txtValue->SetToolTip( std2wx(port->getBBTKDescription()) );
+                       
+                       
                        if(port->getValue()!="")
                        {
-                               txtValue->SetValue(crea::std2wx(port->getValue()));
+                               std::string text = port->getValue();
+                               if(text.length()>0)
+                                       addDoubleQuotes(text);
+                               txtValue->SetValue(crea::std2wx(text));
                        }
 
                        if(port->isConnected())
@@ -156,7 +174,7 @@ namespace bbtk
                sizerDialog->AddSpacer(10);
                sizerDialog->Add(textBoxName,0,wxALIGN_TOP|wxALIGN_CENTER);
                sizerDialog->AddSpacer(10);
-               sizerDialog->Add(valueBoxName, wxSizerFlags(0).Align(0).Border(wxLEFT, 100));
+               sizerDialog->Add(boxnameSizer, wxSizerFlags(0).Align(0).Border(wxLEFT, 100));
                sizerDialog->AddSpacer(10);
                sizerDialog->Add(text,0,wxALIGN_TOP|wxALIGN_CENTER);
                sizerDialog->AddSpacer(15);
@@ -189,6 +207,11 @@ namespace bbtk
                        //TOFIX Search a better alternative
                        if(text!="--No editable--" && text!="--Port Connected--")
                        {
+                               //JPRG: When executing, add double quotes if necessary
+                               if(text.length()>0)
+                               {
+                                       addDoubleQuotes(text);
+                               }
                                _model->setValueToInputPort(i,text);
                        }
                }
@@ -213,7 +236,7 @@ namespace bbtk
                }
  
                if( closeok==1 ){
-                       _parent->SaveTempActualDiagram();
+                       _parent->SaveTempActualDiagram("edit values");
                        Close(true);
                }
        }
@@ -228,6 +251,34 @@ printf("EED wxBlackBoxEditionDialog::onClickClose\n");
 
        //=========================================================================
 
+       //=========================================================================
+       
+       void wxBlackBoxEditionDialog::addDoubleQuotes(std::string &text)
+       {
+               
+               //We add the double quotes at the beginning
+               if(text[0] != '"' )
+                       text = "\"" + text;
+               
+               //We add the double quotes at the end
+               if(text[text.length()-1] != '"')        
+                       text+= "\"";
+               
+       }
+       
+
+       //=========================================================================
+       void wxBlackBoxEditionDialog::removeDoubleQuotes(std::string &text)
+       {
+               if(text[0]== '"' )
+                       text.replace(0, 1,"");
+               if(text[text.length()-1] == '"')        
+                       text.replace(text.length()-1, 1,"");
+               
+       }
+       
+       
+       
 }  // EO namespace bbtk
 
 // EOF