From bb8f3fc98f695bdd6db0fad47709d6f650cfe63f Mon Sep 17 00:00:00 2001 From: Angus Leeming Date: Thu, 29 Apr 2004 14:47:09 +0000 Subject: [PATCH] Squash a warning by fixing the code. git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@8710 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/frontends/qt2/ChangeLog | 5 +++++ src/frontends/qt2/QGraphics.C | 8 +++----- src/frontends/xforms/ChangeLog | 5 +++++ src/frontends/xforms/FormGraphics.C | 9 +++------ 4 files changed, 16 insertions(+), 11 deletions(-) diff --git a/src/frontends/qt2/ChangeLog b/src/frontends/qt2/ChangeLog index 342178c841..848ae5cf9e 100644 --- a/src/frontends/qt2/ChangeLog +++ b/src/frontends/qt2/ChangeLog @@ -1,3 +1,8 @@ +2004-04-29 Angus Leeming + + * QGraphics.C (apply): Remove a #warning statement by + fixing the code. + 2004-04-28 Angus Leeming * QLToolbar.[Ch]: rewrite code to derive from a single Toolbar or diff --git a/src/frontends/qt2/QGraphics.C b/src/frontends/qt2/QGraphics.C index 6b83c675f8..a59f7de911 100644 --- a/src/frontends/qt2/QGraphics.C +++ b/src/frontends/qt2/QGraphics.C @@ -373,11 +373,9 @@ void QGraphics::apply() igp.lyxscale = strToInt(fromqstr(dialog_->displayscale->text())); igp.rotateAngle = strToDbl(fromqstr(dialog_->angle->text())); -#warning Guess what happens if the user enters '1e30' here? - while (igp.rotateAngle < -360.0) - igp.rotateAngle += 360.0; - while (igp.rotateAngle > 360.0) - igp.rotateAngle -= 360.0; + + if (std::abs(igp.rotateAngle) > 360.0) + igp.rotateAngle -= 360.0 * floor(igp.rotateAngle / 360.0); // save the latex name for the origin. If it is the default // then origin_ltx returns "" diff --git a/src/frontends/xforms/ChangeLog b/src/frontends/xforms/ChangeLog index 056eef90ae..d7a35da6ae 100644 --- a/src/frontends/xforms/ChangeLog +++ b/src/frontends/xforms/ChangeLog @@ -1,3 +1,8 @@ +2004-04-29 Angus Leeming + + * FormGraphics.C (apply): don't get caught in a loop when mapping + the angle into -360 -> 360 degrees. + 2004-04-28 Angus Leeming * LayoutEngine.C (updateMetrics): respect the visible() flag when diff --git a/src/frontends/xforms/FormGraphics.C b/src/frontends/xforms/FormGraphics.C index bf31de4c23..578971d2b3 100644 --- a/src/frontends/xforms/FormGraphics.C +++ b/src/frontends/xforms/FormGraphics.C @@ -401,12 +401,9 @@ void FormGraphics::apply() igp.rotateAngle = strToDbl(getString(extra_->input_rotate_angle)); // map angle into -360 (clock-wise) to +360 (counter clock-wise) - while (igp.rotateAngle <= -360.0) { - igp.rotateAngle += 360.0; - } - while (igp.rotateAngle >= 360.0) { - igp.rotateAngle -= 360.0; - } + if (std::abs(igp.rotateAngle) > 360.0) + igp.rotateAngle -= 360.0 * floor(igp.rotateAngle / 360.0); + fl_set_input(extra_->input_rotate_angle, tostr(igp.rotateAngle).c_str()); int const origin_pos = fl_get_choice(extra_->choice_origin); -- 2.39.2