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

InfoPanel

Browse Source
This commit is contained in:
vsr 2020-11-23 12:08:34 +03:00
parent 21d6045fb9
commit 3c2ef28e72
5 changed files with 245 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
resources/SalomeApp.xml.in
View File

File diff suppressed because one or more lines are too long

68
src/GEOMGUI/GEOM_msg_en.ts
View File

@ -5631,6 +5631,74 @@ shells and solids on the other hand.</translation>
<source>TOOL_IMPORTEXPORT</source>
<translation>Import / Export XAO</translation>
</message>
<message>
<source>INFO_WELCOME_TO_GEOM</source>
<translation>Welcome to Geometry</translation>
</message>
<message>
<source>INFO_GRP_CREATE_MODEL</source>
<translation>Create model</translation>
</message>
<message>
<source>INFO_VERTICES</source>
<translation>vertices</translation>
</message>
<message>
<source>INFO_EDGES</source>
<translation>edges</translation>
</message>
<message>
<source>INFO_WIRES</source>
<translation>wires</translation>
</message>
<message>
<source>INFO_FACES</source>
<translation>faces</translation>
</message>
<message>
<source>INFO_SHELLS</source>
<translation>shells</translation>
</message>
<message>
<source>INFO_SOLIDS</source>
<translation>solids</translation>
</message>
<message>
<source>INFO_BOTTOM_UP_CONSTRUCTION</source>
<translation>Bottom-up construction</translation>
</message>
<message>
<source>INFO_BOX</source>
<translation>box</translation>
</message>
<message>
<source>INFO_CYLINDER</source>
<translation>cylinder</translation>
</message>
<message>
<source>INFO_CONE</source>
<translation>cone</translation>
</message>
<message>
<source>INFO_PRIMITIVES</source>
<translation>Primitives construction</translation>
</message>
<message>
<source>INFO_BOOLEANS</source>
<translation>Boolean operations</translation>
</message>
<message>
<source>INFO_TRANSFORMATIONS</source>
<translation>Transformations</translation>
</message>
<message>
<source>INFO_GRP_IMPORT_MODEL</source>
<translation>Import and repair model</translation>
</message>
<message>
<source>INFO_AVAILABLE_FORMATS</source>
<translation>Available formats</translation>
</message>
</context>
<context>
<name>BasicGUI_CurveDlg</name>

68
src/GEOMGUI/GEOM_msg_fr.ts
View File

@ -5615,6 +5615,74 @@ le paramètre &apos;%1&apos; aux préférences du module Géométrie.</translati
<source>TOOL_IMPORTEXPORT</source>
<translation>Import / Export XAO</translation>
</message>
<message>
<source>INFO_WELCOME_TO_GEOM</source>
<translation type="unfinished">Welcome to Geometry</translation>
</message>
<message>
<source>INFO_GRP_CREATE_MODEL</source>
<translation type="unfinished">Create model</translation>
</message>
<message>
<source>INFO_VERTICES</source>
<translation type="unfinished">vertices</translation>
</message>
<message>
<source>INFO_EDGES</source>
<translation type="unfinished">edges</translation>
</message>
<message>
<source>INFO_WIRES</source>
<translation type="unfinished">wires</translation>
</message>
<message>
<source>INFO_FACES</source>
<translation type="unfinished">faces</translation>
</message>
<message>
<source>INFO_SHELLS</source>
<translation type="unfinished">shells</translation>
</message>
<message>
<source>INFO_SOLIDS</source>
<translation type="unfinished">solids</translation>
</message>
<message>
<source>INFO_BOTTOM_UP_CONSTRUCTION</source>
<translation type="unfinished">Bottom-up construction</translation>
</message>
<message>
<source>INFO_BOX</source>
<translation type="unfinished">box</translation>
</message>
<message>
<source>INFO_CYLINDER</source>
<translation type="unfinished">cylinder</translation>
</message>
<message>
<source>INFO_CONE</source>
<translation type="unfinished">cone</translation>
</message>
<message>
<source>INFO_PRIMITIVES</source>
<translation type="unfinished">Primitives construction</translation>
</message>
<message>
<source>INFO_BOOLEANS</source>
<translation type="unfinished">Boolean operations</translation>
</message>
<message>
<source>INFO_TRANSFORMATIONS</source>
<translation type="unfinished">Transformations</translation>
</message>
<message>
<source>INFO_GRP_IMPORT_MODEL</source>
<translation type="unfinished">Import and repair model</translation>
</message>
<message>
<source>INFO_AVAILABLE_FORMATS</source>
<translation type="unfinished">Available formats</translation>
</message>
</context>
<context>
<name>BasicGUI_CurveDlg</name>

68
src/GEOMGUI/GEOM_msg_ja.ts
View File

