[Hugin-cvs] hugin/src/include/hugin CPImageCtrl.h,1.23,1.24

[Pablo d'A. <da...@us...>]

Update of /cvsroot/hugin/hugin/src/include/hugin
In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv8127/include/hugin

Modified Files:
	CPImageCtrl.h 
Log Message:
Added contrast enhancing "magnifiers" for manual control point placement.
Points can be moved with the cursor keys by 1/3 pixel.
Changing the zoom keeps the selected point in the image centre



Index: CPImageCtrl.h
===================================================================
RCS file: /cvsroot/hugin/hugin/src/include/hugin/CPImageCtrl.h,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- CPImageCtrl.h	15 Apr 2007 20:51:03 -0000	1.23
+++ CPImageCtrl.h	8 May 2007 22:21:13 -0000	1.24
@@ -27,6 +27,8 @@
 #include <string>
 #include <vector>
 
+#include <hugin/ImageCache.h>
+
 class CPEditorPanel;
 class CPZoomDisplayPanel;
 /** Events to notify about new point / region / point change
@@ -192,8 +194,9 @@
     wxPoint MaxScrollDelta(wxPoint delta);
 
 protected:
-    void drawPoint(wxDC & p, const FDiff2D & point, const wxColor & color) const;
-    void drawHighlightPoint(wxDC & p, const FDiff2D & point, const wxColor & color) const;
+    void drawPoint(wxDC & p, const FDiff2D & point, int i, bool selected = false) const;
+    // draw the magnified view of a selected control point
+    wxBitmap generateMagBitmap(FDiff2D point, wxPoint canvasPos) const;
     void OnDraw(wxDC& dc);
     void OnSize(wxSizeEvent & e);
     void OnKey(wxKeyEvent & e);
@@ -391,6 +394,7 @@
 
     // colors for the different points
     std::vector<wxColour> pointColors;
+    std::vector<wxColour> textColours;
     double scaleFactor;
     bool fitToWindow;
 
@@ -416,6 +420,8 @@
 
     ImageRotation m_imgRotation;
 
+    ImageCache::EntryPtr m_img;
+
     DECLARE_EVENT_TABLE();
 };