From fc95ec8882a9c60c6a447c7edaabeefa06848301 Mon Sep 17 00:00:00 2001 From: Emmanuele Sassi Date: Thu, 12 Sep 2024 09:54:17 +0200 Subject: [PATCH] - aggiunta icona programma - aggiunte a lua funzioni che accedono direttamente ad ini programma e funzione file exists --- Supervisor/LUA/Lua_General.vb | 76 +++++++++++++++++++++++++ Supervisor/MainWindow/MainWindowV.xaml | 7 +-- Supervisor/Resources/Effector.ico | Bin 0 -> 86392 bytes Supervisor/Supervisor.vbproj | 3 + 4 files changed, 82 insertions(+), 4 deletions(-) create mode 100644 Supervisor/Resources/Effector.ico diff --git a/Supervisor/LUA/Lua_General.vb b/Supervisor/LUA/Lua_General.vb index 445b42d..e7fd30a 100644 --- a/Supervisor/LUA/Lua_General.vb +++ b/Supervisor/LUA/Lua_General.vb @@ -25,12 +25,16 @@ Public Module Lua_General Friend func_EntIs64bit As LuaFunction = AddressOf Lua_EntIs64bit Friend func_EntOutLog As LuaFunction = AddressOf Lua_EntOutLog Friend func_EntExistsDirectory As LuaFunction = AddressOf Lua_EntExistsDirectory + Friend func_EntFileExists As LuaFunction = AddressOf Lua_EntFileExists Friend func_EntCopyFile As LuaFunction = AddressOf Lua_EntCopyFile Friend func_EntGetIniFile As LuaFunction = AddressOf Lua_EntGetIniFile Friend func_EntGetDataDir As LuaFunction = AddressOf Lua_EntGetDataDir Friend func_EntGetNumberFromIni As LuaFunction = AddressOf Lua_EntGetNumberFromIni Friend func_EntGetStringFromIni As LuaFunction = AddressOf Lua_EntGetStringFromIni Friend func_EntWriteStringToIni As LuaFunction = AddressOf Lua_EntWriteStringToIni + Friend func_EntGetMainNumberFromIni As LuaFunction = AddressOf Lua_EntGetMainNumberFromIni + Friend func_EntGetMainStringFromIni As LuaFunction = AddressOf Lua_EntGetMainStringFromIni + Friend func_EntWriteMainStringToIni As LuaFunction = AddressOf Lua_EntWriteMainStringToIni Friend func_EntSplitString As LuaFunction = AddressOf Lua_EntSplitString Friend func_EntSleep As LuaFunction = AddressOf Lua_EntSleep Friend func_EntDeleteFile As LuaFunction = AddressOf Lua_EntDeleteFile @@ -86,6 +90,25 @@ Public Module Lua_General Return 1 End Function + Private Function Lua_EntFileExists(ByVal p As IntPtr) As Integer + Dim state = Lua.FromIntPtr(p) + ' 1 parametro : sDir + Dim sFilePath As String = "" + LuaCheckParam(state, 1, sFilePath) + LuaClearStack(state) + Dim bResult As Boolean + Try + ' verifico esistenza direttorio + bResult = File.Exists(sFilePath) + Catch ex As Exception + bResult = False + EgtOutLog("Lua_EntExistsDirectory on " & sFilePath & " failed! " & ex.Message) + End Try + ' restituisco il risultato + LuaSetParam(state, bResult) + Return 1 + End Function + Private Function Lua_EntCopyFile(ByVal p As IntPtr) As Integer Dim state = Lua.FromIntPtr(p) ' 2 parametri : sFile, sNewFile @@ -197,6 +220,55 @@ Public Module Lua_General Return 1 End Function + Private Function Lua_EntGetMainNumberFromIni(ByVal p As IntPtr) As Integer + Dim state = Lua.FromIntPtr(p) + ' 4 parametri: sSec, sKey, dDef, sIniFile + Dim sSec As String = "" + Dim sKey As String = "" + Dim dDef As Integer = 0 + LuaCheckParam(state, 1, sSec) + LuaCheckParam(state, 2, sKey) + LuaCheckParam(state, 3, dDef) + LuaClearStack(state) + Dim dResult As Double = GetMainPrivateProfileDouble(sSec, sKey, dDef) + ' restituisco il risultato + LuaSetParam(state, dResult) + Return 1 + End Function + + Private Function Lua_EntGetMainStringFromIni(ByVal p As IntPtr) As Integer + Dim state = Lua.FromIntPtr(p) + ' 4 parametri: sSec, sKey, sDef, sIniFile + Dim sSec As String = "" + Dim sKey As String = "" + Dim sDef As String = 0 + LuaCheckParam(state, 1, sSec) + LuaCheckParam(state, 2, sKey) + LuaCheckParam(state, 3, sDef) + LuaClearStack(state) + Dim sResult As String = "" + GetMainPrivateProfileString(sSec, sKey, sDef, sResult) + ' restituisco il risultato + LuaSetParam(state, sResult) + Return 1 + End Function + + Private Function Lua_EntWriteMainStringToIni(ByVal p As IntPtr) As Integer + Dim state = Lua.FromIntPtr(p) + ' 4 parametri: sSec, sKey, sVal, sIniFile + Dim sSec As String = "" + Dim sKey As String = "" + Dim sVal As Integer = 0 + LuaCheckParam(state, 1, sSec) + LuaCheckParam(state, 2, sKey) + LuaCheckParam(state, 3, sVal) + LuaClearStack(state) + Dim bResult As Boolean = WriteMainPrivateProfileString(sSec, sKey, sVal) + ' restituisco il risultato + LuaSetParam(state, bResult) + Return 1 + End Function + Private Function Lua_EntSplitString(ByVal p As IntPtr) As Integer Dim state = Lua.FromIntPtr(p) ' 4 parametri: sSec, sKey, sVal, sIniFile @@ -433,12 +505,16 @@ Public Module Lua_General state.Register("EntIs64bit", func_EntIs64bit) state.Register("EntOutLog", func_EntOutLog) state.Register("EntExistsDirectory", func_EntExistsDirectory) + state.Register("EntFileExists", func_EntFileExists) state.Register("EntCopyFile", func_EntCopyFile) state.Register("EntGetIniFile", func_EntGetIniFile) state.Register("EntGetDataDir", func_EntGetDataDir) state.Register("EntGetNumberFromIni", func_EntGetNumberFromIni) state.Register("EntGetStringFromIni", func_EntGetStringFromIni) state.Register("EntWriteStringToIni", func_EntWriteStringToIni) + state.Register("EntGetMainNumberFromIni", func_EntGetMainNumberFromIni) + state.Register("EntGetMainStringFromIni", func_EntGetMainStringFromIni) + state.Register("EntWriteMainStringToIni", func_EntWriteMainStringToIni) state.Register("EntSplitString", func_EntSplitString) state.Register("EntSleep", func_EntSleep) state.Register("EntFileLength", func_EntFileLength) diff --git a/Supervisor/MainWindow/MainWindowV.xaml b/Supervisor/MainWindow/MainWindowV.xaml index 9dec1cf..c76a03a 100644 --- a/Supervisor/MainWindow/MainWindowV.xaml +++ b/Supervisor/MainWindow/MainWindowV.xaml @@ -20,10 +20,9 @@ + Width="32" + Height="32" + Source="/Resources/Effector.ico" /> @PPjtV|%h1e)X^mJC-buBz+GoOeqW)?orswP6!c%_TwM}nQuEs6V3mz8zJi-H;}=$ z<5=4!*fx6Jo&?8-_}{f_L)x$*2G9UB01ZF`&;T?54L}3X05kv%Km*VKGyn}i1JD38 zz=H;k9m{R2to%fkO^tYM*%G75Sm>PS+*o6x<J#$^f3e^! zmP?BKN6SeQOKVET^Y7vRdnI8xqwvt52!^OG`I0>(Dl7IcZ|`r6k|g{OLI* zb)|E`{5|KdQM$R`#;u`qDbiV>)(m zQlfuxyL8{xyqs-{%gU8=mKT4D>(YHs5}lv8zPq|~OyY9h?90td+@4%HSK|}crTd;F z%pd&4`f;ZnZ}cy{W@^3uQLRgpRR8qY)#lCmC!N32HPe;<#f&<$&zirxw!N8)H+5+L zn7?oCe`#!`NveNe@~6)bR1>Vt)$%)K%m8N80zDd`x5JPAksyv`nBT z%%9C)&G(;5JnGLfN}pw&Uce{*&jT8O2A~0G02+V>paEzA8h{3%0cZdkfCiueXaE|3 z2JU1Hi2oJ<_W6qd{W}o?owh;rcOr<9p1CavLZ8iR*Y+vF#&Zm?*5Ao%edoqbbr1gh z#sK{JWlwz%{@{=GpI;5Y|NOGY`p-9e@CSda|9ooz{J|gh|NLqI{^yrH?*I5^5B}hf z^`CDIfIs--{-0kB!2kTR$NeAQ?7<)WvHtU|0q_TZ-2d~d0r;O^_PGD!n?3l0Kh}S~ zH30tLkNbaqH30wf%O3ZCe6t6C@W=Ykw+6r;{Bi%!uLj_Me%a&xk8k$i5B^yH`PKmV zgFo*7`PBgY&o6uS{hzDf|J1|p2rXI~q^-~Z}||JgBz|JmME zLr3sGTZ?L!P=lLVZGgYpblL5x#ZHZOz@N=a?GkEmQ>zW|SDP-oJ+;`W(GKtYtExV4 zQ}g%Ut=2lG0My{7RvSwATP&AUjS+2+mFT$GbL{-{zp{Rm--}Z%u@ZY;%KPhVTT1xT z_b8q1M_gaYdl_Y1z+W6!Z}!1o$vUIlkMKV`R`5SNM&5YYn>z46{Li{y!S!FcU$OqP zV}qn(j*~Ob)3LKSfImB;tQb1kus^|H93yt*y(^)%|H0pL z4oYI?d8^85fPY7vSR81+FA}R?x(@g%fqzG2SscK>BUbMASTPh|)8zMY{TIi_UA#Mc z9{%r$AWOUOe@Cp`?XhAg*0lV-y#MKQB-O6m=IQr8jvdRDeJ*A3r{52uWjx(j{n9vj z+NQI-J5J8?EdM*(@#IsE3C*MLZsgh1cc}9GX*;Y$HNx&k`TJTL1Gz-=)$C7=w&cc3 z^H}^n9fNvYz~9r@yDAU<%Khyse&TcRKRcH2KRZTZP5F8s{#TC&{LhXh{LhY&uRSkr zAO2U52mH^DCH&8hk=UQU-sjo>thpm!n+Pa-FVp$we{E)mUReVDn|o4*XdW3haFF4{W}y*{Q*wwn5)DVY~BUpvLz#h@b~o^gZA~SG5BAr%%8i{Qapn^rbJo!TzxE8Y^a1#Tzn1z#-`eUA{?|7CTI(PD!Cz|)qJQl) z2>)vrdp+nL{J~!jI>Z>X(INb=P2BaOckl;)y=W2R@V^$}fB(l^PdW#G@Yj9sdtb2d)Ox4 zd-7v(GYK)+b`2z`o9!dzpJ(b(}M9+#uHMwx#z9FbhRA^r#&`z zIUyk{=w|pjHF7l}-8M{)8~>-(^J^{+%!!y3{^Dov4eWXRu0#K*9&j>x$evys!nelt z_(M?mh?y_#{ClsclWDJ|hm_BFyCL`8U9HEhiC4@2GiU7o#`TS>zkA%_HBF|!hLE5^ z0Mpwu79~dX@2E>=D!t`H{Y5yx?ttz83&)fX}#5EIk~*CrnTj}jOfd&EeYGRPOl)d zNAy1)wxqTCortps%)2k9ugOiY?mm!W?)g>o`HFSqo|@t_V;`*a%l_ewt+)_!pzBAM`u5Aic=2Fmu)HmJ8NzO03mshgRjE8n<{98S=s+^Ft*oZw{SX z7*X3aG{Ro6_~T8hQok76)dtbDV;cD(RCqZ*k2Jh#s%*U0Qf;bC88V1u{?<_ZW=0R2 zK!RhplhaY;-g(0e--im#?b*iZ+ezZm+v*3$W*XB9!$O4^!|rM1!S_>)YIEI^iq)S`_brTnDddd2s zu`#;h!qyEN9!lCV@8;#&f~HR?`zb>fT5Y}Y9=dE(T#f(gm%eg=bMkh}l@ literal 0 HcmV?d00001 diff --git a/Supervisor/Supervisor.vbproj b/Supervisor/Supervisor.vbproj index 988f541..185f3c9 100644 --- a/Supervisor/Supervisor.vbproj +++ b/Supervisor/Supervisor.vbproj @@ -262,6 +262,9 @@ + + +