From c0c883fc72c29f66e6703a2e06c0ad27ad18618e Mon Sep 17 00:00:00 2001 From: azakir Date: Thu, 10 Dec 2020 18:33:02 +0100 Subject: [PATCH] update translation files --- src/SMESHGUI/MG_ADAPT.cxx | 13 ++- src/SMESHGUI/SMESHGUI_AdaptDlg.cxx | 10 ++ src/SMESHGUI/SMESH_msg_en.ts | 164 +++++++++++++++++++++++++++++ src/SMESHGUI/SMESH_msg_fr.ts | 136 ++++++++++++++++++++++++ 4 files changed, 320 insertions(+), 3 deletions(-) diff --git a/src/SMESHGUI/MG_ADAPT.cxx b/src/SMESHGUI/MG_ADAPT.cxx index 305990c33..641c0f0c2 100644 --- a/src/SMESHGUI/MG_ADAPT.cxx +++ b/src/SMESHGUI/MG_ADAPT.cxx @@ -1175,9 +1175,16 @@ void MgAdapt::restorefams(MEDCoupling::MEDFileMesh* fileMesh) const std::vector::const_iterator fIt = famVec.begin(); for (; fIt!=famVec.end(); ++fIt) - { - std::string givenFamNameFromMeshGemConverter = fileMesh->getFamilyNameGivenId( fIt->_famId ); - fileMesh->changeFamilyName(givenFamNameFromMeshGemConverter, fIt->_famName); + { + try // safety : FAMILY could be lost P2-->P1 + { + std::string givenFamNameFromMeshGemConverter = fileMesh->getFamilyNameGivenId( fIt->_famId ); + fileMesh->changeFamilyName(givenFamNameFromMeshGemConverter, fIt->_famName); + } + catch (const std::exception& e) + { + std::cerr< @@ -222,6 +224,14 @@ bool SMESHGUI_AdaptDlg::OnGUIEvent (int theCommandID) { INFOS("Interface avec MG-Adapt" ); // A faire + + MgAdapt* model = new MgAdapt(); + bool isCreation = false; + if (mySMESHGUI->isStudyLocked()) break; + mySMESHGUI->EmitSignalDeactivateDialog(); + SMESHGUI_MG_ADAPTDRIVER *mgAdapt = new SMESHGUI_MG_ADAPTDRIVER(mySMESHGUI, model, isCreation); + mgAdapt->show(); + delete model; break; } diff --git a/src/SMESHGUI/SMESH_msg_en.ts b/src/SMESHGUI/SMESH_msg_en.ts index ec3ca2f25..5c7703a82 100644 --- a/src/SMESHGUI/SMESH_msg_en.ts +++ b/src/SMESHGUI/SMESH_msg_en.ts @@ -372,6 +372,118 @@ MEN_MG_ADAPT Remesh with MG_Adapt + + Args + Arguments + + + MeshOut + Mesh Out + + + MeshIn + Mesh In + + + MEDFile + MED file + + + Browser + Browser + + + Publish_MG_ADAPT + Publish + + + SIZE_MAP_FIELD + Size map field + + + MG_ADAPT_FIELD_NAME + Field Name + + + MG_ADAPT_MED_FILE_1 + This MED file cannot be read. + + + MG_ADAPT_MED_FILE_2 + No mesh in this MED file. + + + MG_ADAPT_MED_FILE_3 + More than one mesh in this MED file. + + + MG_ADAPT_MED_FILE_4 + The mesh in this MED file cannot be read. + + + MG_ADAPT_MED_FILE_5 + No field in this MED file. + + + MG_ADAPT_MED_FILE_6 + The field(s) in this MED file cannot be read. + + + MG_ADAPT_ERROR + Error + + + MG_ADAPT_CH_ST + Chosen time step + + + MG_ADAPT_RANK + Rank + + + MG_ADAPT_TSTP + Time step + + + MG_ADAPT_NO_T_ST + No time step + + + MG_ADAPT_L_ST + Last time step + + + MeshName + Mesh name + + + LOCAL_MG_ADAPT + local + + + BACKGRND_MG_ADAPT + Background + + + CNST_MG_ADAPT + Constant + + + MED_FILE_BCKG + MED file background size map + + + VALUE_MG_ADAPT + Value + + + SIZE_MAP_DEF + size map definition + + + ADVOP + Advanced Options + MEN_CONV_TO_QUAD Convert to/from quadratic @@ -2989,6 +3101,30 @@ Check algorithm documentation for supported geometry ADAPT_PREF_MG_ADAPT_PUBLICATION_MAILLAGE_OUT Publication of the OUT mesh + + OPTION_VALUE_COLUMN + Option + + + OPTION_NAME_COLUMN + Value + + + compute_ridges + Compute ridges + + + max_memory + Maximum memory (Mb) + + + Adaption + adaptation + + + components + Components + ADAPT_PREF_MG_ADAPT_SIZE_MAP Size map @@ -3001,18 +3137,46 @@ Check algorithm documentation for supported geometry ADAPT_PREF_MG_ADAPT_SIZE_MAP_BACKGROUND Background + + ADAPT_PREF_MG_ADAPT_MED_SIZE_MAP_BACKGROUND + MED file background size map + ADAPT_PREF_MG_ADAPT_TIME_STEP Time step + + ADAPT_PREF_MG_ADAPT_NO_TIME_STEP + No time step + ADAPT_PREF_MG_ADAPT_TIME_STEP_LAST Last + + ADAPT_PREF_MG_ADAPT_AR + Arguments + + + ADAPT_PREF_MG_ADAPT_ADVOP + Advanced Options + + + ADAPT_PREF_MG_ADAPT_TIME_LAST_STEP + Last time step + + + ADAPT_PREF_MG_ADAPT_TIME_C_STEP + Chosen time step + ADAPT_PREF_MG_ADAPT_TIME_STEP_C Value + + MG_ADAPT_SELECT_FILE_0 + MG-ADAPT select file + SMESH_VISU_PROBLEM Mesh visualization failed diff --git a/src/SMESHGUI/SMESH_msg_fr.ts b/src/SMESHGUI/SMESH_msg_fr.ts index dd806b89c..5b7bdd0f9 100644 --- a/src/SMESHGUI/SMESH_msg_fr.ts +++ b/src/SMESHGUI/SMESH_msg_fr.ts @@ -792,6 +792,114 @@ MEN_ADAPT Adaptation + + Args + Arguments + + + MeshOut + Maillage en sortie + + + MEDFile + Fichier MED + + + Browser + Arbre d'études + + + BACKGRND_MG_ADAPT + Arrière-plan + + + CNST_MG_ADAPT + Constante + + + SIZE_MAP_FIELD + Champ de la carte de taille + + + MG_ADAPT_FIELD_NAME + Nom du champ + + + MG_ADAPT_MED_FILE_1 + Ce fichier MED est illisible. + + + MG_ADAPT_MED_FILE_2 + Ce fichier MED ne contient aucun maillage. + + + MG_ADAPT_MED_FILE_3 + Ce fichier MED contient plus d'un maillage. + + + MG_ADAPT_MED_FILE_4 + Impossible de lire le maillage de ce fichier MED. + + + MG_ADAPT_MED_FILE_5 + Ce fichier MED ne contient aucun champ. + + + MG_ADAPT_MED_FILE_6 + Impossible de lire le(s) champ(s) de ce fichier MED. + + + MG_ADAPT_NO_T_ST + Sans pas de temps + + + MG_ADAPT_CH_ST + Pas de temps choisi + + + MG_ADAPT_RANK + Numéro d'ordre + + + MG_ADAPT_TSTP + Pas de temps + + + MG_ADAPT_L_ST + Dernier pas de temps + + + MED_FILE_BCKG + fichier MED de la carte en arrière-plan + + + VALUE_MG_ADAPT + Valeur + + + Publish_MG_ADAPT + Publication + + + LOCAL_MG_ADAPT + locale + + + MeshName + Nom du maillage + + + MeshIn + Maillage en entrée + + + SIZE_MAP_DEF + Définition de la carte de taille + + + ADVOP + Advanced Options + MEN_MEASURE Outils de mesure @@ -2967,6 +3075,30 @@ Référez-vous à la documentation sur l'algorithme et la géométrie suppo ADAPT_PREF_MG_ADAPT_PUBLICATION_MAILLAGE_OUT Publication du maillage de sortie + + OPTION_VALUE_COLUMN + Option + + + OPTION_NAME_COLUMN + Valeur + + + compute_ridges + Calcul des crêtes + + + max_memory + Maximum memoire (Mb) + + + components + Composants + + + Adapation + adaptation + ADAPT_PREF_MG_ADAPT_SIZE_MAP Carte de tailles @@ -2991,6 +3123,10 @@ Référez-vous à la documentation sur l'algorithme et la géométrie suppo ADAPT_PREF_MG_ADAPT_TIME_STEP_C Valeur + + MG_ADAPT_SELECT_FILE_0 + MG-ADAPT selection fichier MED + SMESH_VISU_PROBLEM Impossible de visualiser le maillage, probablement à cause d'un manque de mémoire -- 2.39.2