X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FEditorGraphicBBS%2FbbsWxGUIEditorGraphic%2FwxBlackBoxEditionDialog.cxx;h=db284eb191063058806388bfdfa65e37b8d63033;hb=17c7281fa9d788fe4df66173b1ab23cecc8918f5;hp=b2c470147e3301f10f0b906bcf7d35d5780660b5;hpb=1b304ebdcfbe1c3bcd0a060ee3d193d81a8047f0;p=bbtkGEditor.git

diff --git a/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/wxBlackBoxEditionDialog.cxx b/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/wxBlackBoxEditionDialog.cxx
index b2c4701..db284eb 100644
--- 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];
-			wxStaticText *lblName = new wxStaticText(this, -1, std2wx(port->getBBTKName()),wxDefaultPosition,wxSize(100,20));
-			wxStaticText *lblType = new wxStaticText(this, -1, std2wx(port->getBBTKType()),wxDefaultPosition,wxSize(230,20));
+			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(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,22 @@ namespace bbtk
 				txtValue->SetEditable(false);
 			}
 
-			_lstNames.push_back(lblName);
-			_lstTypes.push_back(lblType);
-			_lstValues.push_back(txtValue);
+			char et = '*';
+			if(type.find(et)!=-1)
+			{
+				std::string noEditable("--No editable--");
+				txtValue->SetLabel(crea::std2wx(noEditable));
+				txtValue->SetEditable(false);
+			}
 
-			sizer->Add(lblName,1,wxEXPAND,5);
-			sizer->Add(lblType,1,wxCENTRE|wxEXPAND,5);
+			_lstNames.push_back(lblName);			
+			_lstValues.push_back(txtValue);
+			_lstTypes.push_back(lblType);
+			
+			sizer->Add(lblName,1,wxEXPAND,5);			
 			sizer->Add(txtValue,1,wxEXPAND,5);
+			sizer->Add(lblType,1,wxCENTRE|wxEXPAND,5);
+			
 		}
 		
 		wxBoxSizer *buts = new wxBoxSizer(wxHORIZONTAL);
@@ -121,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);
@@ -137,8 +150,12 @@ namespace bbtk
 
 		for(int i=0;i<_lstValues.size();i++)
 		{
-			std::string text = wx2std(_lstValues[i]->GetLabelText());		
-			_model->setValueToInputPort(i,text);
+			std::string text = wx2std(_lstValues[i]->GetLabelText());
+			//TOFIX Search a better alternative
+			if(text!="--No editable--" && text!="--Port Connected--")
+			{
+				_model->setValueToInputPort(i,text);
+			}
 		}
 
 		Close(true);