Changeset 2277 for FalconView/trunk/public/fvw_core/GeodataDataSources/LibkmlNetworkLink.cpp

Timestamp:

03/05/10 11:44:10 (6 months ago)

Author:

gm78

Message:

Added threaded loading of KML NetworkLinks?.

Files:

• FalconView/trunk/public/fvw_core/GeodataDataSources/LibkmlNetworkLink.cpp (modified) (18 diffs)

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

@@ -24 +24 @@
 #include "LibkmlDataSource.h"
 #include "ComErrorObject.h"
+#include "KMLDataLoader.h"
 
 // CLibkmlNetworkLink
@@ -32 +33 @@
    {
       PopulateWrappedDataSourceAsNecessary();
-      if (m_wrappedDataSource)
-         return m_wrappedDataSource->get_DataSetCount(count);
+      const IFvDataSourcePtr& wrappedDataSource = m_networkLinkResource.GetWrappedDataSource();
+      if (wrappedDataSource)
+         return wrappedDataSource->get_DataSetCount(count);
    }
    catch (...)
@@ -54 +56 @@
    {
       PopulateWrappedDataSourceAsNecessary();
-      if (m_wrappedDataSource)
-         return m_wrappedDataSource->raw_GetDataSet(index, dataSet);
+      const IFvDataSourcePtr& wrappedDataSource = m_networkLinkResource.GetWrappedDataSource();
+      if (wrappedDataSource)
+         return wrappedDataSource->raw_GetDataSet(index, dataSet);
       return E_FAIL;
    }
@@ -72 +75 @@
       {
          PopulateWrappedDataSourceAsNecessary();
-         if (m_wrappedDataSource)
-            return m_wrappedDataSource->get_Name(name);
+         const IFvDataSourcePtr& wrappedDataSource = m_networkLinkResource.GetWrappedDataSource();
+         if (wrappedDataSource)
+            return wrappedDataSource->get_Name(name);
          *name = _bstr_t("<NetworkLink>").Detach();
       }
@@ -87 +91 @@
    {
       PopulateWrappedDataSourceAsNecessary();
-      if (m_wrappedDataSource)
-         return m_wrappedDataSource->raw_GetDataSetByName(name, dataSet);
+      const IFvDataSourcePtr& wrappedDataSource = m_networkLinkResource.GetWrappedDataSource();
+      if (wrappedDataSource)
+         return wrappedDataSource->raw_GetDataSetByName(name, dataSet);
       return E_FAIL;
    }
@@ -99 +104 @@
    {
       PopulateWrappedDataSourceAsNecessary();
-      if (m_wrappedDataSource)
-         return m_wrappedDataSource->get_DataSourceCount(count);
+      const IFvDataSourcePtr& wrappedDataSource = m_networkLinkResource.GetWrappedDataSource();
+      if (wrappedDataSource)
+         return wrappedDataSource->get_DataSourceCount(count);
    }
    catch (...)
@@ -121 +127 @@
    {
       PopulateWrappedDataSourceAsNecessary();
-      if (m_wrappedDataSource)
-         return m_wrappedDataSource->raw_GetDataSource(index, dataSource);
+      const IFvDataSourcePtr& wrappedDataSource = m_networkLinkResource.GetWrappedDataSource();
+      if (wrappedDataSource)
+         return wrappedDataSource->raw_GetDataSource(index, dataSource);
       return E_FAIL;
    }
@@ -133 +140 @@
    {
       PopulateWrappedDataSourceAsNecessary();
-      if (m_wrappedDataSource)
-         return m_wrappedDataSource->raw_GetDataSourceByName(name, dataSource);
+      const IFvDataSourcePtr& wrappedDataSource = m_networkLinkResource.GetWrappedDataSource();
+      if (wrappedDataSource)
+         return wrappedDataSource->raw_GetDataSourceByName(name, dataSource);
       return E_FAIL;
    }
@@ -152 +160 @@
       PopulateWrappedDataSourceAsNecessary();
 
