X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FVISUGUI%2FVisuGUI_ClippingDlg.cxx;h=2c9f7f1bb2f2f628096e2f1f4d177d1bc0c17d25;hb=953451df51750a1d9910c0325f01d5ca7b6e0330;hp=02cdbb9a1fb38514d953a609db85403889d71854;hpb=1e8835498e5c78dfb6b134f1a2b5ed65c1723377;p=modules%2Fvisu.git diff --git a/src/VISUGUI/VisuGUI_ClippingDlg.cxx b/src/VISUGUI/VisuGUI_ClippingDlg.cxx index 02cdbb9a..2c9f7f1b 100644 --- a/src/VISUGUI/VisuGUI_ClippingDlg.cxx +++ b/src/VISUGUI/VisuGUI_ClippingDlg.cxx @@ -1,3 +1,22 @@ +// Copyright (C) 2005 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, +// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS +// +// 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. +// +// 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/ +// #include "VisuGUI_ClippingDlg.h" @@ -9,7 +28,7 @@ #include "VISU_PipeLine.hxx" -#include "SalomeApp_SelectionMgr.h" +#include "LightApp_SelectionMgr.h" #include "SVTK_ViewWindow.h" @@ -44,6 +63,7 @@ #include #include #include +#include // OCCT Includes #include @@ -55,7 +75,7 @@ namespace VISU { { if (theValue.isEmpty()) return theDefault; SUIT_ResourceMgr* aResourceMgr = VISU::GetResourceMgr(); - QString aValue = aResourceMgr->stringValue(theValue); + QString aValue = aResourceMgr->stringValue("VISU",theValue); if (aValue.isEmpty()) return theDefault; return aValue.toFloat(); } @@ -161,18 +181,23 @@ protected: vtkProperty* aProp = vtkProperty::New(); float anRGB[3]; - anRGB[0] = VISU::GetFloat("SMESH:SettingsFillColorRed", 0)/255.; - anRGB[1] = VISU::GetFloat("SMESH:SettingsFillColorGreen", 170)/255.; - anRGB[2] = VISU::GetFloat("SMESH:SettingsFillColorBlue", 255)/255.; + + SUIT_ResourceMgr* aResourceMgr = VISU::GetResourceMgr(); + + QColor aFillColor = aResourceMgr->colorValue("SMESH", "fill_color", QColor(0, 170, 255)); + anRGB[0] = aFillColor.red()/255.; + anRGB[1] = aFillColor.green()/255.; + anRGB[2] = aFillColor.blue()/255.; aProp->SetColor(anRGB[0],anRGB[1],anRGB[2]); aProp->SetOpacity(0.75); myActor->SetProperty(aProp); aProp->Delete(); vtkProperty* aBackProp = vtkProperty::New(); - anRGB[0] = VISU::GetFloat("SMESH:SettingsBackFaceColorRed", 0)/255.; - anRGB[1] = VISU::GetFloat("SMESH:SettingsBackFaceColorGreen", 0)/255.; - anRGB[2] = VISU::GetFloat("SMESH:SettingsBackFaceColorBlue", 255)/255.; + QColor aBackFaceColor = aResourceMgr->colorValue("SMESH", "backface_color", QColor(0, 0, 255));//@ + anRGB[0] = aBackFaceColor.red()/255.; + anRGB[1] = aBackFaceColor.green()/255.; + anRGB[2] = aBackFaceColor.blue()/255.; aBackProp->SetColor(anRGB[0],anRGB[1],anRGB[2]); aBackProp->SetOpacity(0.75); myActor->SetBackfaceProperty(aBackProp);