Version compilando arcgis pro 3.0 (.net 6)
parent
66c092ecf6
commit
6ed9074bf8
Binary file not shown.
|
|
@ -3,6 +3,7 @@ using System.Collections.Generic;
|
|||
using System.Linq;
|
||||
using System.Text;
|
||||
using System.Threading.Tasks;
|
||||
using System.Windows.Controls;
|
||||
using ArcGIS.Core.CIM;
|
||||
using ArcGIS.Core.Data;
|
||||
using ArcGIS.Core.Geometry;
|
||||
|
|
@ -18,6 +19,7 @@ using ArcGIS.Desktop.Framework.Threading.Tasks;
|
|||
using ArcGIS.Desktop.Mapping;
|
||||
using OliviaAddInPro.Helper;
|
||||
using OliviaAddInPro.Model;
|
||||
using Button = ArcGIS.Desktop.Framework.Contracts.Button;
|
||||
|
||||
namespace OliviaAddInPro
|
||||
{
|
||||
|
|
|
|||
17
Config.daml
17
Config.daml
|
|
@ -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">
|
||||
<AddInInfo id="{10742570-cf59-42f2-bea2-2a38002a06ee}" version="3.0" desktopVersion="2.8.29751">
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<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>
|
||||
<Description>AddIn de Optimización de la Limpieza Viaria para ArcGIs Pro</Description>
|
||||
<Image>Images\AddinDesktop32.png</Image>
|
||||
|
|
@ -16,17 +17,17 @@
|
|||
<tabs>
|
||||
<tab id="OliviaAddInPro_Tab1" caption="Olivia Pro">
|
||||
<group refID="OliviaAddInPro_Group1" />
|
||||
<group refID="OliviaAddInPro_Group2" />
|
||||
<group refID="OliviaAddInPro_Group2" />
|
||||
</tab>
|
||||
</tabs>
|
||||
<groups>
|
||||
<group id="OliviaAddInPro_Group2" caption=" " appearsOnAddInTab="false">
|
||||
<button refID="OliviaAddInPro_ButtonLimp" size="large" />
|
||||
<button refID="OliviaAddInPro_ButtonRec" size="large" />
|
||||
<button refID="OliviaAddInPro_ButtonRec" size="large" />
|
||||
</group>
|
||||
<group id="OliviaAddInPro_Group1" caption=" " appearsOnAddInTab="false">
|
||||
<button refID="OliviaAddInPro_ButtonConfig" size="large" />
|
||||
</group>
|
||||
<group id="OliviaAddInPro_Group1" caption=" " appearsOnAddInTab="false">
|
||||
<button refID="OliviaAddInPro_ButtonConfig" size="large" />
|
||||
</group>
|
||||
</groups>
|
||||
<controls>
|
||||
<!-- add your controls here -->
|
||||
|
|
@ -41,7 +42,7 @@
|
|||
<button id="OliviaAddInPro_ButtonConfig" caption="Configuración" className="ButtonConfig" loadOnClick="true" largeImage="Images/config2_olv.png">
|
||||
<tooltip heading="OLIVIA - Configuración">
|
||||
Add-In de ArcGIS Pro para la herramienta de optimización de la limpieza viaria, OLIVIA<disabledText /></tooltip>
|
||||
</button>
|
||||
</button>
|
||||
</controls>
|
||||
<dockPanes>
|
||||
<dockPane id="OliviaAddInPro_DockpaneLimpieza" caption="OLIVIA | Limpieza" className="DockpaneLimpiezaViewModel" dock="group" dockWith="esri_core_contentsDockPane">
|
||||
|
|
|
|||
|
|
@ -13,7 +13,6 @@ using ArcGIS.Core.Data;
|
|||
using ArcGIS.Desktop.Mapping;
|
||||
using ArcGIS.Core.Internal.CIM;
|
||||
using ArcGIS.Desktop.Internal.Layouts.Utilities;
|
||||
|
||||
using ArcGIS.Desktop.Core.Geoprocessing;
|
||||
using ArcGIS.Desktop.Framework.Threading.Tasks;
|
||||
using ArcGIS.Desktop.Editing;
|
||||
|
|
@ -25,6 +24,7 @@ using OliviaAddInPro.Model.contract;
|
|||
using ArcGIS.Core.Data.DDL;
|
||||
using ArcGIS.Core.CIM;
|
||||
using System.Threading;
|
||||
using ArcGIS.Core.Data.Exceptions;
|
||||
|
||||
namespace OliviaAddInPro.Helper
|
||||
{
|
||||
|
|
@ -625,7 +625,7 @@ namespace OliviaAddInPro.Helper
|
|||
if (filt == null)
|
||||
filt = new ArcGIS.Core.Data.QueryFilter();
|
||||
sel = fc.Select(filt, SelectionType.ObjectID, SelectionOption.Normal);
|
||||
int nsel = sel.GetCount();
|
||||
long nsel = sel.GetCount();
|
||||
IReadOnlyList<long> ids_ = sel.GetObjectIDs();
|
||||
ids = ids_.ToList();
|
||||
return ids;
|
||||
|
|
@ -656,7 +656,7 @@ namespace OliviaAddInPro.Helper
|
|||
if (filt == null)
|
||||
filt = new ArcGIS.Core.Data.QueryFilter();
|
||||
sel = fc.Select(filt, SelectionType.ObjectID, SelectionOption.Normal);
|
||||
int nsel = sel.GetCount();
|
||||
var nsel = sel.GetCount();
|
||||
IReadOnlyList<long> ids_ = sel.GetObjectIDs();
|
||||
ids = ids_.ToList();
|
||||
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
|
||||
*/
|
||||
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)
|
||||
return geomInters;
|
||||
|
|
@ -975,7 +975,7 @@ namespace OliviaAddInPro.Helper
|
|||
ArcGIS.Core.Geometry.Geometry geomSal = null;
|
||||
try
|
||||
{
|
||||
if (resultDimension == GeometryDimension.esriGeometryNoDimension)
|
||||
if (resultDimension == GeometryDimensionType.EsriGeometryUnknownDimension)//GeometryDimension.esriGeometryNoDimension)
|
||||
geomSal = GeometryEngine.Instance.Intersection(geomIni, geomInters);
|
||||
else
|
||||
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
|
||||
*/
|
||||
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;
|
||||
FeatureClass fc = null;
|
||||
int n = -1;
|
||||
long n = -1;
|
||||
if (gdb != null)
|
||||
{
|
||||
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
|
||||
*/
|
||||
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();
|
||||
return ArcGIS.Desktop.Framework.Threading.Tasks.QueuedTask.Run((Func<int>)(() =>
|
||||
return ArcGIS.Desktop.Framework.Threading.Tasks.QueuedTask.Run((Func<long>)(() =>
|
||||
{
|
||||
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
|
||||
*/
|
||||
public static int GetNumElemsSync(FeatureClass fc, string consulta = "")
|
||||
public static long GetNumElemsSync(FeatureClass fc, string consulta = "")
|
||||
{
|
||||
int n = -1;
|
||||
long n = -1;
|
||||
ReiniciaOutStr();
|
||||
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
|
||||
*/
|
||||
public static int GetNumElems(string pathFtClss, string consulta = "")
|
||||
public static long GetNumElems(string pathFtClss, string consulta = "")
|
||||
{
|
||||
FeatureClass fc = GetFtClass(pathFtClss);
|
||||
int n = GetNumElems(fc, consulta).Result;
|
||||
var n = GetNumElems(fc, consulta).Result;
|
||||
Free(fc);
|
||||
return n;
|
||||
}
|
||||
public static int GetNumElemsSync(string pathFtClss, string consulta = "")
|
||||
public static long GetNumElemsSync(string pathFtClss, string consulta = "")
|
||||
{
|
||||
FeatureClass fc = GetFtClassSync(pathFtClss);
|
||||
int n = GetNumElemsSync(fc, consulta);
|
||||
var n = GetNumElemsSync(fc, consulta);
|
||||
Free(fc);
|
||||
return n;
|
||||
}
|
||||
|
|
@ -1902,7 +1902,7 @@ namespace OliviaAddInPro.Helper
|
|||
geom = f.GetShape();
|
||||
line = (ArcGIS.Core.Geometry.Polyline)geom;
|
||||
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;
|
||||
longi_zon = line.Length;//se consigue la longitud de ámbito (linea) que interseca con el nivel)
|
||||
if ((longi_zon / longi_tot) < porc)
|
||||
|
|
@ -2462,7 +2462,8 @@ namespace OliviaAddInPro.Helper
|
|||
//{
|
||||
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;
|
||||
CIMSymbolReference symbolTemplate=new CIMSymbolReference();
|
||||
if (tipo == GeometryType.Point)//puntual
|
||||
|
|
|
|||
|
|
@ -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>
|
||||
|
|
@ -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.
|
||||
|
|
@ -1,406 +1,152 @@
|
|||
<?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>
|
||||
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
|
||||
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
|
||||
<ProductVersion>8.0.30703</ProductVersion>
|
||||
<SchemaVersion>2.0</SchemaVersion>
|
||||
<ProjectGuid>{10742570-CF59-42F2-BEA2-2A38002A06EE}</ProjectGuid>
|
||||
<OutputType>Library</OutputType>
|
||||
<AppDesignerFolder>Properties</AppDesignerFolder>
|
||||
<RootNamespace>OliviaAddInPro</RootNamespace>
|
||||
<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>
|
||||
<TargetFramework>net6.0-windows</TargetFramework>
|
||||
<RuntimeIdentifier>win10-x64</RuntimeIdentifier>
|
||||
<AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
|
||||
<CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
|
||||
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
|
||||
<NoWarn>CA1416</NoWarn>
|
||||
<UseWPF>true</UseWPF>
|
||||
<AllowUnsafeBlocks>True</AllowUnsafeBlocks>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
|
||||
<HintPath>packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="System" />
|
||||
<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>
|
||||
<Compile Remove=".git\**" />
|
||||
<EmbeddedResource Remove=".git\**" />
|
||||
<None Remove=".git\**" />
|
||||
<Page Remove=".git\**" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<AddInContent Include="Config.daml" />
|
||||
<AddInContent Include="Images\AddInDesktop16.png" />
|
||||
<AddInContent Include="Images\AddInDesktop32.png" />
|
||||
<AddInContent Include="DarkImages\AddInDesktop16.png" />
|
||||
<AddInContent Include="DarkImages\AddInDesktop32.png" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Compile Include="Button\ButtonConfig.cs" />
|
||||
<Compile Include="Button\ButtonLimp.cs" />
|
||||
<Compile Include="Button\ButtonMaq.cs" />
|
||||
<Compile Include="Button\ButtonRec.cs" />
|
||||
<Compile Include="Conexion\Cstr_socket.cs" />
|
||||
<Compile Include="Helper\EnabledComboBoxItem.cs" />
|
||||
<Compile Include="Helper\CheckedListItem.cs" />
|
||||
<Compile Include="Helper\HelperGdb.cs" />
|
||||
<Compile Include="Helper\HelperGlobal.cs" />
|
||||
<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" />
|
||||
<Content Include="Config.daml" />
|
||||
<Content Include="Images\AddInDesktop16.png" />
|
||||
<Content Include="Images\AddInDesktop32.png" />
|
||||
<Content Include="DarkImages\AddInDesktop16.png" />
|
||||
<Content Include="DarkImages\AddInDesktop32.png" />
|
||||
<Content Include="DarkImages\GenericButtonBlue16.png" />
|
||||
<Content Include="DarkImages\GenericButtonBlue32.png" />
|
||||
<Content Include="Images\OliviaIconPro16.png" />
|
||||
<Content Include="Images\OliviaIconPro32.png" />
|
||||
<Content Include="DarkImages\GenericButtonPurple16.png" />
|
||||
<Content Include="DarkImages\GenericButtonPurple32.png" />
|
||||
<Content Include="DarkImages\GenericButtonGreen16.png" />
|
||||
<Content Include="DarkImages\GenericButtonGreen32.png" />
|
||||
<Content Include="Images\reco2.png" />
|
||||
<Content Include="Images\carrito2.png" />
|
||||
<Content Include="Images\config2_olv.png" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<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" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Resource Include="View\OliviaIconPro.ico" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<None Include="packages.config" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Resource Include="Resources\inicio.png" />
|
||||
<Resource Include="Resources\ptosctrl.png" />
|
||||
<Resource Include="Resources\time.png" />
|
||||
<Resource Include="Resources\zonas.png" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<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" />
|
||||
</ItemGroup>
|
||||
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
|
||||
<!--
|
||||
PackageAction can be:
|
||||
BuildDefault: ArcGIS Pro is required. An esriAddinX package is created and copied to ArcGIS Pro add-in folder.
|
||||
BuildZipPostProcess: ArcGIS Pro install is NOT required to build the add-in. An esriAddinX package is created in your output folder.
|
||||
BuildNoPostProcess: ArcGIS Pro install is NOT required to build the add-in. An esriAddinX package is NOT created.
|
||||
-->
|
||||
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
|
||||
<PackageAction>BuildDefault</PackageAction>
|
||||
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
|
||||
<PackageAction>BuildDefault</PackageAction>
|
||||
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
|
||||
</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.CleanAddIn" />
|
||||
<UsingTask AssemblyFile="$(ArcGISFolder)\bin\proapp-sdk-MSBuild.dll" TaskName="proapp_sdk_MSBuild.ConvertToRelativePath" />
|
||||
<!--<Import Project="Esri.ArcGISPro.Extensions.targets" Condition="Exists('Esri.ArcGISPro.Extensions.targets')" />-->
|
||||
<Import Project="$(ArcGISFolder)\bin\Esri.ProApp.SDK.Desktop.targets" Condition="Exists('$(ArcGISFolder)\bin\Esri.ProApp.SDK.Desktop.targets') AND !Exists('Esri.ArcGISPro.Extensions.targets')" />
|
||||
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
|
||||
Other similar extension points exist, see Microsoft.Common.targets.
|
||||
<Target Name="BeforeBuild">
|
||||
</Target>
|
||||
<Target Name="AfterBuild">
|
||||
</Target>
|
||||
-->
|
||||
<!--<Target Name="BeforeBuild">
|
||||
<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')" />
|
||||
</Target>-->
|
||||
<ItemGroup>
|
||||
<PackageReference Include="DotNetProjects.Extended.Wpf.Toolkit" Version="5.0.103" />
|
||||
<PackageReference Include="Newtonsoft.Json" Version="13.0.2" />
|
||||
<Reference Include="ArcGIS.Desktop.Framework">
|
||||
<HintPath>C:\Program Files\ArcGIS\Pro\bin\ArcGIS.Desktop.Framework.dll</HintPath>
|
||||
<CopyLocal>false</CopyLocal>
|
||||
</Reference>
|
||||
<Reference Include="ArcGIS.Core">
|
||||
<HintPath>C:\Program Files\ArcGIS\Pro\bin\ArcGIS.Core.dll</HintPath>
|
||||
<CopyLocal>false</CopyLocal>
|
||||
</Reference>
|
||||
<Reference Include="ArcGIS.Desktop.Core">
|
||||
<HintPath>C:\Program Files\ArcGIS\Pro\bin\Extensions\Core\ArcGIS.Desktop.Core.dll</HintPath>
|
||||
<CopyLocal>false</CopyLocal>
|
||||
</Reference>
|
||||
<Reference Include="ArcGIS.Desktop.Layouts">
|
||||
<HintPath>C:\Program Files\ArcGIS\Pro\bin\Extensions\Layout\ArcGIS.Desktop.Layouts.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="ArcGIS.Desktop.Mapping">
|
||||
<HintPath>C:\Program Files\ArcGIS\Pro\bin\Extensions\Mapping\ArcGIS.Desktop.Mapping.dll</HintPath>
|
||||
<CopyLocal>false</CopyLocal>
|
||||
</Reference>
|
||||
<Reference Include="ArcGIS.Desktop.Catalog">
|
||||
<HintPath>C:\Program Files\ArcGIS\Pro\bin\Extensions\Catalog\ArcGIS.Desktop.Catalog.dll</HintPath>
|
||||
<CopyLocal>false</CopyLocal>
|
||||
</Reference>
|
||||
<Reference Include="ArcGIS.Desktop.Shared.Wpf">
|
||||
<HintPath>C:\Program Files\ArcGIS\Pro\bin\ArcGIS.Desktop.Shared.Wpf.dll</HintPath>
|
||||
<CopyLocal>false</CopyLocal>
|
||||
</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>
|
||||
|
|
@ -25,7 +25,7 @@
|
|||
<OutputPath>bin\Debug\</OutputPath>
|
||||
<DefineConstants>DEBUG;TRACE</DefineConstants>
|
||||
<ErrorReport>prompt</ErrorReport>
|
||||
<WarningLevel>4</WarningLevel>
|
||||
<WarningLevel>0</WarningLevel>
|
||||
<StartAction>Program</StartAction>
|
||||
<StartProgram>$(ArcGISFolder)\bin\ArcGISPro.exe</StartProgram>
|
||||
<PlatformTarget>x64</PlatformTarget>
|
||||
|
|
@ -117,8 +117,9 @@
|
|||
<HintPath>$(ArcGISFolder)\bin\ESRI.ArcGIS.ItemIndex.dll</HintPath>
|
||||
<Private>False</Private>
|
||||
</Reference>
|
||||
<Reference Include="Xceed.Wpf.Toolkit">
|
||||
<HintPath>..\wpftoolkit-master\ExtendedWPFToolkitSolution\Src\Xceed.Wpf.Toolkit\bin\Release\Xceed.Wpf.Toolkit.dll</HintPath>
|
||||
<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>
|
||||
|
|
@ -139,6 +140,7 @@
|
|||
<Compile Include="Helper\HelperGdb.cs" />
|
||||
<Compile Include="Helper\HelperGlobal.cs" />
|
||||
<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" />
|
||||
|
|
@ -150,15 +152,14 @@
|
|||
<Compile Include="Model\OliviaConf.cs" />
|
||||
<Compile Include="Model\OliviaDef.cs" />
|
||||
<Compile Include="Services\ConfigServ.cs" />
|
||||
<<<<<<< HEAD
|
||||
<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\ImportaResServ.cs" />
|
||||
>>>>>>> Elena/reco
|
||||
<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" />
|
||||
|
|
@ -169,6 +170,21 @@
|
|||
<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>
|
||||
|
|
@ -236,6 +252,26 @@
|
|||
<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>
|
||||
|
|
@ -301,9 +337,6 @@
|
|||
<LastGenOutput>Resource1.Designer.cs</LastGenOutput>
|
||||
</EmbeddedResource>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<AddInContent Include="Images\config.png" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<AddInContent Include="DarkImages\GenericButtonGreen16.png" />
|
||||
</ItemGroup>
|
||||
|
|
@ -328,17 +361,18 @@
|
|||
<ItemGroup>
|
||||
<Resource Include="Images\openfolder.png" />
|
||||
</ItemGroup>
|
||||
<<<<<<< HEAD
|
||||
<ItemGroup />
|
||||
=======
|
||||
<ItemGroup>
|
||||
<AddInContent Include="Images\config2.png" />
|
||||
<AddInContent Include="Images\reco2.png" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<AddInContent Include="Images\carrito2.png" />
|
||||
</ItemGroup>
|
||||
>>>>>>> Elena/reco
|
||||
<ItemGroup>
|
||||
<AddInContent Include="Images\config2_olv.png" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Resource Include="Images\help16Pro.png" />
|
||||
</ItemGroup>
|
||||
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
|
||||
<!--
|
||||
PackageAction can be:
|
||||
|
|
@ -352,6 +386,7 @@
|
|||
</PropertyGroup>
|
||||
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
|
||||
<PackageAction>BuildDefault</PackageAction>
|
||||
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
|
||||
</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.CleanAddIn" />
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
|
||||
|
||||
Microsoft Visual Studio Solution File, Format Version 12.00
|
||||
# Visual Studio Version 16
|
||||
VisualStudioVersion = 16.0.30011.22
|
||||
|
|
|
|||
|
|
@ -0,0 +1,8 @@
|
|||
{
|
||||
"profiles": {
|
||||
"OliviaAddInPro": {
|
||||
"commandName": "Executable",
|
||||
"executablePath": "C:\\Program Files\\ArcGIS\\Pro\\bin\\ArcGISPro.exe"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -78,7 +78,7 @@ namespace OliviaAddInPro.Services
|
|||
return false;
|
||||
}
|
||||
//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)
|
||||
{
|
||||
ErrStr = "No existen ámbitos que cumplan las condiciones introducidas para la exportación " + com.ConsultaAmbs;
|
||||
|
|
|
|||
|
|
@ -224,7 +224,7 @@ namespace OliviaAddInPro.Services
|
|||
if (OliviaGlob.CompruebaExistePath(OliviaGlob.Paths.PathGuardCsv))
|
||||
Path = OliviaGlob.Paths.PathGuardCsv;
|
||||
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)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
using ArcGIS.Core.Data;
|
||||
/*using ArcGIS.Core.Data;
|
||||
using ArcGIS.Core.Geometry;
|
||||
using ArcGIS.Core.Internal.CIM;
|
||||
using ArcGIS.Desktop.Framework.Threading.Tasks;
|
||||
using ArcGIS.Desktop.Framework.Threading.Tasks;*/
|
||||
using OliviaAddInPro.Helper;
|
||||
using OliviaAddInPro.Model;
|
||||
using System;
|
||||
|
|
@ -166,7 +166,7 @@ namespace OliviaAddInPro.Services
|
|||
public bool[] BuscAmbGdb(string pathCapa)
|
||||
{
|
||||
string consulta;
|
||||
int numero_lin;
|
||||
long numero_lin;
|
||||
bool[] amb_gdb = new bool[(int)LimpiezaDef.AmbitsTra.AmbN];//se inician a false
|
||||
string ftclass;
|
||||
|
||||
|
|
|
|||
|
|
@ -53,7 +53,7 @@ namespace OliviaAddInPro.View.Configuracion
|
|||
private void PickFileButton_Click(object sender, RoutedEventArgs e)
|
||||
{
|
||||
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))
|
||||
{
|
||||
Value = st;
|
||||
|
|
|
|||
|
|
@ -8,8 +8,8 @@ using System.Threading.Tasks;
|
|||
using System.Windows.Media.Imaging;
|
||||
using OliviaAddInPro.Helper;
|
||||
using static OliviaAddInPro.Model.ComunDef;
|
||||
using ArcGIS.Desktop.Framework.Threading.Tasks;
|
||||
using ArcGIS.Desktop.Framework.Contracts;
|
||||
//using ArcGIS.Desktop.Framework.Threading.Tasks;
|
||||
//using ArcGIS.Desktop.Framework.Contracts;
|
||||
|
||||
namespace OliviaAddInPro
|
||||
{
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@ using System.Linq;
|
|||
using System.Text;
|
||||
using System.Threading.Tasks;
|
||||
using System.Text.RegularExpressions;
|
||||
using System.Runtime.InteropServices.WindowsRuntime;
|
||||
//using System.Runtime.InteropServices.WindowsRuntime;
|
||||
using OliviaAddInPro.Model;
|
||||
using OliviaAddInPro.Helper;
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue