Help save net neutrality! Learn more.
Close

Diff of /src/hugin1/ptbatcher/FindPanoDialog.h [9e26cc] .. [832b36]  Maximize  Restore

Switch to side-by-side view

--- a/src/hugin1/ptbatcher/FindPanoDialog.h
+++ b/src/hugin1/ptbatcher/FindPanoDialog.h
@@ -26,10 +26,10 @@
 #ifndef _FINDPANODIALOG_H
 #define _FINDPANODIALOG_H
 
+#include <vector>
 #include "panoinc_WX.h"
 #include "panoinc.h"
 #include "BatchFrame.h"
-#include <wx/dynarray.h>
 
 extern "C"
 {
@@ -38,8 +38,6 @@
 }
 
 class PossiblePano;
-
-WX_DECLARE_OBJARRAY(PossiblePano, PossiblePanoArray);
 
 /** Dialog for finding panorama in given directory
  *
@@ -58,8 +56,8 @@
     ~FindPanoDialog();
 
 protected:
-	/** closes window */
-	void OnButtonClose(wxCommandEvent & e);
+    /** closes window */
+    void OnButtonClose(wxCommandEvent & e);
     /** select directory with dialog */
     void OnButtonChoose(wxCommandEvent & e);
     /** start/stops detections */
@@ -79,9 +77,10 @@
     wxCheckBox *m_cb_subdir;
     wxStaticText *m_statustext;
     wxCheckListBox *m_list_pano;
-    wxChoice *m_cb_naming;
+    wxChoice *m_ch_naming;
+    wxCheckBox *m_cb_createLinks;
 
-    PossiblePanoArray m_panos;
+    std::vector<PossiblePano*> m_panos;
     wxString m_start_dir;
     bool m_isRunning;
     bool m_stopped;
@@ -110,6 +109,8 @@
             NAMING_FIRST_LAST=1,
             NAMING_FOLDER=2
         };
+        /** destructor, cleans up used variables */
+        ~PossiblePano();
         /** return true, if the image could belong to the given PossiblePano,
           * it checks camera maker and model, focal length, image size and date/time */
         bool BelongsTo(SrcPanoImage* img,const wxTimeSpan max_time_diff);
@@ -121,17 +122,19 @@
         const wxString GetItemString(const wxString BasePath) const;
         /** returns a string with the filename of the first and last file */
         const wxString GetFilestring(const wxString BasePath, const bool stripExtension=false) const;
-        /** delete SrcPanoImages */
-        void Cleanup();
         /** generates the panorama file from this set of images 
           * @return the generated project file, or wxEmptyString if generation failed */
-        wxString GeneratePanorama(NamingConvention nc);
+        wxString GeneratePanorama(NamingConvention nc, bool createLinks);
 
     private:
         /** does some reformating date/time format */
-        wxDateTime GetDateTime(const SrcPanoImage* img);
+        const wxDateTime GetDateTime(const SrcPanoImage* img);
         /** returns a given filename, which does not already exists */
         bool GetNewProjectFilename(NamingConvention nc,const wxString basePath, wxFileName &projectFile);
+        /** checks if the panorama contains stacks */
+        bool IsStacked();
+        /** calculates the ev difference between darkest and brightest image */
+        double GetMaxExposureDifference();
 
         std::string m_make;
         std::string m_camera;