merge BR_PORTING_OCCT_7

[modules/hydro.git] / doc / salome / examples / h005_importImageBad.py

diff --git a/doc/salome/examples/h005_importImageBad.py b/doc/salome/examples/h005_importImageBad.py
index e9ece7584f3d327accf2c799cea967938fb9a171..86340d7c4283658fe99e7bcadf8a98a3c83fbda6 100644 (file)
--- a/doc/salome/examples/h005_importImageBad.py
+++ b/doc/salome/examples/h005_importImageBad.py
@@ -10,8 +10,8 @@ salome.salome_init()
 theStudy = salome.myStudy
 
 from HYDROPy import *
-from PyQt4.QtCore import *
-from PyQt4.QtGui import *
+from PyQt5.QtCore import *
+from PyQt5.QtGui import *
 
 hydro_doc = HYDROData_Document.Document( theStudy._get_StudyId() )
 
@@ -20,19 +20,10 @@ hydro_doc.SetLocalCS( 0, 0 )
 garonne_ign_inexistant = hydro_doc.CreateObject( KIND_IMAGE )
 garonne_ign_inexistant.SetName( "garonne_ign_inexistant" )
 
-garonne_ign_inexistant.LoadImage( os.path.join(HYDRO_SAMPLES , "garonne_ign_inexistant.png" ))
+ret = garonne_ign_inexistant.LoadImage( os.path.join(HYDRO_SAMPLES , "garonne_ign_inexistant.png" ))
 
-# TODO : ce chargement doit echouer avec un retour d'erreur à traiter
-raise ValueError('file not found')
-
-garonne_ign_inexistant.SetLocalPoints( QPoint( 40, 817 ),
-                               QPoint( 1325, 85 ) )
-
-garonne_ign_inexistant.SetGlobalPoints( 1,
-                                QPointF( 471562, 6.36775e+06 ),
-                                QPointF( 489400, 6.37702e+06 ) )
-
-garonne_ign_inexistant.Update()
+if ret:
+  raise ValueError('loading problem not detected: return value should be null')
 
 if salome.sg.hasDesktop():
   salome.sg.updateObjBrowser(1)