]> Creatis software - creaMaracasVisu.git/commitdiff
re indent
authorjean-pierre roux <jean-pierre.roux@creatis.insa-lyon.fr>
Fri, 22 Jul 2011 17:43:01 +0000 (17:43 +0000)
committerjean-pierre roux <jean-pierre.roux@creatis.insa-lyon.fr>
Fri, 22 Jul 2011 17:43:01 +0000 (17:43 +0000)
19 files changed:
CMakeLists.txt
bbtk/src/bbmaracasvisuShowNPoints.cxx
bbtk/src/bbmaracasvisuShowNPoints.h
bbtk/src/bbmaracasvisuSliderMinMax.cxx
bbtk/src/bbmaracasvisuSliderMinMax.h
lib/GUI/Base/VolumeRenderer/volumerendererdata.cxx
lib/GUI/Base/VolumeRenderer/volumerendererdata.h
lib/GUI/Qt/Viewers/CMakeLists.txt
lib/GUI/Qt/Viewers/qtvtkviewerwidget.cxx
lib/GUI/Wx/CMakeLists.txt
lib/Kernel/VTKObjects/VolumeRenderer/volumerenderermanagerdata.cxx
lib/maracasVisuLib/CMakeLists.txt
lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/mBarRange.cxx
lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/mBarRange.h
lib/maracasVisuLib/src/interface/wxWindows/widgets/vtkClipping3DDataViewer.cxx
lib/maracasVisuLib/src/interface/wxWindows/widgets/vtkClipping3DDataViewer.h
lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtkClipping3DView.cxx
lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtkClipping3DViewVolCntrlPanel.cxx
lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtkClipping3DViewVolCntrlPanel.h

index a4ecd1af46c7a99e5dbb4f9c1dc1c21c8dddf3e3..8cac05722c236e1127c567cfcedbcc1ee134b960 100644 (file)
@@ -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
-
-
                     )
 
 
index fd778dca7de22406fda0fdc829ff5681e93ea336..2ec8ea03501cc3e7f736d1b29fe1130383d0033a 100644 (file)
@@ -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);
index 17dc629581714af5eb3544202a5b0e80ee6d6c3a..f047ae4314b69ccb6a4193b77a79bd2dcb3b33c5 100644 (file)
@@ -101,7 +101,7 @@ class /*BBTK_EXPORT*/ ShowNPoints
   void CreateWidget(wxWindow*);
 
 private:
-       WidgetShowNPoints       *mwxwidget; 
+       WidgetShowNPoints *mwxwidget; 
 };
 
 BBTK_BEGIN_DESCRIBE_BLACK_BOX(ShowNPoints,bbtk::WxBlackBox);
index d39065ff27c4cd09a99d63d332b694ca2e7f3a8f..b04dbb97584e451d96731992ed44ab513488312c 100644 (file)
@@ -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 );
index 1aaa5808cf2dfdfe29560a997b6251c65cbc5f02..731e9525d98ff07c2c275669fbc17b475391097d 100644 (file)
@@ -35,7 +35,6 @@ namespace bbcreaMaracasVisu
                void onEndChange_Bar(wxCommandEvent& event);
                void onSelectionEnd(wxCommandEvent& event);
                void onMovedBar(wxCommandEvent& event);
-               
          void PushEventHandler();
 
 
