if( vec1->size() != 0 )
{
vec2->clear();
- for(i=0; i<vec1->size(); i++)
+ for(i=0; i<(int)(vec1->size()); i++)
{
Vector *temp = new Vector();
temp->set_var( (*vec1)[i].get_var() );
void Vector::printVector(std::vector<Vector>*vec1)
{
int i,j;
- for(i=0; i<vec1->size(); i++)
+ for(i=0; i<(int)(vec1->size()); i++)
{
printf("\n Pos (%d) => var = %f",i,(*vec1)[i].get_var());
for(j=0; j<(*vec1)[i].getsize_vec(); j++)
//------------------------------------------------------------------------------------------------------------------------------------------
double Vector::get_x(int id)
{
- if( (-1<id) && (id<_vecX.size()) )
+ if( (-1<id) && (id<(int)(_vecX.size()) ) )
{
return _vecX[id];
}
//------------------------------------------------------------------------------------------------------------------------------------------
double Vector::get_y(int id)
{
- if( (-1<id) && (id<_vecY.size()) )
+ if( (-1<id) && (id<(int)(_vecY.size())) )
{
return _vecY[id];
}
//------------------------------------------------------------------------------------------------------------------------------------------
double Vector::get_z(int id)
{
- if( (-1<id) && (id<_vecZ.size()) )
+ if( (-1<id) && (id<(int)(_vecZ.size())) )
{
return _vecZ[id];
}
tempZ.clear();
while(!feof(fd))
{
- fscanf(fd," %s %d",&firstline,&size);
+ //fscanf(fd," %s %d",&firstline,&size); // JPRx
+ fscanf(fd," %s %d",firstline,&size);
for(int i=0; i<size; i++)
{
fscanf(fd,"%lf %lf %d",&x,&y,&z);
std::vector<int>*Sizes)
{
int sizeS = Sizes->size();
- int sizeV = InX->size();
+ //int sizeV = InX->size(); // JPRx
int i,j,mem,posinic,dir,cont;
double leX;
//----------------------------------------------------------------------------------------------------
vtkImageData* PropContour::method_Spline(std::vector<double>*InX, std::vector<double>*InY, std::vector<double>*InZ, std::vector<int>*Sizes)
{
- long interval = wxGetElapsedTime(TRUE);
+ //long interval = wxGetElapsedTime(TRUE); // JPRx
int i,j,k,sizeX,sizeS,sizeInS;
int numspline;
cont = 0;
for(i=0; i<sizeS; i++)
{
- double hh=tempZ[cont+j];
+ //double hh=tempZ[cont+j]; // JPRx
_mContourModel->AddPoint(tempX[cont+j],tempY[cont+j],tempZ[cont+j]);
cont = cont + tam;
} // for i
int tmpIdKeyContSizes = 0;
bool okFind = false;
int i;
- int sizeKeyContour,Z=(*InZ)[0];
+ int sizeKeyContour,Z=(int)(*InZ)[0];
sizeKeyContour = _KeyContourZ.size();
for (i=0; i<sizeKeyContour; i++)
{
}
_KeyContourSizes.insert( _KeyContourSizes.begin() + idKeyContourSizes , InX->size() );
- for(i=0; i<InX->size(); i++)
+ for(i=0; i<(int)(InX->size()); i++)
{
_KeyContourX.insert( _KeyContourX.begin() + idKeyContour, (*InX)[i] );
_KeyContourY.insert( _KeyContourY.begin() + idKeyContour, (*InY)[i] );
{
return method_Spline(&_KeyContourX,&_KeyContourY,&_KeyContourZ,&_KeyContourSizes);
}
+ return NULL;
}
//---------------------------------------------------------------------------------------------------
void PropContour::GetKeyContours(std::vector<double>*KeyX, std::vector<double>*KeyY, std::vector<double>*KeyZ, std::vector<int>*KeyS)
KeyZ->clear();
KeyS->clear();
- for(i=0; i<_KeyContourSizes.size(); i++)
+ for(i=0; i<(int)(_KeyContourSizes.size()); i++)
{
KeyS->push_back( _KeyContourSizes[i] );
}
- for(i=0; i<_KeyContourX.size(); i++)
+ for(i=0; i<(int)(_KeyContourX.size()); i++)
{
KeyX->push_back( _KeyContourX[i] );
KeyY->push_back( _KeyContourY[i] );
{
int i,j;
planevec->clear();
- for(i=0; i<_planevector.size(); i++)
+ for(i=0; i<(int)(_planevector.size()); i++)
{
Vector *temp = new Vector();
temp->set_plane( _planevector[i].get_plane() );
vecX->clear();
vecY->clear();
vecZ->clear();
- int sizeplane = _planevector[id].getsize_x();
+ //int sizeplane = _planevector[id].getsize_x();
double tempx;
for(i=0; i<_planevector[id].getsize_x(); i++)
{