mirror of
https://github.com/Alex38Lyon/Synthese-PSM_LARRA.git
synced 2026-06-01 13:59:13 +00:00
pyCreateTh update
This commit is contained in:
Alex38Lyon
Binary file not shown.
Binary file not shown.
@@ -0,0 +1,33 @@
|
||||
2026-01-08 10:01:05,741 - INFO - ################################################################################################################################################################
|
||||
2026-01-08 10:01:05,741 - INFO - # Conversion Th, Dat, Mak, Tro, files to Therion files and folders #
|
||||
2026-01-08 10:01:05,741 - INFO - # Script pyCreateTh by : alexandre.pont@yahoo.fr #
|
||||
2026-01-08 10:01:05,742 - INFO - # Version : 2026.01.08 #
|
||||
2026-01-08 10:01:05,744 - INFO - # Input file : . #
|
||||
2026-01-08 10:01:05,744 - INFO - # Output folder : . #
|
||||
2026-01-08 10:01:05,744 - INFO - # Log file : pyCreateTh.log #
|
||||
2026-01-08 10:01:05,744 - INFO - # Config file: config.ini #
|
||||
2026-01-08 10:01:05,744 - INFO - # #
|
||||
2026-01-08 10:01:05,745 - INFO - ################################################################################################################################################################
|
||||
2026-01-08 10:01:05,745 - CRITICAL - !!! No valid file selected
|
||||
2026-01-08 10:02:43,193 - INFO - ######################################################################################################################################################
|
||||
2026-01-08 10:02:43,193 - INFO - # Conversion Th, Dat, Mak, Tro, files to Therion files and folders #
|
||||
2026-01-08 10:02:43,194 - INFO - # Script pyCreateTh by : alexandre.pont@yahoo.fr #
|
||||
2026-01-08 10:02:43,194 - INFO - # Version : 2026.01.08 #
|
||||
2026-01-08 10:02:43,194 - INFO - # Input file : . #
|
||||
2026-01-08 10:02:43,194 - INFO - # Output folder : . #
|
||||
2026-01-08 10:02:43,194 - INFO - # Log file : pyCreateTh.log #
|
||||
2026-01-08 10:02:43,195 - INFO - # Config file: config.ini #
|
||||
2026-01-08 10:02:43,195 - INFO - # #
|
||||
2026-01-08 10:02:43,195 - INFO - ######################################################################################################################################################
|
||||
2026-01-08 10:02:43,195 - CRITICAL - !!! No valid file selected, try again
|
||||
2026-01-08 10:03:35,413 - INFO - ######################################################################################################################################################
|
||||
2026-01-08 10:03:35,413 - INFO - # Conversion th, dat, mak, tro and trox, files to therion files #
|
||||
2026-01-08 10:03:35,414 - INFO - # Script pyCreateTh by : alexandre.pont@yahoo.fr #
|
||||
2026-01-08 10:03:35,414 - INFO - # Version : 2026.01.08 #
|
||||
2026-01-08 10:03:35,414 - INFO - # Input file : . #
|
||||
2026-01-08 10:03:35,414 - INFO - # Output folder : . #
|
||||
2026-01-08 10:03:35,415 - INFO - # Log file : pyCreateTh.log #
|
||||
2026-01-08 10:03:35,415 - INFO - # Config file: config.ini #
|
||||
2026-01-08 10:03:35,415 - INFO - # #
|
||||
2026-01-08 10:03:35,416 - INFO - ######################################################################################################################################################
|
||||
2026-01-08 10:03:35,416 - CRITICAL - !!! No valid file selected, try again
|
||||
|
||||
Binary file not shown.
Binary file not shown.
@@ -64,6 +64,7 @@ def safe_relpath( path, base_dir=None, max_depth=4, max_name_len=50, prefix="~"
|
||||
- Ne lève jamais d'exception
|
||||
"""
|
||||
|
||||
# ── 1. Résolution du chemin ──────────────────────────────────────────────
|
||||
try:
|
||||
path = Path(path).expanduser().resolve()
|
||||
except Exception:
|
||||
@@ -74,13 +75,13 @@ def safe_relpath( path, base_dir=None, max_depth=4, max_name_len=50, prefix="~"
|
||||
except Exception:
|
||||
base = None
|
||||
|
||||
# 1️⃣ Nom du fichier (ou dossier) — tronqué si nécessaire
|
||||
name = path.name
|
||||
# ── 2. Nom du fichier / dossier (tronqué) ─────────────────────────────────
|
||||
name = path.name or str(path)
|
||||
if len(name) > max_name_len:
|
||||
stem = path.stem[: max_name_len - 6]
|
||||
stem = path.stem[: max(1, max_name_len - 6)]
|
||||
name = f"{stem}...{path.suffix}"
|
||||
|
||||
# 2️⃣ Tentative de chemin relatif
|
||||
# ── 3. Construction des parties ──────────────────────────────────────────
|
||||
try:
|
||||
if base:
|
||||
rel = path.relative_to(base)
|
||||
@@ -90,17 +91,25 @@ def safe_relpath( path, base_dir=None, max_depth=4, max_name_len=50, prefix="~"
|
||||
except Exception:
|
||||
parts = list(path.parts)
|
||||
|
||||
# 3️⃣ Limitation de profondeur
|
||||
if max_depth is not None and len(parts) > max_depth:
|
||||
# ── 4. Cas path == base → "." ────────────────────────────────────────────
|
||||
if not parts:
|
||||
parts = ["."]
|
||||
|
||||
# ── 5. Limitation de profondeur ──────────────────────────────────────────
|
||||
if isinstance(max_depth, int) and max_depth > 0 and len(parts) > max_depth:
|
||||
parts = parts[-max_depth:]
|
||||
parts.insert(0, prefix)
|
||||
|
||||
# 4️⃣ Remplacement du nom si tronqué
|
||||
if parts:
|
||||
# ── 6. Remplacement du nom final ──────────────────────────────────────────
|
||||
if parts and parts[-1] not in (".", os.sep):
|
||||
parts[-1] = name
|
||||
|
||||
# 5️⃣ Construction finale portable
|
||||
# ── 7. Construction finale sûre ──────────────────────────────────────────
|
||||
try:
|
||||
return os.path.join(*parts)
|
||||
except Exception:
|
||||
return name
|
||||
|
||||
|
||||
|
||||
#################################################################################################
|
||||
|
||||
@@ -6,7 +6,7 @@ global_data.py for pyCreateTh.py
|
||||
!#############################################################################################!
|
||||
"""
|
||||
|
||||
Version = "2026.01.07"
|
||||
Version = "2026.01.08"
|
||||
|
||||
#################################################################################################
|
||||
|
||||
|
||||
Binary file not shown.
Binary file not shown.
@@ -381,7 +381,7 @@ def convert_tro(fle_tro_fnme, fle_tro_encoding=None, fle_th_fnme = None, cavenam
|
||||
OUTPUTS:
|
||||
new .th file with surveyed data for Therion
|
||||
cavename : Name of the cave from the .tro file
|
||||
coordinates : Coordinates of the entrance
|
||||
coordinates : Coordinates of the entrance (in m)
|
||||
coordsyst : Coordinates system used by the .tro file
|
||||
entrance : Entrance station
|
||||
|
||||
|
||||
@@ -88,6 +88,9 @@ def read_vtopo_header(lines):
|
||||
if u'Trou' in line:
|
||||
# read Trou
|
||||
(cavename, xcoord, ycoord, alt, coordtro) = line[5:].replace(u'\n', u'').rstrip(u'\n\r').split(u',')
|
||||
xcoord = "{:.2f}".format(float(xcoord) * 1000)
|
||||
ycoord = "{:.2f}".format(float(ycoord) * 1000)
|
||||
alt = "{:.2f}".format(float(alt) * 1)
|
||||
coordinates = [xcoord, ycoord, alt]
|
||||
# read club
|
||||
if u'Club' in line: club = line[5:].replace(u'\n', u'')
|
||||
|
||||
@@ -31,9 +31,9 @@ Création Alex le 2025 06 09
|
||||
|
||||
En cours :
|
||||
- Exports Tro :
|
||||
- Pas possible de gérer les fichiers tro avec plusieurs entrées / points fixes car pas sauvegardé dans le format tro
|
||||
- pas possible de gérer les fichiers tro avec plusieurs entrées / points fixes car pas sauvegardé dans le format tro
|
||||
- gérer pour ne pas avoir de copie de config.ini
|
||||
- modifier les coordonnées de km vers m
|
||||
- modifier les coordonnées de km vers m, ajouter les points fixes dans read-me
|
||||
- Exports TroX
|
||||
- A créer pour avoir notamment les réseaux à plusieurs entrées
|
||||
- Exports DAT/MARK
|
||||
@@ -346,7 +346,6 @@ def mak_to_th_file(ENTRY_FILE) :
|
||||
# Génération du CRS QGIS (format WKT)
|
||||
crs_wkt = f'EPSG:{epsg_code}'
|
||||
|
||||
|
||||
log.info(f"Reading mak file: {Colors.ENDC}{shortCurentFile}{Colors.GREEN}, fixed station: {Colors.ENDC}{len(fixPoints)}{Colors.GREEN}, files : {Colors.ENDC}{len(datFiles)}{Colors.GREEN}, UTM Zone : {Colors.ENDC}{UTM[0]}{Colors.GREEN}, Datum : {Colors.ENDC}{next(iter(Datums))}{Colors.GREEN}, SCR : {Colors.ENDC}{crs_wkt}")
|
||||
totReadMeFixPoint = f"\t* Source mak file : {os.path.basename(ENTRY_FILE)}, fixed station: {len(fixPoints)}, files : {len(datFiles)}, UTM Zone : {UTM[0]}, Datum : {next(iter(Datums))}, SCR : {crs_wkt}\n"
|
||||
|
||||
@@ -551,7 +550,7 @@ def mak_to_th_file(ENTRY_FILE) :
|
||||
|
||||
|
||||
#################################################################################################
|
||||
def station_list_dat(data, list, fixPoints, currentSurveyName) :
|
||||
def station_list_dat(data, list, list_fixed,fixPoints, currentSurveyName) :
|
||||
"""Crée une liste de stations à partir des données fournies issues d'un fichier dat.
|
||||
|
||||
Args:
|
||||
@@ -573,22 +572,31 @@ def station_list_dat(data, list, fixPoints, currentSurveyName) :
|
||||
# stations = pd.concat([dfDATA.iloc[1:, 0], dfDATA.iloc[1:, 1]]).drop_duplicates().str.replace('[', '%').str.replace(']', '%%').str.replace('@', '_._')
|
||||
|
||||
stations = pd.concat([dfDATA.iloc[1:, 0], dfDATA.iloc[1:, 1]]).drop_duplicates().stationName()
|
||||
stationsFixed = pd.concat([dfDATA.iloc[1:, 0], dfDATA.iloc[1:, 1]]).drop_duplicates().stationName()
|
||||
|
||||
|
||||
fixed_names = {point[0] for point in fixPoints}
|
||||
stations = stations[~stations.isin(fixed_names)]
|
||||
stations_fixed = stationsFixed[stationsFixed.isin(fixed_names)]
|
||||
|
||||
new_entries = pd.DataFrame({
|
||||
'StationName': stations,
|
||||
'Survey_Name_01': currentSurveyName
|
||||
})
|
||||
|
||||
list = pd.concat([list, new_entries], ignore_index=True)
|
||||
new_fixed = pd.DataFrame({
|
||||
'Station_Fix': stations_fixed,
|
||||
'Survey_Name': currentSurveyName
|
||||
})
|
||||
|
||||
return list, dfDATA
|
||||
list = pd.concat([list, new_entries], ignore_index=True)
|
||||
list_fixed = pd.concat([list_fixed, new_fixed], ignore_index=True)
|
||||
|
||||
return list_fixed, list, dfDATA
|
||||
|
||||
|
||||
#################################################################################################
|
||||
def station_list_th(data, list, fixPoints, currentSurveyName) :
|
||||
def station_list_th(data, list, list_fixed, fixPoints, currentSurveyName) :
|
||||
"""Crée une liste de stations à partir des données fournies issues d'un fichier tro.
|
||||
|
||||
Args:
|
||||
@@ -611,22 +619,30 @@ def station_list_th(data, list, fixPoints, currentSurveyName) :
|
||||
# stations = pd.concat([dfDATA.iloc[:, 0], dfDATA.iloc[:, 1]]).drop_duplicates().reset_index(drop=True)
|
||||
|
||||
stations = pd.concat([dfDATA.iloc[:, 0], dfDATA.iloc[:, 1]]).dropna().astype(str).loc[lambda s: ~s.isin(["-", "*"])].drop_duplicates().reset_index(drop=True)
|
||||
stationsFixed = pd.concat([dfDATA.iloc[:, 0], dfDATA.iloc[:, 1]]).dropna().astype(str).loc[lambda s: ~s.isin(["-", "*"])].drop_duplicates().reset_index(drop=True)
|
||||
|
||||
# print(stations)
|
||||
|
||||
fixed_names = {point[0] for point in fixPoints}
|
||||
stations = stations[~stations.isin(fixed_names)]
|
||||
stations_fixed = stationsFixed[stationsFixed.isin(fixed_names)]
|
||||
|
||||
new_entries = pd.DataFrame({
|
||||
'StationName': stations,
|
||||
'Survey_Name_01': currentSurveyName
|
||||
})
|
||||
|
||||
new_fixed = pd.DataFrame({
|
||||
'Station_Fix': stations_fixed,
|
||||
'Survey_Name': currentSurveyName
|
||||
})
|
||||
|
||||
list = pd.concat([list, new_entries], ignore_index=True)
|
||||
list_fixed = pd.concat([list_fixed, new_fixed], ignore_index=True)
|
||||
|
||||
# print(new_entries)
|
||||
|
||||
return list, dfDATA
|
||||
return list_fixed, list, dfDATA
|
||||
|
||||
|
||||
#################################################################################################
|
||||
@@ -1377,8 +1393,9 @@ def tro_to_th_files(ENTRY_FILE, centerlines = [],
|
||||
totReadMe = ""
|
||||
surveyCount = 0
|
||||
totReadMeFixPoint = f"\tcs {coordsyst}\n"
|
||||
totReadMeFixPoint += f"\tFix point: {entrance} [{coordinates[0]} km, {coordinates[1]} km, {coordinates[2]} m]\n"
|
||||
totReadMeFixPoint += f"\tFix point, station : {entrance}, coordinates: [{coordinates[0]} m, {coordinates[1]} m, {coordinates[2]} m]\n"
|
||||
listStationSection = pd.DataFrame(columns=['StationName', 'Survey_Name'])
|
||||
listStationSectionFixed = pd.DataFrame(columns=['Station_Fix', 'Survey_Name'])
|
||||
threads = []
|
||||
fixPoints = []
|
||||
fixPoints.append([entrance, " ", coordinates[0], coordinates[1], coordinates[2]])
|
||||
@@ -1430,7 +1447,7 @@ def tro_to_th_files(ENTRY_FILE, centerlines = [],
|
||||
|
||||
# Ajouter les données de la section à la liste
|
||||
if len(cl['DATA']) > 0 :
|
||||
listStationSection, dfDATA = station_list_th(cl, listStationSection, fixPoints, currentSurveyName)
|
||||
listStationSectionFixed, listStationSection, dfDATA = station_list_th(cl, listStationSection, listStationSectionFixed, fixPoints, currentSurveyName)
|
||||
# print(f"Explo {i}, dfDATA : {dfDATA}")
|
||||
# print(listStationSection)
|
||||
|
||||
@@ -1519,6 +1536,10 @@ def tro_to_th_files(ENTRY_FILE, centerlines = [],
|
||||
|
||||
if totReadMeErrorDat == "" : totReadMeErrorDat += "\tThis file has no errors, perfect!\n"
|
||||
|
||||
for index, row in listStationSectionFixed.iterrows():
|
||||
# log.info(f"Fixed station : {Colors.ENDC}{row['Station_Fix']}{Colors.INFO}, Survey : {Colors.ENDC}{row['Survey_Name']}")
|
||||
totReadMeFixPoint += f"\tFixed station : {row['Station_Fix']}, Survey : {row['Survey_Name']}\n"
|
||||
|
||||
config_vars = {
|
||||
'fileName': SurveyTitle,
|
||||
'caveName': SurveyTitle.replace("_", " "),
|
||||
@@ -1638,6 +1659,7 @@ def dat_to_th_files (ENTRY_FILE, fixPoints = [], crs_wkt = "", CONFIG_PATH = "",
|
||||
|
||||
# Tableau global pour stocker toutes les stations
|
||||
stationList = pd.DataFrame(columns=['StationName', 'Survey_Name_01', 'Survey_Name_02'])
|
||||
stationList_Fixed = pd.DataFrame(columns=['StationName', 'Survey_Name'])
|
||||
|
||||
section0 = True;
|
||||
|
||||
@@ -1647,6 +1669,7 @@ def dat_to_th_files (ENTRY_FILE, fixPoints = [], crs_wkt = "", CONFIG_PATH = "",
|
||||
for section in sections:
|
||||
|
||||
listStationSection = pd.DataFrame(columns=['StationName', 'Survey_Name'])
|
||||
listStationSection_Fixed = pd.DataFrame(columns=['StationName', 'Survey_Name'])
|
||||
|
||||
if not section.strip():
|
||||
continue # ignorer les sections vides
|
||||
@@ -1667,6 +1690,7 @@ def dat_to_th_files (ENTRY_FILE, fixPoints = [], crs_wkt = "", CONFIG_PATH = "",
|
||||
"PREFIX": None,
|
||||
'DATA' : [],
|
||||
'STATION': [],
|
||||
'STATION_FIXED': [],
|
||||
'SOURCE' : []
|
||||
}
|
||||
|
||||
@@ -1703,8 +1727,10 @@ def dat_to_th_files (ENTRY_FILE, fixPoints = [], crs_wkt = "", CONFIG_PATH = "",
|
||||
if jumpLine == True :
|
||||
jumpLine = False
|
||||
line = line.strip()
|
||||
|
||||
elif line.startswith('SURVEY NAME:'):
|
||||
section_data['SURVEY_NAME'] = sanitize_filename(line.split(':', 1)[1].strip())
|
||||
|
||||
elif line.startswith('SURVEY DATE:'):
|
||||
# current_field = 'DATE'
|
||||
# Séparer la date et le commentaire
|
||||
@@ -1718,15 +1744,18 @@ def dat_to_th_files (ENTRY_FILE, fixPoints = [], crs_wkt = "", CONFIG_PATH = "",
|
||||
log.warning(f"Survey {Colors.ENDC}{section_data['SURVEY_NAME']}{Colors.WARNING} with no date, add default date 2000 01 01 ")
|
||||
if len(date_parts) > 1:
|
||||
section_data['COMMENT'] = date_parts[1].strip()
|
||||
|
||||
elif line.startswith('SURVEY TEAM:'):
|
||||
NextLineSurveyTeam = True
|
||||
line.strip()
|
||||
|
||||
elif NextLineSurveyTeam == True :
|
||||
NextLineSurveyTeam = False
|
||||
val = line.strip()
|
||||
if val.count(' ') >= 2:
|
||||
val = val.replace(' ', '/', 1)
|
||||
section_data['SURVEY_TEAM'] = val
|
||||
|
||||
elif line.startswith('DECLINATION:'):
|
||||
for champ, pattern in regex_patterns.items():
|
||||
match = re.search(pattern, line)
|
||||
@@ -1734,7 +1763,6 @@ def dat_to_th_files (ENTRY_FILE, fixPoints = [], crs_wkt = "", CONFIG_PATH = "",
|
||||
section_data[champ] = match.group(1).strip()
|
||||
jumpLine = True # Sauter une ligne après la ligne DECLINATION
|
||||
|
||||
|
||||
else :
|
||||
if line.strip() != '' :
|
||||
section_data['DATA'].append(line.strip())
|
||||
@@ -1743,8 +1771,9 @@ def dat_to_th_files (ENTRY_FILE, fixPoints = [], crs_wkt = "", CONFIG_PATH = "",
|
||||
|
||||
# Ajouter les données de la section à la liste
|
||||
if len(section_data['DATA']) > 0 :
|
||||
listStationSection, dfDATA = station_list_dat(section_data, listStationSection, fixPoints, section_data['SURVEY_NAME'])
|
||||
listStationSection_Fixed, listStationSection, dfDATA = station_list_dat(section_data, listStationSection, listStationSection_Fixed, fixPoints, section_data['SURVEY_NAME'])
|
||||
section_data['STATION'] = listStationSection
|
||||
section_data['STATION_FIXED'] = listStationSection_Fixed
|
||||
data.append(section_data)
|
||||
unique_id += 1
|
||||
|
||||
@@ -1839,6 +1868,7 @@ def dat_to_th_files (ENTRY_FILE, fixPoints = [], crs_wkt = "", CONFIG_PATH = "",
|
||||
|
||||
if all(val == 0.0 for val in _CorrectionValues) :
|
||||
_corrections = ""
|
||||
|
||||
else :
|
||||
_corrections = f"\t\t# Corrections: {_CorrectionValues[0]} {_CorrectionValues[1]} {_CorrectionValues[2]}, not yet implemented\n"
|
||||
log.error(f"Corrections: {Colors.ENDC}{_CorrectionValues[0]} {_CorrectionValues[1]} {_CorrectionValues[2]}{Colors.ERROR}, not yet implemented in {Colors.ENDC}{currentSurveyName}")
|
||||
@@ -1849,6 +1879,7 @@ def dat_to_th_files (ENTRY_FILE, fixPoints = [], crs_wkt = "", CONFIG_PATH = "",
|
||||
_CorrectionValues3 = [float(val) for val in _line['CORRECTIONS2'].strip().split()]
|
||||
if all(val == 0.0 for val in _CorrectionValues) :
|
||||
_CorrectionValues3 = ""
|
||||
|
||||
else :
|
||||
log.error(f"Corrections2: {Colors.ENDC}{_CorrectionValues[0]} {_CorrectionValues[1]} {_CorrectionValues[2]}{Colors.ERROR}, not yet implemented in {Colors.ENDC}{currentSurveyName}")
|
||||
totReadMeError += f"\tCorrections2: {_CorrectionValues[0]} {_CorrectionValues[1]} {_CorrectionValues[2]}, not yet implemented in {currentSurveyName}\n"
|
||||
@@ -1858,6 +1889,7 @@ def dat_to_th_files (ENTRY_FILE, fixPoints = [], crs_wkt = "", CONFIG_PATH = "",
|
||||
date = _line['DISCOVERY'].strip()
|
||||
mois, jour, annee = date.split()
|
||||
discovery = f"{int(annee):04d} {int(mois):02d} {int(jour):02d}"
|
||||
|
||||
else :
|
||||
discovery = f"{_line['SURVEY_DATE']} # '????'"
|
||||
|
||||
@@ -1876,7 +1908,7 @@ def dat_to_th_files (ENTRY_FILE, fixPoints = [], crs_wkt = "", CONFIG_PATH = "",
|
||||
# gestion des DATA #
|
||||
#################################################################################################
|
||||
|
||||
stationList, dfDATA = station_list_dat(_line, stationList, fixPoints, currentSurveyName)
|
||||
stationList_Fixed, stationList, dfDATA = station_list_dat(_line, stationList, stationList_Fixed, fixPoints, currentSurveyName)
|
||||
|
||||
headerData = dfDATA.iloc[0].tolist()
|
||||
|
||||
@@ -1900,14 +1932,15 @@ def dat_to_th_files (ENTRY_FILE, fixPoints = [], crs_wkt = "", CONFIG_PATH = "",
|
||||
if len(list_common_points) >= 1 :
|
||||
fixPoint += f"\t\tcs {crs_wkt}\n"
|
||||
for point in list_common_points :
|
||||
totReadMeFixPoint += f"\tFix point: {point[0]} [{point[2]:.3f} m, {point[3]:.3f} m, {point[4]:.3f} m], in {currentSurveyName}\n"
|
||||
totReadMeFixPoint += f"\tFix point: {point[0]} [{point[2]:.2f} m, {point[3]:.2f} m, {point[4]:.2f} m], in {currentSurveyName}\n"
|
||||
if point[1] == 'm' :
|
||||
fixPoint += f"\t\tfix {point[0]} {point[2]:.3f} {point[3]:.3f} {point[4]:.3f}\n"
|
||||
fixPoint += f"\t\tfix {point[0]} {point[2]:.2f} {point[3]:.2f} {point[4]:.3f}\n"
|
||||
elif point[1] == 'f' :
|
||||
fixPoint += f"\t\tfix {point[0]} {point[2]*0.3048:.3f} {point[3]*0.3048:.3f} {point[4]*0.3048:.3f} # Conversion feet - meter\n"
|
||||
fixPoint += f"\t\tfix {point[0]} {point[2]*0.3048:.2f} {point[3]*0.3048:.2f} {point[4]*0.3048:.2f} # Conversion feet - meter\n"
|
||||
fixPoint += f'\t\tstation {point[0]} "{point[0]}" entrance\n'
|
||||
|
||||
|
||||
|
||||
#################################################################################################
|
||||
# Gestion des formats
|
||||
#################################################################################################
|
||||
@@ -2047,6 +2080,12 @@ def dat_to_th_files (ENTRY_FILE, fixPoints = [], crs_wkt = "", CONFIG_PATH = "",
|
||||
|
||||
if totReadMeErrorDat == "" : totReadMeErrorDat += "\tNo errors in the file, that's excellent !\n"
|
||||
|
||||
stationList_Fixed = stationList_Fixed.drop_duplicates()
|
||||
|
||||
for index, row in stationList_Fixed.iterrows():
|
||||
# log.info(f"Fixed station: {Colors.ENDC}{row['Station_Fix']}{Colors.INFO}, survey: {Colors.ENDC}{row['Survey_Name']}")
|
||||
totReadMeFixPoint += f"\tFixed station: {row['Station_Fix']}, Survey: {row['Survey_Name']}\n"
|
||||
|
||||
config_vars = {
|
||||
'fileName': SurveyTitle,
|
||||
'caveName': SurveyTitle.replace("_", " "),
|
||||
@@ -2199,7 +2238,7 @@ if __name__ == u'__main__':
|
||||
#################################################################################################
|
||||
# titre #
|
||||
#################################################################################################
|
||||
titre_largeur = 160
|
||||
titre_largeur = 150
|
||||
bordure = "#" * titre_largeur + Colors.ENDC
|
||||
ansi_escape = re.compile(r'\x1b\[[0-9;]*m')
|
||||
|
||||
@@ -2217,7 +2256,7 @@ if __name__ == u'__main__':
|
||||
|
||||
_titre = [
|
||||
bordure,
|
||||
pad_line(f"{Colors.BOLD}{Colors.YELLOW}Conversion Th, Dat, Mak, Tro, files to Therion files and folders", center=True),
|
||||
pad_line(f"{Colors.BOLD}{Colors.YELLOW}Files conversion th, dat, mak, tro and trox to therion files and folders", center=True),
|
||||
pad_line(f"Script pyCreateTh by : {Colors.BLUE}alexandre.pont@yahoo.fr"),
|
||||
pad_line(f"Version : {Colors.ENDC}{globalData.Version}"),
|
||||
pad_line(f"Input file : {Colors.ENDC}{safe_relpath(args.file)}"),
|
||||
@@ -2232,6 +2271,11 @@ if __name__ == u'__main__':
|
||||
log.info(line)
|
||||
|
||||
|
||||
if args.file == "":
|
||||
log.critical(f"No valid file selected, try again")
|
||||
exit(0)
|
||||
|
||||
|
||||
#################################################################################################
|
||||
# Fichier TH #
|
||||
#################################################################################################
|
||||
@@ -2264,7 +2308,6 @@ if __name__ == u'__main__':
|
||||
fileTitle, thread2 = mak_to_th_file(abspath(args.file))
|
||||
threads += thread2
|
||||
|
||||
|
||||
#################################################################################################
|
||||
# Fichier DAT #
|
||||
#################################################################################################
|
||||
|
||||
+8
-8
@@ -94,10 +94,10 @@ processing survey data ...
|
||||
####################### cavern log file ########################
|
||||
1> Survex 1.4.17
|
||||
2> Copyright ¸ 1990-2025 Olly Betts
|
||||
3> C:\Users\alexa\AppData\Local\Temp\th20128\data.svx:1191:6: warning: Station already fixed at the same coordinates
|
||||
3> C:\Users\alexa\AppData\Local\Temp\th26724\data.svx:1191:6: warning: Station already fixed at the same coordinates
|
||||
4> *fix 1122 680916.000000 4757614.000000 1719.000000
|
||||
5> ^~~~
|
||||
6> C:\Users\alexa\AppData\Local\Temp\th20128\data.svx:1190: info: Previously fixed or equated here
|
||||
6> C:\Users\alexa\AppData\Local\Temp\th26724\data.svx:1190: info: Previously fixed or equated here
|
||||
7>
|
||||
8> Survey contains 67389 survey stations, joined by 67542 legs.
|
||||
9> There are 332 loops.
|
||||
@@ -112,10 +112,10 @@ processing survey data ...
|
||||
18> There were 1 warning(s).
|
||||
19>
|
||||
######################### transcription ########################
|
||||
3> 20128 : LAR_d_436/20@Explo_82_1996_06_30.Explo_82_1996_06_30.Complexe_Arrestelia.Synthese-PSM_LARRA
|
||||
3> 26724 : RI122@Explo_45_2018_08_09.Explo_45_2018_08_09.Complexe_BU56_Ilamina.Synthese-PSM_LARRA
|
||||
3> input:1191 -- Data/AN026/Data/Explo_01_2006_11_04/Data/Explo_01_2006_11_04.th [17]
|
||||
4> 1122 : AN26@Explo_01_2006_11_04.Explo_01_2006_11_04.AN026.Synthese-PSM_LARRA
|
||||
6> 20128 : LAR_d_436/20@Explo_82_1996_06_30.Explo_82_1996_06_30.Complexe_Arrestelia.Synthese-PSM_LARRA
|
||||
6> 26724 : RI122@Explo_45_2018_08_09.Explo_45_2018_08_09.Complexe_BU56_Ilamina.Synthese-PSM_LARRA
|
||||
6> input:1190 -- Data/AN026/Data/Explo_01_2006_11_04/Data/Explo_01_2006_11_04.th [15]
|
||||
8> 67389 : 27@Z510_Fond.Z510_Fond.Z510.Synthese-PSM_LARRA
|
||||
9> 332 : AN8_d_455@Explo_03_1992_08_01.Explo_03_1992_08_01.AN008.Synthese-PSM_LARRA
|
||||
@@ -654,7 +654,7 @@ S 1.5e+03 SP-Tobozo_231_01@Tobozo_231.Tobozo.Synthese-PSM_LARRA ()
|
||||
writing Outputs/Synthese-PSM_LARRA-Plan.pdf ...
|
||||
processing projection none ... done
|
||||
####################### metapost log file ########################
|
||||
This is MetaPost, version 2.01 (TeX Live 2021/W32TeX) (kpathsea version 6.3.3) 7 JAN 2026 20:54
|
||||
This is MetaPost, version 2.01 (TeX Live 2021/W32TeX) (kpathsea version 6.3.3) 7 JAN 2026 21:10
|
||||
**data.mp
|
||||
(c:/Program Files/Therion/texmf/mpost/mpost.mp
|
||||
(c:/Program Files/Therion/texmf/mpost/plain.mp
|
||||
@@ -891,7 +891,7 @@ Here is how much of MetaPost's memory you used:
|
||||
converting scraps ... done
|
||||
making map ... done
|
||||
######################## pdftex log file #########################
|
||||
This is pdfTeX, Version 3.141592653-2.6-1.40.22 (TeX Live 2021/W32TeX) (preloaded format=pdfetex 2023.12.2) 7 JAN 2026 20:54
|
||||
This is pdfTeX, Version 3.141592653-2.6-1.40.22 (TeX Live 2021/W32TeX) (preloaded format=pdfetex 2023.12.2) 7 JAN 2026 21:10
|
||||
entering extended mode
|
||||
**data.tex
|
||||
(./data.tex (./th_enc.tex) (./th_texts.tex) (./th_resources.tex
|
||||
@@ -1004,7 +1004,7 @@ processing projection elevation ... done
|
||||
average distortion: 0.55%
|
||||
done
|
||||
####################### metapost log file ########################
|
||||
This is MetaPost, version 2.01 (TeX Live 2021/W32TeX) (kpathsea version 6.3.3) 7 JAN 2026 21:02
|
||||
This is MetaPost, version 2.01 (TeX Live 2021/W32TeX) (kpathsea version 6.3.3) 7 JAN 2026 21:19
|
||||
**data.mp
|
||||
(c:/Program Files/Therion/texmf/mpost/mpost.mp
|
||||
(c:/Program Files/Therion/texmf/mpost/plain.mp
|
||||
@@ -1021,7 +1021,7 @@ writing Outputs/Synthese-PSM_LARRA-model.kml ... done
|
||||
writing Outputs/Synthese-PSM_LARRA-3D.kml ... done
|
||||
writing Outputs/Synthese-PSM_LARRA-Cave-list.html ... done
|
||||
writing Outputs/Synthese-PSM_LARRA-Surveys.html ... done
|
||||
compilation time: 565 sec
|
||||
compilation time: 577 sec
|
||||
|
||||
|
||||
######################### loop errors ##########################
|
||||
|
||||
Reference in New Issue
Block a user