From: corredor <> Date: Tue, 30 Mar 2010 14:29:39 +0000 (+0000) Subject: Documentation and HTML Browser addition X-Git-Tag: v1_0_0~115 X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=ffd05fb1bcea1c1e0c5ab49e03b34fb387923533;p=bbtkGEditor.git Documentation and HTML Browser addition --- diff --git a/lib/EditorGraphicBBS/bbsKernelEditorGraphic/GObjectModel.h b/lib/EditorGraphicBBS/bbsKernelEditorGraphic/GObjectModel.h index bdffa06..c80da35 100644 --- a/lib/EditorGraphicBBS/bbsKernelEditorGraphic/GObjectModel.h +++ b/lib/EditorGraphicBBS/bbsKernelEditorGraphic/GObjectModel.h @@ -51,6 +51,7 @@ Version: $Revision$ //Includes std #include +//Includes bbtk #include namespace bbtk diff --git a/lib/EditorGraphicBBS/bbsVtkGUIEditorGraphic/GObjectsMVCFactory.h b/lib/EditorGraphicBBS/bbsVtkGUIEditorGraphic/GObjectsMVCFactory.h index 40bf577..8aa1bbe 100644 --- a/lib/EditorGraphicBBS/bbsVtkGUIEditorGraphic/GObjectsMVCFactory.h +++ b/lib/EditorGraphicBBS/bbsVtkGUIEditorGraphic/GObjectsMVCFactory.h @@ -48,7 +48,6 @@ Version: $Revision$ #include "GObjectController.h" #include "GObjectModel.h" #include "vtkGObjectView.h" - #include "GBlackBoxController.h" #include "vtkGBlackBoxView.h" #include "GBlackBoxModel.h" @@ -58,7 +57,7 @@ Version: $Revision$ //Includes std #include - +//Includes bbtk #include #include #include diff --git a/lib/EditorGraphicBBS/bbsVtkGUIEditorGraphic/vtkGObjectView.h b/lib/EditorGraphicBBS/bbsVtkGUIEditorGraphic/vtkGObjectView.h index 5c15592..880c09b 100644 --- a/lib/EditorGraphicBBS/bbsVtkGUIEditorGraphic/vtkGObjectView.h +++ b/lib/EditorGraphicBBS/bbsVtkGUIEditorGraphic/vtkGObjectView.h @@ -52,7 +52,6 @@ Version: $Revision$ //Includes vtk #include - #include "vtkConeSource.h" #include "vtkPolyDataMapper.h" #include "vtkActor.h" diff --git a/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/bbtkwxGUIEditorGraphicBBS.cxx b/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/bbtkwxGUIEditorGraphicBBS.cxx index 8d8c577..4e61236 100644 --- a/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/bbtkwxGUIEditorGraphicBBS.cxx +++ b/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/bbtkwxGUIEditorGraphicBBS.cxx @@ -90,23 +90,12 @@ namespace bbtk //Adds a tool btn to the toolbar _toolbar->AddTool(wxID_NEW,_T("New"),bmp_new, wxNullBitmap, wxITEM_NORMAL,_T("New tab"), _T("Create a new panel tab")); - - //////////////////// - // TEMP to avoid drag and drop - - _toolbar->AddTool(15,_T("New Box"),bmp_new, wxNullBitmap, wxITEM_NORMAL,_T("New Box"), _T("Create a new Box")); - - - // - //////////////////// - _toolbar->SetMargins( 2, 2 ); _toolbar->Realize(); SetToolBar(_toolbar); // connect command event handlers Connect(wxID_NEW,wxEVT_COMMAND_TOOL_CLICKED,wxCommandEventHandler(wxGUIEditorGraphicBBS::OnToolLeftClick)); - Connect(15,wxEVT_COMMAND_TOOL_CLICKED,wxCommandEventHandler(wxGUIEditorGraphicBBS::OnToolLeftClick)); } //========================================================================= @@ -167,10 +156,7 @@ namespace bbtk case wxID_NEW : std::cout<<"RaC New"<addNewTab(); - break; - case 15 : - BlackBoxDescriptor* desc = _pkgBrowser->GetActualSelected(); - + break; } } diff --git a/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/bbtkwxGUIEditorGraphicBBS.h b/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/bbtkwxGUIEditorGraphicBBS.h index a1b3878..3f498f2 100644 --- a/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/bbtkwxGUIEditorGraphicBBS.h +++ b/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/bbtkwxGUIEditorGraphicBBS.h @@ -66,6 +66,8 @@ #include #include +//Includes std + namespace bbtk { diff --git a/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/bbtkwxGUIEditorGraphicContainer.cxx b/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/bbtkwxGUIEditorGraphicContainer.cxx deleted file mode 100644 index 78e5754..0000000 --- a/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/bbtkwxGUIEditorGraphicContainer.cxx +++ /dev/null @@ -1,59 +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::wxGUIEditorGraphicContainer . - */ - - -#include "bbtkwxGUIEditorGraphicContainer.h" - -namespace bbtk -{ - - - //========================================================================= - wxGUIEditorGraphicContainer::wxGUIEditorGraphicContainer(wxWindow *parent ) - { - } - - //========================================================================= - wxGUIEditorGraphicContainer::~ wxGUIEditorGraphicContainer() - { - } - //========================================================================= - - - -} // EO namespace bbtk - -// EOF - diff --git a/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/bbtkwxGUIEditorGraphicContainer.h b/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/bbtkwxGUIEditorGraphicContainer.h deleted file mode 100644 index f393b17..0000000 --- a/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/bbtkwxGUIEditorGraphicContainer.h +++ /dev/null @@ -1,67 +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::wxGUIEditorGraphicContainer . - */ - -/** - * \class bbtk::wxGUIEditorGraphicContainer - * \brief - */ - -#ifndef __wxGUIEditorGraphicContainer_h__ -#define __wxGUIEditorGraphicContainer_h__ - -#include - -namespace bbtk -{ - - - class wxGUIEditorGraphicContainer - { - public: - wxGUIEditorGraphicContainer( wxWindow *parent ); - ~wxGUIEditorGraphicContainer(); - private: - - protected: - - }; - - -} -// namespace bbtk -#endif -