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

Merge branch 'vuzlov/20215'

Browse Source
This commit is contained in:
vsr 2021-01-07 16:43:53 +03:00
commit cb793ede66
5 changed files with 264 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

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> <source>TOOL_IMPORTEXPORT</source>
<translation>Import / Export XAO</translation> <translation>Import / Export XAO</translation>
</message> </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>
<context> <context>
<name>BasicGUI_CurveDlg</name> <name>BasicGUI_CurveDlg</name>

72
src/GEOMGUI/GEOM_msg_fr.ts
View File

@ -5560,6 +5560,10 @@ le paramètre &apos;%1&apos; aux préférences du module Géométrie.</translati
<source>GEOM_DIM_AXES</source> <source>GEOM_DIM_AXES</source>
<translation>Dimensions sur les axes locaux</translation> <translation>Dimensions sur les axes locaux</translation>
</message> </message>
<message>
<source>Create, import, repair CAD models</source>
<translation type="unfinished">Create, import, repair CAD models</translation>
</message>
</context> </context>
<context> <context>
<name>GeometryGUI</name> <name>GeometryGUI</name>
@ -5615,6 +5619,74 @@ le paramètre &apos;%1&apos; aux préférences du module Géométrie.</translati
<source>TOOL_IMPORTEXPORT</source> <source>TOOL_IMPORTEXPORT</source>
<translation>Import / Export XAO</translation> <translation>Import / Export XAO</translation>
</message> </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>
<context> <context>
<name>BasicGUI_CurveDlg</name> <name>BasicGUI_CurveDlg</name>

72
src/GEOMGUI/GEOM_msg_ja.ts
View File

@ -5567,6 +5567,10 @@
<source>HIDE_ALL_BTN</source> <source>HIDE_ALL_BTN</source>
<translation>全非表示</translation> <translation>全非表示</translation>
</message> </message>
<message>
<source>Create, import, repair CAD models</source>
<translation type="unfinished">Create, import, repair CAD models</translation>
</message>
</context> </context>
<context> <context>
<name>GeometryGUI</name> <name>GeometryGUI</name>
@ -5622,6 +5626,74 @@
<source>TOOL_IMPORTEXPORT</source> <source>TOOL_IMPORTEXPORT</source>
<translation>インポート / エクスポート XAO</translation> <translation>インポート / エクスポート XAO</translation>
</message> </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>
<context> <context>
<name>BasicGUI_CurveDlg</name> <name>BasicGUI_CurveDlg</name>

49
src/GEOMGUI/GeometryGUI.cxx
View File

@ -91,6 +91,7 @@
#include <SALOMEDS_SObject.hxx> #include <SALOMEDS_SObject.hxx>
#include <QtxFontEdit.h> #include <QtxFontEdit.h>
#include <QtxInfoPanel.h>
// External includes // External includes
#include <QDir> #include <QDir>
@ -1840,12 +1841,58 @@ void GeometryGUI::addPluginActions()
} }
} }
namespace
{
QString wrap(const QString& text, const QString& tag)
{ return QString("<%1>%2</%3>").arg(tag).arg(text).arg(tag);}
}
//======================================================================= //=======================================================================
// function : GeometryGUI::activateModule() // function : GeometryGUI::activateModule()
// purpose : Called when GEOM module is activated // purpose : Called when GEOM module is activated
//======================================================================= //=======================================================================
bool GeometryGUI::activateModule( SUIT_Study* study ) bool GeometryGUI::activateModule( SUIT_Study* study )
{ {
// Fill in: Help Panel
SalomeApp_Application* app = dynamic_cast<SalomeApp_Application*>( application() );
app->infoPanel()->setTitle(tr("INFO_WELCOME_TO_GEOM"));
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();
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 ) ) if ( CORBA::is_nil( myComponentGeom ) )
return false; return false;
@ -1942,6 +1989,7 @@ bool GeometryGUI::activateModule( SUIT_Study* study )
} }
Py_XDECREF(pluginsmanager); Py_XDECREF(pluginsmanager);
return true; return true;
} }
@ -2027,6 +2075,7 @@ void GeometryGUI::onWindowActivated( SUIT_ViewWindow* win )
void GeometryGUI::windows( QMap<int, int>& mappa ) const void GeometryGUI::windows( QMap<int, int>& mappa ) const
{ {
mappa.insert( SalomeApp_Application::WT_ObjectBrowser, Qt::LeftDockWidgetArea ); mappa.insert( SalomeApp_Application::WT_ObjectBrowser, Qt::LeftDockWidgetArea );
mappa.insert( SalomeApp_Application::WT_InfoPanel, Qt::RightDockWidgetArea );
mappa.insert( SalomeApp_Application::WT_NoteBook, Qt::LeftDockWidgetArea ); mappa.insert( SalomeApp_Application::WT_NoteBook, Qt::LeftDockWidgetArea );
#ifndef DISABLE_PYCONSOLE #ifndef DISABLE_PYCONSOLE
mappa.insert( SalomeApp_Application::WT_PyConsole, Qt::BottomDockWidgetArea ); mappa.insert( SalomeApp_Application::WT_PyConsole, Qt::BottomDockWidgetArea );