Issue #2319: AttributeError: 'NoneType' object has no attribute 'isVertex' in model...

[modules/shaper.git] / src / ModuleBase / ModuleBase_OperationFeature.cpp

diff --git a/src/ModuleBase/ModuleBase_OperationFeature.cpp b/src/ModuleBase/ModuleBase_OperationFeature.cpp
index 450e52399e20a9af5b0c8a22471538df6adeb997..3b3cfc82db32ffba4b130efe30a9109ccf1acf43 100755 (executable)
--- a/src/ModuleBase/ModuleBase_OperationFeature.cpp
+++ b/src/ModuleBase/ModuleBase_OperationFeature.cpp
@@ -1,11 +1,22 @@
-// Copyright (C) 2014-20xx CEA/DEN, EDF R&D
-
-/*
- * ModuleBase_OperationFeature.cpp
- *
- *  Created on: Apr 2, 2014
- *      Author: sbh
- */
+// Copyright (C) 2014-2017  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
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+//
+// See http://www.salome-platform.org/ or
+// email : webmaster.salome@opencascade.com<mailto:webmaster.salome@opencascade.com>
+//
 
 #include "ModuleBase_OperationFeature.h"
 
@@ -102,7 +113,7 @@ bool ModuleBase_OperationFeature::isValid() const
     return true;
 
   std::string anError = ModelAPI_Tools::getFeatureError(myFeature);
-  ModuleBase_Tools::translate(myFeature->getKind(), anError);
+  //ModuleBase_Tools::translate(myFeature->getKind(), anError);
   return anError.empty();
 }
 
@@ -206,16 +217,18 @@ bool ModuleBase_OperationFeature::hasObject(ObjectPtr theObj) const
     }
 #ifdef DEBUG_DO_NOT_ACTIVATE_SUB_FEATURE
     if (aFeature->isMacro()) {
-      // macro feature may refers to sub-features, which also should be deactivated when the operation
+      // macro feature may refers to sub-features,
+      // which also should be deactivated when the operation
       // is active, e.g. rectangle'lines.
       FeaturePtr anObjectFeature = ModelAPI_Feature::feature(theObj);
       std::list<AttributePtr> anAttributes = aFeature->data()->attributes(
                                               ModelAPI_AttributeRefList::typeId());
-      std::list<AttributePtr>::const_iterator anIt = anAttributes.begin(), aLast = anAttributes.end();
+      std::list<AttributePtr>::const_iterator
+        anIt = anAttributes.begin(), aLast = anAttributes.end();
       bool aFoundObject = false;
       for (; anIt != aLast && !aFoundObject; anIt++) {
         std::shared_ptr<ModelAPI_AttributeRefList> aCurSelList =
-                                         std::dynamic_pointer_cast<ModelAPI_AttributeRefList>(*anIt);
+                               std::dynamic_pointer_cast<ModelAPI_AttributeRefList>(*anIt);
         for (int i = 0, aNb = aCurSelList->size(); i < aNb && !aFoundObject; i++) {
           ObjectPtr anObject = aCurSelList->object(i);
           FeaturePtr aFeature = std::dynamic_pointer_cast<ModelAPI_Feature>(anObject);
@@ -448,7 +461,8 @@ FeaturePtr ModuleBase_OperationFeature::previousCurrentFeature()
   return myPreviousCurrentFeature;
 }
 
-void ModuleBase_OperationFeature::initSelection(const QList<ModuleBase_ViewerPrsPtr>& thePreSelected)
+void ModuleBase_OperationFeature::initSelection(
+  const QList<ModuleBase_ViewerPrsPtr>& thePreSelected)
 {
   QObjectPtrList aCurrentFeatureResults;
 
@@ -461,7 +475,7 @@ void ModuleBase_OperationFeature::initSelection(const QList<ModuleBase_ViewerPrs
     for (aIt = aResults.begin(); aIt != aResults.end(); ++aIt)
       aCurrentFeatureResults.append(*aIt);
   }
-  
+
   if (aCurrentFeatureResults.empty()) /// filtering of selection is not necessary
     setPreselection(thePreSelected);
   else { // create preselection list without results of current feature
@@ -485,7 +499,7 @@ void ModuleBase_OperationFeature::clearPreselection()
   myPreSelection.clear();
 }
 
-void ModuleBase_OperationFeature::setPropertyPanel(ModuleBase_IPropertyPanel* theProp) 
+void ModuleBase_OperationFeature::setPropertyPanel(ModuleBase_IPropertyPanel* theProp)
 {
   ModuleBase_Operation::setPropertyPanel(theProp);
 
@@ -502,7 +516,7 @@ void ModuleBase_OperationFeature::setPropertyPanel(ModuleBase_IPropertyPanel* th
   }
 
   // Do not activate widgets by default if the current operation is editing operation
-  // Because we don't know which widget is going to be edited. 
+  // Because we don't know which widget is going to be edited.
   if (!isEditOperation()) {
     // 4. activate the first obligatory widget
     theProp->activateNextWidget(NULL);