Patch level :10.0

Files correlati     :
Ricompilazione Demo : [ ]
Commento            :personalizzazione gommari prassiroma messa in ps (ps1100)


git-svn-id: svn://10.65.10.50/trunk@18343 c028cbd2-c16b-5b4b-a496-9718f37d4682
This commit is contained in:
luca 2009-02-24 16:47:43 +00:00
parent ab0db352cc
commit a2ebb59526
14 changed files with 433 additions and 86 deletions

View File

@ -67,6 +67,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pd6142", "pd6142.vcproj", "
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pd0001", "pd0001.vcproj", "{EAEED555-9118-4CFD-9C79-D2A59B49C291}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ps1100", "ps1100.vcproj", "{2CC07FDE-D15A-420B-9DDB-1FDF32B73BC2}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
@ -169,6 +171,10 @@ Global
{EAEED555-9118-4CFD-9C79-D2A59B49C291}.Debug|Win32.Build.0 = Debug|Win32
{EAEED555-9118-4CFD-9C79-D2A59B49C291}.Release|Win32.ActiveCfg = Release|Win32
{EAEED555-9118-4CFD-9C79-D2A59B49C291}.Release|Win32.Build.0 = Release|Win32
{2CC07FDE-D15A-420B-9DDB-1FDF32B73BC2}.Debug|Win32.ActiveCfg = Debug|Win32
{2CC07FDE-D15A-420B-9DDB-1FDF32B73BC2}.Debug|Win32.Build.0 = Debug|Win32
{2CC07FDE-D15A-420B-9DDB-1FDF32B73BC2}.Release|Win32.ActiveCfg = Release|Win32
{2CC07FDE-D15A-420B-9DDB-1FDF32B73BC2}.Release|Win32.Build.0 = Release|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE

4
projects/ps1100.rc Executable file
View File

@ -0,0 +1,4 @@
"9012" ICON DISCARDABLE "../res/exe.ico"
rcinclude ../../wx287/include/wx/msw/wx.rc

345
projects/ps1100.vcproj Executable file
View File

