SIM/qucs_s
1
0
Fork 0
mirror of https://github.com/ra3xdh/qucs_s synced 2025-03-28 21:13:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #777 from wawuwo/fix-765-wrong-text-angle-in-subcircuit-symbol

Browse Source 
Generalise Text::angle() logic
This commit is contained in:
Vadim Kuznetsov 2024-06-21 12:54:51 +02:00 committed by GitHub
commit 4929b4125c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 21 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
qucs/element.cpp
View File

@ -18,6 +18,7 @@
#include "element.h"
#include "misc.h"
#include <cmath>
#include <QPainter>
namespace qucs {
@ -70,28 +71,30 @@ void Text::draw(QPainter *painter, QRectF* br) const {
}
double Text::angle() const {
// Historically Text uses mSin and mCos values to store
// its rotation factor.
// Historically Text uses mSin and mCos values to describe
// at what angle the text is rotated.
//
// The actual rotation was implemented as a clever
// tranformation for a painter, like:
// QTransform(mCos, -mSin, mSin, mCos, …
// It employed some clever technique to draw the text rotated
// by applying "skew" transformations to QPainter and using mCos
// and mSin as skew factors, but later the whole drawing routine
// was refactored and it switched to using QPainter::rotate() and
// degrees to describe the rotation angle.
//
// There were only four combinations of these values
// and here we convert them to their human-readable
// equivalents
if (mCos == 0.0) {
if (mSin == 1.0) {
return 270;
}
return 90;
}
// Many other parts of the codebase still depend on mCos and mSin,
// for example rotating and mirroring of a component and more than
// 200 component constructors. It is a piece of work to get rid
// of mCos and mSin completely, so they're kept as is and their
// "degrees" equivalent is calculated when the text needs to be drawn.
if (mCos == -1.0 && mSin == 0.0) {
return 180;
}
const double radians = std::atan2(mSin, mCos);
const double degrees = (radians * 180.0) / 3.14159265 /* Pi */;
return 0;
// QPainter::rotate() rotates *clockwise*, so if you want a text
// to have rotation angle of 45° (towards up-right direction),
// then the -45° has to be passed to QPainter::rotate().
//
// QPainter::rotate() is called in Text::draw
return -degrees;
}