Merge pull request #301 from Esri/dev

August 2018 Release

source/addins/ArcMapAddinVisibility/ArcMapAddinVisibility.csproj

@@ -146,6 +146,9 @@
       <DependentUpon>Config.esriaddinx</DependentUpon>
     </Compile>
     <Compile Include="Models\AddInPoint.cs" />
+    <Compile Include="Models\AddInPointObject.cs">
+      <SubType>Code</SubType>
+    </Compile>
     <Compile Include="Models\AMGraphic.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>

source/addins/ArcMapAddinVisibility/Models/AddInPointObject.cs

@@ -0,0 +1,27 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace ArcMapAddinVisibility.Models
+{
+    public class AddInPointObject
+    {
+        private int _id;
+
+        public int ID
+        {
+            get { return _id; }
+            set { _id = value; }
+        }
+        private AddInPoint _addInPoint;
+
+        public AddInPoint AddInPoint
+        {
+            get { return _addInPoint; }
+            set { _addInPoint = value; }
+        }
+
+    }
+}

source/addins/ArcMapAddinVisibility/ViewModels/TabBaseViewModel.cs

@@ -42,6 +42,7 @@ public TabBaseViewModel()
             CancelCommand = new RelayCommand(OnCancelCommand);
 
             // Mediator
+            Mediator.Register(Constants.NEW_MAP_POINT, OnMapClickEvent);
             Mediator.Register(Constants.NEW_MAP_POINT, OnNewMapPointEvent);
             Mediator.Register(Constants.MOUSE_MOVE_POINT, OnMouseMoveEvent);
             Mediator.Register(Constants.TAB_ITEM_SELECTED, OnTabItemSelected);
@@ -68,7 +69,7 @@ protected virtual void OnActiveToolChanged(object obj)
         {
             string currentActiveToolName = obj as string;
 
-            if ((currentActiveToolName == ThisAddIn.IDs.MapPointTool))   
+            if ((currentActiveToolName == ThisAddIn.IDs.MapPointTool))
                 return;
 
             lastActiveToolName = currentActiveToolName;
@@ -292,6 +293,7 @@ public virtual bool CanCreateElement
         public VisibilityLibrary.Helpers.RelayCommand ActivateToolCommand { get; set; }
         public VisibilityLibrary.Helpers.RelayCommand EnterKeyCommand { get; set; }
         public VisibilityLibrary.Helpers.RelayCommand CancelCommand { get; set; }
+        public bool IsMapClick { get; set; }
 
         internal void OnCancelCommand(object obj)
         {
@@ -411,7 +413,7 @@ internal void RemoveGraphics(IGraphicsContainer gc, List<AMGraphic> list)
                 }
             }
             elementList.Clear();
-            
+
             RaisePropertyChanged(() => HasMapGraphics);
         }
 
@@ -474,7 +476,13 @@ internal virtual void OnNewMapPointEvent(object obj)
             // do nothing
         }
 
+        internal virtual void OnMapClickEvent(object obj)
+        {
+            IsMapClick = true;
+        } 
+
         #endregion
+
         #region Public Functions
         /// <summary>
         /// Method used to deactivate tool
@@ -502,11 +510,11 @@ public void SetToolActiveInToolBar(string toolName)
                 return;
             }
 
-            if ((ArcMap.Application.CurrentTool != null) && 
+            if ((ArcMap.Application.CurrentTool != null) &&
                 (ArcMap.Application.CurrentTool.Name.Equals(toolName)))
-                    // Tricky: Check if tool already active - because setting CurrentTool again will 
-                    //         cause Activate/Deactive to be called by ArcGIS framework
-                    return;
+                // Tricky: Check if tool already active - because setting CurrentTool again will 
+                //         cause Activate/Deactive to be called by ArcGIS framework
+                return;
 
             ESRI.ArcGIS.Framework.ICommandBars commandBars = ArcMap.Application.Document.CommandBars;
             ESRI.ArcGIS.esriSystem.UID commandID = new ESRI.ArcGIS.esriSystem.UIDClass();
@@ -530,37 +538,37 @@ private string GetFormattedPoint(IPoint point)
 
             try
             {
-            var cn = point as IConversionNotation;
-            if (cn != null)
-            {
-                switch (VisibilityConfig.AddInConfig.DisplayCoordinateType)
+                var cn = point as IConversionNotation;
+                if (cn != null)
                 {
-                    case CoordinateTypes.DD:
-                        result = cn.GetDDFromCoords(6);
-                        break;
-                    case CoordinateTypes.DDM:
-                        result = cn.GetDDMFromCoords(4);
-                        break;
-                    case CoordinateTypes.DMS:
-                        result = cn.GetDMSFromCoords(2);
-                        break;
-                    //case CoordinateTypes.GARS:
-                    //    result = cn.GetGARSFromCoords();
-                    //    break;
-                    case CoordinateTypes.MGRS:
-                        result = cn.CreateMGRS(5, true, esriMGRSModeEnum.esriMGRSMode_Automatic);
-                        break;
-                    case CoordinateTypes.USNG:
-                        result = cn.GetUSNGFromCoords(5, true, true);
-                        break;
-                    case CoordinateTypes.UTM:
-                        result = cn.GetUTMFromCoords(esriUTMConversionOptionsEnum.esriUTMAddSpaces | esriUTMConversionOptionsEnum.esriUTMUseNS);
-                        break;
-                    default:
-                        break;
+                    switch (VisibilityConfig.AddInConfig.DisplayCoordinateType)
+                    {
+                        case CoordinateTypes.DD:
+                            result = cn.GetDDFromCoords(6);
+                            break;
+                        case CoordinateTypes.DDM:
+                            result = cn.GetDDMFromCoords(4);
+                            break;
+                        case CoordinateTypes.DMS:
+                            result = cn.GetDMSFromCoords(2);
+                            break;
+                        //case CoordinateTypes.GARS:
+                        //    result = cn.GetGARSFromCoords();
+                        //    break;
+                        case CoordinateTypes.MGRS:
+                            result = cn.CreateMGRS(5, true, esriMGRSModeEnum.esriMGRSMode_Automatic);
+                            break;
+                        case CoordinateTypes.USNG:
+                            result = cn.GetUSNGFromCoords(5, true, true);
+                            break;
+                        case CoordinateTypes.UTM:
+                            result = cn.GetUTMFromCoords(esriUTMConversionOptionsEnum.esriUTMAddSpaces | esriUTMConversionOptionsEnum.esriUTMUseNS);
+                            break;
+                        default:
+                            break;
+                    }
                 }
             }
-            }
             catch (Exception ex)
             {
                 System.Diagnostics.Debug.WriteLine(ex.Message);
@@ -600,6 +608,7 @@ private void OnTabItemSelected(object obj)
                 return;
 
             IsActiveTab = (obj == this);
+            IsMapClick = false;
         }
 
         internal string AddTextToMap(string text, IGeometry geom, IColor color, bool IsTempGraphic = false, int size = 12)
@@ -653,9 +662,12 @@ internal string AddTextToMap(string text, IGeometry geom, IColor color, bool IsT
         /// Adds a graphic element to the map graphics container
         /// </summary>
         /// <param name="geom">IGeometry</param>
-        internal string AddGraphicToMap(IGeometry geom, IColor color, bool IsTempGraphic = false, 
-            esriSimpleMarkerStyle markerStyle = esriSimpleMarkerStyle.esriSMSCircle, int size = 5)
+        internal string AddGraphicToMap(IGeometry geom, IColor color, bool IsTempGraphic = false,
+            esriSimpleMarkerStyle markerStyle = esriSimpleMarkerStyle.esriSMSCircle, int size = 5, IColor borderColor = null)
         {
+            if (borderColor == null)
+                borderColor = color;
+
             if (geom == null || ArcMap.Document == null || ArcMap.Document.FocusMap == null)
                 return string.Empty;
 
@@ -669,7 +681,7 @@ internal string AddGraphicToMap(IGeometry geom, IColor color, bool IsTempGraphic
                 var simpleMarkerSymbol = (ISimpleMarkerSymbol)new SimpleMarkerSymbol();
                 simpleMarkerSymbol.Color = color;
                 simpleMarkerSymbol.Outline = true;
-                simpleMarkerSymbol.OutlineColor = color;
+                simpleMarkerSymbol.OutlineColor = borderColor;
                 simpleMarkerSymbol.Size = size;
                 simpleMarkerSymbol.Style = markerStyle;
 
@@ -695,16 +707,16 @@ internal string AddGraphicToMap(IGeometry geom, IColor color, bool IsTempGraphic
                 IPolygonElement pe = (IPolygonElement)new PolygonElementClass();
                 element = pe as IElement;
                 IFillShapeElement fe = (IFillShapeElement)pe;
-                
+
                 var fillSymbol = new SimpleFillSymbolClass();
                 RgbColor selectedColor = new RgbColorClass();
                 selectedColor.Red = 0;
                 selectedColor.Green = 0;
                 selectedColor.Blue = 0;
 
                 selectedColor.Transparency = (byte)0;
-                fillSymbol.Color = selectedColor;  
-                
+                fillSymbol.Color = selectedColor;
+
                 fe.Symbol = fillSymbol;
             }
 
@@ -720,7 +732,7 @@ internal string AddGraphicToMap(IGeometry geom, IColor color, bool IsTempGraphic
             var eprop = (IElementProperties)element;
             eprop.Name = Guid.NewGuid().ToString();
 
-            GraphicsList.Add(new AMGraphic(eprop.Name, geom, IsTempGraphic)); 
+            GraphicsList.Add(new AMGraphic(eprop.Name, geom, IsTempGraphic));
 
             gc.AddElement(element, 0);
 
@@ -732,7 +744,7 @@ internal string AddGraphicToMap(IGeometry geom, IColor color, bool IsTempGraphic
         }
 
         internal DistanceTypes GetDistanceType(int linearUnitFactoryCode)
-        { 
+        {
             DistanceTypes distanceType = DistanceTypes.Meters;
             switch (linearUnitFactoryCode)
             {
@@ -826,7 +838,7 @@ internal void ZoomToExtent(IGeometry geom)
             var av = (IActiveView)ArcMap.Document.FocusMap;
 
             IEnvelope env = geom.Envelope;
-
+            
             double extentPercent = (env.XMax - env.XMin) > (env.YMax - env.YMin) ? (env.XMax - env.XMin) * .3 : (env.YMax - env.YMin) * .3;
             env.XMax = env.XMax + extentPercent;
             env.XMin = env.XMin - extentPercent;