From: Eduardo DAVILA Date: Mon, 26 Jul 2021 13:36:44 +0000 (+0200) Subject: Clean code X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=0385bdbfd39849f2e91d38b7ccb72302d67497f0;p=bbtk.git Clean code --- diff --git a/packages/vtk/src/bbvtkTransform.cxx b/packages/vtk/src/bbvtkTransform.cxx index 57c9c1f..1c6b335 100644 --- a/packages/vtk/src/bbvtkTransform.cxx +++ b/packages/vtk/src/bbvtkTransform.cxx @@ -86,31 +86,26 @@ namespace bbvtk // -------------------------------------------------------------- void Transform::Process() { - printf("EED Transform::Process Start\n "); - bbUserInitializeProcessing(); if (bbGetInputIn()!=NULL) { result->Concatenate( bbGetInputIn()->GetMatrix() ); - } - + } // if In if ((bbGetInputTranslate().size()>=3) && (bbGetInputSpacing().size()>=3)) { double tx = bbGetInputTranslate()[0] * bbGetInputSpacing()[0]; double ty = bbGetInputTranslate()[1] * bbGetInputSpacing()[1]; double tz = bbGetInputTranslate()[2] * bbGetInputSpacing()[2]; result->Translate(tx,ty,tz); - } - + } // if translate spacing size >=3 if (bbGetInputScale().size()>=3) { result->Scale(bbGetInputScale()[0], bbGetInputScale()[1], bbGetInputScale()[2]); - } - + } // if scale size >=3 if (bbGetInputRotateWXYZ().size()>=4) { result->RotateWXYZ(bbGetInputRotateWXYZ()[0],bbGetInputRotateWXYZ()[1], bbGetInputRotateWXYZ()[2], bbGetInputRotateWXYZ()[3]); - } + } // if rotation size >=4 if (bbGetInputInverse()==false) { @@ -122,7 +117,6 @@ namespace bbvtk resultInverse->SetMatrix( matrix ); bbSetOutputOut(resultInverse); } // if Inverse - printf("EED Transform::Process End\n "); } }// EO namespace bbvtk diff --git a/packages/wx/src/bbwxRadioButton.cxx b/packages/wx/src/bbwxRadioButton.cxx index 779a281..375092b 100644 --- a/packages/wx/src/bbwxRadioButton.cxx +++ b/packages/wx/src/bbwxRadioButton.cxx @@ -90,64 +90,6 @@ namespace bbwx mBox(box) { -/* - MAX_RADIOBUTTON = lstIn.size(); - wxPanel *panel = this; - int i; - long style=wxRB_GROUP; - for (i=0;iSetValue(true); - } else { - mwxRadioButton[i]->SetValue(false); - } - Connect( mwxRadioButton[i]->GetId(), - wxEVT_COMMAND_RADIOBUTTON_SELECTED, - (wxObjectEventFunction) - (void (wxPanel::*)(wxEvent&)) - &RadioButtonWidget::OnRadioButton ); - } else { - mwxRadioButton[i]=NULL; - } // if - } // for - - //--------------------------------------------------------------------- - // 2) Insertion of the components in the window - - // We use a FlexGridSizer - -//EED 2018-04-18 -// wxFlexGridSizer *sizer = new wxFlexGridSizer(1); - sizer = new wxFlexGridSizer(1); - - if (title!=_T("")) - { - sizer->Add( new wxStaticText(panel,-1, title ) ); - } - for (i=0;iAdd( mwxRadioButton[i],1,wxGROW ); - } - } - sizer->AddGrowableCol(0); - panel->SetSizer(sizer); - -// panel->SetAutoLayout(true); -// panel->Layout(); -*/ - } //------------------------------------------------------------------------- @@ -329,7 +271,6 @@ namespace bbwx RadioButtonWidget *w = new RadioButtonWidget( this, -// bbGetWxParent(), parent, bbGetInputIn() , bbtk::std2wx(bbGetInputTitle()),