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

Algunos cambios pruebas pre demo

Elena/develop
Elena 2022-07-05 23:37:22 +02:00
parent e80a95251a
commit 20a1ac9fd4
3 changed files with 23 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Helper/HelperGdb.cs
View File

@ -1036,6 +1036,7 @@ namespace OliviaAddInPro.Helper
return ArcGIS.Desktop.Framework.Threading.Tasks.QueuedTask.Run((Func<ArcGIS.Core.Geometry.Geometry>)(() =>
{
geomIni = GetGeomUnique(fclss, filter);
geomIni = GeometryEngine.Instance.ConvexHull(geomIni);
return geomIni;
}));
}
@ -1047,6 +1048,7 @@ namespace OliviaAddInPro.Helper
{
ArcGIS.Core.Geometry.Geometry geomIni = null;
geomIni = GetGeomUnique(fclss, filter);
geomIni = GeometryEngine.Instance.ConvexHull(geomIni);
return geomIni;
}
/*
@ -1324,10 +1326,11 @@ namespace OliviaAddInPro.Helper
}
List<long> ids = new List<long>();
/////////////////////////////////////////////////////////
//Añade a la lista los ids que cumplen el filtro espacial
using (RowCursor cursor = fc.Search(filter))
{
while (cursor.MoveNext())
while (cursor.MoveNext() && !cps.Getcancelled())
{
using (Feature feature = (Feature)cursor.Current)
{
@ -1340,6 +1343,12 @@ namespace OliviaAddInPro.Helper
OutStr = "Error al aplicar filtro espacial en exportación";
return false;
}
/////////////////////////////////////////////////////////
if (cps.Getcancelled())
{
OutStr = Resource1.String_cancel_progreso;
return false;
}
//convierte la lista de ids a string para la clause de la forma
//(id1, id2, id3..)
string whereClause = GetWhereClauseFromIds(ids);
@ -1354,7 +1363,7 @@ namespace OliviaAddInPro.Helper
}
var environments = Geoprocessing.MakeEnvironmentArray(outputCoordinateSystem: sr);
//SpatialReferenceBuilder.CreateSpatialReference(3857)
double valini = cps.GetProgress(); ;
double valini = cps.GetProgress();
IGPResult gpResult = Geoprocessing.ExecuteToolAsync("FeatureClassToFeatureClass_conversion", args,
environments, null,
@ -1560,8 +1569,9 @@ namespace OliviaAddInPro.Helper
Respuesta<bool> resp = new Respuesta<bool>();
try
{
ArcGIS.Core.Geometry.Geometry geom_convexhull = GeometryEngine.Instance.ConvexHull(geom);
ArcGIS.Core.Geometry.Polygon poli = (ArcGIS.Core.Geometry.Polygon)geom_convexhull;
//ArcGIS.Core.Geometry.Geometry geom_convexhull = GeometryEngine.Instance.ConvexHull(geom);
//ArcGIS.Core.Geometry.Polygon poli = (ArcGIS.Core.Geometry.Polygon)geom_convexhull;
ArcGIS.Core.Geometry.Polygon poli = (ArcGIS.Core.Geometry.Polygon)geom;
bool contains = GeometryEngine.Instance.Contains(poli, pto.ToMapPoint());
resp.Value = contains;
return resp;

8
Services/EjecServ.cs
View File

@ -125,10 +125,10 @@ namespace OliviaAddInPro.Services
//Pone nombre al shape en función de los ámbitos, el tratamiento, y los polígonos + timestamp
com.NombreShpExport = PREF_NAME_EXPORT + com.NombreShpExp_PrefTto + "_" + fechaHora + EXT_SHP;
com.ProgrSrc.IncMessage(10, "Exportando ámbitos de trabajo");
com.ProgrSrc.IncMessage(10, "Exportando ámbitos de trabajo");//10%
//exporta los datos de entrada
if (!HelperGdb.ExportShp2(com.CapaElems, filtroEspacial, com.NombreShpExport, OliviaGlob.Paths.DirData, com.ProgrSrc._ProgrSrc, null, 40))
if (!HelperGdb.ExportShp2(com.CapaElems, filtroEspacial, com.NombreShpExport, OliviaGlob.Paths.DirData, com.ProgrSrc._ProgrSrc, null, 50))
{
ErrStr = "Error al exportar los ámbitos: " + HelperGdb.OutStr;
return false;
@ -161,7 +161,7 @@ namespace OliviaAddInPro.Services
}
///////////////////////////////////////////////////////////////////////
///
com.ProgrSrc.IncMessage(10, "Preparando exportación de red navegable");//50%
com.ProgrSrc.IncMessage(40, "Preparando exportación de red navegable");//50%
//hace intersecciones espaciales en caso de ámbitos lineales para quitar los que tienen más parte fuera de la zona que dentro
//REVISAR
@ -316,6 +316,8 @@ namespace OliviaAddInPro.Services
ErrStr = Resource1.String_cancel_progreso;
return false;
}
com.ProgrSrc.IncMessage(40, "Finalizada Exportación. Conectando con Olivia Tasks.");//100%
}
catch (Exception ex)
{

2
Services/LanzaSrv/LanzaOlvServ.cs
View File

@ -99,7 +99,7 @@ namespace OliviaAddInPro.Services.LanzaSrv
GeneralDef.EjecGeoParamSep + GeneralDef.GG_port + GeneralDef.EjecGeoParamIgual + OliviaGlob.Conexion.Puerto + " " +
GeneralDef.EjecGeoParamSep + GeneralDef.GG_tout + GeneralDef.EjecGeoParamIgual + OliviaGlob.Conexion.TiempoOutSocket + " " +
GeneralDef.EjecGeoParamSep + GeneralDef.GG_pt + GeneralDef.EjecGeoParamIgual + OliviaGlob.Paths.PathTemp + " " +
GeneralDef.EjecGeoParamSep + GeneralDef.GG_pcfg + GeneralDef.EjecGeoParamIgual + OliviaGlob.Paths.PathCfg + "D:\\Proyectos\\Olivia\\Instal2.0\\cfg.ini";
GeneralDef.EjecGeoParamSep + GeneralDef.GG_pcfg + GeneralDef.EjecGeoParamIgual + OliviaGlob.Paths.PathCfg + " ";
pfi = new ProcessStartInfo(OliviaGlob.Paths.PathExeOlivia, args);
pfi.UseShellExecute = false;