]> Creatis software - creaMaracasVisu.git/commitdiff
#2620 creaMaracasVisu Feature New Normal - creaPanelButtonContainer New wxWidget... creaButtonContainer
authorespinosa <Monica.Espinosa@creatis.insa-lyon.fr>
Fri, 17 Apr 2015 15:22:57 +0000 (17:22 +0200)
committerespinosa <Monica.Espinosa@creatis.insa-lyon.fr>
Fri, 17 Apr 2015 15:22:57 +0000 (17:22 +0200)
lib/maracasVisuLib/src/interface/wxWindows/widgets/creaButtonContainer/view/comboBox.cxx [new file with mode: 0644]
lib/maracasVisuLib/src/interface/wxWindows/widgets/creaButtonContainer/view/comboBox.h [new file with mode: 0644]
lib/maracasVisuLib/src/interface/wxWindows/widgets/creaPanelButtonContainer/buttonContainerSettings.cxx
lib/maracasVisuLib/src/interface/wxWindows/widgets/creaPanelButtonContainer/buttonContainerSettings.h
lib/maracasVisuLib/src/interface/wxWindows/widgets/creaPanelButtonContainer/creaPanelButtonContainer.cxx
lib/maracasVisuLib/src/interface/wxWindows/widgets/creaPanelButtonContainer/creaPanelButtonContainer.h

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/creaButtonContainer/view/comboBox.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/creaButtonContainer/view/comboBox.cxx
new file mode 100644 (file)
index 0000000..aa30564
--- /dev/null
@@ -0,0 +1,142 @@
+/*# ---------------------------------------------------------------------
+ #
+ # Copyright (c) CREATIS (Centre de Recherche en Acquisition et Traitement de l'Image
+ #                        pour la Sant�)
+ # Authors : Eduardo Davila, Frederic Cervenansky, Claire Mouton
+ # Previous Authors : Laurent Guigues, Jean-Pierre Roux
+ # CreaTools website : www.creatis.insa-lyon.fr/site/fr/creatools_accueil
+ #
+ #  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.
+ # ------------------------------------------------------------------------ */
+
+#include "comboBox.h"
+
+namespace creaButtonContainer
+{
+       namespace view
+       {
+               // ----------------------------------------------------------------------------------
+
+       ComboBox::ComboBox(wxWindow* parent, wxWindowID id, ItemsVector iVector,
+                               TFunctor* functor)
+                               : wxPanel(parent, id)
+               {
+
+                       this->m_Functor = functor;
+
+                       wxBoxSizer* sizer = new wxBoxSizer(wxHORIZONTAL);
+
+                       this->SetSizer(sizer);
+
+                       this->m_ComboBox = new wxComboBox(this, -1);
+                       this->m_FunctorEnabled = true;
+
+                       this->Connect(wxEVT_COMMAND_COMBOBOX_SELECTED,
+                                       wxCommandEventHandler(ComboBox::OnComboBoxEvent));
+
+                       if (!iVector.empty())
+                       {
+                               for (ItemsVector::iterator it = iVector.begin(); it != iVector.end();
+                                               ++it)
+                               {
+                                       std::string key = it->first;
+                                       this->m_ComboBox->Append(wxString(key.c_str(), wxConvUTF8));
+                               }
+                       }
+
+                       sizer->Add(this->m_ComboBox, 1, wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL);
+
+               }
+               // ----------------------------------------------------------------------------------
+
+       ComboBox::ComboBox(wxWindow* parent, wxWindowID id, TFunctor* functor)
+                               : wxPanel(parent, id)
+               {
+                       this->m_Functor = functor;
+
+                       wxBoxSizer* sizer = new wxBoxSizer(wxHORIZONTAL);
+
+                       this->SetSizer(sizer);
+
+                       this->m_ComboBox = new wxComboBox(this, -1);
+                       this->m_FunctorEnabled = true;
+
+                       this->Connect(wxEVT_COMMAND_COMBOBOX_SELECTED,
+                                       wxCommandEventHandler(ComboBox::OnComboBoxEvent));
+
+                       sizer->Add(this->m_ComboBox, 1, wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL);
+
+               }
+               // ----------------------------------------------------------------------------------
+
+       ComboBox::~ComboBox()
+               {
+
+               }
+
+               // ----------------------------------------------------------------------------------
+
+               void ComboBox::OnComboBoxEvent(wxCommandEvent& event)
+               {
+                       if (!this->IsFunctorEnabled())
+                               return;
+                       else
+                       {
+                               try
+                               {
+                                       std::cout << "MLER | ComboBox::OnComboBoxEvent( wxCommandEvent& event )"
+                                                       << std::endl;
+
+                                       int iSelection;
+                                       iSelection = this->m_ComboBox->GetSelection();
+
+                                       wxString itemNom = this->m_ComboBox->GetString(iSelection);
+                                       std::string itemNomC = std::string(itemNom.mb_str());
+
+                                       this->m_Functor->Call(itemNomC);
+
+                               } //yrt
+                               catch (const std::exception& e)
+                               {
+                                       std::cerr
+                                                       << "ButtonContainerController::OnComboBoxEvent( wxCommandEvent& event ) exception: "
+                                                       << e.what() << std::endl;
+                               } //hctac
+                       }
+               }
+               // ----------------------------------------------------------------------------------
+
+               void ComboBox::SetFunctorEnabled(const bool& enabled)
+               {
+                       this->m_FunctorEnabled = enabled;
+               }
+               // ----------------------------------------------------------------------------------
+               bool ComboBox::IsFunctorEnabled() const
+               {
+                       return this->m_FunctorEnabled;
+               }
+
+               // ----------------------------------------------------------------------------------
+               wxComboBox*
+               ComboBox::GetComboBox() const
+               {
+                       return this->m_ComboBox;
+               }
+
+       } //ecapseman
+} //ecapseman
+
diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/creaButtonContainer/view/comboBox.h b/lib/maracasVisuLib/src/interface/wxWindows/widgets/creaButtonContainer/view/comboBox.h
new file mode 100644 (file)
index 0000000..aa359f4
--- /dev/null
@@ -0,0 +1,157 @@
+/*# ---------------------------------------------------------------------
+ #
+ # Copyright (c) CREATIS (Centre de Recherche en Acquisition et Traitement de l'Image
+ #                        pour la Sant�)
+ # Authors : Eduardo Davila, Frederic Cervenansky, Claire Mouton
+ # Previous Authors : Laurent Guigues, Jean-Pierre Roux
+ # CreaTools website : www.creatis.insa-lyon.fr/site/fr/creatools_accueil
+ #
+ #  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 listWx.h
+ * @brief This contains the ListWx class.
+ * @author Monica ESPINOSA (espinosa[AT]creatis.insa-lyon.fr)
+ * @date  2015-01-02
+ */
+
+#ifndef COMBOBOX_H
+#define COMBOBOX_H
+
+//#include <wx/bmpbuttn.h>
+#include <wx/panel.h>
+#include <wx/string.h>
+#include <wx/combobox.h>
+#include <wx/wx.h>
+#include <wx/event.h>
+
+#include <string>
+#include <vector>
+#include <utility>
+
+#include "functor.h"
+#include "system.h"
+
+/*!    @namespace <creaButtonContainer>
+ *     @brief Contains the creaButtonContainer library included in creaMaracasVisu.
+ */
+namespace creaButtonContainer
+{
+       /*! @namespace <creaButtonContainer::view>
+        *      @brief Contains the implementation of the view in creaButtonContainer library.
+        *      @see <a href="http://en.wikipedia.org/wiki/Model-view-controller">MVC Software Architecture</a>
+        */
+       namespace view
+       {
+               /*! @class ListWx listWx.h "listWx.h"
+                *      @brief This class contains the list in the panel.
+                *  @details This class contains the information of a list, it derives from wxPanel.
+                *  @see <a href="http://docs.wxwidgets.org/stable/wx_wxpanel.html">wxPanel</a>
+                */
+               class ComboBox: public wxPanel
+               {
+                       public:
+                               //typedef definition.
+                               // ----------------------------------------------------------------------------------
+                               /*!     typedef creaButtonContainer::model::TFunctor TFunctor;
+                                *      @brief Defines the TFunctor type.
+                                */
+                               typedef creaButtonContainer::model::TFunctor TFunctor;
+                               // ----------------------------------------------------------------------------------
+                               /*!     @typedef std::pair<std::string, wxPanel*> ListAction;
+                                *      @brief Defines the ListAction type.
+                                *      First is the button name(item list), Second FunctionEventType
+                                */
+                               typedef std::pair<std::string, wxPanel*> ListAction;
+                               // ----------------------------------------------------------------------------------
+                               /*!     @typedef std::vector<ListAction> ItemsVector;
+                                *      @brief Defines the Items Vector type.
+                                */
+                               typedef std::vector<ListAction> ItemsVector;
+                               // ----------------------------------------------------------------------------------
+                               //end of typedef definition.
+
+                       public:
+                               // ----------------------------------------------------------------------------------
+                               /*! @fn ListWx( wxWindow* parent, wxWindowID id, ItemsVector iVector,
+                                TFunctor* functor );
+                                *      @brief This is the parameterized constructor.
+                                *      @param parent The wxWindow pointer to parent.
+                                *      @param id The wxID of the button.
+                                *      @param ItemsVector //The items Vector (name, wxPanel).
+                                *      @param TFunctor //The functor of items list.
+                                */
+                               ComboBox(wxWindow* parent, wxWindowID id, ItemsVector iVector,
+                                               TFunctor* functor);
+                               // ----------------------------------------------------------------------------------
+                               /*! @fn ListWx( wxWindow* parent, wxWindowID id, TFunctor* functor );
+                                *      @brief This is the parameterized constructor.
+                                *      @param parent The wxWindow pointer to parent.
+                                *      @param id The wxID of the button.
+                                *      @param TFunctor //The functor of items list.
+                                */
+                               ComboBox(wxWindow* parent, wxWindowID id, TFunctor* functor);
+                               // ----------------------------------------------------------------------------------
+                               /*! @fn virtual ~Button( );
+                                *      @brief This is the destructor.
+                                */
+                               virtual
+                               ~ComboBox();
+                               // ----------------------------------------------------------------------------------
+                               /*! @fn void OnListEvent( wxCommandEvent& event );
+                                *  @brief This method calls the functor when
+                                *  an item of list is clicked.
+                                *      @param event
+                                */
+                               void
+                               OnComboBoxEvent(wxCommandEvent& event);
+                               // ----------------------------------------------------------------------------------
+                               /*! @fn void SetFunctorEnabled( wxCommandEvent& event );
+                                *  @brief This method set the state of Functor (enable or disable)
+                                *      @param enabled
+                                */
+                               void
+                               SetFunctorEnabled(const bool& enabled);
+                               // ----------------------------------------------------------------------------------
+                               /*! @fn bool OnListEvent( wxCommandEvent& event );
+                                *  @brief This method ask the state of functor.
+                                *      @return
+                                */
+                               bool
+                               IsFunctorEnabled() const;
+                               // ----------------------------------------------------------------------------------
+                               /*! @fn wxListBox* GetListBox() const;
+                                *      @brief This method returns the wxlistBox.
+                                *      @exception std::bad_alloc
+                                *      @return wxListBox
+                                */
+                               wxComboBox*
+                               GetComboBox() const;
+                               // ----------------------------------------------------------------------------------
+
+                       private:
+
+                               wxComboBox* m_ComboBox;                         //!< This is the Items List.
+                               TFunctor* m_Functor;                            //!< This is the functor.
+                               bool m_FunctorEnabled;                          //!< Disable or Enable Functor.
+
+               };
+       } //ecapseman
+} //ecapseman
+
+#endif // COMBOBOX_H
index f7cceccbc0cfd787a77303031e5d0abdb014f70b..130b81b7faea6aa56ce59df6b8ecb925fb2c4eda 100644 (file)
@@ -215,9 +215,10 @@ namespace creaPanelButtonContainer
                        {
                                if (type == 0)
                                        this->AddButton(*it);
-                               else if (type == 1 || type == 2)
+                               else if (type == 1 || type == 2 || type == 3)
                                        this->AddItems(*it);
 
+
                        }                                       //rof
                }                                       //yrt
                catch (std::exception& e)
