[Hugin-cvs] hugin/src/include/hugin ImageCache.h, 1.23, 1.24 PreviewFrame.h, 1.15, 1.16 PreviewPanel.h, 1.20, 1.21

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

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

Modified Files:
	ImageCache.h PreviewFrame.h PreviewPanel.h 
Log Message:
preview speedup: only remap images if required.
Correctly keep selected images when moving or removing images


Index: PreviewPanel.h
===================================================================
RCS file: /cvsroot/hugin/hugin/src/include/hugin/PreviewPanel.h,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- PreviewPanel.h	9 Aug 2006 20:53:15 -0000	1.20
+++ PreviewPanel.h	10 Aug 2006 15:00:56 -0000	1.21
@@ -59,7 +59,7 @@
     void ForceUpdate();
 
     // select which images should be shown.
-    void SetDisplayedImages(const PT::UIntSet &images);
+//    void SetDisplayedImages(const PT::UIntSet &images);
     
     // blending modes available
     enum BlendMode { BLEND_COPY, BLEND_DIFFERENCE };
@@ -90,8 +90,6 @@
 
     vigra::Diff2D m_panoImgSize;
 
-    PT::UIntSet m_displayedImages;
-
 	wxBitmap * m_panoBitmap;
     // currently updating the preview.
 
@@ -109,6 +107,7 @@
 
     bool m_state_rendering;
     bool m_rerender;
+    bool m_imgsDirty;
 
 
     DECLARE_EVENT_TABLE()

Index: PreviewFrame.h
===================================================================
RCS file: /cvsroot/hugin/hugin/src/include/hugin/PreviewFrame.h,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- PreviewFrame.h	6 Nov 2005 13:26:51 -0000	1.15
+++ PreviewFrame.h	10 Aug 2006 15:00:56 -0000	1.16
@@ -93,8 +93,6 @@
     std::vector<wxCheckBox *> m_ToggleButtons;
 #endif
 
-    PT::UIntSet m_displayedImgs;
-
     DECLARE_EVENT_TABLE()
 };
 

Index: ImageCache.h
===================================================================
RCS file: /cvsroot/hugin/hugin/src/include/hugin/ImageCache.h,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- ImageCache.h	10 Aug 2006 00:16:48 -0000	1.23
+++ ImageCache.h	10 Aug 2006 15:00:56 -0000	1.24
@@ -29,6 +29,7 @@
 #include <common/utils.h>
 //#include <vigra/stdimage.hxx>
 #include <PT/RemappedPanoImage.h>
+//#include <PT/PanoImage.h>
 
 
 typedef wxImage * ImagePtr;
@@ -227,6 +228,9 @@
 
 protected:
     std::map<unsigned, MRemappedImage*> m_images;
+    // descriptions of the remapped image. useful to determine
+    // if it has to be updated or not
+    std::map<unsigned, PT::SrcPanoImage> m_imagesParam;
 };