Merge branch 'BR_LAND_COVER_MAP' into BR_quadtree

[modules/hydro.git] / src / HYDROGUI / HYDROGUI_Operation.cxx

diff --git a/src/HYDROGUI/HYDROGUI_Operation.cxx b/src/HYDROGUI/HYDROGUI_Operation.cxx
index a218483cca731acf4a591b07fdab1f2da1a6eec5..916a5a682337401c496904920d98e86906c23399 100644 (file)
--- a/src/HYDROGUI/HYDROGUI_Operation.cxx
+++ b/src/HYDROGUI/HYDROGUI_Operation.cxx
@@ -1,8 +1,4 @@
-// Copyright (C) 2007-2015  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-// Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
-//
+// 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
@@ -256,7 +252,7 @@ void HYDROGUI_Operation::apply()
     if ( !myIsApplyAndClose && inputPanel() )
       start();
   }
-  else
+  else if( !anErrorMsg.isEmpty() )
   {
     // Abort document opeartion only if requested
     if ( isToAbortOnApply() )
@@ -453,8 +449,12 @@ QString HYDROGUI_Operation::getHelpComponent() const
 
 QString HYDROGUI_Operation::getHelpFile() const
 {
-   QString aFileName = ((myName.isEmpty())? operationName() : myName);
-   return aFileName.replace(QRegExp("\\s"), "_").append(".html");
+  QString aFileName = ((myName.isEmpty())? operationName() : myName);
+  aFileName = aFileName.toLower();
+  aFileName = aFileName.replace(QRegExp("\\s"), "_").append(".html");
+  aFileName.remove( "create_" );
+  aFileName.remove( "edit_" );
+  return aFileName;
 }
 
 QString HYDROGUI_Operation::getHelpContext() const