From 8ba77b9cce93770de811bdac8a8341bcb10f036a Mon Sep 17 00:00:00 2001 From: Eduardo Davila Date: Tue, 15 Feb 2011 08:39:47 +0000 Subject: [PATCH] no message --- data/outlinesOtherConceptsFile.cf | 2 +- .../wxContourMainFrame.cxx | 22 +-- .../wxContourViewPanel.cxx | 181 +++++++++--------- 3 files changed, 99 insertions(+), 106 deletions(-) diff --git a/data/outlinesOtherConceptsFile.cf b/data/outlinesOtherConceptsFile.cf index 012382e..b2b51b6 100644 --- a/data/outlinesOtherConceptsFile.cf +++ b/data/outlinesOtherConceptsFile.cf @@ -7,4 +7,4 @@ concept1.size=15 #concept2 concept2.name=Axe Depth -concept2.size=300 +concept2.size=1000 diff --git a/lib/Interface_ManagerContour_NDimensions/wxContourMainFrame.cxx b/lib/Interface_ManagerContour_NDimensions/wxContourMainFrame.cxx index 0b9b009..1ff0de0 100644 --- a/lib/Interface_ManagerContour_NDimensions/wxContourMainFrame.cxx +++ b/lib/Interface_ManagerContour_NDimensions/wxContourMainFrame.cxx @@ -2320,35 +2320,25 @@ void wxContourMainFrame::onSpreadAdd(){ void wxContourMainFrame::onSpreadAddAll(){ - printf("EED wxContourMainFrame::onSpreadAddAll \n"); //EED02 - std::vector tempVector; _instantPanel->getInstant( tempVector ); - int minZ,maxZ; minZ = 0; maxZ = interfMainPanel::getInstance()->GetImageDataSizeZ(); - int z; int sizeLstContourThings; - for ( z=minZ ; z<=maxZ ; z++ ) { tempVector[1]=z; Instant instant(&tempVector); std::vector lstContourThings = kernelManager->getOutlinesAtInstant( &instant ); sizeLstContourThings = lstContourThings.size(); - - printf("EED wxContourMainFrame::onSpreadAddAll z=%d size=%d\n",z,sizeLstContourThings); - if (sizeLstContourThings>=1) { - std::vector vecX; std::vector vecY; std::vector vecZ; - ContourThing **contourthing = lstContourThings[0]; manualBaseModel *cModel = (*contourthing)->getModel(); int i,size = cModel->GetNumberOfPointsSpline(); @@ -2359,17 +2349,11 @@ void wxContourMainFrame::onSpreadAddAll(){ vecX.push_back(x); vecY.push_back(y); vecZ.push_back(z); - } - + } // for i std::string val = kernelManager->onSpreadAdd(&vecX , &vecY , &vecZ, tempVector); interfMainPanel::getInstance()->appendStringSpread(val); - - printf("EED wxContourMainFrame::onSpreadAddAll -> val=%s\n",val.c_str() ); - - } - - } - + }// if sizeLstContourThings + } // for z } diff --git a/lib/Interface_ManagerContour_NDimensions/wxContourViewPanel.cxx b/lib/Interface_ManagerContour_NDimensions/wxContourViewPanel.cxx index e0aa086..a470eba 100644 --- a/lib/Interface_ManagerContour_NDimensions/wxContourViewPanel.cxx +++ b/lib/Interface_ManagerContour_NDimensions/wxContourViewPanel.cxx @@ -22,20 +22,20 @@ //---------------------------------------------------------------------------------------------------------------- DEFINE_EVENT_TYPE( wxINSTANT_CHANGE ) - - + + //------------------------------------------------------------------------------------------------------------ // Constructors & Destructors //------------------------------------------------------------------------------------------------------------ /*{ - + showingVID = theShowingImage; int gapH = 20; int gapV = 10; createHorizontalBar(1,80); createVerticalBar(1,200); createViewPanel(); - + wxFlexGridSizer * panelSizer = new wxFlexGridSizer(3,1,0,0); panelSizer->AddSpacer(gapV); panelSizer -> AddGrowableCol(1); @@ -53,10 +53,10 @@ DEFINE_EVENT_TYPE( wxINSTANT_CHANGE ) outSizer -> AddGrowableRow(1); outSizer -> AddGrowableCol(1); outSizer->Add(downSizer, 1, wxEXPAND); - + _horizontalBar->setDeviceBlitStart( _verticalBar->GetWidth() + gapH, gapV); _horizontalBar->setDeviceEndMargin( gapH+10 ); - + //Connecting the events to the horizontal bar Connect(_horizontalBar->GetId(),wxEVT_TSBAR,(wxObjectEventFunction) (wxCommandEventFunction) &wxContourViewPanel::onBarrange_Horizontal ); Connect(_horizontalBar->GetId(),wxEVT_TSBAR_ACTUAL,(wxObjectEventFunction) (wxCommandEventFunction) &wxContourViewPanel::onActualChange_Bar_Horizontal ); @@ -64,7 +64,7 @@ DEFINE_EVENT_TYPE( wxINSTANT_CHANGE ) Connect(_horizontalBar->GetId(),wxEVT_TSBAR_END,(wxObjectEventFunction) (wxCommandEventFunction) &wxContourViewPanel::onEndChange_Bar_Horizontal ); Connect(_horizontalBar->GetId(),wxEVT_SELECTION_END,(wxObjectEventFunction) (wxCommandEventFunction) &wxContourViewPanel::onSelectionEnd_Horizontal ); Connect(_horizontalBar->GetId(),wxEVT_TSBAR_MOVED,(wxObjectEventFunction) (wxCommandEventFunction) &wxContourViewPanel::onMovedBar_Horizontal ); - + //Connecting the events to the vertical bar Connect(_verticalBar->GetId(),wxEVT_TSBAR,(wxObjectEventFunction) (wxCommandEventFunction) &wxContourViewPanel::onBarrange_Vertical ); Connect(_verticalBar->GetId(),wxEVT_TSBAR_ACTUAL,(wxObjectEventFunction) (wxCommandEventFunction) &wxContourViewPanel::onActualChange_Bar_Vertical ); @@ -72,8 +72,8 @@ DEFINE_EVENT_TYPE( wxINSTANT_CHANGE ) Connect(_verticalBar->GetId(),wxEVT_TSBAR_END,(wxObjectEventFunction) (wxCommandEventFunction) &wxContourViewPanel::onEndChange_Bar_Vertical ); Connect(_verticalBar->GetId(),wxEVT_SELECTION_END,(wxObjectEventFunction) (wxCommandEventFunction) &wxContourViewPanel::onSelectionEnd_Vertical ); Connect(_verticalBar->GetId(),wxEVT_TSBAR_MOVED,(wxObjectEventFunction) (wxCommandEventFunction) &wxContourViewPanel::onMovedBar_Vertical ); - - + + this->SetAutoLayout( true ); SetSizer( outSizer ); this->Layout(); @@ -84,12 +84,12 @@ DEFINE_EVENT_TYPE( wxINSTANT_CHANGE ) outSizer->Fit( this ); SetBackgroundColour(wxColour(255,0,0)); - + }*/ - //:wxScrolledWindow(parent, -1, pos, size, style) - wxContourViewPanel :: wxContourViewPanel ( vtkImageData * theShowingImage, wxWindow *parent, const wxPoint& pos, const wxSize& size,long style, int vertStart, int vertEnd, int horzStart, int horzEnd ) - :wxPanel(parent, -1, pos, size, style) - { + //:wxScrolledWindow(parent, -1, pos, size, style) + wxContourViewPanel :: wxContourViewPanel ( vtkImageData * theShowingImage, wxWindow *parent, const wxPoint& pos, const wxSize& size,long style, int vertStart, int vertEnd, int horzStart, int horzEnd ) + :wxPanel(parent, -1, pos, size, style) + { theShowingImage->GetSpacing(last_spacing); showingVID = theShowingImage; int gapH = 20; @@ -100,7 +100,7 @@ DEFINE_EVENT_TYPE( wxINSTANT_CHANGE ) createVerticalBar(1,200); createViewPanel(); _eventHandler = NULL; - + wxFlexGridSizer * panelSizer = new wxFlexGridSizer(1, 4, gapV, gapH); panelSizer -> AddGrowableCol(2); panelSizer -> AddGrowableRow(2); @@ -115,10 +115,10 @@ DEFINE_EVENT_TYPE( wxINSTANT_CHANGE ) outSizer->Add( _horizontalBar, 1, wxGROW); outSizer->Add( panelSizer, 1, wxGROW); outSizer->AddSpacer(gapH); - + _horizontalBar->setDeviceBlitStart( _verticalBar->GetWidth() + 2*gapH, gapV); _horizontalBar->setDeviceEndMargin( 2*gapH+10 ); - + //Connecting the events to the horizontal bar Connect(_horizontalBar->GetId(),wxEVT_TSBAR,(wxObjectEventFunction) (wxCommandEventFunction) &wxContourViewPanel::onBarrange_Horizontal ); Connect(_horizontalBar->GetId(),wxEVT_TSBAR_ACTUAL,(wxObjectEventFunction) (wxCommandEventFunction) &wxContourViewPanel::onActualChange_Bar_Horizontal ); @@ -126,7 +126,7 @@ DEFINE_EVENT_TYPE( wxINSTANT_CHANGE ) Connect(_horizontalBar->GetId(),wxEVT_TSBAR_END,(wxObjectEventFunction) (wxCommandEventFunction) &wxContourViewPanel::onEndChange_Bar_Horizontal ); Connect(_horizontalBar->GetId(),wxEVT_SELECTION_END,(wxObjectEventFunction) (wxCommandEventFunction) &wxContourViewPanel::onSelectionEnd_Horizontal ); Connect(_horizontalBar->GetId(),wxEVT_TSBAR_MOVED,(wxObjectEventFunction) (wxCommandEventFunction) &wxContourViewPanel::onMovedBar_Horizontal ); - + //Connecting the events to the vertical bar Connect(_verticalBar->GetId(),wxEVT_TSBAR,(wxObjectEventFunction) (wxCommandEventFunction) &wxContourViewPanel::onBarrange_Vertical ); Connect(_verticalBar->GetId(),wxEVT_TSBAR_ACTUAL,(wxObjectEventFunction) (wxCommandEventFunction) &wxContourViewPanel::onActualChange_Bar_Vertical ); @@ -134,8 +134,8 @@ DEFINE_EVENT_TYPE( wxINSTANT_CHANGE ) Connect(_verticalBar->GetId(),wxEVT_TSBAR_END,(wxObjectEventFunction) (wxCommandEventFunction) &wxContourViewPanel::onEndChange_Bar_Vertical ); Connect(_verticalBar->GetId(),wxEVT_SELECTION_END,(wxObjectEventFunction) (wxCommandEventFunction) &wxContourViewPanel::onSelectionEnd_Vertical ); Connect(_verticalBar->GetId(),wxEVT_TSBAR_MOVED,(wxObjectEventFunction) (wxCommandEventFunction) &wxContourViewPanel::onMovedBar_Vertical ); - - + + this->SetSizer( outSizer ); this->SetAutoLayout( true ); this->Layout(); @@ -144,11 +144,11 @@ DEFINE_EVENT_TYPE( wxINSTANT_CHANGE ) //theViewPanel->SetSize(800,600); //theViewPanel->GetWindow(1)->SetSize(800,600); - //outSizer->Fit( this ); + //outSizer->Fit( this ); initializeScenceManager(); } - + wxContourViewPanel :: ~wxContourViewPanel() { @@ -156,21 +156,21 @@ DEFINE_EVENT_TYPE( wxINSTANT_CHANGE ) } void wxContourViewPanel::initializeScenceManager(){ - + //_theViewPanel = theViewPanel; //_theViewPanel->setWxEventHandler( this ); double spc[3]; this->getSpacing(spc); _sceneManager = new wxVtkBaseView_SceneManager ( this->getWxVtkBaseView(), this, spc ); - + Connect( this->GetId(), wxINSTANT_CHANGE, (wxObjectEventFunction) (wxCommandEventFunction) &wxContourViewPanel::onChangeInstant ); Connect( wxID_ANY, wxEVT_START_CREATE_MULT_ROI, (wxObjectEventFunction) (wxCommandEventFunction) &wxContourViewPanel::onCreateMultipleROI ); Connect( wxID_ANY, wxEVT_START_CREATE_ROI, (wxObjectEventFunction) (wxCommandEventFunction) &wxContourViewPanel::onCreateROI ); Connect( wxID_ANY, wxEVT_STOP_CREATE_ROI, (wxObjectEventFunction) (wxCommandEventFunction) &wxContourViewPanel::onStopCreateROI ); Connect( wxID_ANY, wxEVT_CHANGED_DEEP, (wxObjectEventFunction) (wxCommandEventFunction) &wxContourViewPanel::onChangedDeep ); - Connect( wxID_ANY, wxEVT_COMMAND_BUTTON_CLICKED , (wxObjectEventFunction) &wxContourViewPanel :: onActionButtonPressed ); - + Connect( wxID_ANY, wxEVT_COMMAND_BUTTON_CLICKED , (wxObjectEventFunction) &wxContourViewPanel :: onActionButtonPressed ); + } wxVtkBaseView_SceneManager* wxContourViewPanel::getSceneManager(){ @@ -180,7 +180,7 @@ DEFINE_EVENT_TYPE( wxINSTANT_CHANGE ) //------------------------------------------------------------------------------------------------------------ // Creational and initialization methods //------------------------------------------------------------------------------------------------------------ - + void wxContourViewPanel :: setWxEventHandler( wxEvtHandler * theEventHandler ) { _eventHandler = theEventHandler; @@ -211,7 +211,7 @@ DEFINE_EVENT_TYPE( wxINSTANT_CHANGE ) //------------------------------------------------------------------------------------------------------------ void wxContourViewPanel::createViewPanel() - { + { std::vector * numViews = new std::vector (); numViews->push_back(0); theViewPanel = new wxMaracas_N_ViewersWidget( this, showingVID, numViews ); @@ -221,16 +221,16 @@ DEFINE_EVENT_TYPE( wxINSTANT_CHANGE ) theViewPanel->SetSize(800,600); theViewPanel->GetWindow(1)->SetSize(800,600); - + } //------------------------------------------------------------------------------------------------------------ void wxContourViewPanel::changeImage(vtkImageData* img){ - + theViewPanel->SetImage(img); } - wxVtkMPR2DView * wxContourViewPanel::GetwxVtkMPR2DView() + wxVtkMPR2DView * wxContourViewPanel::GetwxVtkMPR2DView() { return (wxVtkMPR2DView *) (theViewPanel->GetwxVtkBaseView(1)); } @@ -267,20 +267,20 @@ DEFINE_EVENT_TYPE( wxINSTANT_CHANGE ) //------------------------------------------------------------------------------------------------------------ // Methods for capturing events from the horizontal bar //------------------------------------------------------------------------------------------------------------ - + /** - * Handles the event wxEVT_TSBAR from the horizontal bar + * Handles the event wxEVT_TSBAR from the horizontal bar */ void wxContourViewPanel :: onBarrange_Horizontal(wxCommandEvent& event) { - + } /** - * Handles the event wxEVT_TSBAR_ACTUAL from the horizontal bar + * Handles the event wxEVT_TSBAR_ACTUAL from the horizontal bar */ void wxContourViewPanel :: onActualChange_Bar_Horizontal(wxCommandEvent& event) { - + int actual = getActualHorizontal(); wxContourMainFrame::getInstance()->onChangeInstant(_horizontalConceptName, actual); @@ -288,14 +288,14 @@ DEFINE_EVENT_TYPE( wxINSTANT_CHANGE ) //JCP 26 - 11 - 08 //int nxActual_h = getActualHorizontal(); - + //if (_eventHandler!=NULL) //{ //------------------------------------------------- // Sending the event of wxINSTANT_CHANGE //------------------------------------------------- - // wxCommandEvent newevent(wxINSTANT_CHANGE,GetId()); - + // wxCommandEvent newevent(wxINSTANT_CHANGE,GetId()); + // ConceptDataWrap * cWrap = new ConceptDataWrap( _horizontalConceptName ); // cWrap->setActualValue( nxActual_h ); @@ -304,30 +304,30 @@ DEFINE_EVENT_TYPE( wxINSTANT_CHANGE ) //} //JCP 26 - 11 - 08 - } + } /** - * Handles the event wxEVT_TSBAR_START from the horizontal bar + * Handles the event wxEVT_TSBAR_START from the horizontal bar */ void wxContourViewPanel :: onStartChange_Bar_Horizontal(wxCommandEvent& event) { // int nxStart_h = getStartHorizontal(); } /** - * Handles the event wxEVT_TSBAR_END from the horizontal bar + * Handles the event wxEVT_TSBAR_END from the horizontal bar */ void wxContourViewPanel :: onEndChange_Bar_Horizontal(wxCommandEvent& event) { // int nxEnd_h = getEndHorizontal(); } /** - * Handles the event wxEVT_SELECTION_END from the horizontal bar + * Handles the event wxEVT_SELECTION_END from the horizontal bar */ void wxContourViewPanel :: onSelectionEnd_Horizontal(wxCommandEvent& event) { - + } /** - * Handles the event wxEVT_TSBAR_MOVED from the horizontal bar + * Handles the event wxEVT_TSBAR_MOVED from the horizontal bar */ void wxContourViewPanel :: onMovedBar_Horizontal(wxCommandEvent& event) { @@ -341,14 +341,14 @@ DEFINE_EVENT_TYPE( wxINSTANT_CHANGE ) //------------------------------------------------------------------------------------------------------------ /** - * Handles the event wxEVT_TSBAR from the vertical bar + * Handles the event wxEVT_TSBAR from the vertical bar */ void wxContourViewPanel :: onBarrange_Vertical(wxCommandEvent& event) { } /** - * Handles the event wxEVT_TSBAR_ACTUAL from the vertical bar + * Handles the event wxEVT_TSBAR_ACTUAL from the vertical bar */ void wxContourViewPanel :: onActualChange_Bar_Vertical(wxCommandEvent& event) { @@ -363,8 +363,8 @@ DEFINE_EVENT_TYPE( wxINSTANT_CHANGE ) //------------------------------------------------- // Sending the event of wxINSTANT_CHANGE //------------------------------------------------- - wxCommandEvent newevent(wxINSTANT_CHANGE,GetId()); - + wxCommandEvent newevent(wxINSTANT_CHANGE,GetId()); + ConceptDataWrap * cWrap = new ConceptDataWrap( _verticalConceptName ); cWrap->setActualValue( nxActual_v ); @@ -374,34 +374,34 @@ DEFINE_EVENT_TYPE( wxINSTANT_CHANGE ) //JCP 26 - 11 - 08 } /** - * Handles the event wxEVT_TSBAR_START from the vertical bar + * Handles the event wxEVT_TSBAR_START from the vertical bar */ void wxContourViewPanel :: onStartChange_Bar_Vertical(wxCommandEvent& event) { // int nxStart_v = getStartVertical(); } /** - * Handles the event wxEVT_TSBAR_END from the vertical bar + * Handles the event wxEVT_TSBAR_END from the vertical bar */ void wxContourViewPanel :: onEndChange_Bar_Vertical(wxCommandEvent& event) { // int nxEnd_v = getEndVertical(); } /** - * Handles the event wxEVT_SELECTION_END from the vertical bar + * Handles the event wxEVT_SELECTION_END from the vertical bar */ void wxContourViewPanel :: onSelectionEnd_Vertical(wxCommandEvent& event) { } /** - * Handles the event wxEVT_TSBAR_MOVED from the vertical bar + * Handles the event wxEVT_TSBAR_MOVED from the vertical bar */ void wxContourViewPanel :: onMovedBar_Vertical(wxCommandEvent& event) { // int nxStart_v = getStartVertical(); // int nxEnd_v = getEndVertical(); - } + } //------------------------------------------------------------------------------------------------------------ @@ -437,7 +437,7 @@ DEFINE_EVENT_TYPE( wxINSTANT_CHANGE ) _horizontalBar -> setRepresentedValues( minRepresented, maxRepresented ); } } - + /** * Gets the StartVertical value * @return The StartVertical @@ -451,7 +451,7 @@ DEFINE_EVENT_TYPE( wxINSTANT_CHANGE ) * @return The EndVertical */ int wxContourViewPanel :: getEndVertical() - { + { return _verticalBar->GetEnd(); } /** @@ -537,7 +537,7 @@ DEFINE_EVENT_TYPE( wxINSTANT_CHANGE ) { _horizontalBar->SetActual( nwValue ); } - + /** * Sets the horizontal concept values and name * @param theHorizontalConcept The name of the concept for setting at the horizontal bar @@ -573,7 +573,7 @@ DEFINE_EVENT_TYPE( wxINSTANT_CHANGE ) setStartVertical( minShowed ); setEndVertical( maxShowed ); } - + /** * Sets the horizontal concept name @@ -635,20 +635,20 @@ DEFINE_EVENT_TYPE( wxINSTANT_CHANGE ) //return GetZ(); } - + bool wxContourViewPanel::isEditableCControler(std::string theKeyName){ return _sceneManager->isEditableCControler(theKeyName); } void wxContourViewPanel::removeFromScene(std::string theKeyName){ - - _sceneManager->deleteCViewerCControler(theKeyName); - - + + _sceneManager->deleteCViewerCControler(theKeyName); + + } void wxContourViewPanel::onChangeInstant(wxCommandEvent& event){ - ConceptDataWrap * dataConcept = NULL; + ConceptDataWrap * dataConcept = NULL; if ( GetId() == event.GetId() ) { dataConcept = (ConceptDataWrap *)event.GetClientData(); @@ -668,7 +668,7 @@ DEFINE_EVENT_TYPE( wxINSTANT_CHANGE ) { setHorizontalConcept( dataConcept->getName(), dataConcept->getMinShowedValue()/*dataConcept->getMinValue()*/, /*dataConcept->getMaxValue()*/ dataConcept->getMaxShowedValue(), dataConcept->getMinShowedValue(), dataConcept->getMaxShowedValue(), dataConcept->getActualValue()); } - } + } wxContourMainFrame::getInstance()->changeInstant(); } @@ -683,7 +683,7 @@ DEFINE_EVENT_TYPE( wxINSTANT_CHANGE ) //setActualVertical( (int)val ); wxContourMainFrame::getInstance()->onChangeDeep((int)val); //_instantPanel->setConceptValue( "Axe Depth", (int)val ); - + // changeInstant(); } void wxContourViewPanel::changeDeep(){ @@ -692,34 +692,34 @@ DEFINE_EVENT_TYPE( wxINSTANT_CHANGE ) } void wxContourViewPanel::onActionButtonPressed(wxCommandEvent& event){ - + std::vector currentSelection = _sceneManager->getSelectedObjects(); // int elementsSelected = currentSelection.size(); bool ctrlKey = _sceneManager->isCtrlPressed(); char toolCommand = _sceneManager->getLastKeyCode(); - if ( toolCommand == 3 && ctrlKey ) //'C' || 'c' + if ( toolCommand == 3 && ctrlKey ) //'C' || 'c' { wxContourMainFrame::getInstance()->onCopy(); } - else if( toolCommand == 22 && ctrlKey ) //'V' || 'v' + else if( toolCommand == 22 && ctrlKey ) //'V' || 'v' { wxContourMainFrame::getInstance()->onPaste(); } - else if( toolCommand == 8 || (toolCommand==127) ) // backspace Delete + else if( toolCommand == 8 || (toolCommand==127) ) // backspace Delete { wxContourMainFrame::getInstance()->onDeleteContour(); } - else if( toolCommand == 14 && ctrlKey ) //'N' || 'n' + else if( toolCommand == 14 && ctrlKey ) //'N' || 'n' { //toolCommand = &(CREATE_CONTOUR_KEY); } - else if( toolCommand == 15 && ctrlKey ) //'O' || 'o' + else if( toolCommand == 15 && ctrlKey ) //'O' || 'o' { wxContourMainFrame::getInstance()->onLoad(); } - else if( toolCommand == 19 && ctrlKey ) //'S' || 's' + else if( toolCommand == 19 && ctrlKey ) //'S' || 's' { wxContourMainFrame::getInstance()->saveFileWithContoursAutomatique(); }else if( toolCommand == 26 ){ @@ -748,49 +748,57 @@ DEFINE_EVENT_TYPE( wxINSTANT_CHANGE ) void wxContourViewPanel::RefreshInterface(){ getWxVtkBaseView()->Refresh(); } - + vtkImageData* wxContourViewPanel::getImageData(){ return _sceneManager->GetImageData(); } - void wxContourViewPanel::configureViewControlTo(std::string theName,manualBaseModel* manModelContour,double* spc,int typeofcontour){ + void wxContourViewPanel::configureViewControlTo(std::string theName,manualBaseModel* manModelContour,double* spc,int typeofcontour) + { _sceneManager->configureViewControlTo(theName, manModelContour, spc, typeofcontour); } - int wxContourViewPanel::GetImageDataSizeZ(){ + int wxContourViewPanel::GetImageDataSizeZ() + { return _sceneManager->GetImageDataSizeZ(); } - void wxContourViewPanel::GetImageDataRange(double *range){ + void wxContourViewPanel::GetImageDataRange(double *range) + { _sceneManager->GetImageDataRange(range); } - void wxContourViewPanel::SetWidthContour(double width ){ + void wxContourViewPanel::SetWidthContour(double width ) + { _sceneManager->SetWidthContour( width ); } - int wxContourViewPanel::getColorWindow(){ + int wxContourViewPanel::getColorWindow() + { wxVtk2DBaseView *wxvtk2dbaseview = (wxVtk2DBaseView*)getWxVtkBaseView(); vtkImageViewer2 *imageviewer = wxvtk2dbaseview->_imageViewer2XYZ->GetVtkImageViewer2(); int colorwindow = (int)imageviewer->GetWindowLevel()->GetLevel(); return colorwindow; } - int wxContourViewPanel::getWindowLevel(){ + int wxContourViewPanel::getWindowLevel() + { wxVtk2DBaseView *wxvtk2dbaseview = (wxVtk2DBaseView*)getWxVtkBaseView(); vtkImageViewer2 *imageviewer = wxvtk2dbaseview->_imageViewer2XYZ->GetVtkImageViewer2(); - int windowlevel = (int)imageviewer->GetWindowLevel()->GetWindow(); + int windowlevel = (int)imageviewer->GetWindowLevel()->GetWindow(); return windowlevel; } - void wxContourViewPanel::onBrigthnessColorWindowLevel(int colorwindow,int windowlevel){ + void wxContourViewPanel::onBrigthnessColorWindowLevel(int colorwindow,int windowlevel) + { wxVtk2DBaseView *wxvtk2dbaseview = (wxVtk2DBaseView*)getWxVtkBaseView(); vtkImageViewer2 *imageviewer = wxvtk2dbaseview->_imageViewer2XYZ->GetVtkImageViewer2(); imageviewer->SetColorWindow(colorwindow); - imageviewer->SetColorLevel(windowlevel); + imageviewer->SetColorLevel(windowlevel); } - void wxContourViewPanel::onInterpolation(bool interpolate){ + void wxContourViewPanel::onInterpolation(bool interpolate) + { wxVtk2DBaseView *wxvtk2dbaseview = (wxVtk2DBaseView*)getWxVtkBaseView(); vtkImageViewer2 *imageviewer = wxvtk2dbaseview->_imageViewer2XYZ->GetVtkImageViewer2(); @@ -801,7 +809,8 @@ DEFINE_EVENT_TYPE( wxINSTANT_CHANGE ) } } - void wxContourViewPanel::GetPointsOfActualContour( std::vector *vecX, std::vector *vecY, std::vector *vecZ ){ + void wxContourViewPanel::GetPointsOfActualContour( std::vector *vecX, std::vector *vecY, std::vector *vecZ ) + { _sceneManager->GetPointsOfActualContour(vecX, vecY, vecZ); } @@ -811,4 +820,4 @@ DEFINE_EVENT_TYPE( wxINSTANT_CHANGE ) baseview->SetActualSlice(z); RefreshInterface(); } - + -- 2.45.0