Merge branch 'V9_10_BR'

[plugins/hexoticplugin.git] / src / GUI / HexoticPluginGUI_HypothesisCreator.cxx

diff --git a/src/GUI/HexoticPluginGUI_HypothesisCreator.cxx b/src/GUI/HexoticPluginGUI_HypothesisCreator.cxx
index 2df61328da0b809f73f6f8eab160bd1279d542e7..08013982089d0c10ab34a3f554cdb22fb66b6177 100644 (file)
--- a/src/GUI/HexoticPluginGUI_HypothesisCreator.cxx
+++ b/src/GUI/HexoticPluginGUI_HypothesisCreator.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2019  CEA/DEN, EDF R&D
+// Copyright (C) 2007-2022  CEA/DEN, 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
@@ -348,7 +348,7 @@ void HexoticPluginGUI_HypothesisCreator::insertLocalSizeInWidget( std::string en
                                                                   double size, 
                                                                   int row ) const
 {
-  MESSAGE("HexoticPluginGUI_HypothesisCreator:insertLocalSizeInWidget")
+  MESSAGE("HexoticPluginGUI_HypothesisCreator:insertLocalSizeInWidget");
   int columnCount = mySmpWidget->tableWidget->columnCount();
   
   // Add a row at the end of the table
@@ -384,7 +384,7 @@ void HexoticPluginGUI_HypothesisCreator::onRemoveLocalSize()
 {
   // Remove the selected rows in the table
   QList<QTableWidgetSelectionRange> ranges = mySmpWidget->tableWidget->selectedRanges();
-  if ( ranges.isEmpty() ) // If none is selected remove the last one
+  if ( ranges.isEmpty() && mySmpWidget->tableWidget->rowCount() > 0) // If none is selected remove the last one
   {
     int lastRow = mySmpWidget->tableWidget->rowCount() - 1;
     std::string entry = mySmpWidget->tableWidget->item( lastRow, ENTRY_COL )->text().toStdString();
@@ -400,7 +400,7 @@ void HexoticPluginGUI_HypothesisCreator::onRemoveLocalSize()
       {
         std::string entry = mySmpWidget->tableWidget->item( row, ENTRY_COL )->text().toStdString();
         mySizeMapsToRemove.push_back(entry);
-        MESSAGE("ADDING entry : "<<entry<<"to the Size Maps to remove")
+        MESSAGE("ADDING entry : "<<entry<<"to the Size Maps to remove");
       }
       mySmpWidget->tableWidget->model()->removeRows(it->topRow(), it->rowCount());
     }
@@ -481,7 +481,7 @@ void HexoticPluginGUI_HypothesisCreator::retrieveParams() const
     GEOM::GEOM_Object_var anObject = entryToObject( entry );
     std::string shapeName = anObject->GetName();
 
-    MESSAGE(" Insert local size, entry : "<<entry<<", size : "<<size<<", at row : "<<row) 
+    MESSAGE(" Insert local size, entry : "<<entry<<", size : "<<size<<", at row : "<<row);
     insertLocalSizeInWidget( entry, shapeName, size , row );
   }
 
@@ -607,7 +607,7 @@ bool HexoticPluginGUI_HypothesisCreator::readParamsFromHypo( HexoticHypothesisDa
     std::string entry = CORBA::string_dup(aSizeMap.entry.in());
     double size = aSizeMap.size;
     h_data.mySizeMaps[ entry ] = size;
-    MESSAGE("READING Size map : entry "<<entry<<" size : "<<size)
+    MESSAGE("READING Size map : entry "<<entry<<" size : "<<size);
   }
   
   // Viscous layers
@@ -652,7 +652,7 @@ bool HexoticPluginGUI_HypothesisCreator::storeParamsToHypo( const HexoticHypothe
     for ( it =  h_data.mySizeMaps.begin(); it !=  h_data.mySizeMaps.end(); it++ )
     {
       h->SetSizeMapEntry( it->first.c_str(), it->second );
-      MESSAGE("STORING Size map : entry "<<it->first.c_str()<<" size : "<<it->second)
+      MESSAGE("STORING Size map : entry "<<it->first.c_str()<<" size : "<<it->second);
     }
     std::vector< std::string >::const_iterator entry_it;
     for ( entry_it = mySizeMapsToRemove.begin(); entry_it!= mySizeMapsToRemove.end(); entry_it++ )
@@ -740,7 +740,7 @@ bool HexoticPluginGUI_HypothesisCreator::readSizeMapsFromWidgets( HexoticHypothe
     
     // Set the size maps
     h_data.mySizeMaps[ entry ] = size;
-    MESSAGE("READING Size map from WIDGET: entry "<<entry<<" size : "<<size)
+    MESSAGE("READING Size map from WIDGET: entry "<<entry<<" size : "<<size);
   }
   return true;
 }
@@ -748,7 +748,7 @@ bool HexoticPluginGUI_HypothesisCreator::readSizeMapsFromWidgets( HexoticHypothe
 GEOM::GEOM_Object_var HexoticPluginGUI_HypothesisCreator::entryToObject( std::string entry) const
 {
   GEOM::GEOM_Object_var aGeomObj;
-   SALOMEDS::SObject_var aSObj = SMESH_Gen_i::getStudyServant()->FindObjectID( entry.c_str() );
+   SALOMEDS::SObject_var aSObj = SMESH_Gen_i::GetSMESHGen()->getStudyServant()->FindObjectID( entry.c_str() );
   if (!aSObj->_is_nil()) {
     CORBA::Object_var obj = aSObj->GetObject();
     aGeomObj = GEOM::GEOM_Object::_narrow(obj);