From 4bbdc78a96cb9fee70df0c4b007e90d61bbfb6d7 Mon Sep 17 00:00:00 2001 From: Alex38Lyon <55714436+Alex38Lyon@users.noreply.github.com> Date: Wed, 10 Sep 2025 10:43:16 +0200 Subject: [PATCH] Debug divers --- Data | 2 +- Scripts/README.en.md | 5 ++-- Scripts/README.md | 6 +++-- Scripts/pyCreateTh/Template/config.thc | 34 +++++++++++++++++++++++--- config.thc | 34 +++++++++++++++++++++++--- 5 files changed, 70 insertions(+), 11 deletions(-) diff --git a/Data b/Data index 55f4b10..28027e9 160000 --- a/Data +++ b/Data @@ -1 +1 @@ -Subproject commit 55f4b10d858478e318c2c89b13533c5670fc89ee +Subproject commit 28027e99d0574c6f9c04e295b62dbb05783d74d0 diff --git a/Scripts/README.en.md b/Scripts/README.en.md index c688814..01316b1 100644 --- a/Scripts/README.en.md +++ b/Scripts/README.en.md @@ -19,12 +19,12 @@ Result: (.dat) and (.mak) files are created in the same folder Note: Stations are named using the order number from the Therion database, not the numbers from the (.th) files -pyCreate_th2 +pyCreateTh ------------ Script to automate the creation of folders and files for a .th file -Usage: python pyCreate_th2.py +Usage: python pyCreateTh.py (pyCreateTh.py --help) How to use: - Define the different variables in the config.ini file @@ -32,6 +32,7 @@ How to use: - Generate the required files: th, th2, -tot.th - Create scraps with topo stations +Input : Therion files .th (raw, without folders), .mak or .dat Compass files, .tro from VisualTopo pyThStat -------- diff --git a/Scripts/README.md b/Scripts/README.md index 307490c..ece6f21 100644 --- a/Scripts/README.md +++ b/Scripts/README.md @@ -22,18 +22,20 @@ Résultat : fichiers (.dat) et (.mak) dans le même dossier Attention : Les stations sont nommées avec le numéro d'ordre de la BD Therion et pas les numéros des fichiers (.th) -pyCreate_th2 +pyCreateTh ------------ Script pour automatiser la création des dossiers et fichiers pour un fichier .th -Usage : python pyCreate_th2.py +Usage : python pyCreateTh.py (pyCreateTh.py --help) Utilisation : - Définir les différentes variables dans fichier config.ini - Création des dossiers nécessaires d'après dossier 'template' - Création des fichiers nécessaires : th, th2, -tot.th - Création des scraps avec les stations topo + +En entrée : fichiers au format .th de Therion (brut, sans les dossiers), .mak ou .dat de Compass, .tro de VisualTopo pyThStat diff --git a/Scripts/pyCreateTh/Template/config.thc b/Scripts/pyCreateTh/Template/config.thc index 136439f..0583953 100644 --- a/Scripts/pyCreateTh/Template/config.thc +++ b/Scripts/pyCreateTh/Template/config.thc @@ -1,6 +1,6 @@ encoding utf-8 ###################################################################################################################################### -# Version ARSIP By Alex 2025 09 03 +# Version ARSIP By Alex 2025 09 10 ###################################################################################################################################### @@ -83,6 +83,7 @@ encoding utf-8 # - extended view symbol/symbole de vue en coupe développée (u:symbol_extend) # - entrance # - blocks +# - pebbles # - block user (u:block) # - altitude # - label @@ -767,8 +768,8 @@ layout drawingconfig enddef; ######################################################## - # Change the block symbole - # Changer le symbole de block + # Change the point block symbole + # Changer le symbole de point block ######################################################## def p_blocks (expr pos,theta,sc,al)= base_symbolsize :=0.30u; %Factor*u; Factor=size of the blocks @@ -788,6 +789,33 @@ layout drawingconfig thfill (.0symbolsize,.0symbolsize)--(.0symbolsize,.5symbolsize)--(-1.5symbolsize,.5symbolsize)--(-1.5symbolsize,-0.5symbolsize)--(-0.5symbolsize,-0.5symbolsize)--cycle withcolor (0.341117, 0.219607, 0.031372) withalpha AlphaFactor3; thdraw (.0symbolsize,.0symbolsize)--(.0symbolsize,.5symbolsize)--(-1.5symbolsize,.5symbolsize)--(-1.5symbolsize,-0.5symbolsize)--(-0.5symbolsize,-0.5symbolsize)--cycle withcolor (0.341117, 0.219607, 0.031372); enddef; + + ######################################################## + # Change the point pebble symbole + # Changer le symbole de point galets + ######################################################## + def p_pebbles (expr pos,theta,sc,al)= + U:=(.45u,.35u); + + random_theta := uniformdeviate 360; + Alpha_Factor1 := 0.4 + uniformdeviate 0.5; + Alpha_Factor2 := 0.4 + uniformdeviate 0.5; + Alpha_Factor3 := 0.4 + uniformdeviate 0.5; + Alpha_Factor4 := 0.4 + uniformdeviate 0.5; + + T:=identity aligned al rotated random_theta scaled sc shifted pos; + pickup PenC; + p:=superellipse((.25u,0),(0,.15u),(-.25u,0),(0,.-.15u),.75); + + thdraw p rotated -20 shifted (- .2,.2u); + thfill p rotated -20 shifted (-.2,.2u) withcolor (0.341117, 0.219607, 0.031372) withalpha Alpha_Factor1; + thdraw p rotated -37 shifted (.2u,-.2u); + thfill p rotated -37 shifted (.2u,-.2u) withcolor (0.341117, 0.219607, 0.031372) withalpha Alpha_Factor2; + thdraw p rotated -62 shifted (-.2u,-.2u); + thfill p rotated -62 shifted (-.2u,-.2u) withcolor (0.341117, 0.219607, 0.031372) withalpha Alpha_Factor3; + thdraw p rotated -15 shifted (.2u,.2u); + thfill p rotated -15 shifted (.2u,.2u) withcolor (0.341117, 0.219607, 0.031372) withalpha Alpha_Factor4; + enddef; ######################################################## # Change the rock bordersymbole diff --git a/config.thc b/config.thc index 136439f..0583953 100644 --- a/config.thc +++ b/config.thc @@ -1,6 +1,6 @@ encoding utf-8 ###################################################################################################################################### -# Version ARSIP By Alex 2025 09 03 +# Version ARSIP By Alex 2025 09 10 ###################################################################################################################################### @@ -83,6 +83,7 @@ encoding utf-8 # - extended view symbol/symbole de vue en coupe développée (u:symbol_extend) # - entrance # - blocks +# - pebbles # - block user (u:block) # - altitude # - label @@ -767,8 +768,8 @@ layout drawingconfig enddef; ######################################################## - # Change the block symbole - # Changer le symbole de block + # Change the point block symbole + # Changer le symbole de point block ######################################################## def p_blocks (expr pos,theta,sc,al)= base_symbolsize :=0.30u; %Factor*u; Factor=size of the blocks @@ -788,6 +789,33 @@ layout drawingconfig thfill (.0symbolsize,.0symbolsize)--(.0symbolsize,.5symbolsize)--(-1.5symbolsize,.5symbolsize)--(-1.5symbolsize,-0.5symbolsize)--(-0.5symbolsize,-0.5symbolsize)--cycle withcolor (0.341117, 0.219607, 0.031372) withalpha AlphaFactor3; thdraw (.0symbolsize,.0symbolsize)--(.0symbolsize,.5symbolsize)--(-1.5symbolsize,.5symbolsize)--(-1.5symbolsize,-0.5symbolsize)--(-0.5symbolsize,-0.5symbolsize)--cycle withcolor (0.341117, 0.219607, 0.031372); enddef; + + ######################################################## + # Change the point pebble symbole + # Changer le symbole de point galets + ######################################################## + def p_pebbles (expr pos,theta,sc,al)= + U:=(.45u,.35u); + + random_theta := uniformdeviate 360; + Alpha_Factor1 := 0.4 + uniformdeviate 0.5; + Alpha_Factor2 := 0.4 + uniformdeviate 0.5; + Alpha_Factor3 := 0.4 + uniformdeviate 0.5; + Alpha_Factor4 := 0.4 + uniformdeviate 0.5; + + T:=identity aligned al rotated random_theta scaled sc shifted pos; + pickup PenC; + p:=superellipse((.25u,0),(0,.15u),(-.25u,0),(0,.-.15u),.75); + + thdraw p rotated -20 shifted (- .2,.2u); + thfill p rotated -20 shifted (-.2,.2u) withcolor (0.341117, 0.219607, 0.031372) withalpha Alpha_Factor1; + thdraw p rotated -37 shifted (.2u,-.2u); + thfill p rotated -37 shifted (.2u,-.2u) withcolor (0.341117, 0.219607, 0.031372) withalpha Alpha_Factor2; + thdraw p rotated -62 shifted (-.2u,-.2u); + thfill p rotated -62 shifted (-.2u,-.2u) withcolor (0.341117, 0.219607, 0.031372) withalpha Alpha_Factor3; + thdraw p rotated -15 shifted (.2u,.2u); + thfill p rotated -15 shifted (.2u,.2u) withcolor (0.341117, 0.219607, 0.031372) withalpha Alpha_Factor4; + enddef; ######################################################## # Change the rock bordersymbole