@ -0,0 +1,345 @@
<?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject
ProjectType="Visual C++"
Version="9,00"
Name="ps1100"
ProjectGUID="{2CC07FDE-D15A-420B-9DDB-1FDF32B73BC2}"
TargetFrameworkVersion="131072"
>
<Platforms>
<Platform
Name="Win32"
/>
</Platforms>
<ToolFiles>
</ToolFiles>
<Configurations>
<Configuration
Name="Debug|Win32"
OutputDirectory=".\..\debug"
IntermediateDirectory=".\..\debug"
ConfigurationType="1"
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="false"
>
<Tool
Name="VCPreBuildEventTool"
/>
<Tool
Name="VCCustomBuildTool"
/>
<Tool
Name="VCXMLDataGeneratorTool"
/>
<Tool
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
Name="VCMIDLTool"
PreprocessorDefinitions="_DEBUG"
MkTypLibCompatible="true"
SuppressStartupBanner="true"
TargetEnvironment="1"
TypeLibraryName=".\..\debug/ps1100.tlb"
HeaderFileName=""
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="..\include,..\xvaga,..\xi"
PreprocessorDefinitions="_DEBUG;WIN32;DBG;_WINDOWS"
MinimalRebuild="true"
RuntimeLibrary="1"
PrecompiledHeaderFile=".\..\debug/ps1100.pch"
AssemblerListingLocation=".\..\debug/"
ObjectFile=".\..\debug/"
ProgramDataBaseFileName=".\..\debug/"
BrowseInformation="1"
WarningLevel="3"
SuppressStartupBanner="true"
DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="_DEBUG"
Culture="1040"
AdditionalIncludeDirectories="..\..\wx287\include"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="version.lib wsock32.lib comctl32.lib rpcrt4.lib"
OutputFile="..\exed\ps1100.exe"
LinkIncremental="2"
SuppressStartupBanner="true"
IgnoreDefaultLibraryNames="libc.lib"
GenerateDebugInformation="true"
ProgramDatabaseFile=".\..\debug/ps1100.pdb"
SubSystem="2"
RandomizedBaseAddress="1"
DataExecutionPrevention="0"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
<Tool
Name="VCManifestTool"
/>
<Tool
Name="VCXDCMakeTool"
/>
<Tool
Name="VCBscMakeTool"
SuppressStartupBanner="true"
OutputFile=".\..\debug/ps1100.bsc"
/>
<Tool
Name="VCFxCopTool"
/>
<Tool
Name="VCAppVerifierTool"
/>
<Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
<Configuration
Name="Release|Win32"
OutputDirectory=".\..\release"
IntermediateDirectory=".\..\release"
ConfigurationType="1"
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="false"
>
<Tool
Name="VCPreBuildEventTool"
/>
<Tool
Name="VCCustomBuildTool"
/>
<Tool
Name="VCXMLDataGeneratorTool"
/>
<Tool
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
Name="VCMIDLTool"
PreprocessorDefinitions="NDEBUG"
MkTypLibCompatible="true"
SuppressStartupBanner="true"
TargetEnvironment="1"
TypeLibraryName=".\..\release/ps1100.tlb"
HeaderFileName=""
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\include,..\xvaga,..\xi"
PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;XVT"
StringPooling="true"
RuntimeLibrary="0"
EnableFunctionLevelLinking="true"
PrecompiledHeaderFile=".\..\release/ps1100.pch"
AssemblerListingLocation=".\..\release/"
ObjectFile=".\..\release/"
ProgramDataBaseFileName=".\..\release/"
WarningLevel="3"
SuppressStartupBanner="true"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="NDEBUG"
Culture="1040"
AdditionalIncludeDirectories="..\..\wx287\include"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="version.lib wsock32.lib comctl32.lib rpcrt4.lib"
OutputFile="D:\Release\campo100/ps1100.exe"
LinkIncremental="1"
SuppressStartupBanner="true"
IgnoreDefaultLibraryNames="libc.lib"
ProgramDatabaseFile=".\..\release/ps1100.pdb"
SubSystem="2"
RandomizedBaseAddress="1"
DataExecutionPrevention="0"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
<Tool
Name="VCManifestTool"
/>
<Tool
Name="VCXDCMakeTool"
/>
<Tool
Name="VCBscMakeTool"
SuppressStartupBanner="true"
OutputFile=".\..\release/ps1100.bsc"
/>
<Tool
Name="VCFxCopTool"
/>
<Tool
Name="VCAppVerifierTool"
/>
<Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
</Configurations>
<References>
</References>
<Files>
<Filter
Name="Sources"
Filter="cpp"
>
<File
RelativePath="..\ps\ps1100.cpp"
>
<FileConfiguration
Name="Debug|Win32"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
/>
</FileConfiguration>
</File>
<File
RelativePath="..\ps\ps1100100.cpp"
>
<FileConfiguration
Name="Debug|Win32"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
/>
</FileConfiguration>
</File>
</Filter>
<Filter
Name="Masks"
Filter="uml"
>
<File
RelativePath="..\ps\ps1100100a.uml"
>
<FileConfiguration
Name="Debug|Win32"
>
<Tool
Name="VCCustomBuildTool"
Description="Compiling mask $(InputPath)..."
CommandLine="msk32 $(InputPath) $(TargetDir)$(InputName).msk&#x0D;&#x0A;"
Outputs="$(TargetDir)$(InputName).msk"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32"
>
<Tool
Name="VCCustomBuildTool"
Description="Compiling mask $(InputPath)..."
CommandLine="msk32 $(InputPath) $(TargetDir)$(InputName).msk&#x0D;&#x0A;"
Outputs="$(TargetDir)$(InputName).msk"
/>
</FileConfiguration>
</File>
</Filter>
<Filter
Name="Headers"
Filter="h"
>
<File
RelativePath="..\ps\ps1100.h"
>
</File>
<File
RelativePath="..\ps\ps1100100a.h"
>
</File>
</Filter>
<File
RelativePath="..\lib\AgaLib.lib"
>
<FileConfiguration
Name="Debug|Win32"
ExcludedFromBuild="true"
>
<Tool
Name="VCCustomBuildTool"
/>
</FileConfiguration>
</File>
<File
RelativePath="..\lib\AgaLibD.lib"
>
</File>
<File
RelativePath="ps1100.rc"
>
<FileConfiguration
Name="Debug|Win32"
>
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions=""
AdditionalIncludeDirectories=""
ResourceOutputFileName="..\Debug/ps1100.res"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32"
>
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions=""
AdditionalIncludeDirectories=""
/>
</FileConfiguration>
</File>
</Files>
<Globals>
</Globals>
</VisualStudioProject>

