From: jean-pierre roux Date: Fri, 22 Jul 2011 17:43:01 +0000 (+0000) Subject: re indent X-Git-Tag: v1.0.4~76 X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=afeeee6e8ef4a7b29e33db89bf6fc03542201ed1;p=creaMaracasVisu.git re indent --- diff --git a/CMakeLists.txt b/CMakeLists.txt index a4ecd1a..8cac057 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -96,8 +96,6 @@ INCLUDE_DIRECTORIES( ${PROJECT_SOURCE_DIR}/lib/Kernel/VTKObjects/SurfaceRenderer ${PROJECT_SOURCE_DIR}/lib/Kernel/VTKObjects/ViewerWidgets ${PROJECT_SOURCE_DIR}/lib/Kernel/VTKObjects/VolumeRenderer - - ) diff --git a/bbtk/src/bbmaracasvisuShowNPoints.cxx b/bbtk/src/bbmaracasvisuShowNPoints.cxx index fd778dc..2ec8ea0 100644 --- a/bbtk/src/bbmaracasvisuShowNPoints.cxx +++ b/bbtk/src/bbmaracasvisuShowNPoints.cxx @@ -79,7 +79,7 @@ namespace bbcreaMaracasVisu // Widget interface wxButton *btnSetPositionPoint = new wxButton( panel, -1, _T("Set nearest point")); txtNrPoints = new wxStaticText(panel,-1, _T(" ")); - + //NTU: Sliders for opacity and radio change wxStaticText* txOpacity = new wxStaticText(this, -1, wxString(_T(" Points Opacity "))); sdrOpacity = new wxSlider(this, -1, 0, 0, 100, wxDefaultPosition, wxDefaultSize, wxSL_LABELS); @@ -89,7 +89,7 @@ namespace bbcreaMaracasVisu Connect(btnSetPositionPoint->GetId() , wxEVT_COMMAND_BUTTON_CLICKED , (wxObjectEventFunction) &WidgetShowNPoints::OnSetPoint); Connect(sdrOpacity->GetId() , wxEVT_COMMAND_SLIDER_UPDATED , (wxObjectEventFunction) &WidgetShowNPoints::UpdatePoints); Connect(sdrRadio->GetId() , wxEVT_COMMAND_SLIDER_UPDATED , (wxObjectEventFunction) &WidgetShowNPoints::UpdatePoints); - + sizer1->Add(btnSetPositionPoint); sizer1->Add(txtNrPoints); sizer1->Add(txOpacity); @@ -98,7 +98,7 @@ namespace bbcreaMaracasVisu sizer1->Add(sdrRadio,1,wxGROW ); sizer = sizer1; } - + if (sizer!=NULL) { panel->SetSizer(sizer); @@ -233,8 +233,7 @@ void WidgetShowNPoints::AddPoint(int x, int y, int z, std::string label) vtkActor *sphereActor = vtkActor::New(); sphereActor->SetMapper(sphereMapper); sphereActor->SetOrigin(0, 0, 0); - - + /*EED Borrame double spc[3]; if(mimage==NULL){ @@ -247,7 +246,7 @@ void WidgetShowNPoints::AddPoint(int x, int y, int z, std::string label) sphereActor->GetProperty()->SetColor( mcolour[0] , mcolour[1] , mcolour[2] ); sphereActor->GetProperty()->SetOpacity( mopacity ); */ - + lstActorsSphere.push_back(sphereActor); if(renderer==NULL){ wxMessageDialog dialog(this, _T("Renderer Not Set"),_T("Renderer Not Set"),wxICON_ERROR); @@ -485,7 +484,6 @@ void WidgetShowNPoints::OnAddPoint (wxCommandEvent& event) } } - //------------------------------------------------------------------------ void WidgetShowNPoints::OnRenamePoint(wxCommandEvent& event) { @@ -598,12 +596,12 @@ void ShowNPoints::Process() void ShowNPoints::CreateWidget(wxWindow* parent) { mwxwidget = new WidgetShowNPoints( parent, this); - bbSetOutputWidget( mwxwidget ); + bbSetOutputWidget( mwxwidget ); } void ShowNPoints::bbUserSetDefaultValues() { - mwxwidget = NULL; + mwxwidget = NULL; bbSetInputRadio(1); bbSetInputOpacity(1); diff --git a/bbtk/src/bbmaracasvisuShowNPoints.h b/bbtk/src/bbmaracasvisuShowNPoints.h index 17dc629..f047ae4 100644 --- a/bbtk/src/bbmaracasvisuShowNPoints.h +++ b/bbtk/src/bbmaracasvisuShowNPoints.h @@ -101,7 +101,7 @@ class /*BBTK_EXPORT*/ ShowNPoints void CreateWidget(wxWindow*); private: - WidgetShowNPoints *mwxwidget; + WidgetShowNPoints *mwxwidget; }; BBTK_BEGIN_DESCRIBE_BLACK_BOX(ShowNPoints,bbtk::WxBlackBox); diff --git a/bbtk/src/bbmaracasvisuSliderMinMax.cxx b/bbtk/src/bbmaracasvisuSliderMinMax.cxx index d39065f..b04dbb9 100644 --- a/bbtk/src/bbmaracasvisuSliderMinMax.cxx +++ b/bbtk/src/bbmaracasvisuSliderMinMax.cxx @@ -15,8 +15,8 @@ namespace bbcreaMaracasVisu wxWidgetSliderMinMax :: wxWidgetSliderMinMax(SliderMinMax *bbParent,mBarRange * modelBarRange) :wxEvtHandler() { - modBarRange = modelBarRange; - mbbtkSliderMinMax = bbParent; + modBarRange = modelBarRange; + mbbtkSliderMinMax = bbParent; Connect(modBarRange->GetId(),wxEVT_TSBAR,(wxObjectEventFunction) (wxCommandEventFunction) &wxWidgetSliderMinMax::onBarrange ); // Connect(modBarRange->GetId(),98765,(wxObjectEventFunction) (wxCommandEventFunction) &wxWidgetSliderMinMax::onActualChange_Bar ); Connect(modBarRange->GetId(),wxEVT_TSBAR_ACTUAL,(wxObjectEventFunction) (wxCommandEventFunction) &wxWidgetSliderMinMax::onActualChange_Bar ); @@ -29,12 +29,12 @@ namespace bbcreaMaracasVisu wxWidgetSliderMinMax :: ~wxWidgetSliderMinMax() { } - + void wxWidgetSliderMinMax::PushEventHandler() { modBarRange->PushEventHandler(this); } - + //-------------------------------------------------------------------------------------------------------------------------------- // Min-Max Barrange received events //-------------------------------------------------------------------------------------------------------------------------------- @@ -50,7 +50,7 @@ namespace bbcreaMaracasVisu void wxWidgetSliderMinMax :: onStartChange_Bar(wxCommandEvent& event) { - mbbtkSliderMinMax->bbSetOutputOutStart(modBarRange->GetStart()); + mbbtkSliderMinMax->bbSetOutputOutStart(modBarRange->GetStart()); mbbtkSliderMinMax->bbSetInputInMinShow(modBarRange->GetStart()); mbbtkSliderMinMax->bbSignalOutputModification(std::string("OutStart")); } @@ -112,12 +112,12 @@ void SliderMinMax::CreateWidget(wxWindow* parent) mwxwidget -> setIfWithActualDrawed(bbGetInputShowActual()); // mwxwidget -> SetStart(bbGetInputInMinShow()); // mwxwidget -> SetEnd(bbGetInputInMaxShow()); - - + + wxWidgetSliderMinMax *eventHandler = new wxWidgetSliderMinMax(this, mwxwidget); eventHandler->PushEventHandler(); - + bbtkDebugDecTab("Core",9); bbSetOutputWidget( mwxwidget ); diff --git a/bbtk/src/bbmaracasvisuSliderMinMax.h b/bbtk/src/bbmaracasvisuSliderMinMax.h index 1aaa580..731e952 100644 --- a/bbtk/src/bbmaracasvisuSliderMinMax.h +++ b/bbtk/src/bbmaracasvisuSliderMinMax.h @@ -35,7 +35,6 @@ namespace bbcreaMaracasVisu void onEndChange_Bar(wxCommandEvent& event); void onSelectionEnd(wxCommandEvent& event); void onMovedBar(wxCommandEvent& event); - void PushEventHandler(); diff --git a/lib/GUI/Base/VolumeRenderer/volumerendererdata.cxx b/lib/GUI/Base/VolumeRenderer/volumerendererdata.cxx index a63f58e..c19456f 100644 --- a/lib/GUI/Base/VolumeRenderer/volumerendererdata.cxx +++ b/lib/GUI/Base/VolumeRenderer/volumerendererdata.cxx @@ -1,7 +1,7 @@ #include "volumerendererdata.h" #include "vtkObjectFactory.h" -vtkCxxRevisionMacro(VolumeRendererData, "$Revision: 1.5 $"); +vtkCxxRevisionMacro(VolumeRendererData, "$Revision: 1.6 $"); vtkStandardNewMacro(VolumeRendererData); VolumeRendererData::VolumeRendererData() @@ -26,7 +26,7 @@ void VolumeRendererData::ShowVolume(bool checked){ }else{ Renderer->RemoveActor(VolRendData->getProp3D()); // VolRendData->Delete(); - // VolRendData = 0; + // VolRendData = 0; } } @@ -41,7 +41,7 @@ void VolumeRendererData::invariant(){ void VolumeRendererData::OpacityChanged(vector greyvalues, vector values){ //invariant(); - if(VolRendData==NULL) + if(VolRendData==NULL) { VolRendData = new VolumeRendererManagerData(ImageData, true); diff --git a/lib/GUI/Base/VolumeRenderer/volumerendererdata.h b/lib/GUI/Base/VolumeRenderer/volumerendererdata.h index f00d583..95a7eb8 100644 --- a/lib/GUI/Base/VolumeRenderer/volumerendererdata.h +++ b/lib/GUI/Base/VolumeRenderer/volumerendererdata.h @@ -34,10 +34,6 @@ protected: vtkLookupTable* LookUpTable; vtkRenderWindowInteractor* Interactor; - - - - private: void invariant(); diff --git a/lib/GUI/Qt/Viewers/CMakeLists.txt b/lib/GUI/Qt/Viewers/CMakeLists.txt index cabd620..a72202c 100644 --- a/lib/GUI/Qt/Viewers/CMakeLists.txt +++ b/lib/GUI/Qt/Viewers/CMakeLists.txt @@ -89,7 +89,7 @@ IF ( BUILD_${LIBRARY_NAME} ) ${QT_LIBRARIES} QVTK - GUIQtVolumeRenderer + GUIQtVolumeRenderer GUIQtSurfaceRenderer KernelViewerWidgets diff --git a/lib/GUI/Qt/Viewers/qtvtkviewerwidget.cxx b/lib/GUI/Qt/Viewers/qtvtkviewerwidget.cxx index 081107f..8f586fe 100644 --- a/lib/GUI/Qt/Viewers/qtvtkviewerwidget.cxx +++ b/lib/GUI/Qt/Viewers/qtvtkviewerwidget.cxx @@ -8,10 +8,8 @@ QtVTKViewerWidget::QtVTKViewerWidget(QWidget *parent) : { setupUi(this); - this->m_VolumeRender->SetRenderer(this->getRenderer()); this->m_VolumeRender->SetInteractor(this->_qtvtkviewer->GetRenderWindow()->GetInteractor()); - this->m_SurfaceRender->setRenderer(this->getRenderer()); this->m_SurfaceRender->setInteractor(this->_qtvtkviewer->GetRenderWindow()->GetInteractor()); } @@ -29,13 +27,11 @@ void QtVTKViewerWidget::setImage(vtkImageData* img){ this->_qtvtkviewer->setImage(img); this->m_VolumeRender->SetImageData(img); this->m_SurfaceRender->SetImageData(img); - } void QtVTKViewerWidget::SetLookupTable(vtkLookupTable *lookuptable){ this->_qtvtkviewer->SetLookupTable(lookuptable); this->m_VolumeRender->SetLookUpTable(lookuptable); - } void QtVTKViewerWidget::on_checkBoxShowPlanes_clicked(){ diff --git a/lib/GUI/Wx/CMakeLists.txt b/lib/GUI/Wx/CMakeLists.txt index b572d1b..ecd2ced 100644 --- a/lib/GUI/Wx/CMakeLists.txt +++ b/lib/GUI/Wx/CMakeLists.txt @@ -1,3 +1,2 @@ ADD_SUBDIRECTORY(SurfaceRenderer) ADD_SUBDIRECTORY(VolumeRenderer) - diff --git a/lib/Kernel/VTKObjects/VolumeRenderer/volumerenderermanagerdata.cxx b/lib/Kernel/VTKObjects/VolumeRenderer/volumerenderermanagerdata.cxx index 0d94038..f267e3f 100644 --- a/lib/Kernel/VTKObjects/VolumeRenderer/volumerenderermanagerdata.cxx +++ b/lib/Kernel/VTKObjects/VolumeRenderer/volumerenderermanagerdata.cxx @@ -56,8 +56,6 @@ void VolumeRendererManagerData::Initialize(vtkImageData* vol, std::string datana _MIPFunction = 0; _boxWidgetS1 = 0; - - /* EED9Juin2011 if(usegpu && _vol->GetDataDimension() > 2){ _volumeMappergpu = vtkGPUVolumeRayCastMapper::New(); diff --git a/lib/maracasVisuLib/CMakeLists.txt b/lib/maracasVisuLib/CMakeLists.txt index d2a8ad1..6135b61 100644 --- a/lib/maracasVisuLib/CMakeLists.txt +++ b/lib/maracasVisuLib/CMakeLists.txt @@ -161,7 +161,7 @@ FILE(GLOB ${LIBRARY_NAME}_HEADERS_CUTMODULE src/CutModule/interface/*.h src/CutM # Sets the settings for macro CREA_ADVANCED_INSTALL_LIBRARY_FOR_CMAKE SET(${LIBRARY_NAME}_INSTALL_FOLDER ${LIBRARY_NAME}) - SET(${LIBRARY_NAME}_LIBRARIES ${LIBRARY_NAME} + SET(${LIBRARY_NAME}_LIBRARIES ${LIBRARY_NAME} BaseVolumeRenderer BaseSurfaceRenderer GUIWxSurfaceRenderer diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/mBarRange.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/mBarRange.cxx index 494d599..b46e495 100644 --- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/mBarRange.cxx +++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/mBarRange.cxx @@ -1362,7 +1362,6 @@ void mBarRange :: setVisibleLabels ( bool setVisibleLB ) return guideLineColor; } - void mBarRange ::onLeftClicDown(wxMouseEvent& event ) { acceptedClick = true; diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/mBarRange.h b/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/mBarRange.h index aa28eff..96d728c 100644 --- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/mBarRange.h +++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/mBarRange.h @@ -318,9 +318,9 @@ private: //End of the rectangule int _end; //Logical Max - double _max; + double _max; //Logical Min - double _min; + double _min; //Initial point when moving the rectangule bar according to bar reference int _initialPoint; /* diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/vtkClipping3DDataViewer.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/vtkClipping3DDataViewer.cxx index fb791dc..d2524be 100644 --- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/vtkClipping3DDataViewer.cxx +++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/vtkClipping3DDataViewer.cxx @@ -166,8 +166,6 @@ void vtkClipping3DDataViewer::SetVisibleVolume(bool visiblevolume) _visibleVolume = visiblevolume; } - - bool vtkClipping3DDataViewer::GetVisibleVolumeBox() { return _visibleVolumeBox; @@ -178,8 +176,6 @@ void vtkClipping3DDataViewer::SetVisibleVolumeBox(bool visibleBox) _visibleVolumeBox = visibleBox; } - - //------------------------------------------------------------------- void vtkClipping3DDataViewer::Configure_Tissue() { diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/vtkClipping3DDataViewer.h b/lib/maracasVisuLib/src/interface/wxWindows/widgets/vtkClipping3DDataViewer.h index 21e5dbd..86c6aae 100644 --- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/vtkClipping3DDataViewer.h +++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/vtkClipping3DDataViewer.h @@ -143,7 +143,6 @@ private: bool _visibleVolumeBox; - bool _representationType[VTKMPRDATA_MAXTISSUE]; bool _visibleTissue[VTKMPRDATA_MAXTISSUE]; vtkActor *_tissue[VTKMPRDATA_MAXTISSUE]; diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtkClipping3DView.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtkClipping3DView.cxx index c108524..6cb4429 100644 --- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtkClipping3DView.cxx +++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtkClipping3DView.cxx @@ -218,9 +218,6 @@ void wxVtkClipping3DView::Configure(){ // between the planes is actually rendered. _wxvtk3Dbaseview->GetRenderer()->ResetCameraClippingRange(); - - - //cout<<"JPRG::wxVtkClipping3DView::SetVtkClipping3DDataViewer::GetRenderer()::"<GetWxvtk3Dbaseview()->GetRenderer()<GetWxvtk3Dbaseview()->GetWxVTKRenderWindowInteractor()<GetVtkClipping3DDataViewer()->ReadVolumeFunctions(); - //test @@ -308,8 +307,6 @@ void wxVtkClipping3DViewVolCntrlPanel::OnBtnVolumeFunctions(wxCommandEvent& even /* volumeMapper->Update(); newvol->Update(); - - */ } else { if(hDlg->getRefreshed()) @@ -345,11 +342,9 @@ void wxVtkClipping3DViewVolCntrlPanel::OnBtnVolumeFunctions(wxCommandEvent& even //--------------------------------- //_wxvtkclipping3Dview->GetVtkClipping3DDataViewer()->ReadVolumeFunctions(); - wxCommandEvent newevent1(wxEVT_COMMAND_MENU_SELECTED,12121); // Refresh _wxvtkclipping3Dview->GetWxvtk3Dbaseview()->GetWxVTKRenderWindowInteractor()->GetParent()->ProcessEvent(newevent1); - _wxvtkclipping3Dview->Refresh(); /* @@ -361,7 +356,6 @@ void wxVtkClipping3DViewVolCntrlPanel::OnBtnVolumeFunctions(wxCommandEvent& even } //destroy the dialog - hDlg->Destroy(); } @@ -390,8 +384,6 @@ void wxVtkClipping3DViewVolCntrlPanel::OnMIPActive(wxCommandEvent& event){ void wxVtkClipping3DViewVolCntrlPanel::OnInterpolationActive(wxCommandEvent& event){ - - _wxvtkclipping3Dview->SetInterpolation(event.IsChecked()); wxCommandEvent newevent1(wxEVT_COMMAND_MENU_SELECTED,12121); // Refresh @@ -400,8 +392,6 @@ void wxVtkClipping3DViewVolCntrlPanel::OnInterpolationActive(wxCommandEvent& } void wxVtkClipping3DViewVolCntrlPanel::OnShadeActive(wxCommandEvent& event){ - - _wxvtkclipping3Dview->SetShade(event.IsChecked()); wxCommandEvent newevent1(wxEVT_COMMAND_MENU_SELECTED,12121); // Refresh diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtkClipping3DViewVolCntrlPanel.h b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtkClipping3DViewVolCntrlPanel.h index 2a5ebbe..36fca56 100644 --- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtkClipping3DViewVolCntrlPanel.h +++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtkClipping3DViewVolCntrlPanel.h @@ -20,10 +20,8 @@ public: void OnInterpolationActive(wxCommandEvent& event); void OnShadeActive(wxCommandEvent& event); - private: wxVtkClipping3DView *_wxvtkclipping3Dview; - wxRadioButton *rbRayCasting; wxRadioButton *rbMIP; wxCheckBox *ckInterpolation; @@ -31,7 +29,6 @@ private: wxCheckBox *ckVolum; wxCheckBox *ckBoxVolume; - protected: };