OpenCascade/occt
1
0
Fork 0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-08-09 13:22:24 +03:00
Code Activity

0022582: Visualization - provide an API for dumping a sub-region of the viewport

Browse Source 
Graphic3d_Camera definition has been exended by optional Tile property (Graphic3d_CameraTile structure).
V3d_View::ToPixMap() now performs tiled dump when image size exceeds hardware limits.

OpenGl_View::Redraw() - fixed dump of immediate Z layers in no stereo and no MSAA case.

OpenGl_Context now tracks viewport values.
Draw Harness command vdump has been extended with new argument -tileSize.
This commit is contained in:
osa
2016-08-21 21:55:10 +03:00
committed by bugmaster
parent 1ede545fef
commit 3bffef5524
28 changed files with 827 additions and 327 deletions
Download Patch File Download Diff File Expand all files Collapse all files

100
src/ViewerTest/ViewerTest.cxx
View File

@@ -807,11 +807,10 @@ static Standard_Integer VDump (Draw_Interpretor& theDI,
Standard_Integer anArgIter = 1;
Standard_CString aFilePath = theArgVec[anArgIter++];
Graphic3d_BufferType aBufferType = Graphic3d_BT_RGB;
V3d_StereoDumpOptions aStereoOpts = V3d_SDO_MONO;
ViewerTest_StereoPair aStereoPair = ViewerTest_SP_Single;
Standard_Integer aWidth = 0;
Standard_Integer aHeight = 0;
V3d_ImageDumpOptions aParams;
aParams.BufferType = Graphic3d_BT_RGB;
aParams.StereoOptions = V3d_SDO_MONO;
for (; anArgIter < theArgNb; ++anArgIter)
{
TCollection_AsciiString anArg (theArgVec[anArgIter]);
@@ -828,15 +827,15 @@ static Standard_Integer VDump (Draw_Interpretor& theDI,
aBufArg.LowerCase();
if (aBufArg == "rgba")
{
aBufferType = Graphic3d_BT_RGBA;
aParams.BufferType = Graphic3d_BT_RGBA;
}
else if (aBufArg == "rgb")
{
aBufferType = Graphic3d_BT_RGB;
aParams.BufferType = Graphic3d_BT_RGB;
}
else if (aBufArg == "depth")
{
aBufferType = Graphic3d_BT_Depth;
aParams.BufferType = Graphic3d_BT_Depth;
}
else
{
@@ -857,22 +856,22 @@ static Standard_Integer VDump (Draw_Interpretor& theDI,
if (aStereoArg == "l"
|| aStereoArg == "left")
{
aStereoOpts = V3d_SDO_LEFT_EYE;
aParams.StereoOptions = V3d_SDO_LEFT_EYE;
}
else if (aStereoArg == "r"
|| aStereoArg == "right")
{
aStereoOpts = V3d_SDO_RIGHT_EYE;
aParams.StereoOptions = V3d_SDO_RIGHT_EYE;
}
else if (aStereoArg == "mono")
{
aStereoOpts = V3d_SDO_MONO;
aParams.StereoOptions = V3d_SDO_MONO;
}
else if (aStereoArg == "blended"
|| aStereoArg == "blend"
|| aStereoArg == "stereo")
{
aStereoOpts = V3d_SDO_BLENDED;
aParams.StereoOptions = V3d_SDO_BLENDED;
}
else if (aStereoArg == "sbs"
|| aStereoArg == "sidebyside")
@@ -893,24 +892,23 @@ static Standard_Integer VDump (Draw_Interpretor& theDI,
else if (anArg == "-rgba"
|| anArg == "rgba")
{
aBufferType = Graphic3d_BT_RGBA;
aParams.BufferType = Graphic3d_BT_RGBA;
}
else if (anArg == "-rgb"
|| anArg == "rgb")
{
aBufferType = Graphic3d_BT_RGB;
aParams.BufferType = Graphic3d_BT_RGB;
}
else if (anArg == "-depth"
|| anArg == "depth")
{
aBufferType = Graphic3d_BT_Depth;
aParams.BufferType = Graphic3d_BT_Depth;
}
else if (anArg == "-width"
|| anArg == "width"
|| anArg == "sizex")
{
if (aWidth != 0)
if (aParams.Width != 0)
{
std::cout << "Error: wrong syntax at " << theArgVec[anArgIter] << "\n";
return 1;
@@ -920,13 +918,13 @@ static Standard_Integer VDump (Draw_Interpretor& theDI,
std::cout << "Error: integer value is expected right after 'width'\n";
return 1;
}
aWidth = Draw::Atoi (theArgVec[anArgIter]);
aParams.Width = Draw::Atoi (theArgVec[anArgIter]);
}
else if (anArg == "-height"
|| anArg == "height"
|| anArg == "-sizey")
{
if (aHeight != 0)
if (aParams.Height != 0)
{
std::cout << "Error: wrong syntax at " << theArgVec[anArgIter] << "\n";
return 1;
@@ -936,7 +934,17 @@ static Standard_Integer VDump (Draw_Interpretor& theDI,
std::cout << "Error: integer value is expected right after 'height'\n";
return 1;
}
aHeight = Draw::Atoi (theArgVec[anArgIter]);
aParams.Height = Draw::Atoi (theArgVec[anArgIter]);
}
else if (anArg == "-tile"
|| anArg == "-tilesize")
{
if (++anArgIter >= theArgNb)
{
std::cout << "Error: integer value is expected right after 'tileSize'\n";
return 1;
}
aParams.TileSize = Draw::Atoi (theArgVec[anArgIter]);
}
else
{
@@ -944,10 +952,10 @@ static Standard_Integer VDump (Draw_Interpretor& theDI,
return 1;
}
}
if ((aWidth <= 0 && aHeight > 0)
|| (aWidth > 0 && aHeight <= 0))
if ((aParams.Width <= 0 && aParams.Height > 0)
|| (aParams.Width > 0 && aParams.Height <= 0))
{
std::cout << "Error: dimensions " << aWidth << "x" << aHeight << " are incorrect\n";
std::cout << "Error: dimensions " << aParams.Width << "x" << aParams.Height << " are incorrect\n";
return 1;
}
@@ -958,16 +966,16 @@ static Standard_Integer VDump (Draw_Interpretor& theDI,
return 1;
}
if (aWidth <= 0 || aHeight <= 0)
if (aParams.Width <= 0 || aParams.Height <= 0)
{
aView->Window()->Size (aWidth, aHeight);
aView->Window()->Size (aParams.Width, aParams.Height);
}
Image_AlienPixMap aPixMap;
bool isBigEndian = Image_PixMap::IsBigEndianHost();
Image_PixMap::ImgFormat aFormat = Image_PixMap::ImgUNKNOWN;
switch (aBufferType)
switch (aParams.BufferType)
{
case Graphic3d_BT_RGB: aFormat = isBigEndian ? Image_PixMap::ImgRGB : Image_PixMap::ImgBGR; break;
case Graphic3d_BT_RGBA: aFormat = isBigEndian ? Image_PixMap::ImgRGBA : Image_PixMap::ImgBGRA; break;
@@ -978,22 +986,22 @@ static Standard_Integer VDump (Draw_Interpretor& theDI,
{
case ViewerTest_SP_Single:
{
if (!aView->ToPixMap (aPixMap, aWidth, aHeight, aBufferType, Standard_True, aStereoOpts))
if (!aView->ToPixMap (aPixMap, aParams))
{
theDI << "Fail: view dump failed!\n";
return 0;
}
else if (aPixMap.SizeX() != Standard_Size(aWidth)
|| aPixMap.SizeY() != Standard_Size(aHeight))
else if (aPixMap.SizeX() != Standard_Size(aParams.Width)
|| aPixMap.SizeY() != Standard_Size(aParams.Height))
{
theDI << "Fail: dumped dimensions " << (Standard_Integer )aPixMap.SizeX() << "x" << (Standard_Integer )aPixMap.SizeY()
<< " are lesser than requested " << aWidth << "x" << aHeight << "\n";
<< " are lesser than requested " << aParams.Width << "x" << aParams.Height << "\n";
}
break;
}
case ViewerTest_SP_SideBySide:
{
if (!aPixMap.InitZero (aFormat, aWidth * 2, aHeight))
if (!aPixMap.InitZero (aFormat, aParams.Width * 2, aParams.Height))
{
theDI << "Fail: not enough memory for image allocation!\n";
return 0;
@@ -1001,12 +1009,15 @@ static Standard_Integer VDump (Draw_Interpretor& theDI,
Image_PixMap aPixMapL, aPixMapR;
aPixMapL.InitWrapper (aPixMap.Format(), aPixMap.ChangeData(),
aWidth, aHeight, aPixMap.SizeRowBytes());
aPixMapR.InitWrapper (aPixMap.Format(), aPixMap.ChangeData() + aPixMap.SizePixelBytes() * aWidth,
aWidth, aHeight, aPixMap.SizeRowBytes());
if (!aView->ToPixMap (aPixMapL, aWidth, aHeight, aBufferType, Standard_True, V3d_SDO_LEFT_EYE)
|| !aView->ToPixMap (aPixMapR, aWidth, aHeight, aBufferType, Standard_True, V3d_SDO_RIGHT_EYE)
)
aParams.Width, aParams.Height, aPixMap.SizeRowBytes());
aPixMapR.InitWrapper (aPixMap.Format(), aPixMap.ChangeData() + aPixMap.SizePixelBytes() * aParams.Width,
aParams.Width, aParams.Height, aPixMap.SizeRowBytes());
aParams.StereoOptions = V3d_SDO_LEFT_EYE;
Standard_Boolean isOk = aView->ToPixMap (aPixMapL, aParams);
aParams.StereoOptions = V3d_SDO_RIGHT_EYE;
isOk = isOk && aView->ToPixMap (aPixMapR, aParams);
if (!isOk)
{
theDI << "Fail: view dump failed!\n";
return 0;
@@ -1015,7 +1026,7 @@ static Standard_Integer VDump (Draw_Interpretor& theDI,
}
case ViewerTest_SP_OverUnder:
{
if (!aPixMap.InitZero (aFormat, aWidth, aHeight * 2))
if (!aPixMap.InitZero (aFormat, aParams.Width, aParams.Height * 2))
{
theDI << "Fail: not enough memory for image allocation!\n";
return 0;
@@ -1023,11 +1034,15 @@ static Standard_Integer VDump (Draw_Interpretor& theDI,
Image_PixMap aPixMapL, aPixMapR;
aPixMapL.InitWrapper (aFormat, aPixMap.ChangeData(),
aWidth, aHeight, aPixMap.SizeRowBytes());
aPixMapR.InitWrapper (aFormat, aPixMap.ChangeData() + aPixMap.SizeRowBytes() * aHeight,
aWidth, aHeight, aPixMap.SizeRowBytes());
if (!aView->ToPixMap (aPixMapL, aWidth, aHeight, aBufferType, Standard_True, V3d_SDO_LEFT_EYE)
|| !aView->ToPixMap (aPixMapR, aWidth, aHeight, aBufferType, Standard_True, V3d_SDO_RIGHT_EYE))
aParams.Width, aParams.Height, aPixMap.SizeRowBytes());
aPixMapR.InitWrapper (aFormat, aPixMap.ChangeData() + aPixMap.SizeRowBytes() * aParams.Height,
aParams.Width, aParams.Height, aPixMap.SizeRowBytes());
aParams.StereoOptions = V3d_SDO_LEFT_EYE;
Standard_Boolean isOk = aView->ToPixMap (aPixMapL, aParams);
aParams.StereoOptions = V3d_SDO_RIGHT_EYE;
isOk = isOk && aView->ToPixMap (aPixMapR, aParams);
if (!isOk)
{
theDI << "Fail: view dump failed!\n";
return 0;
@@ -5672,6 +5687,7 @@ void ViewerTest::Commands(Draw_Interpretor& theCommands)
"vdump <filename>." DUMP_FORMATS " [-width Width -height Height]"
"\n\t\t: [-buffer rgb|rgba|depth=rgb]"
"\n\t\t: [-stereo mono|left|right|blend|sideBySide|overUnder=mono]"
"\n\t\t: [-tileSize Size=0]"
"\n\t\t: Dumps content of the active view into image file",
__FILE__,VDump,group);

110
src/ViewerTest/ViewerTest_ViewerCommands.cxx
View File

@@ -4278,6 +4278,108 @@ static int VGraduatedTrihedron (Draw_Interpretor& /*theDi*/, Standard_Integer th
return 0;
}
//==============================================================================
//function : VTile
//purpose :
//==============================================================================
static int VTile (Draw_Interpretor& theDI,
Standard_Integer theArgNb,
const char** theArgVec)
{
Handle(V3d_View) aView = ViewerTest::CurrentView();
if (aView.IsNull())
{
std::cerr << "Error: no active viewer.\n";
return 1;
}
Graphic3d_CameraTile aTile = aView->Camera()->Tile();
if (theArgNb < 2)
{
theDI << "Total size: " << aTile.TotalSize.x() << " " << aTile.TotalSize.y() << "\n"
<< "Tile size: " << aTile.TileSize.x() << " " << aTile.TileSize.y() << "\n"
<< "Lower left: " << aTile.Offset.x() << " " << aTile.Offset.y() << "\n";
return 0;
}
aView->Window()->Size (aTile.TileSize.x(), aTile.TileSize.y());
for (Standard_Integer anArgIter = 1; anArgIter < theArgNb; ++anArgIter)
{
TCollection_AsciiString anArg (theArgVec[anArgIter]);
anArg.LowerCase();
if (anArg == "-lowerleft"
|| anArg == "-upperleft")
{
if (anArgIter + 3 < theArgNb)
{
std::cerr << "Syntax error at '" << theArgVec[anArgIter] << "'.\n";
return 1;
}
aTile.IsTopDown = (anArg == "-upperleft") == Standard_True;
aTile.Offset.x() = Draw::Atoi (theArgVec[anArgIter + 1]);
aTile.Offset.y() = Draw::Atoi (theArgVec[anArgIter + 2]);
}
else if (anArg == "-total"
|| anArg == "-totalsize"
|| anArg == "-viewsize")
{
if (anArgIter + 3 < theArgNb)
{
std::cerr << "Syntax error at '" << theArgVec[anArgIter] << "'.\n";
return 1;
}
aTile.TotalSize.x() = Draw::Atoi (theArgVec[anArgIter + 1]);
aTile.TotalSize.y() = Draw::Atoi (theArgVec[anArgIter + 2]);
if (aTile.TotalSize.x() < 1
|| aTile.TotalSize.y() < 1)
{
std::cerr << "Error: total size is incorrect.\n";
return 1;
}
}
else if (anArg == "-tilesize")
{
if (anArgIter + 3 < theArgNb)
{
std::cerr << "Syntax error at '" << theArgVec[anArgIter] << "'.\n";
return 1;
}
aTile.TileSize.x() = Draw::Atoi (theArgVec[anArgIter + 1]);
aTile.TileSize.y() = Draw::Atoi (theArgVec[anArgIter + 2]);
if (aTile.TileSize.x() < 1
|| aTile.TileSize.y() < 1)
{
std::cerr << "Error: tile size is incorrect.\n";
return 1;
}
}
else if (anArg == "-unset")
{
aView->Camera()->SetTile (Graphic3d_CameraTile());
aView->Redraw();
return 0;
}
}
if (aTile.TileSize.x() < 1
|| aTile.TileSize.y() < 1)
{
std::cerr << "Error: tile size is undefined.\n";
return 1;
}
else if (aTile.TotalSize.x() < 1
|| aTile.TotalSize.y() < 1)
{
std::cerr << "Error: total size is undefined.\n";
return 1;
}
aView->Camera()->SetTile (aTile);
aView->Redraw();
return 0;
}
//==============================================================================
//function : VZLayer
//purpose : Test z layer operations for v3d viewer
@@ -9064,6 +9166,14 @@ void ViewerTest::ViewerCommands(Draw_Interpretor& theCommands)
" - xticks, yticks, xzicks - number of tickmark on axes. Default: 5\n"
" - xticklength, yticklength, xzicklength - length of tickmark on axes. Default: 10\n",
__FILE__,VGraduatedTrihedron,group);
theCommands.Add("vtile" ,
"vtile [-totalSize W H] [-lowerLeft X Y] [-upperLeft X Y] [-tileSize W H]"
"\n\t\t: Setup view to draw a tile (a part of virtual bigger viewport)."
"\n\t\t: -totalSize the size of virtual bigger viewport"
"\n\t\t: -tileSize tile size (the view size will be used if omitted)"
"\n\t\t: -lowerLeft tile offset as lower left corner"
"\n\t\t: -upperLeft tile offset as upper left corner",
__FILE__, VTile, group);
theCommands.Add("vzlayer",
"vzlayer add/del/get/settings/enable/disable [id]\n"
" add - add new z layer to viewer and print its id\n"