Merge branch 'release/v5.5'

Author: pmeems

.gitignore

@@ -5,6 +5,7 @@
 *.suo
 *.user
 *.sln.docstates
+.vs/
 
 # Build results
 

install/MapWindow5.iss

@@ -7,18 +7,19 @@
 #define ExeBinPath "..\bin\x86\Release"
 #define SamplePath "testdata"
 #define CPU "Win32"
-#define vcredist "vcredist_x86-2015.exe"
+#define vcredist "vcredist_x86-2017.exe"
 #define SystemFlag "32bit"
 #define MyAppName "MapWindow5"
 #define MyAppPublisher "MapWindow Open Source GIS Community"
 #define MyAppURL "https://www.mapwindow.org/documentation/mapwindow5/"
 #define ReleaseNotes ExeBinPath + "\..\..\..\src\SolutionItems\ReleaseNotes.rtf"
+#define GdalLicensePath ExeBinPath + "\..\..\..\..\..\MapWinGIS\git\support\GDAL_SDK\licenses\
 
 #define x64BitVersion true
 
 #ifdef x64BitVersion
   #define CPU "x64"
-  #define vcredist "vcredist_x64_2015.exe"
+  #define vcredist "vcredist_x64-2017.exe"
   #define ExeBinPath "..\bin\x64\Release"
   #define SystemFlag "64bit"
 #endif
