X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=sidebyside;f=bbtk%2Fsrc%2FbbmaracasvisuShowNPoints.cxx;h=2ec8ea03501cc3e7f736d1b29fe1130383d0033a;hb=d0c09a70008646305df0937f47fd7d5930636a67;hp=fd778dca7de22406fda0fdc829ff5681e93ea336;hpb=9d859a4bbe2433d2489e7c91f64ef32bef816462;p=creaMaracasVisu.git 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);