-// Copyright (C) 2014-2017 CEA/DEN, EDF R&D
+// Copyright (C) 2014-2019 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
//
// 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
+// 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>
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
//
#include "ModelHighAPI_Interface.h"
#include <ModelAPI_Feature.h>
#include <ModelAPI_Session.h>
#include <ModelAPI_Validator.h>
+#include <ModelAPI_Result.h>
#include "ModelHighAPI_Selection.h"
//--------------------------------------------------------------------------------------
feature()->data()->setName(theName);
}
-ModelHighAPI_Selection ModelHighAPI_Interface::result() const
+std::string ModelHighAPI_Interface::name() const
{
- const_cast<ModelHighAPI_Interface*>(this)->execute();
+ return feature()->data()->name();
+}
- return ModelHighAPI_Selection(feature()->firstResult());
+ModelHighAPI_Selection ModelHighAPI_Interface::result() const
+{
+ std::list<ModelHighAPI_Selection> aResults = results();
+ if (aResults.empty())
+ return ModelHighAPI_Selection(std::shared_ptr<ModelAPI_Result>());
+ return aResults.front();
}
std::list<ModelHighAPI_Selection> ModelHighAPI_Interface::results() const
std::list<std::shared_ptr<ModelAPI_Result> > aResults = feature()->results();
for (auto it = aResults.begin(), end = aResults.end(); it != end; ++it) {
- aSelectionList.push_back(ModelHighAPI_Selection(*it));
+ if (!(*it)->isDisabled())
+ aSelectionList.push_back(ModelHighAPI_Selection(*it));
}
return aSelectionList;