Skip to content

Fix minor rounding error. Remove unused variable #3754

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
KjellMorgenstern wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

Fix minor rounding error. Remove unused variable #3754

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 3 additions & 8 deletions src/items/ruler.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,12 +117,9 @@ QString Ruler::makeSvg(double inches) {

// get units
int units = m_modelPart->localProp("width").toString().contains("cm") ? IndexCm : IndexIn;

QString svg = TextUtils::makeSVGHeader(GraphicsUtils::SVGDPI, GraphicsUtils::StandardFritzingDPI, (inches + offset + offset) * GraphicsUtils::SVGDPI, GraphicsUtils::SVGDPI/2);
int counter;

if (units == IndexCm) {
counter = 0;
svg += "<g font-family='Droid Sans' text-anchor='middle' font-size='100' stroke-width='1' style='stroke: rgb(100,100,100)'>";

// 1/100 centimeter spacing
Expand Down Expand Up @@ -191,9 +188,7 @@ QString Ruler::makeSvg(double inches) {
double x = (offset + (i / 16.0)) * GraphicsUtils::StandardFritzingDPI;
if (i % 16 == 0) {

// I wonder if QT compiler would see that this is just a constant, and not perform the runtime math?
// If not calculating out the value could save some cycles:)
h = 0.196875;//.125 + (1.15 / 16);
h = .125 + (1.15 / 16);

double y = (GraphicsUtils::StandardFritzingDPI/4)+35;//(h + .101) * GraphicsUtils::StandardFritzingDPI;
svg += QString("<text x='%1' y='%2'>%3</text>")
Expand All @@ -205,10 +200,10 @@ QString Ruler::makeSvg(double inches) {
}
}
else if (i % 8 == 0) {
h = 0.17812;//.125 + (.85 / 16);
h = .125 + (.85 / 16);
}
else if (i % 4 == 0) {
h = 0.14062;//.125 + (.25 / 16);
h = .125 + (.25 / 16);
}

svg += QString("<line x1='%1' y1='0' x2='%1' y2='%2' />\n")
Expand Down