New merge from develbranch_6 to fix hidden overlay property windows on Mac and fix to clear measurement lines (missed from previous merge and commit).

git-svn-id: https://svn.osgeo.org/grass/grass/trunk@35153 15284696-431f-4ddb-bdfa-cd5b030d7da7

gui/wxpython/gui_modules/mapdisp.py

@@ -48,13 +48,12 @@ except:
     sys.path.append(CompatPath)
     from compat import subprocess
 
-import grass
-
 gmpath = os.path.join(globalvar.ETCWXDIR, "icons")
 sys.path.append(gmpath)
 
 import render
 import toolbars
+import grassenv
 import track
 import menuform
 import gselect
@@ -793,6 +792,18 @@ class BufferedWindow(MapWindow, wx.Window):
                 coordtype = 'mapcoord'
             self.parent.gismanager.georectifying.DrawGCP(coordtype)
             
+        # 
+        # clear measurement
+        #
+        
+        if self.mouse["use"] == "measure":
+            self.ClearLines(pdc=self.pdcTmp)
+            self.polycoords = []
+            self.mouse['use'] = 'pointer'
+            self.mouse['box'] = 'point'
+            self.mouse['end'] = [0, 0]
+            self.SetCursor(self.parent.cursors["default"])
+            
         stop = time.clock()
 
         #
@@ -1080,7 +1091,7 @@ class BufferedWindow(MapWindow, wx.Window):
         elif event.Moving():
             self.OnMouseMoving(event)
 
-        event.Skip()
+#        event.Skip()
         
     def OnMouseWheel(self, event):
         """
@@ -1114,7 +1125,7 @@ class BufferedWindow(MapWindow, wx.Window):
 
         self.Refresh()
         self.processMouse = True
-        event.Skip()
+#        event.Skip()
 
     def OnDragging(self, event):
         """
@@ -1151,7 +1162,7 @@ class BufferedWindow(MapWindow, wx.Window):
                 # draw box only when left mouse button is pressed
                 self.MouseDraw(pdc=self.pdcTmp)
       
-        event.Skip()
+#        event.Skip()
 
     def OnLeftDown(self, event):
         """
@@ -1705,15 +1716,14 @@ class BufferedWindow(MapWindow, wx.Window):
                 self.textdict[self.dragid]['coords'] = self.pdc.GetIdBounds(self.dragid)
             else:
                 pass
+            self.dragid = None
+            self.currtxtid = None
+#            self.UpdateMap(render=True)
             
         else:
             pass
-
-        self.dragid = None
-        self.currtxtid = None
-        self.UpdateMap(render=True)
-                                                               
-        event.Skip()
+                                              
+#        event.Skip()
 
     def OnButtonDClick(self, event):
         """
@@ -1729,7 +1739,7 @@ class BufferedWindow(MapWindow, wx.Window):
             self.mouse['use'] = 'pointer'
             self.mouse['box'] = 'point'
             self.mouse['end'] = [0, 0]
-            ### self.Refresh()
+            self.Refresh()
             self.SetCursor(self.parent.cursors["default"])
         elif self.mouse["use"] == "profile":
             # profile
@@ -1760,7 +1770,7 @@ class BufferedWindow(MapWindow, wx.Window):
             elif self.dragid == 1:
                 self.parent.OnAddLegend(None)
                 
-        event.Skip()
+#        event.Skip()
 
     def OnRightDown(self, event):
         """
@@ -4094,7 +4104,7 @@ if __name__ == "__main__":
     gm_map.mapFrm.SetTitle ("GRASS GIS - Map Display: " + title + " - Location: " + \
                                 grass.gisenv()['LOCATION_NAME'])
     gm_map.MainLoop()
-
+    
     os.remove(cmdfilename)
     os.system("""g.gisenv set="GRASS_PYCMDFILE" """)