ForkMaster/smesh
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/smesh.git synced 2024-12-26 17:30:35 +05:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'vuzlov/20215'

Browse Source
This commit is contained in:
vsr 2021-01-07 16:45:51 +03:00
commit 4576108204
5 changed files with 266 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
resources/SalomeApp.xml.in
View File

File diff suppressed because one or more lines are too long

51
src/SMESHGUI/SMESHGUI.cxx
View File

@ -113,6 +113,7 @@
#include <LightApp_UpdateFlags.h> #include <LightApp_UpdateFlags.h>
#include <QtxFontEdit.h> #include <QtxFontEdit.h>
#include <QtxPopupMgr.h> #include <QtxPopupMgr.h>
#include <QtxInfoPanel.h>
#include <SALOME_ListIO.hxx> #include <SALOME_ListIO.hxx>
#include <SUIT_Desktop.h> #include <SUIT_Desktop.h>
#include <SUIT_FileDlg.h> #include <SUIT_FileDlg.h>
@ -5105,6 +5106,12 @@ bool SMESHGUI::reusableOperation( const int id )
return ( id == SMESHOp::OpCompute || id == SMESHOp::OpPreCompute || id == SMESHOp::OpEvaluate || id == SMESHOp::OpRecompute ) ? false : SalomeApp_Module::reusableOperation( id ); return ( id == SMESHOp::OpCompute || id == SMESHOp::OpPreCompute || id == SMESHOp::OpEvaluate || id == SMESHOp::OpRecompute ) ? false : SalomeApp_Module::reusableOperation( id );
} }
namespace
{
QString wrap(const QString& text, const QString& tag)
{ return QString("<%1>%2</%3>").arg(tag).arg(text).arg(tag);}
}
bool SMESHGUI::activateModule( SUIT_Study* study ) bool SMESHGUI::activateModule( SUIT_Study* study )
{ {
bool res = SalomeApp_Module::activateModule( study ); bool res = SalomeApp_Module::activateModule( study );
@ -5112,6 +5119,49 @@ bool SMESHGUI::activateModule( SUIT_Study* study )
setMenuShown( true ); setMenuShown( true );
setToolShown( true ); setToolShown( true );
// Fill in Help Panel
SalomeApp_Application* app = dynamic_cast<SalomeApp_Application*>( application() );
app->infoPanel()->setTitle(tr("INFO_WELCOME_TO_SMESH"));
int gb = app->infoPanel()->addGroup(tr("INFO_GRP_CREATE_MESH"));
QString lab;
QStringList items;
lab = tr("INFO_DEFINE_ALGOS") + "<br/>";
lab = lab + tr("INFO_DEFINE_HYPOS") + "<br/>";
lab = lab + tr("INFO_COMPUTE") + "<br/>";
lab = lab + tr("INFO_REFINE") + ":";
items << wrap(tr("INFO_REFINE_LOCAL_SIZE"), "li")
<< wrap(tr("INFO_REFINE_SUBMESH"), "li");
lab = lab + wrap(items.join(""), "ul");
items.clear();
app->infoPanel()->addLabel(lab, gb);
gb = app->infoPanel()->addGroup(tr("INFO_GRP_IMPORT_MESH"));
items << wrap("UNV", "li")
<< wrap("MED", "li")
<< wrap("STL", "li")
<< wrap("CGNS", "li")
<< wrap("SAUV", "li")
<< wrap("GMF", "li");
lab = tr("INFO_AVAILABLE_FORMATS") + ":" + wrap(items.join(""), "ul");
items.clear();
app->infoPanel()->addLabel(lab, gb);
gb = app->infoPanel()->addGroup(tr("INFO_GRP_CHECK_MESH"));
lab = tr("INFO_DISPLAY") + "<br/>";
items << wrap(tr("INFO_QUALITY_AREA"), "li")
<< wrap(tr("INFO_QUALITY_VOLUME"), "li")
<< wrap(tr("INFO_QUALITY_ASPECT_RATION"), "li")
<< wrap("...", "li");
lab = lab + tr("INFO_QUALITY_INFO") + ":" + wrap(items.join(""), "ul");
items.clear();
lab = lab + tr("INFO_CLIPPING");
app->infoPanel()->addLabel(lab, gb);
// << Help Panel
// import Python module that manages SMESH plugins (need to be here because SalomePyQt API uses active module) // import Python module that manages SMESH plugins (need to be here because SalomePyQt API uses active module)
PyGILState_STATE gstate = PyGILState_Ensure(); PyGILState_STATE gstate = PyGILState_Ensure();
PyObject* pluginsmanager = PyImport_ImportModuleNoBlock((char*)"salome_pluginsmanager"); PyObject* pluginsmanager = PyImport_ImportModuleNoBlock((char*)"salome_pluginsmanager");
@ -5230,6 +5280,7 @@ void SMESHGUI::windows( QMap<int, int>& aMap ) const
{ {
aMap.insert( SalomeApp_Application::WT_ObjectBrowser, Qt::LeftDockWidgetArea ); aMap.insert( SalomeApp_Application::WT_ObjectBrowser, Qt::LeftDockWidgetArea );
aMap.insert( SalomeApp_Application::WT_NoteBook, Qt::LeftDockWidgetArea ); aMap.insert( SalomeApp_Application::WT_NoteBook, Qt::LeftDockWidgetArea );
aMap.insert( SalomeApp_Application::WT_InfoPanel, Qt::RightDockWidgetArea);
#ifndef DISABLE_PYCONSOLE #ifndef DISABLE_PYCONSOLE
aMap.insert( SalomeApp_Application::WT_PyConsole, Qt::BottomDockWidgetArea ); aMap.insert( SalomeApp_Application::WT_PyConsole, Qt::BottomDockWidgetArea );
#endif #endif

68
src/SMESHGUI/SMESH_msg_en.ts
View File

@ -5029,6 +5029,74 @@ Please, create VTK viewer and try again</translation>
<source>PREF_PREVIEW_CHUNK_SIZE</source> <source>PREF_PREVIEW_CHUNK_SIZE</source>
<translation>Sub-shapes preview chunk size</translation> <translation>Sub-shapes preview chunk size</translation>
</message> </message>
<message>
<source>INFO_WELCOME_TO_SMESH</source>
<translation>Welcome to Mesh</translation>
</message>
<message>
<source>INFO_GRP_CREATE_MESH</source>
<translation>Create mesh</translation>
</message>
<message>
<source>INFO_DEFINE_ALGOS</source>
<translation>Choose algorithms</translation>
</message>
<message>
<source>INFO_DEFINE_HYPOS</source>
<translation>Define hypotheses</translation>
</message>
<message>
<source>INFO_COMPUTE</source>
<translation>Compute</translation>
</message>
<message>
<source>INFO_REFINE</source>
<translation>Add refinements</translation>
</message>
<message>
<source>INFO_REFINE_LOCAL_SIZE</source>
<translation>via local sizes with some hypotheses</translation>
</message>
<message>
<source>INFO_REFINE_SUBMESH</source>
<translation>via sub-meshes</translation>
</message>
<message>
<source>INFO_GRP_IMPORT_MESH</source>
<translation>Import mesh</translation>
</message>
<message>
<source>INFO_AVAILABLE_FORMATS</source>
<translation>Available formats</translation>
</message>
<message>
<source>INFO_GRP_CHECK_MESH</source>
<translation> Check mesh quality</translation>
</message>
<message>
<source>INFO_DISPLAY</source>
<translation>Display mesh</translation>
</message>
<message>
<source>INFO_QUALITY_INFO</source>
<translation>Display some quality criteria</translation>
</message>
<message>
<source>INFO_QUALITY_AREA</source>
<translation>area</translation>
</message>
<message>
<source>INFO_QUALITY_VOLUME</source>
<translation>volume</translation>
</message>
<message>
<source>INFO_QUALITY_ASPECT_RATION</source>
<translation>aspect ration</translation>
</message>
<message>
<source>INFO_CLIPPING</source>
<translation>Add clipping planes</translation>
</message>
</context> </context>
<context> <context>
<name>SMESHGUI_GroupDlg</name> <name>SMESHGUI_GroupDlg</name>

72
src/SMESHGUI/SMESH_msg_fr.ts
View File

@ -4558,6 +4558,10 @@ Il ne peut pas être supprimé.</translation>
<source>SMESH_HEX_PRISM</source> <source>SMESH_HEX_PRISM</source>
<translation>Prisme hexagonal</translation> <translation>Prisme hexagonal</translation>
</message> </message>
<message>
<source>Generate mesh from CAD model or import mesh</source>
<translation type="unfinished">Generate mesh from CAD model or import mesh</translation>
</message>
</context> </context>
<context> <context>
<name>SMESHGUI_FieldSelectorWdg</name> <name>SMESHGUI_FieldSelectorWdg</name>
@ -5006,6 +5010,74 @@ Ouvrez une fenêtre VTK et essayez de nouveau</translation>
<source>PREF_PREVIEW_CHUNK_SIZE</source> <source>PREF_PREVIEW_CHUNK_SIZE</source>
<translation>Taille des blocs pour la prévisualisation des sous-shapes</translation> <translation>Taille des blocs pour la prévisualisation des sous-shapes</translation>
</message> </message>
<message>
<source>INFO_WELCOME_TO_SMESH</source>
<translation type="unfinished">Welcome to Mesh</translation>
</message>
<message>
<source>INFO_GRP_CREATE_MESH</source>
<translation type="unfinished">Create mesh</translation>
</message>
<message>
<source>INFO_DEFINE_ALGOS</source>
<translation type="unfinished">Choose algorithms</translation>
</message>
<message>
<source>INFO_DEFINE_HYPOS</source>
<translation type="unfinished">Define hypotheses</translation>
</message>
<message>
<source>INFO_COMPUTE</source>
<translation type="unfinished">Compute</translation>
</message>
<message>
<source>INFO_REFINE</source>
<translation type="unfinished">Add refinements</translation>
</message>
<message>
<source>INFO_REFINE_LOCAL_SIZE</source>
<translation type="unfinished">via local sizes with some hypotheses</translation>
</message>
<message>
<source>INFO_REFINE_SUBMESH</source>
<translation type="unfinished">via sub-meshes</translation>
</message>
<message>
<source>INFO_GRP_IMPORT_MESH</source>
<translation type="unfinished">Import mesh</translation>
</message>
<message>
<source>INFO_AVAILABLE_FORMATS</source>
<translation type="unfinished">Available formats</translation>
</message>
<message>
<source>INFO_GRP_CHECK_MESH</source>
<translation type="unfinished"> Check mesh quality</translation>
</message>
<message>
<source>INFO_DISPLAY</source>
<translation type="unfinished">Display mesh</translation>
</message>
<message>
<source>INFO_QUALITY_INFO</source>
<translation type="unfinished">Display some quality criteria</translation>
</message>
<message>
<source>INFO_QUALITY_AREA</source>
<translation type="unfinished">area</translation>
</message>
<message>
<source>INFO_QUALITY_VOLUME</source>
<translation type="unfinished">volume</translation>
</message>
<message>
<source>INFO_QUALITY_ASPECT_RATION</source>
<translation type="unfinished">aspect ration</translation>
</message>
<message>
<source>INFO_CLIPPING</source>
<translation type="unfinished">Add clipping planes</translation>
</message>
</context> </context>
<context> <context>
<name>SMESHGUI_GroupDlg</name> <name>SMESHGUI_GroupDlg</name>

72
src/SMESHGUI/SMESH_msg_ja.ts
View File

@ -4431,6 +4431,10 @@
<source>SMESH_HEX_PRISM</source> <source>SMESH_HEX_PRISM</source>
<translation>六角形プリズム</translation> <translation>六角形プリズム</translation>
</message> </message>
<message>
<source>Generate mesh from CAD model or import mesh</source>
<translation type="unfinished">Generate mesh from CAD model or import mesh</translation>
</message>
</context> </context>
<context> <context>
<name>SMESHGUI_FieldSelectorWdg</name> <name>SMESHGUI_FieldSelectorWdg</name>
@ -4827,6 +4831,74 @@
<source>PREF_PREVIEW_CHUNK_SIZE</source> <source>PREF_PREVIEW_CHUNK_SIZE</source>
<translation>Under-shapes のブロックのサイズ</translation> <translation>Under-shapes のブロックのサイズ</translation>
</message> </message>
<message>
<source>INFO_WELCOME_TO_SMESH</source>
<translation type="unfinished">Welcome to Mesh</translation>
</message>
<message>
<source>INFO_GRP_CREATE_MESH</source>
<translation type="unfinished">Create mesh</translation>
</message>
<message>
<source>INFO_DEFINE_ALGOS</source>
<translation type="unfinished">Choose algorithms</translation>
</message>
<message>
<source>INFO_DEFINE_HYPOS</source>
<translation type="unfinished">Define hypotheses</translation>
</message>
<message>
<source>INFO_COMPUTE</source>
<translation type="unfinished">Compute</translation>
</message>
<message>
<source>INFO_REFINE</source>
<translation type="unfinished">Add refinements</translation>
</message>
<message>
<source>INFO_REFINE_LOCAL_SIZE</source>
<translation type="unfinished">via local sizes with some hypotheses</translation>
</message>
<message>
<source>INFO_REFINE_SUBMESH</source>
<translation type="unfinished">via sub-meshes</translation>
</message>
<message>
<source>INFO_GRP_IMPORT_MESH</source>
<translation type="unfinished">Import mesh</translation>
</message>
<message>
<source>INFO_AVAILABLE_FORMATS</source>
<translation type="unfinished">Available formats</translation>
</message>
<message>
<source>INFO_GRP_CHECK_MESH</source>
<translation type="unfinished"> Check mesh quality</translation>
</message>
<message>
<source>INFO_DISPLAY</source>
<translation type="unfinished">Display mesh</translation>
</message>
<message>
<source>INFO_QUALITY_INFO</source>
<translation type="unfinished">Display some quality criteria</translation>
</message>
<message>
<source>INFO_QUALITY_AREA</source>
<translation type="unfinished">area</translation>
</message>
<message>
<source>INFO_QUALITY_VOLUME</source>
<translation type="unfinished">volume</translation>
</message>
<message>
<source>INFO_QUALITY_ASPECT_RATION</source>
<translation type="unfinished">aspect ration</translation>
</message>
<message>
<source>INFO_CLIPPING</source>
<translation type="unfinished">Add clipping planes</translation>
</message>
</context> </context>
<context> <context>
<name>SMESHGUI_GroupDlg</name> <name>SMESHGUI_GroupDlg</name>