From: corredor <> Date: Mon, 3 May 2010 07:39:10 +0000 (+0000) Subject: Change of wxDialog name to wxBlackBoxEditionDialog ... It is better to have two diffe... X-Git-Tag: v1_0_0~91 X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=8a680b0e68359ef1d8dc810d776a4f354ffb65e5;p=bbtkGEditor.git Change of wxDialog name to wxBlackBoxEditionDialog ... It is better to have two different dialogs because this one is very different from the Scene Editor Dialog to be done. Properties Panel won't be used more --- diff --git a/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/bbtkwxGUIEditorGraphicBBS.cxx b/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/bbtkwxGUIEditorGraphicBBS.cxx index f4e7fdd..7d6bead 100644 --- a/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/bbtkwxGUIEditorGraphicBBS.cxx +++ b/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/bbtkwxGUIEditorGraphicBBS.cxx @@ -281,7 +281,7 @@ namespace bbtk void wxGUIEditorGraphicBBS::editBlackBox(GBlackBoxModel *bbmodel) { - wxEditionDialog* dialog = new wxEditionDialog(this,bbmodel); + wxBlackBoxEditionDialog* dialog = new wxBlackBoxEditionDialog(this,bbmodel); dialog->Show(); } @@ -289,7 +289,7 @@ namespace bbtk void wxGUIEditorGraphicBBS::editDiagramParameters(wxVtkSceneManager* scene) { - wxEditionDialog* dialog = new wxEditionDialog(this,scene); + wxBlackBoxEditionDialog* dialog = new wxBlackBoxEditionDialog(this,scene); dialog->Show(); } diff --git a/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/bbtkwxGUIEditorGraphicBBS.h b/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/bbtkwxGUIEditorGraphicBBS.h index 5f3a91f..7374ac3 100644 --- a/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/bbtkwxGUIEditorGraphicBBS.h +++ b/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/bbtkwxGUIEditorGraphicBBS.h @@ -46,7 +46,7 @@ //Includes same project #include "wxTabPanelsManager.h" #include "wxPropertiesPanel.h" -#include "wxEditionDialog.h" +#include "wxBlackBoxEditionDialog.h" #include "wxVtkSceneManager.h" //#include "C:\RaC\CREATIS\bbtkGEditor\data\icons\wxart_new.xpm" // JPR #include "wxart_new.xpm" // JPR diff --git a/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/wxEditionDialog.cxx b/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/wxBlackBoxEditionDialog.cxx similarity index 85% rename from lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/wxEditionDialog.cxx rename to lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/wxBlackBoxEditionDialog.cxx index d5e5cbd..9428913 100644 --- a/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/wxEditionDialog.cxx +++ b/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/wxBlackBoxEditionDialog.cxx @@ -30,17 +30,17 @@ Version: $Revision$ /** * \file -* \brief Class bbtk::wxEditionDialog . +* \brief Class bbtk::wxBlackBoxEditionDialog . */ -#include "wxEditionDialog.h" +#include "wxBlackBoxEditionDialog.h" #include "creaWx.h" namespace bbtk { //========================================================================= - wxEditionDialog::wxEditionDialog(wxGUIEditorGraphicBBS *parent,GBlackBoxModel *model):wxDialog(parent,wxID_ANY,_T(""), wxDefaultPosition, wxSize(480, 640)) + wxBlackBoxEditionDialog::wxBlackBoxEditionDialog(wxGUIEditorGraphicBBS *parent,GBlackBoxModel *model):wxDialog(parent,wxID_ANY,_T(""), wxDefaultPosition, wxSize(480, 640)) { _model=model; std::string title("BlackBox Editing - Name:"); @@ -54,21 +54,21 @@ namespace bbtk //========================================================================= - wxEditionDialog::wxEditionDialog(wxGUIEditorGraphicBBS *parent,wxVtkSceneManager* scene):wxDialog(parent, wxID_ANY, _T(""), wxDefaultPosition, wxSize(300, 300)) + wxBlackBoxEditionDialog::wxBlackBoxEditionDialog(wxGUIEditorGraphicBBS *parent,wxVtkSceneManager* scene):wxDialog(parent, wxID_ANY, _T(""), wxDefaultPosition, wxSize(300, 300)) { } //========================================================================= - wxEditionDialog::~wxEditionDialog() + wxBlackBoxEditionDialog::~wxBlackBoxEditionDialog() { } //========================================================================= - void wxEditionDialog::constructBlackBoxEditionDialog() + void wxBlackBoxEditionDialog::constructBlackBoxEditionDialog() { wxBoxSizer *sizerDialog = new wxBoxSizer(wxVERTICAL); @@ -109,8 +109,8 @@ namespace bbtk wxButton *closeButton = new wxButton(this, 1004, _T("Close"), wxDefaultPosition, wxSize(70, 30)); // connect command event handlers - Connect(1003,wxEVT_COMMAND_BUTTON_CLICKED,wxCommandEventHandler(wxEditionDialog::onClickOk)); - Connect(1004,wxEVT_COMMAND_BUTTON_CLICKED,wxCommandEventHandler(wxEditionDialog::onClickClose)); + Connect(1003,wxEVT_COMMAND_BUTTON_CLICKED,wxCommandEventHandler(wxBlackBoxEditionDialog::onClickOk)); + Connect(1004,wxEVT_COMMAND_BUTTON_CLICKED,wxCommandEventHandler(wxBlackBoxEditionDialog::onClickClose)); buts->Add(okButton,0,wxCENTRE|wxEXPAND,5); buts->Add(closeButton,0,wxCENTRE|wxEXPAND,5); @@ -129,7 +129,7 @@ namespace bbtk //========================================================================= - void wxEditionDialog::onClickOk(wxCommandEvent& event) + void wxBlackBoxEditionDialog::onClickOk(wxCommandEvent& event) { for(int i=0;i<_lstValues.size();i++) @@ -143,7 +143,7 @@ namespace bbtk //========================================================================= - void wxEditionDialog::onClickClose(wxCommandEvent& event) + void wxBlackBoxEditionDialog::onClickClose(wxCommandEvent& event) { Close(true); } diff --git a/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/wxEditionDialog.h b/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/wxBlackBoxEditionDialog.h similarity index 83% rename from lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/wxEditionDialog.h rename to lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/wxBlackBoxEditionDialog.h index 95dc0ad..b4e79f9 100644 --- a/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/wxEditionDialog.h +++ b/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/wxBlackBoxEditionDialog.h @@ -32,16 +32,16 @@ Version: $Revision$ /** * \file -* \brief Class bbtk::wxEditionDialog : abstract black-box interface. +* \brief Class bbtk::wxBlackBoxEditionDialog : abstract black-box interface. */ /** -* \class bbtk::wxEditionDialog +* \class bbtk::wxBlackBoxEditionDialog * \brief */ -#ifndef __wxEditionDialog_h__ -#define __wxEditionDialog_h__ +#ifndef __wxBlackBoxEditionDialog_h__ +#define __wxBlackBoxEditionDialog_h__ //Includes same project #include "bbtkwxGUIEditorGraphicBBS.h" @@ -67,12 +67,12 @@ namespace bbtk class wxVtkSceneManager; - class wxEditionDialog : public wxDialog + class wxBlackBoxEditionDialog : public wxDialog { public: - wxEditionDialog(wxGUIEditorGraphicBBS *parent,wxVtkSceneManager* scene); - wxEditionDialog(wxGUIEditorGraphicBBS *parent,GBlackBoxModel *model); - ~wxEditionDialog(); + wxBlackBoxEditionDialog(wxGUIEditorGraphicBBS *parent,wxVtkSceneManager* scene); + wxBlackBoxEditionDialog(wxGUIEditorGraphicBBS *parent,GBlackBoxModel *model); + ~wxBlackBoxEditionDialog(); void constructBlackBoxEditionDialog(); void onClickOk(wxCommandEvent& event); diff --git a/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/wxPropertiesPanel.cxx b/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/wxPropertiesPanel.cxx deleted file mode 100644 index 0118e3b..0000000 --- a/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/wxPropertiesPanel.cxx +++ /dev/null @@ -1,71 +0,0 @@ -/*========================================================================= -Program: bbtk -Module: $RCSfile$ -Language: C++ -Date: $Date$ -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 -* 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. -* ------------------------------------------------------------------------ */ - -/** -* \file -* \brief Class bbtk::wxPropertiesPanel . -*/ - - -#include "wxPropertiesPanel.h" - - -namespace bbtk -{ - //========================================================================= - wxPropertiesPanel::wxPropertiesPanel() - { - _grid=NULL; - } - - //========================================================================= - wxPropertiesPanel::wxPropertiesPanel(wxWindow *parent):wxPanel(parent) - { - _grid = new wxGrid(this,wxID_ANY); - _grid->CreateGrid(15,2); - _grid->SetColLabelSize(0); - _grid->SetRowLabelSize(0); - - wxBoxSizer *sizer = new wxBoxSizer(wxVERTICAL); - sizer->Add(_grid,0,wxEXPAND|wxALL,0); - SetSizer(sizer); - } - - //========================================================================= - wxPropertiesPanel::~wxPropertiesPanel() - { - - } - //========================================================================= - -} // EO namespace bbtk - -// EOF - diff --git a/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/wxPropertiesPanel.h b/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/wxPropertiesPanel.h deleted file mode 100644 index 147fe13..0000000 --- a/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/wxPropertiesPanel.h +++ /dev/null @@ -1,83 +0,0 @@ -/*========================================================================= -Program: bbtk -Module: $RCSfile$ -Language: C++ -Date: $Date$ -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 -* 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. -* ------------------------------------------------------------------------ */ - - - -/** -* \file -* \brief Class bbtk::wxPropertiesPanel : abstract black-box interface. -*/ - -/** -* \class bbtk::wxPropertiesPanel -* \brief -*/ - -#ifndef __wxPropertiesPanel_h__ -#define __wxPropertiesPanel_h__ - -//Includes same project - -//Includes wxWidgets -#include -#include -#include -#include - -//Includes creaMaracasVisu - -//Includes std -#include - - - - -namespace bbtk -{ - - class wxPropertiesPanel : public wxPanel - { - public: - wxPropertiesPanel(); - wxPropertiesPanel(wxWindow *parent); - ~wxPropertiesPanel(); - - private: - wxGrid *_grid; - - protected: - - }; - - -} -// namespace bbtk -#endif -