SetCompleteCreation( true );
SetKeyBoardMoving( false );
+ cout<<"RaC manualContourBaseControler::OnRightButtonDown"<<endl;
+ this->GetManualContourModel()->SetCloseContour(true);
MouseClickRight(X,Y);
}
return true;
return true;
}
// ----------------------------------------------------------------------------
-void manualContourBaseControler::SetModelView(manualContourModel *manContModel, manualViewBaseContour *manViewBaseCont){
+void manualContourBaseControler::SetModelView(manualBaseModel *manContModel, manualViewBaseContour *manViewBaseCont){
_manContModel = manContModel;
_manViewBaseCont = manViewBaseCont;
_manViewBaseCont->SetEditable( &_editable );
}
// ----------------------------------------------------------------------------
-manualContourModel* manualContourBaseControler::GetManualContourModel()
+manualBaseModel* manualContourBaseControler::GetManualContourModel()
{
return _manContModel;
}
{
if (_state==0)
{
+
int z=GetZ();
- GetManualViewBaseContour()->SelectPosibleContour(x,y,z);
- GetManualViewBaseContour()->SelectPosiblePoint(x,y,z);
- if ( GetManualViewBaseContour()->GetPosibleSelected() )
+ bool temp = _manViewBaseCont->SelectPosibleContour(x,y,z);
+
+ _manViewBaseCont->SelectPosiblePoint(x,y,z);
+
+ if ( _manViewBaseCont->GetPosibleSelected() )
{
_editable = true;
}
double xx = x;
double yy = y;
double zz = GetZ();
- GetManualViewBaseContour()->TransfromeCoordViewWorld(xx,yy,zz);
+ GetManualViewBaseContour()->TransfromCoordViewWorld(xx,yy,zz);
int id = GetManualContourModel()->GetIdPoint(xx,yy,zz,32000,-1);
if (id!=-1)
{
double xx = x;
double yy = y;
double zz = z;
- GetManualViewBaseContour()->TransfromeCoordViewWorld(xx,yy,zz);
+ GetManualViewBaseContour()->TransfromCoordViewWorld(xx,yy,zz);
/*int id =*/ GetManualContourModel()->AddPoint(xx,yy,zz); // JPRx
GetManualViewBaseContour()->AddPoint();
// GetManualViewBaseContour()->UpdateViewPoint(id);
double xx = x;
double yy = y;
double zz = z;
- GetManualViewBaseContour()->TransfromeCoordViewWorld(xx,yy,zz);
+ GetManualViewBaseContour()->TransfromCoordViewWorld(xx,yy,zz);
if (GetManualContourModel()->GetSizeLstPoints()>1){
id = GetManualContourModel()->InsertPoint(xx,yy,zz);
GetManualViewBaseContour()->InsertPoint(id);
double xx = x;
double yy = y;
double zz = z;
- GetManualViewBaseContour()->TransfromeCoordViewWorld(xx,yy,zz);
+ GetManualViewBaseContour()->TransfromCoordViewWorld(xx,yy,zz);
manualPoint *mp = _manContModel->GetManualPoint(id);
mp->SetPoint(xx,yy,zz);
GetManualViewBaseContour()->UpdateViewPoint(id);
double xx = x;
double yy = 0;
double zz = 0;
- GetManualViewBaseContour()->TransfromeCoordViewWorld(xx,yy,zz);
+ GetManualViewBaseContour()->TransfromCoordViewWorld(xx,yy,zz);
manualPoint *mp = _manContModel->GetManualPoint(id);
mp->SetPointX(xx);
GetManualViewBaseContour()->UpdateViewPoint(id);
double xx = 0;
double yy = y;
double zz = 0;
- GetManualViewBaseContour()->TransfromeCoordViewWorld(xx,yy,zz);
+ GetManualViewBaseContour()->TransfromCoordViewWorld(xx,yy,zz);
manualPoint *mp = _manContModel->GetManualPoint(id);
mp->SetPointY(yy);
GetManualViewBaseContour()->UpdateViewPoint(id);
double xx = 0;
double yy = 0;
double zz = z;
- GetManualViewBaseContour()->TransfromeCoordViewWorld(xx,yy,zz);
+ GetManualViewBaseContour()->TransfromCoordViewWorld(xx,yy,zz);
manualPoint *mp = _manContModel->GetManualPoint(id);
mp->SetPointZ(zz);
GetManualViewBaseContour()->UpdateViewPoint(id);