index a63f58e4a401e0696abd5ccc8aed07b1a236ad14..c19456f445c0ac20960148beabedad0353922a38 100644 (file)
@@ -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<double> greyvalues, vector<double> values){
     //invariant();
 
-     if(VolRendData==NULL)
+    if(VolRendData==NULL)
     {
           VolRendData = new VolumeRendererManagerData(ImageData, true);
 
index f00d583391c401137ba9770a5ab96433e40c7948..95a7eb8ebcb7da4e3f4446926bf49c49362a9ba6 100644 (file)
@@ -34,10 +34,6 @@ protected:
     vtkLookupTable* LookUpTable;
     vtkRenderWindowInteractor* Interactor;
 
-
-
-
-
 private:
 
     void invariant();
index cabd6209923247824dff35eaee7723a21bb132e2..a72202cb79c0b6b578c982c974cd597a1d2f57be 100644 (file)
@@ -89,7 +89,7 @@ IF ( BUILD_${LIBRARY_NAME} )
     ${QT_LIBRARIES}
     QVTK
 
-    GUIQtVolumeRenderer    
+    GUIQtVolumeRenderer
     GUIQtSurfaceRenderer
 
     KernelViewerWidgets
index 081107f7a4e05ffb597127915164c87095e66ae4..8f586fe8ab097ef78eceb0db0c552717684b232f 100644 (file)
@@ -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(){
index b572d1b5af3f6e7c551f227705dbbb6493f2b3be..ecd2ced140d0afa6521d6c05798cafe955fffafd 100644 (file)
@@ -1,3 +1,2 @@
 ADD_SUBDIRECTORY(SurfaceRenderer)
 ADD_SUBDIRECTORY(VolumeRenderer)
-
index 0d940380698ebbb9bd5cb5f27d34238a95cff1b9..f267e3f983aee2bc401bbeced394ff32623cadcb 100644 (file)
@@ -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();
index d2a8ad154efe3670f07145ae1007ec2204fa233f..6135b61799b7723536b99bbb2a504cd0f985ba6c 100644 (file)
@@ -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
index 494d599f949c937a8290d1b086c4a7c30218ed71..b46e49531e18946d17d68a6cd0151eb5009f8747 100644 (file)
@@ -1362,7 +1362,6 @@ void mBarRange :: setVisibleLabels ( bool setVisibleLB )
                return guideLineColor;
        }
 
-
        void  mBarRange ::onLeftClicDown(wxMouseEvent& event )
        {
                acceptedClick = true;           
index aa28eff0aa3077b87ed9f0d80fcb4d5a77b54f53..96d728c4bd0c2edc6137922bd29ee1d7049d967f 100644 (file)
@@ -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;
        /*
index fb791dc5ae3216cf6fa5f49008334b1ccefa97e6..d2524bed7c192c2cbb5c9b92c9591903ef09899c 100644 (file)
@@ -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()
 {
index 21e5dbd317682e0b4345f90781dd6fbd6b3f6278..86c6aae04465aa8e76605cf996e005a0e63ed2cc 100644 (file)
@@ -143,7 +143,6 @@ private:
 
     bool                                                               _visibleVolumeBox;
 
-
        bool                                                            _representationType[VTKMPRDATA_MAXTISSUE];
        bool                                                            _visibleTissue[VTKMPRDATA_MAXTISSUE];
        vtkActor                                                        *_tissue[VTKMPRDATA_MAXTISSUE];
index c1085246cf911d1dc9fce4c04b71a1e5d25e3ea8..6cb442983b2c3b224063f466fa08d430eff9db6d 100644 (file)
@@ -218,9 +218,6 @@ void wxVtkClipping3DView::Configure(){
   // between the planes is actually rendered.
   _wxvtk3Dbaseview->GetRenderer()->ResetCameraClippingRange();
 
-
-
-
        //cout<<"JPRG::wxVtkClipping3DView::SetVtkClipping3DDataViewer::GetRenderer()::"<<this->GetWxvtk3Dbaseview()->GetRenderer()<<endl;
        //cout<<"JPRG::wxVtkClipping3DView::SetVtkClipping3DDataViewer::GetWxVTKRenderWindowInteractor()::"<<this->GetWxvtk3Dbaseview()->GetWxVTKRenderWindowInteractor()<<endl;
 
index 083b1daed6f6e8ce025d417fb2ab68628116e3dd..66cdf06b84307070764fbf05cb6e482b02686b90 100644 (file)
@@ -292,7 +292,6 @@ void wxVtkClipping3DViewVolCntrlPanel::OnBtnVolumeFunctions(wxCommandEvent& even
                        //---------------------------------
                        //_wxvtkclipping3Dview->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
index 2a5ebbe0e439d1069b5cd96c6c3288f8440fa7c6..36fca56f3317d0f60f9d1e87673da9650d0c5c14 100644 (file)
@@ -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:
 
 };