Changeset 2270

Timestamp:

03/04/10 12:11:44 (5 months ago)

Author:

JO94

Message:

fixed visibility and open status for network links

Location:

FalconView/trunk/public/fvw_core/GeodataDataSources

Files:

• LibkmlNetworkLink.cpp (modified) (4 diffs)
• LibkmlNetworkLink.h (modified) (2 diffs)

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

@@ -384 +384 @@
 STDMETHODIMP CLibkmlNetworkLink::get_Visible(VARIANT_BOOL *visible)
 {
-   *visible = m_visible;
+   // note that we base the visibility on the properties of the network link, not the wrapped object
+   *visible = m_networkLink->has_visibility() ? (m_networkLink->get_visibility() ? VARIANT_TRUE : VARIANT_FALSE) : VARIANT_TRUE;
    return S_OK;
 }
@@ -390 +391 @@
 STDMETHODIMP CLibkmlNetworkLink::put_Visible(VARIANT_BOOL visible)
 {
-   m_visible = visible;
+   m_networkLink->set_visibility(visible ? true : false);
    return S_OK;
 }
@@ -396 +397 @@
 STDMETHODIMP CLibkmlNetworkLink::get_Expanded(VARIANT_BOOL *expanded)
 {
-   *expanded = m_expanded;
+   // note that we base the expansion on the properties of the network link, not the wrapped object
+   *expanded = m_networkLink->has_open() ? (m_networkLink->get_open() ? VARIANT_TRUE : VARIANT_FALSE) : VARIANT_TRUE;
    return S_OK;
 }
@@ -402 +404 @@
 STDMETHODIMP CLibkmlNetworkLink::put_Expanded(VARIANT_BOOL expanded)
 {
-   m_expanded = expanded;
-   return S_OK;
-}
+   m_networkLink->set_open(expanded ? true : false);
+   return S_OK;
+}

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

@@ -49 +49 @@
    CLibkmlNetworkLink() : m_wrappedDataSource(NULL), m_bFirstAttemptToLoad(TRUE),
       m_leftLon(-180.0), m_bottomLat(-90.0), m_rightLon(180.0), m_topLat(90.0),
-      m_degreesPerPixelX(-1.0), m_degreesPerPixelY(-1.0), m_visible(VARIANT_TRUE), m_expanded(VARIANT_TRUE) {}
+      m_degreesPerPixelX(-1.0), m_degreesPerPixelY(-1.0) {}
 
 DECLARE_REGISTRY_RESOURCEID(IDR_LIBKMLNETWORKLINK)
@@ -131 +131 @@
    IFvDataSourcePtr m_wrappedDataSource;
    BOOL m_bFirstAttemptToLoad; // used to prevent firing data source changed notice the first time it's loaded
-   VARIANT_BOOL m_visible, m_expanded;
 
    // regionation parameters