X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FXGUI%2FXGUI_ColorDialog.cpp;h=9170958f29b3589b392edbf0ab1b13054a0218b3;hb=ed438696473dac61ba94d1b1ef88f8cca5cfb464;hp=e91d3cceb8e5073c7bc87727ee3f9d42db279ffc;hpb=5352bbb1915f98d1f02b1cb953a2de19b286a28c;p=modules%2Fshaper.git diff --git a/src/XGUI/XGUI_ColorDialog.cpp b/src/XGUI/XGUI_ColorDialog.cpp index e91d3cceb..9170958f2 100644 --- a/src/XGUI/XGUI_ColorDialog.cpp +++ b/src/XGUI/XGUI_ColorDialog.cpp @@ -63,16 +63,22 @@ void XGUI_ColorDialog::setColor(const std::vector& theValue) } std::vector XGUI_ColorDialog::getColor() const +{ + QColor aColorResult = myColorButton->color(); + + std::vector aValues; + aValues.push_back(aColorResult.red()); + aValues.push_back(aColorResult.green()); + aValues.push_back(aColorResult.blue()); + + return aValues; +} + +std::vector XGUI_ColorDialog::getRandomColor() const { std::vector aValues; if (isRandomColor()) { ModelAPI_Tools::findRandomColor(aValues); } - else { - QColor aColorResult = myColorButton->color(); - aValues.push_back(aColorResult.red()); - aValues.push_back(aColorResult.green()); - aValues.push_back(aColorResult.blue()); - } return aValues; }