Salome HOME
projects
/
modules
/
hydro.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'BR_PY3' of https://git.forge.pleiade.edf.fr/git/modules-salome.hydro...
[modules/hydro.git]
/
src
/
HYDRO_tests
/
test_HYDROGUI_BathymetryPrs.cxx
diff --git
a/src/HYDRO_tests/test_HYDROGUI_BathymetryPrs.cxx
b/src/HYDRO_tests/test_HYDROGUI_BathymetryPrs.cxx
index 9523ab4c17adaa1ebaca62f4c9d50780fffdf5e2..a250928903f61e80f630b12eadf0f23ddde6140b 100644
(file)
--- a/
src/HYDRO_tests/test_HYDROGUI_BathymetryPrs.cxx
+++ b/
src/HYDRO_tests/test_HYDROGUI_BathymetryPrs.cxx
@@
-21,6
+21,7
@@
#include <TestViewer.h>
#include <AIS_ColorScale.hxx>
#include <OCCViewer_ViewWindow.h>
#include <TestViewer.h>
#include <AIS_ColorScale.hxx>
#include <OCCViewer_ViewWindow.h>
+#include <OCCViewer_ViewFrame.h>
#include <OCCViewer_ViewPort3d.h>
#include <QTest>
#include <OCCViewer_ViewPort3d.h>
#include <QTest>
@@
-42,7
+43,7
@@
void test_HYDROGUI_BathymetryPrs::createBathPrs()
{
myBathPrs = new HYDROGUI_ShapeBathymetry( 0, TestViewer::context(), myBath );
myBathPrs->Build();
{
myBathPrs = new HYDROGUI_ShapeBathymetry( 0, TestViewer::context(), myBath );
myBathPrs->Build();
- myBathPrs->getAISObject
()
->SetAutoHilight( Standard_False );
+ myBathPrs->getAISObject
s()[0]
->SetAutoHilight( Standard_False );
double min, max;
myBathPrs->GetRange( min, max );
double min, max;
myBathPrs->GetRange( min, max );
@@
-59,11
+60,10
@@
void test_HYDROGUI_BathymetryPrs::updateColors()
myBathPrs->UpdateWithColorScale( TestViewer::colorScale() );
}
myBathPrs->UpdateWithColorScale( TestViewer::colorScale() );
}
-
void test_HYDROGUI_BathymetryPrs::test_presentation()
{
void test_HYDROGUI_BathymetryPrs::test_presentation()
{
- TestViewer::eraseAll( true );
- Handle(HYDROData_Document) aDoc = HYDROData_Document::Document(
1
);
+ TestViewer::eraseAll( true
, true
);
+ Handle(HYDROData_Document) aDoc = HYDROData_Document::Document();
importTestBath( aDoc );
TestViewer::showColorScale( false );
importTestBath( aDoc );
TestViewer::showColorScale( false );
@@
-71,7
+71,7
@@
void test_HYDROGUI_BathymetryPrs::test_presentation()
createBathPrs();
updateColors();
createBathPrs();
updateColors();
- Handle(AIS_InteractiveObject) bprs = myBathPrs->getAISObject
()
;
+ Handle(AIS_InteractiveObject) bprs = myBathPrs->getAISObject
s()[0]
;
CPPUNIT_ASSERT( !bprs.IsNull() );
TestViewer::show( bprs, 0, 0, true, "bathy_prs" );
CPPUNIT_ASSERT( !bprs.IsNull() );
TestViewer::show( bprs, 0, 0, true, "bathy_prs" );
@@
-79,7
+79,7
@@
void test_HYDROGUI_BathymetryPrs::test_presentation()
//QTest::qWait( 50000 );
aDoc->Close();
//QTest::qWait( 50000 );
aDoc->Close();
- TestViewer::eraseAll( true );
+ TestViewer::eraseAll( true
, true
);
}
void select( int x1, int y1, int x2, int y2 )
}
void select( int x1, int y1, int x2, int y2 )
@@
-94,8
+94,8
@@
void select( int x1, int y1, int x2, int y2 )
void test_HYDROGUI_BathymetryPrs::test_selection()
{
void test_HYDROGUI_BathymetryPrs::test_selection()
{
- TestViewer::eraseAll( true );
- Handle(HYDROData_Document) aDoc = HYDROData_Document::Document(
1
);
+ TestViewer::eraseAll( true
, true
);
+ Handle(HYDROData_Document) aDoc = HYDROData_Document::Document();
importTestBath( aDoc );
TestViewer::showColorScale( false );
importTestBath( aDoc );
TestViewer::showColorScale( false );
@@
-103,7
+103,7
@@
void test_HYDROGUI_BathymetryPrs::test_selection()
createBathPrs();
updateColors();
createBathPrs();
updateColors();
- Handle(AIS_InteractiveObject) bprs = myBathPrs->getAISObject
()
;
+ Handle(AIS_InteractiveObject) bprs = myBathPrs->getAISObject
s()[0]
;
CPPUNIT_ASSERT( !bprs.IsNull() );
TestViewer::show( bprs, 0, 1, true, "bathy_prs" );
CPPUNIT_ASSERT( !bprs.IsNull() );
TestViewer::show( bprs, 0, 1, true, "bathy_prs" );
@@
-120,13
+120,13
@@
void test_HYDROGUI_BathymetryPrs::test_selection()
//QTest::qWait( 50000 );
aDoc->Close();
//QTest::qWait( 50000 );
aDoc->Close();
- TestViewer::eraseAll( true );
+ TestViewer::eraseAll( true
, true
);
}
void test_HYDROGUI_BathymetryPrs::test_rescale_by_selection()
{
}
void test_HYDROGUI_BathymetryPrs::test_rescale_by_selection()
{
- TestViewer::eraseAll( true );
- Handle(HYDROData_Document) aDoc = HYDROData_Document::Document(
1
);
+ TestViewer::eraseAll( true
, true
);
+ Handle(HYDROData_Document) aDoc = HYDROData_Document::Document();
importTestBath( aDoc );
TestViewer::showColorScale( false );
importTestBath( aDoc );
TestViewer::showColorScale( false );
@@
-134,7
+134,7
@@
void test_HYDROGUI_BathymetryPrs::test_rescale_by_selection()
createBathPrs();
updateColors();
createBathPrs();
updateColors();
- Handle(AIS_InteractiveObject) bprs = myBathPrs->getAISObject
()
;
+ Handle(AIS_InteractiveObject) bprs = myBathPrs->getAISObject
s()[0]
;
CPPUNIT_ASSERT( !bprs.IsNull() );
TestViewer::show( bprs, 0, 1, true, "bathy_prs" );
CPPUNIT_ASSERT( !bprs.IsNull() );
TestViewer::show( bprs, 0, 1, true, "bathy_prs" );
@@
-179,13
+179,13
@@
void test_HYDROGUI_BathymetryPrs::test_rescale_by_selection()
//QTest::qWait( 50000 );
aDoc->Close();
//QTest::qWait( 50000 );
aDoc->Close();
- TestViewer::eraseAll( true );
+ TestViewer::eraseAll( true
, true
);
}
void test_HYDROGUI_BathymetryPrs::test_rescale_by_visible()
{
}
void test_HYDROGUI_BathymetryPrs::test_rescale_by_visible()
{
- TestViewer::eraseAll( true );
- Handle(HYDROData_Document) aDoc = HYDROData_Document::Document(
1
);
+ TestViewer::eraseAll( true
, true
);
+ Handle(HYDROData_Document) aDoc = HYDROData_Document::Document();
importTestBath( aDoc );
TestViewer::showColorScale( false );
importTestBath( aDoc );
TestViewer::showColorScale( false );
@@
-193,7
+193,7
@@
void test_HYDROGUI_BathymetryPrs::test_rescale_by_visible()
createBathPrs();
updateColors();
createBathPrs();
updateColors();
- Handle(AIS_InteractiveObject) bprs = myBathPrs->getAISObject
()
;
+ Handle(AIS_InteractiveObject) bprs = myBathPrs->getAISObject
s()[0]
;
CPPUNIT_ASSERT( !bprs.IsNull() );
TestViewer::show( bprs, 0, 1, true, "bathy_prs" );
CPPUNIT_ASSERT( !bprs.IsNull() );
TestViewer::show( bprs, 0, 1, true, "bathy_prs" );
@@
-226,13
+226,13
@@
void test_HYDROGUI_BathymetryPrs::test_rescale_by_visible()
//QTest::qWait( 50000 );
aDoc->Close();
//QTest::qWait( 50000 );
aDoc->Close();
- TestViewer::eraseAll( true );
+ TestViewer::eraseAll( true
, true
);
}
void test_HYDROGUI_BathymetryPrs::test_text_presentation()
{
}
void test_HYDROGUI_BathymetryPrs::test_text_presentation()
{
- TestViewer::eraseAll( true );
- Handle(HYDROData_Document) aDoc = HYDROData_Document::Document(
1
);
+ TestViewer::eraseAll( true
, true
);
+ Handle(HYDROData_Document) aDoc = HYDROData_Document::Document();
importTestBath( aDoc );
TestViewer::showColorScale( false );
importTestBath( aDoc );
TestViewer::showColorScale( false );
@@
-240,7
+240,7
@@
void test_HYDROGUI_BathymetryPrs::test_text_presentation()
createBathPrs();
updateColors();
createBathPrs();
updateColors();
- Handle(AIS_InteractiveObject) bprs = myBathPrs->getAISObject
()
;
+ Handle(AIS_InteractiveObject) bprs = myBathPrs->getAISObject
s()[0]
;
CPPUNIT_ASSERT( !bprs.IsNull() );
TestViewer::show( bprs, 0, 1, true, "bathy_prs" );
CPPUNIT_ASSERT( !bprs.IsNull() );
TestViewer::show( bprs, 0, 1, true, "bathy_prs" );
@@
-277,13
+277,13
@@
void test_HYDROGUI_BathymetryPrs::test_text_presentation()
//QTest::qWait( 50000 );
aDoc->Close();
//QTest::qWait( 50000 );
aDoc->Close();
- TestViewer::eraseAll( true );
+ TestViewer::eraseAll( true
, true
);
}
void test_HYDROGUI_BathymetryPrs::test_rescale_default()
{
}
void test_HYDROGUI_BathymetryPrs::test_rescale_default()
{
- TestViewer::eraseAll( true );
- Handle(HYDROData_Document) aDoc = HYDROData_Document::Document(
1
);
+ TestViewer::eraseAll( true
, true
);
+ Handle(HYDROData_Document) aDoc = HYDROData_Document::Document();
importTestBath( aDoc );
TestViewer::showColorScale( false );
importTestBath( aDoc );
TestViewer::showColorScale( false );
@@
-291,7
+291,7
@@
void test_HYDROGUI_BathymetryPrs::test_rescale_default()
createBathPrs();
updateColors();
createBathPrs();
updateColors();
- Handle(AIS_InteractiveObject) bprs = myBathPrs->getAISObject
()
;
+ Handle(AIS_InteractiveObject) bprs = myBathPrs->getAISObject
s()[0]
;
CPPUNIT_ASSERT( !bprs.IsNull() );
TestViewer::show( bprs, 0, 1, true, "bathy_prs" );
CPPUNIT_ASSERT( !bprs.IsNull() );
TestViewer::show( bprs, 0, 1, true, "bathy_prs" );
@@
-334,13
+334,13
@@
void test_HYDROGUI_BathymetryPrs::test_rescale_default()
//QTest::qWait( 50000 );
aDoc->Close();
//QTest::qWait( 50000 );
aDoc->Close();
- TestViewer::eraseAll( true );
+ TestViewer::eraseAll( true
, true
);
}
void test_HYDROGUI_BathymetryPrs::test_fit_on_selected()
{
}
void test_HYDROGUI_BathymetryPrs::test_fit_on_selected()
{
- TestViewer::eraseAll( true );
- Handle(HYDROData_Document) aDoc = HYDROData_Document::Document(
1
);
+ TestViewer::eraseAll( true
, true
);
+ Handle(HYDROData_Document) aDoc = HYDROData_Document::Document();
importTestBath( aDoc );
TestViewer::showColorScale( false );
importTestBath( aDoc );
TestViewer::showColorScale( false );
@@
-348,7
+348,7
@@
void test_HYDROGUI_BathymetryPrs::test_fit_on_selected()
createBathPrs();
updateColors();
createBathPrs();
updateColors();
- Handle(AIS_InteractiveObject) bprs = myBathPrs->getAISObject
()
;
+ Handle(AIS_InteractiveObject) bprs = myBathPrs->getAISObject
s()[0]
;
CPPUNIT_ASSERT( !bprs.IsNull() );
TestViewer::show( bprs, 0, 1, true, "bathy_prs" );
CPPUNIT_ASSERT( !bprs.IsNull() );
TestViewer::show( bprs, 0, 1, true, "bathy_prs" );
@@
-364,5
+364,5
@@
void test_HYDROGUI_BathymetryPrs::test_fit_on_selected()
//QTest::qWait( 50000 );
aDoc->Close();
//QTest::qWait( 50000 );
aDoc->Close();
- TestViewer::eraseAll( true );
+ TestViewer::eraseAll( true
, true
);
}
}