From: Eduardo Enrique Davila Serrano Date: Fri, 30 Sep 2022 14:49:07 +0000 (+0200) Subject: #3491 change DEFINE_EVENT_TYPE (obsolete) in pPlotter X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=fec30fa51356d19b1c0b8f7edc2c0edf68f5c117;p=creaMaracasVisu.git #3491 change DEFINE_EVENT_TYPE (obsolete) in pPlotter --- diff --git a/lib/maracasVisuLib/CMakeLists.txt b/lib/maracasVisuLib/CMakeLists.txt index c3b3afc..8d4385e 100644 --- a/lib/maracasVisuLib/CMakeLists.txt +++ b/lib/maracasVisuLib/CMakeLists.txt @@ -156,17 +156,12 @@ IF ( BUILD_${LIBRARY_NAME} ) # ${GDCM_LIBRARIES} # ${BOOST_LIBRARIES} ${OpenMP_libomp_LIBRARY_crea} - - #jhcl-Start=========================================================================== - ${LIBIDO_LIBRARIES} ${CREA_LIBRARIES} #${BOOST_LIBRARIES} #jhcl-End=========================================================================== #creaMaracasVisu_CutModule_interface - - BaseVolumeRenderer BaseSurfaceRenderer KernelVolumeRenderer @@ -174,16 +169,13 @@ IF ( BUILD_${LIBRARY_NAME} ) KernelSurfaceRenderer GUIWxSurfaceRenderer GUIWxVolumeRenderer - #EED CM #KernelVolumeRenderer #EED KernelViewerWidgets #KernelSurfaceRenderer #BaseSurfaceRenderer - ) #---------------------------------------------------------------------------- - #---------------------------------------------------------------------------- # MACRO WHICH DOES ALL THE JOB : BUILD AND INSTALL @@ -205,10 +197,15 @@ IF ( BUILD_${LIBRARY_NAME} ) # CREATE THE TARGET set (${LIBRARY_NAME}_SHARED SHARED) -message(EED mmmmmmmmmmmmmmmmmmmmmmmmmmmmmm "${${LIBRARY_NAME}_SHARED}" ) -message(EED mmmmmmmmmmmmmmmmmmmmmmmmmmmmmm ${LIBRARY_NAME} ) ADD_LIBRARY (${LIBRARY_NAME} ${${LIBRARY_NAME}_SHARED} ${${LIBRARY_NAME}_SOURCES} ${${LIBRARY_NAME}_HEADERS}) +message ("EED 1 :):):):):):):):):):):):):):):):):):):):):) ") +message ("EED 1 :):):):):):):):):):):):):):):):):):):):):) ") +message (${${LIBRARY_NAME}_SOURCES} ) +message ("EED 2 :):):):):):):):):):):):):):):):):):):):):) ") +message ("EED 2 :):):):):):):):):):):):):):):):):):):):):) ") + + # LINK TARGET_LINK_LIBRARIES(${LIBRARY_NAME} ${${LIBRARY_NAME}_LINK_LIBRARIES}) diff --git a/lib/maracasVisuLib/include/Modules/MARACAS_Find_WXWIDGETS.cmake b/lib/maracasVisuLib/include/Modules/MARACAS_Find_WXWIDGETS.cmake index 9ab329a..0eafd3c 100644 --- a/lib/maracasVisuLib/include/Modules/MARACAS_Find_WXWIDGETS.cmake +++ b/lib/maracasVisuLib/include/Modules/MARACAS_Find_WXWIDGETS.cmake @@ -1,7 +1,6 @@ IF(WIN32) - # WXWINDOWS_LIBRARY = full path to the wxWindows library and linker flags on unix # CMAKE_WX_CXX_FLAGS = compiler flags for building wxWindows # WXWINDOWS_INCLUDE_PATH = include path of wxWindows @@ -27,10 +26,17 @@ IF(WIN32) LINK_DIRECTORIES( ${WXWIDGETS_LINK_DIRECTORIES} ) SET(maracas_WXWIDGETS_LIBRARIES ${WXWIDGETS_LIBRARIES} - wxmsw28d_aui + # wxmsw28d_aui + "${wxWidgets_LIB_DIR}/libwxmsw32u_aui.a" + "${wxWidgets_LIB_DIR}/libwxmsw32u_webview.a" + "${wxWidgets_LIB_DIR}/libwxmsw32u_html.a" + "${wxWidgets_LIB_DIR}/libwxmsw32u_adv.a" + "${wxWidgets_LIB_DIR}/libwxmsw32u_gl.a" + "${wxWidgets_LIB_DIR}/libwxmsw32u_media.a" + "${wxWidgets_LIB_DIR}/libwxmsw32u_core.a" + "${wxWidgets_LIB_DIR}/libwxbase32u.a" + "${wxWidgets_LIB_DIR}/libwxbase32u_net.a" ) - - ENDIF(WIN32) IF(UNIX) # GTK2 diff --git a/lib/maracasVisuLib/src/interface/wxWindows/CMakeLists.txt b/lib/maracasVisuLib/src/interface/wxWindows/CMakeLists.txt index fb4cbf4..f51d85a 100644 --- a/lib/maracasVisuLib/src/interface/wxWindows/CMakeLists.txt +++ b/lib/maracasVisuLib/src/interface/wxWindows/CMakeLists.txt @@ -49,13 +49,10 @@ SET(MARACAS_TOOLS_SOURCES "tools/MaracasTools.cpp" ) - - #----------------------------------------------------------------------------- # Required libraries (dll o so) #----------------------------------------------------------------------------- - #TODO for a nice VC++ we need to add header file... SET(MARACAS_LIB_SRCS manualContour.cpp @@ -83,8 +80,6 @@ SET(MARACAS_LIB_SRCS wxMaracasRendererView.cxx wxMaracasRendererView.h - - ## widgets/wxVTKRenderWindowInteractor.cxx ## widgets/wxVTKRenderWindowInteractor.h widgets/wxVTKRenderWindowInteractorEditContour.cxx @@ -134,7 +129,6 @@ SET(MARACAS_LIB_SRCS res/wxInterface.rc ) - ADD_LIBRARY(MaracasInterfaceWX ${MARACAS_LIB_SRCS} ) TARGET_LINK_LIBRARIES(MaracasInterfaceWX ${maracas_WXWIDGETS_LIBRARIES} @@ -146,9 +140,6 @@ TARGET_LINK_LIBRARIES(MaracasInterfaceWX vtkCommon vtkFiltering vtkGraphics vtkIO vtkImaging vtkRendering vtkHybrid ) - - - #TODO for a nice VC++ we need to add header file... SET(MARACAS_LIB_SRCS_02 manualContour.cpp @@ -501,7 +492,6 @@ ELSE(WIN32) ${maracas_WXWIDGETS_LIBRARIES} ) - ENDIF(WIN32) ADD_SUBDIRECTORY(widgets) diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/mBarRange.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/mBarRange.cxx index 42db920..999ec6f 100644 --- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/mBarRange.cxx +++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/mBarRange.cxx @@ -31,12 +31,22 @@ //const wxEventType wxEVT_TSBAR = wxNewEventType(); -DEFINE_EVENT_TYPE(wxEVT_TSBAR) -DEFINE_EVENT_TYPE(wxEVT_TSBAR_ACTUAL) -DEFINE_EVENT_TYPE(wxEVT_TSBAR_START) -DEFINE_EVENT_TYPE(wxEVT_TSBAR_END) -DEFINE_EVENT_TYPE(wxEVT_TSBAR_MOVED) -DEFINE_EVENT_TYPE(wxEVT_SELECTION_END) +/* EED 2022-09-30 + DEFINE_EVENT_TYPE(wxEVT_TSBAR) + DEFINE_EVENT_TYPE(wxEVT_TSBAR_ACTUAL) + DEFINE_EVENT_TYPE(wxEVT_TSBAR_START) + DEFINE_EVENT_TYPE(wxEVT_TSBAR_END) + DEFINE_EVENT_TYPE(wxEVT_TSBAR_MOVED) + DEFINE_EVENT_TYPE(wxEVT_SELECTION_END) +*/ + +wxDEFINE_EVENT(wxEVT_TSBAR, wxCommandEvent); +wxDEFINE_EVENT(wxEVT_TSBAR_ACTUAL, wxCommandEvent); +wxDEFINE_EVENT(wxEVT_TSBAR_START, wxCommandEvent); +wxDEFINE_EVENT(wxEVT_TSBAR_END, wxCommandEvent); +wxDEFINE_EVENT(wxEVT_TSBAR_MOVED, wxCommandEvent); +wxDEFINE_EVENT(wxEVT_SELECTION_END, wxCommandEvent); + //---------------------------------------------------------------------------- //EVENT TABLE diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/mBarRange.h b/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/mBarRange.h index 25d4e2f..e3ace89 100644 --- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/mBarRange.h +++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/mBarRange.h @@ -23,18 +23,14 @@ # knowledge of the CeCILL-B license and that you accept its terms. # ------------------------------------------------------------------------ */ - - #ifndef __mBAR__RANGE__ #define __mBAR__RANGE__ - //----------------------------------------------------------------------------- // Includes //----------------------------------------------------------------------------- #include "wx/colordlg.h" - // ---------------------------------------------------------------------------- // wx headers inclusion. // For compilers that support precompilation, includes . @@ -53,6 +49,15 @@ //wxEVT_TSBAR= event of the two side bar //---------------------------------------------------------------------------- +//EED 2022-09-30 +wxDECLARE_EVENT(wxEVT_TSBAR, wxCommandEvent); +wxDECLARE_EVENT(wxEVT_TSBAR_ACTUAL, wxCommandEvent); +wxDECLARE_EVENT(wxEVT_TSBAR_START, wxCommandEvent); +wxDECLARE_EVENT(wxEVT_TSBAR_END, wxCommandEvent); +wxDECLARE_EVENT(wxEVT_TSBAR_MOVED, wxCommandEvent); +wxDECLARE_EVENT(wxEVT_SELECTION_END, wxCommandEvent); + +/* EED 2022-09-30 BEGIN_DECLARE_EVENT_TYPES() DECLARE_EVENT_TYPE(wxEVT_TSBAR,-1) DECLARE_EVENT_TYPE(wxEVT_TSBAR_ACTUAL,-1) @@ -63,7 +68,7 @@ BEGIN_DECLARE_EVENT_TYPES() DECLARE_EVENT_TYPE(wxEVT_TSBAR_MOVED,-1) DECLARE_EVENT_TYPE(wxEVT_SELECTION_END,-1) END_DECLARE_EVENT_TYPES() - +*/ diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/mBarRange2.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/mBarRange2.cxx index c07727b..ce7b269 100644 --- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/mBarRange2.cxx +++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/mBarRange2.cxx @@ -31,7 +31,11 @@ #include "mBarRange2.h" +/* EED 2022-09-30 DEFINE_EVENT_TYPE(wxEVT_BarRange2_Change) +*/ +wxDEFINE_EVENT(wxEVT_BarRange2_Change, wxCommandEvent); + /** diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/mBarRange2.h b/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/mBarRange2.h index b1450db..1725cb3 100644 --- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/mBarRange2.h +++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/mBarRange2.h @@ -42,9 +42,15 @@ #include #include "mBarRange.h" +/* EED 2022-09-30 BEGIN_DECLARE_EVENT_TYPES() DECLARE_EVENT_TYPE(wxEVT_BarRange2_Change,-1) END_DECLARE_EVENT_TYPES() +*/ +wxDECLARE_EVENT(wxEVT_BarRange2_Change, wxCommandEvent); + + + class mBarRange2 : public wxPanel diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/pColorBar.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/pColorBar.cxx index 68874cc..aeea9ba 100644 --- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/pColorBar.cxx +++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/pColorBar.cxx @@ -35,6 +35,7 @@ /* * How to catch generated event: EVT_COMMAND(ID_CONTAINER_WINDOW_LISTENER, wxEVT_TYPE_EVENT, ContainerClass :: determinedEventFor) */ +/* EED 2022-09-30 BEGIN_DECLARE_EVENT_TYPES() DECLARE_EVENT_TYPE( wxEVT_ADDED_POINT, -1 ) DECLARE_EVENT_TYPE( wxEVT_REMOVED_POINT, -1 ) @@ -42,13 +43,23 @@ BEGIN_DECLARE_EVENT_TYPES() DECLARE_EVENT_TYPE( wxEVT_CHANGED_POINT, -1 ) DECLARE_EVENT_TYPE( wxEVT_ON_COLOR_BAR, -1 ) END_DECLARE_EVENT_TYPES() +*/ - +/* EED 2022-09-30 DEFINE_EVENT_TYPE( wxEVT_ADDED_POINT ) DEFINE_EVENT_TYPE( wxEVT_REMOVED_POINT ) DEFINE_EVENT_TYPE( wxEVT_MOVED_POINT ) DEFINE_EVENT_TYPE( wxEVT_CHANGED_POINT ) DEFINE_EVENT_TYPE( wxEVT_ON_COLOR_BAR ) +*/ + +wxDEFINE_EVENT(wxEVT_ADDED_POINT, wxCommandEvent); +wxDEFINE_EVENT(wxEVT_REMOVED_POINT, wxCommandEvent); +wxDEFINE_EVENT(wxEVT_MOVED_POINT, wxCommandEvent); +wxDEFINE_EVENT(wxEVT_CHANGED_POINT, wxCommandEvent); +wxDEFINE_EVENT(wxEVT_ON_COLOR_BAR, wxCommandEvent); + + //------------------------------------------------------------------------------------------------------------ // Class implementation diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/pColorBar.h b/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/pColorBar.h index 54c8fce..60395e6 100644 --- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/pColorBar.h +++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/pColorBar.h @@ -62,6 +62,7 @@ */ #define FIGURE_WIDTH 3 +/* EED 2022-09-30 BEGIN_DECLARE_EVENT_TYPES() DECLARE_EVENT_TYPE( wxEVT_ADDED_POINT, -1 ) DECLARE_EVENT_TYPE( wxEVT_REMOVED_POINT, -1 ) @@ -69,6 +70,7 @@ BEGIN_DECLARE_EVENT_TYPES() DECLARE_EVENT_TYPE( wxEVT_CHANGED_POINT, -1 ) DECLARE_EVENT_TYPE( wxEVT_ON_COLOR_BAR, -1 ) END_DECLARE_EVENT_TYPES() +*/ //------------------------------------------------------------------------------------------------------------- diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/pPlotter.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/pPlotter.cxx index c6d803e..17083fa 100644 --- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/pPlotter.cxx +++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/pPlotter.cxx @@ -55,31 +55,44 @@ DEFINE_EVENT_TYPE( wxEVT_NW_TEXT_MESAGGE ) // ---------------------------------------------------------------------------------------------------- // Handdled events from pColorBar // ---------------------------------------------------------------------------------------------------- +wxDEFINE_EVENT(wxEVT_ADDED_POINT, wxCommandEvent); +wxDEFINE_EVENT(wxEVT_REMOVED_POINT, wxCommandEvent); +wxDEFINE_EVENT(wxEVT_MOVED_POINT, wxCommandEvent); +wxDEFINE_EVENT(wxEVT_CHANGED_POINT, wxCommandEvent); +wxDEFINE_EVENT(wxEVT_ON_COLOR_BAR, wxCommandEvent); +/* EED 2022-10-30 DECLARE_EVENT_TYPE(wxEVT_ADDED_POINT, -1) DECLARE_EVENT_TYPE(wxEVT_REMOVED_POINT, -1) DECLARE_EVENT_TYPE(wxEVT_MOVED_POINT, -1) DECLARE_EVENT_TYPE(wxEVT_CHANGED_POINT, -1) DECLARE_EVENT_TYPE(wxEVT_ON_COLOR_BAR, -1) +*/ + // ---------------------------------------------------------------------------------------------------- // Handdled events from plotter // ---------------------------------------------------------------------------------------------------- -DECLARE_EVENT_TYPE(wxEVT_PPLOTTER_CHANGED_FUNCTION, -1) -DECLARE_EVENT_TYPE(wxEVT_PPLOTTER_POINT_MOVE, -1) -DECLARE_EVENT_TYPE(wxEVT_PPLOTTER_POINT_ADD, -1) -DECLARE_EVENT_TYPE(wxEVT_PPLOTTER_POINT_DELETE, -1) -DECLARE_EVENT_TYPE(wxEVT_PPLOTTER_GUIDELINES, -1) +// EED 2022-10-30 +/* +wxDEFINE_EVENT(wxEVT_PPLOTTER_CHANGED_FUNCTION, wxCommandEvent); +wxDEFINE_EVENT(wxEVT_PPLOTTER_POINT_MOVE, wxCommandEvent); +wxDEFINE_EVENT(wxEVT_PPLOTTER_POINT_ADD, wxCommandEvent); +wxDEFINE_EVENT(wxEVT_PPLOTTER_POINT_DELETE, wxCommandEvent); +wxDEFINE_EVENT(wxEVT_PPLOTTER_GUIDELINES, wxCommandEvent); +*/ + // ---------------------------------------------------------------------------------------------------- // Handdled events from max-min barrange // ---------------------------------------------------------------------------------------------------- +/*EED 2022-10-30 DECLARE_EVENT_TYPE(wxEVT_TSBAR, -1) DECLARE_EVENT_TYPE(wxEVT_TSBAR_ACTUAL, -1) DECLARE_EVENT_TYPE(wxEVT_TSBAR_START, -1) DECLARE_EVENT_TYPE(wxEVT_TSBAR_END, -1) DECLARE_EVENT_TYPE(wxEVT_TSBAR_MOVED, -1) DECLARE_EVENT_TYPE(wxEVT_SELECTION_END, -1) - +*/ // ---------------------------------------------------------------------------------------------------- // EVENT TABLE (->Connect: analogous) diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/pPlotter.h b/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/pPlotter.h index 62572b9..fcec728 100644 --- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/pPlotter.h +++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/pPlotter.h @@ -65,6 +65,25 @@ // Class definition //-------------------------------------------------------------------------------------------- +// EED 2022-09-30 +wxDECLARE_EVENT(wxEVT_ADDED_POINT, wxCommandEvent); +wxDECLARE_EVENT(wxEVT_REMOVED_POINT, wxCommandEvent); +wxDECLARE_EVENT(wxEVT_MOVED_POINT, wxCommandEvent); +wxDECLARE_EVENT(wxEVT_CHANGED_POINT, wxCommandEvent); +wxDECLARE_EVENT(wxEVT_ON_COLOR_BAR, wxCommandEvent); + + +// EED 2022-09-30 +/* Al ready exist in pPlotterWindow +wxDECLARE_EVENT(wxEVT_PPLOTTER_CHANGED_FUNCTION, wxCommandEvent); +wxDECLARE_EVENT(wxEVT_PPLOTTER_POINT_MOVE, wxCommandEvent); +wxDECLARE_EVENT(wxEVT_PPLOTTER_POINT_ADD, wxCommandEvent); +wxDECLARE_EVENT(wxEVT_PPLOTTER_POINT_DELETE, wxCommandEvent); +wxDECLARE_EVENT(wxEVT_PPLOTTER_GUIDELINES, wxCommandEvent); +*/ + + + /* * Represents the integrated plotter that consists of the a drawing area, and control bars (min-max bar, degrade bar) */ diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/pPlotterWindow.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/pPlotterWindow.cxx index ea0be8f..96a0659 100644 --- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/pPlotterWindow.cxx +++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/pPlotterWindow.cxx @@ -46,13 +46,14 @@ //DECLARING THE NEW EVENT //wxEVT_TSBAR= event of the two side bar //---------------------------------------------------------------------------- +/* EED 2020-09-30 BEGIN_DECLARE_EVENT_TYPES() -DECLARE_EVENT_TYPE(wxEVT_PPLOTTER, -1) -DECLARE_EVENT_TYPE(wxEVT_PPLOTTER_CHANGED_FUNCTION, -1) -DECLARE_EVENT_TYPE(wxEVT_PPLOTTER_POINT_MOVE, -1) -DECLARE_EVENT_TYPE(wxEVT_PPLOTTER_POINT_ADD, -1) -DECLARE_EVENT_TYPE(wxEVT_PPLOTTER_POINT_DELETE, -1) -DECLARE_EVENT_TYPE(wxEVT_PPLOTTER_GUIDELINES, -1) + DECLARE_EVENT_TYPE(wxEVT_PPLOTTER, -1) + DECLARE_EVENT_TYPE(wxEVT_PPLOTTER_CHANGED_FUNCTION, -1) + DECLARE_EVENT_TYPE(wxEVT_PPLOTTER_POINT_MOVE, -1) + DECLARE_EVENT_TYPE(wxEVT_PPLOTTER_POINT_ADD, -1) + DECLARE_EVENT_TYPE(wxEVT_PPLOTTER_POINT_DELETE, -1) + DECLARE_EVENT_TYPE(wxEVT_PPLOTTER_GUIDELINES, -1) END_DECLARE_EVENT_TYPES() //definitions @@ -62,6 +63,14 @@ DEFINE_EVENT_TYPE(wxEVT_PPLOTTER_POINT_MOVE) DEFINE_EVENT_TYPE(wxEVT_PPLOTTER_POINT_ADD) DEFINE_EVENT_TYPE(wxEVT_PPLOTTER_POINT_DELETE) DEFINE_EVENT_TYPE(wxEVT_PPLOTTER_GUIDELINES) +*/ + +wxDEFINE_EVENT(wxEVT_PPLOTTER, wxCommandEvent); +wxDEFINE_EVENT(wxEVT_PPLOTTER_CHANGED_FUNCTION, wxCommandEvent); +wxDEFINE_EVENT(wxEVT_PPLOTTER_POINT_MOVE, wxCommandEvent); +wxDEFINE_EVENT(wxEVT_PPLOTTER_POINT_ADD, wxCommandEvent); +wxDEFINE_EVENT(wxEVT_PPLOTTER_POINT_DELETE, wxCommandEvent); +wxDEFINE_EVENT(wxEVT_PPLOTTER_GUIDELINES, wxCommandEvent); //---------------------------------------------------------------------------- diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/pPlotterWindow.h b/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/pPlotterWindow.h index 264cc73..018bfe7 100644 --- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/pPlotterWindow.h +++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/pPlotterWindow.h @@ -75,6 +75,17 @@ enum }; + +wxDECLARE_EVENT(wxEVT_PPLOTTER, wxCommandEvent); +wxDECLARE_EVENT(wxEVT_PPLOTTER_CHANGED_FUNCTION, wxCommandEvent); +wxDECLARE_EVENT(wxEVT_PPLOTTER_POINT_MOVE, wxCommandEvent); +wxDECLARE_EVENT(wxEVT_PPLOTTER_POINT_ADD, wxCommandEvent); +wxDECLARE_EVENT(wxEVT_PPLOTTER_POINT_DELETE, wxCommandEvent); +wxDECLARE_EVENT(wxEVT_PPLOTTER_GUIDELINES, wxCommandEvent); + + + + #define MAX_FUNCTIONS 7 /** this scale, scales each function with its maximum x, and maximum y