-// Copyright (C) 2014-20xx CEA/DEN, EDF R&D
-
-// File: XGUI_CustomPrs.cpp
-// Created: 10 Mar 2015
-// Author: Natalia ERMOLAEVA
+// 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 <XGUI_CustomPrs.h>
#include <XGUI_Workshop.h>
double getDeflection(const ResultPtr& theResult)
{
double aDeflection = -1;
- // get color from the attribute of the result
+ // get deflection from the attribute of the result
if (theResult.get() != NULL &&
theResult->data()->attribute(ModelAPI_Result::DEFLECTION_ID()).get() != NULL) {
AttributeDoublePtr aDoubleAttr = theResult->data()->real(ModelAPI_Result::DEFLECTION_ID());
{
theColor.clear();
// get color from the attribute of the result
- if (theResult.get() != NULL && theResult->data()->attribute(ModelAPI_Result::COLOR_ID()).get() != NULL) {
+ if (theResult.get() != NULL &&
+ theResult->data()->attribute(ModelAPI_Result::COLOR_ID()).get() != NULL) {
AttributeIntArrayPtr aColorAttr = theResult->data()->intArray(ModelAPI_Result::COLOR_ID());
if (aColorAttr.get() && aColorAttr->size()) {
theColor.push_back(aColorAttr->value(0));
std::string aSection, aName, aDefault;
theObject->colorConfigInfo(aSection, aName, aDefault);
if (!aSection.empty() && !aName.empty()) {
- theColor = Config_PropManager::color(aSection, aName, aDefault);
+ theColor = Config_PropManager::color(aSection, aName);
}
}
if (!isEmptyColorValid && theColor.empty()) {
// all AIS objects, where the color is not set, are in black.
// The color should be defined in XML or set in the attribute
- theColor = Config_PropManager::color("Visualization", "object_default_color", "#000000");
- Events_InfoMessage("XGUI_CustomPrs",
+ theColor = Config_PropManager::color("Visualization", "object_default_color");
+ Events_InfoMessage("XGUI_CustomPrs",
"A default color is not defined in the preferences for this kind of result").send();
}
}
}
}
if (isConstruction)
- aDeflection = Config_PropManager::real("Visualization", "construction_deflection",
- ModelAPI_ResultConstruction::DEFAULT_DEFLECTION());
+ aDeflection = Config_PropManager::real("Visualization", "construction_deflection");
else
- aDeflection = Config_PropManager::real("Visualization", "body_deflection",
- ModelAPI_ResultBody::DEFAULT_DEFLECTION());
+ aDeflection = Config_PropManager::real("Visualization", "body_deflection");
}
return aDeflection;
}
+double getTransparency(const ResultPtr& theResult)
+{
+ double aDeflection = -1;
+ // get transparency from the attribute of the result
+ if (theResult.get() != NULL &&
+ theResult->data()->attribute(ModelAPI_Result::TRANSPARENCY_ID()).get() != NULL) {
+ AttributeDoublePtr aDoubleAttr = theResult->data()->real(ModelAPI_Result::TRANSPARENCY_ID());
+ if (aDoubleAttr.get() && aDoubleAttr->isInitialized()) {
+ double aValue = aDoubleAttr->value();
+ if (aValue > 0) /// zero value should not be used as a transparency(previous studies)
+ aDeflection = aDoubleAttr->value();
+ }
+ }
+ return aDeflection;
+}
+
+double getDefaultTransparency(const ResultPtr& theResult)
+{
+ return 0;
+}
+
XGUI_CustomPrs::XGUI_CustomPrs(XGUI_Workshop* theWorkshop)
: myWorkshop(theWorkshop)
{
return aDeflection;
}
+double XGUI_CustomPrs::getResultTransparency(const ResultPtr& theResult)
+{
+ double aTransparency = getTransparency(theResult);
+ if (aTransparency < 0)
+ aTransparency = getDefaultTransparency(theResult);
+ return aTransparency;
+}
+
bool XGUI_CustomPrs::customisePresentation(ResultPtr theResult, AISObjectPtr thePrs,
std::shared_ptr<GeomAPI_ICustomPrs> theCustomPrs)
{
SessionPtr aMgr = ModelAPI_Session::get();
if (aMgr->activeDocument() != theResult->document()) {
QColor aQColor(aColor[0], aColor[1], aColor[2]);
- QColor aNewColor = QColor::fromHsvF(aQColor.hueF(), aQColor.saturationF()/3., aQColor.valueF());
+ QColor aNewColor =
+ QColor::fromHsvF(aQColor.hueF(), aQColor.saturationF()/3., aQColor.valueF());
aColor[0] = aNewColor.red();
aColor[1] = aNewColor.green();
aColor[2] = aNewColor.blue();
aCustomized = !aColor.empty() && thePrs->setColor(aColor[0], aColor[1], aColor[2]);
aCustomized = thePrs->setDeflection(getResultDeflection(theResult)) | aCustomized;
+
+ aCustomized = thePrs->setTransparency(getResultTransparency(theResult)) | aCustomized;
}
ModuleBase_IModule* aModule = myWorkshop->module();
aCustomized = aModule->customisePresentation(theResult, thePrs, theCustomPrs) || aCustomized;