@ -5622,6 +5622,74 @@
<source>TOOL_IMPORTEXPORT</source>
<translation>インポート / エクスポート XAO</translation>
</message>
<message>
<source>INFO_WELCOME_TO_GEOM</source>
<translation type="unfinished">Welcome to Geometry</translation>
</message>
<message>
<source>INFO_GRP_CREATE_MODEL</source>
<translation type="unfinished">Create model</translation>
</message>
<message>
<source>INFO_VERTICES</source>
<translation type="unfinished">vertices</translation>
</message>
<message>
<source>INFO_EDGES</source>
<translation type="unfinished">edges</translation>
</message>
<message>
<source>INFO_WIRES</source>
<translation type="unfinished">wires</translation>
</message>
<message>
<source>INFO_FACES</source>
<translation type="unfinished">faces</translation>
</message>
<message>
<source>INFO_SHELLS</source>
<translation type="unfinished">shells</translation>
</message>
<message>
<source>INFO_SOLIDS</source>
<translation type="unfinished">solids</translation>
</message>
<message>
<source>INFO_BOTTOM_UP_CONSTRUCTION</source>
<translation type="unfinished">Bottom-up construction</translation>
</message>
<message>
<source>INFO_BOX</source>
<translation type="unfinished">box</translation>
</message>
<message>
<source>INFO_CYLINDER</source>
<translation type="unfinished">cylinder</translation>
</message>
<message>
<source>INFO_CONE</source>
<translation type="unfinished">cone</translation>
</message>
<message>
<source>INFO_PRIMITIVES</source>
<translation type="unfinished">Primitives construction</translation>
</message>
<message>
<source>INFO_BOOLEANS</source>
<translation type="unfinished">Boolean operations</translation>
</message>
<message>
<source>INFO_TRANSFORMATIONS</source>
<translation type="unfinished">Transformations</translation>
</message>
<message>
<source>INFO_GRP_IMPORT_MODEL</source>
<translation type="unfinished">Import and repair model</translation>
</message>
<message>
<source>INFO_AVAILABLE_FORMATS</source>
<translation type="unfinished">Available formats</translation>
</message>
</context>
<context>
<name>BasicGUI_CurveDlg</name>

55
src/GEOMGUI/GeometryGUI.cxx
View File

@ -91,7 +91,6 @@
#include <SALOMEDS_SObject.hxx>
#include <QtxFontEdit.h>
#include <QtxInfoPanel.h>
// External includes
@ -1854,21 +1853,45 @@ namespace
//=======================================================================
bool GeometryGUI::activateModule( SUIT_Study* study )
{
//InfoPanel
// Fill in: Help Panel
SalomeApp_Application* app = dynamic_cast<SalomeApp_Application*>( application() );
app->infoPanel()->setTitle(tr("Welcome to GEOM"));
app->infoPanel()->setTitle(tr("INFO_WELCOME_TO_GEOM"));
int gb1 = app->infoPanel()->addGroup(tr( "Create a shape"));
QString lbl1 = wrap("vertices", "li") + wrap("edges", "li") + wrap("wires", "li") + wrap("faces", "li") + wrap("shells", "li") + wrap("solids", "li");
QString lbl2 = wrap("box, cylinder...", "li") + wrap("boolean operations","li");
lbl1 = tr("Bottom-up construction:") + wrap(lbl1, "ul") + tr("Primitives construction:") + wrap(lbl2, "ul");
app->infoPanel()->addLabel(lbl1, Qt::AlignLeft, gb1);
int gb = app->infoPanel()->addGroup(tr("INFO_GRP_CREATE_MODEL"));
QString lab;
QStringList items;
items << wrap(tr("INFO_VERTICES"), "li")
<< wrap(tr("INFO_EDGES"), "li")
<< wrap(tr("INFO_WIRES"), "li")
<< wrap(tr("INFO_FACES"), "li")
<< wrap(tr("INFO_SHELLS"), "li")
<< wrap(tr("INFO_SOLIDS"), "li");
lab = tr("INFO_BOTTOM_UP_CONSTRUCTION") + ":" + wrap(items.join(""), "ul");
items.clear();
int gb2 = app->infoPanel()->addGroup(tr("Import a shape"));
lbl1 = wrap("brep", "li") + wrap("step", "li") + wrap("iges", "li") + wrap("stl", "li") + wrap("xao", "li");
lbl1 = tr("Available formats:") + wrap(lbl1, "ul");
app->infoPanel()->addLabel(lbl1, Qt::AlignLeft, gb2);
//end InfoPanel
items << wrap(tr("INFO_BOX"), "li")
<< wrap(tr("INFO_CYLINDER"), "li")
<< wrap(tr("INFO_CONE"), "li")
<< wrap("...", "li");
lab = lab + tr("INFO_PRIMITIVES") + ":" + wrap(items.join(""), "ul");
items.clear();
lab = lab + tr("INFO_BOOLEANS") + "<br/>";
lab = lab + tr("INFO_TRANSFORMATIONS");
app->infoPanel()->addLabel(lab, gb);
gb = app->infoPanel()->addGroup(tr("INFO_GRP_IMPORT_MODEL"));
items << wrap("BREP", "li")
<< wrap("STEP", "li")
<< wrap("IGES", "li")
<< wrap("STL", "li")
<< wrap("XAO", "li");
lab = tr("INFO_AVAILABLE_FORMATS") + ":" + wrap(items.join(""), "ul");
items.clear();
app->infoPanel()->addLabel(lab, gb);
// << Help Panel
if ( CORBA::is_nil( myComponentGeom ) )
return false;
@ -1879,7 +1902,7 @@ bool GeometryGUI::activateModule( SUIT_Study* study )
return false;
setMenuShown( true );
setToolShown( true );
// import Python module that manages GEOM plugins (need to be here because SalomePyQt API uses active module)
PyGILState_STATE gstate = PyGILState_Ensure();
PyObject* pluginsmanager = PyImport_ImportModuleNoBlock((char*)"salome_pluginsmanager");
@ -1966,7 +1989,7 @@ bool GeometryGUI::activateModule( SUIT_Study* study )
}
Py_XDECREF(pluginsmanager);
return true;
}
@ -1982,7 +2005,7 @@ bool GeometryGUI::deactivateModule( SUIT_Study* study )
setMenuShown( false );
setToolShown( false );
disconnect( application()->desktop(), SIGNAL( windowActivated( SUIT_ViewWindow* ) ),
this, SLOT( onWindowActivated( SUIT_ViewWindow* ) ) );