easylinux/SignauxComplexes
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

V8.3

Browse Source
This commit is contained in:
f1iwq2
2023-12-08 15:14:26 +01:00
parent e0b9857f1d
commit bf274b0fa7
24 changed files with 4167 additions and 3499 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Notice d'utilisation des signaux_complexes_GL_V8.27.pdf → Notice d'utilisation des signaux_complexes_GL_V8.3.pdf
BIN
View File
Binary file not shown.
Signaux_complexes_GL.cfg
+2 -2
View File
@@ -14,8 +14,8 @@
-$N+ -$N+
-$O- -$O-
-$P+ -$P+
-$Q- -$Q+
-$R- -$R+
-$S- -$S-
-$T- -$T-
-$U- -$U-
Signaux_complexes_GL.dof
+2 -2
View File
@@ -17,8 +17,8 @@ M=0
N=1 N=1
O=0 O=0
P=1 P=1
Q=0 Q=1
R=0 R=1
S=0 S=0
T=0 T=0
U=0 U=0
Signaux_complexes_GL.map
+201 -201
View File
@@ -1,104 +1,104 @@
Start Length Name Class Start Length Name Class
0001:00000000 001688D8H .text CODE 0001:00000000 0019E6D8H .text CODE
0002:00000000 00002BE8H .data DATA 0002:00000000 00002C20H .data DATA
0002:00002BE8 041CEA31H .bss BSS 0002:00002C20 045A150DH .bss BSS
Detailed map of segments Detailed map of segments
0001:00000000 00005DF3 C=CODE S=.text G=(none) M=System ACBP=A9 0001:00000000 00005EC7 C=CODE S=.text G=(none) M=System ACBP=A9
0001:00005DF4 00000140 C=CODE S=.text G=(none) M=SysInit ACBP=A9 0001:00005EC8 00000140 C=CODE S=.text G=(none) M=SysInit ACBP=A9
0001:00005F34 00000108 C=CODE S=.text G=(none) M=Types ACBP=A9 0001:00006008 00000108 C=CODE S=.text G=(none) M=Types ACBP=A9
0001:0000603C 00000ED8 C=CODE S=.text G=(none) M=Windows ACBP=A9 0001:00006110 00000F08 C=CODE S=.text G=(none) M=Windows ACBP=A9
0001:00006F14 00000038 C=CODE S=.text G=(none) M=Messages ACBP=A9 0001:00007018 00000038 C=CODE S=.text G=(none) M=Messages ACBP=A9
0001:00006F4C 00000338 C=CODE S=.text G=(none) M=SysConst ACBP=A9 0001:00007050 00000338 C=CODE S=.text G=(none) M=SysConst ACBP=A9
0001:00007284 00006E28 C=CODE S=.text G=(none) M=SysUtils ACBP=A9 0001:00007388 00006E28 C=CODE S=.text G=(none) M=SysUtils ACBP=A9
0001:0000E0AC 0000081B C=CODE S=.text G=(none) M=VarUtils ACBP=A9 0001:0000E1B0 0000081B C=CODE S=.text G=(none) M=VarUtils ACBP=A9
0001:0000E8C8 0000809A C=CODE S=.text G=(none) M=Variants ACBP=A9 0001:0000E9CC 0000809A C=CODE S=.text G=(none) M=Variants ACBP=A9
0001:00016964 00000188 C=CODE S=.text G=(none) M=RTLConsts ACBP=A9 0001:00016A68 000001A0 C=CODE S=.text G=(none) M=RTLConsts ACBP=A9
0001:00016AEC 0000083C C=CODE S=.text G=(none) M=TypInfo ACBP=A9 0001:00016C08 0000083C C=CODE S=.text G=(none) M=TypInfo ACBP=A9
0001:00017328 00000358 C=CODE S=.text G=(none) M=ActiveX ACBP=A9 0001:00017444 00000358 C=CODE S=.text G=(none) M=ActiveX ACBP=A9
0001:00017680 0000A236 C=CODE S=.text G=(none) M=Classes ACBP=A9 0001:0001779C 0000A7EA C=CODE S=.text G=(none) M=Classes ACBP=A9
0001:000218B8 00000370 C=CODE S=.text G=(none) M=Consts ACBP=A9 0001:00021F88 00000370 C=CODE S=.text G=(none) M=Consts ACBP=A9
0001:00021C28 00009BFB C=CODE S=.text G=(none) M=Graphics ACBP=A9 0001:000222F8 00009BFB C=CODE S=.text G=(none) M=Graphics ACBP=A9
0001:0002B824 00000124 C=CODE S=.text G=(none) M=Math ACBP=A9 0001:0002BEF4 00000124 C=CODE S=.text G=(none) M=Math ACBP=A9
0001:0002B948 000002B8 C=CODE S=.text G=(none) M=Contnrs ACBP=A9 0001:0002C018 000002B8 C=CODE S=.text G=(none) M=Contnrs ACBP=A9
0001:0002BC00 00000198 C=CODE S=.text G=(none) M=CommCtrl ACBP=A9 0001:0002C2D0 00000198 C=CODE S=.text G=(none) M=CommCtrl ACBP=A9
0001:0002BD98 00000787 C=CODE S=.text G=(none) M=MultiMon ACBP=A9 0001:0002C468 00000787 C=CODE S=.text G=(none) M=MultiMon ACBP=A9
0001:0002C520 00000038 C=CODE S=.text G=(none) M=Imm ACBP=A9 0001:0002CBF0 00000038 C=CODE S=.text G=(none) M=Imm ACBP=A9
0001:0002C558 00000FF8 C=CODE S=.text G=(none) M=HelpIntfs ACBP=A9 0001:0002CC28 00000FF8 C=CODE S=.text G=(none) M=HelpIntfs ACBP=A9
0001:0002D550 00000058 C=CODE S=.text G=(none) M=WinSpool ACBP=A9 0001:0002DC20 00000058 C=CODE S=.text G=(none) M=WinSpool ACBP=A9
0001:0002D5A8 000010C8 C=CODE S=.text G=(none) M=Printers ACBP=A9 0001:0002DC78 000010C8 C=CODE S=.text G=(none) M=Printers ACBP=A9
0001:0002E670 0000031F C=CODE S=.text G=(none) M=FlatSB ACBP=A9 0001:0002ED40 0000031F C=CODE S=.text G=(none) M=FlatSB ACBP=A9
0001:0002E990 000001A4 C=CODE S=.text G=(none) M=SyncObjs ACBP=A9 0001:0002F060 000003F0 C=CODE S=.text G=(none) M=SyncObjs ACBP=A9
0001:0002EB34 000009BB C=CODE S=.text G=(none) M=UxTheme ACBP=A9 0001:0002F450 000009BB C=CODE S=.text G=(none) M=UxTheme ACBP=A9
0001:0002F4F0 00000038 C=CODE S=.text G=(none) M=RichEdit ACBP=A9 0001:0002FE0C 00000038 C=CODE S=.text G=(none) M=RichEdit ACBP=A9
0001:0002F528 00000038 C=CODE S=.text G=(none) M=ToolWin ACBP=A9 0001:0002FE44 00000038 C=CODE S=.text G=(none) M=ToolWin ACBP=A9
0001:0002F560 00000040 C=CODE S=.text G=(none) M=ShellAPI ACBP=A9 0001:0002FE7C 00000040 C=CODE S=.text G=(none) M=ShellAPI ACBP=A9
0001:0002F5A0 00000038 C=CODE S=.text G=(none) M=RegStr ACBP=A9 0001:0002FEBC 00000038 C=CODE S=.text G=(none) M=RegStr ACBP=A9
0001:0002F5D8 00000058 C=CODE S=.text G=(none) M=WinInet ACBP=A9 0001:0002FEF4 00000058 C=CODE S=.text G=(none) M=WinInet ACBP=A9
0001:0002F630 00000038 C=CODE S=.text G=(none) M=UrlMon ACBP=A9 0001:0002FF4C 00000038 C=CODE S=.text G=(none) M=UrlMon ACBP=A9
0001:0002F668 0000006C C=CODE S=.text G=(none) M=ShlObj ACBP=A9 0001:0002FF84 0000006C C=CODE S=.text G=(none) M=ShlObj ACBP=A9
0001:0002F6D4 00000060 C=CODE S=.text G=(none) M=CommDlg ACBP=A9 0001:0002FFF0 00000060 C=CODE S=.text G=(none) M=CommDlg ACBP=A9
0001:0002F734 00000038 C=CODE S=.text G=(none) M=Dlgs ACBP=A9 0001:00030050 00000038 C=CODE S=.text G=(none) M=Dlgs ACBP=A9
0001:0002F76C 000036D1 C=CODE S=.text G=(none) M=Dialogs ACBP=A9 0001:00030088 000036D1 C=CODE S=.text G=(none) M=Dialogs ACBP=A9
0001:00032E40 00004ADA C=CODE S=.text G=(none) M=ExtCtrls ACBP=A9 0001:0003375C 00004ADA C=CODE S=.text G=(none) M=ExtCtrls ACBP=A9
0001:0003791C 00000090 C=CODE S=.text G=(none) M=ComStrs ACBP=A9 0001:00038238 00000090 C=CODE S=.text G=(none) M=ComStrs ACBP=A9
0001:000379AC 000007A0 C=CODE S=.text G=(none) M=Clipbrd ACBP=A9 0001:000382C8 000007A0 C=CODE S=.text G=(none) M=Clipbrd ACBP=A9
0001:0003814C 00000128 C=CODE S=.text G=(none) M=StrUtils ACBP=A9 0001:00038A68 00000128 C=CODE S=.text G=(none) M=StrUtils ACBP=A9
0001:00038274 00003821 C=CODE S=.text G=(none) M=Buttons ACBP=A9 0001:00038B90 00003821 C=CODE S=.text G=(none) M=Buttons ACBP=A9
0001:0003BA98 00000038 C=CODE S=.text G=(none) M=ExtDlgs ACBP=A9 0001:0003C3B4 00000038 C=CODE S=.text G=(none) M=ExtDlgs ACBP=A9
0001:0003BAD0 00000068 C=CODE S=.text G=(none) M=IniFiles ACBP=A9 0001:0003C3EC 00000068 C=CODE S=.text G=(none) M=IniFiles ACBP=A9
0001:0003BB38 00000068 C=CODE S=.text G=(none) M=Registry ACBP=A9 0001:0003C454 00000068 C=CODE S=.text G=(none) M=Registry ACBP=A9
0001:0003BBA0 0000006C C=CODE S=.text G=(none) M=Mapi ACBP=A9 0001:0003C4BC 0000006C C=CODE S=.text G=(none) M=Mapi ACBP=A9
0001:0003BC0C 00000058 C=CODE S=.text G=(none) M=ExtActns ACBP=A9 0001:0003C528 00000058 C=CODE S=.text G=(none) M=ExtActns ACBP=A9
0001:0003BC64 00000038 C=CODE S=.text G=(none) M=ListActns ACBP=A9 0001:0003C580 00000038 C=CODE S=.text G=(none) M=ListActns ACBP=A9
0001:0003BC9C 00009948 C=CODE S=.text G=(none) M=ComCtrls ACBP=A9 0001:0003C5B8 00009948 C=CODE S=.text G=(none) M=ComCtrls ACBP=A9
0001:000455E4 00000EA0 C=CODE S=.text G=(none) M=Themes ACBP=A9 0001:00045F00 00000EA0 C=CODE S=.text G=(none) M=Themes ACBP=A9
0001:00046484 0000C698 C=CODE S=.text G=(none) M=StdCtrls ACBP=A9 0001:00046DA0 0000C698 C=CODE S=.text G=(none) M=StdCtrls ACBP=A9
0001:00052B1C 00000168 C=CODE S=.text G=(none) M=StdActns ACBP=A9 0001:00053438 00000168 C=CODE S=.text G=(none) M=StdActns ACBP=A9
0001:00052C84 00000D1F C=CODE S=.text G=(none) M=WinHelpViewer ACBP=A9 0001:000535A0 00000D1F C=CODE S=.text G=(none) M=WinHelpViewer ACBP=A9
0001:000539A4 00011403 C=CODE S=.text G=(none) M=Controls ACBP=A9 0001:000542C0 00011403 C=CODE S=.text G=(none) M=Controls ACBP=A9
0001:00064DA8 00001292 C=CODE S=.text G=(none) M=ActnList ACBP=A9 0001:000656C4 00001292 C=CODE S=.text G=(none) M=ActnList ACBP=A9
0001:0006603C 00001B9C C=CODE S=.text G=(none) M=ImgList ACBP=A9 0001:00066958 00001B9C C=CODE S=.text G=(none) M=ImgList ACBP=A9
0001:00067BD8 000066E1 C=CODE S=.text G=(none) M=Menus ACBP=A9 0001:000684F4 000066E1 C=CODE S=.text G=(none) M=Menus ACBP=A9
0001:0006E2BC 0000CEFC C=CODE S=.text G=(none) M=Forms ACBP=A9 0001:0006EBD8 0000CEFC C=CODE S=.text G=(none) M=Forms ACBP=A9
0001:0007B1B8 00000060 C=CODE S=.text G=(none) M=ComConst ACBP=A9 0001:0007BAD4 00000060 C=CODE S=.text G=(none) M=ComConst ACBP=A9
0001:0007B218 00001259 C=CODE S=.text G=(none) M=ComObj ACBP=A9 0001:0007BB34 00001259 C=CODE S=.text G=(none) M=ComObj ACBP=A9
0001:0007C474 00000038 C=CODE S=.text G=(none) M=StdVCL ACBP=A9 0001:0007CD90 00000038 C=CODE S=.text G=(none) M=StdVCL ACBP=A9
0001:0007C4AC 00001793 C=CODE S=.text G=(none) M=AxCtrls ACBP=A9 0001:0007CDC8 00001793 C=CODE S=.text G=(none) M=AxCtrls ACBP=A9
0001:0007DC40 00000060 C=CODE S=.text G=(none) M=OleConst ACBP=A9 0001:0007E55C 00000060 C=CODE S=.text G=(none) M=OleConst ACBP=A9
0001:0007DCA0 00003519 C=CODE S=.text G=(none) M=OleCtrls ACBP=A9 0001:0007E5BC 00003519 C=CODE S=.text G=(none) M=OleCtrls ACBP=A9
0001:000811BC 00000050 C=CODE S=.text G=(none) M=JConsts ACBP=A9 0001:00081AD8 00000050 C=CODE S=.text G=(none) M=JConsts ACBP=A9
0001:0008120C 000133EC C=CODE S=.text G=(none) M=jpeg ACBP=A9 0001:00081B28 000133EC C=CODE S=.text G=(none) M=jpeg ACBP=A9
0001:000945F8 00000314 C=CODE S=.text G=(none) M=TlHelp32 ACBP=A9 0001:00094F14 00000314 C=CODE S=.text G=(none) M=TlHelp32 ACBP=A9
0001:0009490C 000000D8 C=CODE S=.text G=(none) M=WinSock ACBP=A9 0001:00095228 00000128 C=CODE S=.text G=(none) M=WinSock ACBP=A9
0001:000949E4 00001F40 C=CODE S=.text G=(none) M=ScktComp ACBP=A9 0001:00095350 00003A78 C=CODE S=.text G=(none) M=ScktComp ACBP=A9
0001:00096924 000008EA C=CODE S=.text G=(none) M=OleServer ACBP=A9 0001:00098DC8 000008EA C=CODE S=.text G=(none) M=OleServer ACBP=A9
0001:00097210 00000598 C=CODE S=.text G=(none) M=MSCommLib_TLB ACBP=A9 0001:000996B4 00000598 C=CODE S=.text G=(none) M=MSCommLib_TLB ACBP=A9
0001:000977A8 00000040 C=CODE S=.text G=(none) M=MMSystem ACBP=A9 0001:00099C4C 00000040 C=CODE S=.text G=(none) M=MMSystem ACBP=A9
0001:000977E8 00000038 C=CODE S=.text G=(none) M=Nb30 ACBP=A9 0001:00099C8C 00000038 C=CODE S=.text G=(none) M=Nb30 ACBP=A9
0001:00097820 00000A18 C=CODE S=.text G=(none) M=MaskUtils ACBP=A9 0001:00099CC4 00000A18 C=CODE S=.text G=(none) M=MaskUtils ACBP=A9
0001:00098238 00002108 C=CODE S=.text G=(none) M=Mask ACBP=A9 0001:0009A6DC 00002108 C=CODE S=.text G=(none) M=Mask ACBP=A9
0001:0009A340 0000924C C=CODE S=.text G=(none) M=Grids ACBP=A9 0001:0009C7E4 0000924C C=CODE S=.text G=(none) M=Grids ACBP=A9
0001:000A358C 000015B4 C=CODE S=.text G=(none) M=UnitPilote ACBP=A9 0001:000A5A30 00001900 C=CODE S=.text G=(none) M=UnitPilote ACBP=A9
0001:000A4B40 000004D0 C=CODE S=.text G=(none) M=Importation ACBP=A9 0001:000A7330 000004D0 C=CODE S=.text G=(none) M=Importation ACBP=A9
0001:000A5010 00010280 C=CODE S=.text G=(none) M=UnitAnalyseSegCDM ACBP=A9 0001:000A7800 00013B20 C=CODE S=.text G=(none) M=UnitAnalyseSegCDM ACBP=A9
0001:000B5290 00002698 C=CODE S=.text G=(none) M=UnitConfigTCO ACBP=A9 0001:000BB320 00002C44 C=CODE S=.text G=(none) M=UnitConfigTCO ACBP=A9
0001:000B7928 000009C0 C=CODE S=.text G=(none) M=Unit_Pilote_aig ACBP=A9 0001:000BDF64 00000D10 C=CODE S=.text G=(none) M=Unit_Pilote_aig ACBP=A9
0001:000B82E8 00003988 C=CODE S=.text G=(none) M=UnitConfigCellTCO ACBP=A9 0001:000BEC74 00004D74 C=CODE S=.text G=(none) M=UnitConfigCellTCO ACBP=A9
0001:000BBC70 0002ED60 C=CODE S=.text G=(none) M=UnitTCO ACBP=A9 0001:000C39E8 000452B4 C=CODE S=.text G=(none) M=UnitTCO ACBP=A9
0001:000EA9D0 00002C18 C=CODE S=.text G=(none) M=UnitSR ACBP=A9 0001:00108C9C 000030E4 C=CODE S=.text G=(none) M=UnitSR ACBP=A9
0001:000ED5E8 00002404 C=CODE S=.text G=(none) M=UnitCDF ACBP=A9 0001:0010BD80 000027D4 C=CODE S=.text G=(none) M=UnitCDF ACBP=A9
0001:000EF9EC 000015D3 C=CODE S=.text G=(none) M=verif_version ACBP=A9 0001:0010E554 00040BD0 C=CODE S=.text G=(none) M=UnitConfig ACBP=A9
0001:000F0FC0 0000114C C=CODE S=.text G=(none) M=UnitPareFeu ACBP=A9 0001:0014F124 000017E7 C=CODE S=.text G=(none) M=verif_version ACBP=A9
0001:000F210C 0003732C C=CODE S=.text G=(none) M=UnitConfig ACBP=A9 0001:0015090C 000011D8 C=CODE S=.text G=(none) M=UnitPareFeu ACBP=A9
0001:00129438 0000290C C=CODE S=.text G=(none) M=UnitDebug ACBP=A9 0001:00151AE4 00002B44 C=CODE S=.text G=(none) M=UnitDebug ACBP=A9
0001:0012BD44 00000C00 C=CODE S=.text G=(none) M=UnitSimule ACBP=A9 0001:00154628 00000D2C C=CODE S=.text G=(none) M=UnitSimule ACBP=A9
0001:0012C944 00002390 C=CODE S=.text G=(none) M=Unitplace ACBP=A9 0001:00155354 00002580 C=CODE S=.text G=(none) M=Unitplace ACBP=A9
0001:0012ECD4 00039774 C=CODE S=.text G=(none) M=UnitPrinc ACBP=A9 0001:001578D4 00046974 C=CODE S=.text G=(none) M=UnitPrinc ACBP=A9
0001:00168448 0000048D C=CODE S=.text G=(none) M=Signaux_complexes_GL ACBP=A9 0001:0019E248 0000048D C=CODE S=.text G=(none) M=Signaux_complexes_GL ACBP=A9
0002:00000000 000000CC C=DATA S=.data G=DGROUP M=System ACBP=A9 0002:00000000 000000CC C=DATA S=.data G=DGROUP M=System ACBP=A9
0002:000000CC 00000020 C=DATA S=.data G=DGROUP M=SysInit ACBP=A9 0002:000000CC 00000020 C=DATA S=.data G=DGROUP M=SysInit ACBP=A9
0002:000000EC 00000254 C=DATA S=.data G=DGROUP M=SysUtils ACBP=A9 0002:000000EC 00000254 C=DATA S=.data G=DGROUP M=SysUtils ACBP=A9
@@ -106,31 +106,31 @@ Detailed map of segments
0002:00000348 000001B2 C=DATA S=.data G=DGROUP M=Variants ACBP=A9 0002:00000348 000001B2 C=DATA S=.data G=DGROUP M=Variants ACBP=A9
0002:000004FC 0000000C C=DATA S=.data G=DGROUP M=TypInfo ACBP=A9 0002:000004FC 0000000C C=DATA S=.data G=DGROUP M=TypInfo ACBP=A9
0002:00000508 00000010 C=DATA S=.data G=DGROUP M=ActiveX ACBP=A9 0002:00000508 00000010 C=DATA S=.data G=DGROUP M=ActiveX ACBP=A9
0002:00000518 00000064 C=DATA S=.data G=DGROUP M=Classes ACBP=A9 0002:00000518 00000080 C=DATA S=.data G=DGROUP M=Classes ACBP=A9
0002:0000057C 0000030C C=DATA S=.data G=DGROUP M=Graphics ACBP=A9 0002:00000598 0000030C C=DATA S=.data G=DGROUP M=Graphics ACBP=A9
0002:00000888 00000004 C=DATA S=.data G=DGROUP M=Printers ACBP=A9 0002:000008A4 00000004 C=DATA S=.data G=DGROUP M=Printers ACBP=A9
0002:0000088C 00000180 C=DATA S=.data G=DGROUP M=Dialogs ACBP=A9 0002:000008A8 00000180 C=DATA S=.data G=DGROUP M=Dialogs ACBP=A9
0002:00000A0C 0000018C C=DATA S=.data G=DGROUP M=ExtCtrls ACBP=A9 0002:00000A28 0000018C C=DATA S=.data G=DGROUP M=ExtCtrls ACBP=A9
0002:00000B98 0000009E C=DATA S=.data G=DGROUP M=Buttons ACBP=A9 0002:00000BB4 0000009E C=DATA S=.data G=DGROUP M=Buttons ACBP=A9
0002:00000C38 00000008 C=DATA S=.data G=DGROUP M=IniFiles ACBP=A9 0002:00000C54 00000008 C=DATA S=.data G=DGROUP M=IniFiles ACBP=A9
0002:00000C40 00000008 C=DATA S=.data G=DGROUP M=Registry ACBP=A9 0002:00000C5C 00000008 C=DATA S=.data G=DGROUP M=Registry ACBP=A9
0002:00000C48 00000008 C=DATA S=.data G=DGROUP M=Mapi ACBP=A9 0002:00000C64 00000008 C=DATA S=.data G=DGROUP M=Mapi ACBP=A9
0002:00000C50 000000B9 C=DATA S=.data G=DGROUP M=ComCtrls ACBP=A9 0002:00000C6C 000000B9 C=DATA S=.data G=DGROUP M=ComCtrls ACBP=A9
0002:00000D0C 00000068 C=DATA S=.data G=DGROUP M=Themes ACBP=A9 0002:00000D28 00000068 C=DATA S=.data G=DGROUP M=Themes ACBP=A9
0002:00000D74 00000154 C=DATA S=.data G=DGROUP M=StdCtrls ACBP=A9 0002:00000D90 00000154 C=DATA S=.data G=DGROUP M=StdCtrls ACBP=A9
0002:00000EC8 0000013C C=DATA S=.data G=DGROUP M=Controls ACBP=A9 0002:00000EE4 0000013C C=DATA S=.data G=DGROUP M=Controls ACBP=A9
0002:00001004 00000020 C=DATA S=.data G=DGROUP M=ImgList ACBP=A9 0002:00001020 00000020 C=DATA S=.data G=DGROUP M=ImgList ACBP=A9
0002:00001024 000000EC C=DATA S=.data G=DGROUP M=Menus ACBP=A9 0002:00001040 000000EC C=DATA S=.data G=DGROUP M=Menus ACBP=A9
0002:00001110 00000124 C=DATA S=.data G=DGROUP M=Forms ACBP=A9 0002:0000112C 00000124 C=DATA S=.data G=DGROUP M=Forms ACBP=A9
0002:00001234 00000030 C=DATA S=.data G=DGROUP M=ComObj ACBP=A9 0002:00001250 00000030 C=DATA S=.data G=DGROUP M=ComObj ACBP=A9
0002:00001264 0000002C C=DATA S=.data G=DGROUP M=OleCtrls ACBP=A9 0002:00001280 0000002C C=DATA S=.data G=DGROUP M=OleCtrls ACBP=A9
0002:00001290 00000908 C=DATA S=.data G=DGROUP M=jpeg ACBP=A9 0002:000012AC 00000908 C=DATA S=.data G=DGROUP M=jpeg ACBP=A9
0002:00001B98 00000058 C=DATA S=.data G=DGROUP M=MSCommLib_TLB ACBP=A9 0002:00001BB4 00000058 C=DATA S=.data G=DGROUP M=MSCommLib_TLB ACBP=A9
0002:00001BF0 00000009 C=DATA S=.data G=DGROUP M=MaskUtils ACBP=A9 0002:00001C0C 00000009 C=DATA S=.data G=DGROUP M=MaskUtils ACBP=A9
0002:00001BFC 00000004 C=DATA S=.data G=DGROUP M=Mask ACBP=A9 0002:00001C18 00000004 C=DATA S=.data G=DGROUP M=Mask ACBP=A9
0002:00001C00 00000006 C=DATA S=.data G=DGROUP M=Grids ACBP=A9 0002:00001C1C 00000006 C=DATA S=.data G=DGROUP M=Grids ACBP=A9
0002:00001C08 000000D4 C=DATA S=.data G=DGROUP M=UnitTCO ACBP=A9 0002:00001C24 000000D4 C=DATA S=.data G=DGROUP M=UnitTCO ACBP=A9
0002:00001CDC 0000060D C=DATA S=.data G=DGROUP M=UnitPrinc ACBP=A9 0002:00001CF8 0000060D C=DATA S=.data G=DGROUP M=UnitPrinc ACBP=A9
0002:00003000 00000664 C=BSS S=.bss G=DGROUP M=System ACBP=A9 0002:00003000 00000664 C=BSS S=.bss G=DGROUP M=System ACBP=A9
0002:00003664 00000010 C=BSS S=.bss G=DGROUP M=SysInit ACBP=A9 0002:00003664 00000010 C=BSS S=.bss G=DGROUP M=SysInit ACBP=A9
0002:00003674 00000004 C=BSS S=.bss G=DGROUP M=Types ACBP=A9 0002:00003674 00000004 C=BSS S=.bss G=DGROUP M=Types ACBP=A9
@@ -143,85 +143,85 @@ Detailed map of segments
0002:00003840 00000004 C=BSS S=.bss G=DGROUP M=RTLConsts ACBP=A9 0002:00003840 00000004 C=BSS S=.bss G=DGROUP M=RTLConsts ACBP=A9
0002:00003844 00000004 C=BSS S=.bss G=DGROUP M=TypInfo ACBP=A9 0002:00003844 00000004 C=BSS S=.bss G=DGROUP M=TypInfo ACBP=A9
0002:00003848 00000004 C=BSS S=.bss G=DGROUP M=ActiveX ACBP=A9 0002:00003848 00000004 C=BSS S=.bss G=DGROUP M=ActiveX ACBP=A9
0002:0000384C 00000040 C=BSS S=.bss G=DGROUP M=Classes ACBP=A9 0002:0000384C 00000044 C=BSS S=.bss G=DGROUP M=Classes ACBP=A9
0002:0000388C 00000004 C=BSS S=.bss G=DGROUP M=Consts ACBP=A9 0002:00003890 00000004 C=BSS S=.bss G=DGROUP M=Consts ACBP=A9
0002:00003890 00000060 C=BSS S=.bss G=DGROUP M=Graphics ACBP=A9 0002:00003894 00000060 C=BSS S=.bss G=DGROUP M=Graphics ACBP=A9
0002:000038F0 00000004 C=BSS S=.bss G=DGROUP M=Math ACBP=A9 0002:000038F4 00000004 C=BSS S=.bss G=DGROUP M=Math ACBP=A9
0002:000038F4 00000004 C=BSS S=.bss G=DGROUP M=Contnrs ACBP=A9 0002:000038F8 00000004 C=BSS S=.bss G=DGROUP M=Contnrs ACBP=A9
0002:000038F8 0000000C C=BSS S=.bss G=DGROUP M=CommCtrl ACBP=A9 0002:000038FC 0000000C C=BSS S=.bss G=DGROUP M=CommCtrl ACBP=A9
0002:00003904 00000031 C=BSS S=.bss G=DGROUP M=MultiMon ACBP=A9 0002:00003908 00000031 C=BSS S=.bss G=DGROUP M=MultiMon ACBP=A9
0002:00003938 00000004 C=BSS S=.bss G=DGROUP M=Imm ACBP=A9 0002:0000393C 00000004 C=BSS S=.bss G=DGROUP M=Imm ACBP=A9
0002:0000393C 00000008 C=BSS S=.bss G=DGROUP M=HelpIntfs ACBP=A9 0002:00003940 00000008 C=BSS S=.bss G=DGROUP M=HelpIntfs ACBP=A9
0002:00003944 00000004 C=BSS S=.bss G=DGROUP M=WinSpool ACBP=A9 0002:00003948 00000004 C=BSS S=.bss G=DGROUP M=WinSpool ACBP=A9
0002:00003948 00000004 C=BSS S=.bss G=DGROUP M=Printers ACBP=A9 0002:0000394C 00000004 C=BSS S=.bss G=DGROUP M=Printers ACBP=A9
0002:0000394C 00000034 C=BSS S=.bss G=DGROUP M=FlatSB ACBP=A9 0002:00003950 00000034 C=BSS S=.bss G=DGROUP M=FlatSB ACBP=A9
0002:00003980 00000004 C=BSS S=.bss G=DGROUP M=SyncObjs ACBP=A9 0002:00003984 00000004 C=BSS S=.bss G=DGROUP M=SyncObjs ACBP=A9
0002:00003984 000000CC C=BSS S=.bss G=DGROUP M=UxTheme ACBP=A9 0002:00003988 000000CC C=BSS S=.bss G=DGROUP M=UxTheme ACBP=A9
0002:00003A50 00000004 C=BSS S=.bss G=DGROUP M=RichEdit ACBP=A9 0002:00003A54 00000004 C=BSS S=.bss G=DGROUP M=RichEdit ACBP=A9
0002:00003A54 00000004 C=BSS S=.bss G=DGROUP M=ToolWin ACBP=A9 0002:00003A58 00000004 C=BSS S=.bss G=DGROUP M=ToolWin ACBP=A9
0002:00003A58 00000004 C=BSS S=.bss G=DGROUP M=ShellAPI ACBP=A9 0002:00003A5C 00000004 C=BSS S=.bss G=DGROUP M=ShellAPI ACBP=A9
0002:00003A5C 00000004 C=BSS S=.bss G=DGROUP M=RegStr ACBP=A9 0002:00003A60 00000004 C=BSS S=.bss G=DGROUP M=RegStr ACBP=A9
0002:00003A60 00000004 C=BSS S=.bss G=DGROUP M=WinInet ACBP=A9 0002:00003A64 00000004 C=BSS S=.bss G=DGROUP M=WinInet ACBP=A9
0002:00003A64 00000004 C=BSS S=.bss G=DGROUP M=UrlMon ACBP=A9 0002:00003A68 00000004 C=BSS S=.bss G=DGROUP M=UrlMon ACBP=A9
0002:00003A68 00000004 C=BSS S=.bss G=DGROUP M=ShlObj ACBP=A9 0002:00003A6C 00000004 C=BSS S=.bss G=DGROUP M=ShlObj ACBP=A9
0002:00003A6C 00000004 C=BSS S=.bss G=DGROUP M=CommDlg ACBP=A9 0002:00003A70 00000004 C=BSS S=.bss G=DGROUP M=CommDlg ACBP=A9
0002:00003A70 00000004 C=BSS S=.bss G=DGROUP M=Dlgs ACBP=A9 0002:00003A74 00000004 C=BSS S=.bss G=DGROUP M=Dlgs ACBP=A9
0002:00003A74 0000003C C=BSS S=.bss G=DGROUP M=Dialogs ACBP=A9 0002:00003A78 0000003C C=BSS S=.bss G=DGROUP M=Dialogs ACBP=A9
0002:00003AB0 00000004 C=BSS S=.bss G=DGROUP M=ExtCtrls ACBP=A9 0002:00003AB4 00000004 C=BSS S=.bss G=DGROUP M=ExtCtrls ACBP=A9
0002:00003AB4 00000004 C=BSS S=.bss G=DGROUP M=ComStrs ACBP=A9 0002:00003AB8 00000004 C=BSS S=.bss G=DGROUP M=ComStrs ACBP=A9
0002:00003AB8 0000000C C=BSS S=.bss G=DGROUP M=Clipbrd ACBP=A9 0002:00003ABC 0000000C C=BSS S=.bss G=DGROUP M=Clipbrd ACBP=A9
0002:00003AC4 00000004 C=BSS S=.bss G=DGROUP M=StrUtils ACBP=A9 0002:00003AC8 00000004 C=BSS S=.bss G=DGROUP M=StrUtils ACBP=A9
0002:00003AC8 00000030 C=BSS S=.bss G=DGROUP M=Buttons ACBP=A9 0002:00003ACC 00000030 C=BSS S=.bss G=DGROUP M=Buttons ACBP=A9
0002:00003AF8 00000004 C=BSS S=.bss G=DGROUP M=ExtDlgs ACBP=A9 0002:00003AFC 00000004 C=BSS S=.bss G=DGROUP M=ExtDlgs ACBP=A9
0002:00003AFC 00000004 C=BSS S=.bss G=DGROUP M=IniFiles ACBP=A9 0002:00003B00 00000004 C=BSS S=.bss G=DGROUP M=IniFiles ACBP=A9
0002:00003B00 00000004 C=BSS S=.bss G=DGROUP M=Registry ACBP=A9 0002:00003B04 00000004 C=BSS S=.bss G=DGROUP M=Registry ACBP=A9
0002:00003B04 00000004 C=BSS S=.bss G=DGROUP M=Mapi ACBP=A9 0002:00003B08 00000004 C=BSS S=.bss G=DGROUP M=Mapi ACBP=A9
0002:00003B08 00000009 C=BSS S=.bss G=DGROUP M=ExtActns ACBP=A9 0002:00003B0C 00000009 C=BSS S=.bss G=DGROUP M=ExtActns ACBP=A9
0002:00003B14 00000004 C=BSS S=.bss G=DGROUP M=ListActns ACBP=A9 0002:00003B18 00000004 C=BSS S=.bss G=DGROUP M=ListActns ACBP=A9
0002:00003B18 00000010 C=BSS S=.bss G=DGROUP M=ComCtrls ACBP=A9 0002:00003B1C 00000010 C=BSS S=.bss G=DGROUP M=ComCtrls ACBP=A9
0002:00003B28 00000008 C=BSS S=.bss G=DGROUP M=Themes ACBP=A9 0002:00003B2C 00000008 C=BSS S=.bss G=DGROUP M=Themes ACBP=A9
0002:00003B30 00000004 C=BSS S=.bss G=DGROUP M=StdCtrls ACBP=A9 0002:00003B34 00000004 C=BSS S=.bss G=DGROUP M=StdCtrls ACBP=A9
0002:00003B34 00000004 C=BSS S=.bss G=DGROUP M=StdActns ACBP=A9 0002:00003B38 00000004 C=BSS S=.bss G=DGROUP M=StdActns ACBP=A9
0002:00003B38 00000014 C=BSS S=.bss G=DGROUP M=WinHelpViewer ACBP=A9 0002:00003B3C 00000014 C=BSS S=.bss G=DGROUP M=WinHelpViewer ACBP=A9
0002:00003B4C 00000080 C=BSS S=.bss G=DGROUP M=Controls ACBP=A9 0002:00003B50 00000080 C=BSS S=.bss G=DGROUP M=Controls ACBP=A9
0002:00003BCC 00000004 C=BSS S=.bss G=DGROUP M=ActnList ACBP=A9 0002:00003BD0 00000004 C=BSS S=.bss G=DGROUP M=ActnList ACBP=A9
0002:00003BD0 0000000C C=BSS S=.bss G=DGROUP M=ImgList ACBP=A9 0002:00003BD4 0000000C C=BSS S=.bss G=DGROUP M=ImgList ACBP=A9
0002:00003BDC 00000010 C=BSS S=.bss G=DGROUP M=Menus ACBP=A9 0002:00003BE0 00000010 C=BSS S=.bss G=DGROUP M=Menus ACBP=A9
0002:00003BEC 00000020 C=BSS S=.bss G=DGROUP M=Forms ACBP=A9 0002:00003BF0 00000020 C=BSS S=.bss G=DGROUP M=Forms ACBP=A9
0002:00003C0C 00000004 C=BSS S=.bss G=DGROUP M=ComConst ACBP=A9 0002:00003C10 00000004 C=BSS S=.bss G=DGROUP M=ComConst ACBP=A9
0002:00003C10 00000011 C=BSS S=.bss G=DGROUP M=ComObj ACBP=A9 0002:00003C14 00000011 C=BSS S=.bss G=DGROUP M=ComObj ACBP=A9
0002:00003C24 00000004 C=BSS S=.bss G=DGROUP M=StdVCL ACBP=A9 0002:00003C28 00000004 C=BSS S=.bss G=DGROUP M=StdVCL ACBP=A9
0002:00003C28 0000001C C=BSS S=.bss G=DGROUP M=AxCtrls ACBP=A9 0002:00003C2C 0000001C C=BSS S=.bss G=DGROUP M=AxCtrls ACBP=A9
0002:00003C44 00000004 C=BSS S=.bss G=DGROUP M=OleConst ACBP=A9 0002:00003C48 00000004 C=BSS S=.bss G=DGROUP M=OleConst ACBP=A9
0002:00003C48 00000014 C=BSS S=.bss G=DGROUP M=OleCtrls ACBP=A9 0002:00003C4C 00000014 C=BSS S=.bss G=DGROUP M=OleCtrls ACBP=A9
0002:00003C5C 00000004 C=BSS S=.bss G=DGROUP M=JConsts ACBP=A9 0002:00003C60 00000004 C=BSS S=.bss G=DGROUP M=JConsts ACBP=A9
0002:00003C60 00000004 C=BSS S=.bss G=DGROUP M=jpeg ACBP=A9 0002:00003C64 00000004 C=BSS S=.bss G=DGROUP M=jpeg ACBP=A9
0002:00003C64 00000048 C=BSS S=.bss G=DGROUP M=TlHelp32 ACBP=A9 0002:00003C68 00000048 C=BSS S=.bss G=DGROUP M=TlHelp32 ACBP=A9
0002:00003CAC 00000004 C=BSS S=.bss G=DGROUP M=WinSock ACBP=A9 0002:00003CB0 00000004 C=BSS S=.bss G=DGROUP M=WinSock ACBP=A9
0002:00003CB0 00000194 C=BSS S=.bss G=DGROUP M=ScktComp ACBP=A9 0002:00003CB4 00000194 C=BSS S=.bss G=DGROUP M=ScktComp ACBP=A9
0002:00003E44 00000004 C=BSS S=.bss G=DGROUP M=OleServer ACBP=A9 0002:00003E48 00000004 C=BSS S=.bss G=DGROUP M=OleServer ACBP=A9
0002:00003E48 00000004 C=BSS S=.bss G=DGROUP M=MSCommLib_TLB ACBP=A9 0002:00003E4C 00000004 C=BSS S=.bss G=DGROUP M=MSCommLib_TLB ACBP=A9
0002:00003E4C 00000004 C=BSS S=.bss G=DGROUP M=MMSystem ACBP=A9 0002:00003E50 00000004 C=BSS S=.bss G=DGROUP M=MMSystem ACBP=A9
0002:00003E50 00000004 C=BSS S=.bss G=DGROUP M=Nb30 ACBP=A9 0002:00003E54 00000004 C=BSS S=.bss G=DGROUP M=Nb30 ACBP=A9
0002:00003E54 00000004 C=BSS S=.bss G=DGROUP M=MaskUtils ACBP=A9 0002:00003E58 00000004 C=BSS S=.bss G=DGROUP M=MaskUtils ACBP=A9
0002:00003E58 00000004 C=BSS S=.bss G=DGROUP M=Mask ACBP=A9 0002:00003E5C 00000004 C=BSS S=.bss G=DGROUP M=Mask ACBP=A9
0002:00003E5C 00000004 C=BSS S=.bss G=DGROUP M=Grids ACBP=A9 0002:00003E60 00000004 C=BSS S=.bss G=DGROUP M=Grids ACBP=A9
0002:00003E60 00000010 C=BSS S=.bss G=DGROUP M=UnitPilote ACBP=A9 0002:00003E64 00000010 C=BSS S=.bss G=DGROUP M=UnitPilote ACBP=A9
0002:00003E70 00000010 C=BSS S=.bss G=DGROUP M=Importation ACBP=A9 0002:00003E74 00000010 C=BSS S=.bss G=DGROUP M=Importation ACBP=A9
0002:00003E80 00003DC0 C=BSS S=.bss G=DGROUP M=UnitAnalyseSegCDM ACBP=A9 0002:00003E84 00003DC0 C=BSS S=.bss G=DGROUP M=UnitAnalyseSegCDM ACBP=A9
0002:00007C40 00000014 C=BSS S=.bss G=DGROUP M=UnitConfigTCO ACBP=A9 0002:00007C44 00000014 C=BSS S=.bss G=DGROUP M=UnitConfigTCO ACBP=A9
0002:00007C54 00000014 C=BSS S=.bss G=DGROUP M=Unit_Pilote_aig ACBP=A9 0002:00007C58 00000014 C=BSS S=.bss G=DGROUP M=Unit_Pilote_aig ACBP=A9
0002:00007C68 00000014 C=BSS S=.bss G=DGROUP M=UnitConfigCellTCO ACBP=A9 0002:00007C6C 00000014 C=BSS S=.bss G=DGROUP M=UnitConfigCellTCO ACBP=A9
0002:00007C7C 00047DC8 C=BSS S=.bss G=DGROUP M=UnitTCO ACBP=A9 0002:00007C80 004186C8 C=BSS S=.bss G=DGROUP M=UnitTCO ACBP=A9
0002:0004FA44 00000010 C=BSS S=.bss G=DGROUP M=UnitSR ACBP=A9 0002:00420348 00000010 C=BSS S=.bss G=DGROUP M=UnitSR ACBP=A9
0002:0004FA54 00000014 C=BSS S=.bss G=DGROUP M=UnitCDF ACBP=A9 0002:00420358 00000014 C=BSS S=.bss G=DGROUP M=UnitCDF ACBP=A9
0002:0004FA68 00000018 C=BSS S=.bss G=DGROUP M=verif_version ACBP=A9 0002:0042036C 000004FC C=BSS S=.bss G=DGROUP M=UnitConfig ACBP=A9
0002:0004FA80 00000004 C=BSS S=.bss G=DGROUP M=UnitPareFeu ACBP=A9 0002:00420868 00000018 C=BSS S=.bss G=DGROUP M=verif_version ACBP=A9
0002:0004FA84 000004F8 C=BSS S=.bss G=DGROUP M=UnitConfig ACBP=A9 0002:00420880 00000004 C=BSS S=.bss G=DGROUP M=UnitPareFeu ACBP=A9
0002:0004FF7C 0000002C C=BSS S=.bss G=DGROUP M=UnitDebug ACBP=A9 0002:00420884 0000002C C=BSS S=.bss G=DGROUP M=UnitDebug ACBP=A9
0002:0004FFA8 0000000C C=BSS S=.bss G=DGROUP M=UnitSimule ACBP=A9 0002:004208B0 0000000C C=BSS S=.bss G=DGROUP M=UnitSimule ACBP=A9
0002:0004FFB4 00000008 C=BSS S=.bss G=DGROUP M=Unitplace ACBP=A9 0002:004208BC 00000008 C=BSS S=.bss G=DGROUP M=Unitplace ACBP=A9
0002:0004FFBC 04181A74 C=BSS S=.bss G=DGROUP M=UnitPrinc ACBP=A9 0002:004208C4 04183C48 C=BSS S=.bss G=DGROUP M=UnitPrinc ACBP=A9
Bound resource files Bound resource files
@@ -237,8 +237,8 @@ UnitConfigCellTCO.dfm
UnitTCO.dfm UnitTCO.dfm
UnitSR.dfm UnitSR.dfm
UnitCDF.dfm UnitCDF.dfm
verif_version.dfm
UnitConfig.dfm UnitConfig.dfm
verif_version.dfm
UnitDebug.dfm UnitDebug.dfm
UnitSimule.dfm UnitSimule.dfm
Unitplace.dfm Unitplace.dfm
@@ -247,4 +247,4 @@ Signaux_complexes_GL.res
Signaux_complexes_GL.drf Signaux_complexes_GL.drf
Program entry point at 0001:00168758 Program entry point at 0001:0019E558
UnitAnalyseSegCDM.pas
+2 -3
View File
@@ -502,7 +502,6 @@ begin
exit; exit;
end; end;
// modif pour signaux complexes
if (segType='turnout') or (segType='turnout_3way') or (segType='dbl_slip_switch') then if (segType='turnout') or (segType='turnout_3way') or (segType='dbl_slip_switch') then
begin begin
inc(nligne); inc(nligne);
@@ -1229,10 +1228,10 @@ begin
end; end;
// rotation matricielle autour de Centre // rotation matricielle autour de Centre
function XForm_Rotation(AAngle : Single;Centre : TPoint) : TXForm; function XForm_Rotation(Angle : Single;Centre : TPoint) : TXForm;
var SinA,CosA: Extended; var SinA,CosA: Extended;
begin begin
SinCos(AAngle,SinA,CosA); SinCos(Angle,SinA,CosA);
Result.eM11:=CosA; Result.eM11:=CosA;
Result.eM12:=SinA; Result.eM12:=SinA;
Result.eM21:=-SinA; Result.eM21:=-SinA;
UnitConfig.dfm
+151 -71
View File
@@ -1,6 +1,6 @@
object FormConfig: TFormConfig object FormConfig: TFormConfig
Left = 278 Left = 247
Top = 142 Top = 117
Hint = 'Modifie la configuration selon les s'#233'lections choisies' Hint = 'Modifie la configuration selon les s'#233'lections choisies'
BorderStyle = bsDialog BorderStyle = bsDialog
Caption = 'Configuration g'#233'n'#233'rale' Caption = 'Configuration g'#233'n'#233'rale'
@@ -668,7 +668,7 @@ object FormConfig: TFormConfig
Top = 8 Top = 8
Width = 633 Width = 633
Height = 497 Height = 497
ActivePage = TabSheetAutonome ActivePage = TabSheetCDM
Font.Charset = DEFAULT_CHARSET Font.Charset = DEFAULT_CHARSET
Font.Color = clBlack Font.Color = clBlack
Font.Height = -11 Font.Height = -11
@@ -693,7 +693,7 @@ object FormConfig: TFormConfig
Left = 16 Left = 16
Top = 8 Top = 8
Width = 273 Width = 273
Height = 113 Height = 81
Caption = 'Socket de comm. CDM Rail <--> Signaux complexes' Caption = 'Socket de comm. CDM Rail <--> Signaux complexes'
TabOrder = 0 TabOrder = 0
object Label1: TLabel object Label1: TLabel
@@ -717,35 +717,19 @@ object FormConfig: TFormConfig
Height = 21 Height = 21
TabStop = False TabStop = False
TabOrder = 0 TabOrder = 0
Text = 'EditAdrIPCDM'
end end
object EditPortCDM: TEdit object EditPortCDM: TEdit
Left = 176 Left = 200
Top = 48 Top = 48
Width = 81 Width = 57
Height = 21 Height = 21
TabStop = False TabStop = False
TabOrder = 1 TabOrder = 1
Text = 'EditPortCDM'
end
object ButtonPFCDM: TButton
Left = 16
Top = 72
Width = 241
Height = 25
Hint =
'Ajoute une r'#232'gle d'#39'autorisation de communication du socket vers ' +
'CDM rail dans le pare-feu'
Caption = 'Ajouter une autorisation au pare-feu windows'
ParentShowHint = False
ShowHint = True
TabOrder = 2
OnClick = ButtonPFCDMClick
end end
end end
object GroupBox5: TGroupBox object GroupBox5: TGroupBox
Left = 16 Left = 16
Top = 128 Top = 96
Width = 273 Width = 273
Height = 209 Height = 209
Caption = 'Au d'#233'marrage de Signaux_Complexes ' Caption = 'Au d'#233'marrage de Signaux_Complexes '
@@ -980,7 +964,7 @@ object FormConfig: TFormConfig
end end
object GroupBox8: TGroupBox object GroupBox8: TGroupBox
Left = 16 Left = 16
Top = 344 Top = 312
Width = 273 Width = 273
Height = 97 Height = 97
Caption = 'Services CommIP CDM Rail' Caption = 'Services CommIP CDM Rail'
@@ -1042,7 +1026,7 @@ object FormConfig: TFormConfig
Left = 312 Left = 312
Top = 256 Top = 256
Width = 297 Width = 297
Height = 145 Height = 161
Caption = 'Divers' Caption = 'Divers'
TabOrder = 5 TabOrder = 5
object Label31: TLabel object Label31: TLabel
@@ -1073,6 +1057,13 @@ object FormConfig: TFormConfig
Height = 13 Height = 13
Caption = 'Debug' Caption = 'Debug'
end end
object Label28: TLabel
Left = 8
Top = 136
Width = 182
Height = 13
Caption = 'Port du serveur de Signaux Complexes'
end
object EditNbDetDist: TEdit object EditNbDetDist: TEdit
Left = 240 Left = 240
Top = 20 Top = 20
@@ -1119,7 +1110,7 @@ object FormConfig: TFormConfig
end end
object CheckBoxVerifXpressNet: TCheckBox object CheckBoxVerifXpressNet: TCheckBox
Left = 8 Left = 8
Top = 116 Top = 108
Width = 233 Width = 233
Height = 17 Height = 17
Hint = Hint =
@@ -1132,6 +1123,32 @@ object FormConfig: TFormConfig
TabOrder = 4 TabOrder = 4
OnClick = CheckBoxVerifXpressNetClick OnClick = CheckBoxVerifXpressNetClick
end end
object EditPortServeur: TEdit
Left = 224
Top = 130
Width = 49
Height = 21
Hint = 'Port de 1 '#224' 65535'
ParentShowHint = False
ShowHint = True
TabOrder = 5
OnChange = EditPortServeurChange
OnExit = EditPortServeurExit
end
end
object ButtonPFCDM: TButton
Left = 40
Top = 416
Width = 241
Height = 25
Hint =
'Ajoute une r'#232'gle d'#39'autorisation de communication du socket vers ' +
'CDM rail dans le pare-feu'
Caption = 'Ajouter les autorisations au pare-feu windows'
ParentShowHint = False
ShowHint = True
TabOrder = 6
OnClick = ButtonPFCDMClick
end end
end end
object TabSheetAutonome: TTabSheet object TabSheetAutonome: TTabSheet
@@ -1279,9 +1296,8 @@ object FormConfig: TFormConfig
BorderStyle = bsNone BorderStyle = bsNone
Lines.Strings = ( Lines.Strings = (
'1. Port COM de l'#39'adresse USB de l'#39'interface XpressNet. ' '1. Port COM de l'#39'adresse USB de l'#39'interface XpressNet. '
'COM de 1 '#224' 99 - Si COMX : Signaux complexes d'#233'tecte le ' 'COM de 1 '#224' 255 - Si COMX : Signaux complexes d'#233'tecte le '
'port automatiquement (mais le d'#233'marrage est plus long)' 'port automatiquement (mais le d'#233'marrage est plus long)')
' ')
ReadOnly = True ReadOnly = True
TabOrder = 3 TabOrder = 3
end end
@@ -1415,6 +1431,20 @@ object FormConfig: TFormConfig
ShowHint = True ShowHint = True
TabOrder = 5 TabOrder = 5
end end
object CheckBoxResa: TCheckBox
Left = 16
Top = 136
Width = 265
Height = 17
Hint =
'Permet de r'#233'server les aiguillages, les TJD/S et les croisements' +
' sur le parcours d'#39'un train'
Caption = 'Mode r'#233'servation des aiguillages par les trains'
ParentShowHint = False
ShowHint = True
TabOrder = 6
OnClick = CheckBoxResaClick
end
end end
object GroupBox22: TGroupBox object GroupBox22: TGroupBox
Left = 312 Left = 312
@@ -1478,11 +1508,17 @@ object FormConfig: TFormConfig
object Label12: TLabel object Label12: TLabel
Left = 0 Left = 0
Top = 8 Top = 8
Width = 468 Width = 575
Height = 13 Height = 13
Caption = Caption =
'Liste de mod'#233'lisation des aiguillages - cliquez sur une ligne po' + 'Liste de mod'#233'lisation des aiguillages - cliquez sur une ligne po' +
'ur afficher la description de l'#39'aiguillage' 'ur afficher la description de l'#39'aiguillage'
Font.Charset = DEFAULT_CHARSET
Font.Color = clBlack
Font.Height = -11
Font.Name = 'MS Sans Serif'
Font.Style = [fsBold]
ParentFont = False
end end
object GroupBox11: TGroupBox object GroupBox11: TGroupBox
Left = 328 Left = 328
@@ -1987,11 +2023,17 @@ object FormConfig: TFormConfig
object Label14: TLabel object Label14: TLabel
Left = 0 Left = 0
Top = 8 Top = 8
Width = 508 Width = 622
Height = 13 Height = 13
Caption = Caption =
'Liste de mod'#233'lisation des branches - Cliquer sur une ligne pour ' + 'Liste de mod'#233'lisation des branches - Cliquer sur une ligne pour ' +
'la modifier - Valider la ligne apr'#232's modification' 'la modifier - Valider la ligne apr'#232's modification'
Font.Charset = DEFAULT_CHARSET
Font.Color = clBlack
Font.Height = -11
Font.Name = 'MS Sans Serif'
Font.Style = [fsBold]
ParentFont = False
end end
object Label34: TLabel object Label34: TLabel
Left = 472 Left = 472
@@ -2127,11 +2169,17 @@ object FormConfig: TFormConfig
object Label15: TLabel object Label15: TLabel
Left = 0 Left = 0
Top = 8 Top = 8
Width = 434 Width = 531
Height = 13 Height = 13
Caption = Caption =
'Liste de mod'#233'lisation des signaux - cliquez sur une ligne pour a' + 'Liste de mod'#233'lisation des signaux - cliquez sur une ligne pour a' +
'fficher la description du signal' 'fficher la description du signal'
Font.Charset = DEFAULT_CHARSET
Font.Color = clBlack
Font.Height = -11
Font.Name = 'MS Sans Serif'
Font.Style = [fsBold]
ParentFont = False
end end
object Label35: TLabel object Label35: TLabel
Left = 72 Left = 72
@@ -2318,7 +2366,7 @@ object FormConfig: TFormConfig
Width = 137 Width = 137
Height = 21 Height = 21
Style = csDropDownList Style = csDropDownList
ItemHeight = 13 ItemHeight = 0
TabOrder = 1 TabOrder = 1
OnChange = ComboBoxDecChange OnChange = ComboBoxDecChange
end end
@@ -2400,8 +2448,8 @@ object FormConfig: TFormConfig
Width = 145 Width = 145
Height = 17 Height = 17
Hint = Hint =
'Passe le feu au carr'#233' ci aucun train n'#39'est pr'#233'sent 3 cantons ava' + 'Passe le signal au carr'#233' ci aucun train n'#39'est pr'#233'sent 3 cantons ' +
'nt le signal' 'avant le signal'
Caption = 'Verrouillable au carr'#233 Caption = 'Verrouillable au carr'#233
ParentShowHint = False ParentShowHint = False
ShowHint = True ShowHint = True
@@ -2425,7 +2473,7 @@ object FormConfig: TFormConfig
Width = 137 Width = 137
Height = 21 Height = 21
Style = csDropDownList Style = csDropDownList
ItemHeight = 13 ItemHeight = 0
TabOrder = 2 TabOrder = 2
OnChange = ComboBoxAspChange OnChange = ComboBoxAspChange
end end
@@ -2605,14 +2653,14 @@ object FormConfig: TFormConfig
object Label61: TLabel object Label61: TLabel
Left = 13 Left = 13
Top = 12 Top = 12
Width = 173 Width = 208
Height = 13 Height = 13
Caption = 'D'#233'codeurs personnalis'#233's de signaux' Caption = 'D'#233'codeurs personnalis'#233's de signaux'
Font.Charset = ANSI_CHARSET Font.Charset = ANSI_CHARSET
Font.Color = clBlack Font.Color = clBlack
Font.Height = -11 Font.Height = -11
Font.Name = 'MS Sans Serif' Font.Name = 'MS Sans Serif'
Font.Style = [] Font.Style = [fsBold]
ParentFont = False ParentFont = False
end end
object Label62: TLabel object Label62: TLabel
@@ -2719,7 +2767,7 @@ object FormConfig: TFormConfig
Width = 193 Width = 193
Height = 21 Height = 21
AutoComplete = False AutoComplete = False
ItemHeight = 13 ItemHeight = 0
TabOrder = 0 TabOrder = 0
OnChange = ComboBoxDecodeurPersoChange OnChange = ComboBoxDecodeurPersoChange
end end
@@ -2738,7 +2786,7 @@ object FormConfig: TFormConfig
Width = 145 Width = 145
Height = 21 Height = 21
Style = csDropDownList Style = csDropDownList
ItemHeight = 13 ItemHeight = 0
TabOrder = 2 TabOrder = 2
OnChange = ComboBoxNationChange OnChange = ComboBoxNationChange
end end
@@ -2784,7 +2832,7 @@ object FormConfig: TFormConfig
Width = 193 Width = 193
Height = 21 Height = 21
Style = csDropDownList Style = csDropDownList
ItemHeight = 13 ItemHeight = 0
TabOrder = 6 TabOrder = 6
OnChange = ComboBoxDecCdeChange OnChange = ComboBoxDecCdeChange
end end
@@ -2796,11 +2844,17 @@ object FormConfig: TFormConfig
object Label16: TLabel object Label16: TLabel
Left = 0 Left = 0
Top = 8 Top = 8
Width = 459 Width = 562
Height = 13 Height = 13
Caption = Caption =
'Liste de mod'#233'lisation des actionneurs - cliquez sur une ligne po' + 'Liste de mod'#233'lisation des actionneurs - cliquez sur une ligne po' +
'ur afficher la description de l'#39'action' 'ur afficher la description de l'#39'action'
Font.Charset = DEFAULT_CHARSET
Font.Color = clBlack
Font.Height = -11
Font.Name = 'MS Sans Serif'
Font.Style = [fsBold]
ParentFont = False
end end
object GroupBox13: TGroupBox object GroupBox13: TGroupBox
Left = 352 Left = 352
@@ -2811,7 +2865,7 @@ object FormConfig: TFormConfig
TabOrder = 0 TabOrder = 0
object GroupBoxRadio: TGroupBox object GroupBoxRadio: TGroupBox
Left = 8 Left = 8
Top = 24 Top = 120
Width = 249 Width = 249
Height = 89 Height = 89
Caption = 'Type d'#39'action' Caption = 'Type d'#39'action'
@@ -2855,14 +2909,14 @@ object FormConfig: TFormConfig
end end
object GroupBoxAct: TGroupBox object GroupBoxAct: TGroupBox
Left = 8 Left = 8
Top = 120 Top = 24
Width = 249 Width = 249
Height = 321 Height = 321
Caption = 'Action fonction de locomotive ' Caption = 'Action fonction de locomotive '
TabOrder = 1 TabOrder = 1
object GroupBox18: TGroupBox object GroupBox18: TGroupBox
Left = 8 Left = 8
Top = 16 Top = 24
Width = 233 Width = 233
Height = 161 Height = 161
Caption = 'D'#233'clencheur ' Caption = 'D'#233'clencheur '
@@ -2969,8 +3023,8 @@ object FormConfig: TFormConfig
end end
end end
object GroupBox19: TGroupBox object GroupBox19: TGroupBox
Left = 8 Left = 56
Top = 136 Top = 32
Width = 233 Width = 233
Height = 137 Height = 137
Caption = 'Destinataire de l'#39'action ' Caption = 'Destinataire de l'#39'action '
@@ -3163,7 +3217,7 @@ object FormConfig: TFormConfig
Height = 21 Height = 21
Hint = 'Nom de l'#39'accessoire d'#233'fini dans l'#39'onglet "p'#233'riph'#233'riques COM/USB"' Hint = 'Nom de l'#39'accessoire d'#233'fini dans l'#39'onglet "p'#233'riph'#233'riques COM/USB"'
Style = csDropDownList Style = csDropDownList
ItemHeight = 13 ItemHeight = 0
ParentShowHint = False ParentShowHint = False
ShowHint = True ShowHint = True
TabOrder = 6 TabOrder = 6
@@ -3184,24 +3238,24 @@ object FormConfig: TFormConfig
end end
end end
object GroupBoxPNA: TGroupBox object GroupBoxPNA: TGroupBox
Left = 56 Left = 104
Top = 64 Top = 160
Width = 169 Width = 169
Height = 121 Height = 121
Caption = 'Actionneurs PN simples' Caption = 'Actionneurs PN simples'
TabOrder = 2 TabOrder = 2
end end
object GroupBoxPNZ: TGroupBox object GroupBoxPNZ: TGroupBox
Left = 120 Left = 64
Top = 64 Top = 48
Width = 169 Width = 169
Height = 65 Height = 65
Caption = 'Zones de d'#233'tection' Caption = 'Zones de d'#233'tection'
TabOrder = 3 TabOrder = 3
end end
object GroupBoxPN: TGroupBox object GroupBoxPN: TGroupBox
Left = 136 Left = 40
Top = 24 Top = 48
Width = 249 Width = 249
Height = 193 Height = 193
Caption = 'Action gestion passage '#224' niveau' Caption = 'Action gestion passage '#224' niveau'
@@ -3344,7 +3398,7 @@ object FormConfig: TFormConfig
Height = 21 Height = 21
Hint = 'Nom de l'#39'accessoire d'#233'fini dans l'#39'onglet "p'#233'riph'#233'riques COM/USB"' Hint = 'Nom de l'#39'accessoire d'#233'fini dans l'#39'onglet "p'#233'riph'#233'riques COM/USB"'
Style = csDropDownList Style = csDropDownList
ItemHeight = 13 ItemHeight = 0
ParentShowHint = False ParentShowHint = False
ShowHint = True ShowHint = True
TabOrder = 10 TabOrder = 10
@@ -3595,11 +3649,17 @@ object FormConfig: TFormConfig
object Label19: TLabel object Label19: TLabel
Left = 8 Left = 8
Top = 8 Top = 8
Width = 538 Width = 531
Height = 26 Height = 26
Caption = Caption =
'Configuration de l'#39'interface DCC++ pour le mode autonome (n'#233'cess' + 'Configuration de l'#39'interface DCC++ pour le mode autonome (n'#233'cess' +
'ite de cocher le protocole DCC++ dans l'#39'onglet "Mode autonome")' 'ite de cocher le protocole DCC++ dans l'#39'onglet "Mode autonome")'
Font.Charset = DEFAULT_CHARSET
Font.Color = clBlack
Font.Height = -11
Font.Name = 'MS Sans Serif'
Font.Style = [fsBold]
ParentFont = False
WordWrap = True WordWrap = True
end end
object RichCdeDccpp: TRichEdit object RichCdeDccpp: TRichEdit
@@ -3676,11 +3736,17 @@ object FormConfig: TFormConfig
object Label54: TLabel object Label54: TLabel
Left = 16 Left = 16
Top = 8 Top = 8
Width = 392 Width = 475
Height = 13 Height = 13
Caption = Caption =
'Liste des trains d'#233'clar'#233's du r'#233'seau - Pour utilisation en mode a' + 'Liste des trains d'#233'clar'#233's du r'#233'seau - Pour utilisation en mode a' +
'utonome uniquement' 'utonome uniquement'
Font.Charset = DEFAULT_CHARSET
Font.Color = clBlack
Font.Height = -11
Font.Name = 'MS Sans Serif'
Font.Style = [fsBold]
ParentFont = False
end end
object LabelInfVitesse: TLabel object LabelInfVitesse: TLabel
Left = 320 Left = 320
@@ -3953,13 +4019,15 @@ object FormConfig: TFormConfig
object Label73: TLabel object Label73: TLabel
Left = 8 Left = 8
Top = 8 Top = 8
Width = 580 Width = 208
Height = 26 Height = 13
Caption = Caption = 'P'#233'riph'#233'riques COM/USB ou Sockets'
'Les p'#233'riph'#233'riques COM/USB ou Sockets sont utilis'#233's pour '#234'tre act' + Font.Charset = DEFAULT_CHARSET
'iv'#233's par un actionneur et leur envoyer des ordres ASCII. On peut' + Font.Color = clBlack
' '#233'galement leur envoyer des informations sur les '#233'v'#232'nements aigu' + Font.Height = -11
'illage, d'#233'tecteurs et actionneurs via les services.' Font.Name = 'MS Sans Serif'
Font.Style = [fsBold]
ParentFont = False
WordWrap = True WordWrap = True
end end
object LabelInfoAcc: TLabel object LabelInfoAcc: TLabel
@@ -3970,7 +4038,7 @@ object FormConfig: TFormConfig
end end
object SBMonte: TSpeedButton object SBMonte: TSpeedButton
Left = 240 Left = 240
Top = 160 Top = 176
Width = 25 Width = 25
Height = 33 Height = 33
Hint = Hint =
@@ -3994,7 +4062,7 @@ object FormConfig: TFormConfig
end end
object SBDesc: TSpeedButton object SBDesc: TSpeedButton
Left = 240 Left = 240
Top = 200 Top = 216
Width = 25 Width = 25
Height = 33 Height = 33
Hint = Hint =
@@ -4016,9 +4084,21 @@ object FormConfig: TFormConfig
ShowHint = True ShowHint = True
OnClick = SBDescClick OnClick = SBDescClick
end end
object Label23: TLabel
Left = 8
Top = 28
Width = 570
Height = 26
Caption =
'Ils sont utilis'#233's pour '#234'tre activ'#233's par un actionneur et leur en' +
'voyer des ordres ASCII. On peut '#233'galement leur envoyer des infor' +
'mations sur les '#233'v'#232'nements aiguillage, d'#233'tecteurs et actionneurs' +
' via les services.'
WordWrap = True
end
object ListBoxPeriph: TListBox object ListBoxPeriph: TListBox
Left = 8 Left = 8
Top = 72 Top = 88
Width = 233 Width = 233
Height = 273 Height = 273
Color = clBlack Color = clBlack
@@ -4039,7 +4119,7 @@ object FormConfig: TFormConfig
end end
object ButtonAjAccCom: TButton object ButtonAjAccCom: TButton
Left = 8 Left = 8
Top = 48 Top = 64
Width = 65 Width = 65
Height = 17 Height = 17
Caption = 'Nouveau' Caption = 'Nouveau'
@@ -4048,7 +4128,7 @@ object FormConfig: TFormConfig
end end
object ButtonSupAccCom: TButton object ButtonSupAccCom: TButton
Left = 80 Left = 80
Top = 48 Top = 64
Width = 65 Width = 65
Height = 17 Height = 17
Caption = 'Supprime' Caption = 'Supprime'
@@ -4057,7 +4137,7 @@ object FormConfig: TFormConfig
end end
object GroupBoxDesc: TGroupBox object GroupBoxDesc: TGroupBox
Left = 280 Left = 280
Top = 72 Top = 80
Width = 329 Width = 329
Height = 129 Height = 129
Caption = 'Description du p'#233'riph'#233'rique' Caption = 'Description du p'#233'riph'#233'rique'
@@ -4083,7 +4163,7 @@ object FormConfig: TFormConfig
end end
object ButtonOuvreCom: TButton object ButtonOuvreCom: TButton
Left = 14 Left = 14
Top = 357 Top = 365
Width = 75 Width = 75
Height = 20 Height = 20
Hint = 'R'#233'ouvre les ports COMs et Sockets demand'#233's' Hint = 'R'#233'ouvre les ports COMs et Sockets demand'#233's'
UnitConfig.pas
+612 -572
View File
File diff suppressed because it is too large Load Diff
UnitConfigCellTCO.dfm
+2 -2
View File
@@ -363,7 +363,7 @@ object FormConfCellTCO: TFormConfCellTCO
end end
object EditAdrSortie: TEdit object EditAdrSortie: TEdit
Left = 144 Left = 144
Top = 68 Top = 70
Width = 33 Width = 33
Height = 21 Height = 21
TabOrder = 5 TabOrder = 5
@@ -371,7 +371,7 @@ object FormConfCellTCO: TFormConfCellTCO
end end
object EditEtat: TEdit object EditEtat: TEdit
Left = 200 Left = 200
Top = 68 Top = 70
Width = 25 Width = 25
Height = 21 Height = 21
Hint = '1 ou 2' Hint = '1 ou 2'
UnitConfigCellTCO.pas
+5 -4
View File
@@ -91,7 +91,6 @@ procedure actualise(indexTCO : integer);
var Bimage,oriente,piedFeu,xclic,yclic : integer; var Bimage,oriente,piedFeu,xclic,yclic : integer;
s : string; s : string;
ip : Timage; ip : Timage;
Bm : Tbitmap;
r : trect; r : trect;
begin begin
if (indexTCO=0) or (formConfCellTCO=nil) then exit; if (indexTCO=0) or (formConfCellTCO=nil) then exit;
@@ -100,7 +99,6 @@ begin
xclic:=XclicCell[indexTCO]; xclic:=XclicCell[indexTCO];
yclic:=YclicCell[indexTCO]; yclic:=YclicCell[indexTCO];
Bm:=formConfCellTCO.imagepalettecc.Picture.Bitmap;
//with FormConfCellTCO.ImagePaletteCC.Picture.Bitmap do //with FormConfCellTCO.ImagePaletteCC.Picture.Bitmap do
with FormConfCellTCO.ImagePaletteCC do with FormConfCellTCO.ImagePaletteCC do
begin begin
@@ -213,7 +211,7 @@ begin
end; end;
// si voie ou rien ou signal ou quai // si voie ou rien ou signal ou quai
if (Bimage=1) or (Bimage=0) or (Bimage=Id_signal) or (Bimage=51) then if (Bimage=1) or (Bimage=0) or (Bimage=Id_signal) or (Bimage=Id_Quai) then
begin begin
s:=Tco[indexTCO,XclicCell[indexTCO],YclicCell[indexTCO]].Texte; s:=Tco[indexTCO,XclicCell[indexTCO],YclicCell[indexTCO]].Texte;
with formTCO[indexTCO] do with formTCO[indexTCO] do
@@ -812,12 +810,13 @@ begin
val(EditNumTCO.Text,i,erreur); val(EditNumTCO.Text,i,erreur);
if erreur<>0 then exit; if erreur<>0 then exit;
if i>NbreTCO then if (i>NbreTCO) or (i<1) then
begin begin
EditNumTCO.Text:=intToSTR(NbreTCO); EditNumTCO.Text:=intToSTR(NbreTCO);
i:=NbreTCO; i:=NbreTCO;
end; end;
tco[IndexTCOCourant,XclicCell[indexTCOCourant],YclicCell[indexTCOCourant]].FeuOriente:=i; tco[IndexTCOCourant,XclicCell[indexTCOCourant],YclicCell[indexTCOCourant]].FeuOriente:=i;
Affiche_cellule(IndexTCOCourant,XclicCell[indexTCOCourant],YclicCell[indexTCOCourant]);
end; end;
@@ -851,6 +850,7 @@ begin
if erreur<>0 then exit; if erreur<>0 then exit;
tco[IndexTCOCourant,XclicCell[indexTCOCourant],YclicCell[indexTCOCourant]].adresse:=i; tco[IndexTCOCourant,XclicCell[indexTCOCourant],YclicCell[indexTCOCourant]].adresse:=i;
Affiche_cellule(IndexTCOCourant,XclicCell[indexTCOCourant],YclicCell[indexTCOCourant]);
end; end;
procedure TFormConfCellTCO.EditEtatChange(Sender: TObject); procedure TFormConfCellTCO.EditEtatChange(Sender: TObject);
@@ -862,6 +862,7 @@ begin
if erreur<>0 then exit; if erreur<>0 then exit;
tco[IndexTCOCourant,XclicCell[indexTCOCourant],YclicCell[indexTCOCourant]].sortie:=i; tco[IndexTCOCourant,XclicCell[indexTCOCourant],YclicCell[indexTCOCourant]].sortie:=i;
Affiche_cellule(IndexTCOCourant,XclicCell[indexTCOCourant],YclicCell[indexTCOCourant]);
end; end;
UnitConfigTCO.pas
+4 -1
View File
@@ -293,7 +293,7 @@ var s: string;
i : integer; i : integer;
begin begin
clicConf:=true; clicConf:=true;
s:='Configuration du tco '+inttostr(indextcocourant)+' Fichier '+NomFichierTCO[indextcocourant]; s:='Configuration du tco '+inttostr(indextcocourant)+' - Fichier '+NomFichierTCO[indextcocourant];
caption:=s; caption:=s;
groupBox3.caption:='Configuration du TCO '+inttostr(indextcocourant); groupBox3.caption:='Configuration du TCO '+inttostr(indextcocourant);
@@ -315,7 +315,10 @@ begin
s:='ColorA='+IntToHex(clfond[indexTCOcourant],6); // ajouter aux couleurs personnalisées s:='ColorA='+IntToHex(clfond[indexTCOcourant],6); // ajouter aux couleurs personnalisées
colorDialog1.CustomColors.Add(s); colorDialog1.CustomColors.Add(s);
for i:=1 to 10 do for i:=1 to 10 do
begin
stringGridTCO.Cells[1,i]:=NomFichierTCO[i]; stringGridTCO.Cells[1,i]:=NomFichierTCO[i];
if i<=nbreTCO then stringGridTCO.Cells[2,i]:='X' else stringGridTCO.Cells[2,i]:=' ';
end;
// stringGridTCO.canvas.Font.Style:=[fsBOld]; // stringGridTCO.canvas.Font.Style:=[fsBOld];
clicConf:=false; clicConf:=false;
end; end;
UnitDebug.dfm
+37 -6
View File
@@ -181,9 +181,9 @@ object FormDebug: TFormDebug
ParentFont = False ParentFont = False
end end
object ButtonSigSuiv: TButton object ButtonSigSuiv: TButton
Left = 16 Left = 8
Top = 16 Top = 16
Width = 57 Width = 49
Height = 49 Height = 49
Hint = 'Etat du signal suivant' Hint = 'Etat du signal suivant'
Caption = 'Etat signal suivant' Caption = 'Etat signal suivant'
@@ -194,7 +194,7 @@ object FormDebug: TFormDebug
OnClick = ButtonSigSuivClick OnClick = ButtonSigSuivClick
end end
object ButtonCanSuivSig: TButton object ButtonCanSuivSig: TButton
Left = 80 Left = 56
Top = 16 Top = 16
Width = 65 Width = 65
Height = 49 Height = 49
@@ -217,7 +217,7 @@ object FormDebug: TFormDebug
TabOrder = 2 TabOrder = 2
end end
object ButtonCP: TButton object ButtonCP: TButton
Left = 152 Left = 120
Top = 16 Top = 16
Width = 81 Width = 81
Height = 49 Height = 49
@@ -227,15 +227,25 @@ object FormDebug: TFormDebug
OnClick = ButtonCPClick OnClick = ButtonCPClick
end end
object Button2: TButton object Button2: TButton
Left = 240 Left = 200
Top = 16 Top = 16
Width = 65 Width = 57
Height = 49 Height = 49
Caption = 'Cond Carr'#233' aiguillages' Caption = 'Cond Carr'#233' aiguillages'
TabOrder = 4 TabOrder = 4
WordWrap = True WordWrap = True
OnClick = Button2Click OnClick = Button2Click
end end
object ButtonReserve: TButton
Left = 256
Top = 16
Width = 49
Height = 49
Caption = 'R'#233'serve canton signal'
TabOrder = 5
WordWrap = True
OnClick = ButtonReserveClick
end
end end
object GroupBox4: TGroupBox object GroupBox4: TGroupBox
Left = 8 Left = 8
@@ -360,6 +370,9 @@ object FormDebug: TFormDebug
Top = 96 Top = 96
Width = 233 Width = 233
Height = 17 Height = 17
Hint =
'Affiche les trames de la centrale XpressNet ou les trames CDM-Ra' +
'il (COM_IP)'
Caption = 'Trames '#233'chang'#233'es avec l'#39'interface ou CDM' Caption = 'Trames '#233'chang'#233'es avec l'#39'interface ou CDM'
Font.Charset = DEFAULT_CHARSET Font.Charset = DEFAULT_CHARSET
Font.Color = clBlack Font.Color = clBlack
@@ -367,6 +380,8 @@ object FormDebug: TFormDebug
Font.Name = 'MS Sans Serif' Font.Name = 'MS Sans Serif'
Font.Style = [] Font.Style = []
ParentFont = False ParentFont = False
ParentShowHint = False
ShowHint = True
TabOrder = 3 TabOrder = 3
OnClick = CheckTrameClick OnClick = CheckTrameClick
end end
@@ -485,6 +500,22 @@ object FormDebug: TFormDebug
TabOrder = 10 TabOrder = 10
OnClick = CheckDetSIgClick OnClick = CheckDetSIgClick
end end
object CheckBoxPrinc: TCheckBox
Left = 264
Top = 96
Width = 121
Height = 17
Alignment = taLeftJustify
Caption = 'Proc Principales'
Font.Charset = DEFAULT_CHARSET
Font.Color = clBlack
Font.Height = -11
Font.Name = 'MS Sans Serif'
Font.Style = []
ParentFont = False
TabOrder = 11
OnClick = CheckBoxPrincClick
end
end end
object RichDebug: TRichEdit object RichDebug: TRichEdit
Left = 8 Left = 8
UnitDebug.pas
+27 -2
View File
@@ -63,6 +63,8 @@ type
Button0: TButton; Button0: TButton;
MemoEvtDet: TRichEdit; MemoEvtDet: TRichEdit;
CheckDetSIg: TCheckBox; CheckDetSIg: TCheckBox;
CheckBoxPrinc: TCheckBox;
ButtonReserve: TButton;
procedure FormCreate(Sender: TObject); procedure FormCreate(Sender: TObject);
procedure ButtonEcrLogClick(Sender: TObject); procedure ButtonEcrLogClick(Sender: TObject);
procedure EditNivDebugKeyPress(Sender: TObject; var Key: Char); procedure EditNivDebugKeyPress(Sender: TObject; var Key: Char);
@@ -101,6 +103,8 @@ type
procedure FormActivate(Sender: TObject); procedure FormActivate(Sender: TObject);
procedure MemoEvtDetChange(Sender: TObject); procedure MemoEvtDetChange(Sender: TObject);
procedure CheckDetSIgClick(Sender: TObject); procedure CheckDetSIgClick(Sender: TObject);
procedure CheckBoxPrincClick(Sender: TObject);
procedure ButtonReserveClick(Sender: TObject);
private private
{ Déclarations privées } { Déclarations privées }
public public
@@ -110,7 +114,8 @@ type
var var
FormDebug: TFormDebug; FormDebug: TFormDebug;
NivDebug,signalDebug,compt_erreur,positionErreur,LigneErreur : integer; NivDebug,signalDebug,compt_erreur,positionErreur,LigneErreur : integer;
AffSignal,AffAffect,initform,AffFD,debug_dec_sig,debugTCO,DebugAffiche,AFfDetSIg : boolean; AffSignal,AffAffect,initform,AffFD,debug_dec_sig,debugTCO,DebugAffiche,AFfDetSIg,
ProcPrinc : boolean;
N_event_det : integer; // index du dernier évènement (de 1 à 20) N_event_det : integer; // index du dernier évènement (de 1 à 20)
N_Event_tick : integer ; // dernier index N_Event_tick : integer ; // dernier index
@@ -399,7 +404,7 @@ begin
Val(EditSigSuiv.Text,Adr,erreur); if erreur<>0 then exit; Val(EditSigSuiv.Text,Adr,erreur); if erreur<>0 then exit;
ancdebug:=NivDebug; ancdebug:=NivDebug;
NivDebug:=3; NivDebug:=3;
if PresTrainPrec(Adr,Nb_cantons_Sig,false,voie,adrtrain) then AfficheDebug('Présence train',clYellow) else if PresTrainPrec(Adr,Nb_cantons_Sig,false,voie,adrtrain) then AfficheDebug('Présence train '+intToSTR(AdrTrain),clYellow) else
AfficheDebug('Absence train',clyellow); AfficheDebug('Absence train',clyellow);
NivDebug:=AncDebug; NivDebug:=AncDebug;
end; end;
@@ -631,4 +636,24 @@ end;
procedure TFormDebug.CheckBoxPrincClick(Sender: TObject);
begin
ProcPrinc:=checkBoxPrinc.checked;
end;
procedure TFormDebug.ButtonReserveClick(Sender: TObject);
var i,adr,erreur,AncDebug,det1,det2 : integer;
begin
{Val(EditSigSuiv.Text,Adr,erreur); if erreur<>0 then exit;
ancdebug:=NivDebug;
NivDebug:=3;
i:=index_feu(adr);
feux[i].Adr_det1;
Cond_Carre(Adr);
d
reserve_canton(
NivDebug:=AncDebug; }
reserve_canton(524,521,1,1,3);
end;
end. end.
UnitPareFeu.pas
+18 -17
View File
@@ -3,8 +3,8 @@ unit UnitPareFeu;
// créée une règle dans le parefeu windows pour autoriser tous les ports entre CDM et Signaux_complexes // créée une règle dans le parefeu windows pour autoriser tous les ports entre CDM et Signaux_complexes
interface interface
function verifie_regle : integer; function verifie_regle(sp : string) : integer;
function cree_regle : boolean; function cree_regle(sp,chemin : string) : boolean;
implementation implementation
@@ -22,16 +22,16 @@ Const
NET_FW_MODIFY_STATE_OK=0; NET_FW_MODIFY_STATE_OK=0;
NET_FW_MODIFY_STATE_GP_OVERRIDE=1; NET_FW_MODIFY_STATE_GP_OVERRIDE=1;
NET_FW_MODIFY_STATE_INBOUND_BLOCKED=2; NET_FW_MODIFY_STATE_INBOUND_BLOCKED=2;
nom_regle_cdm='CDM rail';
// Ajoute une règle au pare feu pour un programme en utilisant Microsoft Windows Firewall APIs. // Ajoute une règle au pare feu pour un programme en utilisant Microsoft Windows Firewall APIs.
function AddApplicationRule : boolean; function AddApplicationRule(sp,chemin : string) : boolean;
var var
CurrentProfiles,fwPolicy2,RulesObject,NewRule : OleVariant; CurrentProfiles,fwPolicy2,RulesObject,NewRule : OleVariant;
s,fichier : string; s,fichier : string;
r : boolean; r : boolean;
begin begin
fichier:=CheminProgrammes+'\CDM-Rail\cdr.exe'; fichier:=CheminProgrammes+chemin; //'\CDM-Rail\cdr.exe';
// Crée l'objet FwPolicy2 // Crée l'objet FwPolicy2
fwPolicy2:=CreateOleObject('HNetCfg.FwPolicy2'); fwPolicy2:=CreateOleObject('HNetCfg.FwPolicy2');
@@ -42,8 +42,8 @@ begin
//Crée l'objet de la règle. //Crée l'objet de la règle.
NewRule:=CreateOleObject('HNetCfg.FWRule'); NewRule:=CreateOleObject('HNetCfg.FWRule');
NewRule.Name:=nom_regle_cdm; NewRule.Name:=sp; // CDM rail
NewRule.Description:='Autorise le socket de/vers CDM rail'; NewRule.Description:='Autorise le socket de/vers CDM rail'+sp;
NewRule.Applicationname:=fichier; NewRule.Applicationname:=fichier;
NewRule.Protocol:=NET_FW_IP_PROTOCOL_TCP; NewRule.Protocol:=NET_FW_IP_PROTOCOL_TCP;
@@ -69,7 +69,8 @@ begin
result:=r; result:=r;
end; end;
function cree_regle : boolean; //
function cree_regle(sp,chemin : string) : boolean;
var CoResult : Hresult; var CoResult : Hresult;
s : string; s : string;
r : boolean; r : boolean;
@@ -78,13 +79,13 @@ begin
try try
CoResult:=CoInitializeEx(nil,COINIT_MULTITHREADED); CoResult:=CoInitializeEx(nil,COINIT_MULTITHREADED);
try try
r:=AddApplicationRule; r:=AddApplicationRule(sp,chemin);
finally finally
begin begin
CoUninitialize; CoUninitialize;
if r then if r then
begin begin
s:='Ajout de la règle '+nom_regle_cdm+' dans le pare-feu'; s:='Ajout de la règle '+sp+' dans le pare-feu';
formconfig.Labelinfo.caption:=s; formconfig.Labelinfo.caption:=s;
Affiche(s,clyellow); Affiche(s,clyellow);
end; end;
@@ -109,8 +110,8 @@ end;
// vérifie si la règle cdm est dans le parefeu windows // vérifie si la règle cdm est dans le parefeu windows
// retour =0 : pas dans le pare feu // retour =0 : pas dans le pare feu
// =1 oui mais inactive // =1 oui mais inactive
// =2 oui et active // =2 oui et active sp=Nom regle CDM
function CheckingRuleEnabled : integer; function CheckingRuleEnabled(sp : string) : integer;
var var
fwPolicy2,RulesObject,regle : OleVariant; fwPolicy2,RulesObject,regle : OleVariant;
CurrentProfiles : Integer; CurrentProfiles : Integer;
@@ -122,17 +123,17 @@ begin
fwPolicy2:=CreateOleObject('HNetCfg.FwPolicy2'); fwPolicy2:=CreateOleObject('HNetCfg.FwPolicy2');
RulesObject:=fwPolicy2.Rules; RulesObject:=fwPolicy2.Rules;
CurrentProfiles:=fwPolicy2.CurrentProfileTypes; CurrentProfiles:=fwPolicy2.CurrentProfileTypes;
trouve:=false ; trouve:=false;
oEnum:=IUnknown(Rulesobject._NewEnum) as IEnumVariant; oEnum:=IUnknown(Rulesobject._NewEnum) as IEnumVariant;
while (oEnum.Next(1,regle,iValue)=0) and not(trouve) do while (oEnum.Next(1,regle,iValue)=0) and not(trouve) do
begin begin
if (regle.Profiles And CurrentProfiles)<>0 then if (regle.Profiles And CurrentProfiles)<>0 then
begin begin
s:=regle.Name; s:=regle.Name;
trouve:=s=nom_regle_cdm; trouve:=s=sp;
if trouve then if trouve then
begin begin
Affiche('Description de l''autorisation socket pour CDM rail dans le pare-feu Windows',clyellow); Affiche('Description de l''autorisation socket pour '+sp+' dans le pare-feu Windows',clyellow);
Affiche('Nom : ' + s,clLime); Affiche('Nom : ' + s,clLime);
Affiche('Description : ' + regle.Description,clLime); Affiche('Description : ' + regle.Description,clLime);
Affiche('Nom d''application: ' + regle.ApplicationName,clLime); Affiche('Nom d''application: ' + regle.ApplicationName,clLime);
@@ -161,14 +162,14 @@ begin
end; end;
end; end;
function verifie_regle : integer; function verifie_regle(sp : string) : integer;
var i : integer; var i : integer;
begin begin
i:=0; i:=0;
try try
CoInitialize(nil); CoInitialize(nil);
try try
i:=CheckingRuleEnabled; i:=CheckingRuleEnabled(sp);
finally finally
CoUninitialize; CoUninitialize;
end; end;
UnitPilote.dfm
+10 -9
View File
@@ -40,16 +40,16 @@ object FormPilote: TFormPilote
end end
object LabelNbFeux: TLabel object LabelNbFeux: TLabel
Left = 208 Left = 208
Top = 248 Top = 256
Width = 120 Width = 120
Height = 13 Height = 13
Caption = 'Nombre de feux '#224' allumer' Caption = 'Nombre de feux '#224' allumer'
end end
object LabelDec: TLabel object LabelDec: TLabel
Left = 200 Left = 208
Top = 192 Top = 184
Width = 72 Width = 113
Height = 19 Height = 41
Alignment = taCenter Alignment = taCenter
Caption = 'LabelDec' Caption = 'LabelDec'
Font.Charset = ANSI_CHARSET Font.Charset = ANSI_CHARSET
@@ -59,17 +59,18 @@ object FormPilote: TFormPilote
Font.Style = [fsBold] Font.Style = [fsBold]
ParentFont = False ParentFont = False
Layout = tlCenter Layout = tlCenter
WordWrap = True
end end
object Label1: TLabel object Label1: TLabel
Left = 240 Left = 240
Top = 176 Top = 168
Width = 50 Width = 50
Height = 13 Height = 13
Caption = 'D'#233'codeur:' Caption = 'D'#233'codeur:'
end end
object ImageSignaux: TImage object ImageSignaux: TImage
Left = 168 Left = 168
Top = 96 Top = 72
Width = 153 Width = 153
Height = 105 Height = 105
Picture.Data = { Picture.Data = {
@@ -1130,7 +1131,7 @@ object FormPilote: TFormPilote
end end
object EditNbreFeux: TEdit object EditNbreFeux: TEdit
Left = 240 Left = 240
Top = 264 Top = 272
Width = 57 Width = 57
Height = 21 Height = 21
TabOrder = 3 TabOrder = 3
@@ -1139,7 +1140,7 @@ object FormPilote: TFormPilote
end end
object CheckVerrouCarre: TCheckBox object CheckVerrouCarre: TCheckBox
Left = 216 Left = 216
Top = 216 Top = 240
Width = 113 Width = 113
Height = 17 Height = 17
Caption = 'Verrouiller au carr'#233 Caption = 'Verrouiller au carr'#233
UnitPilote.pas
+48 -23
View File
@@ -136,7 +136,7 @@ begin
5 : dessine_signal5(VCanvas,0,0,1,1,EtatFeupilote,1); 5 : dessine_signal5(VCanvas,0,0,1,1,EtatFeupilote,1);
7 : dessine_signal7(VCanvas,0,0,1,1,EtatFeupilote,1); 7 : dessine_signal7(VCanvas,0,0,1,1,EtatFeupilote,1);
9 : dessine_signal9(VCanvas,0,0,1,1,EtatFeupilote,1); 9 : dessine_signal9(VCanvas,0,0,1,1,EtatFeupilote,1);
20 : dessine_signal20(VCanvas,0,0,1,1,EtatFeupilote,1,feux[i].adresse,12); 20 : dessine_signal20(VCanvas,0,0,1,1,EtatFeupilote,1,feux[i].adresse);
// indicateurs de direction // indicateurs de direction
12 : dessine_dirN(VCanvas,0,0,1,1,EtatFeupilote,1,2); 12 : dessine_dirN(VCanvas,0,0,1,1,EtatFeupilote,1,2);
13 : dessine_dirN(VCanvas,0,0,1,1,EtatFeupilote,1,3); 13 : dessine_dirN(VCanvas,0,0,1,1,EtatFeupilote,1,3);
@@ -316,10 +316,17 @@ begin
i:=Index_Signal(AdrPilote); i:=Index_Signal(AdrPilote);
d:=feux[i].decodeur; d:=feux[i].decodeur;
n:=feux[i].aspect; n:=feux[i].aspect;
LabelDec.Caption:=decodeur[d]; with LabelDec do
begin
Caption:=decodeur[d];
width:=114;
height:=42;
end;
feux[0].decodeur:=d; feux[0].decodeur:=d;
feux[0].aspect:=n; feux[0].aspect:=n;
feux[0].contrevoie:=feux[i].contrevoie; feux[0].contrevoie:=feux[i].contrevoie;
// signal belge // signal belge
if (n=20) then if (n=20) then
begin begin
@@ -329,6 +336,7 @@ begin
RadioJauneCli.Caption:='Deux jaunes clignotants'; RadioJauneCli.Caption:='Deux jaunes clignotants';
RadioBlanc.caption:='Rouge Blanc'; RadioBlanc.caption:='Rouge Blanc';
RadioBlancCli.caption:='Rouge Blanc clignotants'; RadioBlancCli.caption:='Rouge Blanc clignotants';
RadioRouge.caption:='Rouge';
radiovertcli.visible:=false; radiovertcli.visible:=false;
radioJaunecli.visible:=false; radioJaunecli.visible:=false;
@@ -346,6 +354,7 @@ begin
groupBox3.Visible:=false; groupBox3.Visible:=false;
Radiocarre.Caption:='Carré'; Radiocarre.Caption:='Carré';
Radioviolet.Caption:='Violet'; Radioviolet.Caption:='Violet';
RadioRouge.Caption:='Sémaphore';
RadioJauneCli.Caption:='Avertissement clignotant'; RadioJauneCli.Caption:='Avertissement clignotant';
RadioJaune.Caption:='Avertissement'; RadioJaune.Caption:='Avertissement';
RadioBlanc.caption:='Blanc'; RadioBlanc.caption:='Blanc';
@@ -354,18 +363,17 @@ begin
radioJaunecli.visible:=true; radioJaunecli.visible:=true;
radioRougecli.visible:=true; radioRougecli.visible:=true;
radioBlanccli.visible:=true; radioBlanccli.visible:=true;
end; end;
// checkcarré // checkcarré
if (n<4) or (n>10) then checkVerrouCarre.Visible:=false else if (n<4) or (n>10) then checkVerrouCarre.Visible:=false else
begin begin
checkVerrouCarre.Visible:=true; checkVerrouCarre.Visible:=false; //true;
checkVerrouCarre.Checked:=feux[i].VerrouCarre; checkVerrouCarre.Checked:=feux[i].VerrouCarre;
end; end;
with imagePIlote do with imagePilote do
begin begin
Parent:=FormPilote; Parent:=FormPilote;
Picture.Bitmap.TransparentMode:=tmAuto; Picture.Bitmap.TransparentMode:=tmAuto;
@@ -374,26 +382,43 @@ begin
Picture.BitMap:=Feux[i].Img.Picture.Bitmap; Picture.BitMap:=Feux[i].Img.Picture.Bitmap;
//left:=groupBox1.width+50; //left:=groupBox1.width+50;
end; end;
LabelTitrePilote.Caption:='Pilotage du signal '+intToSTR(AdrPilote);
feux[0].EtatSignal:=feux[i].EtatSignal;
if (feux[i].aspect>10) and (feux[i].aspect<20) then LabelTitrePilote.Caption:='Pilotage du signal '+intToSTR(AdrPilote);
begin feux[0].EtatSignal:=feux[i].EtatSignal;
// signaux directionnels
GroupBox1.Visible:=false;
GroupBox2.Visible:=false;
LabelNbFeux.Visible:=true;
EditNbreFeux.Visible:=true;
EditNbreFeux.Text:='1';
end
else
begin
LabelNbFeux.Visible:=False;
EditNbreFeux.Visible:=false;
GroupBox1.Visible:=true;
if (feux[i].aspect<10) then GroupBox2.Visible:=true else GroupBox2.Visible:=false;
end;
if (feux[i].aspect>10) and (feux[i].aspect<20) then
begin
// signaux directionnels
GroupBox1.Visible:=false;
GroupBox2.Visible:=false;
LabelNbFeux.Visible:=true;
EditNbreFeux.Visible:=true;
EditNbreFeux.Text:='1';
end
else
begin
LabelNbFeux.Visible:=False;
EditNbreFeux.Visible:=false;
GroupBox1.Visible:=true;
if (feux[i].aspect<10) then GroupBox2.Visible:=true else GroupBox2.Visible:=false;
end;
radioVert.Checked:=false;
radioVertCli.Checked:=false;
radioJaune.Checked:=false;
radioJauneCli.Checked:=false;
radioRouge.Checked:=false;
radioRougeCli.Checked:=false;
radiocarre.Checked:=false;
radioBlanc.Checked:=false;
radioViolet.Checked:=false;
radioRalen30.Checked:=false;
radioRappel30.Checked:=false;
radioRalen60.Checked:=false;
radioRappel60.Checked:=false;
CheckChiffre.Checked:=false;
CheckChevron.Checked:=false;
CheckClignote.Checked:=false;
end; end;
procedure TFormPilote.CheckVerrouCarreClick(Sender: TObject); procedure TFormPilote.CheckVerrouCarreClick(Sender: TObject);
UnitPrinc.dfm
+43 -24
View File
@@ -1,6 +1,6 @@
object FormPrinc: TFormPrinc object FormPrinc: TFormPrinc
Left = 91 Left = 84
Top = 235 Top = 223
Width = 1133 Width = 1133
Height = 653 Height = 653
Anchors = [akLeft, akTop, akRight] Anchors = [akLeft, akTop, akRight]
@@ -19,8 +19,8 @@ object FormPrinc: TFormPrinc
OnCreate = FormCreate OnCreate = FormCreate
OnResize = FormResize OnResize = FormResize
DesignSize = ( DesignSize = (
1125 1117
602) 595)
PixelsPerInch = 96 PixelsPerInch = 96
TextHeight = 13 TextHeight = 13
object LabelTitre: TLabel object LabelTitre: TLabel
@@ -37,8 +37,8 @@ object FormPrinc: TFormPrinc
ParentFont = False ParentFont = False
end end
object Image9feux: TImage object Image9feux: TImage
Left = 944 Left = 1064
Top = -8 Top = 0
Width = 57 Width = 57
Height = 105 Height = 105
Picture.Data = { Picture.Data = {
@@ -227,7 +227,7 @@ object FormPrinc: TFormPrinc
Visible = False Visible = False
end end
object Image7feux: TImage object Image7feux: TImage
Left = 376 Left = 504
Top = 0 Top = 0
Width = 57 Width = 57
Height = 105 Height = 105
@@ -1081,7 +1081,7 @@ object FormPrinc: TFormPrinc
Visible = False Visible = False
end end
object Image6Dir: TImage object Image6Dir: TImage
Left = 1016 Left = 960
Top = 0 Top = 0
Width = 81 Width = 81
Height = 25 Height = 25
@@ -1203,8 +1203,8 @@ object FormPrinc: TFormPrinc
ParentFont = False ParentFont = False
end end
object ImageSignal20: TImage object ImageSignal20: TImage
Left = 1016 Left = 1072
Top = 0 Top = 96
Width = 57 Width = 57
Height = 105 Height = 105
Picture.Data = { Picture.Data = {
@@ -1443,8 +1443,8 @@ object FormPrinc: TFormPrinc
end end
object StatusBar1: TStatusBar object StatusBar1: TStatusBar
Left = 0 Left = 0
Top = 580 Top = 573
Width = 1125 Width = 1117
Height = 22 Height = 22
Panels = < Panels = <
item item
@@ -1470,18 +1470,18 @@ object FormPrinc: TFormPrinc
end> end>
OnDrawPanel = StatusBar1DrawPanel OnDrawPanel = StatusBar1DrawPanel
end end
object MSCommUSBLenz: TMSComm object MSCommUSBInterface: TMSComm
Left = 1064 Left = 1064
Top = 192 Top = 192
Width = 32 Width = 32
Height = 32 Height = 32
OnComm = MSCommUSBLenzComm OnComm = MSCommUSBInterfaceComm
ControlData = { ControlData = {
2143341208000000ED030000ED03000001568A64000006000000010000040000 2143341208000000ED030000ED03000001568A64000006000000010000040000
00020000802500000000080000000000000000003F00000011000000} 00020000802500000000080000000000000000003F00000011000000}
end end
object Button1: TButton object Button1: TButton
Left = 400 Left = 408
Top = 0 Top = 0
Width = 75 Width = 75
Height = 25 Height = 25
@@ -1600,8 +1600,8 @@ object FormPrinc: TFormPrinc
end end
end end
object GroupBox3: TGroupBox object GroupBox3: TGroupBox
Left = 433 Left = 497
Top = 32 Top = 104
Width = 265 Width = 265
Height = 129 Height = 129
Anchors = [akTop, akRight] Anchors = [akTop, akRight]
@@ -1782,10 +1782,10 @@ object FormPrinc: TFormPrinc
object EditVitesse: TEdit object EditVitesse: TEdit
Left = 80 Left = 80
Top = 40 Top = 40
Width = 25 Width = 33
Height = 21 Height = 21
TabOrder = 2 TabOrder = 2
Text = '30' Text = '0'
OnChange = EditVitesseChange OnChange = EditVitesseChange
end end
object ComboTrains: TComboBox object ComboTrains: TComboBox
@@ -1830,6 +1830,7 @@ object FormPrinc: TFormPrinc
Hint = 'Vitesse loco en %' Hint = 'Vitesse loco en %'
Ctl3D = False Ctl3D = False
Max = 100 Max = 100
Min = -100
ParentCtl3D = False ParentCtl3D = False
TabOrder = 7 TabOrder = 7
OnChange = TrackBarVitChange OnChange = TrackBarVitChange
@@ -1983,8 +1984,8 @@ object FormPrinc: TFormPrinc
end end
end end
object GroupBox2: TGroupBox object GroupBox2: TGroupBox
Left = 457 Left = 505
Top = 144 Top = 24
Width = 265 Width = 265
Height = 105 Height = 105
Anchors = [akTop, akRight] Anchors = [akTop, akRight]
@@ -2046,8 +2047,8 @@ object FormPrinc: TFormPrinc
end end
end end
object ButtonIndex: TButton object ButtonIndex: TButton
Left = 712 Left = 840
Top = 0 Top = 176
Width = 75 Width = 75
Height = 25 Height = 25
Caption = 'Indexs' Caption = 'Indexs'
@@ -2128,6 +2129,11 @@ object FormPrinc: TFormPrinc
Caption = 'Evenements detecteurs par train' Caption = 'Evenements detecteurs par train'
OnClick = Evenementsdetecteurspartrain1Click OnClick = Evenementsdetecteurspartrain1Click
end end
object Listedesclientsconnects1: TMenuItem
Caption = 'Liste des clients connect'#233's'
Hint = 'Affiche la liste des clients connect'#233's par COM-IP'
OnClick = Listedesclientsconnects1Click
end
object N3: TMenuItem object N3: TMenuItem
Caption = '-' Caption = '-'
end end
@@ -2412,6 +2418,10 @@ object FormPrinc: TFormPrinc
Caption = 'Mise '#224' z'#233'ro des r'#233'servations des aiguillages' Caption = 'Mise '#224' z'#233'ro des r'#233'servations des aiguillages'
OnClick = RazResaClick OnClick = RazResaClick
end end
object Copierltatdesaiguillageseninitialisation1: TMenuItem
Caption = 'Copier l'#39#233'tat actuel des aiguillages en initialisation'
OnClick = Copierltatdesaiguillageseninitialisation1Click
end
end end
end end
object ClientSocketCDM: TClientSocket object ClientSocketCDM: TClientSocket
@@ -2437,7 +2447,7 @@ object FormPrinc: TFormPrinc
Top = 8 Top = 8
object outslectionner1: TMenuItem object outslectionner1: TMenuItem
Caption = 'Tout s'#233'lectionner' Caption = 'Tout s'#233'lectionner'
OnClick = outslectionner1Click OnClick = Toutslectionner1Click
end end
object N15: TMenuItem object N15: TMenuItem
Caption = '-' Caption = '-'
@@ -2483,4 +2493,13 @@ object FormPrinc: TFormPrinc
Left = 1072 Left = 1072
Top = 376 Top = 376
end end
object ServerSocket: TServerSocket
Active = False
Port = 0
ServerType = stNonBlocking
OnAccept = ServerSocketAccept
OnClientDisconnect = ServerSocketClientDisconnect
OnClientRead = ServerSocketClientRead
Left = 368
end
end end
UnitPrinc.pas
+1734 -1693
View File
File diff suppressed because it is too large Load Diff
UnitTCO.dfm
+33 -29
View File
@@ -1,6 +1,6 @@
object FormTCO: TFormTCO object FormTCO: TFormTCO
Left = 14 Left = 89
Top = 171 Top = 111
Width = 1212 Width = 1212
Height = 580 Height = 580
VertScrollBar.Visible = False VertScrollBar.Visible = False
@@ -23,8 +23,8 @@ object FormTCO: TFormTCO
OnKeyPress = FormKeyPress OnKeyPress = FormKeyPress
OnMouseWheel = FormMouseWheel OnMouseWheel = FormMouseWheel
DesignSize = ( DesignSize = (
1204 1196
529) 521)
PixelsPerInch = 96 PixelsPerInch = 96
TextHeight = 13 TextHeight = 13
object LabelZoom: TLabel object LabelZoom: TLabel
@@ -42,22 +42,24 @@ object FormTCO: TFormTCO
ParentFont = False ParentFont = False
end end
object ImageTemp: TImage object ImageTemp: TImage
Left = 731 Left = 1020
Top = 123 Top = 3
Width = 121 Width = 121
Height = 121 Height = 121
Anchors = [akTop, akRight]
end end
object ImageTemp2: TImage object ImageTemp2: TImage
Left = 995 Left = 1019
Top = 76 Top = 132
Width = 121 Width = 121
Height = 121 Height = 121
Anchors = [akTop, akRight]
end end
object ScrollBox: TScrollBox object ScrollBox: TScrollBox
Left = 10 Left = 10
Top = 7 Top = 15
Width = 946 Width = 687
Height = 258 Height = 266
HorzScrollBar.Smooth = True HorzScrollBar.Smooth = True
HorzScrollBar.Tracking = True HorzScrollBar.Tracking = True
VertScrollBar.Smooth = True VertScrollBar.Smooth = True
@@ -68,13 +70,13 @@ object FormTCO: TFormTCO
ParentColor = False ParentColor = False
TabOrder = 1 TabOrder = 1
DesignSize = ( DesignSize = (
942 683
254) 262)
object ImageTCO: TImage object ImageTCO: TImage
Left = 56 Left = 120
Top = 33 Top = 41
Width = 745 Width = 486
Height = 168 Height = 176
Anchors = [akLeft, akTop, akRight, akBottom] Anchors = [akLeft, akTop, akRight, akBottom]
AutoSize = True AutoSize = True
ParentShowHint = False ParentShowHint = False
@@ -1260,9 +1262,13 @@ object FormTCO: TFormTCO
OnClick = Tourner90DClick OnClick = Tourner90DClick
end end
object Pos_vert: TMenuItem object Pos_vert: TMenuItem
Caption = 'Signal vertical' Caption = 'Signal vertical 0'#176
OnClick = Pos_vertClick OnClick = Pos_vertClick
end end
object Signalvertical180: TMenuItem
Caption = 'Signal vertical 180'#176
OnClick = Signalvertical180Click
end
object N4: TMenuItem object N4: TMenuItem
Caption = '-' Caption = '-'
end end
@@ -1278,9 +1284,9 @@ object FormTCO: TFormTCO
object N2: TMenuItem object N2: TMenuItem
Caption = '-' Caption = '-'
end end
object outslectionner1: TMenuItem object Toutslectionner1: TMenuItem
Caption = 'Tout s'#233'lectionner' Caption = 'Tout s'#233'lectionner'
OnClick = outslectionner1Click OnClick = Toutslectionner1Click
end end
object Inserer: TMenuItem object Inserer: TMenuItem
Caption = 'Inserer' Caption = 'Inserer'
@@ -1331,8 +1337,8 @@ object FormTCO: TFormTCO
Font.Height = -11 Font.Height = -11
Font.Name = 'MS Sans Serif' Font.Name = 'MS Sans Serif'
Font.Style = [] Font.Style = []
Left = 256 Left = 264
Top = 432 Top = 408
end end
object ColorDialog1: TColorDialog object ColorDialog1: TColorDialog
OnShow = ColorDialog1Show OnShow = ColorDialog1Show
@@ -1353,19 +1359,17 @@ object FormTCO: TFormTCO
end end
object DessinerleTCO1: TMenuItem object DessinerleTCO1: TMenuItem
Caption = 'Dessiner le TCO' Caption = 'Dessiner le TCO'
Hint = 'Dessine le TCO '#224' la souris'
OnClick = DessinerleTCO1Click OnClick = DessinerleTCO1Click
end end
object ConfigurationduTCO1: TMenuItem object ConfigurationduTCO1: TMenuItem
Caption = 'Configuration du TCO' Caption = 'Configuration du TCO'
OnClick = ConfigurationduTCO1Click OnClick = ConfigurationduTCO1Click
end end
object N9: TMenuItem end
Caption = '-' object RafrachirleTCO1: TMenuItem
end Caption = 'Rafra'#238'chir le TCO'
object Redessine1: TMenuItem OnClick = Redessine1Click
Caption = 'Redessine'
OnClick = Redessine1Click
end
end end
object Affichebandeau1: TMenuItem object Affichebandeau1: TMenuItem
Caption = 'Affiche bandeau' Caption = 'Affiche bandeau'
UnitTCO.pas
+1200 -831
View File
File diff suppressed because it is too large Load Diff
Unit_Pilote_aig.dfm
+2 -2
View File
@@ -1,6 +1,6 @@
object FormAig: TFormAig object FormAig: TFormAig
Left = 400 Left = 630
Top = 204 Top = 144
Width = 363 Width = 363
Height = 204 Height = 204
Caption = 'Pilotage de l'#39'aiguillage' Caption = 'Pilotage de l'#39'aiguillage'
Unit_Pilote_aig.pas
+24 -1
View File
@@ -44,7 +44,10 @@ begin
LabelAdr1.Visible:=false; LabelAdr1.Visible:=false;
ButtonDev2.Visible:=false; ButtonDev2.Visible:=false;
ButtonDroit2.Visible:=false; ButtonDroit2.Visible:=false;
ButtonOk.Visible:=false; ButtonOk.Visible:=true;
buttonDev.Visible:=true;
buttonDroit.Visible:=true;
ButtonDev.Left:=48; ButtonDev.Left:=48;
ButtonDroit.Left:=216; ButtonDroit.Left:=216;
end; end;
@@ -55,6 +58,22 @@ var i : integer;
s : string; s : string;
begin begin
i:=Index_aig(Aiguille); i:=Index_aig(Aiguille);
if aiguillage[i].AdrTrain<>0 then
begin
tjdC:=(aiguillage[i].modele=tjd) or (aiguillage[i].modele=tjs);
if tjdC then s:='Pilotage de la TJD/S '+intToSTR(aiguille) else s:='Pilotage de l''aiguillage '+intToSTR(aiguille);
Label1.Caption:=s;
if tjdC then s:='La TJD/S '+intToSTR(aiguille)+' est réservée ' else s:='L''aiguillage '+intToSTR(aiguille)+' est réservé ';
labelAdr1.caption:=s+'par le train '+intToSTR(aiguillage[i].AdrTrain);
labelAdr1.Visible:=true;
buttonDev.Visible:=false;
buttonDroit.Visible:=false;
buttonDev2.Visible:=false;
buttonDroit2.Visible:=false;
LabelAdr2.Visible:=false;
exit;
end;
aigC:=(aiguillage[i].modele=aig); aigC:=(aiguillage[i].modele=aig);
tjdC:=(aiguillage[i].modele=tjd) or (aiguillage[i].modele=tjs); tjdC:=(aiguillage[i].modele=tjd) or (aiguillage[i].modele=tjs);
if aigC then if aigC then
@@ -79,6 +98,10 @@ begin
ButtonDroit2.Visible:=true; ButtonDroit2.Visible:=true;
ButtonDev.Left:=8; ButtonDev.Left:=8;
ButtonDroit.Left:=88; ButtonDroit.Left:=88;
buttonDroit.Visible:=true;
buttonDev.Visible:=true;
end; end;
end; end;
if aiguillage[i].EtatTJD=2 then if aiguillage[i].EtatTJD=2 then
Unitplace.pas
+3 -1
View File
@@ -361,6 +361,7 @@ begin
rouge:=false; rouge:=false;
trouve:=true; trouve:=true;
roulage:=true; roulage:=true;
avecResa:=false; // pour adrTrain ou NumTrain
AdrTrain:=detecteur[AdrDet].AdrTrain; AdrTrain:=detecteur[AdrDet].AdrTrain;
AdrFeu:=signal_detecteur(AdrDet); // trouve l'adresse du signal correspondant au détecteur AdrFeu:=signal_detecteur(AdrDet); // trouve l'adresse du signal correspondant au détecteur
@@ -381,7 +382,7 @@ begin
s:='Lancement du train '+detecteur[adrDet].train+' depuis détecteur '+intToSTR(adrDet); s:='Lancement du train '+detecteur[adrDet].train+' depuis détecteur '+intToSTR(adrDet);
Affiche(s,clYellow); Affiche(s,clYellow);
if traceListe then AfficheDebug(s,clyellow); if traceListe then AfficheDebug(s,clyellow);
reserve_canton(AdrDet,placement[j].detdir,adrtrain); reserve_canton(AdrDet,placement[j].detdir,adrtrain,0,2);
end end
Else Affiche('Le signal '+intToSTR(AdrFeu)+' étant rouge, le train '+detecteur[adrDet].train+' @'+intToSTR(AdrTrain)+' ne démarre pas',clyellow); Else Affiche('Le signal '+intToSTR(AdrFeu)+' étant rouge, le train '+detecteur[adrDet].train+' @'+intToSTR(AdrTrain)+' ne démarre pas',clyellow);
@@ -405,6 +406,7 @@ procedure TFormPlace.ButtonArretTrainsClick(Sender: TObject);
var i : integer; var i : integer;
begin begin
roulage:=false; roulage:=false;
avecRESA:=formConfig.CheckBoxRESA.Checked;
Affiche('Arrêt du roulage de tous les trains',clorange); Affiche('Arrêt du roulage de tous les trains',clorange);
Formprinc.LabelTitre.caption:=titre+' '; Formprinc.LabelTitre.caption:=titre+' ';
for i:=1 to ntrains do for i:=1 to ntrains do
verif_version.pas
+1 -1
View File
@@ -25,7 +25,7 @@ var
verifVersion,notificationVersion : boolean; verifVersion,notificationVersion : boolean;
date_creation,nombre_tel : string; date_creation,nombre_tel : string;
Const Version='8.27'; // sert à la comparaison de la version publiée Const Version='8.3'; // sert à la comparaison de la version publiée
SousVersion=' '; // A B C ... en cas d'absence de sous version mettre un espace SousVersion=' '; // A B C ... en cas d'absence de sous version mettre un espace
function GetCurrentProcessEnvVar(const VariableName: string): string; function GetCurrentProcessEnvVar(const VariableName: string): string;
versions.txt
+6 -2
View File
@@ -204,6 +204,10 @@ version 8.26 : Am
version 8.27 : Nouvel algorithme de suivi des trains dans les TCO. version 8.27 : Nouvel algorithme de suivi des trains dans les TCO.
Correction suivi de deux trains consécutifs. Correction suivi de deux trains consécutifs.
Création d'une action TCO "pilotage d'accessoire" Création d'une action TCO "pilotage d'accessoire"
version 8.28 : Amélioration de l'affichage du suivi des trains dans les TCOs.
Affichage des TJD dans le TCO.
version 8.3 : Possibilité d'afficher des signaux à 180° sur le TCO.
Création d'un mode sélectionnable de réservation des aiguillages par les trains.
Création d'un serveur de données socket pour la transmission des évènements.
Possibilité de télécommander Signaux_Complexes depuis les périphériques ou le serveur socket.