45044cdcba
The TRO markers written by sps_skel (lib/tro_annotate.py) are blocks TRO_SYM_<type> carrying ID and TYPE as attributes. This wires them into the existing SSG_LIB mechanisms rather than adding new ones. The double-click hook and the EATTEDIT override already exist: ***DOUBLECLICK routes [INSERT] to SSG_BLOCKEDIT, and c:EATTEDIT is undefined and forwarded to the same dispatcher. So all that was missing was a branch: Blockname TRO_* -> c:TRO_EDIT (Lisp/Tro_Edit.lsp) -> dcl/tro_edit.dcl Tro_Edit.lsp follows the conventions of the other edit commands: DCL path from DXFM_DCL, ssg-start/ssg-end around the command, ssg-attrib-read and ssg-attrib-set-on for the attributes, all user-visible text via ssg-text/ ssg-textf with keys in lang/de_DE.json and en_GB.json. Implied selection is read before ssg-start, since ssg-start clears it - the same note Gefaellestrecke.lsp carries. TYPE is a picklist rather than free text so it cannot drift from the type catalogue. The list comes from Lisp/tro_types.lsp, generated on the sps_skel side by "tro_annotate.py --emit-lisp" into DXFM_LISP. If that file is absent the dialog offers the block's current type and still works. Loading is lazy: the module is not preloaded in the MNL. The menu macros and the dispatcher pull it with (ssg-ensure "Tro_Edit") on first use, and the dispatcher falls back to native EATTEDIT if the module cannot be found. ssg_load.lsp loads it for the non-menu path. Menu: SSG_LIB > TRO with "Marker bearbeiten" and "Bearbeiten (Auto)", plus an entry in the POP501 edit context menu. The dialog changes attributes only. The marker shape belongs to the block definition of the type and FB_BLOCK is derived from it, so both follow on the next tro_annotate.py run; the dialog states this and the command prints a reminder when the type was changed. Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
170 lines
9.7 KiB
Plaintext
170 lines
9.7 KiB
Plaintext
***MENUGROUP=SSG_LIB
|
|
|
|
***POP1
|
|
[SSG_LIB]
|
|
[->ILS]
|
|
[->Kreisel-Module]
|
|
[Einfuegen]^C^C(ssg-ensure "KreiselInsert") KreiselInsert
|
|
[Verbinden]^C^C(ssg-ensure "KreiselInsert") KreiselConnect
|
|
[Bearbeiten]^C^C(ssg-ensure "KreiselInsert") KreiselEdit
|
|
[<-Eckrad]^C^C(ssg-ensure "KreiselInsert") ILS_Eckrad
|
|
[->Zusatzmodul]
|
|
[~BTMT-Beladung]^C^C(ssg-ensure "SSG_LIB_Commands") ILS_BTMT_Beladung
|
|
[~BTMT-Entladung]^C^C(ssg-ensure "SSG_LIB_Commands") ILS_BTMT_Entladung
|
|
[--]
|
|
[Scanner einfuegen]^C^C(ssg-ensure "SSG_LIB_Commands") ILS_SCANNER_INSERT
|
|
[<-Separator einfuegen]^C^C(ssg-ensure "SSG_LIB_Commands") ILS_SEPARATOR_INSERT
|
|
[->Foerderer]
|
|
[~Durch TEF angetriebene Strecke]^C^C(ssg-ensure "SSG_LIB_Commands") ILS_TEF_Strecke
|
|
[VarioFoerderer]^C^CVarioFoerderer
|
|
[EtageVarioFoerderer]^C^CETAGEVARIOFOERDERER
|
|
[Vario_Kette_Merge]^C^C(ssg-ensure "VarioFoerderer") Vario_Kette_Merge
|
|
[--]
|
|
[~90 Kurve links angetrieben Aussen]^C^C(ssg-ensure "SSG_LIB_Commands") ILS_K90LA
|
|
[~90 Kurve rechts angetrieben Aussen]^C^C(ssg-ensure "SSG_LIB_Commands") ILS_K90RA
|
|
[~60 Kurve links angetrieben Aussen]^C^C(ssg-ensure "SSG_LIB_Commands") ILS_K60LA
|
|
[~60 Kurve rechts angetrieben Aussen]^C^C(ssg-ensure "SSG_LIB_Commands") ILS_K60RA
|
|
[~30 Kurve links angetrieben Aussen]^C^C(ssg-ensure "SSG_LIB_Commands") ILS_K30LA
|
|
[~30 Kurve rechts angetrieben Aussen]^C^C(ssg-ensure "SSG_LIB_Commands") ILS_K30RA
|
|
[--]
|
|
[~90 Kurve links angetrieben Innen]^C^C(ssg-ensure "SSG_LIB_Commands") ILS_K90LI
|
|
[~90 Kurve rechts angetrieben Innen]^C^C(ssg-ensure "SSG_LIB_Commands") ILS_K90RI
|
|
[~60 Kurve links angetrieben Innen]^C^C(ssg-ensure "SSG_LIB_Commands") ILS_K60LI
|
|
[~60 Kurve rechts angetrieben Innen]^C^C(ssg-ensure "SSG_LIB_Commands") ILS_K60RI
|
|
[~30 Kurve links angetrieben Innen]^C^C(ssg-ensure "SSG_LIB_Commands") ILS_K30LI
|
|
[<-~30 Kurve rechts angetrieben Innen]^C^C(ssg-ensure "SSG_LIB_Commands") ILS_K30RI
|
|
[->Gefaellestrecke]
|
|
[Gefaellestrecke]^C^C(ssg-ensure "Gefaellestrecke") GEFAELLESTRECKE
|
|
[--]
|
|
[~90 Kurve links Gefaellestrecke]^C^C(ssg-ensure "SSG_LIB_Commands") ILS_GK90L
|
|
[~90 Kurve rechts Gefaellestrecke]^C^C(ssg-ensure "SSG_LIB_Commands") ILS_GK90R
|
|
[~60 Kurve links Gefaellestrecke]^C^C(ssg-ensure "SSG_LIB_Commands") ILS_GK60L
|
|
[~60 Kurve rechts Gefaellestrecke]^C^C(ssg-ensure "SSG_LIB_Commands") ILS_GK60R
|
|
[~30 Kurve links Gefaellestrecke]^C^C(ssg-ensure "SSG_LIB_Commands") ILS_GK30L
|
|
[<-~30 Kurve rechts Gefaellestrecke]^C^C(ssg-ensure "SSG_LIB_Commands") ILS_GK30R
|
|
[<-ILS Schliessen]^C^C
|
|
[->Omniflo]
|
|
[->Boegen APB110]
|
|
[90]^C^C(ssg-ensure "OmniModulInsert") OMNI_APB_630_90
|
|
[67.5]^C^C(ssg-ensure "OmniModulInsert") OMNI_APB_550_675
|
|
[45]^C^C(ssg-ensure "OmniModulInsert") OMNI_APB_630_45
|
|
[22.5]^C^C(ssg-ensure "OmniModulInsert") OMNI_APB_550_225
|
|
[<-180 ]^C^C(ssg-ensure "OmniModulInsert") OMNI_APB_650_180
|
|
[->Boegen APB60]
|
|
[<-90]^C^C(ssg-ensure "OmniModulInsert") OMNI_APB60_90
|
|
[->Aluprofil Gerade]
|
|
[AP 60]^C^C(ssg-ensure "OmniModulInsert") OMNI_AP60
|
|
[AP 110]^C^C(ssg-ensure "OmniModulInsert") OMNI_AP110
|
|
[<-APG 110]^C^C(ssg-ensure "OmniModulInsert") OMNI_APG110
|
|
[->Weiche 90 Grad]
|
|
[Einfach 90 700/700 links M]^C^C(ssg-ensure "OmniModulInsert") OMNI_W90_Einfach
|
|
[Doppel 90 700/700 M]^C^C(ssg-ensure "OmniModulInsert") OMNI_W90_Doppel
|
|
[<-Dreiwege 90 700/700 M]^C^C(ssg-ensure "OmniModulInsert") OMNI_W90_Dreiwege
|
|
[->Weiche 45 Grad]
|
|
[Einfach 45 350/700 links M]^C^C(ssg-ensure "OmniModulInsert") OMNI_W45_Einfach
|
|
[Doppel 45 350/700 M]^C^C(ssg-ensure "OmniModulInsert") OMNI_W45_Doppel
|
|
[<-Dreiwege 45 350/700 M]^C^C(ssg-ensure "OmniModulInsert") OMNI_W45_Dreiwege
|
|
[->Weichen Parallel]
|
|
[Einfach Parallel 200/750 links M]^C^C(ssg-ensure "OmniModulInsert") OMNI_WP_Einfach
|
|
[Doppel Parallel 200/750 M]^C^C(ssg-ensure "OmniModulInsert") OMNI_WP_Doppel
|
|
[<-Dreiwege Parallel 200/750 M]^C^C(ssg-ensure "OmniModulInsert") OMNI_WP_Dreiwege
|
|
[->Weichenkoerper]
|
|
[Einfach 22.5 links M]^C^C(ssg-ensure "OmniModulInsert") OMNI_WK_Einfach
|
|
[Doppel 22.5 M]^C^C(ssg-ensure "OmniModulInsert") OMNI_WK_Doppel
|
|
[<-Dreiwege 22.5 M]^C^C(ssg-ensure "OmniModulInsert") OMNI_WK_Dreiwege
|
|
[->Weichenkombinationen]
|
|
[Delta 1400/700 M]^C^C(ssg-ensure "OmniModulInsert") OMNI_WKomb_Delta_1400
|
|
[Delta 1600/800 M]^C^C(ssg-ensure "OmniModulInsert") OMNI_WKomb_Delta_1600
|
|
[<-Star 1400/1400 M]^C^C(ssg-ensure "OmniModulInsert") OMNI_WKomb_Star
|
|
[->TEF Elemente]
|
|
[TEF Antriebst. rechts]^C^C(ssg-ensure "OmniModulInsert") OMNI_TEF_AntriebR
|
|
[TEF Umlenkspannst. rechts]^C^C(ssg-ensure "OmniModulInsert") OMNI_TEF_UmlenkR
|
|
[--]
|
|
[TEF Antriebst. links]^C^C(ssg-ensure "OmniModulInsert") OMNI_TEF_AntriebL
|
|
[TEF Umlenkspannst. links]^C^C(ssg-ensure "OmniModulInsert") OMNI_TEF_UmlenkL
|
|
[--]
|
|
[TEF Gerade auf Linie]^C^C(ssg-ensure "TEFInsert") TEF_FOERDERER_LINIE
|
|
[<-TEF Gerade]^C^C(ssg-ensure "OmniModulInsert") OMNI_TEF_Gerade
|
|
[->Anbaugruppen]
|
|
[Stopper AP]^C^C(ssg-ensure "OmniModulInsert") OMNI_STOPPER
|
|
[Scanner]^C^C(ssg-ensure "OmniModulInsert") OMNI_SCANNER
|
|
[<-Bürstenbremse]^C^C(ssg-ensure "OmniModulInsert") OMNI_BUERSTENBREMSE
|
|
[~KettenFoerderer]^C^C(ssg-ensure "OmniModulInsert") OMNI_KettenFoerderer
|
|
[->Verbinder]
|
|
[~TV W-W kpl]^C^C(ssg-ensure "OmniModulInsert") OMNI_TV_W_W
|
|
[~TV W-AP110 kpl]^C^C(ssg-ensure "OmniModulInsert") OMNI_TV_W_AP110
|
|
[~TV W-AP60 oben kpl.]^C^C(ssg-ensure "OmniModulInsert") OMNI_TV_W_AP60
|
|
[~TV W-AP110-W kpl]^C^C(ssg-ensure "OmniModulInsert") OMNI_TV_W_AP110_W
|
|
[~TV W-AP oben kpl]^C^C(ssg-ensure "OmniModulInsert") OMNI_TV_W_AP
|
|
[~TV 80]^C^C(ssg-ensure "OmniModulInsert") OMNI_TV_80
|
|
[~TV 50]^C^C(ssg-ensure "OmniModulInsert") OMNI_TV_50
|
|
[~Endplatte Al-Profil AP schraubbar]^C^C(ssg-ensure "OmniModulInsert") OMNI_TV_ENDPLATTE
|
|
[~Anschlag AP-Ende fuer Spulenzug]^C^C(ssg-ensure "OmniModulInsert") OMNI_TV_ANSCHLAG
|
|
[~TV-A fuer AP110/AP60 kpl]^C^C(ssg-ensure "OmniModulInsert") OMNI_TV_A_AP110_AP60
|
|
[~TV-A fuer AP60/ST]^C^C(ssg-ensure "OmniModulInsert") OMNI_TV_A_AP60_ST
|
|
[~TV-A fuer AP110/ST kpl]^C^C(ssg-ensure "OmniModulInsert") OMNI_TV_A_AP110_ST
|
|
[~TV-SW II fuer SW-SW]^C^C(ssg-ensure "OmniModulInsert") OMNI_TV_SW_II_SW_SW
|
|
[~TV-SW III fuer SW-AP110-SW]^C^C(ssg-ensure "OmniModulInsert") OMNI_TV_SW_III_AP110_SW
|
|
[~TV-SW III fuer SW-AP110]^C^C(ssg-ensure "OmniModulInsert") OMNI_TV_SW_III_AP110
|
|
[~TV-SW IV fuer Anschluss SW-AP60]^C^C(ssg-ensure "OmniModulInsert") OMNI_TV_SW_IV_AP60
|
|
[~TV-SW IV fuer SW-ST]^C^C(ssg-ensure "OmniModulInsert") OMNI_TV_SW_IV_ST
|
|
[<-~Muffe]^C^C(ssg-ensure "OmniModulInsert") OMNI_TV_MUFFE
|
|
[->Boegen fuer Weichen]
|
|
[~APB 110 R400/45 140 nur fuer Delta]^C^C(ssg-ensure "OmniModulInsert") OMNI_APBW_R400_45_140
|
|
[~APB 110 R550/45 194 nur fuer Delta]^C^C(ssg-ensure "OmniModulInsert") OMNI_APBW_R550_45_194
|
|
[~APBW 110 R550/22,5 360x248,5]^C^C(ssg-ensure "OmniModulInsert") OMNI_APBW_R550_225_360
|
|
[~APBW 110 R550/22,5 410x298,5]^C^C(ssg-ensure "OmniModulInsert") OMNI_APBW_R550_225_410A
|
|
[~APBW 110 R550/22,5 410x78,5]^C^C(ssg-ensure "OmniModulInsert") OMNI_APBW_R550_225_410B
|
|
[~APBW 110 R550/22,5 410x98,5]^C^C(ssg-ensure "OmniModulInsert") OMNI_APBW_R550_225_410C
|
|
[~APBW 110 R550/67,5 360x598,5]^C^C(ssg-ensure "OmniModulInsert") OMNI_APBW_R550_675_360
|
|
[~APBW 110 R400/67,5 260x398,5]^C^C(ssg-ensure "OmniModulInsert") OMNI_APBW_R400_675_260
|
|
[~APBW 110 R550/45 77x160]^C^C(ssg-ensure "OmniModulInsert") OMNI_APBW_R550_45_77
|
|
[~APBW 110 R550/67,5 125x83,5]^C^C(ssg-ensure "OmniModulInsert") OMNI_APBW_R550_675_125
|
|
[~APBW 110 R750/90 200x290]^C^C(ssg-ensure "OmniModulInsert") OMNI_APBW_R750_90_200
|
|
[~APBW 110 R650/90 300x190]^C^C(ssg-ensure "OmniModulInsert") OMNI_APBW_R650_90_300
|
|
[~APBW 110 R550/67,5 208x347]^C^C(ssg-ensure "OmniModulInsert") OMNI_APBW_R550_675_208
|
|
[<-~APBW 110 R550/67,5 58x497]^C^C(ssg-ensure "OmniModulInsert") OMNI_APBW_R550_675_58
|
|
[<-Element bearbeiten]^C^C(ssg-ensure "OmniModulInsert") OMNI_EDIT
|
|
[->TRO]
|
|
[Marker bearbeiten]^C^C(ssg-ensure "Tro_Edit") TRO_EDIT
|
|
[<-Bearbeiten (Auto)]^C^C(ssg-ensure "SSG_LIB_Commands") SSG_BLOCKEDIT
|
|
[->Export]
|
|
[Export Sivas]^C^C(ssg-ensure "count_sep_scan") ZAEHLE_SEP_SCAN (ssg-ensure "export") EXPORTSIVAS
|
|
[<-Export CSV]^C^C(ssg-ensure "export") EXPORTCSV
|
|
[->Konfiguration]
|
|
[Umschalten 2D und 3D]^C^C(ssg-ensure "SSG_LIB_Commands") SSG_DIM_SWITCH
|
|
[Alle Bloecke auf 2D]^C^C(ssg-ensure "SSG_LIB_Commands") SSG_DIM_ALL_2D
|
|
[Alle Bloecke auf 3D]^C^C(ssg-ensure "SSG_LIB_Commands") SSG_DIM_ALL_3D
|
|
[Sprache]^C^C(ssg-ensure "SSG_LIB_Commands") SSG_SPRACHE
|
|
[<-Konfiguration Schliessen]^C^C
|
|
[->Tests]
|
|
[Alle Tests ausfuehren]^C^C(load (strcat (getenv "DXFMAKRO") "/tests/test_run_all.lsp")) SSG_RUN_ALL_TESTS
|
|
[--]
|
|
[Kreisel]^C^C(load (strcat (getenv "DXFMAKRO") "/tests/test_kreisel.lsp")) TEST_KREISEL
|
|
[Foerderer]^C^C(load (strcat (getenv "DXFMAKRO") "/tests/test_foerderer.lsp")) TEST_FOERDERER
|
|
[Foerderer-Linienzug]^C^C(load (strcat (getenv "DXFMAKRO") "/tests/test_linienzug.lsp")) TEST_LINIENZUG
|
|
[Omniflo]^C^C(load (strcat (getenv "DXFMAKRO") "/tests/test_omniflo.lsp")) TEST_OMNIFLO
|
|
[Omniflo Strecke]^C^C(load (strcat (getenv "DXFMAKRO") "/tests/test_omniflo_strecke.lsp")) TEST_OMNIFLO_STRECKE
|
|
[Gefaellestrecke]^C^C(load (strcat (getenv "DXFMAKRO") "/tests/test_gefaellestrecke.lsp")) TEST_GEFAELLESTRECKE
|
|
[Mubea Gesamtmodell]^C^C(load (strcat (getenv "DXFMAKRO") "/tests/test_mubea.lsp")) TEST_MUBEA
|
|
[KS 2D/3D pruefen (CSV)]^C^C(load (strcat (getenv "DXFMAKRO") "/Lisp/ks_pruefung.lsp")) KS_PRUEFEN
|
|
[<-Export CSV/Sivas ALL]^C^C(load (strcat (getenv "DXFMAKRO") "/tests/test_export_all.lsp")) TEST_EXPORT_ALL
|
|
|
|
***DOUBLECLICK
|
|
[INSERT]^C^C(ssg-ensure "SSG_LIB_Commands") SSG_BLOCKEDIT
|
|
[MTEXT]^C^CDDEDIT
|
|
[TEXT]^C^CDDEDIT
|
|
[ATTDEF]^C^CDDEDIT
|
|
[HATCH]^C^CHATCHEDIT
|
|
[DIMENSION]^C^CDDEDIT
|
|
|
|
***POP501
|
|
[SSG_LIB Edit Context]
|
|
[Kreisel bearbeiten](ssg-ensure "KreiselInsert") KreiselEdit
|
|
[Omniflo Element bearbeiten](ssg-ensure "OmniModulInsert") OMNI_EDIT
|
|
[Gefaellestrecke bearbeiten](ssg-ensure "Gefaellestrecke") GEFAELLESTRECKE_EDIT
|
|
[VarioFoerderer bearbeiten](ssg-ensure "VarioFoerderer") VARIOFOERDERER_EDIT
|
|
[TRO-Marker bearbeiten](ssg-ensure "Tro_Edit") TRO_EDIT
|
|
[--]
|
|
[SSG Bearbeiten (Auto)](ssg-ensure "SSG_LIB_Commands") SSG_BLOCKEDIT
|