Changeset 2277 for FalconView/trunk/public/fvw_core/GeodataDataSources/LibkmlDataSource.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/LibkmlDataSource.cpp (modified) (7 diffs)

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

@@ -387 +387 @@
       std::string resolved_path(path);
 
-      if (m_kml_file_path)
+      if (m_kml_file_path.size())
       {
          // path is possibly relative to the path / URL of the file from which this was loaded
-         resolved_path = CUtilityMethods::ResolveURI(m_kml_file_path, path);
+         resolved_path = CUtilityMethods::ResolveURI(m_kml_file_path.c_str(), path);
       }
       
@@ -441 +441 @@
 
       // return a cached image, if there is one
-      STRING_TO_VARIANT_MAP::iterator iter = m_imageCache.find(identifierAsChar);
+      STRING_TO_VARIANT_MAP::iterator iter = m_imageCache.begin(); //find(identifierAsChar);
       if (iter != m_imageCache.end())
       {
@@ -528 +528 @@
 
       // load the KML into this object
-      LoadKML(file_data, url_cstr);
+      WrapKMLFile(LoadKML(file_data, url_cstr));
    }
    CATCH_BLOCK_RET
@@ -563 +563 @@
    __ensure_not_released();
 
-   if (m_kml_file_path)
-   {
-      _bstr_t u(m_kml_file_path);
-      *url = u.Detach();
+   if (m_kml_file_path.size())
+   {
+      *url = _bstr_t(m_kml_file_path.c_str()).Detach();
    }
    else
@@ -607 +606 @@
 }
 
-void CLibkmlDataSource::LoadKML(std::string &kml, const char* path) // path may be a URL, if this was opened from a URL
+kmlengine::KmlFilePtr CLibkmlDataSource::LoadKML(std::string &kml, const char* path) // path may be a URL, if this was opened from a URL
 {
    // CreateFromParse creates some pseudo-memory leaks.  These "leaks" do not grow and are not a problem.
@@ -652 +651 @@
    // save the path to the file
 
-   if (m_kml_file_path)
-      delete[] m_kml_file_path;
-
    if (path)
-   {
-      size_t s = strlen(path) + 1;
-      m_kml_file_path = new char[s];
-      memcpy(m_kml_file_path, path, s);
-   }
-
+      m_kml_file_path = path;
+
+   return kml_file;
+}
+
+void CLibkmlDataSource::WrapKMLFile(const kmlengine::KmlFilePtr& kml_file)
+{
    // wrap the root element (must be a data source type)
    kmldom::ElementPtr root = kml_file->get_root();
@@ -923 +920 @@
          (*iter)->DataSourceChanged();
       }
-      catch (...)
+      catch (_com_error& )
       {
          std::string msg("an exception was caught in making a callback on IFvDataSourceCallback");