[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    koffice/krita/plugins/tools/tool_transform
From:       Casper Boemann <cbr () boemann ! dk>
Date:       2007-05-20 10:06:47
Message-ID: 1179655607.638871.29578.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 666560 by boemann:

Make the transform tool handle coords a  little better.
 stil to be done : handle resolution of images


 M  +10 -12    kis_tool_transform.cc  
 M  +2 -2      kis_tool_transform.h  


--- trunk/koffice/krita/plugins/tools/tool_transform/kis_tool_transform.cc #666559:666560
@@ -227,36 +227,36 @@
         switch(m_function)
         {
             case ROTATE:
-                m_clickoffset = e->pos() - m_translate.toPoint();
+                m_clickoffset = e->point - m_translate;
                 m_clickangle = -m_a - atan2(m_clickoffset.x(),m_clickoffset.y());
                 m_clickoffset = QPoint(0, 0);
                 break;
             case MOVE:
-                m_clickoffset = e->pos() - m_translate.toPoint();
+                m_clickoffset = e->point - m_translate;
                 break;
             case TOPSCALE:
-                m_clickoffset = e->pos() - (m_topleft + m_topright)/2.0;
+                m_clickoffset = e->point - (m_topleft + m_topright)/2.0;
                 break;
             case TOPRIGHTSCALE:
-                m_clickoffset = e->pos() - m_topright;
+                m_clickoffset = e->point - m_topright;
                 break;
             case RIGHTSCALE:
-                m_clickoffset = e->pos() - (m_topright + m_bottomright)/2.0;
+                m_clickoffset = e->point - (m_topright + m_bottomright)/2.0;
                 break;
             case BOTTOMRIGHTSCALE:
-                m_clickoffset = e->pos() - m_bottomright;
+                m_clickoffset = e->point - m_bottomright;
                 break;
             case BOTTOMSCALE:
-                m_clickoffset = e->pos() - (m_bottomleft + m_bottomright)/2.0;
+                m_clickoffset = e->point - (m_bottomleft + m_bottomright)/2.0;
                 break;
             case BOTTOMLEFTSCALE:
-                m_clickoffset = e->pos() - m_bottomleft;
+                m_clickoffset = e->point - m_bottomleft;
                 break;
             case LEFTSCALE:
-                m_clickoffset = e->pos() - (m_topleft + m_bottomleft)/2.0;
+                m_clickoffset = e->point - (m_topleft + m_bottomleft)/2.0;
                 break;
             case TOPLEFTSCALE:
-                m_clickoffset = e->pos() - m_topleft;
+                m_clickoffset = e->point - m_topleft;
                 break; 
         }
         m_selecting = true;
@@ -539,8 +539,6 @@
     }
     else
     {
-kDebug() << "moving no select " <<mousePos << endl;
-kDebug() << "topleft is " << topleft << endl;
         if(det(mousePos - topleft, topright - topleft)>0)
             m_function = ROTATE;
         else if(det(mousePos - topright, bottomright - topright)>0)
--- trunk/koffice/krita/plugins/tools/tool_transform/kis_tool_transform.h #666559:666560
@@ -49,9 +49,9 @@
  * Transform tool
  *
  */
-class KisToolTransform : public KoInteractionTool, KisCommandHistoryListener {
+class KisToolTransform : public KoTool, KisCommandHistoryListener {
 
-    typedef KoInteractionTool super;
+    typedef KoTool super;
     Q_OBJECT
 
 public:
[prev in list] [next in list] [prev in thread] [next in thread]