X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FEditorGraphicBBS%2FbbsWxGUIEditorGraphic%2FwxBlackBoxEditionDialog.cxx;h=bfcd83dbb1f27be0556346d5bc7b56b15ec3a4b6;hb=5b4d222a83d861c34b2c08cb624c7569f3a9cc26;hp=850b9edde5dbbe91a3618dd3a07baaa409b257e0;hpb=9877bb1bc1cbfc8b4ac0dbd45d443ba670c9d8d2;p=bbtkGEditor.git

diff --git a/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/wxBlackBoxEditionDialog.cxx b/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/wxBlackBoxEditionDialog.cxx
index 850b9ed..bfcd83d 100644
--- a/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/wxBlackBoxEditionDialog.cxx
+++ b/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/wxBlackBoxEditionDialog.cxx
@@ -1,3 +1,28 @@
+/*
+# ---------------------------------------------------------------------
+#
+# Copyright (c) CREATIS (Centre de Recherche en Acquisition et Traitement de l'Image 
+#                        pour la Santé)
+# Authors : Eduardo Davila, Frederic Cervenansky, Claire Mouton
+#
+#  This software is governed by the CeCILL-B license under French law and 
+#  abiding by the rules of distribution of free software. You can  use, 
+#  modify and/ or redistribute the software under the terms of the CeCILL-B 
+#  license as circulated by CEA, CNRS and INRIA at the following URL 
+#  http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html 
+#  or in the file LICENSE.txt.
+#
+#  As a counterpart to the access to the source code and  rights to copy,
+#  modify and redistribute granted by the license, users are provided only
+#  with a limited warranty  and the software's author,  the holder of the
+#  economic rights,  and the successive licensors  have only  limited
+#  liability. 
+#
+#  The fact that you are presently reading this means that you have had
+#  knowledge of the CeCILL-B license and that you accept its terms.
+# ------------------------------------------------------------------------  
+*/
+
 /*=========================================================================
 Program:   bbtk
 Module:    $RCSfile$
@@ -40,7 +65,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 +111,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 +142,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 +199,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 +232,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);
 			}
 		}
@@ -222,12 +270,39 @@ namespace bbtk
 
 	void wxBlackBoxEditionDialog::onClickClose(wxCommandEvent& event)
 	{
-printf("EED wxBlackBoxEditionDialog::onClickClose\n");
 		Close(true);
 	}
 
 	//=========================================================================
 
+	//=========================================================================
+	
+	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