Narvaling
/
OliviaAddInPro
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Version compilando arcgis pro 3.0 (.net 6)

Gerardo/Compilacion.net
Gerardo 2022-12-20 00:19:52 +01:00
parent 66c092ecf6
commit 6ed9074bf8
22 changed files with 259 additions and 438 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
Backup-2.x.zip Normal file
View File

Binary file not shown.

2
Button/ButtonConfig.cs
View File

@ -3,6 +3,7 @@ using System.Collections.Generic;
using System.Linq; using System.Linq;
using System.Text; using System.Text;
using System.Threading.Tasks; using System.Threading.Tasks;
using System.Windows.Controls;
using ArcGIS.Core.CIM; using ArcGIS.Core.CIM;
using ArcGIS.Core.Data; using ArcGIS.Core.Data;
using ArcGIS.Core.Geometry; using ArcGIS.Core.Geometry;
@ -18,6 +19,7 @@ using ArcGIS.Desktop.Framework.Threading.Tasks;
using ArcGIS.Desktop.Mapping; using ArcGIS.Desktop.Mapping;
using OliviaAddInPro.Helper; using OliviaAddInPro.Helper;
using OliviaAddInPro.Model; using OliviaAddInPro.Model;
using Button = ArcGIS.Desktop.Framework.Contracts.Button;
namespace OliviaAddInPro namespace OliviaAddInPro
{ {

13
Config.daml
View File

@ -1,5 +1,6 @@
<ArcGIS defaultAssembly="OliviaAddInPro.dll" defaultNamespace="OliviaAddInPro" xmlns="http://schemas.esri.com/DADF/Registry" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://schemas.esri.com/DADF/Registry file:///C:/Program%20Files/ArcGIS/Pro/bin/ArcGIS.Desktop.Framework.xsd"> <?xml version="1.0" encoding="utf-8"?>
<AddInInfo id="{10742570-cf59-42f2-bea2-2a38002a06ee}" version="3.0" desktopVersion="2.8.29751"> <ArcGIS defaultAssembly="OliviaAddInPro.dll" defaultNamespace="OliviaAddInPro" xmlns="http://schemas.esri.com/DADF/Registry" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://schemas.esri.com/DADF/Registry file:///C:/Program%20Files/ArcGIS/Pro/bin/ArcGIS.Desktop.Framework.xsd">
<AddInInfo id="{10742570-cf59-42f2-bea2-2a38002a06ee}" version="3.0" desktopVersion="3.0.3.36057">
<Name>OliviaAddInPro</Name> <Name>OliviaAddInPro</Name>
<Description>AddIn de Optimización de la Limpieza Viaria para ArcGIs Pro</Description> <Description>AddIn de Optimización de la Limpieza Viaria para ArcGIs Pro</Description>
<Image>Images\AddinDesktop32.png</Image> <Image>Images\AddinDesktop32.png</Image>
@ -16,7 +17,7 @@
<tabs> <tabs>
<tab id="OliviaAddInPro_Tab1" caption="Olivia Pro"> <tab id="OliviaAddInPro_Tab1" caption="Olivia Pro">
<group refID="OliviaAddInPro_Group1" /> <group refID="OliviaAddInPro_Group1" />
<group refID="OliviaAddInPro_Group2" /> <group refID="OliviaAddInPro_Group2" />
</tab> </tab>
</tabs> </tabs>
<groups> <groups>
@ -24,9 +25,9 @@
<button refID="OliviaAddInPro_ButtonLimp" size="large" /> <button refID="OliviaAddInPro_ButtonLimp" size="large" />
<button refID="OliviaAddInPro_ButtonRec" size="large" /> <button refID="OliviaAddInPro_ButtonRec" size="large" />
</group> </group>
<group id="OliviaAddInPro_Group1" caption=" " appearsOnAddInTab="false"> <group id="OliviaAddInPro_Group1" caption=" " appearsOnAddInTab="false">
<button refID="OliviaAddInPro_ButtonConfig" size="large" /> <button refID="OliviaAddInPro_ButtonConfig" size="large" />
</group> </group>
</groups> </groups>
<controls> <controls>
<!-- add your controls here --> <!-- add your controls here -->

37
Helper/HelperGdb.cs
View File

@ -13,7 +13,6 @@ using ArcGIS.Core.Data;
using ArcGIS.Desktop.Mapping; using ArcGIS.Desktop.Mapping;
using ArcGIS.Core.Internal.CIM; using ArcGIS.Core.Internal.CIM;
using ArcGIS.Desktop.Internal.Layouts.Utilities; using ArcGIS.Desktop.Internal.Layouts.Utilities;
using ArcGIS.Desktop.Core.Geoprocessing; using ArcGIS.Desktop.Core.Geoprocessing;
using ArcGIS.Desktop.Framework.Threading.Tasks; using ArcGIS.Desktop.Framework.Threading.Tasks;
using ArcGIS.Desktop.Editing; using ArcGIS.Desktop.Editing;
@ -25,6 +24,7 @@ using OliviaAddInPro.Model.contract;
using ArcGIS.Core.Data.DDL; using ArcGIS.Core.Data.DDL;
using ArcGIS.Core.CIM; using ArcGIS.Core.CIM;
using System.Threading; using System.Threading;
using ArcGIS.Core.Data.Exceptions;
namespace OliviaAddInPro.Helper namespace OliviaAddInPro.Helper
{ {
@ -625,7 +625,7 @@ namespace OliviaAddInPro.Helper
if (filt == null) if (filt == null)
filt = new ArcGIS.Core.Data.QueryFilter(); filt = new ArcGIS.Core.Data.QueryFilter();
sel = fc.Select(filt, SelectionType.ObjectID, SelectionOption.Normal); sel = fc.Select(filt, SelectionType.ObjectID, SelectionOption.Normal);
int nsel = sel.GetCount(); long nsel = sel.GetCount();
IReadOnlyList<long> ids_ = sel.GetObjectIDs(); IReadOnlyList<long> ids_ = sel.GetObjectIDs();
ids = ids_.ToList(); ids = ids_.ToList();
return ids; return ids;
@ -656,7 +656,7 @@ namespace OliviaAddInPro.Helper
if (filt == null) if (filt == null)
filt = new ArcGIS.Core.Data.QueryFilter(); filt = new ArcGIS.Core.Data.QueryFilter();
sel = fc.Select(filt, SelectionType.ObjectID, SelectionOption.Normal); sel = fc.Select(filt, SelectionType.ObjectID, SelectionOption.Normal);
int nsel = sel.GetCount(); var nsel = sel.GetCount();
IReadOnlyList<long> ids_ = sel.GetObjectIDs(); IReadOnlyList<long> ids_ = sel.GetObjectIDs();
ids = ids_.ToList(); ids = ids_.ToList();
return ids; return ids;
@ -966,7 +966,7 @@ namespace OliviaAddInPro.Helper
* Devuelve una geometría que es la suma de la inicial y la que se añade Add * Devuelve una geometría que es la suma de la inicial y la que se añade Add
*/ */
public static ArcGIS.Core.Geometry.Geometry IntersectGeom(ArcGIS.Core.Geometry.Geometry geomIni, ArcGIS.Core.Geometry.Geometry geomInters, public static ArcGIS.Core.Geometry.Geometry IntersectGeom(ArcGIS.Core.Geometry.Geometry geomIni, ArcGIS.Core.Geometry.Geometry geomInters,
GeometryDimension resultDimension = GeometryDimension.esriGeometryNoDimension) GeometryDimensionType resultDimension = GeometryDimensionType.EsriGeometryUnknownDimension)//esriGeometryNoDimension)
{ {
if (geomIni == null) if (geomIni == null)
return geomInters; return geomInters;
@ -975,7 +975,7 @@ namespace OliviaAddInPro.Helper
ArcGIS.Core.Geometry.Geometry geomSal = null; ArcGIS.Core.Geometry.Geometry geomSal = null;
try try
{ {
if (resultDimension == GeometryDimension.esriGeometryNoDimension) if (resultDimension == GeometryDimensionType.EsriGeometryUnknownDimension)//GeometryDimension.esriGeometryNoDimension)
geomSal = GeometryEngine.Instance.Intersection(geomIni, geomInters); geomSal = GeometryEngine.Instance.Intersection(geomIni, geomInters);
else else
geomSal = GeometryEngine.Instance.Intersection(geomIni, geomInters, resultDimension); geomSal = GeometryEngine.Instance.Intersection(geomIni, geomInters, resultDimension);
@ -1166,11 +1166,11 @@ namespace OliviaAddInPro.Helper
/** /**
* Devuelve el número de entidades de una FeatureClass que cumplen la consulta, o todos si la consulta es empty * Devuelve el número de entidades de una FeatureClass que cumplen la consulta, o todos si la consulta es empty
*/ */
public static int GetNumElems(string pathGdb, string ftclssName, string consulta = "") public static long GetNumElems(string pathGdb, string ftclssName, string consulta = "")
{ {
Geodatabase gdb = GetGdb(pathGdb).Result; Geodatabase gdb = GetGdb(pathGdb).Result;
FeatureClass fc = null; FeatureClass fc = null;
int n = -1; long n = -1;
if (gdb != null) if (gdb != null)
{ {
fc = GetFtClass(ftclssName, gdb).Result; fc = GetFtClass(ftclssName, gdb).Result;
@ -1223,11 +1223,11 @@ namespace OliviaAddInPro.Helper
/** /**
* Devuelve el número de entidades de una FeatureClass que cumplen la consulta, o todos si la consulta es empty * Devuelve el número de entidades de una FeatureClass que cumplen la consulta, o todos si la consulta es empty
*/ */
public static Task<int> GetNumElems(FeatureClass fc, string consulta = "") public static Task<long> GetNumElems(FeatureClass fc, string consulta = "")
{ {
int n = -1; long n = -1;
ReiniciaOutStr(); ReiniciaOutStr();
return ArcGIS.Desktop.Framework.Threading.Tasks.QueuedTask.Run((Func<int>)(() => return ArcGIS.Desktop.Framework.Threading.Tasks.QueuedTask.Run((Func<long>)(() =>
{ {
try try
{ {
@ -1257,9 +1257,9 @@ namespace OliviaAddInPro.Helper
/** /**
* Devuelve el número de entidades de una FeatureClass que cumplen la consulta, o todos si la consulta es empty * Devuelve el número de entidades de una FeatureClass que cumplen la consulta, o todos si la consulta es empty
*/ */
public static int GetNumElemsSync(FeatureClass fc, string consulta = "") public static long GetNumElemsSync(FeatureClass fc, string consulta = "")
{ {
int n = -1; long n = -1;
ReiniciaOutStr(); ReiniciaOutStr();
try try
{ {
@ -1288,17 +1288,17 @@ namespace OliviaAddInPro.Helper
/** /**
* Devuelve el número de entidades de una FeatureClass que cumplen la consulta, o todos si la consulta es empty * Devuelve el número de entidades de una FeatureClass que cumplen la consulta, o todos si la consulta es empty
*/ */
public static int GetNumElems(string pathFtClss, string consulta = "") public static long GetNumElems(string pathFtClss, string consulta = "")
{ {
FeatureClass fc = GetFtClass(pathFtClss); FeatureClass fc = GetFtClass(pathFtClss);
int n = GetNumElems(fc, consulta).Result; var n = GetNumElems(fc, consulta).Result;
Free(fc); Free(fc);
return n; return n;
} }
public static int GetNumElemsSync(string pathFtClss, string consulta = "") public static long GetNumElemsSync(string pathFtClss, string consulta = "")
{ {
FeatureClass fc = GetFtClassSync(pathFtClss); FeatureClass fc = GetFtClassSync(pathFtClss);
int n = GetNumElemsSync(fc, consulta); var n = GetNumElemsSync(fc, consulta);
Free(fc); Free(fc);
return n; return n;
} }
@ -1902,7 +1902,7 @@ namespace OliviaAddInPro.Helper
geom = f.GetShape(); geom = f.GetShape();
line = (ArcGIS.Core.Geometry.Polyline)geom; line = (ArcGIS.Core.Geometry.Polyline)geom;
longi_tot = line.Length; longi_tot = line.Length;
geom = IntersectGeom(geom_zon, line, GeometryDimension.esriGeometry1Dimension); geom = IntersectGeom(geom_zon, line, GeometryDimensionType.EsriGeometry1Dimension);//GeometryDimension.esriGeometry1Dimension);
line = (ArcGIS.Core.Geometry.Polyline)geom; line = (ArcGIS.Core.Geometry.Polyline)geom;
longi_zon = line.Length;//se consigue la longitud de ámbito (linea) que interseca con el nivel) longi_zon = line.Length;//se consigue la longitud de ámbito (linea) que interseca con el nivel)
if ((longi_zon / longi_tot) < porc) if ((longi_zon / longi_tot) < porc)
@ -2462,7 +2462,8 @@ namespace OliviaAddInPro.Helper
//{ //{
try try
{ {
String[] fields = new string[] { field }; //field to be used to retrieve unique values List<String> fields = new List<string>();
fields.Add(field);
UniqueValueRendererDefinition uniqueValueRendererDef; UniqueValueRendererDefinition uniqueValueRendererDef;
CIMSymbolReference symbolTemplate=new CIMSymbolReference(); CIMSymbolReference symbolTemplate=new CIMSymbolReference();
if (tipo == GeometryType.Point)//puntual if (tipo == GeometryType.Point)//puntual

16
Migration-2022-12-19_22-09-22.html Normal file
View File

@ -0,0 +1,16 @@
<!DOCTYPE html >
<html>
<head />
<body>
<h2>Migration Status Report</h2>
<p>Migrate project: D:\desa\v2019\OliviaAddInPro\OliviaAddInPro.csproj</p>
<h3>OliviaAddInPro.csproj</h3>
<ul>project folder: <a href="D:\desa\v2019\OliviaAddInPro\" target="_new">D:\desa\v2019\OliviaAddInPro\</a></ul>
<ul>language: CS</ul>
<p style="color:Red;font-weight:bold">Warning: this project [D:\desa\v2019\OliviaAddInPro\] contains References to 'ArcGIS.Core', but the HintPath tag is wrong or missing. Use the 'Pro Fix References utility' before migrating this project.</p>
<ul>project type: NonArcGIS</ul>
<ul>project has WPF: PresentationFramework</ul>
<p style="color:Red;font-weight:bold">Note: project might contain NuGets in packages.config, please check all NuGets for the most up-to-date .NET variant and if needed, replace with a NuGet that supports .NET 6.</p>
<p style="color:Red;font-weight:bold">Note: please check all NuGets for the most up-to-date .NET variant and if needed, replace with a NuGet that supports .NET 6.</p>
</body>
</html>

12
Migration-2022-12-19_22-09-22.txt Normal file
View File

@ -0,0 +1,12 @@
Migration Status Report
Migrate project: D:\desa\v2019\OliviaAddInPro\OliviaAddInPro.csproj
OliviaAddInPro.csproj
project folder:
D:\desa\v2019\OliviaAddInPro\
D:\desa\v2019\OliviaAddInPro\
language: CS
Warning: this project [D:\desa\v2019\OliviaAddInPro\] contains References to 'ArcGIS.Core', but the HintPath tag is wrong or missing. Use the 'Pro Fix References utility' before migrating this project.
project type: NonArcGIS
project has WPF: PresentationFramework
Note: project might contain NuGets in packages.config, please check all NuGets for the most up-to-date .NET variant and if needed, replace with a NuGet that supports .NET 6.
Note: please check all NuGets for the most up-to-date .NET variant and if needed, replace with a NuGet that supports .NET 6.

520
OliviaAddInPro.csproj
View File

@ -1,406 +1,152 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> <TargetFramework>net6.0-windows</TargetFramework>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> <RuntimeIdentifier>win10-x64</RuntimeIdentifier>
<ProductVersion>8.0.30703</ProductVersion> <AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
<SchemaVersion>2.0</SchemaVersion> <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
<ProjectGuid>{10742570-CF59-42F2-BEA2-2A38002A06EE}</ProjectGuid> <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
<OutputType>Library</OutputType> <NoWarn>CA1416</NoWarn>
<AppDesignerFolder>Properties</AppDesignerFolder> <UseWPF>true</UseWPF>
<RootNamespace>OliviaAddInPro</RootNamespace> <AllowUnsafeBlocks>True</AllowUnsafeBlocks>
<AssemblyName>OliviaAddInPro</AssemblyName>
<TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
</PropertyGroup>
<PropertyGroup>
<ArcGISFolder>$([MSBuild]::GetRegistryValueFromView('HKEY_LOCAL_MACHINE\SOFTWARE\ESRI\ArcGISPro', 'InstallDir', null, RegistryView.Registry64))</ArcGISFolder>
<ArcGISFolder Condition="'$(ArcGISFolder)' == ''">$(registry:HKEY_CURRENT_USER\SOFTWARE\ESRI\ArcGISPro@InstallDir)</ArcGISFolder>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>bin\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>0</WarningLevel>
<StartAction>Program</StartAction>
<StartProgram>$(ArcGISFolder)\bin\ArcGISPro.exe</StartProgram>
<PlatformTarget>x64</PlatformTarget>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>bin\Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<StartAction>Program</StartAction>
<StartProgram>$(ArcGISFolder)\bin\ArcGISPro.exe</StartProgram>
<PlatformTarget>AnyCPU</PlatformTarget>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL"> <Compile Remove=".git\**" />
<HintPath>packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll</HintPath> <EmbeddedResource Remove=".git\**" />
</Reference> <None Remove=".git\**" />
<Reference Include="System" /> <Page Remove=".git\**" />
<Reference Include="System.Core" />
<Reference Include="System.Xml.Linq" />
<Reference Include="System.Data.DataSetExtensions" />
<Reference Include="Microsoft.CSharp" />
<Reference Include="System.Data.DataSetExtensions" />
<Reference Include="System.Data" />
<Reference Include="System.Xml" />
<Reference Include="PresentationCore" />
<Reference Include="PresentationFramework" />
<Reference Include="WindowsBase" />
<Reference Include="System.Xaml" />
<Reference Include="ArcGIS.Desktop.Framework">
<HintPath>$(ArcGISFolder)\bin\ArcGIS.Desktop.Framework.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="ArcGIS.Core">
<HintPath>$(ArcGISFolder)\bin\ArcGIS.Core.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="ArcGIS.Desktop.Core">
<HintPath>$(ArcGISFolder)\bin\Extensions\Core\ArcGIS.Desktop.Core.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="ArcGIS.Desktop.Mapping">
<HintPath>$(ArcGISFolder)\bin\Extensions\Mapping\ArcGIS.Desktop.Mapping.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="ArcGIS.Desktop.Catalog">
<HintPath>$(ArcGISFolder)\bin\Extensions\Catalog\ArcGIS.Desktop.Catalog.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="ArcGIS.Desktop.Editing">
<HintPath>$(ArcGISFolder)\bin\Extensions\Editing\ArcGIS.Desktop.Editing.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="ArcGIS.Desktop.Extensions">
<HintPath>$(ArcGISFolder)\bin\Extensions\DesktopExtensions\ArcGIS.Desktop.Extensions.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="ArcGIS.Desktop.GeoProcessing">
<HintPath>$(ArcGISFolder)\bin\Extensions\GeoProcessing\ArcGIS.Desktop.GeoProcessing.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="ArcGIS.Desktop.Layouts">
<HintPath>$(ArcGISFolder)\bin\Extensions\Layout\ArcGIS.Desktop.Layouts.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="ArcGIS.Desktop.Shared.Wpf">
<HintPath>$(ArcGISFolder)\bin\ArcGIS.Desktop.Shared.Wpf.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="ArcGIS.Desktop.Ribbon.Wpf">
<HintPath>$(ArcGISFolder)\bin\ArcGIS.Desktop.Ribbon.Wpf.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="ArcGIS.Desktop.DataGrid.Contrib.Wpf">
<HintPath>$(ArcGISFolder)\bin\ArcGIS.Desktop.DataGrid.Contrib.Wpf.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="ArcGIS.Desktop.Resources">
<HintPath>$(ArcGISFolder)\bin\ArcGIS.Desktop.Resources.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="ArcGIS.Desktop.Resources">
<HintPath>$(ArcGISFolder)\bin\ArcGIS.Desktop.Resources.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="ESRI.ArcGIS.ItemIndex">
<HintPath>$(ArcGISFolder)\bin\ESRI.ArcGIS.ItemIndex.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="Xceed.Wpf.Toolkit, Version=4.1.0.0, Culture=neutral, PublicKeyToken=3e4669d2f30244f4, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\bin\Release\Xceed.Wpf.Toolkit.dll</HintPath>
</Reference>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<AddInContent Include="Config.daml" /> <Content Include="Config.daml" />
<AddInContent Include="Images\AddInDesktop16.png" /> <Content Include="Images\AddInDesktop16.png" />
<AddInContent Include="Images\AddInDesktop32.png" /> <Content Include="Images\AddInDesktop32.png" />
<AddInContent Include="DarkImages\AddInDesktop16.png" /> <Content Include="DarkImages\AddInDesktop16.png" />
<AddInContent Include="DarkImages\AddInDesktop32.png" /> <Content Include="DarkImages\AddInDesktop32.png" />
</ItemGroup> <Content Include="DarkImages\GenericButtonBlue16.png" />
<ItemGroup> <Content Include="DarkImages\GenericButtonBlue32.png" />
<Compile Include="Button\ButtonConfig.cs" /> <Content Include="Images\OliviaIconPro16.png" />
<Compile Include="Button\ButtonLimp.cs" /> <Content Include="Images\OliviaIconPro32.png" />
<Compile Include="Button\ButtonMaq.cs" /> <Content Include="DarkImages\GenericButtonPurple16.png" />
<Compile Include="Button\ButtonRec.cs" /> <Content Include="DarkImages\GenericButtonPurple32.png" />
<Compile Include="Conexion\Cstr_socket.cs" /> <Content Include="DarkImages\GenericButtonGreen16.png" />
<Compile Include="Helper\EnabledComboBoxItem.cs" /> <Content Include="DarkImages\GenericButtonGreen32.png" />
<Compile Include="Helper\CheckedListItem.cs" /> <Content Include="Images\reco2.png" />
<Compile Include="Helper\HelperGdb.cs" /> <Content Include="Images\carrito2.png" />
<Compile Include="Helper\HelperGlobal.cs" /> <Content Include="Images\config2_olv.png" />
<Compile Include="Model\ComunDef.cs" />
<Compile Include="Model\contract\IprocessManager.cs" />
<Compile Include="Model\ESRI.ArcGIS.Geometry.esriSRProjCS4Type.cs" />
<Compile Include="Model\Recogida.cs" />
<Compile Include="Model\RecogidaDef.cs" />
<Compile Include="Model\Respuesta.cs" />
<Compile Include="Model\TratamientoComun.cs" />
<Compile Include="Model\Limpieza.cs" />
<Compile Include="Model\LimpiezaDef.cs" />
<Compile Include="Services\EjecServ.cs" />
<Compile Include="Model\OliviaConf.cs" />
<Compile Include="Model\OliviaDef.cs" />
<Compile Include="Services\ConfigServ.cs" />
<Compile Include="Services\FinProcServ.cs" />
<Compile Include="Services\LanzaSrv\LanzaLimpSrv.cs" />
<Compile Include="Services\LanzaSrv\LanzaOlvServ.cs" />
<Compile Include="Services\LanzaSrv\LanzaRecoSrv.cs" />
<Compile Include="Services\LimpiezaServ.cs" />
<Compile Include="Services\ProcesoEjecServ.cs" />
<Compile Include="Services\RecogidaServ.cs" />
<Compile Include="ViewModel\Comun\MarchandoUnaDeViewModel.cs" />
<Compile Include="ViewModel\Configuracion\DockpaneConfigViewModel.cs" />
<Compile Include="ViewModel\Configuracion\PaneConfigViewModel.cs" />
<Compile Include="ViewModel\OptionsMenuItem.cs" />
<Compile Include="ViewModel\PaneEjecutarViewModel.cs" />
<Compile Include="ViewModel\Limpieza\PaneLimpiezaSub4ViewModel.cs" />
<Compile Include="ViewModel\Limpieza\PaneLimpiezaSub3ViewModel.cs" />
<Compile Include="ViewModel\Limpieza\PaneLimpiezaSub2ViewModel.cs" />
<Compile Include="ViewModel\Limpieza\PaneLimpiezaViewModel.cs" />
<Compile Include="ViewModel\PanelViewModelBase.cs" />
<Compile Include="ViewModel\Recogida\PaneRecogidaSub1ViewModel.cs" />
<Compile Include="View\Comun\MarchandoUnaDe.xaml.cs">
<DependentUpon>MarchandoUnaDe.xaml</DependentUpon>
</Compile>
<Compile Include="View\Configuracion\PropertyGridFilePickerFolder.xaml.cs">
<DependentUpon>PropertyGridFilePickerFolder.xaml</DependentUpon>
</Compile>
<Compile Include="View\Configuracion\PropertyGridFilePickerDataset.xaml.cs">
<DependentUpon>PropertyGridFilePickerDataset.xaml</DependentUpon>
</Compile>
<Compile Include="View\Configuracion\PropertyGridFilePickerLine.xaml.cs">
<DependentUpon>PropertyGridFilePickerLine.xaml</DependentUpon>
</Compile>
<Compile Include="View\Configuracion\PropertyGridFilePickerGDB.xaml.cs">
<DependentUpon>PropertyGridFilePickerGDB.xaml</DependentUpon>
</Compile>
<Compile Include="View\Recogida\PaneRecogidaSub1.xaml.cs">
<DependentUpon>PaneRecogidaSub1.xaml</DependentUpon>
</Compile>
<Compile Include="View\Recogida\PaneRecogida.xaml.cs">
<DependentUpon>PaneRecogida.xaml</DependentUpon>
</Compile>
<Compile Include="ViewModel\Recogida\PaneRecogidaViewModel.cs" />
<Compile Include="View\Configuracion\DockPaneConfig.xaml.cs">
<DependentUpon>DockPaneConfig.xaml</DependentUpon>
</Compile>
<Compile Include="View\Configuracion\PaneConfigView.xaml.cs">
<DependentUpon>PaneConfigView.xaml</DependentUpon>
</Compile>
<Compile Include="View\PaneEjecutar.xaml.cs">
<DependentUpon>PaneEjecutar.xaml</DependentUpon>
</Compile>
<Compile Include="View\Limpieza\PaneLimpiezaSub4.xaml.cs">
<DependentUpon>PaneLimpiezaSub4.xaml</DependentUpon>
</Compile>
<Compile Include="View\Limpieza\PaneLimpiezaSub3.xaml.cs">
<DependentUpon>PaneLimpiezaSub3.xaml</DependentUpon>
</Compile>
<Compile Include="View\Limpieza\PaneLimpiezaSub2.xaml.cs">
<DependentUpon>PaneLimpiezaSub2.xaml</DependentUpon>
</Compile>
<Compile Include="View\Limpieza\PaneLimpiezaSub1.xaml.cs">
<DependentUpon>PaneLimpiezaSub1.xaml</DependentUpon>
</Compile>
<Compile Include="ViewModel\Limpieza\PaneLimpiezaSub1ViewModel.cs" />
<Compile Include="View\Limpieza\PaneLimpieza.xaml.cs">
<DependentUpon>PaneLimpieza.xaml</DependentUpon>
</Compile>
<Compile Include="View\Limpieza\DockpaneLimpieza.xaml.cs">
<DependentUpon>DockpaneLimpieza.xaml</DependentUpon>
</Compile>
<Compile Include="ViewModel\Limpieza\DockpaneLimpiezaViewModel.cs" />
<Compile Include="View\Recogida\DockpaneRecogida.xaml.cs">
<DependentUpon>DockpaneRecogida.xaml</DependentUpon>
</Compile>
<Compile Include="ViewModel\Recogida\DockpaneRecogidaViewModel.cs" />
<Compile Include="Module1.cs" />
<Compile Include="Model\OliviaGlob.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="Resource1.Designer.cs">
<AutoGen>True</AutoGen>
<DesignTime>True</DesignTime>
<DependentUpon>Resource1.resx</DependentUpon>
</Compile>
<Compile Include="View\ProWndSelectFields.xaml.cs">
<DependentUpon>ProWndSelectFields.xaml</DependentUpon>
</Compile>
<Compile Include="ViewModel\ShowProWndSelectFields.cs" />
</ItemGroup>
<ItemGroup>
<AddInContent Include="DarkImages\GenericButtonBlue16.png" />
</ItemGroup>
<ItemGroup>
<AddInContent Include="DarkImages\GenericButtonBlue32.png" />
</ItemGroup>
<ItemGroup>
<AddInContent Include="Images\OliviaIconPro16.png" />
<AddInContent Include="Images\OliviaIconPro32.png" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Resource Include="OliviaIconPro.ico" /> <Resource Include="OliviaIconPro.ico" />
</ItemGroup>
<ItemGroup>
<Page Include="View\Comun\MarchandoUnaDe.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="View\Configuracion\PropertyGridFilePickerFolder.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="View\Configuracion\PropertyGridFilePickerDataset.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="View\Configuracion\PropertyGridFilePickerLine.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="View\Configuracion\PropertyGridFilePickerGDB.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="View\Recogida\PaneRecogidaSub1.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="View\Recogida\PaneRecogida.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="View\Configuracion\DockPaneConfig.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="View\Configuracion\PaneConfigView.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="View\PaneEjecutar.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="View\Limpieza\PaneLimpiezaSub4.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="View\Limpieza\PaneLimpiezaSub3.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="View\Limpieza\PaneLimpiezaSub2.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="View\Limpieza\PaneLimpiezaSub1.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="View\Limpieza\PaneLimpieza.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="View\Limpieza\DockpaneLimpieza.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="View\Recogida\DockpaneRecogida.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="View\ProWndSelectFields.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
</ItemGroup>
<ItemGroup>
<AddInContent Include="DarkImages\GenericButtonPurple16.png" />
</ItemGroup>
<ItemGroup>
<AddInContent Include="DarkImages\GenericButtonPurple32.png" />
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="Resource1.resx">
<Generator>ResXFileCodeGenerator</Generator>
<LastGenOutput>Resource1.Designer.cs</LastGenOutput>
</EmbeddedResource>
</ItemGroup>
<ItemGroup>
<AddInContent Include="DarkImages\GenericButtonGreen16.png" />
</ItemGroup>
<ItemGroup>
<AddInContent Include="DarkImages\GenericButtonGreen32.png" />
</ItemGroup>
<ItemGroup>
<Resource Include="View\OliviaIconPro16.png" /> <Resource Include="View\OliviaIconPro16.png" />
</ItemGroup>
<ItemGroup>
<Resource Include="View\OliviaIconPro.ico" /> <Resource Include="View\OliviaIconPro.ico" />
</ItemGroup>
<ItemGroup>
<None Include="packages.config" />
</ItemGroup>
<ItemGroup>
<Resource Include="Resources\inicio.png" /> <Resource Include="Resources\inicio.png" />
<Resource Include="Resources\ptosctrl.png" /> <Resource Include="Resources\ptosctrl.png" />
<Resource Include="Resources\time.png" /> <Resource Include="Resources\time.png" />
<Resource Include="Resources\zonas.png" /> <Resource Include="Resources\zonas.png" />
</ItemGroup>
<ItemGroup>
<Resource Include="Images\openfolder.png" /> <Resource Include="Images\openfolder.png" />
</ItemGroup>
<ItemGroup>
<AddInContent Include="Images\reco2.png" />
</ItemGroup>
<ItemGroup>
<AddInContent Include="Images\carrito2.png" />
</ItemGroup>
<ItemGroup>
<AddInContent Include="Images\config2_olv.png" />
</ItemGroup>
<ItemGroup>
<Resource Include="Images\help16Pro.png" /> <Resource Include="Images\help16Pro.png" />
</ItemGroup> </ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> <ItemGroup>
<!-- <PackageReference Include="DotNetProjects.Extended.Wpf.Toolkit" Version="5.0.103" />
PackageAction can be: <PackageReference Include="Newtonsoft.Json" Version="13.0.2" />
BuildDefault: ArcGIS Pro is required. An esriAddinX package is created and copied to ArcGIS Pro add-in folder. <Reference Include="ArcGIS.Desktop.Framework">
BuildZipPostProcess: ArcGIS Pro install is NOT required to build the add-in. An esriAddinX package is created in your output folder. <HintPath>C:\Program Files\ArcGIS\Pro\bin\ArcGIS.Desktop.Framework.dll</HintPath>
BuildNoPostProcess: ArcGIS Pro install is NOT required to build the add-in. An esriAddinX package is NOT created. <CopyLocal>false</CopyLocal>
--> </Reference>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> <Reference Include="ArcGIS.Core">
<PackageAction>BuildDefault</PackageAction> <HintPath>C:\Program Files\ArcGIS\Pro\bin\ArcGIS.Core.dll</HintPath>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks> <CopyLocal>false</CopyLocal>
</PropertyGroup> </Reference>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> <Reference Include="ArcGIS.Desktop.Core">
<PackageAction>BuildDefault</PackageAction> <HintPath>C:\Program Files\ArcGIS\Pro\bin\Extensions\Core\ArcGIS.Desktop.Core.dll</HintPath>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks> <CopyLocal>false</CopyLocal>
</PropertyGroup> </Reference>
<UsingTask AssemblyFile="$(ArcGISFolder)\bin\proapp-sdk-MSBuild.dll" TaskName="proapp_sdk_MSBuild.PackageAddIn" /> <Reference Include="ArcGIS.Desktop.Layouts">
<UsingTask AssemblyFile="$(ArcGISFolder)\bin\proapp-sdk-MSBuild.dll" TaskName="proapp_sdk_MSBuild.CleanAddIn" /> <HintPath>C:\Program Files\ArcGIS\Pro\bin\Extensions\Layout\ArcGIS.Desktop.Layouts.dll</HintPath>
<UsingTask AssemblyFile="$(ArcGISFolder)\bin\proapp-sdk-MSBuild.dll" TaskName="proapp_sdk_MSBuild.ConvertToRelativePath" /> </Reference>
<!--<Import Project="Esri.ArcGISPro.Extensions.targets" Condition="Exists('Esri.ArcGISPro.Extensions.targets')" />--> <Reference Include="ArcGIS.Desktop.Mapping">
<Import Project="$(ArcGISFolder)\bin\Esri.ProApp.SDK.Desktop.targets" Condition="Exists('$(ArcGISFolder)\bin\Esri.ProApp.SDK.Desktop.targets') AND !Exists('Esri.ArcGISPro.Extensions.targets')" /> <HintPath>C:\Program Files\ArcGIS\Pro\bin\Extensions\Mapping\ArcGIS.Desktop.Mapping.dll</HintPath>
<!-- To modify your build process, add your task inside one of the targets below and uncomment it. <CopyLocal>false</CopyLocal>
Other similar extension points exist, see Microsoft.Common.targets. </Reference>
<Target Name="BeforeBuild"> <Reference Include="ArcGIS.Desktop.Catalog">
</Target> <HintPath>C:\Program Files\ArcGIS\Pro\bin\Extensions\Catalog\ArcGIS.Desktop.Catalog.dll</HintPath>
<Target Name="AfterBuild"> <CopyLocal>false</CopyLocal>
</Target> </Reference>
--> <Reference Include="ArcGIS.Desktop.Shared.Wpf">
<!--<Target Name="BeforeBuild"> <HintPath>C:\Program Files\ArcGIS\Pro\bin\ArcGIS.Desktop.Shared.Wpf.dll</HintPath>
<Error Text="C:\Users\Elena\AppData\Local\Programs\ArcGIS\Pro\bin\Esri.ProApp.SDK.Desktop.targets not found." Condition="!Exists('C:\Users\Elena\AppData\Local\Programs\ArcGIS\Pro\bin\Esri.ProApp.SDK.Desktop.targets') AND !Exists('Esri.ArcGISPro.Extensions.targets')" /> <CopyLocal>false</CopyLocal>
</Target>--> </Reference>
<Reference Include="ArcGIS.Desktop.Editing">
<HintPath>C:\Program Files\ArcGIS\Pro\bin\Extensions\Editing\ArcGIS.Desktop.Editing.dll</HintPath>
<CopyLocal>false</CopyLocal>
</Reference>
<Reference Include="ArcGIS.Desktop.Extensions">
<HintPath>C:\Program Files\ArcGIS\Pro\bin\Extensions\DesktopExtensions\ArcGIS.Desktop.Extensions.dll</HintPath>
<CopyLocal>false</CopyLocal>
</Reference>
</ItemGroup>
<ItemGroup>
<None Include="packages.config" />
<None Include=".gitignore" />
<None Include="Backup-2.x.zip" />
<None Include="OliviaAddInPro.csproj.bak" />
<None Include="OliviaAddInPro.csproj.user" />
<None Include="OliviaIconPro.ico" />
<None Include="Images\config2_.png" />
<None Include="Images\config2_olv - copia.png" />
<None Include="Images\config_old.png" />
<None Include="Images\genericproperties32.png" />
<None Include="Images\help16Pro.png" />
<None Include="Images\masking32.png" />
<None Include="Images\OliviaIconPro.ico" />
<None Include="Images\OliviaIconPro32Web.png" />
<None Include="Images\open32.png" />
<None Include="Images\openfolder.png" />
<None Include="Images\openfolder32.png" />
<None Include="Images\time32.png" />
<None Include="Model\OliviaGlob.cs.bak" />
<None Include="Model\Recogida.cs.bak" />
<None Include="packages\Newtonsoft.Json.13.0.1\.signature.p7s" />
<None Include="packages\Newtonsoft.Json.13.0.1\LICENSE.md" />
<None Include="packages\Newtonsoft.Json.13.0.1\Newtonsoft.Json.13.0.1.nupkg" />
<None Include="packages\Newtonsoft.Json.13.0.1\packageIcon.png" />
<None Include="packages\Newtonsoft.Json.13.0.1\lib\net20\Newtonsoft.Json.dll" />
<None Include="packages\Newtonsoft.Json.13.0.1\lib\net20\Newtonsoft.Json.xml" />
<None Include="packages\Newtonsoft.Json.13.0.1\lib\net35\Newtonsoft.Json.dll" />
<None Include="packages\Newtonsoft.Json.13.0.1\lib\net35\Newtonsoft.Json.xml" />
<None Include="packages\Newtonsoft.Json.13.0.1\lib\net40\Newtonsoft.Json.dll" />
<None Include="packages\Newtonsoft.Json.13.0.1\lib\net40\Newtonsoft.Json.xml" />
<None Include="packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll" />
<None Include="packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.xml" />
<None Include="packages\Newtonsoft.Json.13.0.1\lib\netstandard1.0\Newtonsoft.Json.dll" />
<None Include="packages\Newtonsoft.Json.13.0.1\lib\netstandard1.0\Newtonsoft.Json.xml" />
<None Include="packages\Newtonsoft.Json.13.0.1\lib\netstandard1.3\Newtonsoft.Json.dll" />
<None Include="packages\Newtonsoft.Json.13.0.1\lib\netstandard1.3\Newtonsoft.Json.xml" />
<None Include="packages\Newtonsoft.Json.13.0.1\lib\netstandard2.0\Newtonsoft.Json.dll" />
<None Include="packages\Newtonsoft.Json.13.0.1\lib\netstandard2.0\Newtonsoft.Json.xml" />
<None Include="Resources\inicio.png" />
<None Include="Resources\inicio24.png" />
<None Include="Resources\ptosctrl.png" />
<None Include="Resources\ptosctrl24.png" />
<None Include="Resources\time.png" />
<None Include="Resources\time24.png" />
<None Include="Resources\zonas.png" />
<None Include="Resources\zonas24.png" />
<None Include="Services\ProcesoEjecServ.cs.bak" />
<None Include="View\OliviaIconPro.ico" />
<None Include="View\OliviaIconPro16.png" />
<None Include="View\Recogida\old\PaneRecogidaSub2.xaml.NotUsed" />
<None Include="View\Recogida\old\PaneRecogidaSub2.xaml.cs.NotUsed" />
<None Include="View\Recogida\old\PaneRecogidaSub4.xaml.NotUsed" />
<None Include="View\Recogida\old\PaneRecogidaSub4.xaml.cs.NotUsed" />
<None Include="ViewModel\Limpieza\PaneLimpiezaViewModel.cs.bak" />
<None Include="ViewModel\Recogida\old\PaneRecogidaSub2ViewModel.cs.NotUsed" />
<None Include="ViewModel\Recogida\old\PaneRecogidaSub4ViewModel.cs.NotUsed" />
</ItemGroup>
<ItemGroup>
<Compile Update="Resource1.Designer.cs">
<AutoGen>True</AutoGen>
<DependentUpon>Resource1.resx</DependentUpon>
</Compile>
</ItemGroup>
<Import Project="C:\Program Files\ArcGIS\Pro\bin\Esri.ProApp.SDK.Desktop.targets" Condition="Exists('C:\Program Files\ArcGIS\Pro\bin\Esri.ProApp.SDK.Desktop.targets') AND !Exists('Esri.ArcGISPro.Extensions.targets')" />
</Project> </Project>

65
OliviaAddInPro.csproj.bak
View File

@ -25,7 +25,7 @@
<OutputPath>bin\Debug\</OutputPath> <OutputPath>bin\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants> <DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport> <ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel> <WarningLevel>0</WarningLevel>
<StartAction>Program</StartAction> <StartAction>Program</StartAction>
<StartProgram>$(ArcGISFolder)\bin\ArcGISPro.exe</StartProgram> <StartProgram>$(ArcGISFolder)\bin\ArcGISPro.exe</StartProgram>
<PlatformTarget>x64</PlatformTarget> <PlatformTarget>x64</PlatformTarget>
@ -117,8 +117,9 @@
<HintPath>$(ArcGISFolder)\bin\ESRI.ArcGIS.ItemIndex.dll</HintPath> <HintPath>$(ArcGISFolder)\bin\ESRI.ArcGIS.ItemIndex.dll</HintPath>
<Private>False</Private> <Private>False</Private>
</Reference> </Reference>
<Reference Include="Xceed.Wpf.Toolkit"> <Reference Include="Xceed.Wpf.Toolkit, Version=4.1.0.0, Culture=neutral, PublicKeyToken=3e4669d2f30244f4, processorArchitecture=MSIL">
<HintPath>..\wpftoolkit-master\ExtendedWPFToolkitSolution\Src\Xceed.Wpf.Toolkit\bin\Release\Xceed.Wpf.Toolkit.dll</HintPath> <SpecificVersion>False</SpecificVersion>
<HintPath>..\bin\Release\Xceed.Wpf.Toolkit.dll</HintPath>
</Reference> </Reference>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
@ -139,6 +140,7 @@
<Compile Include="Helper\HelperGdb.cs" /> <Compile Include="Helper\HelperGdb.cs" />
<Compile Include="Helper\HelperGlobal.cs" /> <Compile Include="Helper\HelperGlobal.cs" />
<Compile Include="Model\ComunDef.cs" /> <Compile Include="Model\ComunDef.cs" />
<Compile Include="Model\contract\IprocessManager.cs" />
<Compile Include="Model\ESRI.ArcGIS.Geometry.esriSRProjCS4Type.cs" /> <Compile Include="Model\ESRI.ArcGIS.Geometry.esriSRProjCS4Type.cs" />
<Compile Include="Model\Recogida.cs" /> <Compile Include="Model\Recogida.cs" />
<Compile Include="Model\RecogidaDef.cs" /> <Compile Include="Model\RecogidaDef.cs" />
@ -150,15 +152,14 @@
<Compile Include="Model\OliviaConf.cs" /> <Compile Include="Model\OliviaConf.cs" />
<Compile Include="Model\OliviaDef.cs" /> <Compile Include="Model\OliviaDef.cs" />
<Compile Include="Services\ConfigServ.cs" /> <Compile Include="Services\ConfigServ.cs" />
<<<<<<< HEAD <Compile Include="Services\FinProcServ.cs" />
<Compile Include="Services\LanzaSrv\LanzaLimpSrv.cs" /> <Compile Include="Services\LanzaSrv\LanzaLimpSrv.cs" />
<Compile Include="Services\LanzaSrv\LanzaOlvServ.cs" /> <Compile Include="Services\LanzaSrv\LanzaOlvServ.cs" />
<Compile Include="Services\LanzaSrv\LanzaRecoSrv.cs" /> <Compile Include="Services\LanzaSrv\LanzaRecoSrv.cs" />
=======
<Compile Include="Services\ImportaResServ.cs" />
>>>>>>> Elena/reco
<Compile Include="Services\LimpiezaServ.cs" /> <Compile Include="Services\LimpiezaServ.cs" />
<Compile Include="Services\ProcesoEjecServ.cs" />
<Compile Include="Services\RecogidaServ.cs" /> <Compile Include="Services\RecogidaServ.cs" />
<Compile Include="ViewModel\Comun\MarchandoUnaDeViewModel.cs" />
<Compile Include="ViewModel\Configuracion\DockpaneConfigViewModel.cs" /> <Compile Include="ViewModel\Configuracion\DockpaneConfigViewModel.cs" />
<Compile Include="ViewModel\Configuracion\PaneConfigViewModel.cs" /> <Compile Include="ViewModel\Configuracion\PaneConfigViewModel.cs" />
<Compile Include="ViewModel\OptionsMenuItem.cs" /> <Compile Include="ViewModel\OptionsMenuItem.cs" />
@ -169,6 +170,21 @@
<Compile Include="ViewModel\Limpieza\PaneLimpiezaViewModel.cs" /> <Compile Include="ViewModel\Limpieza\PaneLimpiezaViewModel.cs" />
<Compile Include="ViewModel\PanelViewModelBase.cs" /> <Compile Include="ViewModel\PanelViewModelBase.cs" />
<Compile Include="ViewModel\Recogida\PaneRecogidaSub1ViewModel.cs" /> <Compile Include="ViewModel\Recogida\PaneRecogidaSub1ViewModel.cs" />
<Compile Include="View\Comun\MarchandoUnaDe.xaml.cs">
<DependentUpon>MarchandoUnaDe.xaml</DependentUpon>
</Compile>
<Compile Include="View\Configuracion\PropertyGridFilePickerFolder.xaml.cs">
<DependentUpon>PropertyGridFilePickerFolder.xaml</DependentUpon>
</Compile>
<Compile Include="View\Configuracion\PropertyGridFilePickerDataset.xaml.cs">
<DependentUpon>PropertyGridFilePickerDataset.xaml</DependentUpon>
</Compile>
<Compile Include="View\Configuracion\PropertyGridFilePickerLine.xaml.cs">
<DependentUpon>PropertyGridFilePickerLine.xaml</DependentUpon>
</Compile>
<Compile Include="View\Configuracion\PropertyGridFilePickerGDB.xaml.cs">
<DependentUpon>PropertyGridFilePickerGDB.xaml</DependentUpon>
</Compile>
<Compile Include="View\Recogida\PaneRecogidaSub1.xaml.cs"> <Compile Include="View\Recogida\PaneRecogidaSub1.xaml.cs">
<DependentUpon>PaneRecogidaSub1.xaml</DependentUpon> <DependentUpon>PaneRecogidaSub1.xaml</DependentUpon>
</Compile> </Compile>
@ -236,6 +252,26 @@
<Resource Include="OliviaIconPro.ico" /> <Resource Include="OliviaIconPro.ico" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Page Include="View\Comun\MarchandoUnaDe.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="View\Configuracion\PropertyGridFilePickerFolder.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="View\Configuracion\PropertyGridFilePickerDataset.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="View\Configuracion\PropertyGridFilePickerLine.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="View\Configuracion\PropertyGridFilePickerGDB.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="View\Recogida\PaneRecogidaSub1.xaml"> <Page Include="View\Recogida\PaneRecogidaSub1.xaml">
<Generator>MSBuild:Compile</Generator> <Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType> <SubType>Designer</SubType>
@ -301,9 +337,6 @@
<LastGenOutput>Resource1.Designer.cs</LastGenOutput> <LastGenOutput>Resource1.Designer.cs</LastGenOutput>
</EmbeddedResource> </EmbeddedResource>
</ItemGroup> </ItemGroup>
<ItemGroup>
<AddInContent Include="Images\config.png" />
</ItemGroup>
<ItemGroup> <ItemGroup>
<AddInContent Include="DarkImages\GenericButtonGreen16.png" /> <AddInContent Include="DarkImages\GenericButtonGreen16.png" />
</ItemGroup> </ItemGroup>
@ -328,17 +361,18 @@
<ItemGroup> <ItemGroup>
<Resource Include="Images\openfolder.png" /> <Resource Include="Images\openfolder.png" />
</ItemGroup> </ItemGroup>
<<<<<<< HEAD
<ItemGroup />
=======
<ItemGroup> <ItemGroup>
<AddInContent Include="Images\config2.png" />
<AddInContent Include="Images\reco2.png" /> <AddInContent Include="Images\reco2.png" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<AddInContent Include="Images\carrito2.png" /> <AddInContent Include="Images\carrito2.png" />
</ItemGroup> </ItemGroup>
>>>>>>> Elena/reco <ItemGroup>
<AddInContent Include="Images\config2_olv.png" />
</ItemGroup>
<ItemGroup>
<Resource Include="Images\help16Pro.png" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- <!--
PackageAction can be: PackageAction can be:
@ -352,6 +386,7 @@
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<PackageAction>BuildDefault</PackageAction> <PackageAction>BuildDefault</PackageAction>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
</PropertyGroup> </PropertyGroup>
<UsingTask AssemblyFile="$(ArcGISFolder)\bin\proapp-sdk-MSBuild.dll" TaskName="proapp_sdk_MSBuild.PackageAddIn" /> <UsingTask AssemblyFile="$(ArcGISFolder)\bin\proapp-sdk-MSBuild.dll" TaskName="proapp_sdk_MSBuild.PackageAddIn" />
<UsingTask AssemblyFile="$(ArcGISFolder)\bin\proapp-sdk-MSBuild.dll" TaskName="proapp_sdk_MSBuild.CleanAddIn" /> <UsingTask AssemblyFile="$(ArcGISFolder)\bin\proapp-sdk-MSBuild.dll" TaskName="proapp_sdk_MSBuild.CleanAddIn" />

2
OliviaAddInPro.sln
View File

@ -1,4 +1,4 @@

Microsoft Visual Studio Solution File, Format Version 12.00 Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 16 # Visual Studio Version 16
VisualStudioVersion = 16.0.30011.22 VisualStudioVersion = 16.0.30011.22

8
Properties/launchSettings.json Normal file
View File

@ -0,0 +1,8 @@
{
"profiles": {
"OliviaAddInPro": {
"commandName": "Executable",
"executablePath": "C:\\Program Files\\ArcGIS\\Pro\\bin\\ArcGISPro.exe"
}
}
}

2
Services/EjecServ.cs
View File

@ -78,7 +78,7 @@ namespace OliviaAddInPro.Services
return false; return false;
} }
//Cuenta las filas que cumplen la consulta //Cuenta las filas que cumplen la consulta
int nelems = HelperGdb.GetNumElemsSync(com.CapaElems, com.ConsultaAmbs); var nelems = HelperGdb.GetNumElemsSync(com.CapaElems, com.ConsultaAmbs);
if (nelems <= 0) if (nelems <= 0)
{ {
ErrStr = "No existen ámbitos que cumplan las condiciones introducidas para la exportación " + com.ConsultaAmbs; ErrStr = "No existen ámbitos que cumplan las condiciones introducidas para la exportación " + com.ConsultaAmbs;

2
Services/FinProcServ.cs
View File

@ -224,7 +224,7 @@ namespace OliviaAddInPro.Services
if (OliviaGlob.CompruebaExistePath(OliviaGlob.Paths.PathGuardCsv)) if (OliviaGlob.CompruebaExistePath(OliviaGlob.Paths.PathGuardCsv))
Path = OliviaGlob.Paths.PathGuardCsv; Path = OliviaGlob.Paths.PathGuardCsv;
else else
Path = HelperGdb.SaveFileDlg(Title, DirData, null, ArcGIS.Desktop.Catalog.ItemFilters.folders); Path = HelperGdb.SaveFileDlg(Title, DirData, null, ArcGIS.Desktop.Catalog.ItemFilters.Folders);
if (string.IsNullOrEmpty(Path) || Path.Length == 0) if (string.IsNullOrEmpty(Path) || Path.Length == 0)
{ {

6
Services/LimpiezaServ.cs
View File

@ -1,7 +1,7 @@
using ArcGIS.Core.Data; /*using ArcGIS.Core.Data;
using ArcGIS.Core.Geometry; using ArcGIS.Core.Geometry;
using ArcGIS.Core.Internal.CIM; using ArcGIS.Core.Internal.CIM;
using ArcGIS.Desktop.Framework.Threading.Tasks; using ArcGIS.Desktop.Framework.Threading.Tasks;*/
using OliviaAddInPro.Helper; using OliviaAddInPro.Helper;
using OliviaAddInPro.Model; using OliviaAddInPro.Model;
using System; using System;
@ -166,7 +166,7 @@ namespace OliviaAddInPro.Services
public bool[] BuscAmbGdb(string pathCapa) public bool[] BuscAmbGdb(string pathCapa)
{ {
string consulta; string consulta;
int numero_lin; long numero_lin;
bool[] amb_gdb = new bool[(int)LimpiezaDef.AmbitsTra.AmbN];//se inician a false bool[] amb_gdb = new bool[(int)LimpiezaDef.AmbitsTra.AmbN];//se inician a false
string ftclass; string ftclass;

2
View/Configuracion/PropertyGridFilePickerFolder.xaml.cs
View File

@ -53,7 +53,7 @@ namespace OliviaAddInPro.View.Configuracion
private void PickFileButton_Click(object sender, RoutedEventArgs e) private void PickFileButton_Click(object sender, RoutedEventArgs e)
{ {
OpenFileDialog fd = new OpenFileDialog(); OpenFileDialog fd = new OpenFileDialog();
var st = HelperGdb.SaveFileDlg("Seleccione carpeta", null, null, ArcGIS.Desktop.Catalog.ItemFilters.folders); var st = HelperGdb.SaveFileDlg("Seleccione carpeta", null, null, ArcGIS.Desktop.Catalog.ItemFilters.Folders);
if (!string.IsNullOrEmpty(st)) if (!string.IsNullOrEmpty(st))
{ {
Value = st; Value = st;

0
View/Recogida/old/PaneRecogidaSub2.xaml → View/Recogida/old/PaneRecogidaSub2.xaml.NotUsed
View File

0
View/Recogida/old/PaneRecogidaSub2.xaml.cs → View/Recogida/old/PaneRecogidaSub2.xaml.cs.NotUsed
View File

0
View/Recogida/old/PaneRecogidaSub4.xaml → View/Recogida/old/PaneRecogidaSub4.xaml.NotUsed
View File

0
View/Recogida/old/PaneRecogidaSub4.xaml.cs → View/Recogida/old/PaneRecogidaSub4.xaml.cs.NotUsed
View File

4
ViewModel/Limpieza/PaneLimpiezaViewModel.cs
View File

@ -8,8 +8,8 @@ using System.Threading.Tasks;
using System.Windows.Media.Imaging; using System.Windows.Media.Imaging;
using OliviaAddInPro.Helper; using OliviaAddInPro.Helper;
using static OliviaAddInPro.Model.ComunDef; using static OliviaAddInPro.Model.ComunDef;
using ArcGIS.Desktop.Framework.Threading.Tasks; //using ArcGIS.Desktop.Framework.Threading.Tasks;
using ArcGIS.Desktop.Framework.Contracts; //using ArcGIS.Desktop.Framework.Contracts;
namespace OliviaAddInPro namespace OliviaAddInPro
{ {

2
ViewModel/PanelViewModelBase.cs
View File

@ -5,7 +5,7 @@ using System.Linq;
using System.Text; using System.Text;
using System.Threading.Tasks; using System.Threading.Tasks;
using System.Text.RegularExpressions; using System.Text.RegularExpressions;
using System.Runtime.InteropServices.WindowsRuntime; //using System.Runtime.InteropServices.WindowsRuntime;
using OliviaAddInPro.Model; using OliviaAddInPro.Model;
using OliviaAddInPro.Helper; using OliviaAddInPro.Helper;

0
ViewModel/Recogida/old/PaneRecogidaSub2ViewModel.cs → ViewModel/Recogida/old/PaneRecogidaSub2ViewModel.cs.NotUsed
View File

0
ViewModel/Recogida/old/PaneRecogidaSub4ViewModel.cs → ViewModel/Recogida/old/PaneRecogidaSub4ViewModel.cs.NotUsed
View File