index 80528a24488ef2a1eb1fbfaacb815ef8475de26e..4bd2ce508fac2f0ecdb2d55054f65936dd3ae6af 100644 (file)
@@ -35,7 +35,7 @@
 
 #include <wx/panel.h>
 #include <wx/bitmap.h>
-#include <wx/listctrl.h>
+//#include <wx/listctrl.h>
 
 #include <list>
 #include <map>
index f356d35b59cab70e80cde28b5014bf66b46e30f4..8024f4aacb6b1402220d417f8cf16c3a54136ed8 100644 (file)
@@ -157,7 +157,29 @@ namespace creaPanelButtonContainer
                                        wxCommandEventHandler(PanelButtonContainer::OnConfigButton));
 
                }
+               else if (type == 3)
+               {
+                       //MLER
+                       TConcreteFunctor* lFunctor = new TConcreteFunctor(this,
+                       &PanelButtonContainer::GenericListEvent);
+
+                       this->m_EventPanel = new wxPanel(this);
+                       std::cout << "MLER Type 3; new ComboBox" << std::endl;
 
+                       this->m_ComboBoxPanel = new ComboBox(this, -1,
+                       this->m_ButtonContainerSettings->GetItemsVector(), lFunctor);
+
+                       //Bottom Panel
+                       this->m_AuiManager->AddPane(this->m_EventPanel,
+                               wxAuiPaneInfo().Name(_T("EventPanel")).Caption(_("EventPanel")).CaptionVisible(
+                               true).MinimizeButton().MaximizeButton().CloseButton(false).Center().Resizable(
+                               true));
+                       //Top Panel
+                       this->m_AuiManager->AddPane(this->m_ComboBoxPanel,
+                               wxAuiPaneInfo().Name(_T("ComboBoxContainerPanel")).DefaultPane().Caption(
+                               _("ComboBoxContainerPanel")).PinButton().CaptionVisible(true).CloseButton(
+                               false).Center().Resizable(true));
+               }
                //End MLER
 
                this->m_AuiManager->Update();
index 24e7e783733685512ef26868a8c52c14db652547..71ec045bf70e8a1b53a2ab4a674124f146c98f1d 100644 (file)
@@ -47,6 +47,7 @@
 #include "functor.h"
 #include "listWx.h"
 #include "Settings.xpm"
+#include "comboBox.h"
 
 /*!    @namespace <creaPanelButtonContainer>
  *     @brief Contains the creaPanelButtonContainer library included in creaMaracasVisu.
@@ -82,6 +83,9 @@ namespace creaPanelButtonContainer
                         *      This class inherits from wxDialog and contains the wxListBox and wxButton.
                         */
                        typedef creaButtonContainer::view::ListConfigDialog ListConfigDialog;
+
+                       typedef creaButtonContainer::view::ComboBox ComboBox;
+
                        // ----------------------------------------------------------------------------------
                        //End MLER
                //end of typedef definition.
@@ -161,6 +165,8 @@ namespace creaPanelButtonContainer
                        ListWx* m_CurrentWxPanel;//!<This panel contains the final list of the elements .
 
                        wxBitmapButton* m_ConfigButton;//!< "Config" Settings button.
+
+                       ComboBox* m_ComboBoxPanel;//!<This panel contains the list of the comboBox elements.
                        //End MLER
 
                        DECLARE_EVENT_TABLE()