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

0030756: Visualization, TKOpenGl - capping plane does not work for ZLayer with non-zero origin

OpenGl_CappingPlaneResource::updateTransform() now takes into account ZLayer origin.

Fixed VT_ProcessKeyPress() passing arbitrary input to Draw::Atoi() leading
to messages in console like "unclosed braces".
This commit is contained in:
kgv
2019-05-29 15:22:10 +03:00
committed by bugmaster
parent 9aceb23df6
commit edc4ba21c4
5 changed files with 74 additions and 57 deletions

View File

@@ -2963,33 +2963,29 @@ void VT_ProcessKeyPress (const char* buf_ret)
Draw_Interprete (Draw_ToExitOnCloseView ? "exit" : "vclose");
}
}
else
else if (*buf_ret >= '0' && *buf_ret <= '7') // Number
{
// Number
const Standard_Integer aSelMode = Draw::Atoi(buf_ret);
if (aSelMode >= 0 && aSelMode <= 7)
const Standard_Integer aSelMode = Draw::Atoi (buf_ret);
bool toEnable = true;
if (const Handle(AIS_InteractiveContext)& aCtx = ViewerTest::GetAISContext())
{
bool toEnable = true;
if (const Handle(AIS_InteractiveContext) aCtx = ViewerTest::GetAISContext())
AIS_ListOfInteractive aPrsList;
aCtx->DisplayedObjects (aPrsList);
for (AIS_ListOfInteractive::Iterator aPrsIter (aPrsList); aPrsIter.More() && toEnable; aPrsIter.Next())
{
AIS_ListOfInteractive aPrsList;
aCtx->DisplayedObjects (aPrsList);
for (AIS_ListOfInteractive::Iterator aPrsIter (aPrsList); aPrsIter.More() && toEnable; aPrsIter.Next())
TColStd_ListOfInteger aModes;
aCtx->ActivatedModes (aPrsIter.Value(), aModes);
for (TColStd_ListOfInteger::Iterator aModeIter (aModes); aModeIter.More() && toEnable; aModeIter.Next())
{
TColStd_ListOfInteger aModes;
aCtx->ActivatedModes (aPrsIter.Value(), aModes);
for (TColStd_ListOfInteger::Iterator aModeIter (aModes); aModeIter.More() && toEnable; aModeIter.Next())
if (aModeIter.Value() == aSelMode)
{
if (aModeIter.Value() == aSelMode)
{
toEnable = false;
}
toEnable = false;
}
}
}
TCollection_AsciiString aCmd = TCollection_AsciiString ("vselmode ") + aSelMode + (toEnable ? " 1" : " 0");
Draw_Interprete (aCmd.ToCString());
}
TCollection_AsciiString aCmd = TCollection_AsciiString ("vselmode ") + aSelMode + (toEnable ? " 1" : " 0");
Draw_Interprete (aCmd.ToCString());
}
}