X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FModel%2FModel_ResultPart.cpp;h=255f5e3802ce81352513e45182dd92b5dad70178;hb=88be48ed1ea478b9d9d6ac2d965092418ef4dae6;hp=2beb5f56213aa4cfca6d278abfa126cf349aa37c;hpb=9f8379064ab359da1eda4c3a258a8e67ee2c7f7a;p=modules%2Fshaper.git diff --git a/src/Model/Model_ResultPart.cpp b/src/Model/Model_ResultPart.cpp index 2beb5f562..255f5e380 100644 --- a/src/Model/Model_ResultPart.cpp +++ b/src/Model/Model_ResultPart.cpp @@ -1,8 +1,22 @@ -// Copyright (C) 2014-20xx CEA/DEN, EDF R&D - -// File: ModelAPI_ResultPart.cpp -// Created: 07 Jul 2014 -// Author: Mikhail PONIKAROV +// 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 +// #include #include @@ -40,6 +54,7 @@ void Model_ResultPart::initAttributes() data()->addAttribute(COLOR_ID(), ModelAPI_AttributeIntArray::typeId()); data()->addAttribute(BASE_REF_ID(), ModelAPI_AttributeReference::typeId()); data()->addAttribute(DEFLECTION_ID(), ModelAPI_AttributeDouble::typeId()); + data()->addAttribute(TRANSPARENCY_ID(), ModelAPI_AttributeDouble::typeId()); if (aDocRef->isInitialized() && // initialized immideately means already exist and will be loaded !Model_Application::getApplication()->hasDocument(aDocRef->docId())) @@ -48,7 +63,7 @@ void Model_ResultPart::initAttributes() std::shared_ptr Model_ResultPart::partDoc() { - if (myTrsf.get() && baseRef().get()) { // the second condition is to to #2035 + if (myTrsf.get() && baseRef().get()) { // the second condition is due to #2035 return baseRef()->partDoc(); } DocumentPtr aRes = data()->document(DOC_REF())->value(); @@ -78,8 +93,8 @@ void Model_ResultPart::activate() } if (!aDocRef->value().get()) { // create (or open) a document if it is not yet created Handle(Model_Application) anApp = Model_Application::getApplication(); - if (anApp->isLoadByDemand(data()->name())) { - anApp->loadDocument(data()->name(), aDocRef->docId()); // if it is just ne part, load may fail + if (anApp->isLoadByDemand(data()->name(), aDocRef->docId())) { + anApp->loadDocument(data()->name(), aDocRef->docId()); // if it is just new part, load fails } else { anApp->createDocument(aDocRef->docId()); } @@ -99,7 +114,7 @@ void Model_ResultPart::activate() std::shared_ptr Model_ResultPart::original() { - if (myTrsf.get() && baseRef().get()) { // the second condition is to to #2035 + if (myTrsf.get() && baseRef().get()) { // the second condition is due to #2035 return baseRef()->original(); } return std::dynamic_pointer_cast(data()->owner());