suzanne.soy/FreeCAD
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

+ change default colors

Browse Source 
git-svn-id: https://free-cad.svn.sourceforge.net/svnroot/free-cad/trunk@5123 e8eeb9e2-ec13-0410-a4a9-efa5cf37419d
This commit is contained in:
logari81 2011-11-12 23:47:45 +00:00
parent 21042dd515
commit 62e8357b5d
3 changed files with 35 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/Gui/DlgSettingsViewColor.ui
View File

@ -63,9 +63,9 @@
</property> </property>
<property name="color"> <property name="color">
<color> <color>
<red>26</red> <red>28</red>
<green>128</green> <green>173</green>
<blue>26</blue> <blue>28</blue>
</color> </color>
</property> </property>
<property name="prefEntry" stdset="0"> <property name="prefEntry" stdset="0">
@ -130,9 +130,9 @@
</property> </property>
<property name="color"> <property name="color">
<color> <color>
<red>204</red> <red>225</red>
<green>26</green> <green>225</green>
<blue>26</blue> <blue>20</blue>
</color> </color>
</property> </property>
<property name="prefEntry" stdset="0"> <property name="prefEntry" stdset="0">
@ -213,9 +213,9 @@
</property> </property>
<property name="color"> <property name="color">
<color> <color>
<red>234</red> <red>20</red>
<green>229</green> <green>20</green>
<blue>220</blue> <blue>163</blue>
</color> </color>
</property> </property>
<property name="prefEntry" stdset="0"> <property name="prefEntry" stdset="0">
@ -246,9 +246,9 @@
</property> </property>
<property name="color"> <property name="color">
<color> <color>
<red>171</red> <red>151</red>
<green>171</green> <green>151</green>
<blue>193</blue> <blue>170</blue>
</color> </color>
</property> </property>
<property name="prefEntry" stdset="0"> <property name="prefEntry" stdset="0">
@ -410,9 +410,9 @@
</property> </property>
<property name="color"> <property name="color">
<color> <color>
<red>102</red> <red>0</red>
<green>102</green> <green>0</green>
<blue>204</blue> <blue>220</blue>
</color> </color>
</property> </property>
<property name="prefEntry" stdset="0"> <property name="prefEntry" stdset="0">
@ -430,9 +430,9 @@
</property> </property>
<property name="color"> <property name="color">
<color> <color>
<red>149</red> <red>0</red>
<green>178</green> <green>255</green>
<blue>1</blue> <blue>0</blue>
</color> </color>
</property> </property>
<property name="prefEntry" stdset="0"> <property name="prefEntry" stdset="0">
@ -451,7 +451,7 @@
<property name="color"> <property name="color">
<color> <color>
<red>255</red> <red>255</red>
<green>59</green> <green>38</green>
<blue>0</blue> <blue>0</blue>
</color> </color>
</property> </property>

30
src/Mod/Sketcher/Gui/ViewProviderSketch.cpp
View File

