From 7771670ea5249dfab5a3f244ab06ccb521bf3b0a Mon Sep 17 00:00:00 2001 From: f1iwq2 Date: Sat, 15 Oct 2022 11:09:02 +0200 Subject: [PATCH] V4.71 --- UnitConfig.dfm | 9 ++++++--- UnitConfigCellTCO.dfm | 11 +++++++++-- UnitPrinc.dcu | Bin 231994 -> 232026 bytes UnitPrinc.pas | 3 ++- UnitTCO.dfm | 1 + verif_version.dcu | Bin 11169 -> 11178 bytes verif_version.pas | 2 +- versions.txt | 2 ++ 8 files changed, 21 insertions(+), 7 deletions(-) diff --git a/UnitConfig.dfm b/UnitConfig.dfm index 521e6cb..d7f6a4d 100644 --- a/UnitConfig.dfm +++ b/UnitConfig.dfm @@ -1580,7 +1580,7 @@ object FormConfig: TFormConfig Top = 8 Width = 633 Height = 497 - ActivePage = TabSheetAutonome + ActivePage = TabSheetAct Font.Charset = DEFAULT_CHARSET Font.Color = clBlack Font.Height = -11 @@ -2357,9 +2357,9 @@ object FormConfig: TFormConfig Top = 48 Width = 145 Height = 21 + Style = csDropDownList ItemHeight = 13 TabOrder = 3 - Text = 'Type' OnChange = ComboBoxAigChange Items.Strings = ( 'Aiguillage simple' @@ -2626,6 +2626,7 @@ object FormConfig: TFormConfig Top = 24 Width = 97 Height = 21 + Style = csDropDownList ItemHeight = 13 TabOrder = 1 OnChange = ComboBoxDDChange @@ -3002,7 +3003,8 @@ object FormConfig: TFormConfig Top = 48 Width = 129 Height = 21 - ItemHeight = 0 + Style = csDropDownList + ItemHeight = 13 TabOrder = 1 OnChange = ComboBoxDecChange end @@ -3105,6 +3107,7 @@ object FormConfig: TFormConfig Top = 72 Width = 129 Height = 21 + Style = csDropDownList ItemHeight = 13 TabOrder = 2 OnChange = ComboBoxAspChange diff --git a/UnitConfigCellTCO.dfm b/UnitConfigCellTCO.dfm index 3b86775..8930ca4 100644 --- a/UnitConfigCellTCO.dfm +++ b/UnitConfigCellTCO.dfm @@ -1,6 +1,6 @@ object FormConfCellTCO: TFormConfCellTCO - Left = 211 - Top = 228 + Left = 467 + Top = 112 BorderStyle = bsDialog Caption = 'FormConfCellTCO' ClientHeight = 375 @@ -55,6 +55,7 @@ object FormConfCellTCO: TFormConfCellTCO Top = 60 Width = 89 Height = 24 + Style = csDropDownList ItemHeight = 16 TabOrder = 0 OnChange = ComboReprChange @@ -137,12 +138,15 @@ object FormConfCellTCO: TFormConfCellTCO Top = 48 Width = 33 Height = 21 + Hint = 'Num'#233'ro d'#39'image de l'#39#233'l'#233'ment' Font.Charset = ANSI_CHARSET Font.Color = clWindowText Font.Height = -9 Font.Name = 'MS Sans Serif' Font.Style = [] ParentFont = False + ParentShowHint = False + ShowHint = True TabOrder = 0 OnKeyPress = EditTypeImageKeyPress end @@ -254,6 +258,9 @@ object FormConfCellTCO: TFormConfCellTCO Top = 48 Width = 33 Height = 24 + Hint = 'Adresse DCC de l'#39#233'l'#233'ment' + ParentShowHint = False + ShowHint = True TabOrder = 3 OnKeyPress = EditAdrElementKeyPress end diff --git a/UnitPrinc.dcu b/UnitPrinc.dcu index 75d021016c4e2c38473f4ef57d8fdafe48d73b06..0fcb2300318beb69fe8b2a5a838f251b0a4b8fbe 100644 GIT binary patch delta 4968 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 diff --git a/UnitPrinc.pas b/UnitPrinc.pas index 50dd593..85f4988 100644 --- a/UnitPrinc.pas +++ b/UnitPrinc.pas @@ -6162,6 +6162,7 @@ var i,v,va,etatAct,Af,Ao,Access,sortie,dZ1F,dZ2F,dZ1O,dZ2O : integer; begin // vérifier si l'actionneur en évènement a été déclaré pour réagir if AffAigDet then AfficheDebug('Tick='+IntToSTR(tick)+' Evt Act '+intToSTR(Adr)+'/'+intToSTR(Adr2)+'='+intToSTR(etat),clyellow); + if adr=0 then exit; //Affiche(intToSTR(adr)+'/'+intToSTR(adr2)+' '+intToSTR(etat),clyellow); for i:=1 to maxTablo_act do begin @@ -8628,7 +8629,7 @@ begin i:=posEx('AD=',commandeCDM,1);l:=posEx(';',commandeCDM,i); if i<>0 then begin - ss:=copy(commandeCDM,i+6,l-i-6); + ss:=copy(commandeCDM,i+3,l-i-3); val(ss,adr,erreur); Delete(commandeCDM,i,l-i+1); end; diff --git a/UnitTCO.dfm b/UnitTCO.dfm index da19bae..179cdfb 100644 --- a/UnitTCO.dfm +++ b/UnitTCO.dfm @@ -915,6 +915,7 @@ object FormTCO: TFormTCO Top = 84 Width = 89 Height = 21 + Style = csDropDownList ItemHeight = 13 TabOrder = 4 OnChange = ComboReprChange diff --git a/verif_version.dcu b/verif_version.dcu index 3023ceb68096adfbc99c824d705c88f8fb08f8b5..d795b47b59807d2f8841ec61a8fa51aeaea450a9 100644 GIT binary patch delta 349 zcmZ1&zABviJ_7^)Ds2Xa=urQO+_KD3q5d1SLj{E=&aP;XVUqd}1S|{;3?_Q!hMOk| zDlsxKYHr>pq{PIyaq~?PYfeU$$)a+)G8r5U4F5|%^tP_}`~QFU?WXh zEP;%${L*5D(vr-a%;MB4g`7l%vecsD%=|nBkUtd^auYL)6*6-aQY$ixOHz^LH*Zi3 pWn=W*%%-8o$Y{9PR5OuLXmK@@C<_A<10#zph+4dhY4Q@SzW}~lc1-{P delta 291 zcmZ1#zA&8oJ_7^)LTv_y7asf*xn-G8uH)ON9V#eves@WO43orvAYf)-U@*}$+dNrN ziIM4}#^&upN=%FkH{TMm=44cuEGDNblfuEk@W1p!Z|jP`|NnPiegV|L@P8|alhH6a zUd~5s2~a_I=pV2|ck2?ML|QlRk;w<;q|`0|r6A%{7XZb3UH|NS0u#y*-~<``B|~R2 zqr9284Uh*`x+4b0dM&nN$7DZwO}-mol^-&8urn}Ze3;xSZ^Fp3d6)b;Mqa4%89-jK zm|UqS$7nWrrlS1j?TW!{jFy|ZHS`!66*pUHCNlCdh_Wy+F)*^of+&W`YqkCY07$=M A#Q*>R diff --git a/verif_version.pas b/verif_version.pas index 3022558..87e904f 100644 --- a/verif_version.pas +++ b/verif_version.pas @@ -23,7 +23,7 @@ var Lance_verif : integer; verifVersion,notificationVersion : boolean; -Const Version='4.7'; // sert à la comparaison de la version publiée +Const Version='4.71'; // sert à la comparaison de la version publiée SousVersion=' '; // en cas d'absence de sous version mettre un espace implementation diff --git a/versions.txt b/versions.txt index 3001bf2..4244e06 100644 --- a/versions.txt +++ b/versions.txt @@ -121,6 +121,8 @@ version 4.6 : Correction TJD 2/4 version 4.7 : Réorganisation du menu et du panneau de configuration des cellules du TCO. Amélioration du séquenceur de connexion à l'interface. +version 4.71 : Correction bug décodage trame actionneur de CDM +