X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FEditorGraphicBBS%2FbbsWxGUIEditorGraphic%2FwxBlackBoxEditionDialog.cxx;h=8ee617b4c8e51891aee2c8add70c2406c25395fa;hb=713c6f1f54a2114c6e495aa6974d33b5718b46b5;hp=b6e28501bc2324bb8432fd7367c8b370f2e71f63;hpb=56cbba59d070c955c4aab46e59908ab82f5e390d;p=bbtkGEditor.git

diff --git a/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/wxBlackBoxEditionDialog.cxx b/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/wxBlackBoxEditionDialog.cxx
index b6e2850..8ee617b 100644
--- a/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/wxBlackBoxEditionDialog.cxx
+++ b/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/wxBlackBoxEditionDialog.cxx
@@ -40,9 +40,10 @@ namespace bbtk
 {
 	//=========================================================================
 
-	wxBlackBoxEditionDialog::wxBlackBoxEditionDialog(wxGUIEditorGraphicBBS *parent,GBlackBoxModel *model):wxDialog(parent,wxID_ANY,_T(""), wxDefaultPosition, wxSize(480, 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;
 		std::string title("BlackBox Editing - ");
 		title+=_model->getBBTKPackage();
 		title+=":";
@@ -64,31 +65,59 @@ namespace bbtk
 
 	//=========================================================================
 
+	bool wxBlackBoxEditionDialog::isValidNameForABox(std::string boxname) {
+
+         	int i=0;
+         	for (i = 0; i < boxname.size() ; i++) {
+                 	if ( (isalnum(boxname[i])==0) && (boxname.compare(i, 1, "-") != 0) && ( boxname.compare(i, 1, "_") != 0) ){
+                         	return false;
+                 	}
+         	} // for
+ 
+         	return true;
+ 	}
+
+	//=========================================================================
+
 	void wxBlackBoxEditionDialog::constructBlackBoxEditionDialog()
 	{
 		wxBoxSizer *sizerDialog = new wxBoxSizer(wxVERTICAL);
 
         wxScrolledWindow *scrollWin = new wxScrolledWindow( this, -1, wxDefaultPosition,  wxSize(200,200), wxVSCROLL);
 
+		wxStaticText *textBoxName = new wxStaticText(scrollWin, -1, wxT("Box Name"));
+ 		wxTextCtrl *valueBoxName  = new wxTextCtrl(scrollWin, -1, _T(""), wxDefaultPosition,wxSize(300,25));
+ 		_initBoxName = _model->getBBTKName();
+ 		valueBoxName->SetValue(crea::std2wx(_initBoxName));
+ 		_boxName = valueBoxName ;
+
 		wxStaticText *text = new wxStaticText(scrollWin, -1, wxT("Input Ports"));
 		wxFont font(11, wxDEFAULT, wxNORMAL, wxBOLD);
 		text->SetFont(font);
-
+ 		textBoxName->SetFont(font);
 
 
 		std::vector<GPortModel*> lstInputs = _model->getInputPorts();
 		wxFlexGridSizer *sizer = new wxFlexGridSizer(lstInputs.size(),3,5,5);
+		sizer->AddGrowableCol(0);
+		sizer->AddGrowableCol(1);
+		sizer->AddGrowableCol(2);
+		
 		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(90,25));
+			wxTextCtrl *txtValue    = new wxTextCtrl(scrollWin, -1, _T(""),wxDefaultPosition,wxSize(300,25));
 
 			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())
@@ -128,9 +157,13 @@ namespace bbtk
 		buts->Add(closeButton,0,wxCENTRE|wxEXPAND,5);
 
 		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->AddSpacer(10);
 		sizerDialog->Add(text,0,wxALIGN_TOP|wxALIGN_CENTER);
 		sizerDialog->AddSpacer(15);
-		sizerDialog->Add(sizer,0,wxALIGN_CENTER);
+		sizerDialog->Add(sizer,0,wxALIGN_CENTER| wxEXPAND);
 		sizerDialog->AddSpacer(15);
 		sizerDialog->Add(buts,0,wxALIGN_CENTER | wxTOP | wxBOTTOM);
 
@@ -152,17 +185,45 @@ namespace bbtk
 
 	void wxBlackBoxEditionDialog::onClickOk(wxCommandEvent& event)
 	{
+		int closeok = 1;
 		for(int i=0;i<(int)_lstValues.size();i++)
 		{
 			std::string text = wx2std(_lstValues[i]->GetValue());
 			//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);
 			}
 		}
-
-		Close(true);
+		//handle box name
+ 		std::string boxname = wx2std(_boxName->GetValue());
+ 		if( boxname.compare(_initBoxName) != 0 ){
+ 			if (isValidNameForABox(boxname) == true){
+ 				if( _parent->boxNameExists(boxname) == true ){
+ 					closeok=0;
+ 					wxMessageDialog *dial = new wxMessageDialog(NULL,
+                         wxT("The name already exists. Please provide another name"),
+                         wxT("Change name: name already exists"), wxOK | wxICON_EXCLAMATION | wxSTAY_ON_TOP);
+ 					dial->ShowModal();
+ 				}else{
+ 					_model->setBBTKName(boxname);
+ 				}
+ 			}else{
+ 				closeok=0;
+ 				wxMessageDialog *dial = new wxMessageDialog(NULL,  wxT("Please provide a valide name for your box (no spaces and only leters, digits, \"_\" or \"-\" allowed)"),  wxT("Change name: invalid name"), wxOK | wxICON_EXCLAMATION | wxSTAY_ON_TOP);
+ 				dial->ShowModal();
+ 			}
+ 		}
+ 
+ 		if( closeok==1 ){
+			_parent->SaveTempActualDiagram("edit values");
+			Close(true);
+		}
 	}
 
 	//=========================================================================
@@ -175,6 +236,39 @@ 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
+/*	// remove * from the name
+		std::string name = _tabsMgr->GetNameTabPanel();
+		if(name[name.length() - 1] != '*')
+			name = name.substr(0, name.length()-2);
+		_tabsMgr->SetNameTabPanel(name);*/