diff --git a/Signaux_complexes_GL.cfg b/Signaux_complexes_GL.cfg index 096ce3f..c22c47f 100644 --- a/Signaux_complexes_GL.cfg +++ b/Signaux_complexes_GL.cfg @@ -31,12 +31,12 @@ -M -$M16384,1048576 -K$00400000 --LE"c:\program files (x86)\borland\delphi7\Projects\Bpl" --LN"c:\program files (x86)\borland\delphi7\Projects\Bpl" --U"c:\program files (x86)\borland\delphi7\Lib\Debug" --O"c:\program files (x86)\borland\delphi7\Lib\Debug" --I"c:\program files (x86)\borland\delphi7\Lib\Debug" --R"c:\program files (x86)\borland\delphi7\Lib\Debug" +-LE"c:\program files\borland\delphi7\Projects\Bpl" +-LN"c:\program files\borland\delphi7\Projects\Bpl" +-U"c:\program files\borland\delphi7\Lib\Debug" +-O"c:\program files\borland\delphi7\Lib\Debug" +-I"c:\program files\borland\delphi7\Lib\Debug" +-R"c:\program files\borland\delphi7\Lib\Debug" -w-UNSAFE_TYPE -w-UNSAFE_CODE -w-UNSAFE_CAST diff --git a/Signaux_complexes_GL.exe b/Signaux_complexes_GL.exe deleted file mode 100644 index 5dcdcfb..0000000 Binary files a/Signaux_complexes_GL.exe and /dev/null differ diff --git a/Signaux_complexes_GL.zip b/Signaux_complexes_GL.zip deleted file mode 100644 index 4cdcf89..0000000 Binary files a/Signaux_complexes_GL.zip and /dev/null differ diff --git a/UnitDebug.dcu b/UnitDebug.dcu index 920598e..61cb54b 100644 Binary files a/UnitDebug.dcu and b/UnitDebug.dcu differ diff --git a/UnitDebug.dfm b/UnitDebug.dfm index 2a74a57..f610177 100644 --- a/UnitDebug.dfm +++ b/UnitDebug.dfm @@ -1,6 +1,6 @@ object FormDebug: TFormDebug - Left = 390 - Top = 178 + Left = 313 + Top = 77 BorderStyle = bsSingle Caption = 'FormDebug' ClientHeight = 639 @@ -20,7 +20,7 @@ object FormDebug: TFormDebug TextHeight = 13 object Label1: TLabel Left = 456 - Top = 52 + Top = 36 Width = 108 Height = 13 Caption = 'Niveau du Debug (0-3)' @@ -35,7 +35,7 @@ object FormDebug: TFormDebug end object Label2: TLabel Left = 448 - Top = 12 + Top = 4 Width = 131 Height = 18 Caption = 'Fen'#234'tre de d'#233'bug' @@ -47,16 +47,16 @@ object FormDebug: TFormDebug ParentFont = False end object Label3: TLabel - Left = 448 - Top = 84 + Left = 464 + Top = 200 Width = 265 - Height = 209 + Height = 101 AutoSize = False Caption = 'Label3' Color = clGray Font.Charset = ANSI_CHARSET Font.Color = clWindow - Font.Height = -16 + Font.Height = -15 Font.Name = 'Arial Narrow' Font.Style = [] ParentColor = False @@ -65,7 +65,7 @@ object FormDebug: TFormDebug end object EditNivDebug: TEdit Left = 576 - Top = 52 + Top = 36 Width = 73 Height = 21 Font.Charset = DEFAULT_CHARSET @@ -79,8 +79,8 @@ object FormDebug: TFormDebug OnKeyPress = EditNivDebugKeyPress end object MemoEvtDet: TMemo - Left = 452 - Top = 300 + Left = 564 + Top = 308 Width = 181 Height = 281 Color = clBlack @@ -95,8 +95,8 @@ object FormDebug: TFormDebug TabOrder = 1 end object ButtonEcrLog: TButton - Left = 456 - Top = 596 + Left = 448 + Top = 564 Width = 97 Height = 25 Caption = 'Ecrire le log' @@ -113,8 +113,23 @@ object FormDebug: TFormDebug ScrollBars = ssVertical TabOrder = 3 end + object CheckAffSig: TCheckBox + Left = 448 + Top = 64 + Width = 297 + Height = 17 + Caption = 'Affichage du fonctionnement des signaux' + Font.Charset = DEFAULT_CHARSET + Font.Color = clBlack + Font.Height = -11 + Font.Name = 'MS Sans Serif' + Font.Style = [] + ParentFont = False + TabOrder = 4 + OnClick = CheckAffSigClick + end object SaveDialog: TSaveDialog - Left = 616 - Top = 16 + Left = 480 + Top = 440 end end diff --git a/UnitDebug.pas b/UnitDebug.pas index cf5ed43..9f941ee 100644 --- a/UnitDebug.pas +++ b/UnitDebug.pas @@ -16,10 +16,12 @@ type ButtonEcrLog: TButton; Label3: TLabel; MemoDebug: TMemo; + CheckAffSig: TCheckBox; procedure FormClose(Sender: TObject; var Action: TCloseAction); procedure FormCreate(Sender: TObject); procedure ButtonEcrLogClick(Sender: TObject); procedure EditNivDebugKeyPress(Sender: TObject; var Key: Char); + procedure CheckAffSigClick(Sender: TObject); private { Déclarations privées } public @@ -29,6 +31,7 @@ type var FormDebug: TFormDebug; NivDebug : integer; + AffSignal : boolean; procedure AfficheDebug(s : string;lacouleur : TColor); @@ -101,4 +104,9 @@ end; +procedure TFormDebug.CheckAffSigClick(Sender: TObject); +begin + AffSignal:=checkAffSig.Checked; +end; + end. diff --git a/UnitPrinc.dcu b/UnitPrinc.dcu index e91eadd..8a438fb 100644 Binary files a/UnitPrinc.dcu and b/UnitPrinc.dcu differ diff --git a/UnitPrinc.dfm b/UnitPrinc.dfm index cd4848b..1a62549 100644 --- a/UnitPrinc.dfm +++ b/UnitPrinc.dfm @@ -1,6 +1,6 @@ object FormPrinc: TFormPrinc - Left = 89 - Top = 186 + Left = 61 + Top = 202 BorderStyle = bsSingle Caption = 'Client TCP-IP CDM Rail ou USB - syst'#232'me LENZ' ClientHeight = 607 diff --git a/UnitPrinc.pas b/UnitPrinc.pas index fbfa05a..1f19f4b 100644 --- a/UnitPrinc.pas +++ b/UnitPrinc.pas @@ -4672,11 +4672,12 @@ end; procedure Maj_Feu(Adrfeu : integer); var i,j,k1,k2,BtypeSuiv,Adr_det,etat,Adr,Aig,DetPrec1,DetPrec2,Detprec3,Detprec4,Adr_El_Suiv, Btype_el_suivant,det_initial,bt,el_suiv,modele : integer ; - bisSuiv,PresTrain,Aff_semaphore,AffSignal,car : boolean; + bisSuiv,PresTrain,Aff_semaphore,car : boolean; s : string; begin - if AffSignal then Affiche('Traitement du feu '+intToSTR(Adrfeu),clOrange); - if NivDebug>=1 then AfficheDebug('Traitement du feu '+intToSTR(Adrfeu)+'------------------------------------',clOrange); + s:='Traitement du feu '+intToSTR(Adrfeu)+'------------------------------------'; + if AffSignal then Affiche(s,clOrange); + if NivDebug>=1 then AfficheDebug(s,clOrange); i:=index_feu(Adrfeu); if AdrFeu<>0 then begin @@ -4845,7 +4846,6 @@ begin end; end; envoi_signauxCplx; - AffSignal:=false; end; Procedure Maj_feux; diff --git a/verif_version.dcu b/verif_version.dcu index df745ef..339ced3 100644 Binary files a/verif_version.dcu and b/verif_version.dcu differ diff --git a/verif_version.dfm b/verif_version.dfm index ba41d8f..b01d0ea 100644 --- a/verif_version.dfm +++ b/verif_version.dfm @@ -22,7 +22,7 @@ object FormVersion: TFormVersion Height = 105 Font.Charset = ANSI_CHARSET Font.Color = clBlack - Font.Height = -12 + Font.Height = -13 Font.Name = 'Arial Narrow' Font.Style = [] ParentFont = False diff --git a/verif_version.pas b/verif_version.pas index 7a6eebc..006b3a2 100644 --- a/verif_version.pas +++ b/verif_version.pas @@ -114,13 +114,13 @@ begin begin i:=pos('version ',s); trouve_version:=i<>0; - if trouve_version then s2:=s; + if trouve_version then s2:=s; // chaine contenant la version sur le site end; if not(trouve_zip) then begin i:=pos('.zip',s); trouve_zip:=i<>0; - if trouve_zip then s3:=s; + if trouve_zip then s3:=s; // chaine de l'Id du zip à télécharger end; // Aff(s) end; @@ -133,21 +133,35 @@ begin j:=pos(' ',s2); Version_p:=copy(s2,1,j-1); // version dans version_p // isoler l'url du zip + //'href="./download/file.php?id=12086&sid=9d0f759226f8c6e48671ab7c23cf36b4">Signaux_complexes_GL.zip'; + //'href="./download/file.php?id=12086">Signaux_complexes_GL.zip0 then + begin + // supprimer la chaine sid + i:=pos('&',s3); + j:=pos('"',s3); + delete(s3,i,j-1); + end + else + begin + j:=pos('"',s3); + s3:=copy(s3,1,j-1); + end; i:=pos('.',s3); if i<>0 then delete(s3,i,1); // supprimer le . s3:='http://cdmrail.free.fr/ForumCDR'+s3 ; - //aff(s3); // lien dans s3 + aff(s3); // lien dans s3 // changer le . en , s:=Version_p; i:=pos('.',s);if i<>0 then s[i]:=','; s2:=version; i:=pos('.',s2);if i<>0 then s2[i]:=','; - + V_publie:=StrToFloat(s); V_utile:=StrToFloat(s2); if V_utile