X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=bbtk%2Fsrc%2FbbmaracasvisuShowNPoints.h;h=d9eccccd0c09ef45998adaac1691d59c7da683fc;hb=1e7de89ec5e380426c57ee4e85c6a5ccd5aa44ad;hp=8a2feec1f234fa1eb6c3f44fd86144b4dbad06e2;hpb=2fcae0362dddfd613ec085c6b48da49e721d0021;p=creaMaracasVisu.git diff --git a/bbtk/src/bbmaracasvisuShowNPoints.h b/bbtk/src/bbmaracasvisuShowNPoints.h index 8a2feec..d9ecccc 100644 --- a/bbtk/src/bbmaracasvisuShowNPoints.h +++ b/bbtk/src/bbmaracasvisuShowNPoints.h @@ -1,3 +1,28 @@ +/*# --------------------------------------------------------------------- +# +# 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. +# ------------------------------------------------------------------------ */ + #ifdef _USE_WXWIDGETS_ #ifndef __bbcreaMaracasVisuShowNPoints_h_INCLUDED__ #define __bbcreaMaracasVisuShowNPoints_h_INCLUDED__ @@ -5,8 +30,10 @@ #include "vtkActor.h" +#include "vtkSphereSource.h" #include "vtkImageData.h" #include "vtkRenderer.h" +#include "vtkTextActor3D.h" namespace bbcreaMaracasVisu { @@ -20,10 +47,16 @@ namespace bbcreaMaracasVisu WidgetShowNPoints( wxWindow *parent, ShowNPoints *box); ~WidgetShowNPoints(); void OnAddPoint(wxCommandEvent &event); - void ErasePoint(int id); + void OnSetPoint(wxCommandEvent& event); + void OnRenamePoint(wxCommandEvent& event); void OnErasePoint(wxCommandEvent& event); void OnEraseLastPoint(wxCommandEvent &event); void OnDeleteAllPoints(wxCommandEvent &event); + void OnSavePoints(wxCommandEvent &event); + void OnLoadPoints(wxCommandEvent &event); + void UpdatePoints(wxCommandEvent &event); + + void RefreshPoint(int id); void SetPoint(std::vector ppoint); void SetColour(std::vector colour); @@ -34,25 +67,44 @@ namespace bbcreaMaracasVisu std::vector GetLstPointsX(); std::vector GetLstPointsY(); std::vector GetLstPointsZ(); + std::vector GetLstLabels(); + + void AddPoint(int x, int y, int z, std::string label); + private: - ShowNPoints *mbbShowNPoints; - vtkRenderer *renderer; - std::vector lstPointsX; - std::vector lstPointsY; - std::vector lstPointsZ; - std::vector lstActorsSphere; - std::vector lstActorsText; - - std::vector mpoint; - vtkImageData *mimage; - std::vector mcolour; - double mopacity; - double mradio; - wxTextCtrl *textCtrl; - }; + std::string CleanSpaces(std::string ss); + int GetNearestPoint(); + int IdInsidePoint(); + void ErasePoint(int id); + void SetOutputBox(); + + ShowNPoints *mbbShowNPoints; + vtkRenderer *renderer; + std::vector lstPointsX; + std::vector lstPointsY; + std::vector lstPointsZ; + std::vector lstLabels; + std::vector lstActorsSphere;//NTU changed from prop3D to Actor + std::vector lstActorsText; + //NTU: For updating points + + std::vector lstSourceSphere; + + std::vector mpoint; + vtkImageData *mimage; + std::vector mcolour; + double mopacity; + double mradio; + wxStaticText *askPointLabel; + wxTextCtrl *textCtrl; + wxStaticText *txtNrPoints; + wxSlider *sdrOpacity; + wxSlider *sdrRadio; + + }; class /*BBTK_EXPORT*/ ShowNPoints : @@ -65,9 +117,11 @@ class /*BBTK_EXPORT*/ ShowNPoints BBTK_DECLARE_INPUT(Colour, std::vector ); BBTK_DECLARE_INPUT(Opacity, double ); BBTK_DECLARE_INPUT(Radio, double ); + BBTK_DECLARE_INPUT(Type, int ); BBTK_DECLARE_OUTPUT( lstPointsX, std::vector ); BBTK_DECLARE_OUTPUT( lstPointsY, std::vector ); BBTK_DECLARE_OUTPUT( lstPointsZ, std::vector ); + BBTK_DECLARE_OUTPUT( lstLabels, std::vector ); BBTK_PROCESS(Process); void Process(); BBTK_CREATE_WIDGET(CreateWidget); @@ -75,27 +129,27 @@ class /*BBTK_EXPORT*/ ShowNPoints private: WidgetShowNPoints *mwxwidget; - }; BBTK_BEGIN_DESCRIBE_BLACK_BOX(ShowNPoints,bbtk::WxBlackBox); -BBTK_NAME("ShowNPoints"); -BBTK_AUTHOR("Eduardo DAVILA"); -BBTK_DESCRIPTION("widget that shows N moints in 3D (vtkActors)"); -BBTK_CATEGORY("widgetVtk"); -BBTK_INPUT(ShowNPoints,In,"One Point",std::vector,""); -BBTK_INPUT(ShowNPoints,Renderer,"Renderer",vtkRenderer*,""); -BBTK_INPUT(ShowNPoints,Image,"vktkImageData",vtkImageData*,""); -BBTK_INPUT(ShowNPoints,Colour,"Colour of the actor",std::vector,"colour"); -BBTK_INPUT(ShowNPoints,Opacity,"Opacity of the actor",double,""); -BBTK_INPUT(ShowNPoints,Radio,"Radio of the spheres",double,""); -BBTK_OUTPUT(ShowNPoints , lstPointsX , " list of points X ", std::vector ,""); -BBTK_OUTPUT(ShowNPoints , lstPointsY , " list of points Y ", std::vector ,""); -BBTK_OUTPUT(ShowNPoints , lstPointsZ , " list of points Z ", std::vector ,""); + BBTK_NAME("ShowNPoints"); + BBTK_AUTHOR("Eduardo DAVILA"); + BBTK_DESCRIPTION("widget that shows N moints in 3D (vtkActors)"); + BBTK_CATEGORY("widgetVtk"); + BBTK_INPUT(ShowNPoints,In,"One Point",std::vector,""); + BBTK_INPUT(ShowNPoints,Renderer,"Renderer",vtkRenderer*,""); + BBTK_INPUT(ShowNPoints,Image,"vktkImageData",vtkImageData*,""); + BBTK_INPUT(ShowNPoints,Colour,"Colour of the actor",std::vector,"colour"); + BBTK_INPUT(ShowNPoints,Opacity,"Opacity of the actor 0..1 (default 1)",double,""); + BBTK_INPUT(ShowNPoints,Radio,"Radio of the spheres 1..50 (default 10)",double,""); + BBTK_INPUT(ShowNPoints,Type,"Type of the widget. 0(default): N-points, 1:Just one point",int,""); + BBTK_OUTPUT(ShowNPoints , lstPointsX , " list of points X ", std::vector ,""); + BBTK_OUTPUT(ShowNPoints , lstPointsY , " list of points Y ", std::vector ,""); + BBTK_OUTPUT(ShowNPoints , lstPointsZ , " list of points Z ", std::vector ,""); + BBTK_OUTPUT(ShowNPoints , lstLabels , " list of labels ", std::vector ,""); BBTK_END_DESCRIBE_BLACK_BOX(ShowNPoints); } // EO namespace bbcreaMaracasVisu #endif // __bbcreaMaracasVisuShowNPoints_h_INCLUDED__ #endif // _USE_WXWIDGETS_ -