X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FInterface_Icons_NDimensions%2FinterfSegmentationMenu.cxx;h=e207fd2b23d43951515d0cbb4cfa41370b096c90;hb=52396e2d4f1d48b55613aadaca83ad18b90f130a;hp=545db77fce00c34d161d0f0dca816ba66f645784;hpb=6e3c929c883c405e0075fa8df10b12a935979367;p=creaContours.git diff --git a/lib/Interface_Icons_NDimensions/interfSegmentationMenu.cxx b/lib/Interface_Icons_NDimensions/interfSegmentationMenu.cxx index 545db77..e207fd2 100644 --- a/lib/Interface_Icons_NDimensions/interfSegmentationMenu.cxx +++ b/lib/Interface_Icons_NDimensions/interfSegmentationMenu.cxx @@ -1,17 +1,45 @@ +/*# --------------------------------------------------------------------- +# +# 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 "interfSegmentationMenu.h" #include "interfMainPanel.h" interfSegmentationMenu::interfSegmentationMenu(wxWindow * parent, int sizex, int sizey,wxEvtHandler* evtHandler, std::string datdir) : interfMenuBar(parent, sizex, sizey) { - this->datadir = datdir; - //contourevent = (wxContourEventHandler*)evtHandler; - infoWin = NULL; - configPanel = NULL; - spreadPanel = NULL; + this->datadir = datdir; + +/*EED Borrame + //contourevent = (wxContourEventHandler*)evtHandler; + infoWin = NULL; + configPanel = NULL; + spreadPanel = NULL; segmentPanelITK = NULL; - //eventHandler = evtHandler; + //eventHandler = evtHandler; +*/ initButtons(this); } @@ -33,6 +61,11 @@ void interfSegmentationMenu::initButtons(wxEvtHandler* evtHandler) { nom.push_back("Find shapes using border snake interaction"); funct.push_back((wxObjectEventFunction) &interfSegmentationMenu:: onSnakePressed); +/*EED Borrame + path.push_back(datadir + "/Threshold.png"); + nom.push_back("Superpose a 'Red Image' to the selected Image Threshold"); + funct.push_back((wxObjectEventFunction)&interfSegmentationMenu::onThreshold); +*/ this->addButtons(path, nom); this->setVectorFunction(funct); @@ -53,25 +86,28 @@ interfSegmentationMenu::~interfSegmentationMenu() **/ -void interfSegmentationMenu::onSegmentationPressed(wxCommandEvent& event){ - +void interfSegmentationMenu::onSegmentationPressed(wxCommandEvent& event) +{ interfMainPanel::getInstance()->onSegmentationPressed(); } -void interfSegmentationMenu::onSegmentationPressedITK(wxCommandEvent& event){ - - interfMainPanel::getInstance()->onSegmentationPressedITK(); - - +void interfSegmentationMenu::onSegmentationPressedITK(wxCommandEvent& event) +{ + interfMainPanel::getInstance()->onSegmentationPressedITK(); } -void interfSegmentationMenu::onSnakePressed(wxCommandEvent& event){ - - //contourevent->onSnakePressed(this); - +void interfSegmentationMenu::onSnakePressed(wxCommandEvent& event) +{ + interfMainPanel::getInstance()->onSnakePressed(); } +/*EED Borrame +void interfSegmentationMenu::onThreshold(wxCommandEvent& event) +{ + interfMainPanel::getInstance()->onThresholdPressed(); +} +*/ //------------------------------------------------------------------------------------------------------------