@ -98,16 +98,16 @@
using namespace SketcherGui; using namespace SketcherGui;
using namespace Sketcher; using namespace Sketcher;
SbColor ViewProviderSketch::VertexColor (0.5f,0.5f,0.5f); SbColor ViewProviderSketch::VertexColor (1.0f,0.149f,0.0f); // #FF2600 -> (255, 38, 0)
SbColor ViewProviderSketch::CurveColor (1.0f,1.0f,1.0f); SbColor ViewProviderSketch::CurveColor (1.0f,1.0f,1.0f); // #FFFFFF -> (255,255,255)
SbColor ViewProviderSketch::CurveDraftColor (0.4f,0.4f,0.8f); SbColor ViewProviderSketch::CurveDraftColor (0.0f,0.0f,0.86f); // #0000DC -> ( 0, 0,220)
SbColor ViewProviderSketch::CrossColorV (0.8f,0.4f,0.4f); SbColor ViewProviderSketch::CrossColorV (0.8f,0.4f,0.4f); // #CC6666 -> (204,102,102)
SbColor ViewProviderSketch::CrossColorH (0.4f,0.8f,0.4f); SbColor ViewProviderSketch::CrossColorH (0.4f,0.8f,0.4f); // #66CC66 -> (102,204,102)
SbColor ViewProviderSketch::FullyConstrainedColor (0.6f,0.6f,0.9f); SbColor ViewProviderSketch::FullyConstrainedColor (0.0f,1.0f,0.0f); // #00FF00 -> ( 0,255, 0)
SbColor ViewProviderSketch::ConstraintColor (0.0f,0.8f,0.0f); SbColor ViewProviderSketch::ConstrDimColor (1.0f,0.149f,0.0f); // #FF2600 -> (255, 38, 0)
SbColor ViewProviderSketch::ConstrIcoColor (1.0f,0.125f,0.f); SbColor ViewProviderSketch::ConstrIcoColor (1.0f,0.149f,0.0f); // #FF2600 -> (255, 38, 0)
SbColor ViewProviderSketch::PreselectColor (0.1f, 0.1f, 0.8f); SbColor ViewProviderSketch::PreselectColor (0.88f,0.88f,0.0f); // #E1E100 -> (225,225, 0)
SbColor ViewProviderSketch::SelectColor (0.1f, 0.1f, 0.8f); SbColor ViewProviderSketch::SelectColor (0.11f,0.68f,0.11f); // #1CAD1C -> ( 28,173, 28)
// Variables for holding previous click // Variables for holding previous click
SbTime ViewProviderSketch::prvClickTime; SbTime ViewProviderSketch::prvClickTime;
@ -1363,10 +1363,10 @@ void ViewProviderSketch::updateColor(void)
} }
} }
else { else {
m->diffuseColor = ConstraintColor; m->diffuseColor = ConstrDimColor;
if (hasDatumLabel) { if (hasDatumLabel) {
SoDatumLabel *l = dynamic_cast<SoDatumLabel *>(s->getChild(4)); SoDatumLabel *l = dynamic_cast<SoDatumLabel *>(s->getChild(4));
l->textColor = ConstraintColor; l->textColor = ConstrDimColor;
} }
} }
} }
@ -2387,7 +2387,7 @@ void ViewProviderSketch::rebuildConstraintsVisual(void)
sep->renderCaching = SoSeparator::OFF; sep->renderCaching = SoSeparator::OFF;
// every constrained visual node gets its own material for preselection and selection // every constrained visual node gets its own material for preselection and selection
SoMaterial *Material = new SoMaterial; SoMaterial *Material = new SoMaterial;
Material->diffuseColor = ConstraintColor; Material->diffuseColor = ConstrDimColor;
sep->addChild(Material); sep->addChild(Material);
// distinguish different constraint types to build up // distinguish different constraint types to build up
@ -2418,7 +2418,7 @@ void ViewProviderSketch::rebuildConstraintsVisual(void)
SoDatumLabel *text = new SoDatumLabel(); SoDatumLabel *text = new SoDatumLabel();
//text->justification = SoDatumLabel::CENTER; //text->justification = SoDatumLabel::CENTER;
text->string = ""; text->string = "";
text->textColor = ConstraintColor; text->textColor = ConstrDimColor;
sep->addChild(text); sep->addChild(text);
edit->vConstrType.push_back((*it)->Type); edit->vConstrType.push_back((*it)->Type);
@ -2635,7 +2635,7 @@ bool ViewProviderSketch::setEdit(int ModNum)
color = hGrp->GetUnsigned("FullyConstrainedColor", color); color = hGrp->GetUnsigned("FullyConstrainedColor", color);
FullyConstrainedColor.setPackedValue((uint32_t)color, transparency); FullyConstrainedColor.setPackedValue((uint32_t)color, transparency);
// constraints dimensions and icons colors are hard coded // constraints dimensions and icons colors are hard coded
// ConstraintColor; // ConstrDimColor;
// ConstrIcoColor; // ConstrIcoColor;
// set the highlight color // set the highlight color

2
src/Mod/Sketcher/Gui/ViewProviderSketch.h
View File

@ -218,7 +218,7 @@ protected:
static SbColor CrossColorV; static SbColor CrossColorV;
static SbColor CrossColorH; static SbColor CrossColorH;
static SbColor FullyConstrainedColor; static SbColor FullyConstrainedColor;
static SbColor ConstraintColor; static SbColor ConstrDimColor;
static SbColor ConstrIcoColor; static SbColor ConstrIcoColor;
static SbColor PreselectColor; static SbColor PreselectColor;
static SbColor SelectColor; static SbColor SelectColor;