manualViewContour::manualViewContour()
{
_id_viewPoint_for_text = 0;
- _mesureScale = 1;
_initialConoturModel = new manualContourModel();
_minX = 99999;
{
// Call to Fathers object
manualViewBaseContour::CopyAttributesTo(cloneObject);
-
- cloneObject->SetMesureScale(_mesureScale);
}
// ---------------------------------------------------------------------------
_minY=_minY-1.0;
_maxX=_maxX+1.0;
_maxY=_maxY+1.0;
+
+//EED 2017-03-02
+ _pts->Modified();
}
// ----------------------------------------------------------------------------
void manualViewContour::RefreshText() // virtual
{
+
if ((_textActor!=NULL) && ( _textActor->GetProperty()->GetOpacity()!=0 )){
int size = GetNumberOfPoints();
char text[50];
strcpy(resultText, "000");
char resultText2[250];
strcpy(resultText2, "000");
+ double spcP[3];
+ spcP[0]=1;
+ spcP[1]=1;
+ spcP[2]=1;
//CMRU 19-08-09 ----------------------------------
std::string label;
label = _manContModel->GetLabel();
// ------------------------------------
-
+
if (size==2)
{
strcpy(resultText,"L= ");
- gcvt ( _mesureScale * this->_manContModel->GetPathSize(), 5, text );
+ gcvt ( this->_manContModel->GetPathSize( spcP ), 5, text );
strcat(resultText,text);
strcat(resultText,"p");
strcat(resultText,label.c_str());
strcpy(resultText2,"L= ");
- gcvt ( _mesureScale * this->_manContModel->GetPathSize(), 5, text );
+ gcvt ( this->_manContModel->GetPathSize( _spc ), 5, text );
strcat(resultText2,text);
strcat(resultText2,"u");
if (_manContModel->IfCloseContour()==true)
{
strcpy(resultText,"P= ");
- gcvt ( _mesureScale * this->_manContModel->GetPathSize(), 5, text );
+ gcvt ( this->_manContModel->GetPathSize( spcP ), 5, text );
strcat(resultText,text);
strcat(resultText,"p");
- gcvt ( _mesureScale * _mesureScale * this->_manContModel->GetPathArea(), 5, text );
+ gcvt ( this->_manContModel->GetPathArea( spcP ), 5, text );
strcat(resultText," A= ");
strcat(resultText,text);
strcat(resultText,"p^2 ");
strcpy(resultText2,"P= ");
- gcvt ( _mesureScale * this->_manContModel->GetPathSize(), 5, text );
+ gcvt ( this->_manContModel->GetPathSize( _spc ), 5, text );
strcat(resultText2,text);
strcat(resultText2,"u");
- gcvt ( _mesureScale * _mesureScale * this->_manContModel->GetPathArea(), 5, text );
+ gcvt ( this->_manContModel->GetPathArea( _spc ), 5, text );
strcat(resultText2," A= ");
strcat(resultText2,text);
strcat(resultText2,"u^2 ");
} else {
strcpy(resultText,"L= ");
- gcvt ( _mesureScale * this->_manContModel->GetPathSize(), 5, text );
+ gcvt ( this->_manContModel->GetPathSize( spcP ), 5, text );
strcat(resultText,text);
strcat(resultText,"p");
strcpy(resultText2,"L= ");
- gcvt ( _mesureScale * this->_manContModel->GetPathSize(), 5, text );
+ gcvt ( this->_manContModel->GetPathSize( _spc ), 5, text );
strcat(resultText2,text);
strcat(resultText2,"u");
manualViewBaseContour::DeletePoint( id );
}
-//-------------------------------------------------------------------
-void manualViewContour::SetMesureScale(double mesureScale)
-{
- _mesureScale = mesureScale;
-}
//-------------------------------------------------------------------
void manualViewContour::InitMove(int x, int y, int z)
{
this->_initialConoturModel->AddPoint( mp->GetX() - XX, mp->GetY() - YY, mp->GetZ() );
}
}
+
//-------------------------------------------------------------------
void manualViewContour::MoveContour(int x, int y, int z)
{
manualPoint *mpOrigin = NULL;
manualPoint *mpMoving = NULL;
- double XX=x;
- double YY=y;
- double ZZ=z;
+ double XX = x;
+ double YY = y;
+ double ZZ = z;
TransfromCoordViewWorld(XX,YY,ZZ);
}
UpdateViewPoints();
}
+
+//-------------------------------------------------------------------
void manualViewContour::MoveContour(int horizontalUnits, int verticalUnits )
{
manualPoint *mpOrigin = NULL;