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

Solo he tocado cosas de la configuración, lo juro

Elena/develop
Elena 2022-02-18 00:52:40 +01:00
parent 04cc22e6f4
commit 297d960b90
5 changed files with 934 additions and 937 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1820
Model/OliviaConf.cs
View File

File diff suppressed because it is too large Load Diff

16
Model/OliviaGlob.cs
View File

@ -329,7 +329,7 @@ namespace OliviaAddInPro.Model
//importa resultados //importa resultados
//borra los archivos que le toca borrar //borra los archivos que le toca borrar
//hay una funcion borrafiles en EjecServ, usar esa?
//pone modo config2 //pone modo config2
} }
@ -503,13 +503,13 @@ namespace OliviaAddInPro.Model
RecogidaDef.Parametros.t_descM = c.t_descarga_max; RecogidaDef.Parametros.t_descM = c.t_descarga_max;
RecogidaDef.Parametros.t_descm = c.t_descarga_min; RecogidaDef.Parametros.t_descm = c.t_descarga_min;
RecogidaDef.Parametros.t_desc = c.t_descarga; RecogidaDef.Parametros.t_desc = c.t_descarga;
RecogidaDef.Parametros.t_convM = c.R_t_convenio_max; RecogidaDef.Parametros.t_convM = c.t_convenio_max;
RecogidaDef.Parametros.t_convm = c.R_t_convenio_min; RecogidaDef.Parametros.t_convm = c.t_convenio_min;
RecogidaDef.Parametros.t_conv = c.R_t_convenio; RecogidaDef.Parametros.t_conv = c.t_convenio;
RecogidaDef.Parametros.t_descansoM = c.R_t_descanso_max; RecogidaDef.Parametros.t_descansoM = c.t_descanso_max;
RecogidaDef.Parametros.t_descansom = c.R_t_descanso_min; RecogidaDef.Parametros.t_descansom = c.t_descanso_min;
RecogidaDef.Parametros.t_descanso = c.R_t_descanso; RecogidaDef.Parametros.t_descanso = c.t_descanso;
RecogidaDef.Parametros.h_inicio = c.R_hora_inicio; RecogidaDef.Parametros.h_inicio = c.hora_inicio;
RecogidaDef.Parametros.dens_vehi_org = c.dens_vehi_org; RecogidaDef.Parametros.dens_vehi_org = c.dens_vehi_org;
RecogidaDef.Parametros.dens_vehi_res = c.dens_vehi_res; RecogidaDef.Parametros.dens_vehi_res = c.dens_vehi_res;
RecogidaDef.Parametros.dens_vehi_env = c.dens_vehi_env; RecogidaDef.Parametros.dens_vehi_env = c.dens_vehi_env;

6
OliviaAddInPro.csproj
View File

@ -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>
@ -360,6 +361,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" />

4
Services/ConfigServ.cs
View File

@ -255,6 +255,7 @@ namespace OliviaAddInPro.Services
c.v_desp_BalMix=15; c.v_desp_BalMix=15;
c.v_desp_BL=5; c.v_desp_BL=5;
c.v_desp_CH=15; c.v_desp_CH=15;
//son 0 porque van según la velocidad de la vía
c.v_desp_VPap=0; c.v_desp_VPap=0;
c.v_desp_LPap=0; c.v_desp_LPap=0;
c.v_desp_LC=0; c.v_desp_LC=0;
@ -314,9 +315,6 @@ namespace OliviaAddInPro.Services
c.R_t_descanso_min = 0; c.R_t_descanso_min = 0;
c.t_llega_sale=5; c.t_llega_sale=5;
c.t_descarga=40; c.t_descarga=40;
c.R_t_convenio = 480;
c.R_t_descanso = 30;
c.R_hora_inicio = 420; //ES UNA HORA, SON LOS MINUTOS DESDE LAS 00, PERO TIENE QUE APARECER CON FORMATO DE TIME 07:30, POR EJEMPLO
c.dens_vehi_org=500; c.dens_vehi_org=500;
c.dens_vehi_res=500; c.dens_vehi_res=500;
c.dens_vehi_env=120; c.dens_vehi_env=120;

25
View/Configuracion/PropertyGridFilePickerLine.xaml.cs
View File

@ -60,4 +60,29 @@ namespace OliviaAddInPro.View.Configuracion
} }
} }
} }
public class DateTimePickerEditor : Xceed.Wpf.Toolkit.DateTimePicker, ITypeEditor
{
public DateTimePickerEditor()
{
Format = Xceed.Wpf.Toolkit.DateTimeFormat.Custom;
FormatString = "HH 'h' mm 'm'";
//TimePickerVisibility = System.Windows.Visibility.Collapsed;
ShowButtonSpinner = true;
AutoCloseCalendar = false;
ShowDropDownButton = false;
TextAlignment = TextAlignment.Left;
AutoClipTimeParts = true;
}
public FrameworkElement ResolveEditor(PropertyItem propertyItem)
{
Binding binding = new Binding("Value");
binding.Source = propertyItem;
binding.Mode = propertyItem.IsReadOnly ? BindingMode.OneWay : BindingMode.TwoWay;
BindingOperations.SetBinding(this, ValueProperty, binding);
return this;
}
}
} }