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

0024688: Draw Harness - vdump command makes snapshot only for the first view

Browse Source
This commit is contained in:
kgv 2014-03-13 14:27:13 +04:00 committed by bugmaster
parent 2cd138b878
commit 34db9c0093
2 changed files with 202 additions and 88 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

281
src/ViewerTest/ViewerTest.cxx
View File

@ -48,6 +48,7 @@
#include <AIS_ListOfInteractive.hxx> #include <AIS_ListOfInteractive.hxx>
#include <AIS_ListIteratorOfListOfInteractive.hxx> #include <AIS_ListIteratorOfListOfInteractive.hxx>
#include <Aspect_InteriorStyle.hxx> #include <Aspect_InteriorStyle.hxx>
#include <Aspect_Window.hxx>
#include <Graphic3d_AspectFillArea3d.hxx> #include <Graphic3d_AspectFillArea3d.hxx>
#include <Graphic3d_AspectLine3d.hxx> #include <Graphic3d_AspectLine3d.hxx>
#include <Graphic3d_TextureRoot.hxx> #include <Graphic3d_TextureRoot.hxx>
@ -414,25 +415,24 @@ Handle(ViewerTest_EventManager) ViewerTest::CurrentEventManager()
return EM; return EM;
} }
//======================================================================= //=======================================================================
//function : Get Context and active viou.. //function : Get Context and active view
//purpose : //purpose :
//======================================================================= //=======================================================================
void GetCtxAndView(Handle(AIS_InteractiveContext)& Ctx, static Standard_Boolean getCtxAndView (Handle(AIS_InteractiveContext)& theCtx,
Handle(V3d_View)& Viou) Handle(V3d_View)& theView)
{ {
Ctx = ViewerTest::GetAISContext(); theCtx = ViewerTest::GetAISContext();
if (!Ctx.IsNull()) theView = ViewerTest::CurrentView();
if (theCtx.IsNull()
|| theView.IsNull())
{ {
const Handle(V3d_Viewer)& Vwr = Ctx->CurrentViewer(); std::cout << "Error: cannot find an active view!\n";
Vwr->InitActiveViews(); return Standard_False;
if(Vwr->MoreActiveViews())
Viou = Vwr->ActiveView();
} }
return Standard_True;
} }
//============================================================================== //==============================================================================
//function : GetShapeFromName //function : GetShapeFromName
//purpose : Compute an Shape from a draw variable or a file name //purpose : Compute an Shape from a draw variable or a file name
@ -688,42 +688,88 @@ static int visos (Draw_Interpretor& di, Standard_Integer argc, const char** argv
//============================================================================== //==============================================================================
//function : VDispAreas,VDispSensitive,... //function : VDispAreas,VDispSensitive,...
//purpose : Redraw the view //purpose :
//Draw arg : No args
//============================================================================== //==============================================================================
static int VDispAreas (Draw_Interpretor& ,Standard_Integer , const char** ) static Standard_Integer VDispAreas (Draw_Interpretor& ,
Standard_Integer theArgNb,
Standard_CString* )
{ {
if (theArgNb > 1)
{
std::cout << "Error: wrong syntax!\n";
return 1;
}
Handle(AIS_InteractiveContext) Ctx; Handle(AIS_InteractiveContext) aCtx;
Handle(V3d_View) Viou; Handle(V3d_View) aView;
GetCtxAndView(Ctx,Viou); if (!getCtxAndView (aCtx, aView))
Ctx->DisplayActiveAreas(Viou); {
return 1;
}
aCtx->DisplayActiveAreas (aView);
return 0; return 0;
} }
static int VClearAreas (Draw_Interpretor& ,Standard_Integer , const char** ) static Standard_Integer VClearAreas (Draw_Interpretor& ,
Standard_Integer theArgNb,
Standard_CString* )
{ {
Handle(AIS_InteractiveContext) Ctx; if (theArgNb > 1)
Handle(V3d_View) Viou; {
GetCtxAndView(Ctx,Viou); std::cout << "Error: wrong syntax!\n";
Ctx->ClearActiveAreas(Viou); return 1;
}
Handle(AIS_InteractiveContext) aCtx;
Handle(V3d_View) aView;
if (!getCtxAndView (aCtx, aView))
{
return 1;
}
aCtx->ClearActiveAreas (aView);
return 0; return 0;
} }
static int VDispSensi (Draw_Interpretor& ,Standard_Integer , const char** ) static Standard_Integer VDispSensi (Draw_Interpretor& ,
Standard_Integer theArgNb,
Standard_CString* )
{ {
Handle(AIS_InteractiveContext) Ctx; if (theArgNb > 1)
Handle(V3d_View) Viou; {
GetCtxAndView(Ctx,Viou); std::cout << "Error: wrong syntax!\n";
Ctx->DisplayActiveSensitive(Viou); return 1;
}
Handle(AIS_InteractiveContext) aCtx;
Handle(V3d_View) aView;
if (!getCtxAndView (aCtx, aView))
{
return 1;
}
aCtx->DisplayActiveSensitive (aView);
return 0; return 0;
} }
static int VClearSensi (Draw_Interpretor& ,Standard_Integer , const char** )
static Standard_Integer VClearSensi (Draw_Interpretor& ,
Standard_Integer theArgNb,
Standard_CString* )
{ {
Handle(AIS_InteractiveContext) Ctx; if (theArgNb > 1)
Handle(V3d_View) Viou; {
GetCtxAndView(Ctx,Viou); std::cout << "Error: wrong syntax!\n";
Ctx->ClearActiveSensitive(Viou); return 1;
}
Handle(AIS_InteractiveContext) aCtx;
Handle(V3d_View) aView;
if (!getCtxAndView (aCtx, aView))
{
return 1;
}
aCtx->ClearActiveSensitive (aView);
return 0; return 0;
} }
@ -808,91 +854,152 @@ static int VSelPrecision(Draw_Interpretor& di, Standard_Integer argc, const char
//============================================================================== //==============================================================================
//function : VDump //function : VDump
//purpose : To dump the active view snapshot to image file //purpose : To dump the active view snapshot to image file
//Draw arg : Picture file name with extension corresponding to desired format
//============================================================================== //==============================================================================
static Standard_Integer VDump (Draw_Interpretor& di, Standard_Integer argc, const char** argv) static Standard_Integer VDump (Draw_Interpretor& theDI,
Standard_Integer theArgNb,
Standard_CString* theArgVec)
{ {
if (argc < 2) if (theArgNb < 2)
{ {
di<<"Use: "<<argv[0]<<" <filename>.{png|bmp|jpg|gif} [buffer={rgb|rgba|depth}] [width height] [stereoproj={L|R}]\n"; std::cout << "Error: wrong number of arguments! Image file name should be specified at least.\n";
return 1; return 1;
} }
Graphic3d_BufferType aBufferType = Graphic3d_BT_RGB; Standard_Integer anArgIter = 1;
if (argc > 2) Standard_CString aFilePath = theArgVec[anArgIter++];
Graphic3d_BufferType aBufferType = Graphic3d_BT_RGB;
V3d_StereoDumpOptions aStereoOpts = V3d_SDO_MONO;
Standard_Integer aWidth = 0;
Standard_Integer aHeight = 0;
for (; anArgIter < theArgNb; ++anArgIter)
{ {
const char* aBuffTypeStr = argv[2]; TCollection_AsciiString anArg (theArgVec[anArgIter]);
if ( strcasecmp( aBuffTypeStr, "rgb" ) == 0 ) // 4 is to compare '\0' as well anArg.LowerCase();
{ if (anArg == "rgba")
aBufferType = Graphic3d_BT_RGB;
}
else if ( strcasecmp( aBuffTypeStr, "rgba" ) == 0 )
{ {
aBufferType = Graphic3d_BT_RGBA; aBufferType = Graphic3d_BT_RGBA;
} }
else if ( strcasecmp( aBuffTypeStr, "depth" ) == 0 ) else if (anArg == "rgb")
{
aBufferType = Graphic3d_BT_RGB;
}
else if (anArg == "depth")
{ {
aBufferType = Graphic3d_BT_Depth; aBufferType = Graphic3d_BT_Depth;
} }
else if (anArg == "l"
|| anArg == "left")
{
aStereoOpts = V3d_SDO_LEFT_EYE;
}
else if (anArg == "r"
|| anArg == "right")
{
aStereoOpts = V3d_SDO_RIGHT_EYE;
}
else if (anArg == "mono")
{
aStereoOpts = V3d_SDO_MONO;
}
else if (anArg == "w"
|| anArg == "width")
{
if (aWidth != 0)
{
std::cout << "Error: wrong syntax at " << theArgVec[anArgIter] << "\n";
return 1;
}
else if (++anArgIter >= theArgNb)
{
std::cout << "Error: integer value is expected right after 'width'\n";
return 1;
}
aWidth = Draw::Atoi (theArgVec[anArgIter]);
}
else if (anArg == "h"
|| anArg == "height")
{
if (aHeight != 0)
{
std::cout << "Error: wrong syntax at " << theArgVec[anArgIter] << "\n";
return 1;
}
if (++anArgIter >= theArgNb)
{
std::cout << "Error: integer value is expected right after 'height'\n";
return 1;
}
aHeight = Draw::Atoi (theArgVec[anArgIter]);
}
else if (anArg.IsIntegerValue())
{
// compatibility with old syntax
if (aWidth != 0
|| aHeight != 0)
{
std::cout << "Error: wrong syntax at " << theArgVec[anArgIter] << "\n";
return 1;
}
else if (++anArgIter >= theArgNb)
{
std::cout << "Error: height value is expected right after width\n";
return 1;
}
aWidth = Draw::Atoi (theArgVec[anArgIter - 1]);
aHeight = Draw::Atoi (theArgVec[anArgIter]);
}
else
{
std::cout << "Error: unknown argument '" << theArgVec[anArgIter] << "'\n";
return 1;
}
}
if ((aWidth <= 0 && aHeight > 0)
|| (aWidth > 0 && aHeight <= 0))
{
std::cout << "Error: dimensions " << aWidth << "x" << aHeight << " are incorrect\n";
return 1;
} }
Standard_Integer aWidth = (argc > 3) ? Draw::Atoi (argv[3]) : 0; Handle(V3d_View) aView = ViewerTest::CurrentView();
Standard_Integer aHeight = (argc > 4) ? Draw::Atoi (argv[4]) : 0; if (aView.IsNull())
TCollection_AsciiString aStereoProj ((argc > 5) ? argv[5] : "");
Handle(AIS_InteractiveContext) IC;
Handle(V3d_View) view;
GetCtxAndView (IC, view);
if (view.IsNull())
{ {
di << "Cannot find an active viewer/view\n"; std::cout << "Error: cannot find an active view!\n";
return 1; return 1;
} }
if (aWidth <= 0 || aHeight <= 0) if (aWidth <= 0 || aHeight <= 0)
{ {
if (!view->Dump (argv[1], aBufferType)) if (aStereoOpts != V3d_SDO_MONO)
{ {
di << "Dumping failed!\n"; aView->Window()->Size (aWidth, aHeight);
return 1;
} }
return 0; else
}
V3d_StereoDumpOptions aStereoOpts = V3d_SDO_MONO;
if (!aStereoProj.IsEmpty())
{
aStereoProj.UpperCase();
if (aStereoProj == "L")
{ {
aStereoOpts = V3d_SDO_LEFT_EYE; if (!aView->Dump (aFilePath, aBufferType))
} {
theDI << "Fail: view dump failed!\n";
if (aStereoProj == "R") }
{ return 0;
aStereoOpts = V3d_SDO_RIGHT_EYE;
} }
} }
Image_AlienPixMap aPixMap; Image_AlienPixMap aPixMap;
if (!view->ToPixMap (aPixMap, aWidth, aHeight, aBufferType, Standard_True, aStereoOpts)) if (!aView->ToPixMap (aPixMap, aWidth, aHeight, aBufferType, Standard_True, aStereoOpts))
{ {
di << "Dumping failed!\n"; theDI << "Fail: view dump failed!\n";
return 1; return 0;
} }
if (aPixMap.SizeX() != Standard_Size(aWidth) if (aPixMap.SizeX() != Standard_Size(aWidth)
|| aPixMap.SizeY() != Standard_Size(aHeight)) || aPixMap.SizeY() != Standard_Size(aHeight))
{ {
std::cout << "Warning! Dumped dimensions " << aPixMap.SizeX() << "x" << aPixMap.SizeY() 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 " << aWidth << "x" << aHeight << "\n";
} }
if (!aPixMap.Save (argv[1])) if (!aPixMap.Save (aFilePath))
{ {
di << "Saving image failed!\n"; theDI << "Fail: image can not be saved!\n";
return 1;
} }
return 0; return 0;
} }
@ -3635,11 +3742,13 @@ void ViewerTest::Commands(Draw_Interpretor& theCommands)
theCommands.Add("vdump", theCommands.Add("vdump",
#ifdef HAVE_FREEIMAGE #ifdef HAVE_FREEIMAGE
"<filename>.{png|bmp|jpg|gif} [buffer={rgb|rgba|depth}] [width height] [stereoproj={L|R}]" "vdump <filename>.{png|bmp|jpg|gif} [rgb|rgba|depth=rgb] [mono|left|right=mono]"
"\n\t\t: Dumps contents of viewer window to PNG, BMP, JPEG or GIF file", "\n\t\t: [width Width=0 height Height=0]"
"\n\t\t: Dumps content of the active view into PNG, BMP, JPEG or GIF file",
#else #else
"<filename>.{ppm} [buffer={rgb|rgba|depth}] [width height] [stereoproj={L|R}]" "vdump <filename>.{ppm} [rgb|rgba|depth=rgb] [mono|left|right=mono]"
"\n\t\t: Dumps contents of viewer window to PPM image file", "\n\t\t: [width Width=0 height Height=0]"
"\n\t\t: Dumps content of the active view into PPM image file",
#endif #endif
__FILE__,VDump,group); __FILE__,VDump,group);

9
tests/v3d/glsl/phong_views
View File

@ -15,8 +15,13 @@ vfit
vrotate 0.2 0.0 0.0 vrotate 0.2 0.0 0.0
vshaderprog b phong vshaderprog b phong
vdump $::imagedir/${::casename}_1.png vdump $::imagedir/${::casename}_v1.png
vinit View2 vinit View2
vdump $::imagedir/${::casename}_2.png vfit
vdump $::imagedir/${::casename}_v2.png
vmoveto 250 250
vdump $::imagedir/${::casename}_v2sel.png
vactivate View1
vdump $::imagedir/${::casename}_v1sel.png
vclose View2 vclose View2