X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2Fsrc%2Fkernel%2FPlaneDirectionManager.cxx;h=20ef0da8bfa48f4851dabdcdbd55edeac2e1e10e;hb=f6c7b458a17b67950d1844d6a600683a99cb2b6d;hp=0900a392cfeec5501024922bb68b01cc3d8ed00e;hpb=e42ecf415793e6f85e5de98b41385fe53b6d00e0;p=creaMaracasVisu.git diff --git a/lib/maracasVisuLib/src/kernel/PlaneDirectionManager.cxx b/lib/maracasVisuLib/src/kernel/PlaneDirectionManager.cxx index 0900a39..20ef0da 100644 --- a/lib/maracasVisuLib/src/kernel/PlaneDirectionManager.cxx +++ b/lib/maracasVisuLib/src/kernel/PlaneDirectionManager.cxx @@ -9,7 +9,6 @@ PlaneDirectionManager::PlaneDirectionManager(int radio, double colour[3] , int o _radio = radio; _colour = colour; _opacity = opacity; - } @@ -33,11 +32,14 @@ void PlaneDirectionManager::UpdateDirections() throw (std::exception){ AddActors(); } + void PlaneDirectionManager::AddActors(){ - for(int i = 0; i < _vectdata.size();i++){ + int i; + for(i = 0; i < (int)_vectdata.size();i++){ _render->AddViewProp (_vectdata[i]->GetActor()); } } + void PlaneDirectionManager::RemoveAllActorsFromIndex(int n)throw (std::exception){ /*due to incompleate set of points to create the plane */ @@ -48,16 +50,16 @@ void PlaneDirectionManager::RemoveAllActorsFromIndex(int n)throw (std::exception _render->RemoveViewProp(_vectdata[i]->GetActor()); delete _vectdata[i]; _vectdata.pop_back(); - } - + } } void PlaneDirectionManager::UpdateVectors()throw (std::exception){ PlaneDirectionManagerData* temp; bool deletelast = false; int currentdata = 0; - for(int i = 0; i < _lstPointsx.size();i++){ + int i; + for(i = 0; i < (int)_lstPointsx.size();i++){ if(i % 3 == 0){ - if(_vectdata.size()>currentdata){ + if((int)_vectdata.size()>currentdata){ temp = _vectdata[currentdata]; }else{ temp = new PlaneDirectionManagerData(_radio, _colour, _opacity); @@ -76,37 +78,38 @@ void PlaneDirectionManager::UpdateVectors()throw (std::exception){ RemoveAllActorsFromIndex(currentdata); } -void PlaneDirectionManager::UpdateActors(){ - for(int i = 0; i < _vectdata.size();i++){ +void PlaneDirectionManager::UpdateActors() +{ + int i; + for(i = 0; i < (int)_vectdata.size();i++) + { _vectdata[i]->UpdateActor(); } } -void PlaneDirectionManager::addRemoveActor(int index, bool addremove){ - - if(index < _vectdata.size()){ +void PlaneDirectionManager::addRemoveActor(int index, bool addremove) +{ + if(index < (int)_vectdata.size()){ if(addremove){ _render->AddViewProp (_vectdata[index]->GetActor()); }else{ _render->RemoveViewProp (_vectdata[index]->GetActor()); - } - - } - - + } + } } -void PlaneDirectionManager::changeColor(int index,double r,double g,double b){ +void PlaneDirectionManager::changeColor(int index,double r,double g,double b) +{ GetPlaneDirectionManagerData(index)->ChangeColour(r,g,b); } -PlaneDirectionManagerData* PlaneDirectionManager::GetPlaneDirectionManagerData(int id) { - +PlaneDirectionManagerData* PlaneDirectionManager::GetPlaneDirectionManagerData(int id) +{ return _vectdata[id]; } void PlaneDirectionManager::WriteInformation(std::string filename, double* spc){ - FILE *ff; + FILE *ff; ff = fopen( filename.c_str() , "w+" ); if(spc ==NULL){ spc = new double[3]; @@ -115,8 +118,9 @@ void PlaneDirectionManager::WriteInformation(std::string filename, double* spc) spc[2] = 1; } if (ff!=NULL) - { - for(int i = 0; i < _vectdata.size();i++){ + { + int i; + for(i = 0; i < (int)_vectdata.size();i++){ double* p0 = _vectdata[i]->getPoint0(); double* p1 = _vectdata[i]->getPoint1(); @@ -142,16 +146,13 @@ void PlaneDirectionManager::WriteInformation(std::string filename, double* spc) fprintf(ff,"Dir%d\n",i); fprintf(ff,"\tP0[%f, %f, %f]\tP1[%f, %f, %f]\tP2[%f, %f, %f]\tDir[%f, %f, %f] \n", p0x,p0y,p0z, p1x,p1y,p1z, p2x,p2y,p2z, dirx,diry,dirz); - } - + } fclose(ff); } else { // else ff printf("PlaneDirectionManager::WriteInformation ...Error... creating file"); - } //ff - - + } //ff } void PlaneDirectionManager::SetArrowSize(int arrowsize){ _radio = arrowsize; -} \ No newline at end of file +}