]> SALOME platform Git repositories - plugins/blsurfplugin.git/commitdiff
Salome HOME
Remove empty directory BR_EDF_PAL_1456
authorgdd <gdd>
Fri, 18 Feb 2011 09:21:21 +0000 (09:21 +0000)
committergdd <gdd>
Fri, 18 Feb 2011 09:21:21 +0000 (09:21 +0000)
src/BLSURFPlugin/BLSURFPlugin_Hypothesis_i.cxx
src/PluginUtils/EMPTY [deleted file]

index 32a96d79a4ab91d192fb6078eec0115834f31eac..2488854a34fa4d7967b89a37f58b8d20b791fd00 100644 (file)
@@ -496,12 +496,12 @@ void BLSURFPlugin_Hypothesis_i::SetAttractorEntry(const char* entry, const char*
   MESSAGE("ENGINE : SETATTRACTOR START ENTRY : " << entry);
   bool valueChanged = false;
   try {
-    valueChanged = (this->GetImpl()->GetAttractorEntry(entry) != attractor);
-    if (valueChanged) {
-      boost::regex re("^ATTRACTOR\\((?:(-?0(\\.\\d*)*|-?[1-9]+\\d*(\\.\\d*)*|-?\\.(\\d)+);){5}(True|False)\\)$");
+    valueChanged = ( this->GetImpl()->GetAttractorEntry(entry) != attractor );
+    if ( valueChanged ) {
+      //boost::regex re("^ATTRACTOR\\((?:(-?0(\\.\\d*)*|-?[1-9]+\\d*(\\.\\d*)*|-?\\.(\\d)+);){5}(True|False)\\)$");
+      boost::regex re("^ATTRACTOR\\((?:(-?0(\\.\\d*)*|-?[1-9]+\\d*(\\.\\d*)*|-?\\.(\\d)+);){5}(True|False)(?:;(-?0(\\.\\d*)*|-?[1-9]+\\d*(\\.\\d*)*|-?\\.(\\d)+))?\\)$");
       if (!boost::regex_match(string(attractor), re))
-        throw std::invalid_argument(
-            "Error: an attractor is defined with the following pattern: ATTRACTOR(xa;ya;za;a;b;True|False)");
+        throw std::invalid_argument("Error: an attractor is defined with the following pattern: ATTRACTOR(xa;ya;za;a;b;True|False;d(opt.))");
       this->GetImpl()->SetAttractorEntry(entry, attractor);
     }
   } catch (const std::invalid_argument& ex) {
diff --git a/src/PluginUtils/EMPTY b/src/PluginUtils/EMPTY
deleted file mode 100644 (file)
index e69de29..0000000