V4.0
This commit is contained in:
1 parent
398df6e641
commit
3b27e18ab4
20 files changed
+1209
-814
No files matched your search
+15
-90
@@ -1,108 +1,27 @@
|
||||
/******************************************
|
||||
/ fichier de configuration
|
||||
/ gily - f1iwq - 2018
|
||||
/******************************************
|
||||
/ ce programme permet de commander les signaux complexes avec ou sans
|
||||
/ CDM rail. Il a trois modes de fonctionnement:
|
||||
/
|
||||
/ Mode 1 = sans CDM rail. Le programme ne gère que la centrale LENZ ou compatible.
|
||||
/ Il faut connecter le PC en USB ou par éthernet à la centrale (nécessite l'interface LI100 ETH)
|
||||
/
|
||||
/ Mode 2 = Avec CDM rail, ce programme doit être connecté au réseau par l'interface
|
||||
/ ethernet ; CDM est connecté par USB, et dans ce cas,
|
||||
/ mettre 0 dans le numéro de port COM (inutilisé) ainsi que la variable avec ou sans initialisation
|
||||
/ des aiguillages à 0.
|
||||
/
|
||||
/ Mode 3 = Avec CDM Rail, ce programme connecté au réseau par l'interface Ethernet et CDM
|
||||
/ Rail est connecté au réseau par l'USB.
|
||||
/
|
||||
/
|
||||
/ Taille de la fonte de la fenêtre
|
||||
Fonte=10
|
||||
/
|
||||
/ Adresse IP V4 du PC sur lequel s'execute CDM : port
|
||||
/ Fichier de configuration de signaux_complexes_GL
|
||||
Fonte=12
|
||||
IpV4_PC=127.0.0.1:9999
|
||||
/
|
||||
/ ==========================================================================
|
||||
/ D é f i n i t i o n de l'interface XpressNet pour utilisation en mode autonome
|
||||
/ Adresse IP V4 de l'interface LI-USB Ethernet : port
|
||||
/ par défaut le port est 5550
|
||||
/ ne pas connecter le port ou mettre 0 si on travaille avec l'interface USB
|
||||
IPV4_INTERFACE=192.168.1.23:5550
|
||||
/
|
||||
/ port COM de l'adresse USB de l'interface LU-USB - LI100 - LI100F - LI101F - GENLI
|
||||
/ attention de COM1 à 9 - Si le port de l'interface USB >9, il faut le changer
|
||||
/ manuellement dans le gestionnaire des périphériques
|
||||
/ mettre 0 si inutilisée
|
||||
/ Le programme ne tentera pas de se connecter à la centrale si CDM rail est détecté
|
||||
/ Com:vitesse,parité,nombre de bits,bits de stop,protocole: 0=aucun 1=Xon-Xoff 2=RTS-CTS 3=RTS-Xon-Xoff 4=CTS
|
||||
/ voir notice page 29
|
||||
/
|
||||
PROTOCOLE_SERIE=COM9:57600,N,8,1,2
|
||||
/COM8:9600,N,8,1,0
|
||||
/
|
||||
/ Temporisation en ms d'envoi entre deux octets de la trame
|
||||
INTER_CAR=50
|
||||
/
|
||||
/ Temporisation maximale de contrôle après non réponse de l'interface, en tranches de 100ms
|
||||
/ à adapter en fonction de l'interface. Ex 7=700ms d'attente maxi
|
||||
Tempo_maxi=7
|
||||
/
|
||||
/ Entete: préfixe ajouté aux trames :
|
||||
/ Entete=0 - n'ajoute rien aux trames - pour une interface RS232 ou GENLI
|
||||
/ Entete=1 - Ajoute FF FE au début de chaque trame envoyée à l'interface : pour une interface USB, entete=1
|
||||
/ Entete=2 - Ajoute E4 au début de chaque trame et 0D 0D 0A en fin de chaque trame : pour compatibilité arduino
|
||||
Entete=1
|
||||
/ ===============================================================================
|
||||
/
|
||||
/ Avec (1) ou sans (0) initialisation des aiguillages au démarrage selon le tableau ci après
|
||||
Init_Aig=1
|
||||
/Temporisation entre aiguillages en ms à l'initialisation en mode autonome
|
||||
Tempo_Aig=100
|
||||
/
|
||||
/ Temporisation entre deux commandes aux décodeurs de feux en ms
|
||||
Fenetre=0
|
||||
/
|
||||
/ Fenêtre d'exécution en plein écran (1) ou réduite (0)
|
||||
nb_det_dist=3
|
||||
/
|
||||
/ Nombre de détecteurs considérés comme trop distants dans la recherche d'un détecteur "suivant"
|
||||
verif_version=0
|
||||
/
|
||||
/ Vérification des versions au démarrage
|
||||
NOTIF_VERSION=0
|
||||
/ Notification de nouvelle version
|
||||
TCO=1
|
||||
/ Avec TCO
|
||||
TCO=0
|
||||
MasqueBandeauTCO=0
|
||||
CDM=0
|
||||
/ Lancement de CDM Rail au démarrage
|
||||
Lay=RESEAU_GILY_SIGNAL_AJOUTE.LAY
|
||||
/ Nom du fichier LAY à ouvrir depuis CDM sans caractères spéciaux ( : / )
|
||||
/reseau_gily_signal_ajoute.lay
|
||||
Serveur_interface=1
|
||||
/
|
||||
/ Démarrage du serveur d'interface automatique
|
||||
/ 0=ne pas démarrer automatiquement le serveur d'interfaces
|
||||
/ 1=XpressNet (lenz.roco)
|
||||
/ 2=P50X intellibox
|
||||
/ 3=Sprog
|
||||
/ 4=HSI88/HSI88-USB
|
||||
/ 5=ECOS ESU
|
||||
/ 6=FIS88 FeedBack (S88/S88N)
|
||||
/ 7=RS2PC (Rs FeedBack interface)
|
||||
/ 8=DCC++
|
||||
retro=1
|
||||
/
|
||||
/ Interface de rétrosignalisation pour LENZ/DCC++
|
||||
/ 1=auto
|
||||
/ 2=LI-USB
|
||||
/ 3=LI-101F
|
||||
/ 4=LI-100F
|
||||
/ 5=LI-100
|
||||
/ 6=GENLI
|
||||
RazSignaux=0
|
||||
Tempo_Feu=100
|
||||
Alg_Unisemaf=1
|
||||
/------------
|
||||
[section_aig]
|
||||
1,P518,D523,S3P,V30,I0,INIT(9,5)
|
||||
2,P12S,D519,S5S,V0,I0,INIT(9,5)
|
||||
@@ -129,10 +48,12 @@ Alg_Unisemaf=1
|
||||
27,P25S,D530,S537,V0,I0,INIT(9,5)
|
||||
28TJD,D(21D,26D),S(21S,26S),V0,I0,INIT(9,5),E4
|
||||
29,P10D,D513,S30S,V60,I0,INIT(9,5)
|
||||
30,P524,D11D,S29D,V0,I0,INIT(9,5)
|
||||
31,P534,D0,S25P,V0,I0,INIT(9,5)
|
||||
32,P22S,D0,S24D,V0,I0,INIT(9,5)
|
||||
30,P524,D11D,S29S,V0,I0,INIT(9,5)
|
||||
31,P534,D33D,S25P,V0,I0,INIT(9,5)
|
||||
32,P22S,D33S,S24D,V0,I0,INIT(9,5)
|
||||
33,P0,D31D,S32D,V0,I0,INIT(9,5)
|
||||
0
|
||||
/------------
|
||||
[section_branches]
|
||||
A2,A12,517,A18,A11,A30,524,521,A8,527,A7,519,A2
|
||||
A7,520,A20,A12
|
||||
@@ -146,8 +67,9 @@ A26,529,A25
|
||||
A22,537,A27
|
||||
A22,A32,A24
|
||||
A6,516,0
|
||||
A31,0
|
||||
A31,A33,0
|
||||
0
|
||||
/------------
|
||||
[section_sig]
|
||||
176,7,0,1,(520,A20),1
|
||||
190,7,0,1,(523,526),0
|
||||
@@ -165,6 +87,7 @@ A31,0
|
||||
372,D3,1,(A10D)(A19S)(A19D,A22D)(A19D,A22S)
|
||||
382,D3,1,(A29S,A10S)(A19S)(A19D,A22D)(A19D,A22S)
|
||||
392,3,0,1,(535,533),1
|
||||
406,9,0,1,(534,A23),1
|
||||
420,7,0,1,(529,A25,530,A27,537,A27),1
|
||||
448,7,0,1,(533,A24),1
|
||||
462,9,0,1,(513,A29),1
|
||||
@@ -174,11 +97,13 @@ A31,0
|
||||
1000,9,0,0,(530,A26),1
|
||||
1001,9,0,0,(529,A26),1,(A21S,A6D)
|
||||
0
|
||||
/------------
|
||||
[section_act]
|
||||
815,1,CC,F2,0,TGV
|
||||
Mem[527,520],1,X,"KLAXON_2.WAV"
|
||||
830,1,ZZ406526,"C:\PROGRAM FILES (X86)\BORLAND\DELPHI7\PROJECTS\SIGNAUX_COMPLEXES_GL\TRN.WAV"
|
||||
815,1,TGV,F10,0,TGV
|
||||
/------------
|
||||
(817,830),(820,840),PN(121+,121-)
|
||||
(850,851),PN(12+,12-)
|
||||
0
|
||||
BIN
Binary file not shown.
Binary file not shown.
+3
-1
@@ -1578,7 +1578,7 @@ object FormConfig: TFormConfig
|
||||
Top = 8
|
||||
Width = 633
|
||||
Height = 497
|
||||
ActivePage = TabSheetCDM
|
||||
ActivePage = TabSheetSig
|
||||
Font.Charset = DEFAULT_CHARSET
|
||||
Font.Color = clBlack
|
||||
Font.Height = -11
|
||||
@@ -2621,6 +2621,7 @@ object FormConfig: TFormConfig
|
||||
Font.Height = -11
|
||||
Font.Name = 'MS Sans Serif'
|
||||
Font.Style = []
|
||||
HideSelection = False
|
||||
ParentFont = False
|
||||
ReadOnly = True
|
||||
ScrollBars = ssBoth
|
||||
@@ -3089,6 +3090,7 @@ object FormConfig: TFormConfig
|
||||
Font.Height = -11
|
||||
Font.Name = 'MS Sans Serif'
|
||||
Font.Style = []
|
||||
HideSelection = False
|
||||
Lines.Strings = (
|
||||
'RichSig')
|
||||
ParentFont = False
|
||||
|
||||
+313
-180
@@ -398,7 +398,7 @@ var
|
||||
portCDM,TempoOctet,TimoutMaxInterface,Valeur_entete,Port,protocole,NumPort,
|
||||
LigneCliqueePN,AncLigneCliqueePN,clicMemo,
|
||||
ligneclicAig,AncLigneClicAig,ligneClicSig,AncligneClicSig,
|
||||
ligneClicBr,AncligneClicBr,ligneClicAct,AncLigneClicAct,indexfeuclic,NumTrameCDM : integer;
|
||||
ligneClicBr,AncligneClicBr,ligneClicAct,AncLigneClicAct,Adressefeuclic,NumTrameCDM : integer;
|
||||
ack_cdm,clicliste,entreeTCO,affevt,config_modifie,clicproprietes : boolean;
|
||||
fichier : text;
|
||||
|
||||
@@ -1115,142 +1115,110 @@ var s: string;
|
||||
fichierN : text;
|
||||
i : integer;
|
||||
continue : boolean;
|
||||
|
||||
// lit une ligne du fichier source "fichier", si c'est une ligne de commentaire, copie jusqu'à ne plus rencontrer
|
||||
// de ligne commentaire, et retourne la ligne en sortie
|
||||
function copie_commentaire : string ;
|
||||
var c : char;
|
||||
begin
|
||||
repeat
|
||||
readln(fichier,s);
|
||||
//Affiche(s,clWhite);
|
||||
if length(s)>0 then c:=s[1];
|
||||
if c='/' then writeln(fichierN,s); // copie le commentaire
|
||||
until ((c<>'/') and (s<>'')) or eof(fichier) ;
|
||||
copie_commentaire:=s;
|
||||
end;
|
||||
|
||||
|
||||
begin
|
||||
assign(fichierN,'ConfigGenerale.tmp');
|
||||
assign(fichierN,'ConfigGenerale.cfg');
|
||||
rewrite(fichierN);
|
||||
|
||||
// entête
|
||||
copie_commentaire;
|
||||
// copie_commentaire;
|
||||
writeln(fichierN,'/ Fichier de configuration de signaux_complexes_GL');
|
||||
// taille de la fonte
|
||||
writeln(fichierN,Fonte_ch+'=',TailleFonte);
|
||||
FormPrinc.FenRich.Font.Size:=TailleFonte;
|
||||
copie_commentaire;
|
||||
FormPrinc.FenRich.Font.Size:=TailleFonte;
|
||||
|
||||
// adresse ip et port de CDM
|
||||
writeln(fichierN,IpV4_PC_ch+'=',adresseIPCDM+':'+intToSTR(portCDM));
|
||||
copie_commentaire;
|
||||
|
||||
// adresse ip interface XpressNet
|
||||
writeln(fichierN,IPV4_Interface_ch+'=',adresseIP+':'+intToSTR(port));
|
||||
copie_commentaire;
|
||||
|
||||
// port com
|
||||
writeln(fichierN,Protocole_serie_ch+'=',portcom);
|
||||
copie_commentaire;
|
||||
|
||||
// temporisation caractère TempoOctet
|
||||
writeln(fichierN,Inter_Car_ch+'=',IntToSTR(TempoOctet));
|
||||
copie_commentaire;
|
||||
|
||||
// temporisation attente maximale interface
|
||||
writeln(fichierN,Tempo_maxi_ch+'=',IntToSTR(TimoutMaxInterface));
|
||||
copie_commentaire;
|
||||
|
||||
// entete Valeur_entete
|
||||
writeln(fichierN,Entete_ch+'=',intToSTR(Valeur_entete));
|
||||
copie_commentaire;
|
||||
|
||||
// avec ou sans initialisation des aiguillages
|
||||
if AvecInitAiguillages then s:='1' else s:='0';
|
||||
writeln(fichierN,Init_Aig_ch+'='+s);
|
||||
copie_commentaire;
|
||||
|
||||
// temporisation initialisation des aiguillages
|
||||
writeln(fichierN,Tempo_aig_ch+'=',IntToSTR(Tempo_aig));
|
||||
copie_commentaire;
|
||||
|
||||
// plein écran
|
||||
writeln(fichierN,Fenetre_ch+'=',fenetre);
|
||||
copie_commentaire;
|
||||
|
||||
// Nombre maxi de détecteurs considérés distants
|
||||
writeln(fichierN,nb_det_dist_ch+'=',Nb_Det_Dist);
|
||||
copie_commentaire;
|
||||
|
||||
// Vérification des versions au démarrage
|
||||
if verifVersion then s:='1' else s:='0';
|
||||
writeln(fichierN,verif_version_ch+'=',s);
|
||||
copie_commentaire;
|
||||
|
||||
// Notification de nouvelle version
|
||||
if notificationVersion then s:='1' else s:='0';
|
||||
writeln(fichierN,notif_version_ch+'=',s);
|
||||
copie_commentaire;
|
||||
|
||||
// Avec TCO
|
||||
if AvecTCO then s:='1' else s:='0';
|
||||
writeln(fichierN,TCO_ch+'=',s);
|
||||
copie_commentaire;
|
||||
|
||||
if MasqueBandeauTCO then s:='1' else s:='0';
|
||||
writeln(fichierN,MasqueBandeauTCO_ch+'=',s);
|
||||
copie_commentaire;
|
||||
|
||||
// lancement de CDM
|
||||
if LanceCDM then s:='1' else s:='0';
|
||||
writeln(fichierN,CDM_ch+'=',s);
|
||||
copie_commentaire;
|
||||
|
||||
// Nom du LAY
|
||||
writeln(fichierN,lay_ch+'=',Lay);
|
||||
copie_commentaire;
|
||||
|
||||
// Serveur d'interface de CDM
|
||||
writeln(fichierN,Serveur_interface_ch+'=',intToSTR(ServeurInterfaceCDM));
|
||||
copie_commentaire;
|
||||
|
||||
// Serveur de rétrosignalisation Lenz de CDM
|
||||
writeln(fichierN,retro_ch+'=',intToSTR(ServeurRetroCDM));
|
||||
|
||||
// entête
|
||||
copie_commentaire;
|
||||
// Raz Signaux
|
||||
if Raz_Acc_signaux then s:='1' else s:='0';
|
||||
writeln(fichierN,'RazSignaux='+s);
|
||||
//copie_commentaire;
|
||||
|
||||
// temporisation entre 2 commandes décodeurs feu
|
||||
writeln(fichierN,Tempo_feu_ch+'=',IntToSTR(Tempo_feu));
|
||||
copie_commentaire;
|
||||
|
||||
// algorithme Unisemaf
|
||||
writeln(fichierN,Algo_unisemaf_ch+'=',IntToSTR(algo_Unisemaf));
|
||||
copie_commentaire;
|
||||
|
||||
// aiguillages
|
||||
writeln(fichierN,'/------------');
|
||||
writeln(fichierN,section_aig_ch);
|
||||
for i:=1 to MaxAiguillage do
|
||||
begin
|
||||
s:=encode_aig(i);
|
||||
aiguillage[i].modifie:=false; // sauvegarde en cours, on démarque
|
||||
s:=encode_aig(i);
|
||||
aiguillage[i].modifie:=false; // sauvegarde en cours, on démarque
|
||||
writeln(fichierN,s);
|
||||
end;
|
||||
writeln(fichierN,'0');
|
||||
|
||||
writeln(fichierN,'/------------');
|
||||
writeln(fichierN,section_Branches_ch);
|
||||
// branches
|
||||
for i:=1 to NbreBranches do
|
||||
begin
|
||||
s:=Branche[i];
|
||||
writeln(fichierN,s);
|
||||
end;
|
||||
end;
|
||||
writeln(fichierN,'0');
|
||||
|
||||
|
||||
writeln(fichierN,'/------------');
|
||||
writeln(fichierN,section_sig_ch);
|
||||
// feux
|
||||
for i:=1 to NbreFeux do
|
||||
@@ -1259,33 +1227,32 @@ begin
|
||||
// transformer le tableau feux en ligne
|
||||
//Affiche(s,clLime);
|
||||
if s='' then Affiche('Erreur 700 - Encodage du feu index='+IntToSTR(i),clRed);
|
||||
feux[i].modifie:=false; // sauvegarde en cours, on démarque
|
||||
feux[i].modifie:=false; // sauvegarde en cours, on démarque
|
||||
writeln(fichierN,s);
|
||||
end;
|
||||
writeln(fichierN,'0');
|
||||
|
||||
// Fonctions Fx
|
||||
// Fonctions Fx
|
||||
// actionneurs Train ou accessoire
|
||||
writeln(fichierN,'/------------');
|
||||
writeln(fichierN,section_act_ch);
|
||||
for i:=1 to maxTablo_act do
|
||||
begin
|
||||
s:=encode_act_loc_son(i);
|
||||
if s<>'' then writeln(fichierN,s);
|
||||
end;
|
||||
|
||||
end;
|
||||
|
||||
writeln(fichierN,'/------------');
|
||||
// actionneurs PN
|
||||
for i:=1 to NbrePN do
|
||||
begin
|
||||
s:=encode_act_pn(i);
|
||||
if s<>'' then if s<>'' then writeln(fichierN,s);
|
||||
end;
|
||||
end;
|
||||
writeln(fichierN,'0');
|
||||
|
||||
closefile(fichier);
|
||||
closefile(fichierN);
|
||||
|
||||
deletefile(NomConfig);
|
||||
renameFile('ConfigGenerale.tmp',NomConfig);
|
||||
end;
|
||||
|
||||
procedure lit_config;
|
||||
@@ -1600,7 +1567,6 @@ begin
|
||||
Affiche('Définition des aiguillages',clyellow);
|
||||
maxaiguillage:=0;
|
||||
Nligne:=1;
|
||||
|
||||
repeat
|
||||
s:=lit_ligne;
|
||||
inc(Nligne);
|
||||
@@ -1668,7 +1634,7 @@ begin
|
||||
if (length(enregistrement)<>0) then
|
||||
if (enregistrement[1]='P') then
|
||||
begin
|
||||
if tjdC then begin affiche('Erreur P interdit dans une TJD : '+sOrigine,clred);closefile(fichier);exit; end;
|
||||
if tjdC then begin affiche('Erreur P interdit dans une TJD : '+sOrigine,clred);exit; end;
|
||||
if debugconfig then Affiche('Section P - enregistrement='+enregistrement,clYellow);
|
||||
ComptEl:=ComptEl+1;
|
||||
decodeAig(enregistrement,detect,c);
|
||||
@@ -1695,7 +1661,7 @@ begin
|
||||
decodeAig(Enregistrement,detect,c);
|
||||
aiguillage[maxaiguillage].DDroit:=detect;
|
||||
aiguillage[maxaiguillage].DdroitB:=c;
|
||||
i:=pos(')',enregistrement);if i=0 then begin Affiche('Erreur de syntaxe ligne '+SOrigine,clred);closefile(fichier);exit;end;
|
||||
i:=pos(')',enregistrement);if i=0 then begin Affiche('Erreur de syntaxe ligne '+SOrigine,clred);exit;end;
|
||||
Delete(enregistrement,1,i+1);
|
||||
|
||||
//Affiche(enregistrement,clBlue);
|
||||
@@ -1728,7 +1694,7 @@ begin
|
||||
decodeAig(enregistrement,detect,c);
|
||||
aiguillage[maxaiguillage].DDevie:=detect;
|
||||
aiguillage[maxaiguillage].DDevieB:=c;
|
||||
i:=pos(')',enregistrement);if i=0 then begin Affiche('Erreur de syntaxe ligne '+SOrigine,clred);closefile(fichier);exit;end;
|
||||
i:=pos(')',enregistrement);if i=0 then begin Affiche('Erreur de syntaxe ligne '+SOrigine,clred);exit;end;
|
||||
Delete(enregistrement,1,i+1);
|
||||
|
||||
//Affiche(enregistrement,clBlue);
|
||||
@@ -1794,7 +1760,7 @@ begin
|
||||
if (length(enregistrement)<>0) then
|
||||
if enregistrement[1]='L' then
|
||||
begin
|
||||
if not(tjsC) then begin Affiche('Erreur paramètre L ligne: '+sOrigine,clred);closefile(fichier);exit;end;
|
||||
if not(tjsC) then begin Affiche('Erreur paramètre L ligne: '+sOrigine,clred);exit;end;
|
||||
inc(num_champ);
|
||||
delete(enregistrement,1,1);
|
||||
Val(enregistrement,adr,erreur);
|
||||
@@ -1841,7 +1807,7 @@ begin
|
||||
|
||||
inc(itl);
|
||||
until (enregistrement='') or (itl>3);
|
||||
if itl>4 then begin Affiche('Erreur 400 ligne '+sOrigine,clred);closefile(fichier);exit;end;
|
||||
if itl>4 then begin Affiche('Erreur 400 ligne '+sOrigine,clred);exit;end;
|
||||
end;
|
||||
until (sOrigine='0');
|
||||
end;
|
||||
@@ -1866,7 +1832,7 @@ begin
|
||||
delete(s,i,length(sa));
|
||||
val(s,TailleFonte,erreur);
|
||||
if (TailleFonte<8) or (tailleFonte>25) then taillefonte:=10;
|
||||
FormPrinc.FenRich.Font.Size:=TailleFonte;
|
||||
FormPrinc.FenRich.Font.Size:=TailleFonte;
|
||||
end;
|
||||
|
||||
// adresse ip et port de CDM
|
||||
@@ -2003,7 +1969,7 @@ begin
|
||||
val(s,Tempo_Feu,erreur);
|
||||
if tempo_Feu=0 then Tempo_feu:=100;
|
||||
end;
|
||||
|
||||
|
||||
// algo unisemaf
|
||||
sa:=uppercase(Algo_unisemaf_ch)+'=';
|
||||
i:=pos(sa,s);
|
||||
@@ -2015,7 +1981,7 @@ begin
|
||||
val(s,algo_Unisemaf,erreur);
|
||||
if (algo_Unisemaf<0) or (algo_Unisemaf>2) then algo_Unisemaf:=1;
|
||||
end;
|
||||
|
||||
|
||||
sa:=uppercase(verif_version_ch)+'=';
|
||||
i:=pos(sa,s);
|
||||
if i=1 then
|
||||
@@ -2050,7 +2016,7 @@ begin
|
||||
trouve_TCO:=true;
|
||||
val(s,i,erreur);
|
||||
AvecTCO:=i=1;
|
||||
end;
|
||||
end;
|
||||
|
||||
sa:=uppercase(MasqueBandeauTCO_ch)+'=';
|
||||
i:=pos(sa,s);
|
||||
@@ -2061,8 +2027,8 @@ begin
|
||||
trouve_MasqueTCO:=true;
|
||||
val(s,i,erreur);
|
||||
MasqueBandeauTCO:=i=1;
|
||||
end;
|
||||
|
||||
end;
|
||||
|
||||
sa:=uppercase(CDM_ch)+'=';
|
||||
i:=pos(sa,s);
|
||||
if i=1 then
|
||||
@@ -2070,7 +2036,6 @@ begin
|
||||
inc(nv);
|
||||
trouve_CDM:=true;
|
||||
delete(s,i,length(sa));
|
||||
// vérification de la version au démarrage
|
||||
val(s,i,erreur);
|
||||
LanceCDM:=i=1;
|
||||
end;
|
||||
@@ -2212,78 +2177,31 @@ begin
|
||||
Ancien_detecteur[i]:=false;
|
||||
end;
|
||||
|
||||
{
|
||||
// vérifier si le fichier ConfigGenerale.cfg existe
|
||||
fichier_trouve:=true;
|
||||
{$I+}
|
||||
|
||||
{try
|
||||
assign(fichier,NomConfig);
|
||||
reset(fichier);
|
||||
except
|
||||
fichier_trouve:=false;
|
||||
end;
|
||||
{$I-}
|
||||
{
|
||||
if fichier_trouve then
|
||||
begin
|
||||
close(fichier);
|
||||
end;
|
||||
|
||||
// si pas trouvé le fichier, lire les 2 anciens fichiers et les fusionner
|
||||
if not(fichier_trouve) then
|
||||
begin
|
||||
{$I+}
|
||||
{
|
||||
try
|
||||
assign(fichier,'client-GL.cfg');
|
||||
reset(fichier);
|
||||
except
|
||||
Affiche('Fichier client-GL.cfg non trouvé',clred);
|
||||
exit;
|
||||
end;
|
||||
{$I-}
|
||||
{Affiche('Lecture de l''ancien fichier de configuration client-GL.cfg',clyellow);
|
||||
|
||||
lit_flux;
|
||||
closeFile(fichier);
|
||||
|
||||
Affiche('Lecture de l''ancien fichier de configuration config.cfg',clyellow);
|
||||
{$I+}
|
||||
{try
|
||||
assign(fichier,'config.cfg');
|
||||
reset(fichier);
|
||||
except
|
||||
Affiche('Fichier config.cfg non trouvé',clred);
|
||||
exit;
|
||||
end;
|
||||
Affiche('***Traitement de fusion des deux fichiers de config***',clAqua);
|
||||
|
||||
{$I-}
|
||||
{lit_flux;
|
||||
closeFile(fichier);
|
||||
// regénérer la config dans le fichier configgenerale.cfg
|
||||
assign(fichier,'client-gl.cfg');
|
||||
reset(fichier); // pour les commentaires
|
||||
genere_config;
|
||||
|
||||
s:='------------------------------------------------------------------------------------------------------';
|
||||
Affiche(s,clAqua);
|
||||
Affiche('AVERTISSEMENT: les fichiers de configurations ont été fusionnés dans ConfigGenerale.cfg',clAqua);
|
||||
Affiche('les deux anciens fichiers de configuration ne sont plus utilisés',clAqua);
|
||||
Affiche(s,clAqua);
|
||||
end
|
||||
|
||||
else
|
||||
begin}
|
||||
Affiche('Lecture du fichier de configuration '+NomConfig,clyellow);
|
||||
{$I+}
|
||||
try
|
||||
assign(fichier,NomConfig);
|
||||
reset(fichier);
|
||||
except
|
||||
Affiche('Fichier '+NomConfig+' non trouvé',clred);
|
||||
exit;
|
||||
Affiche('Fichier '+NomConfig+' non trouvé : création d''un fichier vide par défaut',clred);
|
||||
portcom:='COM3:57600,N,8,1,2';
|
||||
adresseIPCDM:='127.0.0.1';portCDM:=9999;
|
||||
adresseIP:='192.168.1.23';port:=5550;
|
||||
verifVersion:=true;
|
||||
Valeur_entete:=1;
|
||||
TempoOctet:=50;
|
||||
TimoutMaxInterface:=7;
|
||||
AvecInitAiguillages:=true;
|
||||
Tempo_Aig:=100;
|
||||
Tempo_feu:=100;
|
||||
ServeurInterfaceCDM:=1;
|
||||
ServeurRetroCDM:=1;
|
||||
algo_Unisemaf:=1;
|
||||
TailleFonte:=12;
|
||||
Nb_Det_Dist:=3;
|
||||
genere_config;
|
||||
assign(fichier,NomConfig);
|
||||
reset(fichier);
|
||||
end;
|
||||
{$I-}
|
||||
lit_flux;
|
||||
@@ -2336,12 +2254,14 @@ begin
|
||||
with FormConfig do
|
||||
begin
|
||||
s:=EditAdrIPCDM.text;
|
||||
if s='' then s:='127.0.0.1';
|
||||
if not(IpOk(s)) then begin labelInfo.Caption:='Adresse IP CDM rail incorrecte';sauve_config:=false;exit;end;
|
||||
ChangeCDM:=s<>AdresseIPCDM;
|
||||
adresseIPCDM:=s;
|
||||
|
||||
// contrôle port CDM
|
||||
val(EditPortCDM.Text,i,erreur);
|
||||
if i=0 then i:=9999;
|
||||
if i>65535 then begin labelInfo.Caption:='Port CDM rail incorrect';sauve_config:=false;exit;end;
|
||||
changeCDM:=(portCDM<>i) or ChangeCDM;
|
||||
portCDM:=i;
|
||||
@@ -2353,12 +2273,14 @@ begin
|
||||
|
||||
// contrôle adresse IP interface
|
||||
s:=EditIPLenz.text;
|
||||
if s='' then s:='0';
|
||||
if not(IpOk(s)) and (s<>'0') then begin labelInfo.Caption:='Adresse IP interface Xpressnet incorrecte';sauve_config:=false;exit;end;
|
||||
changeInterface:=s<>AdresseIP;
|
||||
AdresseIP:=s;
|
||||
|
||||
// contrôle port interface
|
||||
val(EditPortLenz.Text,i,erreur);
|
||||
if i=0 then i:=5550;
|
||||
if i>65535 then begin labelInfo.Caption:='Port Interface incorrect';sauve_config:=false;exit;end;
|
||||
changeInterface:=changeInterface or (i<>port);
|
||||
port:=i;
|
||||
@@ -2369,6 +2291,7 @@ begin
|
||||
|
||||
// contrôle protocole interface COM3:57600,N,8,1,2
|
||||
s:=EditComUSB.Text;
|
||||
if s='' then s:='COM3:57600,N,8,1,2';
|
||||
if not(config_com(s)) then begin labelInfo.Caption:='Protocole série USB Interface incorrect';sauve_config:=false;exit;end;
|
||||
changeUSB:=portcom<>s;
|
||||
portcom:=s;
|
||||
@@ -2459,16 +2382,6 @@ begin
|
||||
if change_srv then services_CDM;
|
||||
|
||||
// générer le fichier de config
|
||||
// ouvrir l'ancien fichier pour copier les commentaires
|
||||
{$I+}
|
||||
try
|
||||
assign(fichier,NomConfig);
|
||||
reset(fichier);
|
||||
except
|
||||
Affiche('Fichier '+NomConfig+' non trouvé',clOrange);
|
||||
end;
|
||||
{$I-}
|
||||
|
||||
genere_config;
|
||||
Affiche('Configuration sauvegardée dans le fichier',clLime);
|
||||
config_modifie:=false;
|
||||
@@ -2488,11 +2401,13 @@ begin
|
||||
end;
|
||||
end;
|
||||
|
||||
// LC=Adresse du feu
|
||||
procedure clicListeFeu(lc : integer);
|
||||
var AncAdresse,adresse,erreur : integer;
|
||||
var AncAdresse,index,adresse,erreur : integer;
|
||||
s : string;
|
||||
begin
|
||||
s:=Uppercase(FormConfig.RichSig.Lines[lc]); // ligne cliquée
|
||||
index:=index_feu(lc)-1;
|
||||
s:=Uppercase(FormConfig.RichSig.Lines[index]); // ligne cliquée
|
||||
if s='' then
|
||||
begin
|
||||
RE_ColorLine(Formconfig.RichSig,ligneclicSig,ClAqua);
|
||||
@@ -2500,10 +2415,10 @@ begin
|
||||
exit;
|
||||
end;
|
||||
|
||||
Feu_Sauve:=feux[lc+1]; // sauvegarde
|
||||
Feu_Sauve:=feux[index+1]; // sauvegarde
|
||||
|
||||
AncLigneClicSig:=ligneclicSig;
|
||||
ligneClicSig:=lc;
|
||||
ligneClicSig:=index;
|
||||
|
||||
// Mettre en rouge le signal modifié quand on clique sur un autre signal
|
||||
if AncligneclicSig<>-1 then
|
||||
@@ -2519,7 +2434,7 @@ begin
|
||||
FormConfig.EditAdrSig.Color:=clWindow;
|
||||
RE_ColorLine(Formconfig.RichSig,ligneClicSig,Clyellow);
|
||||
|
||||
aff_champs_sig_feux(lc+1); // affiche les champs du feu
|
||||
aff_champs_sig_feux(index+1); // affiche les champs du feu
|
||||
clicliste:=false;
|
||||
end;
|
||||
|
||||
@@ -2639,12 +2554,13 @@ begin
|
||||
RE_ColorLine(RichAig,RichAig.lines.count-1,ClAqua);
|
||||
Aiguillage[i].modifie:=false;
|
||||
end;
|
||||
// pour positionner sur la 1ere ligne
|
||||
With RichAig do
|
||||
begin
|
||||
SelStart:=0;
|
||||
Perform(EM_SCROLLCARET,0,0);
|
||||
end;
|
||||
|
||||
|
||||
// branches
|
||||
clicListe:=true;
|
||||
RichBranche.clear;
|
||||
@@ -2719,7 +2635,7 @@ begin
|
||||
Perform(EM_SCROLLCARET,0,0);
|
||||
end;
|
||||
|
||||
if clicproprietes then clicListeFeu(indexfeuclic);
|
||||
if clicproprietes then clicListeFeu(Adressefeuclic);
|
||||
clicproprietes:=false;
|
||||
|
||||
//l'onglet affiché est sélectionné à l'appel de la fiche dans l'unité UnitPrinc
|
||||
@@ -3988,9 +3904,9 @@ begin
|
||||
begin
|
||||
lc:=Perform(EM_LINEFROMCHAR,-1,0); // numéro de la lignée cliquée
|
||||
//Affiche('numéro de la ligne cliquée '+intToStr(lc),clyellow);
|
||||
clicListeFeu(lc);
|
||||
clicListeFeu(feux[lc+1].adresse);
|
||||
end;
|
||||
|
||||
|
||||
end;
|
||||
|
||||
procedure Det1;
|
||||
@@ -4641,9 +4557,9 @@ begin
|
||||
feux[ligneClicSig+1].adresse:=i;
|
||||
s:=encode_sig_feux(ligneClicSig+1);
|
||||
RichSig.Lines[ligneClicSig]:=s;
|
||||
Feux[ligneClicSig+1].Lbl.caption:='@'+IntToSTR(i);
|
||||
Maj_Hint_feu(ligneClicSig+1);
|
||||
end;
|
||||
end;
|
||||
end;
|
||||
|
||||
|
||||
procedure TFormConfig.EditAdrAigChange(Sender: TObject);
|
||||
@@ -5328,13 +5244,20 @@ begin
|
||||
end;
|
||||
|
||||
procedure TFormConfig.ButtonNouvFeuClick(Sender: TObject);
|
||||
var i : integer;
|
||||
var i,index,AdrMax : integer;
|
||||
s : string;
|
||||
begin
|
||||
clicliste:=true;
|
||||
inc(NbreFeux);
|
||||
|
||||
AdrMax:=0;
|
||||
for i:=1 to NbreFeux do
|
||||
begin
|
||||
if AdrMax<feux[i].adresse then AdrMax:=feux[i].adresse;
|
||||
end;
|
||||
|
||||
i:=NbreFeux;
|
||||
feux[i].Adresse:=999;
|
||||
feux[i].Adresse:=AdrMax+20;
|
||||
feux[i].Aspect:=3;
|
||||
feux[i].decodeur:=0;
|
||||
feux[i].verrouCarre:=false;
|
||||
@@ -5363,10 +5286,121 @@ begin
|
||||
end;
|
||||
|
||||
procedure TFormConfig.ButtonSupFeuClick(Sender: TObject);
|
||||
var i,index : integer;
|
||||
var adresse,i,indexFeu,index,debut,fin,longueur,ltot,lignedeb,lignefin,l : integer;
|
||||
s : string;
|
||||
begin
|
||||
if affevt then affiche('Evt bouton Sup Feu',clyellow);
|
||||
//trouver ligne de début et de fin sélectionner.
|
||||
debut:=RichSig.SelStart;
|
||||
longueur:=RichSig.SelLength;
|
||||
fin:=debut+longueur;
|
||||
//Affiche(inttostr(debut)+' '+inttostr(longueur),clyellow);
|
||||
// trouver les lignes sélectionnées
|
||||
i:=0;ltot:=0;ligneDeb:=0;LigneFin:=0;
|
||||
repeat
|
||||
l:=length(RichSig.lines[i])+2; //+2 car CR LF
|
||||
ltot:=ltot+l;
|
||||
if (debut<ltot) and (ligneDeb=0) then ligneDeb:=i+1;
|
||||
if (ltot>=fin) and (ligneFin=0) and (ligneDeb<>0) then ligneFin:=i+1;
|
||||
//if (ltot=fin) and (ligneFin=0) then ligneFin:=i;
|
||||
inc(i);
|
||||
until (i>=NbreFeux) or (ligneFin>0);
|
||||
if lignefin=0 then if fin>ltot then ligneFin:=NbreFeux;
|
||||
//Affiche(inttostr(ligneDeb)+' '+inttostr(LigneFin),clyellow);
|
||||
|
||||
i:=ligneClicSig;
|
||||
if (i<0) then exit;
|
||||
index:=i+1; // passe en index tableau
|
||||
|
||||
if ligneDeb=LigneFin then s:='Voulez-vous supprimer le signal '+IntToSTR(feux[index].adresse)+'?'
|
||||
else s:='Voulez-vous supprimer les signaux de '+
|
||||
IntToSTR(feux[ligneDeb].adresse)+' à '+IntToSTR(feux[ligneFin].adresse)+' ?';
|
||||
|
||||
if Application.MessageBox(pchar(s),pchar('confirm'), MB_YESNO or MB_DEFBUTTON2 or MB_ICONQUESTION)=idNo then exit;
|
||||
|
||||
ButtonInsFeu.Caption:='Ajouter le feu '+intToSTR(feux[index].adresse)+' supprimé';
|
||||
clicliste:=true;
|
||||
Feu_supprime:=feux[index]; // sauvegarde le supprimé
|
||||
feu_sauve.adresse:=0; // dévalider sa définition
|
||||
|
||||
index:=ligneDeb;
|
||||
|
||||
if ligneDeb=LigneFin then s:='Suppression du signal '+IntToSTR(feux[index].adresse)
|
||||
else s:='Suppression des signaux de '+
|
||||
IntToSTR(feux[ligneDeb].adresse)+' à '+IntToSTR(feux[ligneFin].adresse);
|
||||
Affiche(s,clOrange);
|
||||
|
||||
//Affiche('Boucle de '+intToSTR(ligneDeb)+' N='+intToSTR(NbreFeux-ligneFin),clyellow);
|
||||
|
||||
// d'abord supprimer les images des feux
|
||||
for i:=LigneDeb to LigneFin do
|
||||
begin
|
||||
feux[i].Img.free; // supprime l'image, ce qui efface le feu du tableau graphique
|
||||
Feux[i].Lbl.free; // supprime le label, ...
|
||||
if Feux[i].check<>nil then begin Feux[i].check.Free;Feux[i].Check:=nil;end; // supprime le check du feu blanc s'il existait
|
||||
end;
|
||||
|
||||
for i:=1 to NbreFeux-ligneFin do
|
||||
begin
|
||||
index:=i+lignefin; //index ddu feu de remplacement
|
||||
indexFeu:=lignedeb+i-1;
|
||||
//Affiche('Suppresion feu '+intToSTR(feux[i+lignedeb].Adresse),clorange);
|
||||
//Affiche('remplacement par index '+intToSTR(index),clorange);
|
||||
|
||||
feux[indexFeu]:=feux[index];
|
||||
adresse:=feux[indexFeu].adresse;
|
||||
|
||||
with feux[IndexFeu].Img do
|
||||
begin
|
||||
Parent:=Formprinc.ScrollBox1; // dire que l'image est dans la scrollBox1
|
||||
Top:=(HtImg+espY+20)*((IndexFeu-1) div NbreImagePLigne); // détermine les points d'origine
|
||||
Left:=10+ (LargImg+5)*((IndexFeu-1) mod (NbreImagePLigne));
|
||||
Name:='ImageFeu'+IntToSTR(adresse);
|
||||
s:='Index='+IntToSTR(IndexFeu)+' @='+inttostr(feux[IndexFeu].Adresse)+' Décodeur='+intToSTR(feux[IndexFeu].Decodeur)+
|
||||
' Adresse détecteur associé='+intToSTR(feux[IndexFeu].Adr_det1)+
|
||||
' Adresse élement suivant='+intToSTR(feux[IndexFeu].Adr_el_suiv1);
|
||||
if feux[IndexFeu].Btype_suiv1=aig then s:=s+' (aig)';
|
||||
Hint:=s;
|
||||
end;
|
||||
with feux[IndexFeu].Lbl do
|
||||
begin
|
||||
Top:=HtImg+((HtImg+EspY+20)*((IndexFeu-1) div NbreImagePLigne));
|
||||
Left:=10+ (LargImg+5)*((IndexFeu-1) mod (NbreImagePLigne));
|
||||
caption:='@'+IntToSTR(Feux[IndexFeu].adresse);
|
||||
end;
|
||||
if Feux[IndexFeu].check<>nil then
|
||||
with Feux[IndexFeu].Check do
|
||||
begin
|
||||
Hint:=intToSTR(IndexFeu);
|
||||
Top:=HtImg+15+((HtImg+EspY+20)*((IndexFeu-1) div NbreImagePLigne));
|
||||
Left:=10+ (LargImg+5)*((IndexFeu-1) mod (NbreImagePLigne));
|
||||
end;
|
||||
//Affiche('décale feu '+IntToSTR(i)+'<'+intToSTR(i+1),clorange);
|
||||
|
||||
feux[index].Adresse:=0;
|
||||
feux[index].modifie:=false;
|
||||
end;
|
||||
Nbrefeux:=NbreFeux-(ligneFin-LigneDeb)-1;
|
||||
|
||||
config_modifie:=true;
|
||||
RichSig.Clear;
|
||||
|
||||
// réafficher le richsig
|
||||
for i:=1 to NbreFeux do
|
||||
begin
|
||||
s:=encode_Sig_Feux(i);
|
||||
if s<>'' then
|
||||
begin
|
||||
RichSig.Lines.Add(s);
|
||||
RE_ColorLine(RichSig,RichSig.lines.count-1,ClAqua);
|
||||
end;
|
||||
end;
|
||||
ligneClicSig:=-1;
|
||||
AncligneClicSig:=-1;
|
||||
raz_champs_sig;
|
||||
clicliste:=false;
|
||||
|
||||
{
|
||||
i:=ligneClicSig;
|
||||
if (i<0) then exit;
|
||||
index:=i+1; // passe en index tableau
|
||||
@@ -5443,6 +5477,7 @@ begin
|
||||
AncligneClicSig:=-1;
|
||||
raz_champs_sig;
|
||||
clicliste:=false;
|
||||
}
|
||||
end;
|
||||
|
||||
// Ajouter le feu supprimé
|
||||
@@ -5511,7 +5546,7 @@ begin
|
||||
end;
|
||||
|
||||
function verif_coherence : boolean;
|
||||
var AncAdr,i,j,k,l,Indexaig,adr,adr2,detect,condcarre,nc,index2,SuivAdr : integer;
|
||||
var AncAdr,i,j,k,l,Indexaig,adr,adr2,extr,detect,condcarre,nc,index2,SuivAdr : integer;
|
||||
modAig,AncModel,model,km,SuivModel: TEquipement;
|
||||
c : char;
|
||||
ok,trouveSuiv,TrouvePrec : boolean;
|
||||
@@ -5842,6 +5877,7 @@ begin
|
||||
// cohérence 7
|
||||
// parcoure les aiguillages pour voir si les aiguillages déclarés aux extrémités sont existants
|
||||
for Indexaig:=1 to maxaiguillage do
|
||||
//indexaig:=29;
|
||||
begin
|
||||
adr:=aiguillage[indexaig].Adresse;
|
||||
if adr>NbMemZone then
|
||||
@@ -5849,6 +5885,7 @@ begin
|
||||
Affiche('Erreur 9.11: adresse aiguillage trop grand: '+intToSTR(adr),clred);
|
||||
ok:=false;
|
||||
end;
|
||||
|
||||
adr2:=aiguillage[indexaig].ADroit;
|
||||
c:=aiguillage[indexaig].AdroitB;
|
||||
if (c='D') or (c='S') or (c='P') then
|
||||
@@ -5858,10 +5895,28 @@ begin
|
||||
begin
|
||||
ok:=false;
|
||||
Affiche('Erreur 10.1: aiguillage '+intToSTR(adr)+': déclaration d''un aiguillage '+IntToSTR(adr2)+' inexistant',clred);
|
||||
end
|
||||
else
|
||||
begin
|
||||
if c='D' then
|
||||
begin
|
||||
extr:=aiguillage[index2].ADroit;
|
||||
if adr<>extr then Affiche('Erreur 10.2: Discordance de déclaration aiguillages '+intToSTR(adr)+'D: '+intToSTR(adr2)+'D',clred);
|
||||
end;
|
||||
if c='S' then
|
||||
begin
|
||||
extr:=aiguillage[index2].ADevie;
|
||||
if adr<>extr then Affiche('Erreur 10.2: Discordance de déclaration aiguillages '+intToSTR(adr)+'D: '+intToSTR(adr2)+'S',clred);
|
||||
end;
|
||||
if c='P' then
|
||||
begin
|
||||
extr:=aiguillage[index2].APointe;
|
||||
if adr<>extr then Affiche('Erreur 10.2: Discordance de déclaration aiguillages '+intToSTR(adr)+'D: '+intToSTR(adr2)+'P',clred);
|
||||
end;
|
||||
end;
|
||||
end;
|
||||
|
||||
adr2:=aiguillage[indexaig].ADevie;
|
||||
adr2:=aiguillage[indexaig].Adevie;
|
||||
c:=aiguillage[indexaig].AdevieB;
|
||||
if (c='D') or (c='S') or (c='P') then
|
||||
begin
|
||||
@@ -5869,11 +5924,29 @@ begin
|
||||
if index2=0 then
|
||||
begin
|
||||
ok:=false;
|
||||
Affiche('Erreur 10.2: aiguillage '+intToSTR(adr)+': déclaration d''un aiguillage '+IntToSTR(adr2)+' inexistant',clred);
|
||||
Affiche('Erreur 10.1: aiguillage '+intToSTR(adr)+': déclaration d''un aiguillage '+IntToSTR(adr2)+' inexistant',clred);
|
||||
end
|
||||
else
|
||||
begin
|
||||
if c='D' then
|
||||
begin
|
||||
extr:=aiguillage[index2].ADroit;
|
||||
if adr<>extr then Affiche('Erreur 10.3: Discordance de déclaration aiguillages '+intToSTR(adr)+'S: '+intToSTR(adr2)+'D',clred);
|
||||
end;
|
||||
if c='S' then
|
||||
begin
|
||||
extr:=aiguillage[index2].ADevie;
|
||||
if adr<>extr then Affiche('Erreur 10.3: Discordance de déclaration aiguillages '+intToSTR(adr)+'S: '+intToSTR(adr2)+'S',clred);
|
||||
end;
|
||||
if c='P' then
|
||||
begin
|
||||
extr:=aiguillage[index2].APointe;
|
||||
if adr<>extr then Affiche('Erreur 10.3: Discordance de déclaration aiguillages '+intToSTR(adr)+'S: '+intToSTR(adr2)+'P',clred);
|
||||
end;
|
||||
end;
|
||||
end;
|
||||
|
||||
adr2:=aiguillage[indexaig].Apointe;
|
||||
adr2:=aiguillage[indexaig].APointe;
|
||||
c:=aiguillage[indexaig].ApointeB;
|
||||
if (c='D') or (c='S') or (c='P') then
|
||||
begin
|
||||
@@ -5881,9 +5954,28 @@ begin
|
||||
if index2=0 then
|
||||
begin
|
||||
ok:=false;
|
||||
Affiche('Erreur 10.3: aiguillage '+intToSTR(adr)+': déclaration d''un aiguillage '+IntToSTR(adr2)+' inexistant',clred);
|
||||
Affiche('Erreur 10.1: aiguillage '+intToSTR(adr)+': déclaration d''un aiguillage '+IntToSTR(adr2)+' inexistant',clred);
|
||||
end
|
||||
else
|
||||
begin
|
||||
if c='D' then
|
||||
begin
|
||||
extr:=aiguillage[index2].ADroit;
|
||||
if adr<>extr then Affiche('Erreur 10.4: Discordance de déclaration aiguillages '+intToSTR(adr)+'P: '+intToSTR(adr2)+'D',clred);
|
||||
end;
|
||||
if c='S' then
|
||||
begin
|
||||
extr:=aiguillage[index2].ADevie;
|
||||
if adr<>extr then Affiche('Erreur 10.4: Discordance de déclaration aiguillages '+intToSTR(adr)+'P: '+intToSTR(adr2)+'S',clred);
|
||||
end;
|
||||
if c='P' then
|
||||
begin
|
||||
extr:=aiguillage[index2].APointe;
|
||||
if adr<>extr then Affiche('Erreur 10.4: Discordance de déclaration aiguillages '+intToSTR(adr)+'P: '+intToSTR(adr2)+'P',clred);
|
||||
end;
|
||||
end;
|
||||
end;
|
||||
|
||||
end;
|
||||
|
||||
// cohérence 8
|
||||
@@ -6030,42 +6122,74 @@ begin
|
||||
end;
|
||||
|
||||
procedure TFormConfig.BoutSupAigClick(Sender: TObject);
|
||||
var i,index,index2 : integer;
|
||||
var ligneDeb,LigneFin,i,index,index2,debut,longueur,fin,l,ltot : integer;
|
||||
s : string;
|
||||
begin
|
||||
//trouver ligne de début et de fin sélectionner.
|
||||
debut:=RichAig.SelStart;
|
||||
longueur:=RichAig.SelLength;
|
||||
fin:=debut+longueur;
|
||||
//Affiche(inttostr(debut)+' '+inttostr(longueur),clyellow);
|
||||
// trouver les lignes sélectionnées
|
||||
i:=0;ltot:=0;ligneDeb:=0;LigneFin:=0;
|
||||
repeat
|
||||
l:=length(RichAig.lines[i])+2; //+2 car CR LF
|
||||
ltot:=ltot+l;
|
||||
if (debut<ltot) and (ligneDeb=0) then ligneDeb:=i+1;
|
||||
if (ltot>=fin) and (ligneFin=0) and (ligneDeb<>0) then ligneFin:=i+1;
|
||||
//if (ltot=fin) and (ligneFin=0) then ligneFin:=i;
|
||||
inc(i);
|
||||
until (i>=MaxAiguillage) or (ligneFin>0);
|
||||
if lignefin=0 then if fin>ltot then ligneFin:=MaxAiguillage;
|
||||
//Affiche(inttostr(Ltot)+' '+inttostr(Fin),clyellow);
|
||||
|
||||
|
||||
i:=ligneClicAig;
|
||||
if (i<0) then exit;
|
||||
index:=i+1; // passe en index tableau
|
||||
|
||||
s:='Voulez-vous supprimer l''aiguillage '+IntToSTR(aiguillage[index].adresse)+'?';
|
||||
if ligneDeb=LigneFin then s:='Voulez-vous supprimer l''aiguillage '+IntToSTR(aiguillage[index].adresse)+'?'
|
||||
else s:='Voulez-vous supprimer les aiguillages de '+
|
||||
IntToSTR(aiguillage[ligneDeb].adresse)+' à '+IntToSTR(aiguillage[ligneFin].adresse)+' ?';
|
||||
|
||||
if Application.MessageBox(pchar(s),pchar('confirm'), MB_YESNO or MB_DEFBUTTON2 or MB_ICONQUESTION)=idNo then exit;
|
||||
Affiche('Suppression de l''aiguillage='+IntToSTR(aiguillage[index].adresse),clOrange);
|
||||
|
||||
ButtonAjSup.Caption:='Ajouter l''aig '+intToSTR(aiguillage[index].adresse)+' supprimé';
|
||||
clicliste:=true;
|
||||
raz_champs_aig;
|
||||
Aig_supprime:=aiguillage[index]; // sauvegarde le supprimé
|
||||
Aig_sauve.adresse:=0; // dévalider sa définition
|
||||
|
||||
// efface les attributs de l'aiguillage supprimé
|
||||
aiguillage[index].Adresse:=0;
|
||||
aiguillage[index].Modele:=rien;
|
||||
aiguillage[index].Adroit:=0;
|
||||
aiguillage[index].Adevie:=0;
|
||||
aiguillage[index].Ddroit:=0;
|
||||
aiguillage[index].Ddevie:=0;
|
||||
aiguillage[index].APointe:=0;
|
||||
aiguillage[index].modifie:=false;
|
||||
index:=ligneDeb;
|
||||
|
||||
// supprime l'aiguillage du tableau
|
||||
dec(MaxAiguillage);
|
||||
for i:=index to MaxAiguillage do
|
||||
if ligneDeb=LigneFin then s:='Suppression de l''aiguillage '+IntToSTR(aiguillage[index].adresse)
|
||||
else s:='Suppression des aiguillages de '+
|
||||
IntToSTR(aiguillage[ligneDeb].adresse)+' à '+IntToSTR(aiguillage[ligneFin].adresse);
|
||||
Affiche(s,clOrange);
|
||||
|
||||
//Affiche('Boucle de '+intToSTR(ligneDeb)+' N='+intToSTR(MaxAiguillage-ligneFin),clyellow);
|
||||
|
||||
for i:=1 to MaxAiguillage-ligneFin do
|
||||
begin
|
||||
Aiguillage[i]:=Aiguillage[i+1];
|
||||
end;
|
||||
index:=i+lignefin; //index de l'aiguillage de remplacement
|
||||
//Affiche('Suppresion aiguillage '+intToSTR(aiguillage[i+lignedeb].Adresse),clorange);
|
||||
//Affiche('remplacement par index '+intToSTR(index),clorange);
|
||||
|
||||
Aiguillage[lignedeb+i-1]:=Aiguillage[index];
|
||||
aiguillage[index].Adresse:=0;
|
||||
aiguillage[index].Modele:=rien;
|
||||
aiguillage[index].Adroit:=0;
|
||||
aiguillage[index].Adevie:=0;
|
||||
aiguillage[index].Ddroit:=0;
|
||||
aiguillage[index].Ddevie:=0;
|
||||
aiguillage[index].APointe:=0;
|
||||
aiguillage[index].modifie:=false;
|
||||
end;
|
||||
MaxAiguillage:=maxAiguillage-(ligneFin-LigneDeb)-1;
|
||||
|
||||
config_modifie:=true;
|
||||
RichAig.Clear;
|
||||
|
||||
|
||||
// réafficher le richsig
|
||||
for i:=1 to MaxAiguillage do
|
||||
begin
|
||||
@@ -6076,6 +6200,11 @@ begin
|
||||
RE_ColorLine(RichAig,RichAig.lines.count-1,ClAqua);
|
||||
end;
|
||||
end;
|
||||
With RichAig do
|
||||
begin
|
||||
SelStart:=0;
|
||||
Perform(EM_SCROLLCARET,0,0);
|
||||
end;
|
||||
ligneClicAig:=-1;
|
||||
AncligneClicAig:=-1;
|
||||
clicliste:=false;
|
||||
@@ -6522,7 +6651,11 @@ begin
|
||||
RE_ColorLine(RichBranche,Ligne-1,ClRed);
|
||||
end;
|
||||
|
||||
if ok then labelResult.Caption:='Syntaxe correcte'
|
||||
if ok then
|
||||
begin
|
||||
labelResult.Caption:='Syntaxe correcte';
|
||||
config_modifie:=true;
|
||||
end
|
||||
else labelResult.Caption:='Erreur de syntaxe';
|
||||
end;
|
||||
|
||||
|
||||
Binary file not shown.
+18
-46
@@ -15,30 +15,16 @@ object FormConfigTCO: TFormConfigTCO
|
||||
OnActivate = FormActivate
|
||||
PixelsPerInch = 96
|
||||
TextHeight = 13
|
||||
object Label1: TLabel
|
||||
Left = 8
|
||||
Top = 8
|
||||
Width = 83
|
||||
Height = 13
|
||||
Caption = 'Taille des cellules'
|
||||
end
|
||||
object Label2: TLabel
|
||||
Left = 120
|
||||
Top = 8
|
||||
Width = 13
|
||||
Height = 13
|
||||
Caption = 'x'
|
||||
end
|
||||
object Label3: TLabel
|
||||
Left = 16
|
||||
Top = 60
|
||||
Top = 44
|
||||
Width = 156
|
||||
Height = 13
|
||||
Caption = 'Nombre de cellules en horizontal:'
|
||||
end
|
||||
object Label4: TLabel
|
||||
Left = 16
|
||||
Top = 84
|
||||
Top = 68
|
||||
Width = 145
|
||||
Height = 13
|
||||
Caption = 'Nombre de cellules en vertical:'
|
||||
@@ -51,49 +37,35 @@ object FormConfigTCO: TFormConfigTCO
|
||||
end
|
||||
object LabelMaxX: TLabel
|
||||
Left = 235
|
||||
Top = 60
|
||||
Top = 44
|
||||
Width = 53
|
||||
Height = 13
|
||||
Caption = 'LabelMaxX'
|
||||
end
|
||||
object LabelMaxY: TLabel
|
||||
Left = 235
|
||||
Top = 84
|
||||
Top = 68
|
||||
Width = 53
|
||||
Height = 13
|
||||
Caption = 'LabelMaxY'
|
||||
end
|
||||
object LabelTailleX: TLabel
|
||||
Left = 96
|
||||
Top = 8
|
||||
Width = 17
|
||||
Height = 13
|
||||
Caption = 'LabelTailleX'
|
||||
end
|
||||
object LabelTailleY: TLabel
|
||||
Left = 136
|
||||
Top = 8
|
||||
Width = 25
|
||||
Height = 13
|
||||
Caption = 'LabelTailleY'
|
||||
end
|
||||
object Ratio: TLabel
|
||||
Left = 8
|
||||
Top = 32
|
||||
Left = 16
|
||||
Top = 16
|
||||
Width = 25
|
||||
Height = 13
|
||||
Caption = 'Ratio'
|
||||
end
|
||||
object Label14: TLabel
|
||||
Left = 72
|
||||
Top = 32
|
||||
Left = 80
|
||||
Top = 16
|
||||
Width = 17
|
||||
Height = 13
|
||||
Caption = '/10'
|
||||
end
|
||||
object ButtonOK: TButton
|
||||
Left = 216
|
||||
Top = 248
|
||||
Top = 240
|
||||
Width = 75
|
||||
Height = 25
|
||||
Caption = 'OK'
|
||||
@@ -102,7 +74,7 @@ object FormConfigTCO: TFormConfigTCO
|
||||
end
|
||||
object ButtonDessine: TButton
|
||||
Left = 16
|
||||
Top = 248
|
||||
Top = 240
|
||||
Width = 75
|
||||
Height = 25
|
||||
Caption = 'Redessine'
|
||||
@@ -111,7 +83,7 @@ object FormConfigTCO: TFormConfigTCO
|
||||
end
|
||||
object CheckDessineGrille: TCheckBox
|
||||
Left = 16
|
||||
Top = 104
|
||||
Top = 88
|
||||
Width = 105
|
||||
Height = 17
|
||||
Caption = 'dessine grille'
|
||||
@@ -119,7 +91,7 @@ object FormConfigTCO: TFormConfigTCO
|
||||
end
|
||||
object EditNbCellX: TEdit
|
||||
Left = 184
|
||||
Top = 56
|
||||
Top = 40
|
||||
Width = 49
|
||||
Height = 21
|
||||
TabOrder = 3
|
||||
@@ -127,7 +99,7 @@ object FormConfigTCO: TFormConfigTCO
|
||||
end
|
||||
object EditNbCellY: TEdit
|
||||
Left = 184
|
||||
Top = 80
|
||||
Top = 64
|
||||
Width = 49
|
||||
Height = 21
|
||||
TabOrder = 4
|
||||
@@ -263,7 +235,7 @@ object FormConfigTCO: TFormConfigTCO
|
||||
end
|
||||
object Memo1: TMemo
|
||||
Left = 16
|
||||
Top = 144
|
||||
Top = 136
|
||||
Width = 273
|
||||
Height = 81
|
||||
BevelInner = bvLowered
|
||||
@@ -279,8 +251,8 @@ object FormConfigTCO: TFormConfigTCO
|
||||
TabOrder = 6
|
||||
end
|
||||
object EditRatio: TEdit
|
||||
Left = 40
|
||||
Top = 29
|
||||
Left = 48
|
||||
Top = 13
|
||||
Width = 25
|
||||
Height = 21
|
||||
Hint = 'Rapport X/Y d'#39'affichage des cellules'
|
||||
@@ -291,7 +263,7 @@ object FormConfigTCO: TFormConfigTCO
|
||||
end
|
||||
object ColorDialog1: TColorDialog
|
||||
OnShow = ColorDialog1Show
|
||||
Left = 216
|
||||
Top = 8
|
||||
Left = 248
|
||||
Top = 88
|
||||
end
|
||||
end
|
||||
@@ -9,8 +9,6 @@ uses
|
||||
type
|
||||
TFormConfigTCO = class(TForm)
|
||||
ButtonOK: TButton;
|
||||
Label1: TLabel;
|
||||
Label2: TLabel;
|
||||
Label3: TLabel;
|
||||
Label4: TLabel;
|
||||
ButtonDessine: TButton;
|
||||
@@ -39,8 +37,6 @@ type
|
||||
LabelMaxY: TLabel;
|
||||
ImageQuai: TImage;
|
||||
Label13: TLabel;
|
||||
LabelTailleX: TLabel;
|
||||
LabelTailleY: TLabel;
|
||||
EditRatio: TEdit;
|
||||
Ratio: TLabel;
|
||||
Label14: TLabel;
|
||||
@@ -264,8 +260,6 @@ end;
|
||||
|
||||
procedure TFormConfigTCO.FormActivate(Sender: TObject);
|
||||
begin
|
||||
LabelTailleX.caption:=IntToSTR(LargeurCell);
|
||||
LabelTailleY.caption:=IntToSTR(HauteurCell);
|
||||
EditNbCellX.Text:=IntToSTR(NbreCellX);
|
||||
EditNbCellY.Text:=IntToSTR(NbreCellY);
|
||||
EditRatio.text:=IntToSTR(RatioC);
|
||||
|
||||
Binary file not shown.
+27
-28
@@ -1,9 +1,8 @@
|
||||
object FormDebug: TFormDebug
|
||||
Left = 219
|
||||
Top = 67
|
||||
Left = 200
|
||||
Top = 155
|
||||
Width = 842
|
||||
Height = 784
|
||||
VertScrollBar.Position = 39
|
||||
Caption = 'Fen'#234'tre de d'#233'bug'
|
||||
Color = clWindow
|
||||
TransparentColorValue = clTeal
|
||||
@@ -22,7 +21,7 @@ object FormDebug: TFormDebug
|
||||
TextHeight = 13
|
||||
object Label1: TLabel
|
||||
Left = 642
|
||||
Top = -35
|
||||
Top = 4
|
||||
Width = 108
|
||||
Height = 13
|
||||
Anchors = [akTop, akRight]
|
||||
@@ -38,7 +37,7 @@ object FormDebug: TFormDebug
|
||||
end
|
||||
object Label2: TLabel
|
||||
Left = 474
|
||||
Top = -37
|
||||
Top = 2
|
||||
Width = 131
|
||||
Height = 18
|
||||
Anchors = [akTop, akRight]
|
||||
@@ -52,7 +51,7 @@ object FormDebug: TFormDebug
|
||||
end
|
||||
object EditNivDebug: TEdit
|
||||
Left = 754
|
||||
Top = -37
|
||||
Top = 2
|
||||
Width = 49
|
||||
Height = 21
|
||||
Anchors = [akTop, akRight]
|
||||
@@ -68,7 +67,7 @@ object FormDebug: TFormDebug
|
||||
end
|
||||
object MemoEvtDet: TMemo
|
||||
Left = 570
|
||||
Top = 297
|
||||
Top = 336
|
||||
Width = 239
|
||||
Height = 201
|
||||
Anchors = [akTop, akRight]
|
||||
@@ -89,7 +88,7 @@ object FormDebug: TFormDebug
|
||||
end
|
||||
object ButtonEcrLog: TButton
|
||||
Left = 466
|
||||
Top = 289
|
||||
Top = 328
|
||||
Width = 97
|
||||
Height = 29
|
||||
Anchors = [akTop, akRight]
|
||||
@@ -99,7 +98,7 @@ object FormDebug: TFormDebug
|
||||
end
|
||||
object ButtonRazTampon: TButton
|
||||
Left = 466
|
||||
Top = 321
|
||||
Top = 360
|
||||
Width = 97
|
||||
Height = 33
|
||||
Anchors = [akTop, akRight]
|
||||
@@ -110,7 +109,7 @@ object FormDebug: TFormDebug
|
||||
end
|
||||
object ButtonCherche: TButton
|
||||
Left = 466
|
||||
Top = 257
|
||||
Top = 296
|
||||
Width = 97
|
||||
Height = 25
|
||||
Anchors = [akTop, akRight]
|
||||
@@ -120,7 +119,7 @@ object FormDebug: TFormDebug
|
||||
end
|
||||
object ButtonAffEvtChrono: TButton
|
||||
Left = 466
|
||||
Top = 217
|
||||
Top = 256
|
||||
Width = 97
|
||||
Height = 33
|
||||
Anchors = [akTop, akRight]
|
||||
@@ -131,7 +130,7 @@ object FormDebug: TFormDebug
|
||||
end
|
||||
object ButtonCop: TButton
|
||||
Left = 466
|
||||
Top = 169
|
||||
Top = 208
|
||||
Width = 97
|
||||
Height = 41
|
||||
Anchors = [akTop, akRight]
|
||||
@@ -148,7 +147,7 @@ object FormDebug: TFormDebug
|
||||
end
|
||||
object RichEdit: TRichEdit
|
||||
Left = 570
|
||||
Top = 137
|
||||
Top = 176
|
||||
Width = 239
|
||||
Height = 153
|
||||
Anchors = [akTop, akRight]
|
||||
@@ -167,7 +166,7 @@ object FormDebug: TFormDebug
|
||||
end
|
||||
object ButtonRazLog: TButton
|
||||
Left = 466
|
||||
Top = 361
|
||||
Top = 400
|
||||
Width = 97
|
||||
Height = 33
|
||||
Anchors = [akTop, akRight]
|
||||
@@ -178,7 +177,7 @@ object FormDebug: TFormDebug
|
||||
end
|
||||
object GroupBox1: TGroupBox
|
||||
Left = 464
|
||||
Top = 569
|
||||
Top = 608
|
||||
Width = 345
|
||||
Height = 177
|
||||
Anchors = [akTop, akRight]
|
||||
@@ -326,7 +325,7 @@ object FormDebug: TFormDebug
|
||||
end
|
||||
object GroupBox2: TGroupBox
|
||||
Left = 464
|
||||
Top = -19
|
||||
Top = 20
|
||||
Width = 345
|
||||
Height = 149
|
||||
Anchors = [akTop, akRight]
|
||||
@@ -480,27 +479,27 @@ object FormDebug: TFormDebug
|
||||
TabOrder = 8
|
||||
OnClick = CheckBoxTiersClick
|
||||
end
|
||||
object CheckDebugTrames: TCheckBox
|
||||
Left = 208
|
||||
Top = 128
|
||||
Width = 129
|
||||
object CheckBox1: TCheckBox
|
||||
Left = 160
|
||||
Top = 48
|
||||
Width = 177
|
||||
Height = 17
|
||||
Caption = 'Debug trames CDM'
|
||||
Caption = 'Duplication Fen'#234'tre evts vers log'
|
||||
Font.Charset = DEFAULT_CHARSET
|
||||
Font.Color = clBlack
|
||||
Font.Color = clWindowText
|
||||
Font.Height = -11
|
||||
Font.Name = 'MS Sans Serif'
|
||||
Font.Style = []
|
||||
ParentFont = False
|
||||
TabOrder = 9
|
||||
OnClick = CheckDebugTramesClick
|
||||
OnClick = CheckBox1Click
|
||||
end
|
||||
end
|
||||
object RichDebug: TRichEdit
|
||||
Left = 8
|
||||
Top = -31
|
||||
Left = 0
|
||||
Top = 0
|
||||
Width = 457
|
||||
Height = 743
|
||||
Height = 737
|
||||
Anchors = [akLeft, akTop, akRight, akBottom]
|
||||
Lines.Strings = (
|
||||
'RichDebug')
|
||||
@@ -512,7 +511,7 @@ object FormDebug: TFormDebug
|
||||
end
|
||||
object GroupBox5: TGroupBox
|
||||
Left = 464
|
||||
Top = 505
|
||||
Top = 544
|
||||
Width = 345
|
||||
Height = 57
|
||||
Anchors = [akTop, akRight]
|
||||
@@ -579,7 +578,7 @@ object FormDebug: TFormDebug
|
||||
end
|
||||
object ButtonRazTout: TButton
|
||||
Left = 467
|
||||
Top = 137
|
||||
Top = 176
|
||||
Width = 97
|
||||
Height = 25
|
||||
Anchors = [akTop, akRight]
|
||||
|
||||
+7
-7
@@ -54,8 +54,8 @@ type
|
||||
CheckBoxTiers: TCheckBox;
|
||||
ButtonSimuAct0: TButton;
|
||||
ButtonSimuAct1: TButton;
|
||||
CheckDebugTrames: TCheckBox;
|
||||
ButtonElSuiv: TButton;
|
||||
CheckBox1: TCheckBox;
|
||||
procedure FormCreate(Sender: TObject);
|
||||
procedure ButtonEcrLogClick(Sender: TObject);
|
||||
procedure EditNivDebugKeyPress(Sender: TObject; var Key: Char);
|
||||
@@ -88,8 +88,8 @@ type
|
||||
procedure CheckBoxTiersClick(Sender: TObject);
|
||||
procedure ButtonSimuAct1Click(Sender: TObject);
|
||||
procedure ButtonSimuAct0Click(Sender: TObject);
|
||||
procedure CheckDebugTramesClick(Sender: TObject);
|
||||
procedure ButtonElSuivClick(Sender: TObject);
|
||||
procedure CheckBox1Click(Sender: TObject);
|
||||
private
|
||||
{ Déclarations privées }
|
||||
public
|
||||
@@ -490,11 +490,6 @@ begin
|
||||
end;
|
||||
|
||||
|
||||
procedure TFormDebug.CheckDebugTramesClick(Sender: TObject);
|
||||
begin
|
||||
debugtrames:=checkDebugTrames.checked;
|
||||
end;
|
||||
|
||||
procedure TFormDebug.ButtonElSuivClick(Sender: TObject);
|
||||
var Adr,Prec,Actuel,erreur,ancdebug : integer ;
|
||||
type1,type2 : tequipement;
|
||||
@@ -528,4 +523,9 @@ begin
|
||||
|
||||
end;
|
||||
|
||||
procedure TFormDebug.CheckBox1Click(Sender: TObject);
|
||||
begin
|
||||
dupliqueEvt:=CheckBox1.checked;
|
||||
end;
|
||||
|
||||
end.
|
||||
+12
-8
@@ -15,6 +15,9 @@ object FormPilote: TFormPilote
|
||||
OnActivate = FormActivate
|
||||
OnClose = FormClose
|
||||
OnCreate = FormCreate
|
||||
DesignSize = (
|
||||
331
|
||||
350)
|
||||
PixelsPerInch = 96
|
||||
TextHeight = 13
|
||||
object LabelTitrePilote: TLabel
|
||||
@@ -31,10 +34,11 @@ object FormPilote: TFormPilote
|
||||
ParentFont = False
|
||||
end
|
||||
object ImagePilote: TImage
|
||||
Left = 208
|
||||
Top = 48
|
||||
Width = 113
|
||||
Height = 129
|
||||
Left = 224
|
||||
Top = 56
|
||||
Width = 81
|
||||
Height = 105
|
||||
Anchors = []
|
||||
end
|
||||
object LabelNbFeux: TLabel
|
||||
Left = 208
|
||||
@@ -57,7 +61,7 @@ object FormPilote: TFormPilote
|
||||
ParentFont = False
|
||||
end
|
||||
object Label1: TLabel
|
||||
Left = 232
|
||||
Left = 240
|
||||
Top = 192
|
||||
Width = 50
|
||||
Height = 13
|
||||
@@ -65,7 +69,7 @@ object FormPilote: TFormPilote
|
||||
end
|
||||
object GroupBox1: TGroupBox
|
||||
Left = 8
|
||||
Top = 40
|
||||
Top = 48
|
||||
Width = 193
|
||||
Height = 185
|
||||
Caption = 'Signalisation de base'
|
||||
@@ -163,7 +167,7 @@ object FormPilote: TFormPilote
|
||||
end
|
||||
object GroupBox2: TGroupBox
|
||||
Left = 8
|
||||
Top = 232
|
||||
Top = 240
|
||||
Width = 193
|
||||
Height = 89
|
||||
Caption = 'Signalisation combin'#233'e'
|
||||
@@ -207,7 +211,7 @@ object FormPilote: TFormPilote
|
||||
end
|
||||
object ButtonPilote: TButton
|
||||
Left = 208
|
||||
Top = 288
|
||||
Top = 296
|
||||
Width = 113
|
||||
Height = 33
|
||||
Caption = 'Envoyer la commande'
|
||||
|
||||
Binary file not shown.
+626
-294
File diff suppressed because it is too large.
Load diff
BIN
Binary file not shown.
+160
-136
@@ -385,7 +385,7 @@ begin
|
||||
reset(fichier);
|
||||
except
|
||||
Affiche('Nouveau tco',clyellow);
|
||||
NbreCellX:=35;NbreCellY:=20;LargeurCell:=30;HauteurCell:=30;
|
||||
NbreCellX:=35;NbreCellY:=20;LargeurCell:=35;HauteurCell:=35;
|
||||
RatioC:=10;
|
||||
exit;
|
||||
end;
|
||||
@@ -542,8 +542,9 @@ begin
|
||||
Val(s,NbreCellY,erreur)
|
||||
end;
|
||||
|
||||
// largeur et hauteur des cellules
|
||||
// Ancien largeur et hauteur des cellules
|
||||
if ancienformatTCO then begin s:=lit_ligne;val(s,LargeurCell,erreur);i:=pos(',',s);delete(s,1,i);Val(s,HauteurCell,erreur);end;
|
||||
{
|
||||
sa:=uppercase(Cellule_ch)+'=';
|
||||
i:=pos(sa,s);
|
||||
if i<>0 then
|
||||
@@ -552,11 +553,12 @@ begin
|
||||
trouve_cellule:=true;
|
||||
delete(s,i,length(sa));
|
||||
val(s,i,erreur);
|
||||
NbreCellX:=i;
|
||||
LargeurCell:=i;
|
||||
i:=pos(',',s);delete(s,1,i);
|
||||
Val(s,HauteurCell,erreur)
|
||||
end;
|
||||
|
||||
}
|
||||
|
||||
// ratio
|
||||
sa:=uppercase(Ratio_ch)+'=';
|
||||
i:=pos(sa,s);
|
||||
@@ -746,8 +748,6 @@ begin
|
||||
|
||||
writeln(fichier,'/ Taille de la matrice x,y');
|
||||
writeln(fichier,matrice_ch+'='+IntToSTR(NbreCellX)+','+intToSTR(NbreCellY));
|
||||
writeln(fichier,'/ Largeur et hauteur des cellules en pixels');
|
||||
writeln(fichier,cellule_ch+'='+IntToSTR(LargeurCell)+','+intToSTR(HauteurCell));
|
||||
writeln(fichier,'/ Ratio d''affichage celluleX/CelluleY');
|
||||
writeln(fichier,Ratio_ch+'='+intToSTR(ratioC));
|
||||
writeln(fichier,'/Matrice TCO');
|
||||
@@ -3233,9 +3233,9 @@ end;
|
||||
// =2 : couleur de l'index train
|
||||
|
||||
procedure zone_TCO(det1,det2,mode: integer);
|
||||
var i,j,x,y,ancienY,ancien2Y,ancienX,ancien2X,Xdet1,Ydet1,Xdet2,Ydet2,Bimage,adresse,
|
||||
var i,j,x,y,xn,yn,ancienY,ancienX,Xdet1,Ydet1,Xdet2,Ydet2,Bimage,adresse,
|
||||
pos,pos2 : integer;
|
||||
memtrouve,debugTCO : boolean;
|
||||
memtrouve,debugTCO,increment : boolean;
|
||||
mdl : Tequipement;
|
||||
s : string;
|
||||
begin
|
||||
@@ -3248,34 +3248,32 @@ begin
|
||||
trouve_det(det2,Xdet2,Ydet2);
|
||||
if (Xdet2=0) or (Ydet2=0) then exit;
|
||||
|
||||
increment:=true;
|
||||
// inverser coordonnées des détecteurs si à l'envers en X
|
||||
if xDet2<xDet1 then
|
||||
begin
|
||||
x:=Xdet2;Xdet2:=Xdet1;Xdet1:=x;
|
||||
increment:=false;
|
||||
{ x:=Xdet2;Xdet2:=Xdet1;Xdet1:=x;
|
||||
x:=Ydet2;Ydet2:=Ydet1;Ydet1:=x;
|
||||
x:=det2;det2:=det1;det1:=x;
|
||||
x:=det2;det2:=det1;det1:=x; }
|
||||
end;
|
||||
|
||||
if debugTCO then Affiche('réorienté en det1='+intToSTR(det1)+' X='+intToSTR(xDet1)+' Y='+intToSTR(ydet1)+
|
||||
' det2='+intToSTR(det2)+' X='+intToSTR(xDet2)+' Y='+intToSTR(ydet2),clyellow);
|
||||
|
||||
|
||||
//Affiche('trouvé '+intToSTR(det1)+' en '+IntToSTR(xDet1)+'/'+intToSTR(ydet1),clyellow);
|
||||
//Affiche('trouvé '+intToSTR(det2)+' en '+IntToSTR(xDet2)+'/'+intToSTR(ydet2),clyellow);
|
||||
|
||||
// Aller de det1 à det2 vers le sens X croissant du TCO
|
||||
ancienX:=Xdet2;ancienY:=yDet2-Ydet1;
|
||||
|
||||
if ydet2<ydet1 then ancieny:=ydet1+1 else ancieny:=ydet1-1;
|
||||
if xdet2<xdet1 then ancienx:=xdet1+1 else ancienx:=xdet1-1;
|
||||
|
||||
x:=xDet1;y:=Ydet1;
|
||||
xn:=x;yn:=y;
|
||||
i:=0; memtrouve:=false;
|
||||
|
||||
repeat
|
||||
ancien2X:=ancienX;
|
||||
ancienX:=X;
|
||||
ancien2Y:=ancienY;
|
||||
ancienY:=y;
|
||||
//Affiche('X='+intToSTR(x)+' Y='+IntToSTR(Y),clyellow);
|
||||
|
||||
if debugTCO then Affiche('X='+intToSTR(x)+' AncienX='+intToSTR(ancienX)+' Y='+IntToSTR(Y)+' AncienY='+IntToSTR(ancienY),clyellow);
|
||||
|
||||
// Affiche la cellule en fonction du mode
|
||||
Tco[x,y].mode:=mode;
|
||||
@@ -3286,103 +3284,100 @@ begin
|
||||
// vers case suivante: trouver le trajet pour rejoindre det1 à det2
|
||||
case Bimage of
|
||||
// voie
|
||||
1 : if ancien2X<x then inc(x) else dec(x);
|
||||
// aiguillage pris en talon - pris en pointe
|
||||
2 : if ancien2X<x then inc(x) else
|
||||
begin
|
||||
pos:=positionTCO(x,y);
|
||||
if (pos=const_devie) then begin dec(x);inc(y); end;
|
||||
if (pos=const_droit) then dec(x);
|
||||
if (pos=const_inconnu) then Erreur_TCO(x,y);
|
||||
end;
|
||||
// aiguillage en pointe dévié: changer xy
|
||||
3 : begin
|
||||
if ancien2X<x then
|
||||
begin
|
||||
pos:=positionTCO(x,y);
|
||||
if (pos=const_devie) then begin inc(x);dec(y); end;
|
||||
if (pos=const_droit) then inc(x);
|
||||
if (pos=const_inconnu) then Erreur_TCO(x,y);
|
||||
end
|
||||
else dec(x);
|
||||
1 : begin
|
||||
if debugTCO then Affiche('El 1',clyellow);
|
||||
if ancienX<x then xn:=x+1 else xn:=x-1;
|
||||
end;
|
||||
// aiguillage en pointe
|
||||
4 : begin
|
||||
if ancien2X<x then
|
||||
begin
|
||||
pos:=positionTCO(x,y);
|
||||
if (pos=const_devie) then begin inc(x);inc(y); end;
|
||||
if (pos=const_droit) then inc(x);
|
||||
if (pos=const_inconnu) then Erreur_TCO(x,y);
|
||||
end
|
||||
else dec(x);
|
||||
end;
|
||||
// aiguillage pris en talon - pris en pointe
|
||||
5 : if ancien2X<x then inc(x) else
|
||||
begin
|
||||
2 : begin
|
||||
if debugTCO then Affiche('El 2',clyellow);
|
||||
pos:=positionTCO(x,y);
|
||||
if (pos=const_devie) then begin dec(x);dec(y); end;
|
||||
if (pos=const_droit) then dec(x);
|
||||
if (ancienX<x) and (ancienY=y) then xn:=x+1;
|
||||
if (ancienX>x) and (ancienY=Y) then begin xn:=x-1;if pos=const_devie then yn:=y+1;end;
|
||||
if (ancienX<x) and (ancienY>y) then xn:=x-1;
|
||||
if (pos=const_inconnu) then Erreur_TCO(x,y);
|
||||
end;
|
||||
// tourner à droite
|
||||
6 : if ancien2X<x then inc(x)
|
||||
else begin dec(x);dec(y);end;
|
||||
|
||||
// tourner vers le haut
|
||||
7 : if ancien2x<x then begin inc(x);dec(y); end else dec(x);
|
||||
// tourner vers le bas
|
||||
8 : if ancien2X<x then begin inc(x);inc(y); end else dec(x);
|
||||
// tourner
|
||||
9 : if ancien2X<x then inc(x) else begin dec(x);inc(y);end;
|
||||
// diagonale /
|
||||
10 : if ancien2X<x then begin inc(x);dec(y);end else begin dec(x);inc(y);end;
|
||||
// diagonale \
|
||||
11 : if ancien2X<x then begin inc(x);inc(y);end else begin dec(x);dec(y);end;
|
||||
// aiguillage en pointe
|
||||
12 : if ancien2X<x then
|
||||
begin
|
||||
3 : begin
|
||||
if debugTCO then Affiche('El 3',clyellow);
|
||||
pos:=positionTCO(x,y);
|
||||
if (ancienX<x) then begin xn:=x+1;if pos=const_devie then yn:=y-1;end;
|
||||
if (ancienX>x) and (ancienY=Y) then xn:=x-1;
|
||||
if (ancienX>x) and (ancienY<y) then xn:=x-1;
|
||||
if (pos=const_inconnu) then Erreur_TCO(x,y);
|
||||
end;
|
||||
4 : begin
|
||||
if debugTCO then Affiche('El 4',clyellow);
|
||||
pos:=positionTCO(x,y);
|
||||
if (ancienX<x) and (ancienY=Y) then begin xn:=x+1;if pos=const_devie then yn:=y+1;end;
|
||||
if (ancienX>x) and (ancienY=Y) then xn:=x-1;
|
||||
if (ancienX>x) and (ancienY>y) then xn:=x-1;
|
||||
if (pos=const_inconnu) then Erreur_TCO(x,y);
|
||||
end;
|
||||
5 : begin
|
||||
if debugTCO then Affiche('El 5',clyellow);
|
||||
pos:=positionTCO(x,y);
|
||||
if (ancienX<x) and (ancienY=Y) then xn:=x+1;
|
||||
if (ancienX>x) and (ancienY=Y) then begin xn:=x-1;if pos=const_devie then yn:=y-1;end;
|
||||
if (ancienX<x) and (ancienY<y) then xn:=x+1;
|
||||
if (pos=const_inconnu) then Erreur_TCO(x,y);
|
||||
end;
|
||||
6 : begin
|
||||
if debugTCO then Affiche('El 6',clyellow);
|
||||
if ancienX<x then xn:=x+1
|
||||
else begin xn:=x-1;yn:=y-1;end;
|
||||
end;
|
||||
7 : if ancienx<x then begin xn:=x+1;yn:=y-1; end else xn:=x-1;
|
||||
8 : if ancienX<x then begin xn:=x+1;yn:=y+1; end else xn:=x-1;
|
||||
9 : if ancienX<x then xn:=x+1 else begin xn:=x-1;yn:=y+1;end;
|
||||
10 : begin
|
||||
if debugTCO then Affiche('El 10',clyellow);
|
||||
if ancienX<x then begin xn:=x+1;yn:=y-1;end else begin xn:=x-1;yn:=y+1;end;
|
||||
end;
|
||||
11 : begin
|
||||
if debugTCO then Affiche('El 11',clyellow);
|
||||
if ancienX<x then begin xn:=x+1;yn:=y+1;end else begin xn:=x-1;yn:=y-1;end;
|
||||
end;
|
||||
12 : begin
|
||||
if debugTCO then Affiche('El 12',clyellow);
|
||||
pos:=positionTCO(x,y);
|
||||
if (pos=const_devie) then inc(x);
|
||||
if (pos=const_droit) then begin inc(x);inc(y);end;
|
||||
if (pos=const_inconnu) then Erreur_TCO(x,y);
|
||||
end
|
||||
else begin dec(x);dec(y);end;
|
||||
// aiguillage en talon
|
||||
13 : if ancien2X<x then begin inc(x);dec(y); end
|
||||
else
|
||||
begin
|
||||
pos:=positionTCO(x,y);
|
||||
if (pos=const_devie) then dec(x);
|
||||
if (pos=const_droit) then begin dec(x);inc(y);end;
|
||||
if (pos=const_inconnu) then Erreur_TCO(x,y);
|
||||
end;
|
||||
// aiguillage en talon
|
||||
14 : if ancien2X<x then
|
||||
begin
|
||||
inc(x);inc(y);
|
||||
end else
|
||||
begin
|
||||
pos:=positionTCO(x,y);
|
||||
if (pos=const_devie) then dec(x);
|
||||
if (pos=const_droit) then begin dec(x);dec(y);end;
|
||||
if (ancienX<x) and (ancienY<Y) then begin xn:=x+1;if pos=const_droit then yn:=y+1;end;
|
||||
if (ancienX>x) and (ancienY=Y) then begin xn:=x-1;yn:=y-1;end;
|
||||
if (ancienX>x) and (ancienY>y) then begin xn:=x-1;yn:=y-1;end;
|
||||
if (pos=const_inconnu) then Erreur_TCO(x,y);
|
||||
end;
|
||||
// aiguillage en pointe
|
||||
15 : if ancien2X<x then
|
||||
begin
|
||||
13 : begin
|
||||
if debugTCO then Affiche('El 13',clyellow);
|
||||
pos:=positionTCO(x,y);
|
||||
if (pos=const_devie) then inc(x);
|
||||
if (pos=const_droit) then begin inc(x);dec(y);end;
|
||||
if (ancienX<x) and (ancienY=Y) then begin xn:=x+1;yn:=y-1;end;
|
||||
if (ancienX>x) and (ancienY<Y) then begin xn:=x-1;if pos=const_droit then yn:=y+1;end;
|
||||
if (ancienX<x) and (ancienY>y) then begin xn:=x+1;yn:=y-1;end;
|
||||
if (pos=const_inconnu) then Erreur_TCO(x,y);
|
||||
end
|
||||
else begin dec(x);inc(y);end;
|
||||
16 : if ancien2X<x then inc(y) else begin dec(x);dec(y);end;
|
||||
17 : if ancien2Y<y then begin inc(y);end else begin inc(x);dec(y);end;
|
||||
18 : if Ancien2X<x then dec(y) else begin inc(y);dec(x);end;
|
||||
19 : if ancien2Y<y then begin inc(x);inc(y);end else dec(y);
|
||||
20 : if ancien2Y<y then inc(y) else dec(y);
|
||||
end;
|
||||
14 : begin
|
||||
if debugTCO then Affiche('El 14',clyellow);
|
||||
pos:=positionTCO(x,y);
|
||||
if (ancienX<x) and (ancienY=Y) then begin xn:=x+1;yn:=y+1;end;
|
||||
if (ancienX<x) and (ancienY<Y) then begin xn:=x+1;yn:=y+1;end;
|
||||
if (ancienX>x) and (ancienY>y) then begin xn:=x-1;if pos=const_droit then yn:=y-1;end;
|
||||
if (pos=const_inconnu) then Erreur_TCO(x,y);
|
||||
end;
|
||||
15 : begin
|
||||
if debugTCO then Affiche('El 15',clyellow);
|
||||
pos:=positionTCO(x,y);
|
||||
if (ancienX<x) and (ancienY>Y) then begin xn:=x+1;if pos=const_droit then yn:=y-1;end;
|
||||
if (ancienX>x) and (ancienY<Y) then begin xn:=x-1;yn:=y+1;end;
|
||||
if (ancienX>x) and (ancienY=y) then begin xn:=x-1;yn:=y+1;end;
|
||||
if (pos=const_inconnu) then Erreur_TCO(x,y);
|
||||
end;
|
||||
16 : if ancienX<x then yn:=y+1 else begin xn:=x-1;yn:=y-1;end;
|
||||
17 : if ancienY<y then begin yn:=y+1;end else begin xn:=x+1;yn:=y-1;end;
|
||||
18 : if AncienX<x then yn:=y-1 else begin yn:=y+1;xn:=x-1;end;
|
||||
19 : begin
|
||||
if debugTCO then Affiche('El 19',clyellow);
|
||||
if ancienY<y then begin xn:=x+1;yn:=y+1;end else yn:=y-1;
|
||||
end;
|
||||
20 : if ancienY<y then yn:=y+1 else yn:=y-1;
|
||||
21 : begin
|
||||
if debugTCO then Affiche('El 21',clyellow);
|
||||
// tjd ou tjs
|
||||
if adresse<>0 then
|
||||
begin
|
||||
@@ -3397,37 +3392,50 @@ begin
|
||||
if (pos2=const_inconnu) then Erreur_TCO(x,y);
|
||||
if (pos=const_droit) and (pos2=const_droit) then
|
||||
begin
|
||||
inc(x);
|
||||
if ancienX<x then xn:=x+1 else xn:=x-1;
|
||||
end;
|
||||
if (pos=const_devie) and (pos2=const_devie) then
|
||||
begin
|
||||
inc(x);dec(y);
|
||||
if ancienX<x then begin xn:=x+1;yn:=y-1;end
|
||||
else begin xn:=x-1;yn:=y+1;end;
|
||||
end;
|
||||
if (pos=const_droit) and (pos2=const_devie) then
|
||||
begin
|
||||
inc(x);
|
||||
if ancienX<x then xn:=x+1 else begin xn:=x-1;yn:=y+1;end;
|
||||
end;
|
||||
if (pos=const_devie) and (pos2=const_droit) then
|
||||
begin
|
||||
inc(x);dec(y);
|
||||
if ancienX<x then begin xn:=x+1;end
|
||||
else begin xn:=x-1;yn:=y-1;end;
|
||||
end;
|
||||
end;
|
||||
if mdl=tjs then
|
||||
begin
|
||||
if (pos=const_droit) then inc(x);
|
||||
if (pos=const_devie) then begin inc(x);dec(y);end;
|
||||
if (pos=const_droit) then
|
||||
begin
|
||||
if ancienX<x then xn:=x+1 else xn:=x-1;
|
||||
end;
|
||||
if (pos=const_devie) then
|
||||
begin
|
||||
if ancienX<x then begin xn:=x+1;yn:=y-1;end
|
||||
else begin xn:=x-1;yn:=y+1;end ;
|
||||
end;
|
||||
end;
|
||||
end
|
||||
else
|
||||
// croisement
|
||||
begin
|
||||
if ancien2Y=y then begin inc(x);end else begin inc(x);dec(y);end;
|
||||
if (ancienX<x) and (ancienY=Y) then xn:=x+1;
|
||||
if (ancienX>x) and (ancienY=Y) then xn:=x-1;
|
||||
if (ancienX<x) and (ancienY>Y) then begin xn:=x+1;yn:=y-1;end;
|
||||
if (ancienX>x) and (ancienY<Y) then begin xn:=x-1;yn:=y+1;end;
|
||||
end;
|
||||
end;
|
||||
// TJD ou croisement
|
||||
22 : begin
|
||||
// tjd ou tjs
|
||||
if adresse<>0 then
|
||||
if debugTCO then Affiche('El 22',clyellow);
|
||||
if adresse<>0 then
|
||||
begin
|
||||
j:=Index_Aig(adresse);
|
||||
pos:=aiguillage[j].position;
|
||||
@@ -3440,45 +3448,62 @@ begin
|
||||
if (pos2=const_inconnu) then Erreur_TCO(x,y);
|
||||
if (pos=const_droit) and (pos2=const_droit) then
|
||||
begin
|
||||
inc(x);inc(y);
|
||||
if ancienX<x then begin xn:=x+1;yn:=y+1;end else begin xn:=x-1;yn:=y-1;end;
|
||||
end;
|
||||
if (pos=const_devie) and (pos2=const_devie) then
|
||||
begin
|
||||
inc(x);
|
||||
if ancienX<x then xn:=x+1 else xn:=x-1;
|
||||
end;
|
||||
if (pos=const_droit) and (pos2=const_devie) then
|
||||
begin
|
||||
inc(x);inc(y);
|
||||
if ancienX<x then begin xn:=x+1;yn:=y+1;end else begin xn:=x-1;end ;
|
||||
end;
|
||||
if (pos=const_devie) and (pos2=const_droit) then
|
||||
begin
|
||||
inc(x);
|
||||
if ancienX<x then xn:=x+1 else begin xn:=x-1;yn:=y-1;end;
|
||||
end;
|
||||
end;
|
||||
if mdl=tjs then
|
||||
begin
|
||||
if mdl=tjs then
|
||||
begin
|
||||
if (pos=const_droit) then inc(x);
|
||||
if (pos=const_devie) then begin inc(x);inc(y);end;
|
||||
if (pos=const_droit) then
|
||||
begin
|
||||
if ancienX<x then xn:=x+1 else xn:=x-1;
|
||||
end ;
|
||||
if (pos=const_devie) then
|
||||
begin
|
||||
if ancienX<x then begin xn:=x+1;yn:=y+1;end else begin xn:=x-1;yn:=y-1;end
|
||||
end;
|
||||
end;
|
||||
end;
|
||||
end
|
||||
else
|
||||
// croisement
|
||||
begin
|
||||
if ancien2Y=y then begin inc(x);end else begin inc(x);inc(y);end;
|
||||
if (ancienX<x) and (ancienY=Y) then xn:=x+1;
|
||||
if (ancienX>x) and (ancienY=Y) then xn:=x-1;
|
||||
if (ancienX>x) and (ancienY>Y) then begin xn:=x-1;yn:=y-1;end;
|
||||
if (ancienX<x) and (ancienY<Y) then begin xn:=x+1;yn:=y+1;end;
|
||||
end;
|
||||
end;
|
||||
else exit;
|
||||
end;
|
||||
else
|
||||
begin
|
||||
Affiche('Erreur 400 TCO - Element '+intToSTR(Bimage)+' inconnu ',clred);
|
||||
exit;
|
||||
end;
|
||||
end;
|
||||
inc(i);
|
||||
if adresse=det2 then memTrouve:=true;
|
||||
ancienX:=X;
|
||||
ancienY:=y;
|
||||
x:=xn;
|
||||
y:=yn;
|
||||
until (x=1) or (x=NbreCellX) or (y=NbreCellY) or ((adresse<>det2) and memTrouve) or (i>NbCellulesTCO);
|
||||
//Affiche(intToSTR(x),clLime);
|
||||
if i>NbCellulesTCO then
|
||||
begin
|
||||
s:='Erreur 1000 : dépassement d''itérations TCO: '+IntToSTR(det1)+' - '+IntToSTR(det2);
|
||||
s:='Erreur 1000 TCO : dépassement d''itérations '+IntToSTR(det1)+' - '+IntToSTR(det2);
|
||||
Affiche(s,clred); AfficheDebug(s,clred);
|
||||
end;
|
||||
end;
|
||||
@@ -4833,20 +4858,19 @@ end;
|
||||
|
||||
procedure TFormTCO.ButtonSimuClick(Sender: TObject);
|
||||
begin
|
||||
aiguillage[Index_Aig(1)].position:=const_devie;
|
||||
aiguillage[Index_Aig(1)].position:=const_devie;
|
||||
aiguillage[Index_Aig(2)].position:=const_droit;
|
||||
aiguillage[Index_Aig(3)].position:=const_devie;
|
||||
aiguillage[Index_Aig(5)].position:=const_devie;
|
||||
aiguillage[Index_Aig(7)].position:=const_droit;
|
||||
aiguillage[Index_Aig(12)].position:=const_devie;
|
||||
aiguillage[Index_Aig(20)].position:=const_devie;
|
||||
aiguillage[Index_Aig(3)].position:=const_droit;
|
||||
aiguillage[Index_Aig(4)].position:=const_devie;
|
||||
aiguillage[Index_Aig(5)].position:=const_droit;
|
||||
aiguillage[Index_Aig(7)].position:=const_devie;
|
||||
aiguillage[Index_Aig(12)].position:=const_droit;
|
||||
aiguillage[Index_Aig(20)].position:=const_droit;
|
||||
aiguillage[Index_Aig(21)].position:=const_droit;
|
||||
aiguillage[Index_Aig(26)].position:=const_droit;
|
||||
aiguillage[Index_Aig(28)].position:=const_devie;
|
||||
index_couleur:=1;
|
||||
//zone_TCO(527,519,0);
|
||||
zone_TCO(519,517,2);
|
||||
|
||||
|
||||
//zone_TCO(547,560,1);
|
||||
//zone_TCO(530,520,1);
|
||||
zone_TCO(520,529,1);
|
||||
end;
|
||||
|
||||
procedure TFormTCO.CheckPinvClick(Sender: TObject);
|
||||
|
||||
@@ -1,27 +1,30 @@
|
||||
/ Couleurs : fond, voies, détecteur_activé, grille, textes, quai
|
||||
/ D馭initions
|
||||
CoulFond=202050
|
||||
CoulVoies=0077FF
|
||||
CoulAllume=00FFFF
|
||||
CoulGrille=4A4A4A
|
||||
CoulTexte=00FF00
|
||||
CoulQuai=808080
|
||||
CoulCanton=00FFFF
|
||||
ModeCouleurCanton=1
|
||||
AvecGrille=1
|
||||
/ Taille de la matrice x,y
|
||||
Matrice=53,13
|
||||
/ Largeur et hauteur des cellules en pixels
|
||||
Cellule=42,42
|
||||
Matrice=35,13
|
||||
/ Ratio d'affichage celluleX/CelluleY
|
||||
Ratio=10
|
||||
/Matrice TCO
|
||||
[Matrice]
|
||||
/ inutilisé,adresse,image,inversion aiguillage,Orientation du feu, pied du feu , [texte], representation, fonte, taille fonte, couleur fonte, style
|
||||
(0,0,0,0,0,0,,2,,0,000000,)(0,0,0,0,0,0,,2,,0,000000,)(0,0,0,0,0,0,,2,,0,000000,)(0,0,0,0,0,0,,2,,0,000000,)(0,0,0,0,0,0,,2,,0,000000,)(0,0,0,0,0,0,,2,,0,000000,)(0,0,0,0,0,0,,2,,0,000000,)(0,0,0,0,0,0,,2,,0,000000,)(0,0,0,0,0,0,,2,,0,000000,)(0,0,0,0,0,0,,2,,0,000000,)(0,0,0,0,0,0,,2,,0,000000,)(0,0,0,0,0,0,,2,,0,000000,)(0,0,0,0,0,0,TCO GARE PRINCIPALE,1,ARIAL,20,00FFFF,GI)(0,0,0,0,0,0,,2,,0,000000,)(0,0,0,0,0,0,,2,,0,000000,)(0,0,0,0,0,0,,2,,0,000000,)(0,0,0,0,0,0,,2,,0,000000,)(0,0,0,0,0,0,,2,,0,000000,)(0,0,0,0,0,0,,2,,0,000000,)(0,0,0,0,0,0,,2,,0,000000,)(0,0,0,0,0,0,,2,,0,000000,)(0,0,0,0,0,0,,2,,0,000000,)(0,0,0,0,0,0,,2,,0,000000,)(0,0,0,0,0,0,,2,,0,000000,)(0,0,0,0,0,0,,2,,0,000000,)(0,0,0,0,0,0,,2,,0,000000,)(0,0,0,0,0,0,,2,,0,000000,)(0,0,0,0,0,0,,2,,0,000000,)(0,0,0,0,0,0,,2,,0,000000,)(0,0,0,0,0,0,,2,,0,000000,)(0,0,0,0,0,0,,2,,0,000000,)(0,288,30,0,2,0,,2,,0,00FF00,)(0,0,0,0,0,0,,2,,0,000000,)(0,0,0,0,0,0,,2,,0,000000,)(0,0,0,0,0,0,,2,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)
|
||||
(0,0,0,0,0,0,,2,,0,000000,)(0,0,0,0,0,0,,2,,0,000000,)(0,0,0,0,0,0,,2,,0,000000,)(0,0,0,0,0,0,,2,,0,000000,)(0,0,0,0,0,0,,2,,0,000000,)(0,0,0,0,0,0,,2,,0,000000,)(0,0,0,0,0,0,,2,,0,000000,)(0,0,0,0,0,0,,2,,0,000000,)(0,0,0,0,0,0,,2,,0,000000,)(0,0,0,0,0,0,,2,,0,000000,)(0,0,0,0,0,0,,2,,0,000000,)(0,0,0,0,0,0,,2,,8,00FF00,)(0,0,0,0,0,0,,2,,8,00FF00,)(0,0,0,0,0,0,,2,,0,000000,)(0,0,0,0,0,0,,2,,0,000000,)(0,0,0,0,0,0,,2,,0,000000,)(0,0,0,0,0,0,,2,,0,000000,)(0,0,0,0,0,0,,2,,0,000000,)(0,0,0,0,0,0,,2,,0,000000,)(0,0,0,0,0,0,,2,,0,000000,)(0,0,0,0,0,0,,2,,0,000000,)(0,0,0,0,0,0,,2,,0,000000,)(0,0,0,0,0,0,,2,,0,000000,)(0,0,0,0,0,0,,2,,0,000000,)(0,0,0,0,0,0,,2,,0,000000,)(0,0,0,0,0,0,,2,,0,000000,)(0,0,0,0,0,0,,2,,0,000000,)(0,0,0,0,0,0,,2,,0,000000,)(0,0,0,0,0,0,,2,,0,000000,)(0,0,9,0,0,0,,2,,0,000000,)(0,0,1,0,0,0,,2,,0,00FFFF,)(0,0,1,0,0,0,,2,,0,00FFFF,)(0,0,0,0,0,0,,2,,0,000000,)(0,0,0,0,0,0,,2,,0,000000,)(0,0,0,0,0,0,,2,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)
|
||||
(0,0,0,0,0,0,,2,,0,000000,)(0,0,0,0,0,0,,2,,0,000000,)(0,0,0,0,0,0,,2,,0,000000,)(0,0,0,0,0,0,,2,,0,000000,)(0,0,0,0,0,0,,2,,0,000000,)(0,0,0,0,0,0,,2,,0,000000,)(0,0,0,0,0,0,,2,,0,000000,)(0,0,0,0,0,0,,2,,0,000000,)(0,0,0,0,0,0,,2,,0,000000,)(0,0,1,0,0,0,,2,,0,00FFFF,)(0,0,1,0,0,0,,2,,0,00FFFF,)(0,6,2,0,0,0,,2,,0,00FF00,)(0,0,1,0,0,0,,2,,0,00FFFF,)(0,0,1,0,0,0,,2,,0,00FFFF,)(0,0,1,0,0,0,,2,,0,00FFFF,)(0,0,1,0,0,0,,2,,0,00FFFF,)(0,0,0,0,0,0,,2,,0,000000,)(0,0,0,0,0,0,,2,,0,000000,)(0,0,0,0,0,0,,2,,0,000000,)(0,0,0,0,0,0,,2,,0,000000,)(0,0,0,0,0,0,,2,,0,000000,)(0,0,0,0,0,0,,2,,0,000000,)(0,0,0,0,0,0,,2,,0,000000,)(0,0,0,0,0,0,,2,,0,000000,)(0,0,0,0,0,0,,2,,0,000000,)(0,0,0,0,0,0,,2,,0,000000,)(0,0,0,0,0,0,,2,,0,000000,)(0,0,0,0,0,0,,2,,0,000000,)(0,0,10,0,0,0,,2,,0,000000,)(0,0,9,0,0,0,,2,,0,000000,)(0,0,1,0,0,0,,2,,0,00FFFF,)(0,0,1,0,0,0,,2,,0,00FFFF,)(0,0,0,0,0,0,,2,,0,000000,)(0,0,0,0,0,0,,2,,0,000000,)(0,0,0,0,0,0,,2,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)
|
||||
(0,0,0,0,0,0,,2,,0,000000,)(0,0,0,0,0,0,,2,,0,000000,)(0,0,0,0,0,0,,2,,0,000000,)(0,0,0,0,0,0,,2,,0,000000,)(0,0,0,0,0,0,,2,,0,000000,)(0,0,0,0,0,0,,2,,0,000000,)(0,0,0,0,0,0,,2,,0,000000,)(0,0,0,0,0,0,,2,,0,000000,)(0,0,0,0,0,0,,2,,0,000000,)(0,0,0,0,0,0,,2,,0,000000,)(0,0,10,0,0,0,,2,,0,000000,)(0,0,0,0,0,0,,2,,0,000000,)(0,232,30,0,3,0,,2,,0,00FF00,)(0,0,0,0,0,0,,2,,0,000000,)(0,0,0,0,0,0,,2,,0,000000,)(0,0,0,0,0,0,,2,,0,000000,)(0,0,0,0,0,0,,2,,0,000000,)(0,0,0,0,0,0,,2,,0,000000,)(0,0,0,0,0,0,,2,,0,000000,)(0,0,0,0,0,0,,2,COOPER BLACK,10,00FF00,)(0,0,0,0,0,0,,2,,0,000000,)(0,0,0,0,0,0,,2,,0,000000,)(0,0,0,0,0,0,,2,,0,000000,)(0,0,0,0,0,0,,2,,0,000000,)(0,0,0,0,0,0,,2,,0,000000,)(0,0,0,0,0,0,,2,,0,000000,)(0,0,0,0,0,0,,2,,0,000000,)(0,0,10,0,0,0,,2,,0,000000,)(0,0,10,0,0,0,,2,,0,000000,)(0,0,0,0,0,0,,2,,0,000000,)(0,0,0,0,0,0,,2,,0,000000,)(0,0,0,0,0,0,,2,,0,000000,)(0,0,0,0,0,0,,2,,0,000000,)(0,0,0,0,0,0,,2,,0,000000,)(0,0,0,0,0,0,,2,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)
|
||||
(0,0,0,0,0,0,,2,,0,000000,)(0,0,0,0,0,0,,2,,0,000000,)(0,0,0,0,0,0,,2,,0,000000,)(0,0,0,0,0,0,,2,,0,000000,)(0,0,0,0,0,0,,2,,0,000000,)(0,0,0,0,0,0,,2,,0,000000,)(0,0,0,0,0,0,,2,,0,000000,)(0,0,0,0,0,0,,2,,0,000000,)(0,0,0,0,0,0,,2,,0,000000,)(0,4,15,0,0,0,,2,MS SANS SERIF,10,00FF00,)(0,0,1,0,0,0,,2,,0,00FFFF,)(0,0,1,0,0,0,,2,,0,00FFFF,)(0,0,1,0,0,0,,2,,0,00FFFF,)(0,0,1,0,0,0,,2,,0,00FFFF,)(0,0,1,0,0,0,,2,,0,00FFFF,)(0,0,1,0,0,0,,2,,0,00FFFF,)(0,0,1,0,0,0,,2,,0,00FFFF,)(0,0,1,0,0,0,,2,,0,00FFFF,)(0,0,1,0,0,0,,2,,0,00FFFF,)(0,0,1,0,0,0,,2,,0,00FFFF,)(0,0,1,0,0,0,,2,,0,00FFFF,)(0,0,1,0,0,0,,2,,0,00FFFF,)(0,0,1,0,0,0,,2,,0,00FFFF,)(0,0,1,0,0,0,,2,,0,00FFFF,)(0,0,1,0,0,0,,2,,0,00FFFF,)(0,0,1,0,0,0,,2,,0,00FFFF,)(0,0,7,0,0,0,,2,,0,000000,)(0,0,10,0,0,0,,2,,0,000000,)(0,0,0,0,0,0,,2,,0,000000,)(0,0,0,0,0,0,,2,,0,000000,)(0,0,0,0,0,0,,2,,0,000000,)(0,0,0,0,0,0,,2,,0,000000,)(0,0,0,0,0,0,,2,,0,000000,)(0,0,0,0,0,0,,2,,0,000000,)(0,0,0,0,0,0,,2,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)
|
||||
(0,0,0,0,0,0,,2,,0,000000,)(0,0,0,0,0,0,,2,,0,000000,)(0,0,0,0,0,0,,2,,0,000000,)(0,0,0,0,0,0,,2,,0,000000,)(0,0,0,0,0,0,,2,,0,000000,)(0,0,0,0,0,0,,2,,0,000000,)(0,0,0,0,0,0,,2,,0,000000,)(0,0,0,0,0,0,,2,,0,000000,)(0,3,15,0,0,0,,2,,0,00FF00,)(0,5,2,0,0,0,,2,,0,00FF00,)(0,0,1,0,0,0,,2,,0,00FFFF,)(0,0,1,0,0,0,,2,,0,00FFFF,)(0,515,1,0,0,0,,2,MS SANS SERIF,10,00FFFF,)(0,515,1,0,0,0,,0,,0,00FFFF,)(0,0,1,0,0,0,,2,,0,00FFFF,)(0,0,1,0,0,0,,2,,0,00FFFF,)(0,0,1,0,0,0,,2,,0,00FFFF,)(0,0,1,0,0,0,,2,,0,00FFFF,)(0,0,1,0,0,0,,2,,0,00FFFF,)(0,0,1,0,0,0,,2,,0,00FFFF,)(0,0,1,0,0,0,,2,,0,00FFFF,)(0,0,1,0,0,0,,2,,0,00FFFF,)(0,0,1,0,0,0,,2,,0,00FFFF,)(0,0,1,0,0,0,,2,,0,00FFFF,)(0,0,1,0,0,0,,2,,0,00FFFF,)(0,0,1,0,0,0,,2,,0,00FFFF,)(0,0,7,0,0,0,,2,,0,000000,)(0,0,0,0,0,0,,2,,0,000000,)(0,0,0,0,0,0,,2,,0,000000,)(0,0,0,0,0,0,,2,,0,000000,)(0,0,0,0,0,0,,2,,0,000000,)(0,0,0,0,0,0,,2,,0,000000,)(0,0,0,0,0,0,,2,,0,000000,)(0,0,0,0,0,0,,2,,0,000000,)(0,0,0,0,0,0,,2,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)
|
||||
(0,0,0,0,0,0,,2,,0,000000,)(0,0,0,0,0,0,,2,,0,000000,)(0,0,0,0,0,0,,2,,0,000000,)(0,0,0,0,0,0,,2,,0,000000,)(0,260,30,0,2,0,,2,MS SANS SERIF,10,00FF00,)(0,0,0,0,0,0,,2,,0,000000,)(0,0,0,0,0,0,,2,,0,000000,)(0,0,10,0,0,0,,2,,0,000000,)(0,0,10,0,0,0,,2,,0,000000,)(0,0,0,0,0,0,,2,,0,000000,)(0,316,30,0,3,0,,2,COOPER BLACK,10,00FF00,)(0,0,0,0,0,0,,2,COOPER BLACK,10,0000FF,)(0,0,0,0,0,0,,2,,0,000000,)(0,0,23,0,0,0,,2,,0,000000,)(0,0,23,0,0,0,,2,,0,000000,)(0,0,23,0,0,0,QUAI 1,1,ARIAL,12,FFFFFF,G)(0,0,23,0,0,0,,2,,0,000000,)(0,0,23,0,0,0,,2,,0,000000,)(0,0,23,0,0,0,,2,,0,000000,)(0,0,23,0,0,0,,2,,0,000000,)(0,0,23,0,0,0,,2,,0,000000,)(0,0,23,0,0,0,,2,,0,000000,)(0,0,23,0,0,0,,2,,0,000000,)(0,0,0,0,0,0,,2,,0,000000,)(0,0,0,0,0,0,,2,,0,000000,)(0,0,0,0,0,0,,2,,0,000000,)(0,190,30,0,2,0,,2,COOPER BLACK,10,00FF00,)(0,0,0,0,0,0,,2,,0,000000,)(0,0,0,0,0,0,,2,,0,000000,)(0,0,0,0,0,0,,2,,0,000000,)(0,0,0,0,0,0,,2,,0,000000,)(0,0,0,0,0,0,,2,,0,000000,)(0,0,0,0,0,0,,2,,0,000000,)(0,0,0,0,0,0,,2,,0,000000,)(0,0,0,0,0,0,,2,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)
|
||||
(0,0,0,0,0,0,,2,,0,000000,)(0,0,6,0,0,0,,2,,0,000000,)(0,518,1,0,0,0,,0,,0,00FFFF,)(0,518,1,0,0,0,,2,,0,00FFFF,)(0,0,1,0,0,0,,2,,0,00FFFF,)(0,0,1,0,0,0,,2,,0,00FFFF,)(0,1,3,0,0,0,,2,,0,00FF00,)(0,0,21,0,0,0,,2,,0,00FF00,)(0,0,1,0,0,0,,2,,0,00FFFF,)(0,0,1,0,0,0,,2,,0,00FFFF,)(0,0,1,0,0,0,,2,,0,00FFFF,)(0,0,1,0,0,0,,2,,0,00FFFF,)(0,0,1,0,0,0,,2,,0,00FFFF,)(0,0,1,0,0,0,VOIE 2,2,ARIAL,10,00FFFF,)(0,0,1,0,0,0,,2,,0,00FFFF,)(0,0,1,0,0,0,,2,,0,00FFFF,)(0,0,1,0,0,0,,2,,0,00FFFF,)(0,0,1,0,0,0,,2,,0,00FFFF,)(0,0,1,0,0,0,,2,,0,00FFFF,)(0,0,1,0,0,0,,2,,0,00FFFF,)(0,0,1,0,0,0,,2,,0,00FFFF,)(0,0,1,0,0,0,,2,,0,00FFFF,)(0,0,1,0,0,0,,2,,0,00FFFF,)(0,523,1,0,0,0,,0,,0,00FFFF,)(0,523,1,0,0,0,,0,,0,00FFFF,)(0,523,1,0,0,0,,2,,0,00FFFF,)(0,0,1,0,0,0,,2,,0,00FFFF,)(0,0,1,0,0,0,,2,,0,00FFFF,)(0,0,1,0,0,0,,2,,0,00FFFF,)(0,0,1,0,0,0,,2,,0,00FFFF,)(0,0,1,0,0,0,,2,,0,00FFFF,)(0,0,1,0,0,0,,2,,0,00FFFF,)(0,0,0,0,0,0,,2,,0,000000,)(0,0,0,0,0,0,,2,,0,000000,)(0,0,0,0,0,0,,2,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)
|
||||
(0,0,0,0,0,0,,2,,0,000000,)(0,0,6,0,0,0,,2,,0,000000,)(0,0,1,0,0,0,,2,,0,00FFFF,)(0,0,1,0,0,0,,2,,0,00FFFF,)(0,0,1,0,0,0,,2,,0,00FFFF,)(0,12,4,0,0,0,,2,MS SANS SERIF,10,00FF00,)(0,2,3,0,0,0,,2,MS SANS SERIF,10,00FF00,)(0,0,1,0,0,0,,2,,0,00FFFF,)(0,0,1,0,0,0,,2,,0,00FFFF,)(0,519,1,0,0,0,,2,,0,00FFFF,)(0,519,1,0,0,0,,0,,0,00FFFF,)(0,0,1,0,0,0,,2,,0,00FFFF,)(0,0,1,0,0,0,,2,,0,00FFFF,)(0,0,1,0,0,0,VOIE 1,2,ARIAL,10,00FFFF,)(0,0,1,0,0,0,,2,,0,00FFFF,)(0,0,1,0,0,0,,2,,0,00FFFF,)(0,0,1,0,0,0,,2,,0,00FFFF,)(0,0,1,0,0,0,,2,,0,00FFFF,)(0,0,1,0,0,0,,2,,0,00FFFF,)(0,0,1,0,0,0,,2,,8,00FFFF,)(0,0,1,0,0,0,,2,,0,00FFFF,)(0,0,1,0,0,0,,2,,0,00FFFF,)(0,0,1,0,0,0,,2,,0,00FFFF,)(0,0,1,0,0,0,,2,,0,00FFFF,)(0,0,1,0,0,0,,2,,0,00FFFF,)(0,0,1,0,0,0,,2,,0,00FFFF,)(0,0,1,0,0,0,,2,,0,00FFFF,)(0,7,2,0,0,0,,2,,0,00FF00,)(0,0,1,0,0,0,,2,,0,00FFFF,)(0,527,1,0,0,0,,2,,8,00FFFF,)(0,0,1,0,0,0,,3,,8,00FFFF,)(0,0,1,0,0,0,,0,,0,00FFFF,)(0,0,0,0,0,0,,2,,0,000000,)(0,0,0,0,0,0,,2,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)
|
||||
(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,2,,0,000000,)(0,0,1,0,0,0,,0,,0,00FFFF,)(0,0,8,0,0,0,,0,,0,000000,)(0,0,11,0,0,0,,0,,0,000000,)(0,330,30,0,3,0,,0,,0,00FF00,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,23,0,0,0,,0,,0,000000,)(0,0,23,0,0,0,,0,,0,000000,)(0,0,23,0,0,0,QUAI 2,0,ARIAL,12,FFFFFF,G)(0,0,23,0,0,0,,0,,0,000000,)(0,0,23,0,0,0,,0,,0,000000,)(0,0,23,0,0,0,,0,,0,000000,)(0,0,23,0,0,0,,0,,0,000000,)(0,0,23,0,0,0,,0,,0,000000,)(0,0,23,0,0,0,,0,,0,000000,)(0,0,23,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,10,0,0,0,,0,,0,000000,)(0,204,30,0,3,0,,0,COOPER BLACK,10,00FF00,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,8,00FF00,)(0,0,0,0,0,0,,0,,8,00FF00,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)
|
||||
(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,1,0,0,0,,0,,0,00FFFF,)(0,0,1,0,0,0,,0,,0,00FFFF,)(0,21,5,0,0,0,,0,,0,00FF00,)(0,20,5,0,0,0,,0,,0,00FF00,)(0,520,1,0,0,0,,2,,8,00FFFF,)(0,520,1,0,0,0,,0,,0,00FFFF,)(0,520,1,0,0,0,,0,,0,00FFFF,)(0,0,1,0,0,0,,0,,8,00FFFF,)(0,0,1,0,0,0,,2,,0,00FFFF,)(0,0,1,0,0,0,,0,,0,00FFFF,)(0,0,1,0,0,0,,0,,8,00FFFF,)(0,0,1,0,0,0,,0,,0,00FFFF,)(0,0,1,0,0,0,,0,,0,00FFFF,)(0,0,1,0,0,0,,0,,8,00FFFF,)(0,0,1,0,0,0,,0,,0,00FFFF,)(0,0,1,0,0,0,,0,,0,00FFFF,)(0,0,1,0,0,0,,0,,8,00FFFF,)(0,0,1,0,0,0,,0,,0,00FFFF,)(0,0,1,0,0,0,,0,,8,00FFFF,)(0,0,1,0,0,0,,0,,0,00FFFF,)(0,0,1,0,0,0,,0,,0,00FFFF,)(0,0,7,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,2,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,8,00FF00,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)
|
||||
(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,176,30,0,3,0,,0,MS SANS SERIF,10,00FF00,)(0,0,0,0,0,0,,2,COOPER BLACK,10,00FF00,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,3,,8,00FF00,)(0,0,0,0,0,0,,0,,8,00FF00,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,8,00FF00,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,8,00FF00,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,8,00FF00,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)
|
||||
(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)
|
||||
(0,358,30,0,1,1,,2,,0,FFFFFF,)(0,0,20,0,0,0,,2,,0,00FFFF,)(0,0,20,0,0,0,,2,,0,00FFFF,)(0,497,30,0,1,2,,2,,0,FFFFFF,)(0,0,0,0,0,0,,2,,0,000000,)(0,0,0,0,0,0,,2,,0,000000,)(0,0,0,0,0,0,,2,,0,000000,)(0,0,0,0,0,0,,2,,0,00FFFF,)(0,0,0,0,0,0,,2,,0,00FFFF,)(0,0,0,0,0,0,,2,,0,000000,)(0,0,0,0,0,0,,2,,0,000000,)(0,0,0,0,0,0,,2,,0,000000,)(0,0,0,0,0,0,,2,,0,000000,)(0,0,0,0,0,0,,2,,0,000000,)(0,0,0,0,0,0,TCO GARE PRINCIPALE,1,ARIAL,20,00FFFF,GI)(0,0,0,0,0,0,,2,,0,000000,)(0,0,0,0,0,0,,2,,0,000000,)(0,0,0,0,0,0,,2,,0,000000,)(0,0,0,0,0,0,,2,,0,000000,)(0,0,0,0,0,0,,2,,0,000000,)(0,0,0,0,0,0,,2,,0,000000,)(0,0,0,0,0,0,,2,,0,000000,)(0,0,0,0,0,0,,2,,0,000000,)(0,0,0,0,0,0,,2,,0,000000,)(0,0,0,0,0,0,,2,,0,000000,)(0,0,0,0,0,0,,2,,0,000000,)(0,0,0,0,0,0,,2,,0,000000,)(0,0,0,0,0,0,,2,,0,000000,)(0,0,0,0,0,0,,2,,0,000000,)(0,0,0,0,0,0,,2,,0,000000,)(0,0,0,0,0,0,,2,,0,000000,)(0,0,0,0,0,0,,2,,0,000000,)(0,0,0,0,0,0,,2,,0,000000,)(0,0,0,0,0,0,,2,,0,FFFFFF,)(0,0,0,0,0,0,,0,,0,000000,)
|
||||
(0,0,0,0,0,0,,2,,0,000000,)(0,0,20,0,0,0,,2,,0,00FFFF,)(0,0,20,0,0,0,,2,,0,00FFFF,)(0,0,0,0,0,0,,2,,0,000000,)(0,0,0,0,0,0,,2,,0,000000,)(0,0,0,0,0,0,,2,,0,000000,)(0,0,0,0,0,0,,2,,0,000000,)(0,0,0,0,0,0,,2,,0,000000,)(0,0,0,0,0,0,,2,,0,000000,)(0,0,0,0,0,0,,2,,0,00FFFF,)(0,0,0,0,0,0,,2,,0,00FFFF,)(0,0,0,0,0,0,,2,,0,00FFFF,)(0,0,0,0,0,0,,2,,0,000000,)(0,0,0,0,0,0,,2,,8,00FF00,)(0,0,0,0,0,0,,2,,8,00FF00,)(0,0,0,0,0,0,,2,,0,000000,)(0,0,0,0,0,0,,2,,0,000000,)(0,0,0,0,0,0,,2,,0,000000,)(0,0,0,0,0,0,,2,,0,000000,)(0,0,0,0,0,0,,2,,0,00FFFF,)(0,0,0,0,0,0,,2,,0,00FFFF,)(0,0,0,0,0,0,,2,,0,00FFFF,)(0,0,0,0,0,0,,2,,0,000000,)(0,0,0,0,0,0,,2,,0,000000,)(0,0,0,0,0,0,,2,,0,000000,)(0,0,0,0,0,0,,2,,0,000000,)(0,0,0,0,0,0,,2,,0,000000,)(0,0,0,0,0,0,,2,,0,000000,)(0,0,0,0,0,0,,2,,0,000000,)(0,0,0,0,0,0,,2,,0,000000,)(0,0,0,0,0,0,,2,,0,000000,)(0,0,9,0,0,0,,2,,0,000000,)(0,0,1,0,0,0,,2,,0,00FFFF,)(0,0,1,0,0,0,,0,,0,00FFFF,)(0,0,0,0,0,0,,0,,0,000000,)
|
||||
(0,0,0,0,0,0,,2,,0,000000,)(0,517,20,0,0,0,,2,,0,00FFFF,)(0,531,20,0,0,0,,2,,0,00FFFF,)(0,0,0,0,0,0,,2,,0,000000,)(0,0,0,0,0,0,,2,,0,000000,)(0,0,0,0,0,0,,2,,0,000000,)(0,0,0,0,0,0,,2,,0,000000,)(0,0,0,0,0,0,,2,,0,000000,)(0,0,0,0,0,0,,2,,0,000000,)(0,0,0,0,0,0,,2,,0,000000,)(0,0,0,0,0,0,,2,,0,00FFFF,)(0,0,0,0,0,0,,2,,0,00FFFF,)(0,0,1,0,0,0,,2,,0,00FFFF,)(0,6,2,0,0,0,,2,,0,00FF00,)(0,0,1,0,0,0,,2,,0,00FFFF,)(0,0,1,0,0,0,,2,,0,00FFFF,)(0,0,0,0,0,0,,2,,0,00FFFF,)(0,0,0,0,0,0,,2,,0,00FFFF,)(0,0,0,0,0,0,,2,,0,00FFFF,)(0,0,0,0,0,0,,2,,0,000000,)(0,0,0,0,0,0,,2,,0,000000,)(0,0,0,0,0,0,,2,,0,00FFFF,)(0,0,0,0,0,0,,2,,0,00FFFF,)(0,0,0,0,0,0,,2,,0,000000,)(0,0,0,0,0,0,,2,,0,000000,)(0,0,0,0,0,0,,2,,0,000000,)(0,0,0,0,0,0,,2,,0,000000,)(0,0,0,0,0,0,,2,,0,000000,)(0,0,0,0,0,0,,2,,0,000000,)(0,0,0,0,0,0,,2,,0,000000,)(0,0,10,0,0,0,,2,,0,000000,)(0,0,9,0,0,0,,2,,0,000000,)(0,0,1,0,0,0,,2,,0,00FFFF,)(0,0,1,0,0,0,,0,,0,00FFFF,)(0,0,0,0,0,0,,0,,0,000000,)
|
||||
(0,0,0,0,0,0,,2,,0,000000,)(0,0,20,0,0,0,,2,,0,00FFFF,)(0,0,20,0,0,0,,2,,0,00FFFF,)(0,0,0,0,0,0,,2,,0,000000,)(0,0,0,0,0,0,,2,,0,000000,)(0,0,0,0,0,0,,2,,0,000000,)(0,0,0,0,0,0,,2,,0,000000,)(0,0,0,0,0,0,,2,,0,000000,)(0,0,0,0,0,0,,2,,0,000000,)(0,0,0,0,0,0,,2,,0,000000,)(0,0,0,0,0,0,,2,,0,000000,)(0,0,0,0,0,0,,2,,0,000000,)(0,0,10,0,0,0,,2,,0,000000,)(0,0,0,0,0,0,,2,,0,000000,)(0,232,30,0,3,1,,2,,0,00FF00,)(0,0,0,0,0,0,,2,,0,000000,)(0,0,0,0,0,0,,2,,0,00FFFF,)(0,0,0,0,0,0,,2,,0,00FFFF,)(0,0,0,0,0,0,,2,,0,000000,)(0,0,0,0,0,0,,2,,0,000000,)(0,0,0,0,0,0,,2,,0,000000,)(0,0,0,0,0,0,,2,,0,000000,)(0,0,0,0,0,0,,2,,0,000000,)(0,0,0,0,0,0,,2,,0,00FFFF,)(0,0,0,0,0,0,,2,,0,00FFFF,)(0,0,0,0,0,0,,2,,0,000000,)(0,0,0,0,0,0,,2,,0,FFFFFF,)(0,288,30,0,2,1,,2,,0,FFFFFF,)(0,0,0,0,0,0,,2,,0,000000,)(0,0,10,0,0,0,,2,MS SANS SERIF,10,00FFFF,)(0,0,10,0,0,0,,2,,0,000000,)(0,0,0,0,0,0,,2,,0,000000,)(0,0,0,0,0,0,,2,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)
|
||||
(0,0,0,0,0,0,,2,,0,000000,)(0,0,20,0,0,0,,2,,0,00FFFF,)(0,0,20,0,0,0,,2,,0,00FFFF,)(0,0,0,0,0,0,,2,,0,000000,)(0,0,0,0,0,0,,2,,0,000000,)(0,0,0,0,0,0,,2,,0,000000,)(0,0,0,0,0,0,,2,,0,000000,)(0,0,0,0,0,0,,2,,0,000000,)(0,0,0,0,0,0,,2,,0,000000,)(0,0,0,0,0,0,,2,,0,000000,)(0,0,0,0,0,0,,2,,0,000000,)(0,4,15,0,0,0,,2,,0,00FF00,)(0,0,1,0,0,0,,2,,0,00FFFF,)(0,0,1,0,0,0,,2,,0,00FFFF,)(0,0,1,0,0,0,,2,,0,00FFFF,)(0,0,1,0,0,0,,2,,0,00FFFF,)(0,0,1,0,0,0,,2,,0,00FFFF,)(0,0,1,0,0,0,,2,,0,00FFFF,)(0,0,1,0,0,0,,2,,0,00FFFF,)(0,0,1,0,0,0,,2,,0,00FFFF,)(0,0,1,0,0,0,,2,,0,00FFFF,)(0,0,1,0,0,0,,2,,0,00FFFF,)(0,514,1,0,0,0,,2,,0,00FFFF,)(0,0,1,0,0,0,,2,,0,00FFFF,)(0,0,1,0,0,0,,2,,0,00FFFF,)(0,0,1,0,0,0,,2,,0,00FFFF,)(0,0,1,0,0,0,,2,,0,00FFFF,)(0,522,1,0,0,0,,2,,0,00FFFF,)(0,0,7,0,0,0,,2,,0,000000,)(0,0,10,0,0,0,,2,,0,000000,)(0,0,0,0,0,0,,2,,0,000000,)(0,0,0,0,0,0,,2,,0,000000,)(0,0,0,0,0,0,,2,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)
|
||||
(0,0,0,0,0,0,,2,,0,000000,)(0,0,20,0,0,0,,2,,0,00FFFF,)(0,0,20,0,0,0,,2,,0,00FFFF,)(0,0,0,0,0,0,,2,,0,000000,)(0,0,0,0,0,0,,2,,0,000000,)(0,0,0,0,0,0,,2,,0,000000,)(0,0,0,0,0,0,,2,,0,000000,)(0,0,0,0,0,0,,2,,0,000000,)(0,0,0,0,0,0,,2,,0,000000,)(0,0,0,0,0,0,,2,,0,000000,)(0,3,15,0,0,0,,2,,0,00FF00,)(0,5,2,0,0,0,,2,,0,00FF00,)(0,0,1,0,0,0,,2,,0,00FFFF,)(0,0,1,0,0,0,,2,,0,00FFFF,)(0,515,1,0,0,0,,2,,0,00FFFF,)(0,515,1,0,0,0,,0,,0,00FFFF,)(0,0,1,0,0,0,,2,,0,00FFFF,)(0,0,1,0,0,0,,2,,0,00FFFF,)(0,0,1,0,0,0,,2,,0,00FFFF,)(0,0,1,0,0,0,,2,,0,00FFFF,)(0,0,1,0,0,0,,2,,0,00FFFF,)(0,0,1,0,0,0,,2,,0,00FFFF,)(0,0,1,0,0,0,,2,,0,00FFFF,)(0,0,1,0,0,0,,2,,0,00FFFF,)(0,0,1,0,0,0,,2,,0,00FFFF,)(0,0,1,0,0,0,,2,,0,00FFFF,)(0,0,1,0,0,0,,2,,0,00FFFF,)(0,0,1,0,0,0,,2,,0,00FFFF,)(0,0,7,0,0,0,,2,,0,000000,)(0,0,0,0,0,0,,2,,0,000000,)(0,0,0,0,0,0,,2,,0,000000,)(0,0,0,0,0,0,,2,,0,000000,)(0,0,0,0,0,0,,2,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)
|
||||
(0,0,0,0,0,0,,2,,0,000000,)(0,0,19,0,0,0,,2,,0,00FFFF,)(0,0,19,0,0,0,,2,,0,00FFFF,)(0,0,0,0,0,0,,2,,0,000000,)(0,0,0,0,0,0,,2,,0,000000,)(0,0,0,0,0,0,,2,,0,000000,)(0,260,30,0,2,1,,2,,0,00FF00,)(0,0,0,0,0,0,,2,,0,000000,)(0,0,0,0,0,0,,2,,0,000000,)(0,0,10,0,0,0,,2,,0,000000,)(0,0,10,0,0,0,,2,,0,000000,)(0,0,0,0,0,0,,2,,0,000000,)(0,316,30,0,3,1,,2,,0,00FF00,)(0,0,0,0,0,0,,2,,0,000000,)(0,0,0,0,0,0,,2,,0,000000,)(0,0,23,0,0,0,,2,,0,000000,)(0,0,23,0,0,0,,2,,0,000000,)(0,0,23,0,0,0,QUAI 1,1,ARIAL,12,FFFFFF,G)(0,0,23,0,0,0,,2,,0,000000,)(0,0,23,0,0,0,,2,,0,000000,)(0,0,23,0,0,0,,2,,0,000000,)(0,0,23,0,0,0,,2,,0,000000,)(0,0,23,0,0,0,,2,,0,000000,)(0,0,23,0,0,0,,2,,0,000000,)(0,0,23,0,0,0,,2,,0,000000,)(0,0,0,0,0,0,,2,,0,000000,)(0,0,0,0,0,0,,2,,0,000000,)(0,0,0,0,0,0,,2,,0,000000,)(0,190,30,0,2,1,,2,,0,00FF00,)(0,0,0,0,0,0,,2,,0,000000,)(0,0,0,0,0,0,,2,,0,000000,)(0,0,0,0,0,0,,2,,0,000000,)(0,0,0,0,0,0,,2,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)
|
||||
(0,0,0,0,0,0,,2,,0,000000,)(0,0,0,0,0,0,,2,,0,000000,)(0,0,11,0,0,0,,2,,0,00FFFF,)(0,0,6,0,0,0,,2,,0,000000,)(0,518,1,0,0,0,,0,,0,00FFFF,)(0,518,1,0,0,0,,2,,0,00FFFF,)(0,0,1,0,0,0,,2,,0,00FFFF,)(0,0,1,0,0,0,,2,,0,00FFFF,)(0,1,3,0,0,0,,2,,0,00FF00,)(0,0,21,0,0,0,,2,,0,00FF00,)(0,0,1,0,0,0,,2,,0,00FFFF,)(0,0,1,0,0,0,,2,,0,00FFFF,)(0,0,1,0,0,0,,2,,0,00FFFF,)(0,0,1,0,0,0,,2,,0,00FFFF,)(0,0,1,0,0,0,,2,,0,00FFFF,)(0,0,1,0,0,0,VOIE 2,2,ARIAL,10,00FFFF,)(0,0,1,0,0,0,,2,,0,00FFFF,)(0,0,1,0,0,0,,2,,0,00FFFF,)(0,0,1,0,0,0,,2,,0,00FFFF,)(0,0,1,0,0,0,,2,,0,00FFFF,)(0,0,1,0,0,0,,2,,0,00FFFF,)(0,0,1,0,0,0,,2,,0,00FFFF,)(0,0,1,0,0,0,,2,,0,00FFFF,)(0,0,1,0,0,0,,2,,0,00FFFF,)(0,0,1,0,0,0,,2,,0,00FFFF,)(0,523,1,0,0,0,,0,,0,00FFFF,)(0,523,1,0,0,0,,0,,0,00FFFF,)(0,523,1,0,0,0,,2,,0,00FFFF,)(0,0,1,0,0,0,,2,,0,00FFFF,)(0,0,1,0,0,0,,2,,0,00FFFF,)(0,0,1,0,0,0,,2,,0,00FFFF,)(0,0,1,0,0,0,,2,,0,00FFFF,)(0,0,1,0,0,0,,2,,0,00FFFF,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)
|
||||
(0,530,1,0,0,0,,2,,0,00FFFF,)(0,0,1,0,0,0,,2,,0,00FFFF,)(0,0,8,0,0,0,,2,,0,00FFFF,)(0,0,6,0,0,0,,2,,0,000000,)(0,0,1,0,0,0,,2,,0,00FFFF,)(0,0,1,0,0,0,,2,,0,00FFFF,)(0,0,1,0,0,0,,2,,0,00FFFF,)(0,12,4,1,0,0,,2,,0,00FF00,)(0,2,3,0,0,0,,2,,0,00FF00,)(0,0,1,0,0,0,,2,,0,00FFFF,)(0,0,1,0,0,0,,2,,0,00FFFF,)(0,519,1,0,0,0,,2,,0,00FFFF,)(0,519,1,0,0,0,,0,,0,00FFFF,)(0,0,1,0,0,0,,2,,0,00FFFF,)(0,0,1,0,0,0,,2,,0,00FFFF,)(0,0,1,0,0,0,VOIE 1,2,ARIAL,10,00FFFF,)(0,0,1,0,0,0,,2,,0,00FFFF,)(0,0,1,0,0,0,,2,,0,00FFFF,)(0,0,1,0,0,0,,2,,0,00FFFF,)(0,0,1,0,0,0,,2,,0,00FFFF,)(0,0,1,0,0,0,,2,,0,00FFFF,)(0,0,1,0,0,0,,2,,8,00FFFF,)(0,0,1,0,0,0,,2,,0,00FFFF,)(0,0,1,0,0,0,,2,,0,00FFFF,)(0,0,1,0,0,0,,2,,0,00FFFF,)(0,0,1,0,0,0,,2,,0,00FFFF,)(0,0,1,0,0,0,,2,,0,00FFFF,)(0,0,1,0,0,0,,2,,0,00FFFF,)(0,0,1,0,0,0,,2,,0,00FFFF,)(0,7,2,0,0,0,,2,,0,00FF00,)(0,0,1,0,0,0,,2,,0,00FFFF,)(0,527,1,0,0,0,,2,,8,00FFFF,)(0,0,1,0,0,0,,3,,8,00FFFF,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)
|
||||
(0,529,1,0,0,0,,2,,0,00FFFF,)(0,0,1,0,0,0,,0,,0,00FFFF,)(0,0,1,0,0,0,,2,,0,00FFFF,)(0,26,22,0,0,0,,0,,0,00FFFF,)(0,0,1,0,0,0,,2,,0,00FFFF,)(0,0,1,0,0,0,,0,,0,00FFFF,)(0,0,1,0,0,0,,0,,0,00FFFF,)(0,0,8,0,0,0,,0,,0,000000,)(0,0,11,0,0,0,,0,,0,000000,)(0,330,30,0,3,1,,0,,0,00FF00,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,23,0,0,0,,0,,0,000000,)(0,0,23,0,0,0,,0,,0,000000,)(0,0,23,0,0,0,QUAI 2,0,ARIAL,12,FFFFFF,G)(0,0,23,0,0,0,,0,,0,000000,)(0,0,23,0,0,0,,0,,0,000000,)(0,0,23,0,0,0,,0,,0,000000,)(0,0,23,0,0,0,,0,,0,000000,)(0,0,23,0,0,0,,0,,0,000000,)(0,0,23,0,0,0,,0,,0,000000,)(0,0,23,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,10,0,0,0,,0,,0,000000,)(0,204,30,0,3,1,,0,,0,00FF00,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,8,00FF00,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)
|
||||
(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,6,0,0,0,,0,,0,00FFFF,)(0,0,1,0,0,0,,0,,0,00FFFF,)(0,0,1,0,0,0,,0,,0,00FFFF,)(0,0,1,0,0,0,,0,,0,00FFFF,)(0,21,5,0,0,0,,0,,0,00FF00,)(0,20,5,0,0,0,,0,,0,00FF00,)(0,520,1,0,0,0,,2,,8,00FFFF,)(0,520,1,0,0,0,,0,,0,00FFFF,)(0,520,1,0,0,0,,0,,0,00FFFF,)(0,0,1,0,0,0,,0,,8,00FFFF,)(0,0,1,0,0,0,,0,,0,00FFFF,)(0,0,1,0,0,0,,0,,0,00FFFF,)(0,0,1,0,0,0,,0,,8,00FFFF,)(0,0,1,0,0,0,,0,,0,00FFFF,)(0,0,1,0,0,0,,0,,0,00FFFF,)(0,0,1,0,0,0,,0,,8,00FFFF,)(0,0,1,0,0,0,,2,,0,00FFFF,)(0,0,1,0,0,0,,0,,0,00FFFF,)(0,0,1,0,0,0,,0,,8,00FFFF,)(0,0,1,0,0,0,,0,,0,00FFFF,)(0,0,1,0,0,0,,0,,8,00FFFF,)(0,0,1,0,0,0,,0,,0,00FFFF,)(0,0,1,0,0,0,,0,,0,00FFFF,)(0,0,7,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,8,00FF00,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)
|
||||
(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,176,30,0,3,1,,0,,0,00FF00,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,3,,8,00FF00,)(0,0,0,0,0,0,,0,,8,00FF00,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,8,00FF00,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,8,00FF00,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,8,00FF00,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,2,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)
|
||||
(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,2,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)(0,0,0,0,0,0,,0,,0,000000,)
|
||||
Binary file not shown.
+1
-1
@@ -23,7 +23,7 @@ var
|
||||
Lance_verif : integer;
|
||||
verifVersion,notificationVersion : boolean;
|
||||
|
||||
Const Version='3.85'; // sert à la comparaison de la version publiée
|
||||
Const Version='4.0'; // sert à la comparaison de la version publiée
|
||||
SousVersion=' '; // en cas d'absence de sous version mettre un espace
|
||||
|
||||
implementation
|
||||
|
||||
@@ -98,6 +98,13 @@ version 3.84 : Possibilit
|
||||
version 3.85 : Affichage des cantons occupés avec des couleurs différentes par train ou non dans le TCO.
|
||||
Grille optionnelle sauvegardée dans la configuration du TCO.
|
||||
Possibilité de déclarer des signaux implantés à droite ou à gauche des voies dans le TCO.
|
||||
version 4.0 Changement de l'algorithme d'affichage du TCO.
|
||||
Calcul de la route correcte d'un train si changement de la position de
|
||||
l'aiguillage derrière le train.
|
||||
Renforcement de la vérification de la configuration.
|
||||
Possibilité de multisélectionner les feux ou les aiguillages pour leur suppression dans
|
||||
le panneau de configuration.
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
Reference in new issue
Block a user