eraseAll( false );
}
- context()->Display( theObject, theMode, theSelectionMode );
if( theSelectionMode > 0 )
{
context()->OpenLocalContext();
+ context()->Display( theObject, theMode, theSelectionMode );
context()->Activate( theObject, theSelectionMode, Standard_True );
}
+ else
+ context()->Display( theObject, theMode, theSelectionMode );
if( isFitAll )
- {
- viewWindow()->onTopView();
- viewWindow()->onFitAll();
- }
+ fitAll();
+}
+
+void TestViewer::fitAll()
+{
+ viewWindow()->onTopView();
+ viewWindow()->onFitAll();
}
void TestViewer::show( const TopoDS_Shape& theShape, int theMode, bool isFitAll, const QColor& theColor,
context()->Display( aShape, theMode, 0, Standard_False );
if( isFitAll )
- {
- viewWindow()->onTopView();
- viewWindow()->onFitAll();
- }
+ fitAll();
}
void TestViewer::show( const TopoDS_Shape& theShape, int theMode, bool isFitAll, const char* theKey,
int theUIANb, int theVIANb)
show( aLE.Value(), theMode, false, GetColor(i) );
if( isFitAll )
- {
- viewWindow()->onTopView();
- viewWindow()->onFitAll();
- }
+ fitAll();
}
/*void TestViewer::ShowShape(const TopoDS_Shape& theShape, int theMode, int& i)
return true;
}
-bool TestViewer::AssertImages( QString& theMessage, const QImage* theImage, const char* theCase )
+bool TestViewer::AssertImages( QString& theMessage, const QImage* theImage, const char* theCase, bool swapRGB )
{
QImage anActualImage;
if( theImage )
else
anActualImage = viewWindow()->getView(OCCViewer_ViewFrame::MAIN_VIEW)->dumpView();
+ if( swapRGB )
+ {
+ // A temporary patch for bug in SALOME/OCC dump; the result image contains swapped RGB colors
+ anActualImage = anActualImage.rgbSwapped();
+ }
+
+
if( theCase )
myKey = theCase;
return isEqual;
}
+
+void TestViewer::setKey( const QString& theKey )
+{
+ myKey = theKey;
+}