X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FEditorGraphicBBS%2FbbsWxGUIEditorGraphic%2FwxBlackBoxEditionDialog.cxx;h=f72d05bb8a8066f5503747c6ac5e8f0ee7bd5944;hb=775c8164b5f679027b8bbafa97c0e0110711909b;hp=fdde6ad262f97e498ac6892df30ddd81aaf52d3d;hpb=c2ceb1ba52ffe871ccb9f835a0330e12484d2f0e;p=bbtkGEditor.git diff --git a/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/wxBlackBoxEditionDialog.cxx b/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/wxBlackBoxEditionDialog.cxx index fdde6ad..f72d05b 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" @@ -56,12 +56,6 @@ namespace bbtk //========================================================================= - wxBlackBoxEditionDialog::wxBlackBoxEditionDialog(wxGUIEditorGraphicBBS *parent,wxVtkSceneManager* scene):wxDialog(parent, wxID_ANY, _T(""), wxDefaultPosition, wxSize(300, 300)) - { - - } - - //========================================================================= wxBlackBoxEditionDialog::~wxBlackBoxEditionDialog() { @@ -74,29 +68,38 @@ namespace bbtk { 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 *text = new wxStaticText(scrollWin, -1, wxT("Input Ports")); wxFont font(11, wxDEFAULT, wxNORMAL, wxBOLD); text->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(90,25)); + if(port->getValue()!="") { - txtValue->SetLabel(crea::std2wx(port->getValue())); + txtValue->SetValue(crea::std2wx(port->getValue())); } if(port->isConnected()) { std::string connected("--Port Connected--"); - txtValue->SetLabel(crea::std2wx(connected)); + txtValue->SetValue(crea::std2wx(connected)); txtValue->SetEditable(false); } @@ -104,41 +107,48 @@ namespace bbtk if(type.find(et)!=-1) { std::string noEditable("--No editable--"); - txtValue->SetLabel(crea::std2wx(noEditable)); + txtValue->SetValue(crea::std2wx(noEditable)); 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, 1003, _T("Ok"),wxDefaultPosition, wxSize(70, 30)); - wxButton *closeButton = new wxButton(this, 1004, _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(1003,wxEVT_COMMAND_BUTTON_CLICKED,wxCommandEventHandler(wxBlackBoxEditionDialog::onClickOk)); - Connect(1004,wxEVT_COMMAND_BUTTON_CLICKED,wxCommandEventHandler(wxBlackBoxEditionDialog::onClickClose)); - + 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(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(); } @@ -147,11 +157,14 @@ namespace bbtk void wxBlackBoxEditionDialog::onClickOk(wxCommandEvent& event) { - - for(int i=0;i<_lstValues.size();i++) + for(int i=0;i<(int)_lstValues.size();i++) { - std::string text = wx2std(_lstValues[i]->GetLabelText()); - _model->setValueToInputPort(i,text); + std::string text = wx2std(_lstValues[i]->GetValue()); + //TOFIX Search a better alternative + if(text!="--No editable--" && text!="--Port Connected--") + { + _model->setValueToInputPort(i,text); + } } Close(true); @@ -161,7 +174,8 @@ namespace bbtk void wxBlackBoxEditionDialog::onClickClose(wxCommandEvent& event) { - Close(true); +printf("EED wxBlackBoxEditionDialog::onClickClose\n"); + Close(true); } //=========================================================================