From 23cd733c9b68b55744055d51dc3347d15c4fe1e3 Mon Sep 17 00:00:00 2001
From: Elena <Elena@narvaling.com>
Date: Mon, 24 Oct 2022 13:07:45 +0200
Subject: [PATCH] Comienzos hacer ventana para cambiar Dataset y Nombre

---
 Config.daml                            |  12 +++---
 Helper/HelperGdb.cs                    |   5 ++-
 Images/GenericButtonPurple16.png       | Bin 0 -> 1055 bytes
 Images/GenericButtonPurple32.png       | Bin 0 -> 1255 bytes
 OliviaAddInPro.csproj                  |  14 ++++++
 Services/EjecServ.cs                   |  20 +++++++--
 View/ProWindowSaveFileName.xaml        |  24 +++++++++++
 View/ProWindowSaveFileName.xaml.cs     |  57 +++++++++++++++++++++++++
 ViewModel/ShowProWindowSaveFileName.cs |  47 ++++++++++++++++++++
 9 files changed, 169 insertions(+), 10 deletions(-)
 create mode 100644 Images/GenericButtonPurple16.png
 create mode 100644 Images/GenericButtonPurple32.png
 create mode 100644 View/ProWindowSaveFileName.xaml
 create mode 100644 View/ProWindowSaveFileName.xaml.cs
 create mode 100644 ViewModel/ShowProWindowSaveFileName.cs

diff --git a/Config.daml b/Config.daml
index 69da287..d01f6c8 100644
--- a/Config.daml
+++ b/Config.daml
@@ -16,17 +16,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 +41,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">
diff --git a/Helper/HelperGdb.cs b/Helper/HelperGdb.cs
index 24bceda..07e9123 100644
--- a/Helper/HelperGdb.cs
+++ b/Helper/HelperGdb.cs
@@ -25,6 +25,7 @@ using OliviaAddInPro.Model.contract;
 using ArcGIS.Core.Data.DDL;
 using ArcGIS.Core.CIM;
 using System.Threading;
+using Microsoft.Win32;
 
 namespace OliviaAddInPro.Helper
 {
@@ -2005,8 +2006,10 @@ namespace OliviaAddInPro.Helper
             if (!string.IsNullOrEmpty(ext_))
                 dlg.DefaultExt = ext_;
             if (brwsFilt != null)
+            {
+                brwsFilt.BrowsingFilesMode = true;
                 dlg.BrowseFilter = brwsFilt;
-
+            }
             try
             {
                 bool? ok = dlg.ShowDialog();
diff --git a/Images/GenericButtonPurple16.png b/Images/GenericButtonPurple16.png
new file mode 100644
index 0000000000000000000000000000000000000000..01b089507f9a610698e9beef0932c761c4b14e3d
GIT binary patch
literal 1055
zcmaJ=OK8(z98cK;*#kT%xG5M?Hx$>T=_6Z1<JLCaR$0bqyIC)?H2J#5Ef14#Hk$}j
zPaYIx9&`wL@Ug)dQxriDDxMUST?Ds_h=Lvz56Vyw>X)wFJXn)_`5yd#zyIs^ogW(P
zYi?+5z%Z;i(a$H*yxkew>d}Ai_o9fV78uXKl%9hH(F9mT*0TUlsNxt%0#Tki@dAV~
ztY)8*&cKW?z)HGGijECws|G@2Sh(9ZL}?sAJPXDYjU&E2enQ}i%n?U|f>$tNAg}aK
zn;<nkn3kr;rI1W?AHu^niwINzMch^=G>f%4qQuLhwR21nc*z8gbHqka8DR*I=_bH~
zq~9ZXX&Pr3k`4qJhVH<9UfM@_(Z_h`02^djUngFE2;|L_b8M3DE&D<{j>to3uoP7&
z6v%>~)Xg!94uwJvhtKCh79ML#gQD%xEO&*02bN?i22^wncNoR2J_$JjMY@rKYHZSK
zR=G^5V3aKy6is@alq!aT@PAWP-L$q~5^Tl$Phu-QWdJG(EPc|HP~&oL$CbgxOdvwt
zOzZkYrHVs&9qLwIH}F`B!S@TIq-f5;ff7Ox*o0<5QIkM|=Lp0>DvHcTgMqFtKNDkU
zzLTco{z&Piz1~1?EEeZO6)dkylPb_)1uJi1`Knk)461=V^T1S20=d`JRlJlmt5lCA
zQkAcam8-`Rt%{{kFqG5Uzgk^6Li%x*o5Dq#P3Z#->D@%aKK9_^9J&;j5_}|WuVsH1
zi`_MCGj;spwNtlU{cmRHAJXB~n`i1?E)>>Nxls`ihd*6^SKPI(J!-tS>{>dPdG-1D
z(UrD4_rHRlzdm%1T==qQu_-kC`ieNy)HBD`4BTy9KK)#2qTA~mp3S>5S=Wx?x6$40
zeJj`xyM3+k#>YfQ&q$*caR=1d%U649-M3a-@Tb^L>)`v^h2^YsWfSp1eknS7_7BY~
BR#yN3

