Fix compilation error

diff --git a/src/BLSURFPlugin/BLSURFPlugin_Hypothesis.cxx b/src/BLSURFPlugin/BLSURFPlugin_Hypothesis.cxx
index 50ff614c433c04ab139d5f388e1fd68540bac184..cec87cac89653578dcc362c52cf1ca3461422ce3 100644 (file)
--- a/src/BLSURFPlugin/BLSURFPlugin_Hypothesis.cxx
+++ b/src/BLSURFPlugin/BLSURFPlugin_Hypothesis.cxx
@@ -110,37 +110,30 @@ BLSURFPlugin_Hypothesis::BLSURFPlugin_Hypothesis(int hypId, SMESH_Gen * gen, boo
 
   // Advanced options with their defaults according to MG User Manual
 
-  const char* boolOptionNames[] = {         "enforce_cad_edge_sizes",                   // default = 0
-                                            // "correct_surface_intersections",            // default = 1
-                                            // "create_tag_on_collision",                  // default = 1
-                                            "jacobian_rectification_respect_geometry",  // default = 1
-                                            "rectify_jacobian",                         // default = 1
-                                            "respect_geometry",                         // default = 1
-                                            // "optimise_tiny_edges",                      // default = 0
-                                            // "remove_duplicate_cad_faces",               // default = 1
-                                            "tiny_edge_avoid_surface_intersections",    // default = 1
-                                            "debug",                                    // default = 0
-                                            "allow_patch_independent",                   // false
-
-                                            //"use_deprecated_patch_mesher",              // default 0
-                                            // "tiny_edge_respect_geometry",               // default = 0
-                                            "" // mark of end
-      };
+  const char* boolOptionNames[] = { "enforce_cad_edge_sizes",                   // default = 0
+                                    "jacobian_rectification_respect_geometry",  // default = 1
+                                    "rectify_jacobian",                         // default = 1
+                                    "respect_geometry",                         // default = 1
+                                    "tiny_edge_avoid_surface_intersections",    // default = 1
+                                    "debug",                                    // default = 0
+                                    "allow_patch_independent",                   // false
+                                    "" // mark of end
+  };
 
   const char* intOptionNames[] = {          "max_number_of_points_per_patch",           // default = 100000
                                             "max_number_of_threads",                    // default = 4
                                             "" // mark of end
-      };
+  };
   const char* doubleOptionNames[] = {       // "surface_intersections_processing_max_cost",// default = 15
                                             // "periodic_tolerance",                       // default = diag/100
                                             // "volume_gradation",
                                             // "tiny_edge_optimisation_length",            // default = diag * 1e-6
-                                            "" // mark of end
-      };
+    "" // mark of end
+  };
   const char* charOptionNames[] = {         // "required_entities",                        // default = "respect"
                                             // "tags",                                     // default = "respect"
-                                            "" // mark of end
-      };
+    "" // mark of end
+  };
 
   // PreCAD advanced options
   const char* preCADboolOptionNames[] = {   "closed_geometry",                          // default = 0

diff --git a/src/GUI/BLSURFPluginGUI_HypothesisCreator.cxx b/src/GUI/BLSURFPluginGUI_HypothesisCreator.cxx
index 79a0f23cabf88cbffaccfc6060c160fa8ea97a40..43c7a1eacec1c70efce90d42fb3eb0457456b364 100644 (file)
--- a/src/GUI/BLSURFPluginGUI_HypothesisCreator.cxx
+++ b/src/GUI/BLSURFPluginGUI_HypothesisCreator.cxx
@@ -2084,10 +2084,10 @@ bool BLSURFPluginGUI_HypothesisCreator::readParamsFromHypo( BlsurfHypothesisData
   //h_data.myPreCADMergeEdges       = h->GetPreCADMergeEdges();
   // h_data.myPreCADProcess3DTopology  = h->GetPreCADProcess3DTopology();
   // h_data.myPreCADDiscardInput     = h->GetPreCADDiscardInput();
-  h_data.myUseSurfaceProximity      = h->GetUseSurfaceProximity     ();
+  h_data.myUseSurfaceProximity      = h->GetSurfaceProximity        ();
   h_data.myNbSurfaceProximityLayers = h->GetNbSurfaceProximityLayers();
   h_data.mySurfaceProximityRatio    = h->GetSurfaceProximityRatio   ();
-  h_data.myUseVolumeProximity       = h->GetUseVolumeProximity      ();
+  h_data.myUseVolumeProximity       = h->GetVolumeProximity         ();
   h_data.myNbVolumeProximityLayers  = h->GetNbVolumeProximityLayers ();
   h_data.myVolumeProximityRatio     = h->GetVolumeProximityRatio    ();
 
@@ -2323,10 +2323,10 @@ bool BLSURFPluginGUI_HypothesisCreator::storeParamsToHypo( const BlsurfHypothesi
     if ( h->GetVolumeGradation() !=  h_data.myVolumeGradation )
       h->SetVolumeGradation( h_data.myVolumeGradation <= 0 ? -1 : h_data.myVolumeGradation );
 
-    h->SetUseSurfaceProximity     ( h_data.myUseSurfaceProximity      );
+    h->SetSurfaceProximity        ( h_data.myUseSurfaceProximity      );
     h->SetNbSurfaceProximityLayers( h_data.myNbSurfaceProximityLayers );
     h->SetSurfaceProximityRatio   ( h_data.mySurfaceProximityRatio    );
-    h->SetUseVolumeProximity      ( h_data.myUseVolumeProximity       );
+    h->SetVolumeProximity         ( h_data.myUseVolumeProximity       );
     h->SetNbVolumeProximityLayers ( h_data.myNbVolumeProximityLayers  );
     h->SetVolumeProximityRatio    ( h_data.myVolumeProximityRatio     );