pastk/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

[core] Allow for rotation when scale is max. (#10137)

Browse source 
Signed-off-by: Colin Takushi <takushicolin@gmail.com>
This commit is contained in:
Colin Takushi 2025-02-01 04:36:12 -06:00 • committed by GitHub
parent 457dac6f15
commit 882cfd1a89
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 28 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
drape_frontend/navigator.cpp
View file

@ -176,9 +176,28 @@ bool Navigator::ScaleImpl(m2::PointD const & newPt1, m2::PointD const & newPt2,
math::Matrix<double, 3, 3> const newM = math::Matrix<double, 3, 3> const newM =
screen.GtoPMatrix() * ScreenBase::CalcTransform(oldPt1 + offset, oldPt2 + offset, screen.GtoPMatrix() * ScreenBase::CalcTransform(oldPt1 + offset, oldPt2 + offset,
newPt1 + offset, newPt2 + offset, newPt1 + offset, newPt2 + offset,
doRotateScreen); doRotateScreen,
true);
ScreenBase tmp = screen; ScreenBase tmp = screen;
tmp.SetGtoPMatrix(newM); tmp.SetGtoPMatrix(newM);
if (!CheckMaxScale(tmp))
{
if (doRotateScreen)
{
math::Matrix<double, 3, 3> const tmpM =
screen.GtoPMatrix() * ScreenBase::CalcTransform(oldPt1 + offset, oldPt2 + offset,
newPt1 + offset, newPt2 + offset,
doRotateScreen,
false);
tmp.SetGtoPMatrix(tmpM);
}
else
{
return false;
}
}
if (tmp.isPerspective()) if (tmp.isPerspective())
tmp.MatchGandP3d(centerG, center3d); tmp.MatchGandP3d(centerG, center3d);
@ -195,9 +214,6 @@ bool Navigator::ScaleImpl(m2::PointD const & newPt1, m2::PointD const & newPt2,
return false; return false;
} }
if (!CheckMaxScale(tmp))
return false;
// re-checking the borders, as we might violate them a bit (don't know why). // re-checking the borders, as we might violate them a bit (don't know why).
if (!CheckBorders(tmp)) if (!CheckBorders(tmp))
tmp = ScaleInto(tmp, worldR); tmp = ScaleInto(tmp, worldR);

3
geometry/geometry_tests/screen_test.cpp
View file

@ -151,7 +151,8 @@ UNIT_TEST(ScreenBase_CalcTransform)
m2::PointD(0, 1), m2::PointD(1, 1), m2::PointD(0, 1), m2::PointD(1, 1),
m2::PointD( s * sin(a) + dx, s * cos(a) + dy), m2::PointD( s * sin(a) + dx, s * cos(a) + dy),
m2::PointD(s * cos(a) + s * sin(a) + dx, -s * sin(a) + s * cos(a) + dy), m2::PointD(s * cos(a) + s * sin(a) + dx, -s * sin(a) + s * cos(a) + dy),
true /* allow rotate */); true /* allow rotate */,
true /* allow scale*/);
ScreenBase::ExtractGtoPParams(m, a1, s1, dx1, dy1); ScreenBase::ExtractGtoPParams(m, a1, s1, dx1, dy1);

7
geometry/screenbase.cpp
View file

@ -225,9 +225,12 @@ int ScreenBase::GetHeight() const { return base::SignedRound(m_PixelRect.SizeY()
ScreenBase::MatrixT const ScreenBase::CalcTransform(m2::PointD const & oldPt1, ScreenBase::MatrixT const ScreenBase::CalcTransform(m2::PointD const & oldPt1,
m2::PointD const & oldPt2, m2::PointD const & oldPt2,
m2::PointD const & newPt1, m2::PointD const & newPt1,
m2::PointD const & newPt2, bool allowRotate) m2::PointD const & newPt2,
bool allowRotate,
bool allowScale)
{ {
double const s = newPt1.Length(newPt2) / oldPt1.Length(oldPt2);
double const s = allowScale ? newPt1.Length(newPt2) / oldPt1.Length(oldPt2) : 1.0;
double const a = allowRotate ? ang::AngleTo(newPt1, newPt2) - ang::AngleTo(oldPt1, oldPt2) : 0.0; double const a = allowRotate ? ang::AngleTo(newPt1, newPt2) - ang::AngleTo(oldPt1, oldPt2) : 0.0;
MatrixT m = math::Shift( MatrixT m = math::Shift(

2
geometry/screenbase.hpp
View file

@ -124,7 +124,7 @@ public:
/// newPt2) /// newPt2)
static MatrixT const CalcTransform(m2::PointD const & oldPt1, m2::PointD const & oldPt2, static MatrixT const CalcTransform(m2::PointD const & oldPt1, m2::PointD const & oldPt2,
m2::PointD const & newPt1, m2::PointD const & newPt2, m2::PointD const & newPt1, m2::PointD const & newPt2,
bool allowRotate); bool allowRotate, bool allowScale);
/// Setting GtoP matrix extracts the Angle and m_Org parameters, leaving PixelRect intact /// Setting GtoP matrix extracts the Angle and m_Org parameters, leaving PixelRect intact
void SetGtoPMatrix(MatrixT const & m); void SetGtoPMatrix(MatrixT const & m);