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

Compare commits

merge into: Narvaling:Gerardo/ErrorGuardadoCSV
Branches Tags
Narvaling:master
Narvaling:Gerardo/ModosViaje
Narvaling:Gerardo/elevacion
Narvaling:Gerardo/StreetMapPremium
Narvaling:develop
Narvaling:Gerardo/ErrorGuardadoCSV
Narvaling:Gerardo/Compilacion.net
Narvaling:Elena/develop
Narvaling:ConfiguracionSimplificada
...
pull from: Narvaling:develop
Branches Tags
Narvaling:master
Narvaling:Gerardo/ModosViaje
Narvaling:Gerardo/elevacion
Narvaling:Gerardo/StreetMapPremium
Narvaling:develop
Narvaling:Gerardo/ErrorGuardadoCSV
Narvaling:Gerardo/Compilacion.net
Narvaling:Elena/develop
Narvaling:ConfiguracionSimplificada

6 Commits
Gerardo/Er ... develop

Author SHA1 Message Date
Gerardo 6e7c7f787c Merge branch 'Gerardo/Compilacion.net' into develop 2023-04-18 21:19:49 +02:00
Gerardo 002d3edd17 Merge branch 'Gerardo/ErrorGuardadoCSV' into develop 
# Conflicts:
#	Conexion/Cstr_socket.cs
#	Helper/HelperGdb.cs
#	Services/EjecServ.cs
#	Services/LanzaSrv/LanzaLimpSrv.cs
#	Services/ProcesoEjecServ.cs
#	View/Configuracion/PaneConfigView.xaml
#	View/Limpieza/PaneLimpiezaSub2.xaml.cs
#	ViewModel/Limpieza/PaneLimpiezaSub1ViewModel.cs
 2023-04-18 21:19:03 +02:00
Gerardo 895d4e89f0 Log mensaje error 2023-03-29 23:41:00 +02:00
Elena 2b91905abb Cambios en nombres pedidos por vsm, arreglo tema oscuro propertygrid, envia mima 2023-02-17 01:16:51 +01:00
Elena c7f8bb403a Arreglos ObjectID exportacion shp 2023-02-13 22:34:35 +01:00
Elena 0f9a21eddc Arreglos IP local 2023-02-13 14:04:36 +01:00
3 changed files with 14 additions and 3 deletions
Show Stats Expand all files Collapse all files

4
Conexion/Cstr_socket.cs
View File

@ -24,7 +24,7 @@ namespace OliviaAddIn
//devuelve -1 si no se ha podido crear socket
//0 si no se puede conectar
//1 si conectado
public bool conecta(string ip, int puerto, string ip_local = "")
public bool conecta(string ip, int puerto, string ip_local="")
{
termina();
try
@ -120,7 +120,7 @@ namespace OliviaAddIn
unsafe public static extern IntPtr str_socket_crea();
[DllImport("utiles.dll", CallingConvention = CallingConvention.StdCall, CharSet = CharSet.Ansi)]
unsafe public static extern int str_socket_conecta(IntPtr soc, String ip, int puerto, String ip_local = null);
unsafe public static extern int str_socket_conecta(IntPtr soc, String ip, int puerto, String ip_local=null);
[DllImport("utiles.dll", CallingConvention = CallingConvention.StdCall, CharSet = CharSet.Ansi)]
unsafe public static extern int str_socket_envia(IntPtr soc, String txt);//solo este

12
OliviaAddInPro.sln
View File

@ -8,13 +8,25 @@ EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Debug|x64 = Debug|x64
Debug|x86 = Debug|x86
Release|Any CPU = Release|Any CPU
Release|x64 = Release|x64
Release|x86 = Release|x86
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{10742570-CF59-42F2-BEA2-2A38002A06EE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{10742570-CF59-42F2-BEA2-2A38002A06EE}.Debug|Any CPU.Build.0 = Debug|Any CPU
{10742570-CF59-42F2-BEA2-2A38002A06EE}.Debug|x64.ActiveCfg = Debug|Any CPU
{10742570-CF59-42F2-BEA2-2A38002A06EE}.Debug|x64.Build.0 = Debug|Any CPU
{10742570-CF59-42F2-BEA2-2A38002A06EE}.Debug|x86.ActiveCfg = Debug|Any CPU
{10742570-CF59-42F2-BEA2-2A38002A06EE}.Debug|x86.Build.0 = Debug|Any CPU
{10742570-CF59-42F2-BEA2-2A38002A06EE}.Release|Any CPU.ActiveCfg = Release|Any CPU
{10742570-CF59-42F2-BEA2-2A38002A06EE}.Release|Any CPU.Build.0 = Release|Any CPU
{10742570-CF59-42F2-BEA2-2A38002A06EE}.Release|x64.ActiveCfg = Release|Any CPU
{10742570-CF59-42F2-BEA2-2A38002A06EE}.Release|x64.Build.0 = Release|Any CPU
{10742570-CF59-42F2-BEA2-2A38002A06EE}.Release|x86.ActiveCfg = Release|Any CPU
{10742570-CF59-42F2-BEA2-2A38002A06EE}.Release|x86.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE

1
View/Configuracion/PaneConfigView.xaml.cs
View File

@ -25,7 +25,6 @@ namespace OliviaAddInPro
public PaneConfigView()
{
InitializeComponent();
}
private void OnGuardar(object sender, RoutedEventArgs e)
{