Changeset 2279

Timestamp:

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

Author:

gm78

Message:

Added threaded loading of KML images.

Location:

FalconView/trunk/public/fvw_core/GeodataDataSources

Files:

• GeodataDataSources.vcproj (modified) (2 diffs)
• KMLImageDataResource.cpp (added)
• KMLImageDataResource.h (added)
• KMLResource.h (modified) (3 diffs)
• LibkmlDataSource.cpp (modified) (3 diffs)
• LibkmlDataSource.h (modified) (7 diffs)
• UtilityMethods.h (modified) (1 diff)

FalconView/trunk/public/fvw_core/GeodataDataSources/GeodataDataSources.vcproj

@@ -550 +550 @@
             </File>
             <File
+                RelativePath=".\KMLImageDataResource.cpp"
+                >
+            </File>
+            <File
                 RelativePath=".\KMLNetworkLinkResource.cpp"
                 >
@@ -744 +748 @@
             </File>
             <File
+                RelativePath=".\KMLImageDataResource.h"
+                >
+            </File>
+            <File
                 RelativePath=".\KMLNetworkLinkResource.h"
                 >

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

@@ -15 +15 @@
 
    IStream* m_pMarshalingStream;
-   IFvDataSourceCallbackPtr m_marshaledCallback;
 
 public:
@@ -36 +35 @@
       {
          // create IStream used for marshalling
-         m_marshaledCallback = NULL;
+         m_pMarshalingStream = NULL;
          THROW_IF_NOT_OK(::CoMarshalInterThreadInterfaceInStream(IID_IFvDataSourceCallback, 
             pDataSourceCallback, &m_pMarshalingStream));
@@ -51 +50 @@
        try
        {
-          // marshall the IDisplayChangeNotifyEvents interface to this thread
-          HRESULT hr = ::CoGetInterfaceAndReleaseStream(m_pMarshalingStream, 
-             IID_IFvDataSourceCallback, reinterpret_cast<void **>(&m_marshaledCallback));
+          if (m_pMarshalingStream != NULL)
+          {
+             // marshall the IDisplayChangeNotifyEvents interface to this thread
+             IFvDataSourceCallbackPtr marshaledCallback;
 
-          if (m_marshaledCallback != NULL)
-             m_marshaledCallback->DataSourceChanged();
+             HRESULT hr = ::CoGetInterfaceAndReleaseStream(m_pMarshalingStream, 
+                IID_IFvDataSourceCallback, reinterpret_cast<void **>(&marshaledCallback));
+
+             if (marshaledCallback != NULL)
+                marshaledCallback->DataSourceChanged();
+          }
        }
        catch(_com_error &)

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

@@ -38 +38 @@
 #include "kml/base/file.h"
 #include "kml/base/uri_parser.h"
+#include "KMLImageDataResource.h"
+#include "KMLDataLoader.h"
 
 // CLibkmlDataSource
-
-/* static */ ULONG CLibkmlDataSource::s_nextMemFile = 0;
 
 STDMETHODIMP CLibkmlDataSource::raw_Open(BSTR file)
@@ -441 +441 @@
 
       // return a cached image, if there is one
-      STRING_TO_VARIANT_MAP::iterator iter = m_imageCache.begin(); //find(identifierAsChar);
-      if (iter != m_imageCache.end())
-      {
-         // return the cached image
-         *imageData = _variant_t(iter->second).Detach(); // copies buffer to imageData
+      CKMLImageDataResource* pCachedImage = m_imageCache.Find(identifierAsChar);
+      if (pCachedImage != NULL)
+      {
+         pCachedImage->GetImageData(imageData);
          return S_OK;
       }
 
-      // no image cached
-
-      // fetch the image data
-      std::string file_contents;
-      FetchDataRelativeToDataSource(identifierAsChar, file_contents);
-      char mem_file_name[MEM_FILE_NAME_MAX_LENGTH];
-      sprintf_s(mem_file_name, MEM_FILE_NAME_MAX_LENGTH, "/vsimem/LibkmlDSMemFile%u", s_nextMemFile++);
-      VSIFCloseL(VSIFileFromMemBuffer(mem_file_name, (GByte*)file_contents.c_str(), file_contents.length(), FALSE));
-
-      // use GDAL to interpret the raw data
-      IFvGDALDataSetPtr GDALDataset(CLSID_FvGDALDataSet);
-      GDALDataset->Open(_bstr_t(mem_file_name));
-      IRasterDataSetPtr raster = GDALDataset;
-      *imageData = raster->InterpretAsImage().Detach();
-      VSIUnlink(mem_file_name);
-
-      // cache the image
-      m_imageCache[identifierAsChar] = _variant_t(imageData); // copies imageData to buffer
-   }
-   CATCH_BLOCK_RET
-
+      // no image cached.  we'll create a resource for the image and
+      // load it in a background thread
+      CKMLImageDataResource* imageDataResource = new CKMLImageDataResource(this, identifierAsChar);
+      m_imageCache.Insert(identifierAsChar, imageDataResource);
+      CKMLDataLoader::GetInstance()->AddLoadRequest(this, imageDataResource);
+
+      imageDataResource->GetImageData(imageData);
+   }
+   CATCH_BLOCK_RET
+
+   return S_OK;
+}
+
+STDMETHODIMP CLibkmlDataSource::raw_DataSourceChanged()
+{
+   FireDataSourceChanged(m_handle);
    return S_OK;
 }
@@ -956 +950 @@
    return S_OK;
 }
+
+
+void CKmlImageCache::Insert(const std::string& imageId, CKMLImageDataResource *pResource)
+{
+   // add smarts here to manage resource quotas in the cache 
+   //
+
+   m_imageCache[imageId] = pResource;
+}
+
+CKMLImageDataResource* CKmlImageCache::Find(const std::string& imageId)
+{
+   std::map<std::string, CKMLImageDataResource*>::iterator it = m_imageCache.find(imageId);
+   if (it == m_imageCache.end())
+      return NULL;
+
+   return it->second;
+}
+
+void CKmlImageCache::Clear()
+{
+   std::map<std::string, CKMLImageDataResource*>::iterator it = m_imageCache.begin();
+   for(; it != m_imageCache.end(); ++it)
+      delete it->second;
+}

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;
 };
 

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

@@ -146 +146 @@
    STDMETHOD(raw_GetLeakData)(VARIANT* leakData);
 
-   static ULONG s_nextMemFile;
-
    static OGRPoint* Copy2OGR(IPoint* point);
    static OGRLineString* Copy2OGR(ILineString* lineString);