- Opacity of the text in the ShowNPoints box is not working
- The IO in ShowNPoints is not working with an empty description of points.
And BUG 1439 from creaContours
#include "vtkPolyDataMapper.h"
#include "vtkRenderWindow.h"
#include "vtkTextActor3D.h"
#include "vtkPolyDataMapper.h"
#include "vtkRenderWindow.h"
#include "vtkTextActor3D.h"
+#include <vtkTextProperty.h>
namespace bbcreaMaracasVisu
{
namespace bbcreaMaracasVisu
{
//EED
int result_FD = FD->ShowModal();
//EED
int result_FD = FD->ShowModal();
+ std::string tmpLabel;
+
// This line is need it by windows //EED
FD->SetReturnCode( result_FD );
// This line is need it by windows //EED
FD->SetReturnCode( result_FD );
y=lstPointsY[i];
z=lstPointsZ[i];
value= mimage->GetScalarComponentAsDouble(x,y,z,0);
y=lstPointsY[i];
z=lstPointsZ[i];
value= mimage->GetScalarComponentAsDouble(x,y,z,0);
- fprintf(ff,"%d\t%d\t%d\t%f\t%s\n", x , y , z , value , lstLabels[i].c_str());
+ if (lstLabels[i]!="")
+ {
+ tmpLabel=lstLabels[i];
+ } else{
+ tmpLabel="<_VOID_>";
+ }
+ fprintf(ff,"%d\t%d\t%d\t%f\t%s\n", x , y , z , value , tmpLabel.c_str());
} // for
fclose(ff);
} else { // else ff
} // for
fclose(ff);
} else { // else ff
for (i=0; i<size; i++)
{
fscanf(ff,"%d%d%d%f%s",&x,&y,&z,&value,chartmp ); // x,y,z,value,label
for (i=0; i<size; i++)
{
fscanf(ff,"%d%d%d%f%s",&x,&y,&z,&value,chartmp ); // x,y,z,value,label
+ if (strcmp(chartmp,"<_VOID_>")==0) { strcpy(chartmp,""); }
AddPoint(x,y,z, chartmp );
}
fclose(ff);
AddPoint(x,y,z, chartmp );
}
fclose(ff);
{
this->lstSourceSphere[i]->SetRadius(mradio);
this->lstActorsSphere[i]->GetProperty()->SetOpacity(mopacity);
{
this->lstSourceSphere[i]->SetRadius(mradio);
this->lstActorsSphere[i]->GetProperty()->SetOpacity(mopacity);
+ this->lstActorsText[i]->GetTextProperty()->SetOpacity(mopacity);
this->lstActorsText[i]->SetPosition(this->lstActorsText[i]->GetPosition()[0]+difradio,this->lstActorsText[i]->GetPosition()[1], this->lstActorsText[i]->GetPosition()[2]);
}
this->lstActorsText[i]->SetPosition(this->lstActorsText[i]->GetPosition()[0]+difradio,this->lstActorsText[i]->GetPosition()[1], this->lstActorsText[i]->GetPosition()[2]);
}
manualViewContour::manualViewContour()
{
manualViewContour::manualViewContour()
{
- _id_viewPoint_for_text = 0;
- _mesureScale = 1;
- _initialConoturModel = new manualContourModel();
+ _id_viewPoint_for_text = 0;
+ _mesureScale = 1;
+ _initialConoturModel = new manualContourModel();
+
+ _minX = 99999;
+ _minY = 99999;
+ _maxX = -99999;
+ _maxY = -99999;
+
}
// ----------------------------------------------------------------------------
manualViewContour::~manualViewContour()
}
// ----------------------------------------------------------------------------
manualViewContour::~manualViewContour()
//JSTG 25-02-08 --------------------
//double t,delta, x,y,z;
double x,y,z;
//JSTG 25-02-08 --------------------
//double t,delta, x,y,z;
double x,y,z;
//----------------------------------
_manContModel->UpdateSpline();
//----------------------------------
_manContModel->UpdateSpline();
nps = _manContModel->GetNumberOfPointsSpline();
//delta=( double ) ( np ) / ( double ) ( nps-1 ); //JSTG 25-02-08
nps = _manContModel->GetNumberOfPointsSpline();
//delta=( double ) ( np ) / ( double ) ( nps-1 ); //JSTG 25-02-08
+ _minX=99999;
+ _minY=99999;
+ _maxX=-99999;
+ _maxY=-99999;
+
if ( _pts!=NULL )
{
if (np>=2 )
if ( _pts!=NULL )
{
if (np>=2 )
//--------------------------------------------------------------
// EED 27 sep 2006
// _pts->SetPoint(i, x,y,z );
//--------------------------------------------------------------
// EED 27 sep 2006
// _pts->SetPoint(i, x,y,z );
- _pts->SetPoint(i, x*_spc[0], y*_spc[1], z*_spc[2] );
-
+ xx=x*_spc[0];
+ yy=y*_spc[1];
+ zz=z*_spc[2];
+ _pts->SetPoint(i,xx,yy,zz );
+
+//EED 27 Juin 2012
+ if (xx < _minX) { _minX = xx; }
+ if (yy < _minY) { _minY = yy; }
+ if (xx > _maxX) { _maxX = xx; }
+ if (yy > _maxY) { _maxY = yy; }
+
yy = yy * _spc[1];
zz = zz * _spc[2];
yy = yy * _spc[1];
zz = zz * _spc[2];
- unsigned int i, nps,nps_t;
- nps = _sizePointsContour;
+ if ( (xx>=_minX) && (yy>=_minY) && (xx<=_maxX) && (yy<=_maxY)) {
- if (this->_manContModel->IfCloseContour()==true)
- {
- nps_t = nps;
- } else {
+ unsigned int i, nps,nps_t;
+ nps = _sizePointsContour;
+
+ if (this->_manContModel->IfCloseContour()==true)
+ {
+ nps_t = nps;
+ } else {
- for( i = 0; i < nps_t; i++ )
- {
- _pts->GetPoint(i%nps, ppA);
- _pts->GetPoint((i+1)%nps, ppB);
- d1= sqrt( (ppA[0]-xx)*(ppA[0]-xx) + (ppA[1]-yy)*(ppA[1]-yy) + (ppA[2]-zz)*(ppA[2]-zz));
- d2= sqrt( (ppB[0]-xx)*(ppB[0]-xx) + (ppB[1]-yy)*(ppB[1]-yy) + (ppB[2]-zz)*(ppB[2]-zz));
- d3= sqrt( (ppB[0]-ppA[0])*(ppB[0]-ppA[0]) + (ppB[1]-ppA[1])*(ppB[1]-ppA[1]) + (ppB[2]-ppA[2])*(ppB[2]-ppA[2]));
+ printf("EED manualViewContour::ifTouchContour \n");
- if ( ((d1+d2)>=d3) && ((d1+d2)<=d3*1.3) )
+ for( i = 0; i < nps_t; i++ )
- result=true;
- i=nps;
- }
- }
+printf("%d ", i);
+ _pts->GetPoint(i%nps, ppA);
+ _pts->GetPoint((i+1)%nps, ppB);
+ d1 = sqrt( (ppA[0]-xx)*(ppA[0]-xx) + (ppA[1]-yy)*(ppA[1]-yy) + (ppA[2]-zz)*(ppA[2]-zz));
+ d2 = sqrt( (ppB[0]-xx)*(ppB[0]-xx) + (ppB[1]-yy)*(ppB[1]-yy) + (ppB[2]-zz)*(ppB[2]-zz));
+ d3 = sqrt( (ppB[0]-ppA[0])*(ppB[0]-ppA[0]) + (ppB[1]-ppA[1])*(ppB[1]-ppA[1]) + (ppB[2]-ppA[2])*(ppB[2]-ppA[2]));
+
+ if ( ((d1+d2)>=d3) && ((d1+d2)<=d3*1.3) )
+ {
+ result=true;
+ i=nps;
+ } // if
+ } // for i
+ } // if min max
double _mesureScale;
std::vector< std::vector<double> > _initialMovingPoints;
manualContourModel * _initialConoturModel;
double _mesureScale;
std::vector< std::vector<double> > _initialMovingPoints;
manualContourModel * _initialConoturModel;
virtual void RefreshText();
virtual void RefreshText();
+protected:
+ double _minX;
+ double _minY;
+ double _maxX;
+ double _maxY;
+
};
#endif // manualViewContour_h
};
#endif // manualViewContour_h