Changeset 2279 for FalconView/trunk/public/fvw_core/GeodataDataSources/LibkmlDataSource.h

Timestamp:

03/05/10 14:16:21 (6 months ago)

Author:

gm78

Message:

Added threaded loading of KML images.

Files:

• FalconView/trunk/public/fvw_core/GeodataDataSources/LibkmlDataSource.h (modified) (7 diffs)

FalconView/trunk/public/fvw_core/GeodataDataSources/LibkmlDataSource.h

@@ -31 +31 @@
 #error "Single-threaded COM objects are not properly supported on Windows CE platform, such as the Windows Mobile platforms that do not include full DCOM support. Define _CE_ALLOW_SINGLE_THREADED_OBJECTS_IN_MTA to force ATL to support creating single-thread COM object's and allow use of it's single-threaded COM object implementations. The threading model in your rgs file was set to 'Free' as that is the only threading model supported in non DCOM Windows CE platforms."
 #endif
+
+class CKMLImageDataResource;
+
+class CKmlImageCache
+{
+   std::map<std::string, CKMLImageDataResource*> m_imageCache;
+   
+public:
+   void Insert(const std::string& imageId, CKMLImageDataResource *pResource);
+   CKMLImageDataResource* Find(const std::string& imageId);
+   void Clear();
+};
 
 // CLibkmlDataSource
@@ -44 +56 @@
    public IDispatchImpl<IFvDataSourceEdit, &__uuidof(IFvDataSourceEdit), &LIBID_FvDataSourcesLib, /* wMajor = */ 1, /* wMinor = */ 0>,
    public IDispatchImpl<IUIState, &__uuidof(IUIState), &LIBID_FvDataSourcesLib, /* wMajor = */ 1, /* wMinor = */ 0>,
+   public IDispatchImpl<IFvDataSourceCallback, &__uuidof(IUIState), &LIBID_FvDataSourcesLib, /* wMajor = */ 1, /* wMinor = */ 0>,
    public CComErrorHandler
 {
@@ -71 +84 @@
    COM_INTERFACE_ENTRY(IRegionatedKMLContainer)
     COM_INTERFACE_ENTRY(IUIState)
+   COM_INTERFACE_ENTRY(IFvDataSourceCallback)
 END_COM_MAP()
 
@@ -88 +102 @@
       CInternalObjectRegistry::UnregisterObject(m_handle);
       m_b_objectFinalReleased = true;
+
+      m_imageCache.Clear();
     }
 
@@ -157 +173 @@
    STDMETHOD(raw_GetImageByIdentifier)(BSTR identifier, VARIANT* imageData);
 
+   // IFvDataSourceCallback Methods
+public:
+   STDMETHOD(raw_DataSourceChanged)();
+
    // IFvDataSourceEdit Methods
 public:
@@ -185 +205 @@
    kmlengine::KmzFilePtr m_kmz_file; // populate this if KMZ
    ULONG m_internalRefs;
-   STRING_TO_VARIANT_MAP m_imageCache;
+   CKmlImageCache m_imageCache;
    DATA_SOURCE_CALLBACK_VECTOR m_callbacks;
    bool m_b_objectFinalReleased;
@@ -200 +220 @@
    static std::string s_dumpFile;
    static void MaybeDumpKML(std::string& kml);
-
-   static ULONG s_nextMemFile;
 };