+/*# ---------------------------------------------------------------------
+#
+# 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 "interfMainPanel.h"
interfMainPanel::interfMainPanel(wxWindow * parent, int sizex, int sizey, wxEvtHandler * evtHandler, std::string datadir)
: wxPanel(parent, -1, wxDefaultPosition, wxSize(sizex, sizey), wxBORDER_SUNKEN)
{
-
PANEL = "New Contour";
PANEL1 = "I/O";
PANEL2 = "Edit";
colorImageLayerPanel = NULL;
currentWindow = NULL;
testPanel = NULL;
+ flipPanel = NULL;
//CMRU 17-08-09 ------------------------------------------------------------------
infoPanelCalibration = NULL;
wxPanel* toolpanel = new wxPanel(splitterwindow, -1, wxDefaultPosition, wxDefaultSize, wxBORDER_DOUBLE, wxString(_T("")));
+//EED 2017-09-16 Migration wxWidgets 2.8 to 3.0
+#if wxMAJOR_VERSION <= 2
wxFlexGridSizer* flexsizer = new wxFlexGridSizer(6,2,1,1);
+#else
+ wxFlexGridSizer* flexsizer = new wxFlexGridSizer(6);
+#endif
toolpanel->SetSizer(flexsizer, true);
toolpanel->SetAutoLayout( true );
wxButton* b6 = getButton(toolpanel);
b6->SetClientData(&PANEL6);
-
wxPanel* mentex = new wxPanel(toolpanel, -1, wxDefaultPosition, wxDefaultSize, wxBORDER_NONE, wxString(_T("")));
wxPanel* mentex1 = new wxPanel(toolpanel, -1, wxDefaultPosition, wxDefaultSize, wxBORDER_NONE, wxString(_T("")));
wxPanel* mentex2 = new wxPanel(toolpanel, -1, wxDefaultPosition, wxDefaultSize, wxBORDER_NONE, wxString(_T("")));
if(currentWindow != NULL){
currentWindow->Hide();
/// \TODO fix warning: virtual bool wxSizer::Remove(wxWindow*) is deprecated
+//EED 2017-09-16 Migration wxWidgets 2.8 to 3.0
+#if wxMAJOR_VERSION <= 2
sizer->Remove(currentWindow);
+#else
+ sizer->Detach(currentWindow);
+#endif
+
}
sizer->Add(panel);
currentWindow = panel;
if(currentWindow != NULL){
currentWindow->Hide();
/// \TODO fix warning: virtual bool wxSizer::Remove(wxWindow*) is deprecated
+//EED 2017-09-16 Migration wxWidgets 2.8 to 3.0
+#if wxMAJOR_VERSION <= 2
sizer->Remove(currentWindow);
+#else
+ sizer->Detach(currentWindow);
+#endif
+
}
wxPanel * emptyPanel = new wxPanel(interfMainPanel::getInstance()->getInfoPanel(), -1, wxDefaultPosition, wxDefaultSize, wxBORDER_STATIC, wxString(_T("")));
sizer->Add(emptyPanel);
wxContourMainFrame::getInstance()->onSave();
}
-void interfMainPanel::onImport(){
+void interfMainPanel::onImport()
+{
wxContourMainFrame::getInstance()->onImport();
}
-void interfMainPanel::onTest(){
+void interfMainPanel::onTest()
+{
+ printf("EED interfMainPanel::onTest \n");
if(testPanel==NULL)
{
testPanel = new wxPanel(interfMainPanel::getInstance()->getInfoPanel(), -1, wxDefaultPosition,
testPanel->SetSizer(flexsizer, true);
testPanel->SetAutoLayout( true );
panelTest = new interfTestPanel(testPanel);
-
- wxStaticText* stattext = new wxStaticText(mirrorPanel, -1,
+ wxStaticText* stattext = new wxStaticText(testPanel, -1,
wxString(_T(" Test Panel ")),
wxDefaultPosition, wxDefaultSize,
wxALIGN_CENTRE|wxBORDER_SIMPLE|wxFULL_REPAINT_ON_RESIZE, wxString(_T("")));
-
flexsizer->Add(stattext,wxALIGN_CENTER | wxALIGN_CENTRE);
flexsizer->Add(panelTest, wxEXPAND);
testPanel->Layout();
- showPanel(testPanel);
}
+ showPanel(testPanel);
}
void interfMainPanel::RefreshInterface()
wxContourMainFrame::getInstance()->SetContourGroup( contourGroup);
}
+
+void interfMainPanel::onFlipContours()
+{
+ printf("EED interfMainPanel::onFlipContours() \n");
+ if(flipPanel==NULL)
+ {
+ flipPanel = new wxPanel(interfMainPanel::getInstance()->getInfoPanel(), -1, wxDefaultPosition,
+ wxDefaultSize, wxBORDER_STATIC, wxString(_T("")));
+ wxFlexGridSizer* flexsizer = new wxFlexGridSizer(1);
+ flipPanel->SetSizer(flexsizer, true);
+ flipPanel->SetAutoLayout( true );
+ panelFlip = new interfFlipPanel(flipPanel);
+ wxStaticText* stattext = new wxStaticText(flipPanel, -1,
+ wxString(_T(" Flip Contours ")),
+ wxDefaultPosition, wxDefaultSize,
+ wxALIGN_CENTRE|wxBORDER_SIMPLE|wxFULL_REPAINT_ON_RESIZE, wxString(_T("")));
+ flexsizer->Add(stattext,wxALIGN_CENTER | wxALIGN_CENTRE);
+ flexsizer->Add(panelFlip, wxEXPAND);
+ flipPanel->Layout();
+ }
+ showPanel(flipPanel);
+}
+
+
+void interfMainPanel::FlipContours(int typeContourFlip, int flipDirection)
+{
+ printf("EED interfMainPanel::FlipContours( %d , %d ) \n",typeContourFlip, flipDirection );
+ wxContourMainFrame::getInstance()->FlipContours( typeContourFlip , flipDirection );
+}
+
+
+
//CMRU 17-08-09 ---------------------------------------------
void interfMainPanel::onPrintLabel ()
{
type = wxContourMainFrame::getInstance()->getType();
contourSize = wxContourMainFrame::getInstance()->getContourSizeInPixels();
- std::cout<<"Cata->Tamaño del contorno en pixeles:"<<contourSize<<endl;
+ std::cout<<"Cata->Tama�o del contorno en pixeles:"<<contourSize<<endl;
if ( type == 6 )
{