View File

@ -31,29 +31,38 @@
Name="VCPreBuildEventTool"
/>
<Tool
Name="DesCompiler"
Name="DatCompiler"
/>
<Tool
Name="VCCustomBuildTool"
/>
<Tool
Name="BmpCompiler"
/>
<Tool
Name="GifCompiler"
/>
<Tool
Name="DesCompiler"
/>
<Tool
Name="SrcDebugCompiler"
/>
<Tool
Name="MskCompiler"
/>
<Tool
Name="FormCompiler"
/>
<Tool
Name="AlxCompiler"
/>
<Tool
Name="BmpCompiler"
/>
<Tool
Name="DatCompiler"
/>
<Tool
Name="SrcCompiler"
/>
<Tool
Name="TxtCompiler"
/>
<Tool
Name="PngCompiler"
/>
<Tool
Name="JpegCompiler"
/>
@ -70,14 +79,11 @@
Name="TrrCompiler"
/>
<Tool
Name="GifCompiler"
Name="SrcReleaseCompiler"
/>
<Tool
Name="DirCompiler"
/>
<Tool
Name="MskCompiler"
/>
<Tool
Name="VCXMLDataGeneratorTool"
/>
@ -172,29 +178,38 @@
Name="VCPreBuildEventTool"
/>
<Tool
Name="DesCompiler"
Name="DatCompiler"
/>
<Tool
Name="VCCustomBuildTool"
/>
<Tool
Name="BmpCompiler"
/>
<Tool
Name="GifCompiler"
/>
<Tool
Name="DesCompiler"
/>
<Tool
Name="SrcDebugCompiler"
/>
<Tool
Name="MskCompiler"
/>
<Tool
Name="FormCompiler"
/>
<Tool
Name="AlxCompiler"
/>
<Tool
Name="BmpCompiler"
/>
<Tool
Name="DatCompiler"
/>
<Tool
Name="SrcCompiler"
/>
<Tool
Name="TxtCompiler"
/>
<Tool
Name="PngCompiler"
/>
<Tool
Name="JpegCompiler"
/>
@ -211,14 +226,11 @@
Name="TrrCompiler"
/>
<Tool
Name="GifCompiler"
Name="SrcReleaseCompiler"
/>
<Tool
Name="DirCompiler"
/>
<Tool
Name="MskCompiler"
/>
<Tool
Name="VCXMLDataGeneratorTool"
/>
@ -557,28 +569,6 @@
/>
</FileConfiguration>
</File>
<File
RelativePath="..\ve\ve7500.cpp"
>
<FileConfiguration
Name="Debug|Win32"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
/>
</FileConfiguration>
</File>
<File
RelativePath="..\ve\ve7600.cpp"
>
@ -814,10 +804,6 @@
RelativePath="..\ve\ve7400a.uml"
>
</File>
<File
RelativePath="..\ve\ve7500a.uml"
>
</File>
<File
RelativePath="..\ve\ve7600a.uml"
>
@ -859,10 +845,6 @@
RelativePath="..\ve\ve7400a.h"
>
</File>
<File
RelativePath="..\ve\ve7500a.h"
>
</File>
<File
RelativePath="..\ve\ve7600a.h"
>
@ -900,14 +882,6 @@
RelativePath="..\ve\ve7400conf.ini"
>
</File>
<File
RelativePath="..\ve\ve7500m.ini"
>
</File>
<File
RelativePath="..\ve\ve7500p.ini"
>
</File>
<File
RelativePath="..\ve\ve7701a.ini"
>

