OpenCascade/occt
1
0
Fork 0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-04-07 18:30:55 +03:00
Code Packages Releases Activity

0025363: Visualization - add test command for V3d_View::FitAll by view area

Browse Source
This commit is contained in:
apl 2014-10-15 12:01:16 +04:00 committed by bugmaster
parent 5203f74183
commit 6262a3032c
2 changed files with 144 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
src/ViewerTest/ViewerTest_ViewerCommands.cxx
View File

@ -2480,6 +2480,68 @@ static int VFit(Draw_Interpretor& , Standard_Integer , const char** )
return 0; return 0;
} }
//=======================================================================
//function : VFitArea
//purpose : Fit view to show area located between two points
// : given in world 2D or 3D coordinates.
//=======================================================================
static int VFitArea (Draw_Interpretor& theDI, Standard_Integer theArgNb, const char** theArgVec)
{
Handle(V3d_View) aView = ViewerTest::CurrentView();
if (aView.IsNull())
{
std::cerr << theArgVec[0] << "Error: No active view.\n";
return 1;
}
// Parse arguments.
gp_Pnt aWorldPnt1 (0.0, 0.0, 0.0);
gp_Pnt aWorldPnt2 (0.0, 0.0, 0.0);
if (theArgNb == 5)
{
aWorldPnt1.SetX (Draw::Atof (theArgVec[1]));
aWorldPnt1.SetY (Draw::Atof (theArgVec[2]));
aWorldPnt2.SetX (Draw::Atof (theArgVec[3]));
aWorldPnt2.SetY (Draw::Atof (theArgVec[4]));
}
else if (theArgNb == 7)
{
aWorldPnt1.SetX (Draw::Atof (theArgVec[1]));
aWorldPnt1.SetY (Draw::Atof (theArgVec[2]));
aWorldPnt1.SetZ (Draw::Atof (theArgVec[3]));
aWorldPnt2.SetX (Draw::Atof (theArgVec[4]));
aWorldPnt2.SetY (Draw::Atof (theArgVec[5]));
aWorldPnt2.SetZ (Draw::Atof (theArgVec[6]));
}
else
{
std::cerr << theArgVec[0] << "Error: Invalid number of arguments.\n";
theDI.PrintHelp(theArgVec[0]);
return 1;
}
// Convert model coordinates to view space
Handle(Graphic3d_Camera) aCamera = aView->Camera();
gp_Pnt aViewPnt1 = aCamera->ConvertWorld2View (aWorldPnt1);
gp_Pnt aViewPnt2 = aCamera->ConvertWorld2View (aWorldPnt2);
// Determine fit area
gp_Pnt2d aMinCorner (Min (aViewPnt1.X(), aViewPnt2.X()), Min (aViewPnt1.Y(), aViewPnt2.Y()));
gp_Pnt2d aMaxCorner (Max (aViewPnt1.X(), aViewPnt2.X()), Max (aViewPnt1.Y(), aViewPnt2.Y()));
Standard_Real aDiagonal = aMinCorner.Distance (aMaxCorner);
if (aDiagonal < Precision::Confusion())
{
std::cerr << theArgVec[0] << "Error: view area is too small.\n";
return 1;
}
aView->FitAll (aMinCorner.X(), aMinCorner.Y(), aMaxCorner.X(), aMaxCorner.Y());
return 0;
}
//============================================================================== //==============================================================================
//function : VZFit //function : VZFit
//purpose : ZFitall, no DRAW arguments //purpose : ZFitall, no DRAW arguments
@ -7102,6 +7164,12 @@ void ViewerTest::ViewerCommands(Draw_Interpretor& theCommands)
theCommands.Add("vfit" , theCommands.Add("vfit" ,
"vfit or <F> : vfit", "vfit or <F> : vfit",
__FILE__,VFit,group); __FILE__,VFit,group);
theCommands.Add ("vfitarea",
"vfitarea x1 y1 x2 y2"
"\n\t\t: vfitarea x1 y1 z1 x2 y2 z2"
"\n\t\t: Fit view to show area located between two points"
"\n\t\t: given in world 2D or 3D corrdinates.",
__FILE__, VFitArea, group);
theCommands.Add ("vzfit", "vzfit [scale]\n" theCommands.Add ("vzfit", "vzfit [scale]\n"
" Matches Z near, Z far view volume planes to the displayed objects.\n" " Matches Z near, Z far view volume planes to the displayed objects.\n"
" \"scale\" - specifies factor to scale computed z range.\n", " \"scale\" - specifies factor to scale computed z range.\n",

76
tests/bugs/vis/bug25363 Normal file
View File

@ -0,0 +1,76 @@
puts "================"
puts "OCC25335"
puts "================"
puts ""
#######################################################################################
# Visualization - add test command for V3d_View::FitAll by view area
#######################################################################################
set check1_x 2
set check1_y 2
set check2_x 407
set check2_y 2
set check3_x 2
set check3_y 407
set check4_x 407
set check4_y 407
set check5_x 204
set check5_y 204
vinit View1
vtop
# 2D view area
vpoint p1 5.0 5.0 0.0
vpoint p2 15.0 5.0 0.0
vpoint p3 15.0 15.0 0.0
vpoint p4 5.0 15.0 0.0
vpoint p5 10.0 10.0 0.0
vfitarea 4.999 4.999 15.001 15.001
# Check area by 1st point
vmoveto ${check1_x} ${check1_y}
checkcolor ${check1_x} ${check1_y} 0 1 1
if {$stat != 1} {
puts "Error : Fit all by view area is broken."
}
# Check area by 2nd point
vmoveto ${check2_x} ${check2_y}
checkcolor ${check2_x} ${check2_y} 0 1 1
if {$stat != 1} {
puts "Error : Fit all by view area is broken."
}
# Check area by 3rd point
vmoveto ${check3_x} ${check3_y}
checkcolor ${check3_x} ${check3_y} 0 1 1
if {$stat != 1} {
puts "Error : Fit all by view area is broken."
}
# Check area by 4th point
vmoveto ${check4_x} ${check4_y}
checkcolor ${check4_x} ${check4_y} 0 1 1
if {$stat != 1} {
puts "Error : Fit all by view area is broken."
}
# Check area by 5th point
vmoveto ${check5_x} ${check5_y}
checkcolor ${check5_x} ${check5_y} 0 1 1
if {$stat != 1} {
puts "Error : Fit all by view area is broken."
}
set only_screen 1