diff --git a/src/App/Material.h b/src/App/Material.h index 18f1f9f470..43fe4122de 100644 --- a/src/App/Material.h +++ b/src/App/Material.h @@ -130,12 +130,7 @@ public: << std::setw(2) << int(b*255.0f); return ss.str(); } - /** - * \deprecated - */ - std::string asCSSString() const { - return asHexString(); - } + /** * gets color from hex color "#RRGGBB" * diff --git a/src/Mod/TechDraw/App/DrawViewDraft.cpp b/src/Mod/TechDraw/App/DrawViewDraft.cpp index cef0223111..41821dd33a 100644 --- a/src/Mod/TechDraw/App/DrawViewDraft.cpp +++ b/src/Mod/TechDraw/App/DrawViewDraft.cpp @@ -110,7 +110,7 @@ App::DocumentObjectExecReturn *DrawViewDraft::execute(void) // TODO treat fillstyle here << ",direction=FreeCAD.Vector(" << Direction.getValue().x << "," << Direction.getValue().y << "," << Direction.getValue().z << ")" << ",linestyle=\"" << LineStyle.getValue() << "\"" - << ",color=\"" << col.asCSSString() << "\"" + << ",color=\"" << col.asHexString() << "\"" << ",linespacing=" << LineSpacing.getValue() // We must set techdraw to "true" becausea couple of things behave differently than in Drawing << ",techdraw=True" diff --git a/src/Mod/TechDraw/App/DrawViewSpreadsheet.cpp b/src/Mod/TechDraw/App/DrawViewSpreadsheet.cpp index 68202f2f2d..d289485980 100644 --- a/src/Mod/TechDraw/App/DrawViewSpreadsheet.cpp +++ b/src/Mod/TechDraw/App/DrawViewSpreadsheet.cpp @@ -301,17 +301,17 @@ std::string DrawViewSpreadsheet::getSheetImage(void) // get colors, style, alignment and span int alignment = 0; std::string bcolor = "none"; - std::string fcolor = c.asCSSString(); + std::string fcolor = c.asHexString(); std::string textstyle = ""; if (cell) { App::Color f,b; std::set st; int colspan, rowspan; if (cell->getBackground(b)) { - bcolor = b.asCSSString(); + bcolor = b.asHexString(); } if (cell->getForeground(f)) { - fcolor = f.asCSSString(); + fcolor = f.asHexString(); } if (cell->getStyle(st)) { for (std::set::const_iterator i = st.begin(); i != st.end(); ++i) { @@ -342,7 +342,7 @@ std::string DrawViewSpreadsheet::getSheetImage(void) if (std::find(skiplist.begin(), skiplist.end(), address.toString()) == skiplist.end()) { result << " " << endl; + << LineWidth.getValue()/getScale() << ";stroke:" << c.asHexString() << ";\" />" << endl; if (alignment & Spreadsheet::Cell::ALIGNMENT_LEFT) result << " (); } diff --git a/src/Mod/TechDraw/Gui/QGIViewAnnotation.cpp b/src/Mod/TechDraw/Gui/QGIViewAnnotation.cpp index b2da336386..c0c874df64 100644 --- a/src/Mod/TechDraw/Gui/QGIViewAnnotation.cpp +++ b/src/Mod/TechDraw/Gui/QGIViewAnnotation.cpp @@ -156,7 +156,7 @@ void QGIViewAnnotation::drawAnnotation() } ss << "line-height:" << viewAnno->LineSpace.getValue() << "%; "; App::Color c = viewAnno->TextColor.getValue(); - ss << "color:" << c.asCSSString() << "; "; + ss << "color:" << c.asHexString() << "; "; ss << "}\n\n\n\n

"; for(std::vector::const_iterator it = annoText.begin(); it != annoText.end(); it++) { if (it != annoText.begin()) {