literal 0
HcmV?d00001

diff --git a/Images/GenericButtonPurple32.png b/Images/GenericButtonPurple32.png
new file mode 100644
index 0000000000000000000000000000000000000000..39f62dbd909f6ea3aea92e464cdec4ad25671294
GIT binary patch
literal 1255
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz$r9IylHmNblJdl&R0hYC{G?O`
z&)mfH)S%SFl*+=BsWuD@%qp275hW46K32*3xq68pHF_1f1wh>l3^w)^1&PVosU-?Y
zsp*+{wo31J?^jaDOtDo8H}y5}EpSfF$n>ZxN)4{^3rViZPPR-@vbR&PsjvbXkegbP
zs8ErclUHn2VXFi-*9yo63F|8<fR&VF+bTgE72zA8;GAESs$i;Tteb3LXsBRjre|nk
zYG!7rqhMrUXryldL}t2%CRV0qRz~IuP@n{~ttchUD#*nRY8Q}atCUevQedU8UtV6W
zS8lAAUzDzIXlZE)GQ-G77pOwFxH7LKu|hYmSQ%!5OKNd)QD#9&W`3Rm$i&2?{L&Iz
zC7??oUdSzg8=F@Q4JKfK=~pBc=o{)8fV>1#=<ADLX>KlDb#X~hD#E>34K5C;EJ)Q4
zN-fSWElLJPT$(b-ssbzLqSVBa{GyQj{2W*)24v)y<QHe;7brLfn<;4cCMIX*fdn+c
zI(&VtJoAc667!N%JzZ>-fM)1rW~NxVnYp<c8M&F58M-(c8oC-gf}x>-fr*>5v#X0G
zOs`9Ra%paAUI|QZ3PP_bPQ9SSkXrz>*(J3ovn(~mttdZN0qkk3Ox$iU!f75<ZwhX=
z7~|Bd4|I$^C~A?S8YToxKOiPN;Q~4Eq@S7xOz%a&gk2(L^p=5vG1Ak;F{I*F(x3nT
z?GHOJ9dmrh;O6FLkbZQ|Wk!cp@*ScXDfgKb^m;rD?=pP0xWlM$Ix=GBHR&iXLypd(
zOGmzyuitMx$Npc>!}IU!8y}ujlXgh*@%Z$2%N7|HhqUH54Q)oucNiV+H$QS{oHk9_
zx@mHEDC1GaFKqYs|83hG>A+$T_=mlXDeUO;KKm4lZU6ZWpO@e7xv6Dt^VEYkg618(
z6v(>XN~~tm@kX(D%kMo0FZl^e<h)V&^-2Bk&dKEma%%bxNVBFl?lU(ESG-vy!0^&=
z^F@Z)jr<Qv88mL3+$h5q5jj(`?*A|6eatHu|NZ@KzkyGI#ZA`WRYM?qk5$44>j&T8
z?@y8T>xtXLXRs+G!J_mD+m0;Ny%#?UuMtmSyZM&U-Jh3@k58=aar-)cpJtY8GZa!z
zZ18O1cX(SC#k@k6e}m-$fh(B{mMSO63Qve_UY%{WsQNeqBO62Q=SfzdOx|07iXKl_
KKbLh*2~7YH@3UP1

literal 0
HcmV?d00001

diff --git a/OliviaAddInPro.csproj b/OliviaAddInPro.csproj
index 91ffcd5..c977a91 100644
--- a/OliviaAddInPro.csproj
+++ b/OliviaAddInPro.csproj
@@ -148,6 +148,9 @@
     <Compile Include="Model\TratamientoComun.cs" />
     <Compile Include="Model\Limpieza.cs" />
     <Compile Include="Model\LimpiezaDef.cs" />
+    <Compile Include="View\ProWindowSaveFileName.xaml.cs">
+      <DependentUpon>ProWindowSaveFileName.xaml</DependentUpon>
+    </Compile>
     <Compile Include="Services\EjecServ.cs" />
     <Compile Include="Model\OliviaConf.cs" />
     <Compile Include="Model\OliviaDef.cs" />
@@ -159,6 +162,7 @@
     <Compile Include="Services\LimpiezaServ.cs" />
     <Compile Include="Services\ProcesoEjecServ.cs" />
     <Compile Include="Services\RecogidaServ.cs" />
+    <Compile Include="ViewModel\ShowProWindowSaveFileName.cs" />
     <Compile Include="ViewModel\Comun\MarchandoUnaDeViewModel.cs" />
     <Compile Include="ViewModel\Configuracion\DockpaneConfigViewModel.cs" />
     <Compile Include="ViewModel\Configuracion\PaneConfigViewModel.cs" />
@@ -252,6 +256,10 @@
     <Resource Include="OliviaIconPro.ico" />
   </ItemGroup>
   <ItemGroup>
+    <Page Include="View\ProWindowSaveFileName.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="View\Comun\MarchandoUnaDe.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
@@ -373,6 +381,12 @@
   <ItemGroup>
     <Resource Include="Images\help16Pro.png" />
   </ItemGroup>
+  <ItemGroup>
+    <AddInContent Include="Images\GenericButtonPurple16.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AddInContent Include="Images\GenericButtonPurple32.png" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!--
   PackageAction can be:
diff --git a/Services/EjecServ.cs b/Services/EjecServ.cs
index 0ace66e..c8a6567 100644
--- a/Services/EjecServ.cs
+++ b/Services/EjecServ.cs
@@ -748,6 +748,16 @@ namespace OliviaAddInPro.Services
                     msg_avisa = "No se encuentra el Dataset " + datname + ". ";
                 }
             }
+            else
+            {
+                /////////////////////////////////////////
+                //no tiene un dataset configurado, saca ventana para elegir uno
+                //saca ventana para elegir Dataset, si se cancela, se guarda en el nombre por defecto en función del tratamiento y los ámbitos
+                //HelperGlobal.ponMsg("A continuación, seleccione nombre de Feature Class para importación. Si cancela el proceso, se establecerán el nombre y Dataset por defecto en función de los ámbitos y el tratamiento");
+                string path_aux = HelperGdb.SaveFileDlg("Seleccione Dataset donde importar", GdbFileName, null, ArcGIS.Desktop.Catalog.ItemFilters.featureDatasets_all);
+                if (!string.IsNullOrEmpty(path_aux))
+                    tratamiento = System.IO.Path.GetDirectoryName(path_aux);
+            }
             //crea el dataset o comprueba si existe
             string datasetNameOut = string.Empty;
             var resp = HelperGdb.CreateDataset(GdbFileName, tratamiento, spatRefData, out datasetNameOut);            
@@ -771,12 +781,16 @@ namespace OliviaAddInPro.Services
                 //HelperGlobal.ponMsg(err_spatref +", se ha creado un nuevo dataset "+ datasetNameOut );
                 tratamiento = datasetNameOut;
             }
-            string dataset = tratamiento;            
-
+            string dataset = tratamiento;
+            /////////////////////////////////////////
+            //saca ventana para elegir nombre
+            ShowProWindowSaveFileName wndFileName = new ShowProWindowSaveFileName(ambitos);
+            string amb_aux = wndFileName.GetName();
+            if (!string.IsNullOrEmpty(amb_aux))
+                ambitos = amb_aux;
             /////////////////////////////////////////
             //todo ok, se pone a importar
             string err_st =string.Empty;
-            string name = ambitos;
             string path_import = GdbFileName + "\\" + dataset + "\\" + ambitos;
             int NIMPORT;
             string[] noms_shp = null;
diff --git a/View/ProWindowSaveFileName.xaml b/View/ProWindowSaveFileName.xaml
new file mode 100644
index 0000000..8106762
--- /dev/null
+++ b/View/ProWindowSaveFileName.xaml
@@ -0,0 +1,24 @@
+<controls:ProWindow x:Class="OliviaAddInPro.ProWindowSaveFileName"
+        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+        xmlns:controls="clr-namespace:ArcGIS.Desktop.Framework.Controls;assembly=ArcGIS.Desktop.Framework"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+        xmlns:extensions="clr-namespace:ArcGIS.Desktop.Extensions;assembly=ArcGIS.Desktop.Extensions"
+        mc:Ignorable="d"
+        Title="Guardar elemento como..." Height="145.946" Width="544.144"
+        WindowStartupLocation="CenterOwner" Closed="ProWindow_Closed" Closing="ProWindow_Closing"
+    >
+    <controls:ProWindow.Resources>
+        <ResourceDictionary>
+            <ResourceDictionary.MergedDictionaries>
+                <extensions:DesignOnlyResourceDictionary Source="pack://application:,,,/ArcGIS.Desktop.Framework;component\Themes\Default.xaml"/>
+            </ResourceDictionary.MergedDictionaries>
+        </ResourceDictionary>
+    </controls:ProWindow.Resources>
+    <StackPanel Height="108" VerticalAlignment="Top" Margin="0,0,2,0">
+        <TextBox HorizontalAlignment="Left" Height="35" Margin="20,8,0,0" TextWrapping="Wrap" Text="{Binding Path=Texto, Mode = TwoWay}" VerticalAlignment="Top" Width="491" KeyUp="TextBox_KeyUp"/>
+        <Button Content="Guardar" HorizontalAlignment="Left" Height="35" Margin="387,20,0,0" Width="124" Click="Button_Click"/>
+    </StackPanel>
+
+</controls:ProWindow>
diff --git a/View/ProWindowSaveFileName.xaml.cs b/View/ProWindowSaveFileName.xaml.cs
new file mode 100644
index 0000000..831528d
--- /dev/null
+++ b/View/ProWindowSaveFileName.xaml.cs
@@ -0,0 +1,57 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Navigation;
+using System.Windows.Shapes;
+
+namespace OliviaAddInPro
+{
+    /// <summary>
+    /// Interaction logic for ProWindowSaveFileName.xaml
+    /// </summary>
+    public partial class ProWindowSaveFileName : ArcGIS.Desktop.Framework.Controls.ProWindow
+    {
+        private bool ok = false;
+        public ProWindowSaveFileName()
+        {
+            InitializeComponent();
+        }
+
+        private void Button_Click(object sender, RoutedEventArgs e)
+        {
+            ok = true;
+            Close();
+        }
+
+        private void ProWindow_Closed(object sender, EventArgs e)
+        {
+
+        }
+
+        private void ProWindow_Closing(object sender, System.ComponentModel.CancelEventArgs e)
+        {
+            if (ok)
+                DialogResult = true;
+            else
+                DialogResult = false;
+        }
+
+        private void TextBox_KeyUp(object sender, KeyEventArgs e)
+        {
+            if(e.Key==Key.Enter)
+            {
+                ok = true;
+                Close();
+            }
+        }
+    }
+}
diff --git a/ViewModel/ShowProWindowSaveFileName.cs b/ViewModel/ShowProWindowSaveFileName.cs
new file mode 100644
index 0000000..fb09a17
--- /dev/null
+++ b/ViewModel/ShowProWindowSaveFileName.cs
@@ -0,0 +1,47 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using ArcGIS.Desktop.Framework;
+using ArcGIS.Desktop.Framework.Contracts;
+
+namespace OliviaAddInPro
+{
+    internal class ShowProWindowSaveFileName : Button
+    {
+
+        private ProWindowSaveFileName _prowindowsavefilename = null;
+
+        private string texto;
+        public string Texto
+        {
+            get { return texto; }
+            set { base.SetProperty(ref texto, value, () => Texto); }
+
+        }
+
+        public ShowProWindowSaveFileName(string text_in)
+        {
+            Texto = text_in;
+            crea();            
+        }
+        public string GetName()
+        {
+            bool? res = _prowindowsavefilename.ShowDialog();
+            if (res ?? true)
+            {
+                return Texto;
+            }
+            return string.Empty;
+        }
+        private void crea()
+        {
+            //already open?
+            if (_prowindowsavefilename != null)
+                return;
+            _prowindowsavefilename = new ProWindowSaveFileName();
+            _prowindowsavefilename.Owner = FrameworkApplication.Current.MainWindow;
+        }
+    }
+}