X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHYDRO_tests%2FTestViewer.cxx;h=52917a31a07c023cd60eae54b1c830e4956ed48d;hb=71ba58001e1084f0995fff43bf5e4643b153e5e0;hp=44e3fc2c94f869f4d78c2cd614ea5c6e6fae2274;hpb=73c6183c872b9bef4db51730512666316f055553;p=modules%2Fhydro.git diff --git a/src/HYDRO_tests/TestViewer.cxx b/src/HYDRO_tests/TestViewer.cxx index 44e3fc2c..52917a31 100644 --- a/src/HYDRO_tests/TestViewer.cxx +++ b/src/HYDRO_tests/TestViewer.cxx @@ -1,3 +1,20 @@ +// Copyright (C) 2014-2015 EDF-R&D +// This library is free software; you can redistribute it and/or +// modify it under the terms of the GNU Lesser General Public +// License as published by the Free Software Foundation; either +// version 2.1 of the License, or (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public +// License along with this library; if not, write to the Free Software +// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +// +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +// #include #include @@ -25,6 +42,8 @@ #include #include #include +#include +#include #ifdef WIN32 #pragma warning ( default: 4251 ) @@ -65,9 +84,9 @@ OCCViewer_ViewWindow* TestViewer::viewWindow() return myViewWindow; } -Handle(AIS_InteractiveContext) context() +Handle(AIS_InteractiveContext) TestViewer::context() { - return TestViewer::viewer()->getAISContext(); + return viewer()->getAISContext(); } QColor TestViewer::GetColor(int i) @@ -83,7 +102,22 @@ QColor TestViewer::GetColor(int i) << QColor(100,100,20) << QColor(10,100,150); } - return aCV[i]; + if (i < aCV.size()) + return aCV[i]; + else + { + QColor TestColor = aCV[i % aCV.size()]; + QColor NewColor((TestColor.red() + i * 41) % 256, + (TestColor.green() + i * 13) % 256, + (TestColor.blue() + i * 23) % 256); + return NewColor; + } +} + +void TestViewer::eraseAll( bool isUpdate ) +{ + context()->CloseLocalContext( -1, Standard_False ); + context()->EraseAll( isUpdate ); } void TestViewer::show( const Handle(AIS_InteractiveObject)& theObject, @@ -93,8 +127,7 @@ void TestViewer::show( const Handle(AIS_InteractiveObject)& theObject, if( !aNewKey.isEmpty() ) { myKey = aNewKey; - context()->CloseLocalContext(); - context()->EraseAll( Standard_False ); + eraseAll( false ); } context()->Display( theObject, theMode, theSelectionMode ); @@ -129,19 +162,31 @@ void TestViewer::show( const TopoDS_Shape& theShape, int theMode, bool isFitAll, void TestViewer::show( const TopoDS_Shape& theShape, int theMode, bool isFitAll, const char* theKey ) { - context()->CloseLocalContext(); - context()->EraseAll( Standard_False ); - - myKey = theKey; - int i = 0; - if( theShape.ShapeType()==TopAbs_SHELL ) + QString aNewKey = theKey; + if( !aNewKey.isEmpty() ) { - TopoDS_Iterator anIt( theShape ); - for( ; anIt.More(); anIt.Next(), i++ ) - show( anIt.Value(), theMode, false, GetColor(i) ); + eraseAll( false ); + myKey = aNewKey; } - else - show( theShape, theMode, false, GetColor(0) ); + + if( theShape.IsNull() ) + return; + + int i = 0; + //show all faces first + TopExp_Explorer aFE( theShape, TopAbs_FACE ); + for( ; aFE.More(); aFE.Next(), i++ ) + show( aFE.Current(), theMode, false, GetColor(i) ); + + //show all independent wires + TopExp_Explorer aWE( theShape, TopAbs_WIRE, TopAbs_FACE ); + for( ; aWE.More(); aWE.Next(), i++ ) + show( aWE.Current(), theMode, false, GetColor(i) ); + + //show all independent edges + TopExp_Explorer anEE( theShape, TopAbs_EDGE, TopAbs_WIRE ); + for( ; anEE.More(); anEE.Next(), i++ ) + show( anEE.Current(), theMode, false, GetColor(i) ); if( isFitAll ) { @@ -150,6 +195,27 @@ void TestViewer::show( const TopoDS_Shape& theShape, int theMode, bool isFitAll, } } +/*void TestViewer::ShowShape(const TopoDS_Shape& theShape, int theMode, int& i) +{ + if( theShape.ShapeType()==TopAbs_SHELL ) + { + TopoDS_Iterator anIt( theShape ); + for( ; anIt.More(); anIt.Next()) + { + show( anIt.Value(), theMode, false, GetColor(i) ); + i++; + } + } + else if (theShape.ShapeType()==TopAbs_FACE || + theShape.ShapeType()==TopAbs_WIRE || + theShape.ShapeType()==TopAbs_EDGE || + theShape.ShapeType()==TopAbs_VERTEX ) + { + show( theShape, theMode, false, GetColor(i) ); + i++; + } +}*/ + bool AreImagesEqual( const QImage& theImage1, const QImage& theImage2, double theTolerance ) { if( theImage1.isNull() || theImage2.isNull() ) @@ -204,22 +270,31 @@ bool TestViewer::AssertImages( QString& theMessage ) return false; } -Handle_Aspect_ColorScale TestViewer::showColorScale( bool isShow ) +Handle_Aspect_ColorScale TestViewer::colorScale() { Handle(V3d_View) aView = myViewWindow->getViewPort()->getView(); if( aView.IsNull() ) return Handle(Aspect_ColorScale)(); + else + return aView->ColorScale(); +} + +void TestViewer::showColorScale( bool isShow ) +{ + Handle(V3d_View) aView = myViewWindow->getViewPort()->getView(); + if( aView.IsNull() ) + return; - Handle(Aspect_ColorScale) aColorScale = aView->ColorScale(); + Handle(Aspect_ColorScale) aColorScale = colorScale(); if( aColorScale.IsNull() ) - return aColorScale; + return; - Standard_Real anXPos = 0.05; //TODO - Standard_Real anYPos = 0.1; //TODO - Standard_Real aWidth = 0.2; //TODO - Standard_Real aHeight = 0.5; //TODO - Standard_Integer aTextHeight = 14; //TODO - Standard_Integer aNbIntervals = 30; //TODO + Standard_Real anXPos = 0.05; + Standard_Real anYPos = 0.1; + Standard_Real aWidth = 0.2; + Standard_Real aHeight = 0.5; + Standard_Integer aTextHeight = 14; + Standard_Integer aNbIntervals = 30; aColorScale->SetXPosition( anXPos ); aColorScale->SetYPosition( anYPos ); @@ -241,5 +316,63 @@ Handle_Aspect_ColorScale TestViewer::showColorScale( bool isShow ) if( aView->ColorScaleIsDisplayed() ) aView->ColorScaleErase(); } - return aColorScale; +} + +void TestViewer::select( int theViewX, int theViewY ) +{ + Handle(V3d_View) aView = myViewWindow->getViewPort()->getView(); + context()->MoveTo( theViewX, theViewY, aView ); + context()->Select(); +} + +QString GetLine( QFile& theFile, bool isUtf8 ) +{ + QByteArray aLineData = theFile.readLine(); + QString aLine; + if( isUtf8 ) + aLine = QString::fromUtf8( aLineData ); + else + aLine = aLineData; + return aLine; +} + +bool TestViewer::areScriptsEqual( const QString& theBaseName, + bool isExpectedUtf8, + bool isActualUtf8, + int theLinesToOmit, + QString& theMsg ) +{ + QString anExpectedRefFilePath = qgetenv( "HYDRO_REFERENCE_DATA" ); + anExpectedRefFilePath += "/" + theBaseName; + + QString anActualFilePath = QDir::tempPath() + "/" + theBaseName; + + QFile anExpected( anExpectedRefFilePath ); + QFile anActual( anActualFilePath ); + if( !anExpected.open( QFile::ReadOnly | QFile::Text ) || + !anActual.open ( QFile::ReadOnly | QFile::Text ) ) + return false; + + for( int i=0; i