-// Copyright (C) 2014-2017 CEA/DEN, EDF R&D
+// Copyright (C) 2014-2023 CEA, EDF
//
// 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 <Model_ResultField.h>
#include <ModelAPI_Feature.h>
#include <ModelAPI_AttributeIntArray.h>
#include <ModelAPI_AttributeSelectionList.h>
+#include <ModelAPI_Tools.h>
#include <GeomAlgoAPI_CompoundBuilder.h>
+#include <Locale_Convert.h>
+
#include <Config_PropManager.h>
Model_ResultField::Model_ResultField(std::shared_ptr<ModelAPI_Data> theOwnerData)
Model_ResultField::~Model_ResultField()
{
while(mySteps.size() > 0) {
- delete mySteps.back();
+ //delete mySteps.back();
mySteps.pop_back();
}
}
+// LCOV_EXCL_START
void Model_ResultField::colorConfigInfo(std::string& theSection, std::string& theName,
std::string& theDefault)
{
theName = "result_field_color";
theDefault = DEFAULT_COLOR();
}
+// LCOV_EXCL_STOP
std::shared_ptr<GeomAPI_Shape> Model_ResultField::shape()
{
for(int a = aList->size() - 1; a >= 0; a--) {
std::shared_ptr<GeomAPI_Shape> aSelection = aList->value(a)->value();
if (aSelection && !aSelection->isNull()) {
- aSubs.push_back(aSelection);
+ aSubs.push_front(aSelection);
}
}
}
{
// Update Array of steps
int aNbSteps = stepsSize();
- if (mySteps.size() != aNbSteps) {
- while(mySteps.size() > aNbSteps) {
- delete mySteps.back();
+ if ((int)mySteps.size() != aNbSteps) {
+ while((int)mySteps.size() > aNbSteps) {
+ //delete mySteps.back();
mySteps.pop_back();
}
- while(mySteps.size() < aNbSteps) {
- mySteps.push_back(new Model_ResultField::Model_FieldStep(this, mySteps.size()));
+ while((int)mySteps.size() < aNbSteps) {
+ mySteps.push_back(FieldStepPtr(new Model_ResultField::Model_FieldStep(this,
+ (int)mySteps.size())));
}
}
}
return "";
}
-
-ModelAPI_ResultField::ModelAPI_FieldStep* Model_ResultField::step(int theId) const
+// used by GUI only
+// LCOV_EXCL_START
+std::shared_ptr<ModelAPI_ResultField::ModelAPI_FieldStep> Model_ResultField::step(int theId) const
{
- if (theId < mySteps.size()) {
+ if (theId < (int)mySteps.size()) {
return mySteps[theId];
}
return NULL;
}
+
+std::wstring Model_ResultField::Model_FieldStep::name() {
+ std::wostringstream aStream;
+ aStream<<myParent->data()->name()<<std::endl;
+ aStream<<"Step "<<(myId + 1)<<" "<< Locale::Convert::toWString(myParent->textLine(myId));
+ return aStream.str();
+}
+// LCOV_EXCL_STOP