X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FEditorGraphicBBS%2FbbsWxGUIEditorGraphic%2FwxBlackBoxEditionDialog.cxx;h=8ee617b4c8e51891aee2c8add70c2406c25395fa;hb=713c6f1f54a2114c6e495aa6974d33b5718b46b5;hp=3cf0c06bda1f25a09f46b94f00fe530650aae13e;hpb=6a326b219e8d69c186f8cff4e82c64b622fc9288;p=bbtkGEditor.git diff --git a/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/wxBlackBoxEditionDialog.cxx b/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/wxBlackBoxEditionDialog.cxx index 3cf0c06..8ee617b 100644 --- a/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/wxBlackBoxEditionDialog.cxx +++ b/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/wxBlackBoxEditionDialog.cxx @@ -1,4 +1,4 @@ -/*========================================================================= +/*========================================================================= Program: bbtk Module: $RCSfile$ Language: C++ @@ -11,26 +11,26 @@ Version: $Revision$ * Copyright (c) CREATIS-LRMN (Centre de Recherche en Imagerie Medicale) * Authors : Eduardo Davila, Laurent Guigues, Jean-Pierre Roux * -* 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 +* 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. +* 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. -* ------------------------------------------------------------------------ */ +* ------------------------------------------------------------------------ */ /** -* \file -* \brief Class bbtk::wxBlackBoxEditionDialog . +* \file +* \brief Class bbtk::wxBlackBoxEditionDialog . */ #include "wxBlackBoxEditionDialog.h" @@ -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+=":"; @@ -56,7 +57,7 @@ namespace bbtk //========================================================================= - + wxBlackBoxEditionDialog::~wxBlackBoxEditionDialog() { @@ -64,27 +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); - wxStaticText *text = new wxStaticText(this, -1, wxT("Input Ports")); + 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 lstInputs = _model->getInputPorts(); - wxFlexGridSizer *sizer = new wxFlexGridSizer(lstInputs.size(),3,5,5); - for(int i = 0;iAddGrowableCol(0); + sizer->AddGrowableCol(1); + sizer->AddGrowableCol(2); + + for(int i = 0;i<(int)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(type),wxDefaultPosition,wxSize(250,25)); - wxTextCtrl *txtValue = new wxTextCtrl(this, -1, _T(""),wxDefaultPosition,wxSize(90,25)); - + 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)); + 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()) @@ -102,37 +135,48 @@ namespace bbtk txtValue->SetEditable(false); } - _lstNames.push_back(lblName); + _lstNames.push_back(lblName); _lstValues.push_back(txtValue); _lstTypes.push_back(lblType); - - sizer->Add(lblName,1,wxEXPAND,5); + + sizer->Add(lblName,1,wxEXPAND,5); sizer->Add(txtValue,1,wxEXPAND,5); sizer->Add(lblType,1,wxCENTRE|wxEXPAND,5); - } - - wxBoxSizer *buts = new wxBoxSizer(wxHORIZONTAL); - wxButton *okButton = new wxButton(this, -1, _T("Ok"),wxDefaultPosition, wxSize(70, 30)); - wxButton *closeButton = new wxButton(this, -1, _T("Close"), wxDefaultPosition, wxSize(70, 30)); + + + wxBoxSizer *buts = new wxBoxSizer(wxHORIZONTAL); + wxButton *okButton = new wxButton(scrollWin, -1, _T("Ok"),wxDefaultPosition, wxSize(70, 30)); + wxButton *closeButton = new wxButton(scrollWin, -1, _T("Close"), wxDefaultPosition, wxSize(70, 30)); // connect command event handlers Connect(okButton->GetId(),wxEVT_COMMAND_BUTTON_CLICKED,wxCommandEventHandler(wxBlackBoxEditionDialog::onClickOk)); Connect(closeButton->GetId(),wxEVT_COMMAND_BUTTON_CLICKED,wxCommandEventHandler(wxBlackBoxEditionDialog::onClickClose)); - + buts->Add(okButton,0,wxCENTRE|wxEXPAND,5); 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); - SetSizer(sizerDialog); + scrollWin->SetSizer(sizerDialog); + scrollWin->Centre(); + + + scrollWin->SetVirtualSize(400,400); + scrollWin->SetSize(300,300); + scrollWin->SetScrollbars(10, 10, 50, 50); +// scrollWin->SetSizer(sizer); + - Centre(); ShowModal(); Destroy(); } @@ -141,20 +185,45 @@ namespace bbtk void wxBlackBoxEditionDialog::onClickOk(wxCommandEvent& event) { -printf("EED wxBlackBoxEditionDialog::onClickOk size %d \n", (int)_lstValues.size() ); + int closeok = 1; for(int i=0;i<(int)_lstValues.size();i++) { std::string text = wx2std(_lstValues[i]->GetValue()); -printf("EED wxBlackBoxEditionDialog::onClickOk text %s \n", text.c_str() ); //TOFIX Search a better alternative if(text!="--No editable--" && text!="--Port Connected--") { -printf("EED wxBlackBoxEditionDialog::onClickOk text %s \n", text.c_str() ); + //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); + } } //========================================================================= @@ -162,11 +231,44 @@ printf("EED wxBlackBoxEditionDialog::onClickOk text %s \n", text.c_str() ); void wxBlackBoxEditionDialog::onClickClose(wxCommandEvent& event) { printf("EED wxBlackBoxEditionDialog::onClickClose\n"); - Close(true); + 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 +/* // remove * from the name + std::string name = _tabsMgr->GetNameTabPanel(); + if(name[name.length() - 1] != '*') + name = name.substr(0, name.length()-2); + _tabsMgr->SetNameTabPanel(name);*/