char text[50];
char resultText[50];
strcpy(resultText," ");
+
+//CMRU 19-08-09 ----------------------------------
+ std::string label;
+ label = _manContModel->GetLabel();
+// ------------------------------------
+
if (size==2)
{
strcpy(resultText,"L= ");
gcvt ( _mesureScale * this->_manContModel->GetPathSize() , 5, text );
strcat(resultText,text);
+
+//CMRU 19-08-09 ----------------------------------
+ strcat(resultText," ");
+ strcat(resultText,label.c_str());
+//------------------------------------------------
}
if (size>2)
{
gcvt ( _mesureScale * _mesureScale * this->_manContModel->GetPathArea() , 5, text );
strcat(resultText," A= ");
strcat(resultText,text);
+ strcat(resultText," ");
} else {
strcpy(resultText,"L= ");
gcvt ( _mesureScale * this->_manContModel->GetPathSize() , 5, text );
strcat(resultText,text);
}
+//CMRU 19-08-09 ----------------------------------
+ strcat(resultText,label.c_str());
+//------------------------------------------------
}
_textActor->SetInput(resultText);
}
}
- int id = _id_viewPoint_for_text;
- double px = _manContModel->GetManualPoint(id)->GetX();
- double py = _manContModel->GetManualPoint(id)->GetY();
+ if (_id_viewPoint_for_text>=size)
+ {
+ _id_viewPoint_for_text=0;
+ }
+
+ double px = _manContModel->GetManualPoint(_id_viewPoint_for_text)->GetX();
+ double py = _manContModel->GetManualPoint(_id_viewPoint_for_text)->GetY();
//EED 27 sep 2006
px=px*_spc[0];
// ----------------------------------------------------------------------------
bool manualViewContour::ifTouchContour(int x,int y,int z){
-
bool result=false;
double xx=x;
double yy=y;
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;
- }
-
- //EED 25 Sep 2009
- if ((d1<=1) || (d2<=1))
{
result=true;
i=nps;
}
-
}
return result;