@@ -93,7 +94,7 @@ Source: "{#ExeBinPath}\Projections\*"; DestDir: "{app}\Projections"; Flags: igno
 ;; Manuals sub folder
 Source: "{#ExeBinPath}\Manuals\*"; DestDir: "{app}\Manuals"; Flags: ignoreversion recursesubdirs createallsubdirs {#SystemFlag}; Components: MapWindow
 ;; Plugins subfolder
-Source: "{#ExeBinPath}\Plugins\*.dll"; DestDir: "{app}\Plugins"; Flags: ignoreversion {#SystemFlag}; Components: MapWindow; Excludes: "Interop.MapWinGIS.dll,MW5.TemplatePlugin.dll,Syncfusion.*"
+Source: "{#ExeBinPath}\Plugins\*"; DestDir: "{app}\Plugins"; Flags: ignoreversion recursesubdirs createallsubdirs {#SystemFlag}; Components: MapWindow; Excludes: "Interop.MapWinGIS.dll,MW5.TemplatePlugin.dll,Syncfusion.*"
 ;; Styles subfolder
 Source: "{#ExeBinPath}\Styles\*"; DestDir: "{app}\Styles"; Flags: ignoreversion recursesubdirs createallsubdirs {#SystemFlag}; Components: MapWindow
 ;; SQLite interop:
@@ -105,7 +106,7 @@ Source: "{#ExeBinPath}\x86\*"; DestDir: "{app}\x86"; Flags: ignoreversion {#Syst
 ;; Config files:
 Source: "{#ExeBinPath}\MapWindow.exe.config"; DestDir: "{app}"; Flags: ignoreversion {#SystemFlag}; Components: MapWindow; Permissions: users-modify
 ;; Licenses
-Source: "D:\dev\MapwinGIS\GitHub\support\GDAL_SDK\licenses\*.rtf"; DestDir: "{app}\Licenses"; Flags: ignoreversion; Components: MapWindow
+Source: "{#GdalLicensePath}\*.rtf"; DestDir: "{app}\Licenses"; Flags: ignoreversion; Components: MapWindow
 Source: "{#ExeBinPath}\..\..\..\licenses\*"; DestDir: "{app}\Licenses"; Flags: ignoreversion {#SystemFlag}; Components: MapWindow
 
 ;; Sample data
@@ -123,7 +124,7 @@ Source: "{#ReleaseNotes}"; DestDir: "{app}"; Flags: ignoreversion; Components: M
 BeveledLabel={#MyAppName}
 
 [Run]
-; Install VC++ 2015 if needed:
+; Install VC++ 2017 if needed:
 #ifdef x64BitVersion
 Filename: "{tmp}\{#vcredist}"; Parameters: "/quiet"; Flags: waituntilterminated; Check: VCRedistNeedsInstall_x64()
 #else
@@ -154,6 +155,7 @@ Root: "HKCR"; Subkey: ".mwproj"; ValueType: string; ValueData: "MW5Project"; Fla
 Root: "HKCR"; Subkey: "MW5Project"; ValueType: string; ValueData: "MW5 Project"; Flags: uninsdeletekey
 Root: "HKCR"; Subkey: "MW5Project\DefaultIcon"; ValueType: string; ValueData: "{app}\MAPWINDOW.EXE,0"
 Root: "HKCR"; Subkey: "MW5Project\shell\open\command"; ValueType: string; ValueData: """{app}\MAPWINDOW.EXE"" ""%1"""
+Root: "HKCR"; Subkey: "MW5Project\"; ValueName: "InstallDir"; ValueType: string; ValueData: "{app}"
 
 [InstallDelete]
 Type: files; Name: "{app}\Plugins\MW5.TemplatePlugin.dll"; Components: MapWindow
@@ -203,6 +205,12 @@ const
   VC_2015_REDIST_X86 = '{8F271F6C-6E7B-3D0A-951B-6E7B694D78BD}'; //Microsoft.VS.VC_RuntimeMinimumVSU_x86,v14
   VC_2015_REDIST_X64 = '{221D6DB4-46E2-333C-B09B-5F49351D0980}'; //Microsoft.VS.VC_RuntimeMinimumVSU_amd64,v14
 
+
+  // https://bell0bytes.eu/inno-setup-vc/
+  // { Visual C++ 2017 Redistributable 14.16.27024 }
+  VC_2017_REDIST_X86 = '{5EEFCEFB-E5F7-4C82-99A5-813F04AA4FBD}';
+  VC_2017_REDIST_X64 = '{F1B0FB3A-E0EA-47A6-9383-3650655403B0}';
+
 function MsiQueryProductState(szProduct: string): INSTALLSTATE; 
   external 'MsiQueryProductState{#AW}@msi.dll stdcall';
 
@@ -218,7 +226,7 @@ begin
   // this statement, the following won't install your VC redist only when
   // the Visual C++ 2008 Redist (x86) and Visual C++ 2008 SP1 Redist(x86)
   // are installed for the current user
-  Result := not (VCVersionInstalled(VC_2015_REDIST_X86));
+  Result := not (VCVersionInstalled(VC_2017_REDIST_X86));
 end;
 
 function VCRedistNeedsInstall_x64(): Boolean;
@@ -228,7 +236,7 @@ begin
   // this statement, the following won't install your VC redist only when
   // the Visual C++ 2008 Redist (x86) and Visual C++ 2008 SP1 Redist(x86)
   // are installed for the current user
-  Result := not (VCVersionInstalled(VC_2015_REDIST_X64));
+  Result := not (VCVersionInstalled(VC_2017_REDIST_X64));
 end;
 
 function NeedsAddPath(Param: string): boolean;
@@ -368,8 +376,8 @@ end;
 
 function InitializeSetup(): Boolean;
 begin
-    if not IsDotNetDetected('v4.5', 0) then begin
-        MsgBox('MapWindow5 requires Microsoft .NET Framework 4.5.'#13#13
+    if not IsDotNetDetected('v4.6', 0) then begin
+        MsgBox('MapWindow5 requires Microsoft .NET Framework 4.6.'#13#13
             'Please use Windows Update to install this version,'#13
             'and then re-run this setup program.', mbInformation, MB_OK);
         result := false;
@@ -379,51 +387,50 @@ end;
 
 [Languages]
 Name: "english"; MessagesFile: "compiler:Default.isl"
-;Name: "afrikaans"; MessagesFile: "compiler:Languages\Afrikaans.isl"
-;Name: "albanian"; MessagesFile: "compiler:Languages\Albanian.isl"
-;Name: "arabic"; MessagesFile: "compiler:Languages\Arabic.isl"
-;Name: "basque"; MessagesFile: "compiler:Languages\Basque.isl"
-;Name: "belarusian"; MessagesFile: "compiler:Languages\Belarusian.isl"
-;Name: "bosnian"; MessagesFile: "compiler:Languages\Bosnian.isl"
+;;Name: "afrikaans"; MessagesFile: "compiler:Languages\Afrikaans.isl"
+;;Name: "albanian"; MessagesFile: "compiler:Languages\Albanian.isl"
+;;Name: "arabic"; MessagesFile: "compiler:Languages\Arabic.isl"
+;;Name: "basque"; MessagesFile: "compiler:Languages\Basque.isl"
+;;Name: "belarusian"; MessagesFile: "compiler:Languages\Belarusian.isl"
+;;Name: "bosnian"; MessagesFile: "compiler:Languages\Bosnian.isl"
 Name: "brazilianportuguese"; MessagesFile: "compiler:Languages\BrazilianPortuguese.isl"
-;Name: "bulgarian"; MessagesFile: "compiler:Languages\Bulgarian.isl"
+;;Name: "bulgarian"; MessagesFile: "compiler:Languages\Bulgarian.isl"
 Name: "catalan"; MessagesFile: "compiler:Languages\Catalan.isl"
-;Name: "chinesesimp"; MessagesFile: "compiler:Languages\ChineseSimplified.isl"
-;Name: "chinesetrad"; MessagesFile: "compiler:Languages\ChineseTraditional.isl"
+;;Name: "chinesesimp"; MessagesFile: "compiler:Languages\ChineseSimplified.isl"
+;;Name: "chinesetrad"; MessagesFile: "compiler:Languages\ChineseTraditional.isl"
 Name: "corsican"; MessagesFile: "compiler:Languages\Corsican.isl"
 Name: "czech"; MessagesFile: "compiler:Languages\Czech.isl"
 Name: "danish"; MessagesFile: "compiler:Languages\Danish.isl"
 Name: "dutch"; MessagesFile: "compiler:Languages\Dutch.isl"
-;Name: "estonian"; MessagesFile: "compiler:Languages\Estonian.isl"
+;;Name: "estonian"; MessagesFile: "compiler:Languages\Estonian.isl"
 Name: "finnish"; MessagesFile: "compiler:Languages\Finnish.isl"
 Name: "french"; MessagesFile: "compiler:Languages\French.isl"
-;Name: "galician"; MessagesFile: "compiler:Languages\Galician.isl"
+;;Name: "galician"; MessagesFile: "compiler:Languages\Galician.isl"
 Name: "german"; MessagesFile: "compiler:Languages\German.isl"
-Name: "greek"; MessagesFile: "compiler:Languages\Greek.isl"
+;;Name: "greek"; MessagesFile: "compiler:Languages\Greek.isl"
 Name: "hebrew"; MessagesFile: "compiler:Languages\Hebrew.isl"
-Name: "hungarian"; MessagesFile: "compiler:Languages\Hungarian.isl"
-;Name: "icelandic"; MessagesFile: "compiler:Languages\Icelandic.isl"
-;Name: "indonesian"; MessagesFile: "compiler:Languages\Indonesian.isl"
+;;Name: "hungarian"; MessagesFile: "compiler:Languages\Hungarian.isl"
+Name: "icelandic"; MessagesFile: "compiler:Languages\Icelandic.isl"
+;;Name: "indonesian"; MessagesFile: "compiler:Languages\Indonesian.isl"
 Name: "italian"; MessagesFile: "compiler:Languages\Italian.isl"
 Name: "japanese"; MessagesFile: "compiler:Languages\Japanese.isl"
-;Name: "korean"; MessagesFile: "compiler:Languages\Korean.isl"
-;Name: "lithuanian"; MessagesFile: "compiler:Languages\Lithuanian.isl"
-;Name: "luxemburgish"; MessagesFile: "compiler:Languages\Luxemburgish.isl"
-;Name: "macedonian"; MessagesFile: "compiler:Languages\Macedonian.isl"
-;Name: "malaysian"; MessagesFile: "compiler:Languages\Malaysian.isl"
-;Name: "nepali"; MessagesFile: "compiler:Languages\Nepali.islu"
+;;Name: "korean"; MessagesFile: "compiler:Languages\Korean.isl"
+;;Name: "lithuanian"; MessagesFile: "compiler:Languages\Lithuanian.isl"
+;;Name: "luxemburgish"; MessagesFile: "compiler:Languages\Luxemburgish.isl"
+;;Name: "macedonian"; MessagesFile: "compiler:Languages\Macedonian.isl"
+;;Name: "malaysian"; MessagesFile: "compiler:Languages\Malaysian.isl"
+;;Name: "nepali"; MessagesFile: "compiler:Languages\Nepali.islu"
 Name: "norwegian"; MessagesFile: "compiler:Languages\Norwegian.isl"
 Name: "polish"; MessagesFile: "compiler:Languages\Polish.isl"
 Name: "portuguese"; MessagesFile: "compiler:Languages\Portuguese.isl"
-;Name: "romanian"; MessagesFile: "compiler:Languages\Romanian.isl"
+;;Name: "romanian"; MessagesFile: "compiler:Languages\Romanian.isl"
 Name: "russian"; MessagesFile: "compiler:Languages\Russian.isl"
-Name: "serbiancyrillic"; MessagesFile: "compiler:Languages\SerbianCyrillic.isl"
-Name: "serbianlatin"; MessagesFile: "compiler:Languages\SerbianLatin.isl"
-;Name: "slovak"; MessagesFile: "compiler:Languages\Slovak.isl"
+;;Name: "serbiancyrillic"; MessagesFile: "compiler:Languages\SerbianCyrillic.isl"
+;;Name: "serbianlatin"; MessagesFile: "compiler:Languages\SerbianLatin.isl"
+;;Name: "slovak"; MessagesFile: "compiler:Languages\Slovak.isl"
 Name: "slovenian"; MessagesFile: "compiler:Languages\Slovenian.isl"
 Name: "spanish"; MessagesFile: "compiler:Languages\Spanish.isl"
-;Name: "swedish"; MessagesFile: "compiler:Languages\Swedish.isl"
-;Name: "tatarish"; MessagesFile: "compiler:Languages\Tatar.isl"
+;;Name: "swedish"; MessagesFile: "compiler:Languages\Swedish.isl"
+;;Name: "tatarish"; MessagesFile: "compiler:Languages\Tatar.isl"
 Name: "turkish"; MessagesFile: "compiler:Languages\Turkish.isl"
 Name: "ukrainian"; MessagesFile: "compiler:Languages\Ukrainian.isl"
-

src/.nuget/NuGet.Config

@@ -126,13 +126,15 @@ IEnumerator IEnumerable.GetEnumerator()
 
         public bool Draw(IntPtr hdc, float x, float y, int clipWidth, int clipHeight, Color? backColor = null)
         {
-            return _pattern.Draw(hdc, x, y, clipWidth, clipHeight, backColor.ToUInt());
+            var hdcInt = hdc.ToInt32();
+            return _pattern.Draw(hdcInt, x, y, clipWidth, clipHeight, backColor.ToUInt());
         }
 
         public bool Draw(Graphics g, float x, float y, int clipWidth, int clipHeight, Color? backColor = null)
         {
             var hdc = g.GetHdc();
-            bool result = _pattern.Draw(hdc, x, y, clipWidth, clipHeight, backColor.ToUInt());
+            var hdcInt = hdc.ToInt32();
+            var result = _pattern.Draw(hdcInt, x, y, clipWidth, clipHeight, backColor.ToUInt());
             g.ReleaseHdc(hdc);
             return result;
         }

src/.nuget/NuGet.targets

@@ -324,13 +324,15 @@ public PersistenceType SavingMode
 
         public bool DrawChart(IntPtr hdc, float x, float y, bool hideLabels, Color? backColor)
         {
-            return _charts.DrawChart(hdc, x, y, hideLabels, backColor.ToUInt());
+            var hdcInt = hdc.ToInt32();
+            return _charts.DrawChart(hdcInt, x, y, hideLabels, backColor.ToUInt());
         }
 
         public bool DrawChart(Graphics g, float x, float y, bool hideLabels, Color? backColor)
         {
             var hdc = g.GetHdc();
-            bool result = _charts.DrawChart(hdc, x, y, hideLabels, backColor.ToUInt());
+            var hdcInt = hdc.ToInt32();
+            var result = _charts.DrawChart(hdcInt, x, y, hideLabels, backColor.ToUInt());
             g.ReleaseHdc(hdc);
             return result;
         }

src/MW5.Api/Concrete/CompositeLine.cs

@@ -67,6 +67,11 @@ public int Index
             get { return _shapeIndex; }
         }
 
+        public bool IsPartOfSet(IFeatureSet set)
+        {
+            return set?.InternalObject == InternalShapefile;
+        }
+
         public IGeometry Geometry
         {
             get