kindred/create
1
1
Fork 0
Code Issues 37 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

Remove deprecated function

Browse Source
This commit is contained in:
andrea
2022-07-11 19:41:32 +02:00
committed by WandererFan
parent c6a91b4ff3
commit 5a9ffe468c
5 changed files with 8 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/App/Material.h
View File

@@ -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"
*

2
src/Mod/TechDraw/App/DrawViewDraft.cpp
View File

@@ -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"

8
src/Mod/TechDraw/App/DrawViewSpreadsheet.cpp
View File

@@ -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<std::string> 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<std::string>::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 << " <rect x=\"" << coloffset << "\" y=\"" << rowoffset << "\" width=\"" << cellwidth
<< "\" height=\"" << cellheight << "\" style=\"fill:" << bcolor << ";stroke-width:"
<< LineWidth.getValue()/getScale() << ";stroke:" << c.asCSSString() << ";\" />" << endl;
<< LineWidth.getValue()/getScale() << ";stroke:" << c.asHexString() << ";\" />" << endl;
if (alignment & Spreadsheet::Cell::ALIGNMENT_LEFT)
result << " <text style=\"" << textstyle << "\" x=\"" << coloffset + TextSize.getValue()/2 << "\" y=\"" << rowoffset + 0.75 * cellheight << "\" font-family=\"" ;
if (alignment & Spreadsheet::Cell::ALIGNMENT_HCENTER)

2
src/Mod/TechDraw/Gui/QGIFace.cpp
View File

@@ -670,7 +670,7 @@ QPixmap QGIFace::textureFromSvg(std::string fileSpec)
void QGIFace::setHatchColor(App::Color c)
{
m_svgCol = c.asCSSString();
m_svgCol = c.asHexString();
m_geomColor = c.asValue<QColor>();
}

2
src/Mod/TechDraw/Gui/QGIViewAnnotation.cpp
View File

@@ -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</style>\n</head>\n<body>\n<p>";
for(std::vector<std::string>::const_iterator it = annoText.begin(); it != annoText.end(); it++) {
if (it != annoText.begin()) {