Bug #168: filter for invalid polyline.

[modules/hydro.git] / src / HYDROData / HYDROData_Entity.cxx

diff --git a/src/HYDROData/HYDROData_Entity.cxx b/src/HYDROData/HYDROData_Entity.cxx
index af16992f00e20e3650b3aad5bf2602def70de7b9..f3f37eeb9f0fab5e5dde63df7420ea9eddaf7537 100644 (file)
--- a/src/HYDROData/HYDROData_Entity.cxx
+++ b/src/HYDROData/HYDROData_Entity.cxx
@@ -499,38 +499,44 @@ void HYDROData_Entity::setPythonReferenceObject( MapOfTreatedObjects&
                                                  const Handle(HYDROData_Entity)& theRefObject,
                                                  const QString&                  theMethod ) const
 {
-  if ( theRefObject.IsNull() )
+  if ( !checkObjectPythonDefinition( theTreatedObjects, theScript, theRefObject ) )
     return;
 
+  QString aRefObjName = theRefObject->GetObjPyName();
+
+  QString anObjName = GetObjPyName();
+  theScript << QString( "%1.%2( %3 );" )
+               .arg( anObjName ).arg( theMethod ).arg( aRefObjName );
+}
+
+bool HYDROData_Entity::checkObjectPythonDefinition( MapOfTreatedObjects&            theTreatedObjects,
+                                                    QStringList&                    theScript,
+                                                    const Handle(HYDROData_Entity)& theRefObject ) const
+{
+  if ( theRefObject.IsNull() )
+    return false;
+
   QString aRefObjName = theRefObject->GetObjPyName();
   if ( aRefObjName.isEmpty() )
-    return;
+    return false;
 
-  bool anIsToSetObject = true;
+  if ( theTreatedObjects.contains( aRefObjName ) )
+    return true;
 
   // The definition of reference object must be dumped before this
-  if ( !theTreatedObjects.contains( aRefObjName ) )
-  {
-    // Write definition of reference polyline
-    QStringList aRefObjDump = theRefObject->DumpToPython( theTreatedObjects );
-    if ( ( anIsToSetObject = !aRefObjDump.isEmpty() ) )
-    {
-      QStringList aTmpList = theScript;
-      theScript = aRefObjDump;
+  QStringList aRefObjDump = theRefObject->DumpToPython( theTreatedObjects );
+  if ( aRefObjDump.isEmpty() )
+    return false;
 
-      theScript << QString( "" );
-      theScript << aTmpList;
+  QStringList aTmpList = theScript;
+  theScript = aRefObjDump;
 
-      theTreatedObjects.insert( aRefObjName, theRefObject );
-    }
-  }
+  theScript << QString( "" );
+  theScript << aTmpList;
 
-  if ( anIsToSetObject )
-  {
-    QString anObjName = GetObjPyName();
-    theScript << QString( "%1.%2( %3 );" )
-                 .arg( anObjName ).arg( theMethod ).arg( aRefObjName );
-  }
+  theTreatedObjects.insert( aRefObjName, theRefObject );
+
+  return true;
 }
 
 void HYDROData_Entity::setPythonObjectColor( QStringList&         theScript,