Changes in information presented in status bar, inside the box, and the editing dialo...

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

diff --git a/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/wxBlackBoxEditionDialog.cxx b/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/wxBlackBoxEditionDialog.cxx
index a6af50463259997f3ff631769dc3c370e0983cec..fdde6ad262f97e498ac6892df30ddd81aaf52d3d 100644 (file)
--- a/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/wxBlackBoxEditionDialog.cxx
+++ b/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/wxBlackBoxEditionDialog.cxx
@@ -43,10 +43,12 @@ namespace bbtk
        wxBlackBoxEditionDialog::wxBlackBoxEditionDialog(wxGUIEditorGraphicBBS *parent,GBlackBoxModel *model):wxDialog(parent,wxID_ANY,_T(""), wxDefaultPosition, wxSize(480, 640),wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER)
        {
                _model=model;
-               std::string title("BlackBox Editing - Name:");
-               title+=_model->getBBTKName();
-               title+=" Type:";
+               std::string title("BlackBox Editing - ");
+               title+=_model->getBBTKPackage();
+               title+=":";
                title+=_model->getBBTKType();
+               title+=":";
+               title+=_model->getBBTKName();
                SetTitle(std2wx(title));
 
                constructBlackBoxEditionDialog();
@@ -81,10 +83,11 @@ namespace bbtk
                for(int i = 0;i<lstInputs.size();i++)
                {
                        GPortModel* port = lstInputs[i];
+                       std::string type = port->getBBTKType();
                        wxStaticText *lblName = new wxStaticText(this, -1, std2wx(port->getBBTKName()),wxDefaultPosition,wxSize(100,25));
-                       wxStaticText *lblType = new wxStaticText(this, -1, std2wx(port->getBBTKType()),wxDefaultPosition,wxSize(250,25));
+                       wxStaticText *lblType = new wxStaticText(this, -1, std2wx(type),wxDefaultPosition,wxSize(250,25));
                        wxTextCtrl *txtValue = new wxTextCtrl(this, -1, _T(""),wxDefaultPosition,wxSize(90,25));
-
+                       
                        if(port->getValue()!="")
                        {
                                txtValue->SetLabel(crea::std2wx(port->getValue()));
@@ -97,13 +100,21 @@ namespace bbtk
                                txtValue->SetEditable(false);
                        }
 
-                       _lstNames.push_back(lblName);
-                       _lstTypes.push_back(lblType);
+                       char et = '*';
+                       if(type.find(et)!=-1)
+                       {
+                               std::string noEditable("--No editable--");
+                               txtValue->SetLabel(crea::std2wx(noEditable));
+                               txtValue->SetEditable(false);
+                       }
+
+                       _lstNames.push_back(lblName);                   
                        _lstValues.push_back(txtValue);
+                       _lstTypes.push_back(lblType);
                        
-                       sizer->Add(lblName,1,wxEXPAND,5);
-                       sizer->Add(lblType,1,wxCENTRE|wxEXPAND,5);
+                       sizer->Add(lblName,1,wxEXPAND,5);                       
                        sizer->Add(txtValue,1,wxEXPAND,5);
+                       sizer->Add(lblType,1,wxCENTRE|wxEXPAND,5);
                        
                }
                
@@ -122,6 +133,7 @@ namespace bbtk
                sizerDialog->Add(text,0,wxALIGN_TOP|wxALIGN_CENTER);
                sizerDialog->AddSpacer(15);
                sizerDialog->Add(sizer,0,wxALIGN_CENTER);
+               sizerDialog->AddSpacer(15);
                sizerDialog->Add(buts,0,wxALIGN_CENTER | wxTOP | wxBOTTOM);
 
                SetSizer(sizerDialog);