diff --git a/ConfigGenerale.cfg b/ConfigGenerale.cfg index 9cef4a2..8018f05 100644 --- a/ConfigGenerale.cfg +++ b/ConfigGenerale.cfg @@ -9,7 +9,7 @@ Fonte=10 Protocole=1 Verif_AdrXpressNet=1 IpV4_PC=127.0.0.1:9999 -ServicesCDM=15 +ServicesCDM=7 Ipv4_interface=192.168.1.23:5550 MaxCom=30 Protocole_serie=COMX:115200,N,8,1,0 @@ -23,9 +23,9 @@ Init_demUSBCOM=0 Init_demETH=0 Fenetre=0 nb_det_dist=3 -verif_version=0 +verif_version=1 notif_version=0 -TCO=0 +TCO=1 MasqueBandeauTCO=0 CDM=0 Lay=RESEAU_GILY_SIGNAL_AJOUTE.LAY diff --git a/Notice d'utilisation des signaux_complexes_GL_V6.0.pdf b/Notice d'utilisation des signaux_complexes_GL_V6.0.pdf deleted file mode 100644 index 141c6cf..0000000 Binary files a/Notice d'utilisation des signaux_complexes_GL_V6.0.pdf and /dev/null differ diff --git a/Notice d'utilisation des signaux_complexes_GL_V6.1.pdf b/Notice d'utilisation des signaux_complexes_GL_V6.2.pdf similarity index 79% rename from Notice d'utilisation des signaux_complexes_GL_V6.1.pdf rename to Notice d'utilisation des signaux_complexes_GL_V6.2.pdf index 23ae486..cd9cbe2 100644 Binary files a/Notice d'utilisation des signaux_complexes_GL_V6.1.pdf and b/Notice d'utilisation des signaux_complexes_GL_V6.2.pdf differ diff --git a/UnitAnalyseSegCDM.pas b/UnitAnalyseSegCDM.pas index 147d550..39cd8b2 100644 --- a/UnitAnalyseSegCDM.pas +++ b/UnitAnalyseSegCDM.pas @@ -22,6 +22,7 @@ const Zmini=50; Zmaxi=100; fond_cdm=$303000; + precision_clic=4; // précision du clic sur un élément type TFormAnalyseCDM = class(TForm) @@ -836,7 +837,7 @@ begin r:=((y1-y)*(y1-y2)-(x1-x)*(x2-x1))/(l*l); s:=((y1-y)*(x2-x1)-(x1-x)*(y2-y1))/(l*l); if (r>0) and (r<1) then - if Abs(s*l)<=7 then Result:=True; //s*l=distance + if Abs(s*l)<=precision_clic then Result:=True; //s*l=distance end; end; @@ -869,7 +870,7 @@ begin if inverse then yArc:=CentreY+round(rayon*sinA) else yArc:=CentreY-round(rayon*sinA); - trouve:=(abs(x-xArc)<10) and (abs(y-yArc)<10); + trouve:=(abs(x-xArc)0 then s:=s+' Adr='+intToSTR(tco[XClicCell,YClicCell].adresse); + //hint:=s; + + if not(formConfCellTCOAff) then exit; actualize:=true; // évite les évènements parasites FormConfCellTCO.caption:='Propriétés de la cellule '+IntToSTR(XClicCell)+','+intToSTR(YClicCell); diff --git a/UnitDebug.pas b/UnitDebug.pas index d206ce7..d3f9217 100644 --- a/UnitDebug.pas +++ b/UnitDebug.pas @@ -175,6 +175,7 @@ procedure TFormDebug.FormCreate(Sender: TObject); var s: string; begin if affevt then affiche('FormDebug create',clLime); + if debug=1 then Affiche('Création fenêtre debug',clLime); EditNivDebug.Text:='0'; RichDebug.WordWrap:=false; // interdit la coupure des chaînes en limite du composant RichDebug.color:=$33; @@ -185,6 +186,7 @@ begin DebugAffiche:=true; compt_erreur:=0; LigneErreur:=0; + if debug=1 then Affiche('Fin création fenêtre debug',clLime); end; procedure TFormDebug.ButtonEcrLogClick(Sender: TObject); diff --git a/UnitPrinc.pas b/UnitPrinc.pas index 668deb6..cf84a5d 100644 --- a/UnitPrinc.pas +++ b/UnitPrinc.pas @@ -4135,7 +4135,7 @@ begin Adr:=aiguillage[index].Adevie; if adr<>0 then begin - if (A='Z') or (a=#0) then TypeEl:=det else TypeEL:=aig; //TypeEL=(1=détécteur 2=aig + if (A='Z') or (a=#0) then TypeEl:=det else TypeEL:=aig; //TypeEL=(1=détécteur 2=aig) trouve_element(adr,TypeEl,1); // branche_trouve IndexBranche_trouve typeGen:=BrancheN[branche_trouve,IndexBranche_trouve].Btype; end @@ -4710,17 +4710,19 @@ begin Adr2:=aiguillage[index].AdrTriple; if (aiguillage[index].Apointe=prec) then begin - // aiguillage triple pris en pointe + //aiguillage triple pris en pointe //Affiche('position='+intToSTR(aiguillage[index_aig(Adr].position),clyellow); if (aiguillage[index].position=const_droit) and (aiguillage[index_aig(Adr2)].position=const_droit) then begin - if NivDebug=3 then AfficheDebug('Aiguillage triple pris en pointe droit',clYellow); + if NivDebug=3 then AfficheDebug('Aiguillage triple '+inttoSTR(aiguillage[index].adresse)+' pris en pointe droit',clYellow); A:=aiguillage[index].AdroitB; Adr:=aiguillage[index].Adroit; if (A='Z') or (a=#0) then TypeEl:=det else TypeEL:=aig; //TypeEL=(1=détécteur 2=aig + if adr=0 then TypeEl:=buttoir; trouve_element(Adr,TypeEl,1); // branche_trouve IndexBranche_trouve - typeGen:=BrancheN[branche_trouve,IndexBranche_trouve].BType; - suivant_alg3:=adr;exit; + typeGen:=BrancheN[branche_trouve,IndexBranche_trouve].BType; //?? + suivant_alg3:=adr; + exit; end; if (aiguillage[index].position<>const_droit) and (aiguillage[index_aig(Adr2)].position=const_droit) then begin @@ -4728,6 +4730,7 @@ begin A:=aiguillage[index].AdevieB; Adr:=aiguillage[index].Adevie; if (A='Z') or (a=#0) then TypeEl:=det else TypeEL:=aig; + if adr=0 then TypeEl:=buttoir; trouve_element(Adr,TypeEl,1); // branche_trouve IndexBranche_trouve typeGen:=BrancheN[branche_trouve,IndexBranche_trouve].BType; suivant_alg3:=adr;exit; @@ -4798,7 +4801,7 @@ begin end; A:=aiguillage[index].ApointeB; Adr:=aiguillage[index].Apointe; - if (A='Z') or (a=#0) then TypeEl:=det else TypeEL:=aig; + if (A='Z') or (a=#0) then TypeEl:=det else TypeEL:=aig; trouve_element(Adr,TypeEl,1); // branche_trouve IndexBranche_trouve typeGen:=BrancheN[branche_trouve,IndexBranche_trouve].BType; suivant_alg3:=Adr; @@ -4846,7 +4849,7 @@ begin inc(trouve); if trouve=1 then index1:=i; if trouve=2 then index2:=i; - if trouve=1 then // on ne mémorise la voie qu'a la premiere recherche + if trouve=1 then // on ne mémorise la voie qu'à la premiere recherche begin if trouve1 then voie:=1; if trouve2 then voie:=2; @@ -5645,7 +5648,7 @@ begin i:=Index_feu(adresse); if i=0 then begin - s:='Erreur 603 - signal '+IntToSTR(adresse)+' non trouvé'; + s:='Erreur 603 - Signal '+IntToSTR(adresse)+' non trouvé'; Affiche(s,clred); if NivDebug=3 then AfficheDebug(s,clred); carre_signal:=true; @@ -5819,7 +5822,6 @@ function signal_suivant_det(det1,det2 : integer) : integer; var num_feu,AdrFeu,i,j,prec,AdrSuiv,index2,voie : integer; Typ,TypePrec,TypeActuel : TEquipement; s : string; - begin //traceDet:=true; if NivDebug>=2 then AfficheDebug('Cherche Signal suivant détecteur '+IntToSTR(det1),clyellow); @@ -10412,7 +10414,7 @@ end; procedure init_dccpp; var i,j1,j2,p,n,erreur : integer; - s : string; + s,se : string; begin if EnvAigDccpp=1 then envoi_aiguillages_DCCpp; // envoi la liste des aiguillages à l'interface DCC++ @@ -10421,7 +10423,8 @@ begin s:=CdeDccpp[i]; if s<>'' then begin - Affiche(s,clLime); + se:=s+' : '+decodeDCC(s); + Affiche(se,clLime); affiche_retour_dcc:=true; tps_affiche_retour_dcc:=2; p:=pos(''); } procetape('Terminé !!'); + if debug=1 then Affiche('Positionnement des signaux',clLime); Maj_feux(false); // vérifier si le fichier de segments existe @@ -11420,6 +11427,7 @@ begin formprinc.ButtonAffAnalyseCDM.Visible:=fichier_module_cdm; if fichier_module_CDM then begin + if debug=1 then Affiche('Module réseau CDM',clLime); Affiche_fenetre_CDM.Enabled:=true; lit_fichier_segments_cdm; end @@ -11435,6 +11443,7 @@ begin ReadOnly:=true; end; } //Affiche(GetMACAddress,clred); + if debug=1 then Affiche('Fini',clLime); end; @@ -13735,11 +13744,14 @@ begin end; procedure TFormPrinc.ButtonEnvClick(Sender: TObject); +var se,s : string; begin affiche_retour_dcc:=true; tps_affiche_retour_dcc:=2; - Affiche(editEnvoi.text,ClWhite); - envoi(editEnvoi.Text); + s:=editEnvoi.Text; + se:=s+' : '+decodeDCC(s); + Affiche(se,ClWhite); + envoi(s); end; procedure TFormPrinc.Placerlestrains1Click(Sender: TObject); @@ -13950,8 +13962,6 @@ begin Affiche('Dans Signaux complexes, clic droit et "coller, compiler et importer le réseau CDM rail" ',clLime); Affiche('Dans la fenêtre graphique d''importation cliquer sur "compiler"',clLime); - - if lance_cdm(false) then begin sleep(400); @@ -13966,12 +13976,12 @@ begin KeybdInput(vk_decimal,KEYEVENTF_KEYUP); KeybdInput(VK_MENU,KEYEVENTF_KEYUP); // relache ALT - KeybdInput(VK_DOWN,0); - KeybdInput(VK_DOWN,KEYEVENTF_KEYUP); + KeybdInput(VK_DOWN,0); + KeybdInput(VK_DOWN,KEYEVENTF_KEYUP); KeybdInput(VK_RETURN,0); - KeybdInput(VK_RETURN,KEYEVENTF_KEYUP); + KeybdInput(VK_RETURN,KEYEVENTF_KEYUP); KeybdInput(VK_RETURN,0); // valide le menu "track drawing" - KeybdInput(VK_RETURN,KEYEVENTF_KEYUP); + KeybdInput(VK_RETURN,KEYEVENTF_KEYUP); // envoie les touches i:=SendInput(Length(KeyInputs),KeyInputs[0],SizeOf(KeyInputs[0]));SetLength(KeyInputs,0); // la fenetre serveur démarré est affichée @@ -13980,14 +13990,12 @@ begin // clic droit valider le menu KeybdInput(VK_RBUTTON,0); // VK_APPS = menu droit - KeybdInput(VK_RBUTTON,KEYEVENTF_KEYUP); + KeybdInput(VK_RBUTTON,KEYEVENTF_KEYUP); i:=SendInput(Length(KeyInputs),KeyInputs[0],SizeOf(KeyInputs[0]));SetLength(KeyInputs,0); - Application.ProcessMessages; + Application.ProcessMessages; end; exit; - end; - end; procedure TFormPrinc.Coller1Click(Sender: TObject); diff --git a/UnitTCO.dfm b/UnitTCO.dfm index 2a53384..68e9c90 100644 --- a/UnitTCO.dfm +++ b/UnitTCO.dfm @@ -1,7 +1,7 @@ object FormTCO: TFormTCO - Left = 163 - Top = 46 - Width = 1142 + Left = 147 + Top = 77 + Width = 1141 Height = 678 VertScrollBar.Visible = False Caption = 'FormTCO' @@ -22,7 +22,7 @@ object FormTCO: TFormTCO OnKeyPress = FormKeyPress OnMouseWheel = FormMouseWheel DesignSize = ( - 1134 + 1133 647) PixelsPerInch = 96 TextHeight = 13 @@ -67,7 +67,7 @@ object FormTCO: TFormTCO Caption = '0' end object Label19: TLabel - Left = 1078 + Left = 1077 Top = 391 Width = 32 Height = 13 @@ -95,7 +95,7 @@ object FormTCO: TFormTCO object ScrollBox: TScrollBox Left = 8 Top = 18 - Width = 828 + Width = 827 Height = 351 HorzScrollBar.Smooth = True HorzScrollBar.Tracking = True @@ -105,14 +105,14 @@ object FormTCO: TFormTCO BevelEdges = [beLeft, beTop, beRight] Color = clBlack ParentColor = False - TabOrder = 0 + TabOrder = 1 DesignSize = ( - 824 + 823 347) object ImageTCO: TImage Left = 0 Top = 0 - Width = 716 + Width = 715 Height = 305 Anchors = [akLeft, akTop, akRight, akBottom] AutoSize = True @@ -128,7 +128,7 @@ object FormTCO: TFormTCO end end object TrackBarZoom: TTrackBar - Left = 1078 + Left = 1077 Top = 18 Width = 41 Height = 350 @@ -139,15 +139,16 @@ object FormTCO: TFormTCO Orientation = trVertical ParentCtl3D = False Position = 20 - TabOrder = 1 + TabOrder = 0 + TabStop = False TickMarks = tmTopLeft OnChange = TrackBarZoomChange end object Panel1: TPanel Left = 0 - Top = 472 - Width = 1124 - Height = 165 + Top = 464 + Width = 1123 + Height = 173 Anchors = [akLeft, akRight, akBottom] Color = clActiveBorder Font.Charset = ANSI_CHARSET @@ -159,8 +160,8 @@ object FormTCO: TFormTCO TabOrder = 2 OnDragOver = Panel1DragOver DesignSize = ( - 1124 - 165) + 1123 + 173) object Label6: TLabel Left = 216 Top = 22 @@ -741,29 +742,31 @@ object FormTCO: TFormTCO OnMouseDown = ImagePalette8MouseDown end object ButtonSauveTCO: TButton - Left = 1016 + Left = 1015 Top = 48 Width = 92 Height = 33 Anchors = [akTop, akRight] Caption = 'Sauvegarder TCO' TabOrder = 0 + TabStop = False WordWrap = True OnClick = ButtonSauveTCOClick end object ButtonRedessine: TButton - Left = 1016 + Left = 1015 Top = 8 Width = 92 Height = 33 Anchors = [akTop, akRight] Caption = 'Redessine' TabOrder = 1 + TabStop = False OnClick = ButtonRedessineClick end object Button1: TButton - Left = 760 - Top = 112 + Left = 496 + Top = 136 Width = 89 Height = 25 Caption = 'Simu det 1' @@ -771,8 +774,8 @@ object FormTCO: TFormTCO OnClick = Button1Click end object Button2: TButton - Left = 656 - Top = 112 + Left = 496 + Top = 104 Width = 89 Height = 25 Caption = 'Simu Det 0' @@ -780,18 +783,19 @@ object FormTCO: TFormTCO OnClick = Button2Click end object ButtonConfigTCO: TButton - Left = 1016 + Left = 1015 Top = 88 Width = 92 Height = 33 Anchors = [akTop, akRight] Caption = 'Configuration TCO' TabOrder = 4 + TabStop = False OnClick = ButtonConfigTCOClick end object ButtonSimu: TButton - Left = 760 - Top = 136 + Left = 592 + Top = 128 Width = 113 Height = 25 Caption = 'Simu canton occup'#233 @@ -799,13 +803,14 @@ object FormTCO: TFormTCO OnClick = ButtonSimuClick end object ButtonMasquer: TButton - Left = 1016 + Left = 1015 Top = 128 Width = 92 Height = 33 Anchors = [akTop, akRight] Caption = 'Masquer bandeau' TabOrder = 6 + TabStop = False WordWrap = True OnClick = ButtonMasquerClick end @@ -933,6 +938,7 @@ object FormTCO: TFormTCO Style = csDropDownList ItemHeight = 13 TabOrder = 4 + TabStop = False OnChange = ComboReprChange Items.Strings = ( 'Sans' @@ -969,28 +975,44 @@ object FormTCO: TFormTCO end end object buttonRaz: TButton - Left = 912 + Left = 911 Top = 128 Width = 92 Height = 33 Anchors = [akTop, akRight] Caption = 'Raz des occupations' TabOrder = 8 + TabStop = False WordWrap = True OnClick = buttonRazClick end object ButtonCalibrage: TButton - Left = 560 - Top = 112 + Left = 592 + Top = 104 Width = 75 Height = 25 Caption = 'Calibrage' TabOrder = 9 OnClick = ButtonCalibrageClick end + object ButtonDessiner: TButton + Left = 816 + Top = 128 + Width = 89 + Height = 33 + Hint = + 'Dessine le TCO '#224' la souris. Clic droit pour lever le pointeur. T' + + 'ouche Echap pour quitter le mode trac'#233'.' + Anchors = [akTop, akRight] + Caption = 'Dessiner le TCO' + ParentShowHint = False + ShowHint = True + TabOrder = 10 + OnClick = ButtonDessinerClick + end end object ButtonAfficheBandeau: TButton - Left = 1070 + Left = 1069 Top = 415 Width = 57 Height = 33 @@ -1113,6 +1135,6 @@ object FormTCO: TFormTCO object ColorDialog1: TColorDialog OnShow = ColorDialog1Show Left = 448 - Top = 456 + Top = 432 end end diff --git a/UnitTCO.pas b/UnitTCO.pas index ca02521..02b3fef 100644 --- a/UnitTCO.pas +++ b/UnitTCO.pas @@ -5,9 +5,12 @@ interface uses Windows, Messages, SysUtils, Variants, Classes, Graphics, Controls, Forms, Dialogs, Grids , UnitPrinc, StdCtrls, ExtCtrls, Menus, UnitPilote, UnitDebug, - ComCtrls ,StrUtils, math ; + ComCtrls ,StrUtils, math, unitconfig, + Buttons ; type + + TFormTCO = class(TForm) LabelCoord: TLabel; Label2: TLabel; @@ -124,6 +127,7 @@ type ImageTemp: TImage; ImageTemp2: TImage; outslectionner1: TMenuItem; + ButtonDessiner: TButton; procedure FormCreate(Sender: TObject); procedure FormActivate(Sender: TObject); procedure ImageTCOContextPopup(Sender: TObject; MousePos: TPoint; @@ -330,14 +334,16 @@ type State: TDragState; var Accept: Boolean); procedure EditTypeImageChange(Sender: TObject); procedure outslectionner1Click(Sender: TObject); + procedure ButtonDessinerClick(Sender: TObject); - - private + private { Déclarations privées } public { Déclarations publiques } end; + + const ZoomMax=50;ZoomMin=15; MaxCellX=150;MaxCellY=70; @@ -355,8 +361,8 @@ const AvecGrille_ch='AvecGrille'; ModeCouleurCanton_ch='ModeCouleurCanton'; // liaisons des voies pour chaque icone par bit (0=NO 1=Nors 2=NE 3=Est 4=SE 5=S 6=SO 7=Ouest) - Liaisons : array[0..29] of integer= - (0,$88,$c8,$8c,$98,$89,$9,$84,$90,$48,$44,$11,$19,$c4,$91,$4c,$21,$24,$42,$12,$22,$cc,$99,$00,$23,$33,0,0,0,0) ; + Liaisons : array[0..31] of integer= + (0,$88,$c8,$8c,$98,$89,$9,$84,$90,$48,$44,$11,$19,$c4,$91,$4c,$21,$24,$42,$12,$22,$cc,$99,$00,$23,$33,0,0,0,0,0,0) ; type // structure du TCO TTCO = record @@ -376,6 +382,7 @@ type PiedFeu : integer; // type de pied au signal : signal à gauche=1 ou à droite=2 de la voie x,y : integer; // coordonnées pixels relativés du coin sup gauche du signal pour le décalage par rapport au 0,0 cellule FeuOriente : integer; // orientation du signal : 1 vertical en bas / 2 horizontal gauche / 3 horizontal droit + liaisons : integer; // quadrants des liaisons end; var @@ -385,13 +392,14 @@ var Forminit,sourisclic,SelectionAffichee,TamponAffecte,entoure,TCO_modifie, clicTCO,piloteAig,BandeauMasque,eval_format,sauve_tco,formConfCellTCOAff, - drag,TCOActive,TCOCree : boolean; + drag,TCOActive,TCOCree,modeTrace,ancienok : boolean; HtImageTCO,LargImageTCO,XclicCell,YclicCell,XminiSel,YminiSel,XCoupe,Ycoupe,Temposouris, XmaxiSel,YmaxiSel,AncienXMiniSel,AncienXMaxiSel ,AncienYMiniSel,AncienYMaxiSel, Xclic,Yclic,XClicCellInserer,YClicCellInserer,Xentoure,Yentoure,RatioC,ModeCouleurCanton, AncienXClicCell,AncienYClicCell,LargeurCell,HauteurCell,NbreCellX,NbreCellY,NbCellulesTCO, - Epaisseur,oldX,oldY,offsetSourisY,offsetSourisX,AvecVerifIconesTCO : integer; + Epaisseur,oldX,oldY,offsetSourisY,offsetSourisX,AvecVerifIconesTCO,indexTrace, + largeurCelld2,HauteurCelld2,ancienTraceX,ancienTraceY : integer; titre_Fonte : string; @@ -405,6 +413,10 @@ var x,y : integer; end; + // tracé + traceXY : Array[1..50] of record x,y : integer; // en coordonnées grille + end; + rAncien : TRect; PCanvasTCO : Tcanvas; PBitMapTCO,VBm,OldBmp : TBitMap; @@ -438,6 +450,9 @@ uses UnitConfigTCO, Unit_Pilote_aig, UnitConfigCellTCO; {$R *.dfm} + + + procedure lire_fichier_tco; var fichier : textfile; s,sa : string; @@ -466,6 +481,7 @@ begin except Affiche('Nouveau tco',clyellow); NbreCellX:=35;NbreCellY:=20;LargeurCell:=35;HauteurCell:=35; + largeurCelld2:=largeurCell div 2;HauteurCelld2:=HauteurCell div 2; RatioC:=10; ClFond:=$202050; ClVoies:=$0077FF; @@ -723,6 +739,7 @@ begin val(copy(s,1,i-1),valeur,erreur);if erreur<>0 then begin Affiche('ETCO7',clred);closefile(fichier);exit;end; if valeur=23 then begin valeur:=31;sauve_tco:=true;end; // nouvelle version icone 23 passe à 31 tco[x,y].Bimage:=valeur; + tco[x,y].liaisons:=liaisons[valeur]; delete(s,1,i); //4 Inverse @@ -829,6 +846,14 @@ begin end; +procedure echange(var a,b : integer); +var i : integer; +begin + i:=a; + a:=b; + b:=i; +end; + procedure sauve_fichier_tco; var fichier : textfile; s : string; @@ -899,6 +924,7 @@ begin LargeurCell:=ZoomMax-FormTCO.TrackBarZoom.Position+ZoomMin; //Affiche(intToSTR(largeurcell),clyellow); hauteurCell:=(LargeurCell * RatioC) div 10; + largeurCelld2:=largeurCell div 2;HauteurCelld2:=HauteurCell div 2; Epaisseur:=LargeurCell div 7; // épaisseur du trait pour PEN end; @@ -1043,7 +1069,7 @@ var x0,y0,xc,yc,jy1,jy2,xf,yf,position : integer; moveto(xc,yc);LineTo(xf,yc); // 1ere partie en fonction de la position - if position=const_devie then + if position=const_devie then begin pen.color:=clvoies; Brush.Color:=clvoies; @@ -3538,6 +3564,7 @@ var x,y,DimX,DimY : integer; r : Trect; begin if affevt then affiche('Affiche_tco',clLime); + if pImageTCO=nil then exit; DimX:=LargeurCell*NbreCellX; DimY:=HauteurCell*NbreCellY; // DimX DimY maxi 8191 pixels pour les bitmap @@ -3550,6 +3577,7 @@ begin PBitMapTCO.Height:=DimY; PBitMapTCO.Width:=DimX; + //PScrollBoxTCO.HorzScrollBar.Range:=DimX; //PScrollBoxTCO. with formTCO.ScrollBox do @@ -3620,6 +3648,7 @@ end; procedure TFormTCO.FormCreate(Sender: TObject); begin if affevt then Affiche('FormTCO create',clyellow); + if debug=1 then Affiche('Création fenêtre TCO',clLime); offsetSourisY:=-10; offsetSourisX:=-10; caption:='TCO'; @@ -3628,7 +3657,15 @@ begin XclicCell:=1; YclicCell:=1; xCoupe:=0;yCoupe:=0; - KeyPreview:=false; // invalide les évènements clavier + indexTrace:=0; + KeyPreview:=true; // valide les évènements clavier + TrackBarZoom.Tabstop:=false; // permet d'avoir les evts curseurs + Buttonredessine.TabStop:=false; + ButtonSauveTCO.TabStop:=false; + ButtonConfigTCO.TabStop:=false; + Buttonmasquer.TabStop:=false; + ButtonRaz.TabStop:=false; + Clfond:=$202050; couleurAdresse:=Cyan; xMiniSel:=99999;yMiniSel:=99999; @@ -3657,8 +3694,12 @@ begin oldbmp:=Tbitmap.Create; oldbmp.width:=100; oldbmp.Height:=100; + + modeTrace:=false; // pour tracer les voies à la souris //controlStyle:=controlStyle+[csOpaque]; + TCOCree:=true; + if debug=1 then Affiche('Fin création fenêtre TCO',clLime); end; @@ -4216,6 +4257,7 @@ begin HauteurCell:=ImagePalette1.Height; LargeurCell:=ImagePalette1.Width; + largeurCelld2:=largeurCell div 2;HauteurCelld2:=HauteurCell div 2; calcul_reduction(frxGlob,fryGlob,LargeurCell,HauteurCell,ZoomMax,ZoomMax); // dessiner les icônes @@ -4494,21 +4536,82 @@ begin result:=res; end; -procedure TFormTCO.FormKeyDown(Sender: TObject; var Key: Word;Shift: TShiftState); +procedure stop_modetrace; +begin + modetrace:=false; + FormTCO.Caption:='TCO'; + screen.cursor:=crDefault; + modeTrace:=false; + IndexTrace:=0; + traceXY[1].x:=0;traceXY[1].y:=0; + traceXY[2].x:=0;traceXY[2].y:=0; + affiche_tco; + if debugTCO then Affiche('------------',clYellow); + FormTCO.Caption:='TCO'; + screen.cursor:=crDefault; +end; + +procedure TFormTCO.FormKeyDown(Sender: TObject; var Key: Word;Shift: TShiftState); +var s,d : integer; begin - exit; if affevt then Affiche('TCO.FormKeyDown',clOrange); - Entoure_cell(XclicCell,YclicCell); + + //Affiche(intToSTR(key),clyellow); case Key of - VK_right : if XClicCell1 then dec(XClicCell); - VK_down : if YClicCell1 then dec(YClicCell); - VK_delete : affiche('delete',clorange); + VK_right : if XClicCellFormTCO.ScrollBox.Width then scrollBox.HorzScrollBar.Position:=s+largeurCell; + end + else exit; + VK_left : if XClicCell>1 then + begin + dec(XClicCell); + d:=(xClicCell-1)*largeurCell; + s:=scrollBox.HorzScrollBar.Position; + if d<=s then + begin + s:=s-largeurCell; + if sFormTCO.ScrollBox.Height then scrollBox.VertScrollBar.Position:=s+HauteurCell; + end + else exit; + VK_up : if YClicCell>1 then + begin + dec(YClicCell); + d:=(yClicCell-1)*HauteurCell; + s:=scrollBox.VertScrollBar.Position; + if dtraceXY[2].x then echange(traceXY[1].x,traceXY[2].x); + // tracé horizontal (vers la droite) + for xt:=traceXY[1].x to traceXY[2].x do + begin + Bimage:=replace(xt,yt,1,3,xt=traceXY[1].x,xt=traceXY[2].x); + tco[xt,yt].BImage:=Bimage; + tco[xt,yt].liaisons:=liaisons[Bimage]; + end; + affiche_tco; + end + + else + begin + if traceXY[1].x=traceXY[2].x then + begin + xt:=traceXY[1].x; + if traceXY[1].y>traceXY[2].y then echange(traceXY[1].y,traceXY[2].y); + // tracé vertical (le bas) (quadrant 5) + for yt:=traceXY[1].y to traceXY[2].y do + begin + Bimage:=replace(xt,yt,20,5,yt=traceXY[1].y,yt=traceXY[2].y); + tco[xt,yt].BImage:=Bimage; + tco[xt,yt].liaisons:=liaisons[Bimage]; + end; + affiche_tco; + end + + // indice 1 doit toujours < que indice 2 + // tracé diagonal vers en bas à droite (quadrant 4) + else + begin + if (traceXY[1].x>traceXY[2].x) then + begin + echange(traceXY[1].x,traceXY[2].x); + echange(traceXY[1].y,traceXY[2].y); + end; + + if (traceXY[1].y0 then s:=s+' Adr='+intToSTR(tco[XClicCell,YClicCell].adresse); - //hint:=s; if not(selectionaffichee) then _entoure_cell_clic; actualise; // actualise la fenetre de config cellule @@ -5347,6 +5822,17 @@ begin if button=mbRight then begin if affEvt then Affiche('TCO Souris clicD enfoncée',clLime); + + if modetrace then + begin + traceXY[1].x:=0;traceXY[1].y:=0; + traceXY[2].x:=0;traceXY[2].y:=0; + indextrace:=0; + affiche_tco; + screen.cursor:=crUpArrow; + exit; + end; + GetCursorPos(Position); Position:=ImageTCO.screenToCLient(Position); Xclic:=position.X; @@ -5365,11 +5851,15 @@ end; procedure TFormTCO.ImageTCOMouseMove(Sender: TObject; Shift: TShiftState;X, Y: Integer); var r : Trect; - cellX,cellY,XSel1,YSel1,XSel2,YSel2,Bimage,xMiniSelP,yMiniSelP,xMaxiSelP,yMaxiSelP : integer; + cellX,cellY,XSel1,YSel1,XSel2,YSel2,Bimage,xMiniSelP,yMiniSelP,xMaxiSelP,yMaxiSelP, + cx,cy : integer; + ok : boolean; begin //Affiche('ImageTCOMouseMove',clLime); - if Temposouris<1 then exit; - if not(sourisclic) then exit; + // Affiche('*',cllime); + // if Temposouris<1 then exit; + // Affiche('-',cllime); + if not(sourisclic) and not(modeTrace) then exit; SourisX.Caption:=IntToSTR(x); SourisY.Caption:=IntToSTR(y); //affiche(intToSTR(x),clorange); @@ -5390,6 +5880,58 @@ begin Bimage:=tco[cellX,cellY].BImage; + if modeTrace then + begin + + if indexTrace>0 then + begin + + begin + with ImageTCO.canvas do + begin + Pen.Mode:=pmXor; + Pen.Color:=clwhite; + Pen.Width:=2; + // efface le précédent + if traceXY[indextrace+1].x<>0 then + begin + if debugTCO then Affiche('Efface précédent',clyellow); + if ancienok then Pen.color:=clyellow else pen.color:=clGray; + MoveTo(traceXY[indexTrace].x*largeurCell-LargeurCelld2,traceXY[indexTrace].y*hauteurCell-HauteurCelld2); + LineTo(ancienTraceX*largeurcell-largeurCelld2,ancienTraceY*HauteurCell-HauteurCelld2); + end; + if debugTCO then Affiche('Trace',clyellow); + + ancienTraceX:=cellx; + ancienTraceY:=celly; + + ok:=( abs(cellX-traceXY[indexTrace].x)=abs(cellY-traceXY[indexTrace].y) ) or + ( cellX-traceXY[indexTrace].x=0 ) or ( cellY-traceXY[indexTrace].y=0 ) ; + + if (ancienok=false) and ok then screen.cursor:=crUpArrow; + if ancienok and (ok=false) then screen.cursor:=crNoDrop; + + Ancienok:=ok; + if ok then Pen.color:=clyellow else pen.color:=clGray; + + + + + MoveTo(traceXY[indexTrace].x*largeurCell-LargeurCelld2,traceXY[indexTrace].y*hauteurCell-HauteurCelld2); + LineTo(cellX*largeurCell-largeurCelld2,CellY*hauteurCell-HauteurCelld2); + + if ok then + begin + traceXY[indextrace+1].x:=cellX; + traceXY[indextrace+1].y:=cellY; + end; + end; + end; + end; + exit; + end; + + xMiniSel:=(XclicCell-1)*LargeurCell; yMiniSel:=(YclicCell-1)*HauteurCell; xMaxiSel:=(cellX-1)*LargeurCell; @@ -5452,6 +5994,7 @@ end; procedure TFormTCO.ButtonRedessineClick(Sender: TObject); begin Affiche_TCO; + defocusControl(ButtonRedessine,true); end; // changement de l'adresse d'un élément @@ -5465,8 +6008,9 @@ begin if Adr=0 then tco[XClicCell,YClicCell].repr:=2; + efface_entoure; tco[XClicCell,YClicCell].Adresse:=Adr; - formConfCellTCO.editAdrElement.Text:=intToSTR(Adr); + //formConfCellTCO.editAdrElement.Text:=intToSTR(Adr); tco_Modifie:=true; if tco[XClicCell,YClicCell].BImage=30 then begin @@ -5478,6 +6022,7 @@ begin affiche_tco; end; end; + Affiche_cellule(XclicCell,YclicCell); end; @@ -5526,6 +6071,7 @@ begin TCO_modifie:=true; dessin_10(ImageTCO.Canvas,XClicCell,YClicCell,0); tco[XClicCell,YClicCell].BImage:=10; + tco[XClicCell,YClicCell].liaisons:=liaisons[10]; tco[xClicCell,YClicCell].CoulFonte:=clYellow; tco[XClicCell,YClicCell].Adresse:=0; EditAdrElement.Text:=IntToSTR(tco[XClicCell,YClicCell].Adresse); @@ -5549,7 +6095,8 @@ begin TCO_modifie:=true; dessin_11(ImageTCO.Canvas,XClicCell,YClicCell,0); - tco[XClicCell,YClicCell].BImage:=11; + tco[XClicCell,YClicCell].BImage:=11; + tco[XClicCell,YClicCell].liaisons:=liaisons[11]; tco[xClicCell,YClicCell].CoulFonte:=clYellow; tco[XClicCell,YClicCell].Adresse:=0; EditAdrElement.Text:=IntToSTR(tco[XClicCell,YClicCell].Adresse); @@ -5573,6 +6120,7 @@ begin TformconfigTCO.create(self); formconfigTCO.showmodal; formconfigTCO.close; + defocusControl(ButtonConfigTCO,true); end; procedure TFormTCO.ImagePalette30EndDrag(Sender, Target: TObject; X, Y: Integer); @@ -5587,6 +6135,7 @@ begin XclicCell:=Xclic div largeurCell +1; YclicCell:=Yclic div hauteurCell +1; tco[XClicCell,YClicCell].BImage:=30; + tco[XClicCell,YClicCell].liaisons:=0; tco[XClicCell,YClicCell].Adresse:=0; tco[XClicCell,YClicCell].FeuOriente:=1; tco[XClicCell,YClicCell].PiedFeu:=1; @@ -5765,7 +6314,16 @@ begin calcul_cellules; Affiche_TCO; SelectionAffichee:=false; -// Affiche(intTostr(TrackBarZoom.Position),clLime); + tabstop:=false; + defocusControl(trackbarZoom,true); + { Affiche(intToSTR(FormTCO.ScrollBox.HorzScrollBar.Range),clyellow); + with formTCO.imagetCO.Canvas do + begin + moveTo(0,0); + pen.Color:=clwhite; + LineTo(FormTCO.ScrollBox.HorzScrollBar.Range,100); + lineTo(0,300); + end; } end; @@ -5775,6 +6333,7 @@ begin if affevt then Affiche('TCO.EditTextChange',clOrange); PCanvasTCO.Brush.Color:=Clfond; efface_entoure; + if Tco[XClicCell,YClicCell].texte='' then begin Tco[XClicCell,YClicCell].CoulFonte:=clTexte; @@ -5784,7 +6343,7 @@ begin Tco[XClicCell,YClicCell].Texte:=EditTexte.Text; formConfCellTCO.EditTexteCCTCO.Text:=EditTexte.Text; TCO_modifie:=true; - affiche_texte(XClicCell,YClicCell); +// affiche_texte(XClicCell,YClicCell); end; procedure TFormTCO.ButtonSimuClick(Sender: TObject); @@ -5840,6 +6399,7 @@ begin ScrollBox.Height:=ClientHeight-40; //ScrollBox.Anchors:=[akLeft,AkTop,AkRight,akBottom]; BandeauMasque:=true; + defocusControl(ButtonMasquer,true); end; procedure TFormTCO.ButtonAfficheBandeauClick(Sender: TObject); @@ -5942,7 +6502,7 @@ begin SelectionAffichee:=false; formConfCellTCO.ComboRepr.ItemIndex:=ComboRepr.ItemIndex; sourisclic:=false; - //affiche_cellule(XClicCell,yClicCell); + defocusControl(ComboRepr,true); affiche_tco; end; @@ -6050,6 +6610,7 @@ begin YclicCell:=Yclic div hauteurCell +1; Dessin_31(ImageTCO.Canvas,XClicCell,YClicCell,0); tco[XClicCell,YClicCell].BImage:=31; + tco[XClicCell,YClicCell].liaisons:=0; tco[XClicCell,YClicCell].Adresse:=0; EditAdrElement.Text:=IntToSTR( tco[XClicCell,YClicCell].Adresse); EdittypeImage.Text:=IntToSTR(tco[XClicCell,YClicCell].BImage); @@ -6074,6 +6635,7 @@ begin Dessin_24(ImageTCO.Canvas,XClicCell,YClicCell,0); tco[XClicCell,YClicCell].BImage:=24; + tco[XClicCell,YClicCell].liaisons:=liaisons[24]; tco[XClicCell,YClicCell].Adresse:=0; EditAdrElement.Text:=IntToSTR( tco[XClicCell,YClicCell].Adresse); EdittypeImage.Text:=IntToSTR(tco[XClicCell,YClicCell].BImage); @@ -6096,6 +6658,7 @@ begin TCO_modifie:=true; Dessin_25(ImageTCO.Canvas,XClicCell,YClicCell,0); tco[XClicCell,YClicCell].BImage:=25; + tco[XClicCell,YClicCell].liaisons:=liaisons[25]; tco[XClicCell,YClicCell].Adresse:=0; EditAdrElement.Text:=IntToSTR( tco[XClicCell,YClicCell].Adresse); EdittypeImage.Text:=IntToSTR(tco[XClicCell,YClicCell].BImage); @@ -6118,6 +6681,7 @@ begin Dessin_20(ImageTCO.Canvas,XClicCell,YClicCell,0); tco[XClicCell,YClicCell].BImage:=20; + tco[XClicCell,YClicCell].liaisons:=liaisons[20]; tco[XClicCell,YClicCell].Adresse:=0; EditAdrElement.Text:=IntToSTR(tco[XClicCell,YClicCell].Adresse); EdittypeImage.Text:=IntToSTR(tco[XClicCell,YClicCell].BImage); @@ -6312,7 +6876,7 @@ procedure TFormTCO.PopupMenu1Popup(Sender: TObject); var oriente,piedFeu : integer; begin //Affiche('on popup',clyellow); - + if modetrace then Abort; PopUpMenu1.Items[9][0].Caption:='Ligne au dessus de la '+intToSTR(YclicCell); PopUpMenu1.Items[9][1].Caption:='Ligne en dessous de la '+intToSTR(YclicCell); PopUpMenu1.Items[9][3].Caption:='Colonne à gauche de la '+intToSTR(XclicCell); @@ -6581,6 +7145,7 @@ begin for x:=1 to NbreCellx do for y:=1 to NbreCelly do tco[x,y].mode:=0; Affiche_TCO; + defocusControl(buttonRaz,true); end; procedure TFormTCO.FormMouseWheel(Sender: TObject; Shift: TShiftState; @@ -6752,5 +7317,25 @@ begin end; end; +procedure TFormTCO.ButtonDessinerClick(Sender: TObject); begin + if not(modetrace) then + begin + modetrace:=true; + indexTrace:=0; + traceXY[1].x:=0; + traceXY[1].y:=0; + traceXY[2].x:=0; + traceXY[2].x:=0; + FormTCO.Caption:='** mode dessin ** Clic droit pour lever le pointeur. Touche Echap pour quitter le mode tracé.'; + //debugtco:=true; + screen.cursor:=crUpArrow; + end + else stop_modetrace; +end; + + + + + end. diff --git a/tco.cfg b/tco.cfg index 70206aa..325376e 100644 --- a/tco.cfg +++ b/tco.cfg @@ -10,22 +10,22 @@ CoulCanton=00FFFF ModeCouleurCanton=1 AvecGrille=1 / Taille de la matrice x,y -Matrice=35,13 +Matrice=39,13 / Ratio d'affichage celluleX/CelluleY Ratio=10 /Matrice TCO [Matrice] -/ couleur fond,adresse,image,inversion aiguillage,Orientation du feu, pied du feu , [texte], representation, fonte, taille fonte, couleur fonte, style, réserve -(202050,358,30,0,1,1,,2,,0,FFFFFF,,0)(202050,0,20,0,0,0,,2,,0,00FFFF,G,0)(202050,0,20,0,0,0,,2,,0,00FFFF,,0)(202050,497,30,0,1,2,,2,,0,FFFFFF,G,0)(202050,0,0,0,0,0,,2,,0,000000,,0)(202050,0,0,0,0,0,,2,,0,00FFFF,,0)(202050,0,0,0,0,0,,2,,0,000000,,0)(202050,0,0,0,0,0,,2,,0,00FFFF,,0)(202050,0,0,0,0,0,,2,,0,00FFFF,,0)(202050,0,0,0,0,0,,2,,0,000000,,0)(202050,0,0,0,0,0,,2,,0,000000,,0)(202050,0,0,0,0,0,,2,,0,000000,,0)(202050,0,0,0,0,0,,2,,0,000000,,0)(202050,0,0,0,0,0,,2,,0,000000,,0)(202050,0,0,0,0,0,TCO GARE PRINCIPALE,1,ARIAL,20,00FFFF,GI,0)(202050,0,0,0,0,0,,2,,0,000000,,0)(202050,0,0,0,0,0,,2,,0,000000,,0)(202050,0,0,0,0,0,,2,,0,000000,,0)(202050,0,0,0,0,0,,2,,0,000000,,0)(202050,0,0,0,0,0,,2,,0,000000,,0)(202050,0,0,0,0,0,,2,,0,000000,,0)(202050,0,0,0,0,0,,2,,0,000000,,0)(202050,0,0,0,0,0,,2,,0,000000,,0)(202050,0,0,0,0,0,,2,,0,000000,,0)(202050,0,0,0,0,0,,2,,0,000000,,0)(202050,0,0,0,0,0,,2,,0,000000,,0)(202050,0,0,0,0,0,,2,,0,000000,,0)(202050,0,0,0,0,0,,2,,0,000000,,0)(202050,0,0,0,0,0,,2,,0,000000,,0)(202050,0,0,0,0,0,,2,,0,000000,,0)(202050,0,0,0,0,0,,2,,0,000000,,0)(202050,0,0,0,0,0,,2,,0,000000,,0)(202050,0,0,0,0,0,,2,,0,000000,,0)(202050,0,0,0,0,0,,2,,0,FFFFFF,,0)(202050,0,0,0,0,0,,0,,0,000000,,0) -(202050,0,0,0,0,0,,2,,0,000000,,0)(202050,0,20,0,0,0,,2,,0,00FFFF,,0)(202050,0,20,0,0,0,,2,,0,00FFFF,,0)(202050,0,0,0,0,0,,2,,0,000000,,0)(202050,0,0,0,0,0,,2,,0,000000,,0)(202050,0,0,0,0,0,,2,,0,000000,,0)(202050,0,0,0,0,0,,2,,0,000000,,0)(202050,0,0,0,0,0,,2,,0,000000,,0)(202050,0,0,0,0,0,,2,,0,000000,,0)(202050,0,0,0,0,0,,2,,0,00FFFF,,0)(202050,0,0,0,0,0,,2,,0,00FFFF,,0)(202050,0,0,0,0,0,,2,,0,00FFFF,,0)(202050,0,0,0,0,0,,2,,0,000000,,0)(202050,0,0,0,0,0,,2,,8,00FF00,,0)(202050,0,0,0,0,0,,2,,8,00FF00,,0)(202050,0,0,0,0,0,,2,,0,000000,,0)(202050,0,0,0,0,0,,2,,0,000000,,0)(202050,0,0,0,0,0,,2,,0,000000,,0)(202050,0,0,0,0,0,,2,,0,000000,,0)(202050,0,0,0,0,0,,2,,0,00FFFF,,0)(202050,0,0,0,0,0,,2,,0,00FFFF,,0)(202050,0,0,0,0,0,,2,,0,00FFFF,,0)(202050,0,0,0,0,0,,2,,0,000000,,0)(202050,0,0,0,0,0,,2,,0,000000,,0)(202050,0,0,0,0,0,,2,,0,000000,,0)(202050,0,0,0,0,0,,2,,0,000000,,0)(202050,0,0,0,0,0,,2,,0,000000,,0)(202050,0,0,0,0,0,,2,,0,000000,,0)(202050,0,0,0,0,0,,2,,0,000000,,0)(202050,0,0,0,0,0,,2,,0,000000,,0)(202050,0,0,0,0,0,,2,,0,000000,,0)(202050,0,9,0,0,0,,2,,0,000000,,0)(202050,0,1,0,0,0,,2,,0,00FFFF,,0)(202050,0,1,0,0,0,,0,,0,00FFFF,,0)(202050,0,0,0,0,0,,0,,0,000000,,0) -(202050,0,0,0,0,0,,2,,0,000000,,0)(202050,517,20,0,0,0,,2,,0,00FFFF,,0)(202050,531,20,0,0,0,,2,,0,00FFFF,,0)(202050,0,0,0,0,0,,2,,0,000000,,0)(202050,0,0,0,0,0,,2,,0,000000,,0)(202050,0,0,0,0,0,,2,,0,000000,,0)(202050,0,0,0,0,0,,2,,0,000000,,0)(202050,0,0,0,0,0,,2,,0,000000,,0)(202050,0,0,0,0,0,,2,,0,000000,,0)(202050,0,0,0,0,0,,2,,0,000000,,0)(202050,0,0,0,0,0,,2,,0,00FFFF,,0)(202050,0,0,0,0,0,,2,,0,00FFFF,,0)(202050,0,1,0,0,0,,2,,0,00FFFF,,0)(202050,6,2,0,0,0,,2,,0,00FF00,,0)(202050,0,1,0,0,0,,2,,0,00FFFF,,0)(202050,0,1,0,0,0,,2,,0,00FFFF,,0)(202050,0,0,0,0,0,,2,,0,00FFFF,,0)(202050,0,0,0,0,0,,2,,0,00FFFF,,0)(202050,0,0,0,0,0,,2,,0,00FFFF,,0)(202050,0,0,0,0,0,,2,,0,000000,,0)(202050,0,0,0,0,0,,2,,0,000000,,0)(202050,0,0,0,0,0,,2,,0,00FFFF,,0)(202050,0,0,0,0,0,,2,,0,00FFFF,,0)(202050,0,0,0,0,0,,2,,0,000000,,0)(202050,0,0,0,0,0,,2,,0,000000,,0)(202050,0,0,0,0,0,,2,,0,000000,,0)(202050,0,0,0,0,0,,2,,0,000000,,0)(202050,0,0,0,0,0,,2,,0,000000,,0)(202050,0,0,0,0,0,,2,,0,000000,,0)(202050,0,0,0,0,0,,2,,0,000000,,0)(202050,0,10,0,0,0,,2,,0,000000,,0)(202050,0,9,0,0,0,,2,,0,000000,,0)(202050,0,1,0,0,0,,2,,0,00FFFF,,0)(202050,0,1,0,0,0,,0,,0,00FFFF,,0)(202050,0,0,0,0,0,,0,,0,000000,,0) -(202050,0,0,0,0,0,,2,,0,000000,,0)(202050,0,20,0,0,0,,2,,0,00FFFF,,0)(202050,0,20,0,0,0,,2,,0,00FFFF,,0)(202050,0,0,0,0,0,,2,,0,000000,,0)(202050,0,0,0,0,0,,2,,0,000000,,0)(202050,0,0,0,0,0,,2,,0,000000,,0)(202050,0,0,0,0,0,,2,,0,00FFFF,,0)(202050,0,0,0,0,0,,2,,0,000000,,0)(202050,0,0,0,0,0,,2,,0,000000,,0)(202050,0,0,0,0,0,,2,,0,000000,,0)(202050,0,0,0,0,0,,2,,0,000000,,0)(202050,0,0,0,0,0,,2,,0,000000,,0)(202050,0,10,0,0,0,,2,,0,000000,,0)(202050,0,0,0,0,0,,2,,0,000000,,0)(202050,232,30,0,2,1,,2,,0,00FF00,,0)(202050,0,0,0,0,0,,2,,0,000000,,0)(202050,0,0,0,0,0,,2,,0,00FFFF,,0)(202050,0,0,0,0,0,,2,,0,00FFFF,,0)(202050,0,0,0,0,0,,2,,0,000000,,0)(202050,0,0,0,0,0,,2,,0,000000,,0)(202050,0,0,0,0,0,,2,,0,000000,,0)(202050,0,0,0,0,0,,2,,0,000000,,0)(202050,0,0,0,0,0,,2,,0,000000,,0)(202050,0,0,0,0,0,,2,,0,00FFFF,,0)(202050,0,0,0,0,0,,2,,0,00FFFF,,0)(202050,0,0,0,0,0,,2,,0,000000,,0)(202050,0,0,0,0,0,,2,,0,FFFFFF,,0)(202050,288,30,0,2,1,,2,,0,FFFFFF,,0)(202050,0,0,0,0,0,,2,,0,000000,,0)(202050,0,10,0,0,0,,2,MS SANS SERIF,10,00FFFF,,0)(202050,0,10,0,0,0,,2,,0,000000,,0)(202050,0,0,0,0,0,,2,,0,000000,,0)(202050,0,0,0,0,0,,2,,0,000000,,0)(202050,0,0,0,0,0,,0,,0,000000,,0)(202050,0,0,0,0,0,,0,,0,000000,,0) -(202050,0,0,0,0,0,,2,,0,000000,,0)(202050,0,20,0,0,0,,2,,0,00FFFF,,0)(202050,0,20,0,0,0,,2,,0,00FFFF,,0)(202050,0,0,0,0,0,,2,,0,000000,,0)(202050,0,0,0,0,0,,2,,0,000000,,0)(202050,0,0,0,0,0,,2,,0,000000,,0)(202050,0,0,0,0,0,,2,,0,000000,,0)(202050,0,0,0,0,0,,2,,0,000000,,0)(202050,372,30,0,1,1,,2,,0,FFFFFF,,0)(202050,0,0,0,0,0,,2,,0,000000,,0)(202050,0,0,0,0,0,,2,,0,000000,,0)(202050,4,15,0,0,0,,2,,0,00FF00,,0)(202050,0,1,0,0,0,,2,,0,00FFFF,,0)(202050,0,1,0,0,0,,2,,0,00FFFF,,0)(202050,0,1,0,0,0,,2,,0,00FFFF,,0)(202050,0,1,0,0,0,,2,,0,00FFFF,,0)(202050,0,1,0,0,0,,2,,0,00FFFF,,0)(202050,0,1,0,0,0,,2,,0,00FFFF,,0)(202050,0,1,0,0,0,,2,,0,00FFFF,,0)(202050,0,1,0,0,0,,2,,0,00FFFF,,0)(202050,0,1,0,0,0,,2,,0,00FFFF,,0)(202050,0,1,0,0,0,,2,,0,00FFFF,,0)(202050,514,1,0,0,0,,2,,0,00FFFF,,0)(202050,0,1,0,0,0,,2,,0,00FFFF,,0)(202050,0,1,0,0,0,,2,,0,00FFFF,,0)(202050,0,1,0,0,0,,2,,0,00FFFF,,0)(202050,0,1,0,0,0,,2,,0,00FFFF,,0)(202050,522,1,0,0,0,,2,,0,00FFFF,,0)(202050,0,7,0,0,0,,2,,0,000000,,0)(202050,0,10,0,0,0,,2,,0,000000,,0)(202050,0,0,0,0,0,,2,,0,000000,,0)(202050,0,0,0,0,0,,2,,0,00FFFF,,0)(202050,0,0,0,0,0,,2,,0,00FFFF,,0)(202050,0,0,0,0,0,,0,,0,000000,,0)(202050,0,0,0,0,0,,0,,0,000000,,0) -(202050,0,0,0,0,0,,2,,0,000000,,0)(202050,0,20,0,0,0,,2,,0,00FFFF,,0)(202050,0,20,0,0,0,,2,,0,00FFFF,,0)(202050,0,0,0,0,0,,2,,0,000000,,0)(202050,0,0,0,0,0,,2,,0,000000,,0)(202050,0,0,0,0,0,,2,,0,000000,,0)(202050,0,0,0,0,0,,2,,0,000000,,0)(202050,0,0,0,0,0,,2,,0,000000,,0)(202050,0,0,0,0,0,,2,,0,000000,,0)(202050,0,0,0,0,0,,2,,0,000000,,0)(202050,3,15,0,0,0,,2,,0,00FF00,,0)(202050,5,2,0,0,0,,2,,0,00FF00,,0)(202050,0,1,0,0,0,,2,,0,00FFFF,,0)(202050,0,1,0,0,0,,2,,0,00FFFF,,0)(202050,515,1,0,0,0,,2,,0,00FFFF,,0)(202050,515,1,0,0,0,,0,,0,00FFFF,,0)(202050,0,1,0,0,0,,2,,0,00FFFF,,0)(202050,0,1,0,0,0,,2,,0,00FFFF,,0)(202050,0,1,0,0,0,,2,,0,00FFFF,,0)(202050,0,1,0,0,0,,2,,0,00FFFF,,0)(202050,0,1,0,0,0,,2,,0,00FFFF,,0)(202050,0,1,0,0,0,,2,,0,00FFFF,,0)(202050,0,1,0,0,0,,2,,0,00FFFF,,0)(202050,0,1,0,0,0,,2,,0,00FFFF,,0)(202050,0,1,0,0,0,,2,,0,00FFFF,,0)(202050,0,1,0,0,0,,2,,0,00FFFF,,0)(202050,0,1,0,0,0,,2,,0,00FFFF,,0)(202050,0,1,0,0,0,,2,,0,00FFFF,,0)(202050,0,7,0,0,0,,2,,0,000000,,0)(202050,0,0,0,0,0,,2,,0,000000,,0)(202050,0,0,0,0,0,,2,,0,000000,,0)(202050,0,0,0,0,0,,2,,0,00FFFF,,0)(202050,0,0,0,0,0,,2,,0,000000,,0)(202050,0,0,0,0,0,,0,,0,00FFFF,,0)(202050,0,0,0,0,0,,0,,0,000000,,0) -(202050,0,0,0,0,0,,2,,0,000000,,0)(202050,0,19,0,0,0,,2,,0,00FFFF,,0)(202050,0,19,0,0,0,,2,,0,00FFFF,,0)(202050,0,0,0,0,0,,2,,0,000000,,0)(202050,0,0,0,0,0,,2,,0,000000,,0)(202050,0,0,0,0,0,,2,,0,000000,,0)(202050,520,30,0,2,1,,2,,0,00FF00,,0)(202050,0,0,0,0,0,,2,,0,000000,,0)(202050,0,0,0,0,0,,2,,0,000000,,0)(202050,0,10,0,0,0,,2,,0,000000,,0)(202050,0,10,0,0,0,,2,,0,000000,,0)(202050,0,0,0,0,0,,2,,0,000000,,0)(202050,316,30,0,3,1,,2,,0,00FF00,,0)(202050,0,0,0,0,0,,2,,0,000000,,0)(202050,0,0,0,0,0,,2,,0,000000,,0)(202050,0,23,0,0,0,,2,,0,000000,,0)(202050,0,23,0,0,0,,2,,0,000000,,0)(202050,0,23,0,0,0,QUAI 1,1,ARIAL,12,FFFFFF,G,0)(202050,0,23,0,0,0,,2,,8,00FF00,,0)(202050,0,23,0,0,0,,2,,8,00FF00,,0)(202050,0,23,0,0,0,,2,,0,000000,,0)(202050,0,23,0,0,0,,2,,0,000000,,0)(202050,0,23,0,0,0,,2,,0,000000,,0)(202050,0,23,0,0,0,,2,,0,000000,,0)(202050,0,23,0,0,0,,2,,0,000000,,0)(202050,0,0,0,0,0,,2,,0,000000,,0)(202050,0,0,0,0,0,,2,,0,000000,,0)(202050,0,0,0,0,0,,2,,0,000000,,0)(202050,190,30,0,2,1,,2,,0,00FF00,,0)(202050,0,0,0,0,0,,2,,0,000000,,0)(202050,0,0,0,0,0,,2,,0,000000,,0)(202050,0,0,0,0,0,,2,,0,000000,,0)(202050,0,0,0,0,0,,2,,0,000000,,0)(202050,0,0,0,0,0,,0,,0,00FFFF,,0)(202050,0,0,0,0,0,,0,,0,000000,,0) -(202050,0,0,0,0,0,,2,,0,000000,,0)(202050,0,0,0,0,0,,2,,0,000000,,0)(202050,0,11,0,0,0,,2,,0,00FFFF,,0)(202050,0,6,0,0,0,,2,,0,000000,,0)(202050,518,1,0,0,0,,0,,0,00FFFF,,0)(202050,518,1,0,0,0,,2,,0,00FFFF,,0)(202050,0,1,0,0,0,,2,,0,00FFFF,,0)(202050,0,1,0,0,0,,2,,0,00FFFF,,0)(202050,1,3,0,0,0,,2,,8,00FF00,,0)(202050,100,21,0,0,0,,2,,0,00FF00,,0)(202050,0,1,0,0,0,,2,,0,00FFFF,,0)(202050,0,1,0,0,0,,2,,0,00FFFF,,0)(202050,0,1,0,0,0,,2,,0,00FFFF,,0)(202050,0,1,0,0,0,,2,,0,00FFFF,,0)(202050,0,1,0,0,0,,2,,0,00FFFF,,0)(202050,0,1,0,0,0,VOIE 2,2,ARIAL,10,00FFFF,,0)(202050,0,1,0,0,0,,2,,0,00FFFF,,0)(202050,0,1,0,0,0,,2,,0,00FFFF,,0)(202050,0,1,0,0,0,,2,,0,00FFFF,,0)(202050,0,1,0,0,0,,2,,0,00FFFF,,0)(202050,0,1,0,0,0,,2,,0,00FFFF,,0)(202050,0,1,0,0,0,,2,,0,00FFFF,,0)(202050,0,1,0,0,0,,2,,0,00FFFF,,0)(202050,0,1,0,0,0,,2,,0,00FFFF,,0)(202050,0,1,0,0,0,,2,,0,00FFFF,,0)(202050,523,1,0,0,0,,0,,0,00FFFF,,0)(202050,523,1,0,0,0,,0,,0,00FFFF,,0)(202050,523,1,0,0,0,,2,,0,00FFFF,,0)(202050,0,1,0,0,0,,2,,0,00FFFF,,0)(202050,0,1,0,0,0,,2,,0,00FFFF,,0)(202050,0,1,0,0,0,,2,,0,00FFFF,,0)(202050,0,1,0,0,0,,2,,0,00FFFF,,0)(202050,0,1,0,0,0,,2,,0,00FFFF,,0)(202050,0,1,0,0,0,,2,,0,00FFFF,,0)(202050,0,0,0,0,0,,2,,0,00FFFF,,0) -(202050,530,1,0,0,0,,2,,0,00FFFF,,0)(202050,0,1,0,0,0,,2,,0,00FFFF,,0)(202050,0,8,0,0,0,,2,,0,00FFFF,,0)(202050,0,6,0,0,0,,2,,0,000000,,0)(202050,0,1,0,0,0,,2,,0,00FFFF,,0)(202050,0,1,0,0,0,,2,,0,00FFFF,,0)(202050,0,1,0,0,0,,2,,0,00FFFF,,0)(202050,12,4,1,0,0,,2,,0,00FF00,,0)(202050,2,3,0,0,0,,2,,0,00FF00,,0)(202050,0,1,0,0,0,,2,,0,00FFFF,,0)(202050,0,1,0,0,0,,2,,0,00FFFF,,0)(202050,519,1,0,0,0,,2,,0,00FFFF,,0)(202050,519,1,0,0,0,,0,,0,00FFFF,,0)(202050,0,1,0,0,0,,2,,0,00FFFF,,0)(202050,0,1,0,0,0,,2,,0,00FFFF,,0)(202050,0,1,0,0,0,VOIE 1,2,ARIAL,10,00FFFF,,0)(202050,0,1,0,0,0,,2,,0,00FFFF,,0)(202050,0,1,0,0,0,,2,,0,00FFFF,,0)(202050,0,1,0,0,0,,2,,0,00FFFF,,0)(202050,0,1,0,0,0,,2,,0,00FFFF,,0)(202050,0,1,0,0,0,,2,,0,00FFFF,,0)(202050,0,1,0,0,0,,2,,8,00FFFF,,0)(202050,0,1,0,0,0,,2,,0,00FFFF,,0)(202050,0,1,0,0,0,,2,,0,00FFFF,,0)(202050,0,1,0,0,0,,2,,0,00FFFF,,0)(202050,0,1,0,0,0,,2,,0,00FFFF,,0)(202050,0,1,0,0,0,,2,,0,00FFFF,,0)(202050,0,1,0,0,0,,2,,0,00FFFF,,0)(202050,0,1,0,0,0,,2,,0,00FFFF,,0)(202050,7,2,0,0,0,,2,,0,00FF00,,0)(202050,0,1,0,0,0,,2,,0,00FFFF,,0)(202050,527,1,0,0,0,,2,,8,00FFFF,,0)(202050,0,1,0,0,0,,3,,8,00FFFF,,0)(202050,0,0,0,0,0,,0,,0,000000,,0)(202050,0,0,0,0,0,,0,,0,000000,,0) -(202050,529,1,0,0,0,,2,,0,00FFFF,,0)(202050,0,1,0,0,0,,0,,0,00FFFF,,0)(202050,0,1,0,0,0,,2,,0,00FFFF,,0)(202050,26,22,0,0,0,,0,,0,00FFFF,,0)(202050,0,1,0,0,0,,2,,0,00FFFF,,0)(202050,0,1,0,0,0,,0,,0,00FFFF,,0)(202050,0,1,0,0,0,,0,,0,00FFFF,,0)(202050,0,8,0,0,0,,0,,0,000000,,0)(202050,0,11,0,0,0,,0,,0,000000,,0)(202050,330,30,0,3,1,,0,,0,00FF00,,0)(202050,0,0,0,0,0,,0,,0,000000,,0)(202050,0,0,0,0,0,,0,,0,000000,,0)(202050,0,0,0,0,0,,0,,0,000000,,0)(202050,0,0,0,0,0,,0,,0,000000,,0)(202050,0,0,0,0,0,,0,,0,000000,,0)(202050,0,23,0,0,0,,0,,0,000000,,0)(202050,0,23,0,0,0,,0,,0,000000,,0)(202050,0,23,0,0,0,QUAI 2,1,ARIAL,12,FFFFFF,G,0)(202050,0,23,0,0,0,,0,,0,000000,,0)(202050,0,23,0,0,0,,0,,0,000000,,0)(202050,0,23,0,0,0,,0,,0,000000,,0)(202050,0,23,0,0,0,,0,,0,000000,,0)(202050,0,23,0,0,0,,0,,0,000000,,0)(202050,0,23,0,0,0,,0,,0,000000,,0)(202050,0,23,0,0,0,,0,,0,000000,,0)(202050,0,0,0,0,0,,0,,0,000000,,0)(202050,0,0,0,0,0,,0,,0,000000,,0)(202050,0,0,0,0,0,,0,,0,000000,,0)(202050,0,10,0,0,0,,0,,0,000000,,0)(202050,204,30,0,3,1,,0,,0,00FF00,,0)(202050,0,0,0,0,0,,0,,0,000000,,0)(202050,0,0,0,0,0,,0,,0,000000,,0)(202050,0,0,0,0,0,,0,,8,00FF00,,0)(202050,0,0,0,0,0,,0,,0,000000,,0)(202050,0,0,0,0,0,,0,,0,000000,,0) -(202050,0,0,0,0,0,,0,,0,000000,,0)(202050,0,0,0,0,0,,0,,0,000000,,0)(202050,0,0,0,0,0,,0,,0,000000,,0)(202050,0,0,0,0,0,,2,,0,000000,,0)(202050,0,6,0,0,0,,0,,0,00FFFF,,0)(202050,0,1,0,0,0,,0,,0,00FFFF,,0)(202050,0,1,0,0,0,,0,,0,00FFFF,,0)(202050,0,1,0,0,0,,0,,0,00FFFF,,0)(202050,21,5,0,0,0,,0,,0,00FF00,,0)(202050,20,5,0,0,0,,0,,0,00FF00,,0)(202050,520,1,0,0,0,,2,,8,00FFFF,,0)(202050,520,1,0,0,0,,0,,0,00FFFF,,0)(202050,520,1,0,0,0,,0,,0,00FFFF,,0)(202050,0,1,0,0,0,,0,,8,00FFFF,,0)(202050,0,1,0,0,0,,0,,0,00FFFF,,0)(202050,0,1,0,0,0,,0,,0,00FFFF,,0)(202050,0,1,0,0,0,,0,,8,00FFFF,,0)(202050,0,1,0,0,0,,0,,0,00FFFF,,0)(202050,0,1,0,0,0,,0,,0,00FFFF,,0)(202050,0,1,0,0,0,,0,,8,00FFFF,,0)(202050,0,1,0,0,0,,2,,0,00FFFF,,0)(202050,0,1,0,0,0,,0,,0,00FFFF,,0)(202050,0,1,0,0,0,,0,,8,00FFFF,,0)(202050,0,1,0,0,0,,0,,0,00FFFF,,0)(202050,0,1,0,0,0,,0,,8,00FFFF,,0)(202050,0,1,0,0,0,,0,,0,00FFFF,,0)(202050,0,1,0,0,0,,0,,0,00FFFF,,0)(202050,0,7,0,0,0,,0,,0,000000,,0)(202050,0,0,0,0,0,,0,,0,000000,,0)(202050,0,0,0,0,0,,0,,0,000000,,0)(202050,0,0,0,0,0,,0,,0,000000,,0)(202050,0,0,0,0,0,,0,,0,000000,,0)(202050,0,0,0,0,0,,0,,8,00FF00,,0)(202050,0,0,0,0,0,,0,,0,000000,,0)(202050,0,0,0,0,0,,0,,0,000000,,0) -(202050,0,0,0,0,0,,0,,0,000000,,0)(202050,0,0,0,0,0,,0,,0,000000,,0)(202050,0,0,0,0,0,,0,,0,000000,,0)(202050,0,0,0,0,0,,0,,0,000000,,0)(202050,0,0,0,0,0,,0,,0,000000,,0)(202050,0,0,0,0,0,,0,,0,000000,,0)(202050,0,0,0,0,0,,0,,0,000000,,0)(202050,0,0,0,0,0,,0,,0,000000,,0)(202050,176,30,0,3,1,,0,,0,00FF00,,0)(202050,0,0,0,0,0,,0,,0,000000,,0)(202050,0,0,0,0,0,,0,,0,000000,,0)(202050,0,0,0,0,0,,0,,0,000000,,0)(202050,0,0,0,0,0,,3,,8,00FF00,,0)(202050,0,0,0,0,0,,0,,8,00FF00,,0)(202050,0,0,0,0,0,,2,,0,000000,,0)(202050,0,0,0,0,0,,0,,0,000000,,0)(202050,0,0,0,0,0,,0,,8,00FF00,,0)(202050,0,0,0,0,0,,0,,0,000000,,0)(202050,0,0,0,0,0,,0,,8,00FF00,,0)(202050,0,0,0,0,0,,0,,0,000000,,0)(202050,0,0,0,0,0,,0,,8,00FF00,,0)(202050,0,0,0,0,0,,0,,0,000000,,0)(202050,0,0,0,0,0,,0,,0,000000,,0)(202050,0,0,0,0,0,,0,,0,000000,,0)(202050,0,0,0,0,0,,0,,0,000000,,0)(202050,0,0,0,0,0,,0,,0,000000,,0)(202050,0,0,0,0,0,,0,,0,000000,,0)(202050,0,0,0,0,0,,0,,0,000000,,0)(202050,0,0,0,0,0,,0,,0,000000,,0)(202050,0,0,0,0,0,,0,,0,000000,,0)(202050,0,0,0,0,0,,2,,0,000000,,0)(202050,0,0,0,0,0,,0,,0,000000,,0)(202050,0,0,0,0,0,,0,,0,000000,,0)(202050,0,0,0,0,0,,0,,0,000000,,0)(202050,0,0,0,0,0,,0,,0,000000,,0) -(202050,0,0,0,0,0,,0,,0,000000,,0)(202050,0,0,0,0,0,,0,,0,000000,,0)(202050,0,0,0,0,0,,0,,0,000000,,0)(202050,0,0,0,0,0,,0,,0,000000,,0)(202050,0,0,0,0,0,,0,,0,000000,,0)(202050,0,0,0,0,0,,0,,0,000000,,0)(202050,0,0,0,0,0,,0,,0,000000,,0)(202050,0,0,0,0,0,,0,,0,000000,,0)(202050,0,0,0,0,0,,0,,0,000000,,0)(202050,0,0,0,0,0,,0,,0,000000,,0)(202050,0,0,0,0,0,,0,,0,000000,,0)(202050,0,0,0,0,0,,0,,0,000000,,0)(202050,0,0,0,0,0,,0,,0,000000,,0)(202050,0,0,0,0,0,,0,,0,000000,,0)(202050,0,0,0,0,0,,0,,0,000000,,0)(202050,0,0,0,0,0,,0,,0,000000,,0)(202050,0,0,0,0,0,,0,,0,000000,,0)(202050,0,0,0,0,0,,0,,0,000000,,0)(202050,0,0,0,0,0,,0,,0,000000,,0)(202050,0,0,0,0,0,,0,,0,000000,,0)(202050,0,0,0,0,0,,0,,0,000000,,0)(202050,0,0,0,0,0,,0,,0,000000,,0)(202050,0,0,0,0,0,,0,,0,000000,,0)(202050,0,0,0,0,0,,0,,0,000000,,0)(202050,0,0,0,0,0,,0,,0,000000,,0)(202050,0,0,0,0,0,,2,,0,000000,,0)(202050,0,0,0,0,0,,0,,0,000000,,0)(202050,0,0,0,0,0,,0,,0,000000,,0)(202050,0,0,0,0,0,,0,,0,000000,,0)(202050,0,0,0,0,0,,0,,0,000000,,0)(202050,0,0,0,0,0,,0,,0,000000,,0)(202050,0,0,0,0,0,,0,,0,000000,,0)(202050,0,0,0,0,0,,0,,0,000000,,0)(202050,0,0,0,0,0,,0,,0,000000,,0)(202050,0,0,0,0,0,,0,,0,000000,,0) +/ couleur fond,adresse,image,inversion aiguillage,Orientation du signal, pied du signal , [texte], representation, fonte, taille fonte, couleur fonte, style, réserve +(202050,358,30,0,1,1,,2,,0,FFFFFF,,0)(202050,0,20,0,0,0,,2,,0,00FFFF,G,0)(202050,0,20,0,0,0,,2,,0,00FFFF,,0)(202050,497,30,0,1,2,,2,,0,FFFFFF,G,0)(202050,0,0,0,0,0,,2,,0,000000,,0)(202050,0,0,0,0,0,,2,,0,00FFFF,,0)(202050,0,0,0,0,0,,2,,0,000000,,0)(202050,0,0,0,0,0,,2,,0,00FFFF,,0)(202050,0,0,0,0,0,,2,,0,00FFFF,,0)(202050,0,0,0,0,0,,2,,0,000000,,0)(202050,0,0,0,0,0,,2,,0,000000,,0)(202050,0,0,0,0,0,,2,,0,000000,,0)(202050,0,0,0,0,0,,2,,0,000000,,0)(202050,0,0,0,0,0,,2,,0,000000,,0)(202050,0,0,0,0,0,TCO GARE PRINCIPALE,1,ARIAL,20,00FFFF,GI,0)(202050,0,0,0,0,0,,2,,0,000000,,0)(202050,0,0,0,0,0,,2,,0,000000,,0)(202050,0,0,0,0,0,,2,,0,000000,,0)(202050,0,0,0,0,0,,2,,0,000000,,0)(202050,0,0,0,0,0,,2,,0,000000,,0)(202050,0,0,0,0,0,,2,,0,000000,,0)(202050,0,0,0,0,0,,2,,0,000000,,0)(202050,0,0,0,0,0,,2,,0,000000,,0)(202050,0,0,0,0,0,,2,,0,000000,,0)(202050,0,0,0,0,0,,2,,0,000000,,0)(202050,0,0,0,0,0,,2,,0,000000,,0)(202050,0,0,0,0,0,,2,,0,000000,,0)(202050,0,0,0,0,0,,2,,0,000000,,0)(202050,0,0,0,0,0,,2,,0,000000,,0)(202050,0,0,0,0,0,,2,,0,000000,,0)(202050,0,0,0,0,0,,2,,0,000000,,0)(202050,0,0,0,0,0,,2,,0,000000,,0)(202050,0,0,0,0,0,,2,,0,FFFFFF,,0)(202050,0,0,0,0,0,,0,,0,000000,,0)(202050,0,0,0,0,0,,0,,0,000000,,0)(202050,0,0,0,0,0,,0,,0,000000,,0)(202050,0,0,0,0,0,,0,,0,000000,,0)(202050,0,0,0,0,0,,0,,0,000000,,0)(202050,0,0,0,0,0,,0,,0,000000,,0) +(202050,0,0,0,0,0,,2,,0,000000,,0)(202050,0,20,0,0,0,,2,,0,00FFFF,,0)(202050,0,20,0,0,0,,2,,0,00FFFF,,0)(202050,0,0,0,0,0,,2,,0,000000,,0)(202050,0,0,0,0,0,,2,,0,000000,,0)(202050,0,0,0,0,0,,2,,0,000000,,0)(202050,0,0,0,0,0,,2,,0,00FFFF,,0)(202050,0,0,0,0,0,,2,,0,00FFFF,,0)(202050,0,0,0,0,0,,2,,0,000000,,0)(202050,0,0,0,0,0,,2,,0,00FFFF,,0)(202050,0,0,0,0,0,,2,,0,00FFFF,,0)(202050,0,0,0,0,0,,2,,0,00FFFF,,0)(202050,0,0,0,0,0,,2,,0,000000,,0)(202050,0,0,0,0,0,,2,,8,00FF00,,0)(202050,0,0,0,0,0,,2,,8,00FF00,,0)(202050,0,0,0,0,0,,2,,0,000000,,0)(202050,0,0,0,0,0,,2,,0,000000,,0)(202050,0,0,0,0,0,,2,,0,000000,,0)(202050,0,0,0,0,0,,2,,0,000000,,0)(202050,0,0,0,0,0,,2,,0,00FFFF,,0)(202050,0,0,0,0,0,,2,,0,00FFFF,,0)(202050,0,0,0,0,0,,2,,0,00FFFF,,0)(202050,0,0,0,0,0,,2,,0,000000,,0)(202050,0,0,0,0,0,,2,,0,000000,,0)(202050,0,0,0,0,0,,2,,0,000000,,0)(202050,0,0,0,0,0,,2,,0,000000,,0)(202050,0,0,0,0,0,,2,,0,000000,,0)(202050,0,0,0,0,0,,2,,0,000000,,0)(202050,0,0,0,0,0,,2,,0,000000,,0)(202050,0,0,0,0,0,,2,,0,000000,,0)(202050,0,9,0,0,0,,2,,0,000000,,0)(202050,0,1,0,0,0,,2,,0,00FFFF,,0)(202050,0,1,0,0,0,,0,,0,00FFFF,,0)(202050,0,8,0,0,0,,0,,0,00FFFF,,0)(202050,0,20,0,0,0,,2,,0,000000,,0)(202050,0,20,0,0,0,,2,,0,000000,,0)(202050,0,0,0,0,0,,0,,0,000000,,0)(202050,0,0,0,0,0,,0,,0,000000,,0)(202050,0,0,0,0,0,,0,,0,000000,,0) +(202050,0,0,0,0,0,,2,,0,000000,,0)(202050,517,20,0,0,0,,2,,0,00FFFF,,0)(202050,531,20,0,0,0,,2,,0,00FFFF,,0)(202050,0,0,0,0,0,,2,,0,000000,,0)(202050,0,0,0,0,0,,2,,0,000000,,0)(202050,0,0,0,0,0,,2,,0,000000,,0)(202050,0,0,0,0,0,,2,,0,000000,,0)(202050,0,0,0,0,0,,2,,0,000000,,0)(202050,0,0,0,0,0,,2,,0,000000,,0)(202050,0,0,0,0,0,,2,,0,000000,,0)(202050,0,0,0,0,0,,2,,0,00FFFF,,0)(202050,0,1,0,0,0,,2,,0,00FFFF,,0)(202050,0,1,0,0,0,,2,,0,00FFFF,,0)(202050,6,2,0,0,0,,2,,0,00FF00,,0)(202050,0,1,0,0,0,,2,,0,00FFFF,,0)(202050,516,1,0,0,0,,2,,0,00FFFF,,0)(202050,516,1,0,0,0,,0,,0,00FFFF,,0)(202050,0,1,0,0,0,,2,,0,00FFFF,,0)(202050,0,0,0,0,0,,2,,0,00FFFF,,0)(202050,0,0,0,0,0,,2,,0,000000,,0)(202050,0,0,0,0,0,,2,,0,000000,,0)(202050,0,0,0,0,0,,2,,0,00FFFF,,0)(202050,0,0,0,0,0,,2,,0,00FFFF,,0)(202050,0,0,0,0,0,,2,,0,000000,,0)(202050,0,0,0,0,0,,2,,0,000000,,0)(202050,0,0,0,0,0,,2,,0,000000,,0)(202050,0,0,0,0,0,,2,,0,000000,,0)(202050,0,0,0,0,0,,2,,0,000000,,0)(202050,0,0,0,0,0,,2,,0,000000,,0)(202050,0,10,0,0,0,,2,,0,000000,,0)(202050,0,9,0,0,0,,2,,0,000000,,0)(202050,0,1,0,0,0,,2,,0,00FFFF,,0)(202050,0,1,0,0,0,,0,,0,00FFFF,,0)(202050,0,8,0,0,0,,2,,0,00FFFF,,0)(202050,103,25,0,0,0,,2,MS SANS SERIF,10,00FF00,,0)(202050,0,20,0,0,0,,0,,0,000000,,0)(202050,0,0,0,0,0,,0,,0,000000,,0)(202050,0,0,0,0,0,,0,,0,000000,,0)(202050,0,0,0,0,0,,0,,0,000000,,0) +(202050,0,0,0,0,0,,2,,0,000000,,0)(202050,0,20,0,0,0,,2,,0,00FFFF,,0)(202050,0,20,0,0,0,,2,,0,00FFFF,,0)(202050,0,0,0,0,0,,2,,0,000000,,0)(202050,0,0,0,0,0,,2,,0,000000,,0)(202050,0,0,0,0,0,,2,,0,000000,,0)(202050,0,0,0,0,0,,2,,0,00FFFF,,0)(202050,0,0,0,0,0,,2,,0,000000,,0)(202050,0,0,0,0,0,,2,,0,000000,,0)(202050,0,0,0,0,0,,2,,0,000000,,0)(202050,0,0,0,0,0,,2,,0,000000,,0)(202050,0,0,0,0,0,,2,,0,000000,,0)(202050,0,10,0,0,0,,2,,0,000000,,0)(202050,0,0,0,0,0,,2,,0,000000,,0)(202050,232,30,0,3,1,,2,,0,00FF00,,0)(202050,0,0,0,0,0,,2,,0,000000,,0)(202050,0,0,0,0,0,,2,,0,00FFFF,,0)(202050,0,0,0,0,0,,2,,0,00FFFF,,0)(202050,0,0,0,0,0,,2,,0,000000,,0)(202050,0,0,0,0,0,,2,,0,000000,,0)(202050,0,0,0,0,0,,2,,0,000000,,0)(202050,0,0,0,0,0,,2,,0,000000,,0)(202050,0,0,0,0,0,,2,,0,000000,,0)(202050,0,0,0,0,0,,2,,0,00FFFF,,0)(202050,0,0,0,0,0,,2,,0,00FFFF,,0)(202050,0,0,0,0,0,,2,,0,FFFFFF,,0)(202050,288,30,0,2,1,,2,,0,FFFFFF,,0)(202050,0,0,0,0,0,,2,,0,000000,,0)(202050,0,10,0,0,0,,2,MS SANS SERIF,10,00FFFF,,0)(202050,0,10,0,0,0,,2,,0,000000,,0)(202050,0,0,0,0,0,,2,,0,000000,,0)(202050,0,0,0,0,0,,2,,0,000000,,0)(202050,0,0,0,0,0,,0,,0,000000,,0)(202050,302,30,0,1,1,,0,,0,FFFFFF,,0)(202050,9,24,0,0,0,,2,MS SANS SERIF,10,00FF00,,0)(202050,8,24,0,0,0,,0,MS SANS SERIF,10,00FF00,,0)(202050,0,0,0,0,0,,0,,0,000000,,0)(202050,0,0,0,0,0,,0,,0,000000,,0)(202050,0,0,0,0,0,,0,,0,000000,,0) +(202050,0,0,0,0,0,,2,,0,000000,,0)(202050,0,20,0,0,0,,2,,0,00FFFF,,0)(202050,0,20,0,0,0,,2,,0,00FFFF,,0)(202050,0,0,0,0,0,,2,,0,000000,,0)(202050,0,0,0,0,0,,2,,0,000000,,0)(202050,0,0,0,0,0,,2,,0,000000,,0)(202050,0,0,0,0,0,,2,,0,000000,,0)(202050,0,0,0,0,0,,2,,0,000000,,0)(202050,372,30,0,1,1,,2,,0,FFFFFF,,0)(202050,0,0,0,0,0,,2,,0,000000,,0)(202050,0,0,0,0,0,,2,,0,000000,,0)(202050,4,15,0,0,0,,2,,0,00FF00,,0)(202050,0,1,0,0,0,,2,,0,00FFFF,,0)(202050,0,1,0,0,0,,2,,0,00FFFF,,0)(202050,0,1,0,0,0,,2,,0,00FFFF,,0)(202050,0,1,0,0,0,,2,,0,00FFFF,,0)(202050,0,1,0,0,0,,2,,0,00FFFF,,0)(202050,0,1,0,0,0,,2,,0,00FFFF,,0)(202050,0,1,0,0,0,,2,,0,00FFFF,,0)(202050,0,1,0,0,0,,2,,0,00FFFF,,0)(202050,0,1,0,0,0,,2,,0,00FFFF,,0)(202050,0,1,0,0,0,,2,,0,00FFFF,,0)(202050,514,1,0,0,0,,2,,0,00FFFF,,0)(202050,0,1,0,0,0,,2,,0,00FFFF,,0)(202050,0,1,0,0,0,,2,,0,00FFFF,,0)(202050,0,1,0,0,0,,2,,0,00FFFF,,0)(202050,522,1,0,0,0,,2,,0,00FFFF,,0)(202050,0,7,0,0,0,,2,,0,000000,,0)(202050,0,10,0,0,0,,2,,0,000000,,0)(202050,0,0,0,0,0,,2,,0,000000,,0)(202050,0,0,0,0,0,,2,,0,00FFFF,,0)(202050,0,0,0,0,0,,2,,0,00FFFF,,0)(202050,0,0,0,0,0,,0,,0,000000,,0)(202050,0,0,0,0,0,,0,,0,FFFFFF,,0)(202050,0,20,0,0,0,,0,,0,00FFFF,,0)(202050,0,20,0,0,0,,0,,0,000000,,0)(202050,0,0,0,0,0,,0,,0,000000,,0)(202050,0,0,0,0,0,,2,,0,000000,,0)(202050,0,0,0,0,0,,0,,0,000000,,0) +(202050,0,0,0,0,0,,2,,0,000000,,0)(202050,0,20,0,0,0,,2,,0,00FFFF,,0)(202050,0,20,0,0,0,,2,,0,00FFFF,,0)(202050,0,0,0,0,0,,2,,0,000000,,0)(202050,0,0,0,0,0,,2,,0,000000,,0)(202050,0,0,0,0,0,,2,,0,000000,,0)(202050,0,0,0,0,0,,2,,0,000000,,0)(202050,0,0,0,0,0,,2,,0,000000,,0)(202050,0,0,0,0,0,,2,,0,000000,,0)(202050,0,0,0,0,0,,2,,0,000000,,0)(202050,3,15,0,0,0,,2,,0,00FF00,,0)(202050,5,2,0,0,0,,2,,0,00FF00,,0)(202050,0,1,0,0,0,,2,,0,00FFFF,,0)(202050,0,1,0,0,0,,2,,0,00FFFF,,0)(202050,515,1,0,0,0,,2,,0,00FFFF,,0)(202050,515,1,0,0,0,,0,,0,00FFFF,,0)(202050,0,1,0,0,0,,2,,0,00FFFF,,0)(202050,0,1,0,0,0,,2,,0,00FFFF,,0)(202050,0,1,0,0,0,,2,,0,00FFFF,,0)(202050,0,1,0,0,0,,2,,0,00FFFF,,0)(202050,0,1,0,0,0,,2,,0,00FFFF,,0)(202050,0,1,0,0,0,,2,,0,00FFFF,,0)(202050,0,1,0,0,0,,2,,0,00FFFF,,0)(202050,0,1,0,0,0,,2,,0,00FFFF,,0)(202050,0,1,0,0,0,,2,,0,00FFFF,,0)(202050,0,1,0,0,0,,2,,0,00FFFF,,0)(202050,0,1,0,0,0,,2,,0,00FFFF,,0)(202050,0,7,0,0,0,,2,,0,000000,,0)(202050,0,0,0,0,0,,2,,0,000000,,0)(202050,0,0,0,0,0,,2,,0,000000,,0)(202050,0,0,0,0,0,,2,,0,00FFFF,,0)(202050,0,0,0,0,0,,2,,0,000000,,0)(202050,0,0,0,0,0,,0,,0,00FFFF,,0)(202050,0,0,0,0,0,,0,,0,FFFFFF,,0)(202050,526,20,0,0,0,,2,,0,00FFFF,,0)(202050,0,20,0,0,0,,0,,0,000000,,0)(202050,0,0,0,0,0,,0,,0,000000,,0)(202050,0,0,0,0,0,,0,,0,00FFFF,,0)(202050,0,0,0,0,0,,0,,0,000000,,0) +(202050,0,0,0,0,0,,2,,0,000000,,0)(202050,0,19,0,0,0,,2,,0,00FFFF,,0)(202050,0,19,0,0,0,,2,,0,00FFFF,,0)(202050,0,0,0,0,0,,2,,0,000000,,0)(202050,0,0,0,0,0,,2,,0,000000,,0)(202050,0,0,0,0,0,,2,,0,000000,,0)(202050,520,30,0,2,1,,2,,0,00FF00,,0)(202050,0,0,0,0,0,,2,,0,000000,,0)(202050,0,0,0,0,0,,2,,0,000000,,0)(202050,0,10,0,0,0,,2,,0,000000,,0)(202050,0,10,0,0,0,,2,,0,000000,,0)(202050,0,0,0,0,0,,2,,0,000000,,0)(202050,316,30,0,3,1,,2,,0,00FF00,,0)(202050,0,0,0,0,0,,2,,0,000000,,0)(202050,0,0,0,0,0,,2,,0,000000,,0)(202050,0,31,0,0,0,,2,,0,000000,,0)(202050,0,31,0,0,0,,2,,0,000000,,0)(202050,0,31,0,0,0,QUAI 1,1,ARIAL,12,FFFFFF,G,0)(202050,0,31,0,0,0,,2,,8,00FF00,,0)(202050,0,31,0,0,0,,2,,8,00FF00,,0)(202050,0,31,0,0,0,,2,,0,000000,,0)(202050,0,31,0,0,0,,2,,0,000000,,0)(202050,0,31,0,0,0,,2,,0,000000,,0)(202050,0,31,0,0,0,,2,,0,000000,,0)(202050,0,31,0,0,0,,2,,0,000000,,0)(202050,0,0,0,0,0,,2,,0,000000,,0)(202050,0,0,0,0,0,,2,,0,000000,,0)(202050,190,30,0,2,1,,2,,0,00FF00,,0)(202050,0,0,0,0,0,,2,,0,000000,,0)(202050,0,0,0,0,0,,2,,0,000000,,0)(202050,0,0,0,0,0,,2,,0,000000,,0)(202050,0,0,0,0,0,,2,,0,000000,,0)(202050,0,0,0,0,0,,0,,0,00FFFF,,0)(202050,0,0,0,0,0,,0,,0,000000,,0)(202050,0,18,0,0,0,,0,,0,00FFFF,,0)(202050,0,18,0,0,0,,0,,0,00FFFF,,0)(202050,0,0,0,0,0,,0,,0,00FFFF,,0)(202050,0,0,0,0,0,,0,,0,000000,,0)(202050,0,0,0,0,0,,0,,0,000000,,0) +(202050,0,0,0,0,0,,2,,0,000000,,0)(202050,0,0,0,0,0,,2,,0,000000,,0)(202050,0,11,0,0,0,,2,,0,00FFFF,,0)(202050,0,6,0,0,0,,2,,0,000000,,0)(202050,518,1,0,0,0,,0,,0,00FFFF,,0)(202050,518,1,0,0,0,,2,,0,00FFFF,,0)(202050,0,1,0,0,0,,2,,0,00FFFF,,0)(202050,0,1,0,0,0,,2,,0,00FFFF,,0)(202050,1,3,0,0,0,,2,,8,00FF00,,0)(202050,100,21,0,0,0,,2,,0,00FF00,,0)(202050,0,1,0,0,0,,2,,0,00FFFF,,0)(202050,0,1,0,0,0,,2,,0,00FFFF,,0)(202050,0,1,0,0,0,,2,,0,00FFFF,,0)(202050,0,1,0,0,0,,2,,0,00FFFF,,0)(202050,0,1,0,0,0,,2,,0,00FFFF,,0)(202050,0,1,0,0,0,VOIE 2,2,ARIAL,10,00FFFF,,0)(202050,0,1,0,0,0,,2,,0,00FFFF,,0)(202050,0,1,0,0,0,,2,,0,00FFFF,,0)(202050,0,1,0,0,0,,2,,0,00FFFF,,0)(202050,0,1,0,0,0,,2,,0,00FFFF,,0)(202050,0,1,0,0,0,,2,,0,00FFFF,,0)(202050,0,1,0,0,0,,2,,0,00FFFF,,0)(202050,0,1,0,0,0,,2,,0,00FFFF,,0)(202050,0,1,0,0,0,,2,,0,00FFFF,,0)(202050,0,1,0,0,0,,2,,0,00FFFF,,0)(202050,523,1,0,0,0,,0,,0,00FFFF,,0)(202050,523,1,0,0,0,,2,,0,00FFFF,,0)(202050,0,1,0,0,0,,2,,0,00FFFF,,0)(202050,0,1,0,0,0,,2,,0,00FFFF,,0)(202050,0,1,0,0,0,,2,,0,00FFFF,,0)(202050,0,1,0,0,0,,2,,0,00FFFF,,0)(202050,0,1,0,0,0,,2,,0,00FFFF,,0)(202050,0,1,0,0,0,,2,,0,00FFFF,,0)(202050,0,7,0,0,0,,2,,0,00FFFF,,0)(202050,0,10,0,0,0,,0,,0,00FFFF,,0)(202050,0,0,0,0,0,,0,,0,00FFFF,,0)(202050,0,0,0,0,0,,0,,0,000000,,0)(202050,0,0,0,0,0,,0,,0,000000,,0)(202050,0,0,0,0,0,,0,,0,000000,,0) +(202050,530,1,0,0,0,,2,,0,00FFFF,,0)(202050,0,1,0,0,0,,2,,0,00FFFF,,0)(202050,0,8,0,0,0,,2,,0,00FFFF,,0)(202050,0,6,0,0,0,,2,,0,000000,,0)(202050,0,1,0,0,0,,2,,0,00FFFF,,0)(202050,0,1,0,0,0,,2,,0,00FFFF,,0)(202050,0,1,0,0,0,,2,,0,00FFFF,,0)(202050,12,4,1,0,0,,2,,0,00FF00,,0)(202050,2,3,0,0,0,,2,,0,00FF00,,0)(202050,0,1,0,0,0,,2,,0,00FFFF,,0)(202050,0,1,0,0,0,,2,,0,00FFFF,,0)(202050,519,1,0,0,0,,2,,0,00FFFF,,0)(202050,519,1,0,0,0,,0,,0,00FFFF,,0)(202050,0,1,0,0,0,,2,,0,00FFFF,,0)(202050,0,1,0,0,0,,2,,0,00FFFF,,0)(202050,0,1,0,0,0,VOIE 1,2,ARIAL,10,00FFFF,,0)(202050,0,1,0,0,0,,2,,0,00FFFF,,0)(202050,0,1,0,0,0,,2,,0,00FFFF,,0)(202050,0,1,0,0,0,,2,,0,00FFFF,,0)(202050,0,1,0,0,0,,2,,0,00FFFF,,0)(202050,0,1,0,0,0,,2,,0,00FFFF,,0)(202050,0,1,0,0,0,,2,,8,00FFFF,,0)(202050,0,1,0,0,0,,2,,0,00FFFF,,0)(202050,0,1,0,0,0,,2,,0,00FFFF,,0)(202050,0,1,0,0,0,,2,,0,00FFFF,,0)(202050,0,1,0,0,0,,2,,0,00FFFF,,0)(202050,0,1,0,0,0,,2,,0,00FFFF,,0)(202050,0,1,0,0,0,,2,,0,00FFFF,,0)(202050,7,2,0,0,0,,2,,0,00FF00,,0)(202050,0,1,0,0,0,,2,,0,00FFFF,,0)(202050,527,1,0,0,0,,2,,8,00FFFF,,0)(202050,0,1,0,0,0,,3,,8,00FFFF,,0)(202050,0,1,0,0,0,,0,,0,00FFFF,,0)(202050,0,7,0,0,0,,0,,0,00FFFF,,0)(202050,0,0,0,0,0,,0,,0,00FFFF,,0)(202050,0,0,0,0,0,,0,,0,000000,,0)(202050,0,0,0,0,0,,0,,0,000000,,0)(202050,0,0,0,0,0,,0,,0,000000,,0)(202050,0,0,0,0,0,,0,,0,000000,,0) +(202050,529,1,0,0,0,,2,,0,00FFFF,,0)(202050,0,1,0,0,0,,0,,0,00FFFF,,0)(202050,0,1,0,0,0,,2,,0,00FFFF,,0)(202050,26,22,0,0,0,,0,,0,00FFFF,,0)(202050,0,1,0,0,0,,2,,0,00FFFF,,0)(202050,0,1,0,0,0,,0,,0,00FFFF,,0)(202050,0,1,0,0,0,,0,,0,00FFFF,,0)(202050,0,8,0,0,0,,0,,0,000000,,0)(202050,0,11,0,0,0,,0,,0,000000,,0)(202050,330,30,0,3,1,,0,,0,00FF00,,0)(202050,0,0,0,0,0,,0,,0,000000,,0)(202050,0,0,0,0,0,,0,,0,000000,,0)(202050,0,0,0,0,0,,0,,0,000000,,0)(202050,0,0,0,0,0,,0,,0,000000,,0)(202050,0,0,0,0,0,,0,,0,000000,,0)(202050,0,31,0,0,0,,0,,0,000000,,0)(202050,0,31,0,0,0,,0,,0,000000,,0)(202050,0,31,0,0,0,QUAI 2,1,ARIAL,12,FFFFFF,G,0)(202050,0,31,0,0,0,,0,,0,000000,,0)(202050,0,31,0,0,0,,0,,0,000000,,0)(202050,0,31,0,0,0,,0,,0,000000,,0)(202050,0,31,0,0,0,,0,,0,000000,,0)(202050,0,31,0,0,0,,0,,0,000000,,0)(202050,0,31,0,0,0,,0,,0,000000,,0)(202050,0,31,0,0,0,,0,,0,000000,,0)(202050,0,0,0,0,0,,0,,0,000000,,0)(202050,0,0,0,0,0,,0,,0,000000,,0)(202050,0,10,0,0,0,,0,,0,000000,,0)(202050,204,30,0,3,1,,0,,0,00FF00,,0)(202050,0,0,0,0,0,,0,,0,000000,,0)(202050,0,0,0,0,0,,0,,0,000000,,0)(202050,0,0,0,0,0,,0,,8,00FF00,,0)(202050,0,0,0,0,0,,0,,0,000000,,0)(202050,0,0,0,0,0,,0,,0,000000,,0)(202050,0,0,0,0,0,,0,,0,000000,,0)(202050,0,0,0,0,0,,0,,0,000000,,0)(202050,0,0,0,0,0,,0,,0,000000,,0)(202050,0,0,0,0,0,,0,,0,000000,,0)(202050,0,0,0,0,0,,0,,0,000000,,0) +(202050,0,0,0,0,0,,0,,0,000000,,0)(202050,0,0,0,0,0,,0,,0,000000,,0)(202050,0,0,0,0,0,,0,,0,000000,,0)(202050,0,0,0,0,0,,2,,0,000000,,0)(202050,0,6,0,0,0,,0,,0,00FFFF,,0)(202050,0,1,0,0,0,,0,,0,00FFFF,,0)(202050,0,1,0,0,0,,0,,0,00FFFF,,0)(202050,0,1,0,0,0,,0,,0,00FFFF,,0)(202050,21,5,0,0,0,,0,,0,00FF00,,0)(202050,20,5,0,0,0,,0,,0,00FF00,,0)(202050,520,1,0,0,0,,2,,8,00FFFF,,0)(202050,520,1,0,0,0,,0,,0,00FFFF,,0)(202050,520,1,0,0,0,,0,,0,00FFFF,,0)(202050,0,1,0,0,0,,0,,8,00FFFF,,0)(202050,0,1,0,0,0,,0,,0,00FFFF,,0)(202050,0,1,0,0,0,,0,,0,00FFFF,,0)(202050,0,1,0,0,0,,0,,8,00FFFF,,0)(202050,0,1,0,0,0,,0,,0,00FFFF,,0)(202050,0,1,0,0,0,,0,,0,00FFFF,,0)(202050,0,1,0,0,0,,0,,8,00FFFF,,0)(202050,0,1,0,0,0,,2,,0,00FFFF,,0)(202050,0,1,0,0,0,,0,,0,00FFFF,,0)(202050,0,1,0,0,0,,0,,8,00FFFF,,0)(202050,0,1,0,0,0,,0,,0,00FFFF,,0)(202050,0,1,0,0,0,,0,,8,00FFFF,,0)(202050,0,1,0,0,0,,2,,0,00FFFF,,0)(202050,0,7,0,0,0,,0,,0,000000,,0)(202050,0,0,0,0,0,,0,,0,000000,,0)(202050,0,0,0,0,0,,0,,0,000000,,0)(202050,0,0,0,0,0,,0,,0,000000,,0)(202050,0,0,0,0,0,,0,,0,000000,,0)(202050,0,0,0,0,0,,0,,8,00FF00,,0)(202050,0,0,0,0,0,,0,,0,000000,,0)(202050,0,0,0,0,0,,0,,0,000000,,0)(202050,0,0,0,0,0,,2,,0,000000,,0)(202050,0,0,0,0,0,,0,,0,000000,,0)(202050,0,0,0,0,0,,0,,0,000000,,0)(202050,0,0,0,0,0,,0,,0,000000,,0)(202050,0,0,0,0,0,,0,,0,000000,,0) +(202050,0,0,0,0,0,,0,,0,000000,,0)(202050,0,0,0,0,0,,0,,0,000000,,0)(202050,0,0,0,0,0,,0,,0,000000,,0)(202050,0,0,0,0,0,,0,,0,000000,,0)(202050,0,0,0,0,0,,0,,0,000000,,0)(202050,0,0,0,0,0,,0,,0,000000,,0)(202050,0,0,0,0,0,,0,,0,000000,,0)(202050,0,0,0,0,0,,0,,0,000000,,0)(202050,176,30,0,3,1,,0,,0,00FF00,,0)(202050,0,0,0,0,0,,0,,0,000000,,0)(202050,0,0,0,0,0,,0,,0,000000,,0)(202050,0,0,0,0,0,,0,,0,000000,,0)(202050,0,0,0,0,0,,3,,8,00FF00,,0)(202050,0,0,0,0,0,,0,,8,00FF00,,0)(202050,0,0,0,0,0,,2,,0,000000,,0)(202050,0,0,0,0,0,,0,,0,000000,,0)(202050,0,0,0,0,0,,0,,8,00FF00,,0)(202050,0,0,0,0,0,,0,,0,000000,,0)(202050,0,0,0,0,0,,0,,8,00FF00,,0)(202050,0,0,0,0,0,,0,,0,000000,,0)(202050,0,0,0,0,0,,0,,8,00FF00,,0)(202050,0,0,0,0,0,,0,,0,000000,,0)(202050,0,0,0,0,0,,0,,0,000000,,0)(202050,0,0,0,0,0,,0,,0,000000,,0)(202050,0,0,0,0,0,,0,,0,000000,,0)(202050,0,0,0,0,0,,0,,0,000000,,0)(202050,0,0,0,0,0,,0,,0,00FFFF,,0)(202050,0,0,0,0,0,,0,,0,000000,,0)(202050,0,0,0,0,0,,0,,0,000000,,0)(202050,0,0,0,0,0,,2,,0,000000,,0)(202050,0,0,0,0,0,,0,,0,000000,,0)(202050,0,0,0,0,0,,0,,0,000000,,0)(202050,0,0,0,0,0,,0,,0,000000,,0)(202050,0,0,0,0,0,,0,,0,000000,,0)(202050,0,0,0,0,0,,0,,0,000000,,0)(202050,0,0,0,0,0,,0,,0,000000,,0)(202050,0,0,0,0,0,,0,,0,000000,,0)(202050,0,0,0,0,0,,0,,0,000000,,0)(202050,0,0,0,0,0,,0,,0,000000,,0) +(202050,0,0,0,0,0,,0,,0,000000,,0)(202050,0,0,0,0,0,,0,,0,000000,,0)(202050,0,0,0,0,0,,0,,0,000000,,0)(202050,0,0,0,0,0,,0,,0,000000,,0)(202050,0,0,0,0,0,,0,,0,000000,,0)(202050,0,0,0,0,0,,0,,0,000000,,0)(202050,0,0,0,0,0,,0,,0,000000,,0)(202050,0,0,0,0,0,,0,,0,000000,,0)(202050,0,0,0,0,0,,0,,0,000000,,0)(202050,0,0,0,0,0,,0,,0,000000,,0)(202050,0,0,0,0,0,,0,,0,000000,,0)(202050,0,0,0,0,0,,0,,0,000000,,0)(202050,0,0,0,0,0,,0,,0,000000,,0)(202050,0,0,0,0,0,,0,,0,000000,,0)(202050,0,0,0,0,0,,0,,0,000000,,0)(202050,0,0,0,0,0,,0,,0,000000,,0)(202050,0,0,0,0,0,,0,,0,000000,,0)(202050,0,0,0,0,0,,0,,0,000000,,0)(202050,0,0,0,0,0,,0,,0,000000,,0)(202050,0,0,0,0,0,,0,,0,000000,,0)(202050,0,0,0,0,0,,0,,0,000000,,0)(202050,0,0,0,0,0,,0,,0,000000,,0)(202050,0,0,0,0,0,,0,,0,000000,,0)(202050,0,0,0,0,0,,0,,0,000000,,0)(202050,0,0,0,0,0,,0,,0,000000,,0)(202050,0,0,0,0,0,,0,,0,000000,,0)(202050,0,0,0,0,0,,0,,0,000000,,0)(202050,0,0,0,0,0,,0,,0,00FFFF,,0)(202050,0,0,0,0,0,,0,,0,000000,,0)(202050,0,0,0,0,0,,0,,0,000000,,0)(202050,0,0,0,0,0,,0,,0,000000,,0)(202050,0,0,0,0,0,,0,,0,000000,,0)(202050,0,0,0,0,0,,0,,0,000000,,0)(202050,0,0,0,0,0,,0,,0,000000,,0)(202050,0,0,0,0,0,,0,,0,000000,,0)(202050,0,0,0,0,0,,0,,0,000000,,0)(202050,0,0,0,0,0,,0,,0,000000,,0)(202050,0,0,0,0,0,,0,,0,000000,,0)(202050,0,0,0,0,0,,0,,0,000000,,0) diff --git a/verif_version.pas b/verif_version.pas index 9b68ea0..cf5f033 100644 --- a/verif_version.pas +++ b/verif_version.pas @@ -23,7 +23,7 @@ var Lance_verif : integer; verifVersion,notificationVersion : boolean; -Const Version='6.1'; // sert à la comparaison de la version publiée +Const Version='6.2'; // sert à la comparaison de la version publiée SousVersion=' '; // A B C ... en cas d'absence de sous version mettre un espace function GetCurrentProcessEnvVar(const VariableName: string): string; @@ -31,6 +31,8 @@ function verifie_version : real; implementation +uses unitconfig; + {$R *.dfm} Procedure Aff(s : string); @@ -284,8 +286,10 @@ end; procedure TFormVersion.FormCreate(Sender: TObject); begin + if debug=1 then Affiche('Création fenêtre version',clLime); Timerverif.Interval:=1000; // timer à 1 seconde Lance_verif:=2; // lancer la vérification de version dans 3s + if debug=1 then Affiche('Fin création fenêtre version',clLime); end; procedure TFormVersion.TimerVerifTimer(Sender: TObject); @@ -299,6 +303,7 @@ begin timerVerif.Enabled:=false; if not(AvecInit) then exit; if not(verifVersion) then exit; + if debug=1 then Affiche('Vérification version en ligne',clLime); V_publie:=verifie_version; if notificationVersion and (v_publie>0) then begin diff --git a/versions.txt b/versions.txt index 90d8ad3..38bd1c3 100644 --- a/versions.txt +++ b/versions.txt @@ -167,3 +167,7 @@ version 6.0 : Gestion du d Nécessite la version >=23.04 de CDM rail. version 6.1 : Amélioration de la fenêtre réseau CDM. Animation des trains dans la fenêtre réseau CDM. +version 6.2 : Déplacement du curseur du TCO avec les touches curseur. + Dessin du TCO à la souris + +