[Hugin-cvs] hugin/src/include/hugin ImageCache.h, 1.24, 1.25 PreviewFrame.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-serv2681/src/include/hugin

Modified Files:
	ImageCache.h PreviewFrame.h 
Log Message:
Full support for new projections, with choosing parameters for them


Index: PreviewFrame.h
===================================================================
RCS file: /cvsroot/hugin/hugin/src/include/hugin/PreviewFrame.h,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- PreviewFrame.h	20 Dec 2006 00:42:16 -0000	1.20
+++ PreviewFrame.h	25 Jan 2007 22:47:44 -0000	1.21
@@ -65,6 +65,7 @@
     void OnShowNone(wxCommandEvent & e);
     void OnNumTransform(wxCommandEvent & e);
     void OnChangeFOV(wxScrollEvent & e);
+    void OnTextCtrlChanged(wxCommandEvent & e);
 
     void OnBlendChoice(wxCommandEvent & e);
     void OnProjectionChoice(wxCommandEvent & e);
@@ -82,6 +83,7 @@
     wxChoice * m_BlendModeChoice;
     wxChoice * m_ProjectionChoice;
     wxString m_choices[3];
+    int m_oldProjFormat;
 
 //    wxButton * m_updatePreview;
 //    wxCheckBox * m_autoCB;
@@ -90,6 +92,12 @@
 	wxBoxSizer * m_ButtonSizer;
 	wxStaticBoxSizer * m_ToggleButtonSizer;
 
+    wxBoxSizer * m_topsizer;
+    wxStaticBoxSizer * m_projParamSizer;
+    std::vector<wxStaticText *> m_projParamNamesLabel;
+    std::vector<wxTextCtrl *>   m_projParamTextCtrl;
+    std::vector<wxSlider *>     m_projParamSlider;
+
 #ifdef USE_TOGGLE_BUTTON
     std::vector<wxToggleButton *> m_ToggleButtons;
 #else

Index: ImageCache.h
===================================================================
RCS file: /cvsroot/hugin/hugin/src/include/hugin/ImageCache.h,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- ImageCache.h	10 Aug 2006 15:00:56 -0000	1.24
+++ ImageCache.h	25 Jan 2007 22:47:44 -0000	1.25
@@ -231,6 +231,7 @@
     // descriptions of the remapped image. useful to determine
     // if it has to be updated or not
     std::map<unsigned, PT::SrcPanoImage> m_imagesParam;
+    std::map<unsigned, PT::PanoramaOptions> m_panoOpts;
 };