Changeset 2275

Timestamp:

03/05/10 08:34:54 (5 months ago)

Author:

JO94

Message:

working on refreshing properly

Location:

FalconView/trunk/public/Plugins/Overlays/GeodataOverlayServer

Files:

• DataSourceTree.cs (modified) (4 diffs)
• GeodataOverlay.cs (modified) (6 diffs)

FalconView/trunk/public/Plugins/Overlays/GeodataOverlayServer/DataSourceTree.cs

@@ -57 +57 @@
       {
          InitializeComponent();
+
          tree.Parent = this;
          tree.Dock = DockStyle.Fill;
@@ -102 +103 @@
          Tree.AfterExpand += handler;
       }
+
+      public GeodataOverlay Overlay = null;
 
       private void UpdateDataSourceExpandedState(object sender, TreeViewEventArgs e)
@@ -450 +453 @@
       }
 
-      void Tree_AfterCheck(object sender, TreeViewEventArgs e)
+      private void Tree_AfterCheck(object sender, TreeViewEventArgs e)
       {
          Tree.AfterCheck -= m_clickHandler;
@@ -457 +460 @@
          else
             SetCheckNodeAndChildren((FvDataTreeNode)e.Node, false);
-         new fvw.LayerClass().Refresh(-1); // refresh FalconView
+         Overlay.RefreshFalconView();
          Tree.AfterCheck += m_clickHandler;
       }
 
-      void Tree_NodeMouseClick(object sender, System.Windows.Forms.TreeNodeMouseClickEventArgs e)
+      private void Tree_NodeMouseClick(object sender, System.Windows.Forms.TreeNodeMouseClickEventArgs e)
       {
          Tree.SelectedNode = e.Node;

FalconView/trunk/public/Plugins/Overlays/GeodataOverlayServer/GeodataOverlay.cs

@@ -80 +80 @@
       void Singleton_SettingsApplied()
       {
-         new fvw.LayerClass().Refresh(-1); // refresh FalconView
+         RefreshFalconView();
       }
 
@@ -104 +104 @@
          {
             if (s_treeControl == null)
-            {
                s_treeControl = new GeodataControl();
-            }
+
             return s_treeControl;
          }
@@ -124 +123 @@
       {
          DefaultRendererSettings.Singleton.SettingsApplied += new AppliedHandler(Singleton_SettingsApplied);
+
+         // Give the data source tree a reference to this overlay so that it can refresh
+         // FalconView.  Note that this may reset a reference to another Geodata overlay.
+         Tree.Overlay = this;
       }
 
@@ -493 +496 @@
                //draw children
                OnDraw(m_dataSource);
-
             }
             catch (Exception ex)
@@ -599 +601 @@
       }
 
-      void Tree_OnTreeNodeRefreshed(object sender, FvDataTreeNode oldNode, FvDataTreeNode newNode)
+      public void RefreshFalconView()
+      {
+         // InvalidateOverlay doesn't work if it is called while we are in OnDraw
+         //if (m_displayChangeNotifyEvents != null) m_displayChangeNotifyEvents.InvalidateOverlay();
+         new fvw.LayerClass().Refresh(-1); // refresh FalconView
+      }
+
+      private void Tree_OnTreeNodeRefreshed(object sender, FvDataTreeNode oldNode, FvDataTreeNode newNode)
       {
          if (m_dataSource == oldNode) m_dataSource = newNode;
-         new fvw.LayerClass().Refresh(-1); // refresh FalconView
+         RefreshFalconView();
       }
 
@@ -705 +714 @@
          // TODO: Don't invalidate every time, if possible.  Problem is that we don't know when data sets
          // may change based on temporal filter changes.
-         new fvw.LayerClass().Refresh(-1); // refresh FalconView
+         RefreshFalconView();
          m_temporalFilterDateTime = dateCurrentTime;
       }