-#include "interfMainPanel.h"
+/*# ---------------------------------------------------------------------
+#
+# 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 <wx/msgdlg.h>
+#include "interfMainPanel.h"
-interfMainPanel* interfMainPanel::interfmainpanel=NULL;
-wxFrame* interfMainPanel::_newframe=NULL;
+interfMainPanel *interfMainPanel::interfmainpanel = NULL;
+wxFrame *interfMainPanel::_newframe = NULL;
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;
panelAux = NULL;
//--------------------------------------------------------------------------------
splitterwindow = new wxSplitterWindow(this,-1, wxDefaultPosition, wxSize(sizex, sizey), wxSP_3DSASH, wxString(_T("")));
-
splitterwindow->SetMinimumPaneSize( 10 );
sizey = sizey/8;
-
wxPanel* toolpanel = new wxPanel(splitterwindow, -1, wxDefaultPosition, wxDefaultSize, wxBORDER_DOUBLE, wxString(_T("")));
-
- wxFlexGridSizer* flexsizer = new wxFlexGridSizer(6,2,1,1);
+ wxFlexGridSizer* flexsizer = new wxFlexGridSizer(20,2,1,1);
toolpanel->SetSizer(flexsizer, true);
toolpanel->SetAutoLayout( true );
-
wxButton* b = getButton(toolpanel);
b->SetClientData(&PANEL);
wxButton* b1 = getButton(toolpanel);
//EED 07/07/2010
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("")));
wxPanel* mentex5 = new wxPanel(toolpanel, -1, wxDefaultPosition, wxDefaultSize, wxBORDER_NONE, wxString(_T("")));
//EED 07/07/2010
wxPanel* mentex6 = new wxPanel(toolpanel, -1, wxDefaultPosition, wxDefaultSize, wxBORDER_NONE, wxString(_T("")));
-
menubar = new interfNewContourMenu (mentex, sizex, sizey, evtHandler, datadir);
menubar1 = new interfIOMenu (mentex1, sizex, sizey, evtHandler, datadir);
menubar2 = new interfEditMenu (mentex2, sizex, sizey, evtHandler, datadir);
menubar4 = new interfToolsMenu (mentex4, sizex ,sizey, evtHandler, datadir);
menubar5 = new interfSegmentationMenu(mentex5, sizex, sizey, evtHandler, datadir);
menubar6 = new interfImageToolsMenu(mentex6, sizex, sizey, evtHandler, datadir);
-
statictext = getText(mentex, PANEL);
statictext1 = getText(mentex1, PANEL1);
statictext2 = getText(mentex2, PANEL2);
statictext4 = getText(mentex4, PANEL4);
statictext5 = getText(mentex5, PANEL5);
statictext6 = getText(mentex6, PANEL6);
-
flexsizer->Add(b, wxFIXED_MINSIZE);
flexsizer->Add(setMenuTextSizer(mentex, menubar,statictext), wxFIXED_MINSIZE);
-
flexsizer->Add(b1, wxFIXED_MINSIZE);
flexsizer->Add(setMenuTextSizer(mentex1, menubar1,statictext1), wxFIXED_MINSIZE);
-
flexsizer->Add(b2, wxFIXED_MINSIZE);
flexsizer->Add(setMenuTextSizer(mentex2, menubar2,statictext2), wxFIXED_MINSIZE);
-
flexsizer->Add(b3, wxFIXED_MINSIZE);
flexsizer->Add(setMenuTextSizer(mentex3, menubar3,statictext3), wxFIXED_MINSIZE);
-
flexsizer->Add(b4, wxFIXED_MINSIZE);
flexsizer->Add(setMenuTextSizer(mentex4, menubar4,statictext4), wxFIXED_MINSIZE);
-
flexsizer->Add(b5, wxFIXED_MINSIZE);
flexsizer->Add(setMenuTextSizer(mentex5, menubar5,statictext5), wxFIXED_MINSIZE);
flexsizer->Add(b6, wxFIXED_MINSIZE);
flexsizer->Add(setMenuTextSizer(mentex6, menubar6,statictext6), wxFIXED_MINSIZE);
-
toolpanel->Update();
toolpanel->Layout();
-
infoPanel = new wxPanel(splitterwindow, -1, wxDefaultPosition, wxDefaultSize, wxBORDER_DOUBLE, wxString(_T("")));
wxFlexGridSizer* infosizer = new wxFlexGridSizer(1,1,2,2);
infoPanel->SetSizer(infosizer, true);
infoPanel->SetAutoLayout( true );
-
splitterwindow->Initialize(toolpanel);
splitterwindow->SetSashGravity(1);
//EED splitterwindow->SetSashPosition(600);
splitterwindow->SetSashSize(5);
splitterwindow->SplitHorizontally(toolpanel, infoPanel,8*73);
-
Connect(b->GetId(), wxEVT_COMMAND_BUTTON_CLICKED, (wxObjectEventFunction)&interfMainPanel::onActionButtonPressed1);
Connect(b1->GetId(), wxEVT_COMMAND_BUTTON_CLICKED, (wxObjectEventFunction)&interfMainPanel::onActionButtonPressed1);
Connect(b2->GetId(), wxEVT_COMMAND_BUTTON_CLICKED, (wxObjectEventFunction)&interfMainPanel::onActionButtonPressed1);
Connect(b4->GetId(), wxEVT_COMMAND_BUTTON_CLICKED, (wxObjectEventFunction)&interfMainPanel::onActionButtonPressed1);
Connect(b5->GetId(), wxEVT_COMMAND_BUTTON_CLICKED, (wxObjectEventFunction)&interfMainPanel::onActionButtonPressed1);
Connect(b6->GetId(), wxEVT_COMMAND_BUTTON_CLICKED, (wxObjectEventFunction)&interfMainPanel::onActionButtonPressed1);
-
- this->Layout();
+ this->Layout();
}
interfMainPanel::~interfMainPanel(void)
interfMainPanel* interfMainPanel::getInstance(wxWindow* parent, std::string datadir, wxEvtHandler * evtHandler)
{
- _newframe = new wxFrame(parent, -1, wxT(" Contour Tools "), wxPoint(25,50), wxSize(350,900),wxFRAME_TOOL_WINDOW|wxSYSTEM_MENU | wxCAPTION | wxCLIP_CHILDREN |wxFRAME_FLOAT_ON_PARENT);
-
- if(interfmainpanel == NULL){
- interfmainpanel = new interfMainPanel(_newframe, 350, 900, evtHandler, datadir);
+ _newframe = new wxFrame(parent, -1, wxT(" Contour Tools "), wxPoint(25,50), wxSize(450,900),wxFRAME_TOOL_WINDOW|wxSYSTEM_MENU | wxCAPTION | wxCLIP_CHILDREN |wxFRAME_FLOAT_ON_PARENT | wxRESIZE_BORDER);
+ _newframe->SetMinSize( wxSize(200,200) );
+ if(interfmainpanel == NULL)
+ {
+ interfmainpanel = new interfMainPanel(_newframe, 450, 900, evtHandler, datadir);
}
_newframe->Show(TRUE);
return interfmainpanel;
interfMainPanel* interfMainPanel::getInstance(wxWindow* parent, wxEvtHandler * evtHandler)
{
-
- _newframe = new wxFrame(parent, -1, wxT(" Contour Tools "), wxPoint(25,50), wxSize(350,900),wxFRAME_TOOL_WINDOW|wxSYSTEM_MENU | wxCAPTION | wxCLIP_CHILDREN |wxFRAME_FLOAT_ON_PARENT );
-
- if(interfmainpanel == NULL){
- interfmainpanel = new interfMainPanel(_newframe, 350, 900, evtHandler);
+ _newframe = new wxFrame(parent, -1, wxT(" Contour Tools "), wxPoint(25,50), wxSize(450,900),wxFRAME_TOOL_WINDOW|wxSYSTEM_MENU | wxCAPTION | wxCLIP_CHILDREN |wxFRAME_FLOAT_ON_PARENT | wxRESIZE_BORDER);
+ _newframe->SetMinSize( wxSize(200,200) );
+ if(interfmainpanel == NULL)
+ {
+ interfmainpanel = new interfMainPanel(_newframe, 450, 900, evtHandler);
}
_newframe->Show(TRUE);
return interfmainpanel;
wxPanel* interfMainPanel::initializeToolsPanel(wxWindow* parent, int sizex, int sizey, wxEvtHandler * evtHandler)
{
wxPanel* panel = new wxPanel(parent, -1, wxDefaultPosition, wxSize(sizex, sizey), wxBORDER_SUNKEN, wxString(_T("Spread")));
-
wxFlexGridSizer* flexsizer = new wxFlexGridSizer(2,1,2,2) ;
panel->SetSizer(flexsizer, true);
panel->SetAutoLayout( true );
-
- interfToolsMenu* menu = new interfToolsMenu(panel, sizex, sizey, evtHandler);
- toolspread = new interfToolsSpreadPanel(panel, sizex, 300, evtHandler);
-
+ interfToolsMenu *menu = new interfToolsMenu(panel, sizex, sizey, evtHandler);
+ toolspread = new interfToolsSpreadPanel(panel, sizex, 300, evtHandler);
flexsizer->Add(menu, wxFIXED_MINSIZE);
flexsizer->Add(toolspread, wxFIXED_MINSIZE);
-
panel->Layout();
-
return panel;
}
wxPanel* interfMainPanel::setMenuTextSizer(wxWindow* parent, wxPanel* panel, wxStaticText* text)
{
-
wxFlexGridSizer* flexsizer = new wxFlexGridSizer(2,1,2,2);
parent->SetSizer(flexsizer, true);
parent->SetAutoLayout( true );
-
flexsizer->Add(text, wxFLEX_GROWMODE_ALL);
flexsizer->Add(panel, wxFLEX_GROWMODE_ALL);
-
parent->Layout();
return (wxPanel*)parent;
}
{
wxContourMainFrame::getInstance()->showAxis(false);
wxSizer* sizer = infoPanel->GetSizer();
-
- if(currentWindow != NULL){
+ 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
+ } // if currentWindow
sizer->Add(panel);
currentWindow = panel;
currentWindow->Show(true);
-
splitterwindow->SetSashPosition(splitterwindow->GetSashPosition()+1);
splitterwindow->SetSashPosition(splitterwindow->GetSashPosition()-1);
-
infoPanel->Layout();
infoPanel->Refresh();
this->Layout();
{
wxContourMainFrame::getInstance()->showAxis(false);
wxSizer* sizer = infoPanel->GetSizer();
-
- if(currentWindow != NULL){
+ 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);
currentWindow = emptyPanel;
currentWindow->Show(true);
-
splitterwindow->SetSashPosition(splitterwindow->GetSashPosition()+1);
splitterwindow->SetSashPosition(splitterwindow->GetSashPosition()-1);
-
infoPanel->Layout();
infoPanel->Refresh();
this->Layout();
wxContourMainFrame::getInstance()->onCreateContourBullEye(panBull);
}
-void interfMainPanel::onDeleteContour()
+void interfMainPanel::onDeleteContoursActSlice()
{
wxContourMainFrame::getInstance()->showAxis(false);
- wxContourMainFrame::getInstance()->onDeleteContour();
+ wxContourMainFrame::getInstance()->onDeleteContoursActSlice();
}
-void interfMainPanel::onDeleteContoursActSlice()
+void interfMainPanel::onDeleteContour()
{
wxContourMainFrame::getInstance()->showAxis(false);
- wxContourMainFrame::getInstance()->onDeleteContoursActSlice();
+ wxContourMainFrame::getInstance()->onDeleteContour();
}
void interfMainPanel::onDeleteAllContours()
{
- wxContourMainFrame::getInstance()->showAxis(false);
- wxContourMainFrame::getInstance()->onDeleteAllContours();
+ wxMessageDialog *dial;
+ dial=new wxMessageDialog( NULL,
+ wxT("Delete all contours of the system?"),
+ wxT("Warnning!"),
+ wxOK | wxCANCEL | wxICON_QUESTION );
+ if (dial->ShowModal()==wxID_OK)
+ {
+ wxContourMainFrame::getInstance()->showAxis(false);
+ wxContourMainFrame::getInstance()->onDeleteAllContours();
+ } // if OK
}
void interfMainPanel::onCopy()
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()
return wxContourMainFrame::getInstance()->GetImageDataSizeZ();
}
-void interfMainPanel::onSegmentationAllSlice(int minZ,int maxZ,int isovalue,int sampling,int method)
+void interfMainPanel::onSegmentationAllSlices(int minZ,int maxZ,int isovalue,int sampling,int method)
{
- wxContourMainFrame::getInstance()->onSegmentationAllSlice(minZ, maxZ,isovalue,sampling,method);
+ wxContourMainFrame::getInstance()->onSegmentationAllSlices(minZ, maxZ,isovalue,sampling,method);
}
void interfMainPanel::setLabelSegmentationPanelVTK(wxString tmpString)
{
((interfSegmentationPanelVTK*)segmentationPanel)->setLabel(tmpString);
}
+
void interfMainPanel::onSegmentationPressed()
{
- if(segmentPanel == NULL){
+ if(segmentPanel == NULL)
+ {
segmentPanel = new wxPanel(getInfoPanel(), -1, wxDefaultPosition, wxDefaultSize, wxBORDER_STATIC, wxString(_T("")));
wxFlexGridSizer* flexsizer = new wxFlexGridSizer(1);
segmentPanel->SetSizer(flexsizer, true);
segmentPanel->SetAutoLayout(true);
segmentPanel->SetEventHandler(this);
-
//wxPanel* panel = contourevent->getSegmentationPanel(segmentPanel);
segmentationPanel = new interfSegmentationPanelVTK(segmentPanel);
-
-
wxStaticText* stattext = new wxStaticText(segmentPanel, -1, wxString(_T(" Automatic Segmentation ")), wxDefaultPosition,
wxDefaultSize, wxALIGN_CENTRE|wxBORDER_SIMPLE|wxFULL_REPAINT_ON_RESIZE, wxString(_T("")));
flexsizer->Add(stattext,wxALIGN_CENTER | wxALIGN_CENTRE);
flexsizer->Add(segmentationPanel, wxEXPAND);
segmentPanel->Layout();
- }
+ }// if segmentPanel
showPanel(segmentPanel);
wxContourMainFrame::getInstance()->showAxis(true);
axisshown = true;
void interfMainPanel::onSegmentationPressedITK()
{
- if(segmentPanelITK == NULL){
+ if(segmentPanelITK == NULL)
+ {
segmentPanelITK = new wxPanel(interfMainPanel::getInstance()->getInfoPanel(), -1, wxDefaultPosition, wxDefaultSize, wxBORDER_STATIC, wxString(_T("")));
-
-
wxFlexGridSizer* flexsizer = new wxFlexGridSizer(1);
segmentPanelITK->SetSizer(flexsizer, true);
segmentPanelITK->SetAutoLayout( true );
flexsizer->Add(stattext,wxALIGN_CENTER | wxALIGN_CENTRE);
flexsizer->Add(panel, wxEXPAND);
segmentPanelITK->Layout();
- }
+ }// if segmentPanelITK
showPanel(segmentPanelITK);
wxContourMainFrame::getInstance()->showAxis(true);
axisshown = true;
wxContourMainFrame::getInstance()->onInterpolation(interpolate);
}
+void interfMainPanel::onBeforAfterContour(bool before, bool after)
+{
+ wxContourMainFrame::getInstance()->onBeforeAfterContour(before,after);
+}
+
+void interfMainPanel::onJumpSlice(int step, int shift)
+{
+ wxContourMainFrame::getInstance()->onJumpSlice(step,shift);
+}
+
+void interfMainPanel::onShowTextContour(bool show)
+{
+ wxContourMainFrame::getInstance()->onShowTextContour(show);
+}
+
void interfMainPanel::onConfigurationPressed()
{
- if(configPanel == NULL){
+ if(configPanel == NULL)
+ {
configPanel = new wxPanel(interfMainPanel::getInstance()->getInfoPanel(), -1, wxDefaultPosition, wxDefaultSize, wxNO_BORDER, wxString(_T("")));
wxFlexGridSizer* flexsizer = new wxFlexGridSizer(1);
configPanel->SetSizer(flexsizer, true);
flexsizer->Add(stattext,wxALIGN_CENTER | wxALIGN_CENTRE);
flexsizer->Add(panel, wxEXPAND);
configPanel->Layout();
- }
+ }// if configPanel
showPanel(configPanel);
}
void interfMainPanel::onSpreadPressed()
{
- if(spreadPanel==NULL){
-
+ if(spreadPanel==NULL)
+ {
spreadPanel = new wxPanel(interfMainPanel::getInstance()->getInfoPanel(), -1, wxDefaultPosition, wxDefaultSize, wxBORDER_STATIC, wxString(_T("")));
wxFlexGridSizer* flexsizer = new wxFlexGridSizer(1);
spreadPanel->SetSizer(flexsizer, true);
spreadPanel->SetAutoLayout( true );
//spreadPanel->SetEventHandler(this->contourevent);
-
//wxPanel* panel = contourevent->getSpreadPanel(spreadPanel);
panelSpread = new interfSpreadPanel(spreadPanel);
-
-
wxStaticText* stattext = new wxStaticText(spreadPanel, -1, wxString(_T(" Automatic Spread ")), wxDefaultPosition,
wxDefaultSize, wxALIGN_CENTRE|wxBORDER_SIMPLE|wxFULL_REPAINT_ON_RESIZE, wxString(_T("")));
-
flexsizer->Add(stattext,wxALIGN_CENTER | wxALIGN_CENTRE);
flexsizer->Add(panelSpread, wxEXPAND);
spreadPanel->Layout();
- }
+ } // spreadPanel
showPanel(spreadPanel);
//hideAxis();
}
void interfMainPanel::onInformationPressed()
{
-
// Statistics frame
- if(infoWin ==NULL){
+ if(infoWin ==NULL)
+ {
infoWin = new wxFrame (this, -1,_T(" Statistics "), wxDefaultPosition, wxDefaultSize, wxFRAME_TOOL_WINDOW|wxSYSTEM_MENU | wxCAPTION | wxCLIP_CHILDREN |wxFRAME_FLOAT_ON_PARENT | wxRESIZE_BORDER );
infoWin->SetSize( wxSize(825,650) );
wxSize sizepanel(825,675);
informationPanel = new interfInformationPanel(infoWin);//contourevent->getInformationPanel(infoWin);
- wxBoxSizer * sizerPanel = new wxBoxSizer(wxHORIZONTAL);
+ wxFlexGridSizer * sizerPanel = new wxFlexGridSizer(1);
+
sizerPanel -> Add( informationPanel, 1, wxEXPAND ,0);
infoWin->SetSizer( sizerPanel );
infoWin->Layout();
infoWin->Show();
}else {
-
if (infoWin->IsShown()==true)
{
infoWin->Show(false);
panelAux = new wxPanel(interfMainPanel::getInstance()->getInfoPanel(), -1, wxDefaultPosition, wxDefaultSize, wxNO_BORDER, wxString(_T("")));
}
//------------------------------------------------------------------------------------------------------------
-
// mask view control panel
if(infoPanelMask == NULL){
infoPanelMask = new wxPanel(panelAux, -1, wxDefaultPosition, wxDefaultSize, wxNO_BORDER, wxString(_T("")));
wxPanel *panel = wxContourMainFrame::getInstance()->getMaskImageViewPanel( infoPanelMask );
wxStaticText* stattext = new wxStaticText(infoPanelMask, -1, wxString(_T(" Mask segmentation ")), wxDefaultPosition,
wxDefaultSize, wxALIGN_CENTRE|wxBORDER_SIMPLE|wxFULL_REPAINT_ON_RESIZE, wxString(_T("")));
-
flexsizer->Add(stattext,wxALIGN_CENTER | wxALIGN_CENTRE);
-
flexsizer->Add(panel, wxEXPAND);
infoPanelMask->Layout();
-
}
//CMRU 29-08-09-----------------------------------------------------------------------------------------------
wxFlexGridSizer* flexsizer = new wxFlexGridSizer(1);
infoPanelCalibration->SetSizer(flexsizer, true);
infoPanelCalibration->SetAutoLayout( true );
-
wxPanel *panel = new interfCalibrationPanel(infoPanelCalibration);
wxStaticText* stattext = new wxStaticText(infoPanelCalibration, -1, wxString(_T(" Calibration ")), wxDefaultPosition,
wxDefaultSize, wxALIGN_CENTRE|wxBORDER_SIMPLE|wxFULL_REPAINT_ON_RESIZE, wxString(_T("")));
-
flexsizer->Add(stattext,wxALIGN_CENTER | wxALIGN_CENTRE);
-
flexsizer->Add(panel, wxEXPAND);
infoPanelCalibration->Layout();
}
+//EED 2017-09-16 Migration wxWidgets 2.8 to 3.0
+#if wxMAJOR_VERSION <= 2
wxFlexGridSizer* sizer = new wxFlexGridSizer(1);
- panelAux->SetSizer(sizer, true);
- panelAux->SetAutoLayout( true );
+#else
+ wxFlexGridSizer* sizer = new wxFlexGridSizer(2);
+#endif
sizer->Add(infoPanelMask);
sizer->Add(infoPanelCalibration);
-
+ panelAux->SetSizer(sizer, true);
+ panelAux->SetAutoLayout( true );
showPanel(panelAux);
//------------------------------------------------------------------
-
wxContourMainFrame::getInstance()->changeInstant();
}
+
void interfMainPanel::getInstantVector(std::vector<int>& tempVector)
{
wxContourMainFrame::getInstance()->getInstantVector(tempVector);
mirrorPanel->SetSizer(flexsizer, true);
mirrorPanel->SetAutoLayout( true );
panelMirror = new interfMirrorPanel(mirrorPanel);
-
wxStaticText* stattext = new wxStaticText(mirrorPanel, -1, wxString(_T(" Mirroring Tool ")), wxDefaultPosition,
wxDefaultSize, wxALIGN_CENTRE|wxBORDER_SIMPLE|wxFULL_REPAINT_ON_RESIZE, wxString(_T("")));
flexsizer->Add(stattext,wxALIGN_CENTER | wxALIGN_CENTRE);
flexsizer->Add(panelMirror, wxEXPAND);
mirrorPanel->Layout();
-
refLineShown=true;
wxContourMainFrame::getInstance()->referenceLine();
- }
-
- else
- {
-
+ } else {
if (!refLineShown)
{
wxContourMainFrame::getInstance()->refLineShow();
refLineShown=true;
}
- }
+ } // if mirrorPanel
showPanel(mirrorPanel);
}
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 )
{
git://git.creatis.insa-lyon.fr / creaContours.git / blobdiff