← Back to branch summary

~ubuntu-branches/ubuntu/trusty/hugin/trusty-proposed

« back to all changes in this revision

Viewing changes to src/hugin1/hugin/ImagesPanel.h

  • Committer: Bazaar Package Importer
  • Author(s): Andreas Metzler
  • Date: 2011-01-06 14:28:24 UTC
  • mfrom: (1.1.9 upstream) (0.1.21 experimental)
  • Revision ID: james.westby@ubuntu.com-20110106142824-zn9lxylg5z44dynn
* Drop Cyril Brulebois from Uploaders. Thank you very much for your work.
* Bump package version. (rc3 was re-released as 2010.4.0).

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/hugin1/hugin/ImagesPanel.h
32
32
#include "CelesteGlobals.h"
33
33
#include "Utilities.h"
34
34
 
 
35
#include "base_wx/ImageCache.h"
 
36
 
35
37
using namespace PT;
36
38
 
37
39
// forward declarations, to save the #include statements
83
85
    void panoramaImagesChanged(PT::Panorama &pano, const PT::UIntSet & imgNr);
84
86
    /** Reloads the cp detector settings from config, necessary after edit preferences */
85
87
    void ReloadCPDetectorSettings();
86
 
    /** returns the default cp detector setings */
 
88
    /** returns the default cp detector settings */
87
89
    CPDetectorSetting& GetDefaultSetting() { return cpdetector_config.settings.Item(cpdetector_config.GetDefaultGenerator());};
88
90
private:
89
91
    // a window event
154
156
 
155
157
    /** bitmap with default image */
156
158
    wxBitmap m_empty;
 
159
    
 
160
    /** Request for thumbnail image */
 
161
    HuginBase::ImageCache::RequestPtr thumbnail_request;
157
162
 
158
163
    /** pointer to the list control */
159
164
    ImagesListImage* images_list;