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 612be230b2
commit e3adea272c
5 changed files with 8 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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)