From ca806f920d083b7cc6195e7339fc5cfe50f3d624 Mon Sep 17 00:00:00 2001 From: mtollari Date: Mon, 7 Nov 2016 08:32:41 +0000 Subject: [PATCH] =?UTF-8?q?Patch=20level=20=20=20=20=20=20=20=20=20:=2012.?= =?UTF-8?q?0=20no-patch=20Files=20correlati=20=20=20=20=20:=20Commento=20?= =?UTF-8?q?=20=20=20=20=20=20=20=20=20=20=20:=20-=20Spostato=20Trasferimen?= =?UTF-8?q?to=20dati=20in=20mr0=20-=20Aggiunta=20voce=20di=20men=C3=B9=20-?= =?UTF-8?q?=20Sistemati=20progetti=20=20mr?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: svn://10.65.10.50/branches/R_10_00@23397 c028cbd2-c16b-5b4b-a496-9718f37d4682 --- build/mr.sln | 14 +++++++++++- build/mr0.vcxproj | 26 +++++++++++----------- build/mr0.vcxproj.filters | 15 +++++++------ build/mr1.vcxproj | 30 +++++++++----------------- build/mr1.vcxproj.filters | 6 ------ build/mr2.vcxproj | 26 +++++++++------------- build/mr2.vcxproj.filters | 6 ------ src/mr/mr0.cpp | 1 + src/mr/mr0.h | 1 + src/{ca/ca2600.cpp => mr/mr0600.cpp} | 6 +++--- src/{ca/ca2600a.h => mr/mr0600a.h} | 0 src/{ca/ca2600a.uml => mr/mr0600a.uml} | 2 +- src/mr/mrmenu.men | 12 ++++++----- 13 files changed, 68 insertions(+), 77 deletions(-) rename src/{ca/ca2600.cpp => mr/mr0600.cpp} (96%) rename src/{ca/ca2600a.h => mr/mr0600a.h} (100%) rename src/{ca/ca2600a.uml => mr/mr0600a.uml} (97%) diff --git a/build/mr.sln b/build/mr.sln index 25d4b1e04..85fbfbea4 100644 --- a/build/mr.sln +++ b/build/mr.sln @@ -1,12 +1,16 @@  Microsoft Visual Studio Solution File, Format Version 11.00 -# Visual C++ Express 2010 +# Visual Studio 2010 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mr0", "mr0.vcxproj", "{92083925-A9A5-4539-95E2-39EA1511D912}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mr1", "mr1.vcxproj", "{F8DC72EE-59C2-40AB-BE1D-583AEAE6793D}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mr2", "mr2.vcxproj", "{3FC30246-14E2-47AE-AD86-DD78BC3C202B}" EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AgaLib", "AgaLib.vcxproj", "{2D38A763-3D74-4338-9362-B891784EC90E}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vedoc", "vedoc.vcxproj", "{A1CE9743-A597-4F92-B55A-345A366C9E55}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Win32 = Debug|Win32 @@ -25,6 +29,14 @@ Global {3FC30246-14E2-47AE-AD86-DD78BC3C202B}.Debug|Win32.Build.0 = Debug|Win32 {3FC30246-14E2-47AE-AD86-DD78BC3C202B}.Release|Win32.ActiveCfg = Release|Win32 {3FC30246-14E2-47AE-AD86-DD78BC3C202B}.Release|Win32.Build.0 = Release|Win32 + {2D38A763-3D74-4338-9362-B891784EC90E}.Debug|Win32.ActiveCfg = Debug|Win32 + {2D38A763-3D74-4338-9362-B891784EC90E}.Debug|Win32.Build.0 = Debug|Win32 + {2D38A763-3D74-4338-9362-B891784EC90E}.Release|Win32.ActiveCfg = Release|Win32 + {2D38A763-3D74-4338-9362-B891784EC90E}.Release|Win32.Build.0 = Release|Win32 + {A1CE9743-A597-4F92-B55A-345A366C9E55}.Debug|Win32.ActiveCfg = Debug|Win32 + {A1CE9743-A597-4F92-B55A-345A366C9E55}.Debug|Win32.Build.0 = Debug|Win32 + {A1CE9743-A597-4F92-B55A-345A366C9E55}.Release|Win32.ActiveCfg = Release|Win32 + {A1CE9743-A597-4F92-B55A-345A366C9E55}.Release|Win32.Build.0 = Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/build/mr0.vcxproj b/build/mr0.vcxproj index 11e4f153c..c2f90a95f 100644 --- a/build/mr0.vcxproj +++ b/build/mr0.vcxproj @@ -39,13 +39,14 @@ <_ProjectFileVersion>10.0.30319.1 ..\exe\ - $(Configuration)\$(ProjectName)\ + ..\obj\ false false false false false - ..\exed\ + ..\exe\ + ..\obj\ @@ -59,7 +60,7 @@ Disabled - ..\src\include;..\src\xvaga;%(AdditionalIncludeDirectories) + ..\src\xi;..\src\include;..\src\xvaga;%(AdditionalIncludeDirectories) _DEBUG;WIN32;__LONGDOUBLE__;_WINDOWS;%(PreprocessorDefinitions) MultiThreadedDebug true @@ -154,6 +155,7 @@ %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) @@ -178,6 +180,7 @@ + @@ -188,6 +191,7 @@ + @@ -234,16 +238,12 @@ - - true - - - - true - - - true - + + {2d38a763-3d74-4338-9362-b891784ec90e} + + + {a1ce9743-a597-4f92-b55a-345a366c9e55} + diff --git a/build/mr0.vcxproj.filters b/build/mr0.vcxproj.filters index cd8b4905b..3937d77a2 100644 --- a/build/mr0.vcxproj.filters +++ b/build/mr0.vcxproj.filters @@ -54,6 +54,9 @@ Sources + + Sources + @@ -77,6 +80,9 @@ Masks + + Masks + @@ -106,6 +112,9 @@ Headers + + Headers + @@ -147,10 +156,4 @@ Image - - - - - - \ No newline at end of file diff --git a/build/mr1.vcxproj b/build/mr1.vcxproj index e282e594d..b8cbc41bb 100644 --- a/build/mr1.vcxproj +++ b/build/mr1.vcxproj @@ -39,10 +39,10 @@ <_ProjectFileVersion>10.0.30319.1 ..\exe\ - $(Configuration)\$(ProjectName)\ + ..\obj\ false - .\..\debug\ - .\..\debug\ + ..\exe\ + ..\obj\ true false false @@ -102,7 +102,7 @@ Disabled - ..\include;..\xvaga;..\xi;%(AdditionalIncludeDirectories) + ..\src\include;..\src\xvaga;..\src\xi;%(AdditionalIncludeDirectories) _DEBUG;WIN32;DBG;_WINDOWS;%(PreprocessorDefinitions) true MultiThreadedDebug @@ -197,22 +197,12 @@ - - Document - true - - - Document - true - - - Document - true - - - Document - true - + + {2d38a763-3d74-4338-9362-b891784ec90e} + + + {a1ce9743-a597-4f92-b55a-345a366c9e55} + diff --git a/build/mr1.vcxproj.filters b/build/mr1.vcxproj.filters index 6ff59c414..927397b7a 100644 --- a/build/mr1.vcxproj.filters +++ b/build/mr1.vcxproj.filters @@ -56,10 +56,4 @@ - - - - - - \ No newline at end of file diff --git a/build/mr2.vcxproj b/build/mr2.vcxproj index d284cda3a..e63c8fad1 100644 --- a/build/mr2.vcxproj +++ b/build/mr2.vcxproj @@ -38,14 +38,15 @@ <_ProjectFileVersion>10.0.30319.1 - ..\exed\ + ..\exe\ ..\exe\ - $(Configuration)\$(ProjectName)\ + ..\obj\ false false false false false + ..\obj\ @@ -59,7 +60,7 @@ Disabled - ..\src\include;..\src\xvaga;%(AdditionalIncludeDirectories) + ..\src\include;..\src\xvaga;..\src\xi;%(AdditionalIncludeDirectories) _DEBUG;WIN32;__LONGDOUBLE__;_WINDOWS;%(PreprocessorDefinitions) true MultiThreadedDebug @@ -249,19 +250,12 @@ - - Document - true - - - Document - true - - - Document - true - - + + {2d38a763-3d74-4338-9362-b891784ec90e} + + + {a1ce9743-a597-4f92-b55a-345a366c9e55} + diff --git a/build/mr2.vcxproj.filters b/build/mr2.vcxproj.filters index ca2a5478b..c7990f648 100644 --- a/build/mr2.vcxproj.filters +++ b/build/mr2.vcxproj.filters @@ -131,10 +131,4 @@ - - - - - - \ No newline at end of file diff --git a/src/mr/mr0.cpp b/src/mr/mr0.cpp index cc25aad7f..7bd5f7566 100755 --- a/src/mr/mr0.cpp +++ b/src/mr/mr0.cpp @@ -9,6 +9,7 @@ int main(int argc, char** argv) { case 3: mr0400(argc, argv); break; // parametri ditta case 4: mr0500(argc, argv); break; // rilevazione produzione + case 5: mr0600(argc, argv); break; // Trasferimento a Compass default: mr0100(argc, argv);break; // M.R.P. } return 0; diff --git a/src/mr/mr0.h b/src/mr/mr0.h index 6929a5832..daa1bf1e7 100755 --- a/src/mr/mr0.h +++ b/src/mr/mr0.h @@ -6,6 +6,7 @@ int mr0100(int argc, char* argv[]); //int mr0300(int argc, char* argv[]); int mr0400(int argc, char* argv[]); int mr0500(int argc, char* argv[]); +int mr0600(int argc, char* argv[]); #endif diff --git a/src/ca/ca2600.cpp b/src/mr/mr0600.cpp similarity index 96% rename from src/ca/ca2600.cpp rename to src/mr/mr0600.cpp index 2be7623a1..bf7727edf 100644 --- a/src/ca/ca2600.cpp +++ b/src/mr/mr0600.cpp @@ -6,7 +6,7 @@ #include #include -#include "ca2600a.h" +#include "mr0600a.h" class TCampass_msk : public TAutomask { @@ -46,7 +46,7 @@ bool TCampass_msk::on_field_event(TOperable_field& o, TField_event e, long jolly return true; } -TCampass_msk::TCampass_msk() : TAutomask("ca2600a") +TCampass_msk::TCampass_msk() : TAutomask("mr0600a") { set(F_DSN, ini_get_string(CONFIG_DITTA, "Campo_Compass", "DSN")); set(F_USR, ini_get_string(CONFIG_DITTA, "Campo_Compass", "User")); @@ -750,7 +750,7 @@ void TCampass_app::main_loop() } -int ca2600(int argc, char* argv[]) +int mr0600(int argc, char* argv[]) { TCampass_app app; // Imposto le tabelle da utilizzare diff --git a/src/ca/ca2600a.h b/src/mr/mr0600a.h similarity index 100% rename from src/ca/ca2600a.h rename to src/mr/mr0600a.h diff --git a/src/ca/ca2600a.uml b/src/mr/mr0600a.uml similarity index 97% rename from src/ca/ca2600a.uml rename to src/mr/mr0600a.uml index c3722e91e..62ad51785 100644 --- a/src/ca/ca2600a.uml +++ b/src/mr/mr0600a.uml @@ -1,4 +1,4 @@ -#include "ca2600a.h" +#include "mr0600a.h" TOOLBAR "topbar" 0 0 0 2 diff --git a/src/mr/mrmenu.men b/src/mr/mrmenu.men index 12c7f728f..c41b71df7 100755 --- a/src/mr/mrmenu.men +++ b/src/mr/mrmenu.men @@ -8,11 +8,13 @@ Item_02 = "Pianificazione ordini", "mr2 -1", "F" Item_03 = "M.R.P.", "mr2 -0", "F" Item_04 = "Rilevazione produzione", "mr0 -4", "F" Item_05 = "Pianificazione acquisti", "mr2 -3", "F" -Item_06 = "Stampe", [MRMENU_040] -Item_07 = "Archivi", [MRMENU_010] -Item_08 = "Stampe archivi", [MRMENU_020] -Item_09 = "Servizi", [MRMENU_030] -Item_10 = "Configurazione MRP", [MRMENU_080] +Item_06 = "Trasmissione a Compass", "mr0 -5", "F" +Item_07 = "Stampe", [MRMENU_040] +Item_08 = "Archivi", [MRMENU_010] +Item_09 = "Stampe archivi", [MRMENU_020] +Item_10 = "Servizi", [MRMENU_030] +Item_11 = "Configurazione MRP", [MRMENU_080] + [MRMENU_010] Caption = "Gestione archivi"