-      if (m_wrappedDataSource)
-      {
-         ISymbolFactoryPtr symbolFactory = m_wrappedDataSource;
+      const IFvDataSourcePtr& wrappedDataSource = m_networkLinkResource.GetWrappedDataSource();
+      if (wrappedDataSource)
+      {
+         ISymbolFactoryPtr symbolFactory = wrappedDataSource;
          if (symbolFactory)
             return symbolFactory->raw_GetImageByIdentifier(identifier, imageData);
@@ -181 +190 @@
    try
    {
-      if (!m_wrappedDataSource && m_networkLink->has_link())
+      if (m_networkLinkResource.State() == Resource_Not_Loaded && m_networkLink->has_link())
       {
          // If the regionation parameters have been set and the feature is active,
@@ -205 +214 @@
          {
             // get the base URL
-            IFvDataSourcePtr dataSource(CLSID_LibkmlDataSource);
-            ILibkmlDataSourcePtr libkmlDataSource = dataSource;
             kmldom::LinkPtr link = m_networkLink->get_link();
             std::string url = CUtilityMethods::ResolveURI((char*)m_rootDS->URL, (char*)link->get_href().c_str());
@@ -262 +269 @@
             }
 
-            // populate the data source from the URL
-            long handle = libkmlDataSource->GetHandle();
-            CLibkmlDataSource* ds = (CLibkmlDataSource*)CInternalObjectRegistry::GetObject(handle);
-            std::string kml_data;
-            ds->FetchDataRelativeToDataSource(url.c_str(), kml_data);
-            ds->LoadKML(kml_data, url.c_str());
-
-            m_wrappedDataSource = dataSource.Detach();
-
-            // register for callbacks on the wrapped data source so that changes notices get fired to anything registered
-            // for callbacks on the root data source
-            dataSource = libkmlDataSource; // reassociate the smart pointer after Detach()
-            dataSource->RegisterForCallbacks(this);
-
-            // indicate to the root data source that something has changed
-            if (!m_bFirstAttemptToLoad)
-               CLibkmlDataSource::FireDataSourceChanged(m_rootDS->Handle);
+            // Load the networklink in a background thread
+            m_networkLinkResource.SetResolvedUri(url);
+            CKMLDataLoader::GetInstance()->AddLoadRequest(this, &m_networkLinkResource);
          }
       }
@@ -284 +277 @@
    catch (...)
    {
-      m_wrappedDataSource = NULL;
       THROW_ERROR_MSG2(E_FAIL, "exception in CLibkmlNetworkLink::PopulateWrappedDataSourceAsNecessary()");
    }
@@ -296 +288 @@
    {
       PopulateWrappedDataSourceAsNecessary();
-      if (m_wrappedDataSource)
-         return m_wrappedDataSource->raw_Extent2D(minX, minY, maxX, maxY);
+      const IFvDataSourcePtr& wrappedDataSource = m_networkLinkResource.GetWrappedDataSource();
+      if (wrappedDataSource)
+         return wrappedDataSource->raw_Extent2D(minX, minY, maxX, maxY);
       return E_FAIL;
    }
@@ -314 +307 @@
       {
          PopulateWrappedDataSourceAsNecessary();
-         if (m_wrappedDataSource)
-            return m_wrappedDataSource->get_Description(description);
+         const IFvDataSourcePtr& wrappedDataSource = m_networkLinkResource.GetWrappedDataSource();
+         if (wrappedDataSource)
+            return wrappedDataSource->get_Description(description);
          *description = _bstr_t("A KML <NetworkLink>.").Detach();
       }
@@ -329 +323 @@
    {
       IFvDataSourcePtr rootDS = m_rootDS;
-      return rootDS->RegisterForCallbacks(fvDataSourceCallback);;
+      return rootDS->RegisterForCallbacks(fvDataSourceCallback);
    }
    CATCH_BLOCK_RET
@@ -339 +333 @@
    {
       IFvDataSourcePtr rootDS = m_rootDS;
-      return rootDS->UnregisterForCallbacks(fvDataSourceCallback);;
+      return rootDS->UnregisterForCallbacks(fvDataSourceCallback);
    }
    CATCH_BLOCK_RET
@@ -362 +356 @@
 
       // pass the parameters on to any wrapped data source
-      IRegionatedKMLContainerPtr regionatedKMLContainer = m_wrappedDataSource;
+      IRegionatedKMLContainerPtr regionatedKMLContainer = m_networkLinkResource.GetWrappedDataSource();
       if (regionatedKMLContainer)
          regionatedKMLContainer->SetRegionationParameters(leftLon, bottomLat, rightLon, topLat, degreesPerPixelX, degreesPerPixelY);