Changeset 2300

Timestamp:

03/09/10 09:09:53 (5 months ago)

Author:

JO94

Message:

fixed setting placemark visibility

Location:

FalconView/trunk/public/fvw_core

Files:

• GeodataDataSources/LibkmlContainerBase.cpp (modified) (2 diffs)
• GeodataDataSources/LibkmlGroundOverlay.cpp (modified) (1 diff)
• GeodataDataSources/LibkmlNetworkLink.cpp (modified) (1 diff)
• GeodataDataSources/LibkmlScreenOverlay.cpp (modified) (1 diff)
• GeodataDataSources/UtilityMethods.cpp (modified) (2 diffs)
• GeodataDataSources/UtilityMethods.h (modified) (1 diff)
• SharedDotNetUtils/RubberSheet.cs (modified) (2 diffs)

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

@@ -619 +619 @@
    // Note that Google Earth apparently will set a container to visible if any of its children are
    // visible.  The OGC standard doesn't seem to read this way, so we only look at the container itself.
-   *visible = m_container->has_visibility() ? (m_container->get_visibility() ? VARIANT_TRUE : VARIANT_FALSE) : VARIANT_TRUE;
+   *visible = CUtilityMethods::KMLFeatureVisible(m_container) ? VARIANT_TRUE : VARIANT_FALSE;
    return S_OK;
 }
@@ -625 +625 @@
 STDMETHODIMP LibkmlContainerBase::base_put_Visible(VARIANT_BOOL visible)
 {
-   m_container->set_visibility(visible ? true : false);
+   if (visible)
+      CUtilityMethods::SetKMLFeatureVisible(m_container);
+   else
+      m_container->set_visibility(false);
    return S_OK;
 }

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

@@ -333 +333 @@
 STDMETHODIMP CLibkmlGroundOverlay::put_Visible(VARIANT_BOOL visible)
 {
-   m_ground_overlay->set_visibility(visible ? true : false);
+   if (visible)
+      CUtilityMethods::SetKMLFeatureVisible(m_ground_overlay);
+   else
+      m_ground_overlay->set_visibility(false);
    return S_OK;
 }

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

@@ -385 +385 @@
 STDMETHODIMP CLibkmlNetworkLink::put_Visible(VARIANT_BOOL visible)
 {
-   m_networkLink->set_visibility(visible ? true : false);
+   if (visible)
+      CUtilityMethods::SetKMLFeatureVisible(m_networkLink);
+   else
+      m_networkLink->set_visibility(false);
    return S_OK;
 }

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

@@ -274 +274 @@
 STDMETHODIMP CLibkmlScreenOverlay::put_Visible(VARIANT_BOOL visible)
 {
-   m_screen_overlay->set_visibility(visible ? true : false);
+   if (visible)
+      CUtilityMethods::SetKMLFeatureVisible(m_screen_overlay);
+   else
+      m_screen_overlay->set_visibility(false);
    return S_OK;
 }

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

@@ -709 +709 @@
 {
    if (feature == NULL)
-      return true;
+      return true; // end recursion
 
    // In order for a feature to be visible, the <visibility> tag of all its ancestors must also be set to 1
@@ -718 +718 @@
 }
 
+/* static */ void CUtilityMethods::SetKMLFeatureVisible(const kmldom::FeaturePtr& feature)
+{
+   if (feature == NULL)
+      return; // end recursion
+   feature->set_visibility(true);
+   // set all ancestors visible
+   SetKMLFeatureVisible(kmldom::AsFeature(GetAncestorOfType(feature, kmldom::Type_Feature)));
+}
 
 //

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

@@ -108 +108 @@
       DOUBLE leftLon, DOUBLE bottomLat, DOUBLE rightLon, DOUBLE topLat,
       DOUBLE degreesPerPixelX, DOUBLE degreesPerPixelY); // use negative number if dpp is not set)
-
    static bool KMLFeatureVisible(const kmldom::FeaturePtr& feature);
+   static void SetKMLFeatureVisible(const kmldom::FeaturePtr& feature);
 
    static std::string ResolveURI(const char* base_url, const char* uri);

FalconView/trunk/public/fvw_core/SharedDotNetUtils/RubberSheet.cs

@@ -1 @@
-// Copyright (c) 1994-2009 Georgia Tech Research Corporation, Atlanta, GA
+// Copyright (c) 1994-2010 Georgia Tech Research Corporation, Atlanta, GA
 // This file is part of FalconView(tm).
 
@@ -314 +314 @@
 
             // constrain the lower left to >= 180 (some KML images, for example, may be outside this bound)
-            while (m_ll_lon < 180) m_ll_lon += 360;
+            while (m_ll_lon < -180) m_ll_lon += 360;
          }