From a2ebb5952695e1d183c05bd3b7500eb63e1c48b2 Mon Sep 17 00:00:00 2001 From: luca Date: Tue, 24 Feb 2009 16:47:43 +0000 Subject: [PATCH] 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 --- projects/ps.sln | 6 + projects/ps1100.rc | 4 + projects/ps1100.vcproj | 345 ++++++++++++++++++++++++++++ projects/ve7.vcproj | 106 ++++----- ps/indice_programmi.txt | 3 + ps/ps1100.cpp | 17 ++ ps/ps1100.h | 6 + ve/ve7500.cpp => ps/ps1100100.cpp | 12 +- ve/ve7500a.h => ps/ps1100100a.h | 0 ve/ve7500a.uml => ps/ps1100100a.uml | 17 +- ve/ve7500m.ini => ps/ps1100100m.ini | 0 ve/ve7500p.ini => ps/ps1100100p.ini | 0 ve/ve7.cpp | 2 - ve/ve7.h | 1 - 14 files changed, 433 insertions(+), 86 deletions(-) create mode 100755 projects/ps1100.rc create mode 100755 projects/ps1100.vcproj create mode 100755 ps/ps1100.cpp create mode 100755 ps/ps1100.h rename ve/ve7500.cpp => ps/ps1100100.cpp (94%) rename ve/ve7500a.h => ps/ps1100100a.h (100%) rename ve/ve7500a.uml => ps/ps1100100a.uml (57%) rename ve/ve7500m.ini => ps/ps1100100m.ini (100%) rename ve/ve7500p.ini => ps/ps1100100p.ini (100%) diff --git a/projects/ps.sln b/projects/ps.sln index ac6f96b4e..eed5fd312 100755 --- a/projects/ps.sln +++ b/projects/ps.sln @@ -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 diff --git a/projects/ps1100.rc b/projects/ps1100.rc new file mode 100755 index 000000000..7593751ff --- /dev/null +++ b/projects/ps1100.rc @@ -0,0 +1,4 @@ +"9012" ICON DISCARDABLE "../res/exe.ico" + +rcinclude ../../wx287/include/wx/msw/wx.rc + diff --git a/projects/ps1100.vcproj b/projects/ps1100.vcproj new file mode 100755 index 000000000..cd083a1cc --- /dev/null +++ b/projects/ps1100.vcproj @@ -0,0 +1,345 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/projects/ve7.vcproj b/projects/ve7.vcproj index dfb07b0e5..935a06b05 100755 --- a/projects/ve7.vcproj +++ b/projects/ve7.vcproj @@ -31,29 +31,38 @@ Name="VCPreBuildEventTool" /> + + + + + - - - + @@ -70,14 +79,11 @@ Name="TrrCompiler" /> - @@ -172,29 +178,38 @@ Name="VCPreBuildEventTool" /> + + + + + - - - + @@ -211,14 +226,11 @@ Name="TrrCompiler" /> - @@ -557,28 +569,6 @@ /> - - - - - - - - @@ -814,10 +804,6 @@ RelativePath="..\ve\ve7400a.uml" > - - @@ -859,10 +845,6 @@ RelativePath="..\ve\ve7400a.h" > - - @@ -900,14 +882,6 @@ RelativePath="..\ve\ve7400conf.ini" > - - - - diff --git a/ps/indice_programmi.txt b/ps/indice_programmi.txt index b21c85261..f7750d06e 100755 --- a/ps/indice_programmi.txt +++ b/ps/indice_programmi.txt @@ -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) diff --git a/ps/ps1100.cpp b/ps/ps1100.cpp new file mode 100755 index 000000000..7c6e64111 --- /dev/null +++ b/ps/ps1100.cpp @@ -0,0 +1,17 @@ +#include +#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; +} diff --git a/ps/ps1100.h b/ps/ps1100.h new file mode 100755 index 000000000..0767cdafb --- /dev/null +++ b/ps/ps1100.h @@ -0,0 +1,6 @@ +int ps1100100(int argc, char* argv[]); + + + + + diff --git a/ve/ve7500.cpp b/ps/ps1100100.cpp similarity index 94% rename from ve/ve7500.cpp rename to ps/ps1100100.cpp index 078029740..8aecb6b24 100755 --- a/ve/ve7500.cpp +++ b/ps/ps1100100.cpp @@ -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")); diff --git a/ve/ve7500a.h b/ps/ps1100100a.h similarity index 100% rename from ve/ve7500a.h rename to ps/ps1100100a.h diff --git a/ve/ve7500a.uml b/ps/ps1100100a.uml similarity index 57% rename from ve/ve7500a.uml rename to ps/ps1100100a.uml index c709182e5..40fabf4e4 100755 --- a/ve/ve7500a.uml +++ b/ps/ps1100100a.uml @@ -1,17 +1,10 @@ -#include "ve7500a.h" +#include "ps1100100a.h" +TOOLBAR "topbar" 0 0 0 2 +#include +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 diff --git a/ve/ve7500m.ini b/ps/ps1100100m.ini similarity index 100% rename from ve/ve7500m.ini rename to ps/ps1100100m.ini diff --git a/ve/ve7500p.ini b/ps/ps1100100p.ini similarity index 100% rename from ve/ve7500p.ini rename to ps/ps1100100p.ini diff --git a/ve/ve7.cpp b/ve/ve7.cpp index 5eb68737d..dcf157787 100755 --- a/ve/ve7.cpp +++ b/ve/ve7.cpp @@ -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: diff --git a/ve/ve7.h b/ve/ve7.h index d62c3880f..6953063f0 100755 --- a/ve/ve7.h +++ b/ve/ve7.h @@ -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**);