View File

@ -93,6 +93,9 @@ Pianificazione impianti DBService
PS0925 Coseaespoertaxione estratti conti su piu' ditte
PS1100
Importazione listini dei gommari (prassiroma, ex ve7500)
PS1104
Importazione articoli da file .csv per ditta TENDER (pennari di prassiroma)

17
ps/ps1100.cpp Executable file
View File

@ -0,0 +1,17 @@
#include <xvt.h>
#include "ps1100.h"
int main(int argc, char **argv)
{
const int r= (argc>1)? argv[1][1]-'0' : -1;
switch (r)
{
case (0):
ps1100100(argc, argv); break;
default:
ps1100100(argc, argv); break;
}
exit(0);
return 0;
}

6
ps/ps1100.h Executable file
View File

@ -0,0 +1,6 @@
int ps1100100(int argc, char* argv[]);

View File

@ -7,8 +7,8 @@
#include "../mg/umart.h"
#include "../mg/anamag.h"
#include "ve7.h"
#include "ve7500a.h"
#include "ps1100.h"
#include "ps1100100a.h"
/////////////////////////////////////////////////////
@ -55,6 +55,8 @@ class TLis2fil: public TSkeleton_application
TString4 _um;
protected:
virtual const char * extra_modules() const {return "ve";}
virtual bool create(void);
virtual void main_loop();
virtual bool destroy(void);
@ -73,7 +75,7 @@ const char * TLis2fil::get_ini_name (const TString& filename) const
{
TScanner scan_line(filename);
const TString& line = scan_line.line();
return line[0] == '"' ? "ve7500p.ini" : "ve7500m.ini";
return line[0] == '"' ? "ps1100100p.ini" : "ps1100100m.ini";
}
void TLis2fil::import(const TString& filename)
@ -106,7 +108,7 @@ bool TLis2fil::create()
{
open_files(LF_ANAMAG, LF_UMART, 0);
_msk = new TMask("ve7500a");
_msk = new TMask("ps1100100a");
TString default_dir = "A:\\";
_msk->set(F_DIRNAME, default_dir);
TString4 default_um = "PZ";
@ -158,7 +160,7 @@ bool TLis2fil::annulla_handler(TMask_field& f, KEY k)
}
int ve7500(int argc, char* argv[])
int ps1100100(int argc, char* argv[])
{
TLis2fil a ;
a.run(argc, argv, TR("Importazione listino"));

View File

@ -1,17 +1,10 @@
#include "ve7500a.h"
#include "ps1100100a.h"
TOOLBAR "topbar" 0 0 0 2
#include <stdbar.h>
ENDPAGE
PAGE "Acquisizione dati da file" -1 -1 78 5
BUTTON DLG_OK 10 2
BEGIN
PROMPT -12 -1 ""
END
BUTTON DLG_QUIT 10 2
BEGIN
PROMPT -22 -1 ""
END
PAGE "Acquisizione dati da file" 0 2 0 0
STRING F_DIRNAME 45 50
BEGIN

View File

@ -12,8 +12,6 @@ int main( int argc, char** argv )
ve7700(argc, argv); break; // importazione da Galileo Cantieri
case 5:
ve7600(argc, argv); break; // trasferimento JBI
case 4:
ve7500(argc, argv); break; // importazione listini gommisti (michelin,pirelli etc.)
case 3:
ve7400(argc, argv); break; // esportazione bolle CONAD per marpesca
case 2:

View File

@ -5,7 +5,6 @@ int ve7100 (int, char**);
int ve7200 (int, char**);
int ve7300 (int, char**);
int ve7400 (int, char**);
int ve7500 (int, char**);
int ve7600 (int, char**);
int ve7700 (int, char**);