: wxPanel(parent, -1, wxDefaultPosition, wxSize(sizex, sizey), wxBORDER_SUNKEN)
{
- PANEL = "New Contour";
- PANEL1 = "I/O";
- PANEL2 = "Edit";
- PANEL3 = "Delete";
- PANEL4 = "Tools";
- PANEL5 = "Segmentation";
- segmentPanel = NULL;
- segmentPanelITK = NULL;
- configPanel = NULL;
- spreadPanel = NULL;
- infoWin = NULL;
- informationPanel = NULL;
- mirrorPanel = NULL;
- thresholdPanel = NULL;
- currentWindow = NULL;
-
+ PANEL = "New Contour";
+ PANEL1 = "I/O";
+ PANEL2 = "Edit";
+ PANEL3 = "Delete";
+ PANEL4 = "Tools";
+ PANEL5 = "Segmentation";
+ segmentPanel = NULL;
+ segmentPanelITK = NULL;
+ configPanel = NULL;
+ spreadPanel = NULL;
+ infoWin = NULL;
+ infoPanel = NULL;
+ infoPanelMask = NULL;
+ informationPanel = NULL;
+ mirrorPanel = NULL;
+ thresholdPanel = NULL;
+ currentWindow = 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 );
wxButton* b5 = getButton(toolpanel);
b5->SetClientData(&PANEL5);
- wxPanel* mentex = new wxPanel(toolpanel, -1, wxDefaultPosition, wxDefaultSize, wxBORDER_NONE, wxString(_T("")));
+ 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* mentex3 = new wxPanel(toolpanel, -1, wxDefaultPosition, wxDefaultSize, wxBORDER_NONE, wxString(_T("")));
wxPanel* mentex4 = new wxPanel(toolpanel, -1, wxDefaultPosition, wxDefaultSize, wxBORDER_NONE, wxString(_T("")));
wxPanel* mentex5 = 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);
- menubar3 = new interfDeleteMenu(mentex3, sizex, sizey, evtHandler, datadir);
- menubar4 = new interfToolsMenu(mentex4, sizex,sizey, evtHandler, datadir);
- menubar5 = new interfSegmentationMenu(mentex5, sizex,sizey, evtHandler, datadir);
+ menubar = new interfNewContourMenu (mentex, sizex, sizey, evtHandler, datadir);
+ menubar1 = new interfIOMenu (mentex1, sizex, sizey, evtHandler, datadir);
+ menubar2 = new interfEditMenu (mentex2, sizex, sizey, evtHandler, datadir);
+ menubar3 = new interfDeleteMenu (mentex3, sizex, sizey, evtHandler, datadir);
+ menubar4 = new interfToolsMenu (mentex4, sizex ,sizey, evtHandler, datadir);
+ menubar5 = new interfSegmentationMenu(mentex5, sizex, sizey, evtHandler, datadir);
- statictext = getText(mentex, PANEL);
+ statictext = getText(mentex, PANEL);
statictext1 = getText(mentex1, PANEL1);
statictext2 = getText(mentex2, PANEL2);
statictext3 = getText(mentex3, PANEL3);
wxFlexGridSizer* infosizer = new wxFlexGridSizer(1,1,2,2);
infoPanel->SetSizer(infosizer, true);
infoPanel->SetAutoLayout( true );
-
+
splitterwindow->Initialize(toolpanel);
splitterwindow->SetSashGravity(1);
splitterwindow->SplitHorizontally(toolpanel, infoPanel);
-
- Connect(b->GetId(), wxEVT_COMMAND_BUTTON_CLICKED, (wxObjectEventFunction)&interfMainPanel::onActionButtonPressed1);
+
+ 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(b3->GetId(), wxEVT_COMMAND_BUTTON_CLICKED, (wxObjectEventFunction)&interfMainPanel::onActionButtonPressed1);
interfMainPanel::~interfMainPanel(void)
{
-}
-interfMainPanel* interfMainPanel::getInstance(wxWindow* parent, std::string datadir, wxEvtHandler * evtHandler){
+}
+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->Show(TRUE);
return interfmainpanel;
}
-interfMainPanel* interfMainPanel::getInstance(wxWindow* parent, wxEvtHandler * evtHandler){
+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->Show(TRUE);
return interfmainpanel;
}
-bool interfMainPanel::Show(bool show){
+
+bool interfMainPanel::Show(bool show)
+{
return _newframe->Show(show);
}
+
interfMainPanel* interfMainPanel::getInstance()
{
-
return interfmainpanel;
}
interfmainpanel = NULL;
}
-wxPanel* interfMainPanel::initializeToolsPanel(wxWindow* parent, int sizex, int sizey, wxEvtHandler * evtHandler){
-
-
+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) ;
flexsizer->Add(menu, wxFIXED_MINSIZE);
flexsizer->Add(toolspread, wxFIXED_MINSIZE);
-
- panel->Layout();
-
+
+ panel->Layout();
return panel;
}
-
/**
** Adds a new checkbox to the scrolledwindow using the checkboxsizer
** @Params id of contour
**
**/
-void interfMainPanel::addContourCheckBox(std::string id){
+void interfMainPanel::addContourCheckBox(std::string id)
+{
toolspread->addContourCheckBox(id);
}
** @Params id of contour
**
**/
-void interfMainPanel::removeContourCheckBox(std::string id){
+void interfMainPanel::removeContourCheckBox(std::string id)
+{
toolspread->removeContourCheckBox(id);
}
-void interfMainPanel::onActionButtonPressed1( wxCommandEvent& event ){
+void interfMainPanel::onActionButtonPressed1( wxCommandEvent& event )
+{
//((interfToolsMenu*)menubar4)->hideAxis();
wxButton* b = (wxButton*)event.GetEventObject();
wxPanel* dmenu;
std::string dstring = *((std::string*) b->GetClientData());
int sizechange=0;
-
if(dstring.compare(PANEL)==0){
dmenu = menubar;
text = statictext;
this->Refresh();
}
-wxStaticText* interfMainPanel::getText(wxWindow* parent, std::string nom){
+wxStaticText* interfMainPanel::getText(wxWindow* parent, std::string nom)
+{
return new wxStaticText(parent, -1, wxString(nom.c_str(),wxConvUTF8), wxDefaultPosition,
- wxDefaultSize, wxALIGN_CENTRE, wxString(nom.c_str(),wxConvUTF8));
+ wxDefaultSize, wxALIGN_CENTRE, wxString(nom.c_str(),wxConvUTF8));
}
-wxButton* interfMainPanel::getButton(wxWindow* parent){
+wxButton* interfMainPanel::getButton(wxWindow* parent)
+{
wxButton* b = new wxButton(parent, -1, wxString(_T("-")), wxDefaultPosition, wxDefaultSize, wxBU_EXACTFIT,
- wxDefaultValidator, wxString(_T("-")));
+ wxDefaultValidator, wxString(_T("-")));
return b;
}
-wxPanel* interfMainPanel::setMenuTextSizer(wxWindow* parent, wxPanel* panel, wxStaticText* text){
+wxPanel* interfMainPanel::setMenuTextSizer(wxWindow* parent, wxPanel* panel, wxStaticText* text)
+{
wxFlexGridSizer* flexsizer = new wxFlexGridSizer(2,1,2,2);
parent->SetSizer(flexsizer, true);
parent->Layout();
return (wxPanel*)parent;
-
}
/**
sizer->Remove(currentWindow);
}
sizer->Add(panel);
- currentWindow = panel;
+ currentWindow = panel;
currentWindow->Show(true);
splitterwindow->SetSashPosition(splitterwindow->GetSashPosition()+1);
/**
** Hide the panel in the lower box
**/
-void interfMainPanel::hidePanel( ){
+void interfMainPanel::hidePanel( )
+{
wxContourMainFrame::getInstance()->showAxis(false);
wxSizer* sizer = infoPanel->GetSizer();
}
wxPanel * emptyPanel = new wxPanel(interfMainPanel::getInstance()->getInfoPanel(), -1, wxDefaultPosition, wxDefaultSize, wxBORDER_STATIC, wxString(_T("")));
sizer->Add(emptyPanel);
- currentWindow = emptyPanel;
+ currentWindow = emptyPanel;
currentWindow->Show(true);
splitterwindow->SetSashPosition(splitterwindow->GetSashPosition()+1);
/**
** Gets the Information panel
**/
-wxPanel* interfMainPanel::getInfoPanel(){
+wxPanel* interfMainPanel::getInfoPanel()
+{
return infoPanel;
}
-void interfMainPanel::onCreateContourSpline( ){
+void interfMainPanel::onCreateContourSpline( )
+{
wxContourMainFrame::getInstance()->showAxis(false);
wxContourMainFrame::getInstance()->onCreateContourSpline();
}
-void interfMainPanel::onCreateContourRectangle( ){
+
+void interfMainPanel::onCreateContourRectangle( )
+{
wxContourMainFrame::getInstance()->showAxis(false);
wxContourMainFrame::getInstance()->onCreateContourRectangle();
}
-void interfMainPanel::onCreateContourCircle( ){
+void interfMainPanel::onCreateContourCircle( )
+{
wxContourMainFrame::getInstance()->showAxis(false);
wxContourMainFrame::getInstance()->onCreateContourCircle();
}
-void interfMainPanel::onCreateContourLine( ){
+
+void interfMainPanel::onCreateContourLine( )
+{
wxContourMainFrame::getInstance()->showAxis(false);
wxContourMainFrame::getInstance()->onCreateContourLine();
}
-void interfMainPanel::onCreateContoursBullEye(wxPanel* panBull){
+
+// RaC 09-09 ---------------------
+void interfMainPanel::onCreateContourPoints( )
+{
+ wxContourMainFrame::getInstance()->showAxis(false);
+ wxContourMainFrame::getInstance()->onCreateContourPoints();
+}
+// RaC 09-09 ---------------------
+
+// RaC 10-09 ---------------------
+void interfMainPanel::onCreateContourPolygon( )
+{
+ wxContourMainFrame::getInstance()->showAxis(false);
+ wxContourMainFrame::getInstance()->onCreateContourPolygon();
+}
+// RaC 10-09 ---------------------
+
+void interfMainPanel::onCreateContoursBullEye(wxPanel* panBull)
+{
wxContourMainFrame::getInstance()->showAxis(false);
wxContourMainFrame::getInstance()->onCreateContourBullEye(panBull);
}
-void interfMainPanel::onDeleteContour(){
+
+void interfMainPanel::onDeleteContour()
+{
wxContourMainFrame::getInstance()->showAxis(false);
wxContourMainFrame::getInstance()->onDeleteContour();
}
-void interfMainPanel::onDeleteContoursActSlice(){
+
+void interfMainPanel::onDeleteContoursActSlice()
+{
wxContourMainFrame::getInstance()->showAxis(false);
wxContourMainFrame::getInstance()->onDeleteContoursActSlice();
}
-void interfMainPanel::onDeleteAllContours(){
+
+void interfMainPanel::onDeleteAllContours()
+{
wxContourMainFrame::getInstance()->showAxis(false);
wxContourMainFrame::getInstance()->onDeleteAllContours();
}
-void interfMainPanel::onCopy(){
+void interfMainPanel::onCopy()
+{
wxContourMainFrame::getInstance()->onCopy();
}
-void interfMainPanel::onPaste(){
+
+void interfMainPanel::onPaste()
+{
wxContourMainFrame::getInstance()->onPaste();
}
-void interfMainPanel::onUndo(){
+
+void interfMainPanel::onUndo()
+{
wxContourMainFrame::getInstance()->onUndo();
}
-void interfMainPanel::onRedo(){
+
+void interfMainPanel::onRedo()
+{
wxContourMainFrame::getInstance()->onRedo();
}
-void interfMainPanel::onLoad(){
+
+void interfMainPanel::onLoad()
+{
wxContourMainFrame::getInstance()->onLoad();
}
-void interfMainPanel::onSave(){
- wxContourMainFrame::getInstance()-> onSave();
+
+void interfMainPanel::onSave()
+{
+ wxContourMainFrame::getInstance()->onSave();
}
-void interfMainPanel::RefreshInterface(){
+
+void interfMainPanel::RefreshInterface()
+{
wxContourMainFrame::getInstance()->RefreshInterface();
}
-vtkImageData* interfMainPanel::getImageData(){
+vtkImageData* interfMainPanel::getImageData()
+{
return wxContourMainFrame::getInstance()->getImageData();
}
wxContourMainFrame::getInstance()->onSegmentationOneSlice(isovalue, sampling, method);
}
-void interfMainPanel::onSegmentationOneSliceITK(wxString distance, wxString sigma, wxString alfa, wxString beta, wxString propagation, wxString iterations, wxString inflation){
+void interfMainPanel::onSegmentationOneSliceITK(wxString distance, wxString sigma, wxString alfa, wxString beta, wxString propagation, wxString iterations, wxString inflation)
+{
wxContourMainFrame::getInstance()->onSegmentationOneSliceITK(distance, sigma, alfa, beta, propagation, iterations, inflation);
}
-int interfMainPanel::GetImageDataSizeZ(){
+int interfMainPanel::GetImageDataSizeZ()
+{
return wxContourMainFrame::getInstance()->GetImageDataSizeZ();
}
-void interfMainPanel::onSegmentationAllSlice(int minZ,int maxZ,int isovalue,int sampling,int method){
+void interfMainPanel::onSegmentationAllSlice(int minZ,int maxZ,int isovalue,int sampling,int method)
+{
wxContourMainFrame::getInstance()->onSegmentationAllSlice(minZ, maxZ,isovalue,sampling,method);
}
-void interfMainPanel::setLabelSegmentationPanelVTK(wxString tmpString){
+void interfMainPanel::setLabelSegmentationPanelVTK(wxString tmpString)
+{
((interfSegmentationPanelVTK*)segmentationPanel)->setLabel(tmpString);
}
-void interfMainPanel::onSegmentationPressed(){
+void interfMainPanel::onSegmentationPressed()
+{
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->SetAutoLayout(true);
segmentPanel->SetEventHandler(this);
//wxPanel* panel = contourevent->getSegmentationPanel(segmentPanel);
axisshown = true;
}
-void interfMainPanel::onSegmentationPressedITK(){
+void interfMainPanel::onSegmentationPressedITK()
+{
if(segmentPanelITK == NULL){
segmentPanelITK = new wxPanel(interfMainPanel::getInstance()->getInfoPanel(), -1, wxDefaultPosition, wxDefaultSize, wxBORDER_STATIC, wxString(_T("")));
//wxPanel* panel = contourevent->getSegmentationPanelITK(segmentPanelITK);
wxPanel* panel = new interfSegmentationPanelITK(segmentPanelITK);
-
wxStaticText* stattext = new wxStaticText(segmentPanelITK, -1, wxString(_T(" Automatic ITK Segmentation ")), wxDefaultPosition,
wxDefaultSize, wxALIGN_CENTRE|wxBORDER_SIMPLE|wxFULL_REPAINT_ON_RESIZE, wxString(_T("")));
axisshown = true;
}
-void interfMainPanel::onRigidPressed(){
+void interfMainPanel::onRigidPressed()
+{
wxContourMainFrame::getInstance()->onRigidPressed();
}
-void interfMainPanel::onWidthOfContour(double width){
+void interfMainPanel::onWidthOfContour(double width)
+{
wxContourMainFrame::getInstance()->onWidthOfContour(width);
}
-int interfMainPanel::getColorWindow(){
+int interfMainPanel::getColorWindow()
+{
return wxContourMainFrame::getInstance()->getColorWindow();
}
-int interfMainPanel::getWindowLevel(){
+int interfMainPanel::getWindowLevel()
+{
return wxContourMainFrame::getInstance()->getWindowLevel();
}
-void interfMainPanel::onBrigthnessColorWindowLevel(int colorwindow,int windowlevel){
+void interfMainPanel::onBrigthnessColorWindowLevel(int colorwindow,int windowlevel)
+{
wxContourMainFrame::getInstance()->onBrigthnessColorWindowLevel(colorwindow, windowlevel);
}
wxContourMainFrame::getInstance()->onInterpolation(interpolate);
}
-void interfMainPanel::onConfigurationPressed(){
+void interfMainPanel::onConfigurationPressed()
+{
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);
configPanel->SetAutoLayout( true );
//configPanel->SetEventHandler(this->contourevent);
-
wxPanel* panel = new interfConfigurationPanel(configPanel);
-
wxStaticText* stattext = new wxStaticText(configPanel, -1, wxString(_T(" Interface Configuration ")), wxDefaultPosition,
wxDefaultSize, wxALIGN_CENTRE|wxBORDER_SIMPLE|wxFULL_REPAINT_ON_RESIZE, wxString(_T("")));
-
flexsizer->Add(stattext,wxALIGN_CENTER | wxALIGN_CENTRE);
-
flexsizer->Add(panel, wxEXPAND);
configPanel->Layout();
-
}
showPanel(configPanel);
}
-void interfMainPanel::onSpreadPressed(){
+void interfMainPanel::onSpreadPressed()
+{
if(spreadPanel==NULL){
spreadPanel = new wxPanel(interfMainPanel::getInstance()->getInfoPanel(), -1, wxDefaultPosition, wxDefaultSize, wxBORDER_STATIC, wxString(_T("")));
//hideAxis();
}
-void interfMainPanel::resetAppend(){
+void interfMainPanel::resetAppend()
+{
wxContourMainFrame::getInstance()->resetAppend();
}
-void interfMainPanel::onSpreadAdd(){
+void interfMainPanel::onSpreadAdd()
+{
wxContourMainFrame::getInstance()->onSpreadAdd();
}
-void interfMainPanel::appendStringSpread(std::string val){
+void interfMainPanel::appendStringSpread(std::string val)
+{
panelSpread->appendStringSpread(val);
}
-void interfMainPanel::onSpreadGo(int type){
+void interfMainPanel::onSpreadGo(int type)
+{
wxContourMainFrame::getInstance()->onSpreadGo(type);
}
-void interfMainPanel::setStringSpread(std::string stringtemp){
+
+void interfMainPanel::setStringSpread(std::string stringtemp)
+{
panelSpread->setStringSpread(stringtemp);
}
-void interfMainPanel::onInformationPressed(){
+void interfMainPanel::onInformationPressed()
+{
+
+ // Statistics frame
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 = 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);
+ informationPanel = new interfInformationPanel(infoWin);//contourevent->getInformationPanel(infoWin);
- wxBoxSizer * sizerPanel = new wxBoxSizer(wxHORIZONTAL);
- sizerPanel -> Add( informationPanel , 1, wxEXPAND ,0);
+ wxBoxSizer * sizerPanel = new wxBoxSizer(wxHORIZONTAL);
+ sizerPanel -> Add( informationPanel, 1, wxEXPAND ,0);
infoWin->SetSizer( sizerPanel );
infoWin->SetAutoLayout( true );
infoWin->Layout();
-
infoWin->Show();
-
}else {
if (infoWin->IsShown()==true)
//contourevent->FillGridWithContoursInformation();
infoWin->Show(true);
}
+ }
+
+//CMRU 29-08-09-----------------------------------------------------------------------------------------------
+ if(panelAux == NULL)
+ {
+ 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("")));
+ wxFlexGridSizer* flexsizer = new wxFlexGridSizer(1);
+ infoPanelMask->SetSizer(flexsizer, true);
+ infoPanelMask->SetAutoLayout( true );
+ //configPanel->SetEventHandler(this->contourevent);
+ 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-----------------------------------------------------------------------------------------------
+ //Calibration panel
+ if(infoPanelCalibration == NULL)
+ {
+ infoPanelCalibration = new wxPanel(panelAux, -1, wxDefaultPosition, wxDefaultSize, wxNO_BORDER , wxString(_T("")));
+ 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();
+ }
+
+ wxFlexGridSizer* sizer = new wxFlexGridSizer(1);
+ panelAux->SetSizer(sizer, true);
+ panelAux->SetAutoLayout( true );
+ sizer->Add(infoPanelMask);
+ sizer->Add(infoPanelCalibration);
+
+ showPanel(panelAux);
+
+//------------------------------------------------------------------
+
+ wxContourMainFrame::getInstance()->changeInstant();
}
-void interfMainPanel::getInstantVector(std::vector<int>& tempVector){
+void interfMainPanel::getInstantVector(std::vector<int>& tempVector)
+{
wxContourMainFrame::getInstance()->getInstantVector(tempVector);
}
-std::vector<std::string> interfMainPanel::getOutlinesName(int slide){
+std::vector<std::string> interfMainPanel::getOutlinesName(int slide)
+{
return wxContourMainFrame::getInstance()->getOutlinesName(slide);
}
-void interfMainPanel::onInformationContourLabels(int typeContourGroup,int selection,int minZ,int maxZ){
- wxContourMainFrame::getInstance()->onInformationContourLabels(typeContourGroup, selection, minZ, maxZ);
+void interfMainPanel::onInformationContourLabels(int typeContourGroup,int selection,int minZ,int maxZ,int grayRangeMin,int grayRangeMax){
+ wxContourMainFrame::getInstance()->onInformationContourLabels(typeContourGroup, selection, minZ, maxZ,grayRangeMin,grayRangeMax);
}
-void interfMainPanel::setStringInfoPanel(wxString tmpString){
+void interfMainPanel::setStringInfoPanel(wxString tmpString)
+{
if(informationPanel!=NULL){
((interfInformationPanel*)informationPanel)->setStringInfoPanel(tmpString);
}
}
-void interfMainPanel::setRowLabelInfoPanel(int z, wxString tempString){
+void interfMainPanel::setRowLabelInfoPanel(int z, wxString tempString)
+{
((interfInformationPanel*)informationPanel)->setRowLabelInfoPanel(z, tempString);
}
-int interfMainPanel::getNumberColsInformationPanel(){
+int interfMainPanel::getNumberColsInformationPanel()
+{
return ((interfInformationPanel*)informationPanel)->getNumberCols();
}
-void interfMainPanel::appendColsInformationPanel(int _numberOfVariablesStatistics){
+void interfMainPanel::appendColsInformationPanel(int _numberOfVariablesStatistics)
+{
((interfInformationPanel*)informationPanel)->appendCols(_numberOfVariablesStatistics);
}
-void interfMainPanel::setCellValueInfoPanel(int z,int tmpIntA,wxString tempString){
+void interfMainPanel::setCellValueInfoPanel(int z,int tmpIntA,wxString tempString)
+{
((interfInformationPanel*)informationPanel)->setCellValue(z, tmpIntA, tempString);
}
-void interfMainPanel::setColLableInfoPanel(int tmpIntB,wxString tmpTitleString){
+void interfMainPanel::setColLableInfoPanel(int tmpIntB,wxString tmpTitleString)
+{
((interfInformationPanel*)informationPanel)->setColLabel(tmpIntB, tmpTitleString);
}
+void interfMainPanel::SetScalarRange(int grayRangeMin,int grayRangeMax)
+{
+ wxContourMainFrame::getInstance()->SetScalarRange(grayRangeMin, grayRangeMax);
+}
+
void interfMainPanel::onSaveResults(std::string directory,std::string namefile, std::string filename,
- int typeContourGroup, bool XYZValues, bool contourImage, bool statistics)
+ int typeContourGroup, int selection, int minZ, int maxZ ,bool XYZValues, bool contourImage, bool statistics)
{
wxContourMainFrame::getInstance()->onSaveResults(directory, namefile, filename,
- typeContourGroup, XYZValues, contourImage, statistics);
+ typeContourGroup, selection, minZ,maxZ, XYZValues, contourImage, statistics);
}
wxString interfMainPanel::getCellValue(int j,int i){
{
axisshown=false;
wxContourMainFrame::getInstance()->showAxis(axisshown);
- wxContourMainFrame::getInstance()->onSnakePressed();
+ wxContourMainFrame::getInstance()->onSnakePressed();
}
void interfMainPanel::onMirrorPressed(){
}
-void interfMainPanel::onThreshold()
-{
- wxContourMainFrame::getInstance()->onThreshold();
-}
-void interfMainPanel::onThresholdChange()
+//EED01
+void interfMainPanel::onThresholdPressed()
{
- wxContourMainFrame::getInstance()->onThresholdChange();
+
+ // Threshold view control panel
+ if(thresholdPanel == NULL){
+ thresholdPanel = new wxPanel(interfMainPanel::getInstance()->getInfoPanel(), -1, wxDefaultPosition, wxDefaultSize, wxNO_BORDER, wxString(_T("")));
+ wxFlexGridSizer* flexsizer = new wxFlexGridSizer(1);
+ thresholdPanel->SetSizer(flexsizer, true);
+ thresholdPanel->SetAutoLayout( true );
+ //configPanel->SetEventHandler(this->contourevent);
+ wxPanel *panel = wxContourMainFrame::getInstance()->getThresholdImageViewPanel( thresholdPanel );
+ wxStaticText* stattext = new wxStaticText(thresholdPanel, -1, wxString(_T(" Threshold segmentation ")), wxDefaultPosition,
+ wxDefaultSize, wxALIGN_CENTRE|wxBORDER_SIMPLE|wxFULL_REPAINT_ON_RESIZE, wxString(_T("")));
+
+ flexsizer->Add(stattext,wxALIGN_CENTER | wxALIGN_CENTRE);
+
+ flexsizer->Add(panel, wxEXPAND);
+ thresholdPanel->Layout();
+
+ }
+ showPanel(thresholdPanel);
+ wxContourMainFrame::getInstance()->changeInstant();
}
-void interfMainPanel::onThresholdInstantChange(double range[])
-{
- panelThreshold->onThresholdInstantChange(range);
-}
-void interfMainPanel::onThresholdInterpolation(bool interpolate)
+void interfMainPanel::ShowResultImages(int typeContourGroup, int selection, int minZ, int maxZ)
{
- wxContourMainFrame::getInstance()->onThresholdInterpolation(interpolate);
+ wxContourMainFrame::getInstance()->ShowResultImages(typeContourGroup, selection, minZ, maxZ);
}
-void interfMainPanel::onThresholdChangeOpacity (int opacity)
-{
- wxContourMainFrame::getInstance()->onThresholdChangeOpacity(opacity);
-}
-void interfMainPanel::onThresholdRemove()
+void interfMainPanel::SetContourGroup(int contourGroup)
{
- wxContourMainFrame::getInstance()->onThresholdRemove();
+ wxContourMainFrame::getInstance()->SetContourGroup( contourGroup);
}
-void interfMainPanel::onThresholdPressed()
+//CMRU 17-08-09 ---------------------------------------------
+void interfMainPanel::onPrintLabel ()
{
- if(thresholdPanel==NULL)
+ wxString label;
+ manualBaseModel* manualModel = wxContourMainFrame::getInstance()->getContour();
+
+ if(manualModel==NULL)
{
+ wxMessageDialog *dial = new wxMessageDialog(NULL, wxT("Please select a Contour"), wxT("Warning"), wxOK | wxICON_EXCLAMATION);
+ dial->ShowModal();
+ return;
+ }
- thresholdPanel = new wxPanel(interfMainPanel::getInstance()->getInfoPanel(), -1, wxDefaultPosition, wxDefaultSize, wxBORDER_STATIC, wxString(_T("")));
- wxFlexGridSizer* flexsizer = new wxFlexGridSizer(1);
- thresholdPanel->SetSizer(flexsizer, true);
- thresholdPanel->SetAutoLayout( true );
- panelThreshold = new interfThresholdPanel(thresholdPanel);
+ wxTextEntryDialog* dialog = new wxTextEntryDialog(this,_T("Enter a tag name: ")) ;
- wxStaticText* stattext = new wxStaticText(thresholdPanel, -1, wxString(_T(" Threshold Tool ")), wxDefaultPosition,
- wxDefaultSize, wxALIGN_CENTRE|wxBORDER_SIMPLE|wxFULL_REPAINT_ON_RESIZE, wxString(_T("")));
-
- flexsizer->Add(stattext,wxALIGN_CENTER | wxALIGN_CENTRE);
- flexsizer->Add(panelThreshold, wxEXPAND);
- thresholdPanel->Layout();
+ if (dialog->ShowModal() == wxID_OK)
+ {
+ label = dialog->GetValue();
- }
- showPanel(thresholdPanel);
+ if(label.Len()!=0)
+ {
+ wxContourMainFrame::getInstance()->onPrintLabel(label,manualModel);
+ wxMessageDialog *dial = new wxMessageDialog(NULL, wxT("The tag name was updated"), wxT("Information"), wxOK | wxICON_INFORMATION);
+ dial->ShowModal();
+ }
+ else
+ {
+ wxMessageDialog *dial = new wxMessageDialog(NULL, wxT("Please enter a valid tag"), wxT("Warning"), wxOK | wxICON_EXCLAMATION);
+ dial->ShowModal();
+ }
+ }
}
-void interfMainPanel::ShowResultImages(int typeContourGroup)
+void interfMainPanel::onCalibration(wxString size, int unit)
{
- wxContourMainFrame::getInstance()->ShowResultImages(typeContourGroup);
+ int type = 0;
+ double contourSize = 0.0;
+ double realSizeDouble = 0.0;
+
+ type = wxContourMainFrame::getInstance()->getType();
+ contourSize = wxContourMainFrame::getInstance()->getContourSizeInPixels();
+
+ std::cout<<"Cata->Tamaño del contorno en pixeles:"<<contourSize<<endl;
+
+ if ( type == 6 )
+ {
+ if (size.ToDouble(&realSizeDouble))
+ {
+ if(unit==1)
+ {
+ realSizeDouble = realSizeDouble * 10;
+ }
+ if(unit==2)
+ {
+ realSizeDouble = realSizeDouble * 25.4;
+ }
+ std::cout<< "Valor del usuario" << realSizeDouble<< endl ;
+ onePixelSize (realSizeDouble,contourSize);
+ }
+ else
+ {
+ wxMessageDialog *dial = new wxMessageDialog(NULL, wxT("Please enter a numeric value"), wxT("Warning"), wxOK | wxICON_EXCLAMATION);
+ dial->ShowModal();
+ }
+ }
+ else
+ {
+ wxMessageDialog *dial = new wxMessageDialog(NULL, wxT("Please select a line contour"), wxT("Warning"), wxOK | wxICON_EXCLAMATION);
+ dial->ShowModal();
+ }
+
+ wxMessageDialog *dial = new wxMessageDialog(NULL, wxT("The calibration was made"), wxT("Information"), wxOK | wxICON_INFORMATION);
+ dial->ShowModal();
+ std::cout<< "Cata-> Se ha realizado la calibracion" << endl ;
}
+double interfMainPanel::onePixelSize (double realSize,double sizePixel)
+{
+ _pixelValue = realSize/sizePixel;
+ std::cout<< "Valor del un pixel = " << _pixelValue<< endl ;
+ wxContourMainFrame::getInstance()->onePixelSize (_pixelValue);
+ return _pixelValue ;
+}
+double interfMainPanel::GetPixelValue()
+{
+ return _pixelValue;
+}
+//------------------------------------------------------------------------------------------------------------
git://git.creatis.insa-lyon.fr / creaContours.git / blobdiff