ForkMaster/geom
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/geom.git synced 2025-02-28 03:55:36 +05:00
Code Issues Packages Projects Releases Wiki Activity

Improve actions management

Browse Source 
Remove deprecated code
This commit is contained in:
vsr 2010-02-28 20:19:40 +00:00
parent b757df10d5
commit 3b2d951662
11 changed files with 137 additions and 353 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

253
src/GEOMToolsGUI/GEOMToolsGUI.cxx
View File

@ -27,6 +27,7 @@
#include "GEOMToolsGUI_DeleteDlg.h" #include "GEOMToolsGUI_DeleteDlg.h"
#include <GeometryGUI.h> #include <GeometryGUI.h>
#include "GeometryGUI_Operations.h"
#include <GEOMBase.h> #include <GEOMBase.h>
#include <GEOM_Operation.h> #include <GEOM_Operation.h>
#include <GEOM_Displayer.h> #include <GEOM_Displayer.h>
@ -285,149 +286,75 @@ bool GEOMToolsGUI::OnGUIEvent(int theCommandID, SUIT_Desktop* parent)
{ {
getGeometryGUI()->EmitSignalDeactivateDialog(); getGeometryGUI()->EmitSignalDeactivateDialog();
switch (theCommandID) switch ( theCommandID ) {
{ case GEOMOp::OpDelete: // EDIT - DELETE
case 31: // COPY OnEditDelete();
{ break;
OnEditCopy(); case GEOMOp::OpImport: // FILE - IMPORT
break; Import();
} break;
case 33: // DELETE case GEOMOp::OpExport: // FILE - EXPORT
{ Export();
OnEditDelete(); break;
break; case GEOMOp::OpCheckGeom: // TOOLS - CHECK GEOMETRY
} OnCheckGeometry();
case 111: // IMPORT BREP break;
case 112: // IMPORT IGES case GEOMOp::OpSelectVertex: // POPUP - SELECT ONLY - VERTEX
case 113: // IMPORT STEP OnSelectOnly( GEOM_POINT );
{ break;
Import(); case GEOMOp::OpSelectEdge: // POPUP - SELECT ONLY - EDGE
break; OnSelectOnly( GEOM_EDGE );
} break;
case 121: // EXPORT BREP case GEOMOp::OpSelectWire: // POPUP - SELECT ONLY - WIRE
case 122: // EXPORT IGES OnSelectOnly( GEOM_WIRE );
case 123: // EXPORT STEP break;
{ case GEOMOp::OpSelectFace: // POPUP - SELECT ONLY - FACE
Export(); OnSelectOnly( GEOM_FACE );
break; break;
} case GEOMOp::OpSelectShell: // POPUP - SELECT ONLY - SHELL
case 2171: // POPUP VIEWER - SELECT ONLY - VERTEX OnSelectOnly( GEOM_SHELL );
{ break;
OnSelectOnly( GEOM_POINT ); case GEOMOp::OpSelectSolid: // POPUP - SELECT ONLY - SOLID
break; OnSelectOnly( GEOM_SOLID );
} break;
case 2172: // POPUP VIEWER - SELECT ONLY - EDGE case GEOMOp::OpSelectCompound: // POPUP - SELECT ONLY - COMPOUND
{ OnSelectOnly( GEOM_COMPOUND );
OnSelectOnly( GEOM_EDGE ); break;
break; case GEOMOp::OpSelectAll: // POPUP - SELECT ONLY - SELECT ALL
} OnSelectOnly( GEOM_ALLOBJECTS );
case 2173: // POPUP VIEWER - SELECT ONLY - WIRE break;
{ case GEOMOp::OpRename: // POPUP - RENAME
OnSelectOnly( GEOM_WIRE ); OnRename();
break; break;
} case GEOMOp::OpDeflection: // POPUP - DEFLECTION ANGLE
case 2174: // POPUP VIEWER - SELECT ONLY - FACE OnDeflection();
{ break;
OnSelectOnly( GEOM_FACE ); case GEOMOp::OpColor: // POPUP - COLOR
break; OnColor();
} break;
case 2175: // POPUP VIEWER - SELECT ONLY - SHELL case GEOMOp::OpTransparency: // POPUP - TRANSPARENCY
{ OnTransparency();
OnSelectOnly( GEOM_SHELL ); break;
break; case GEOMOp::OpIsos: // POPUP - ISOS
} OnNbIsos();
case 2176: // POPUP VIEWER - SELECT ONLY - SOLID break;
{ case GEOMOp::OpAutoColor: // POPUP - AUTO COLOR
OnSelectOnly( GEOM_SOLID ); OnAutoColor();
break; break;
} case GEOMOp::OpNoAutoColor: // POPUP - DISABLE AUTO COLOR
case 2177: // POPUP VIEWER - SELECT ONLY - COMPOUND OnDisableAutoColor();
{ break;
OnSelectOnly( GEOM_COMPOUND ); case GEOMOp::OpShowChildren: // POPUP - SHOW CHILDREN
break; case GEOMOp::OpHideChildren: // POPUP - HIDE CHILDREN
} OnShowHideChildren( theCommandID == GEOMOp::OpShowChildren );
case 2178: // POPUP VIEWER - SELECT ONLY - SELECT ALL break;
{ case GEOMOp::OpPointMarker: // POPUP - POINT MARKER
OnSelectOnly( GEOM_ALLOBJECTS ); OnPointMarker();
break; break;
} default:
case 411: // SETTINGS - ADD IN STUDY SUIT_Session::session()->activeApplication()->putInfo(tr("GEOM_PRP_COMMAND").arg(theCommandID));
{ break;
// SAN -- TO BE REMOVED !!! }
break;
}
case 412: // SETTINGS - SHADING COLOR
{
OnSettingsColor();
break;
}
case 804: // ADD IN STUDY - POPUP VIEWER
{
// SAN -- TO BE REMOVED !!!!
break;
}
case 901: // RENAME
{
OnRename();
break;
}
case 5103: // CHECK GEOMETRY
{
OnCheckGeometry();
break;
}
case 8031: // DEFLECTION ANGLE - POPUP VIEWER
{
OnDeflection();
break;
}
case 8032: // COLOR - POPUP VIEWER
{
OnColor();
break;
}
case 8033: // TRANSPARENCY - POPUP VIEWER
{
OnTransparency();
break;
}
case 8034: // ISOS - POPUP VIEWER
{
OnNbIsos();
break;
}
case 8035: // AUTO COLOR - POPUP VIEWER
{
OnAutoColor();
break;
}
case 8036: // DISABLE AUTO COLOR - POPUP VIEWER
{
OnDisableAutoColor();
break;
}
case 8037: // SHOW CHILDREN - POPUP VIEWER
case 8038: // HIDE CHILDREN - POPUP VIEWER
{
OnShowHideChildren( theCommandID == 8037 );
break;
}
case 8039: // POINT MARKER
{
OnPointMarker();
break;
}
case 9024 : // OPEN - OBJBROSER POPUP
{
OnOpen();
break;
}
default:
{
SUIT_Session::session()->activeApplication()->putInfo(tr("GEOM_PRP_COMMAND").arg(theCommandID));
break;
}
}
return true; return true;
} }
@ -585,45 +512,9 @@ void GEOMToolsGUI::OnEditDelete()
app->updateActions(); //SRN: To update a Save button in the toolbar app->updateActions(); //SRN: To update a Save button in the toolbar
} }
//==============================================================================
// function : OnEditCopy()
// purpose :
//==============================================================================
void GEOMToolsGUI::OnEditCopy()
{
/*
SALOME_Selection* Sel = SALOME_Selection::Selection(QAD_Application::getDesktop()->getActiveStudy()->getSelection() );
GEOM::string_array_var listIOR = new GEOM::string_array;
const SALOME_ListIO& List = Sel->StoredIObjects();
myGeomBase->ConvertListOfIOInListOfIOR(List, listIOR);
Sel->ClearIObjects();
SALOMEDS::Study_var aStudy = QAD_Application::getDesktop()->getActiveStudy()->getStudyDocument();
int aStudyID = aStudy->StudyId();
for (unsigned int ind = 0; ind < listIOR->length();ind++) {
GEOM::GEOM_Object_var aShapeInit = myGeom->GetIORFromString(listIOR[ind]);
try {
GEOM::GEOM_IInsertOperations_var IOp = myGeom->GetIInsertOperations(aStudyID);
GEOM::GEOM_Object_var result = IOp->MakeCopy(aShapeInit);
myGeomBase->Display(result);
}
catch (const SALOME::SALOME_Exception& S_ex) {
QtCatchCorbaException(S_ex);
}
}
QAD_Application::getDesktop()->putInfo(tr("GEOM_PRP_READY"));
*/
}
//===================================================================================== //=====================================================================================
// function : Import // function : Import
// purpose : BRep, Iges, Step // purpose : BRep, Iges, Step, ...
//===================================================================================== //=====================================================================================
bool GEOMToolsGUI::Import() bool GEOMToolsGUI::Import()
{ {
@ -931,7 +822,7 @@ bool GEOMToolsGUI::Export()
//===================================================================================== //=====================================================================================
// function : RemoveObjectWithChildren // function : RemoveObjectWithChildren
// purpose : to be used by OnEditDelete() method // purpose : used by OnEditDelete() method
//===================================================================================== //=====================================================================================
void GEOMToolsGUI::removeObjectWithChildren(_PTR(SObject) obj, void GEOMToolsGUI::removeObjectWithChildren(_PTR(SObject) obj,
_PTR(Study) aStudy, _PTR(Study) aStudy,

3
src/GEOMToolsGUI/GEOMToolsGUI.h
View File

@ -56,10 +56,8 @@ private:
bool Import(); bool Import();
bool Export(); bool Export();
void OnEditCopy();
void OnEditDelete(); void OnEditDelete();
void OnSettingsColor();
void OnRename(); void OnRename();
void OnCheckGeometry(); void OnCheckGeometry();
@ -70,7 +68,6 @@ private:
void OnTransparency(); void OnTransparency();
void OnNbIsos(); void OnNbIsos();
void OnDeflection(); void OnDeflection();
void OnOpen();
void OnSelectOnly(int mode); void OnSelectOnly(int mode);
void OnShowHideChildren( bool ); void OnShowHideChildren( bool );
void OnPointMarker(); void OnPointMarker();

112
src/GEOMToolsGUI/GEOMToolsGUI_1.cxx
View File

@ -89,25 +89,6 @@
// VTK includes // VTK includes
#include <vtkRenderer.h> #include <vtkRenderer.h>
void GEOMToolsGUI::OnSettingsColor()
{
SUIT_Session* sess = SUIT_Session::session();
SUIT_ResourceMgr* resMgr = sess->resourceMgr();
SUIT_Desktop* desk = sess->activeApplication()->desktop();
QColor anInitColor = resMgr->colorValue( "Geometry", "SettingsShadingColor", QColor( "yellow" ) );
QColor aDialogColor = QColorDialog::getColor(anInitColor, desk );
if( aDialogColor.isValid() )
{
QString type = desk->activeWindow()->getViewManager()->getType();
if( type != OCCViewer_Viewer::Type() && type != SVTK_Viewer::Type() )
MESSAGE("Settings Color is not supported for current Viewer");
resMgr->setValue( "Geometry", "SettingsShadingColor", aDialogColor );
}
}
void GEOMToolsGUI::OnRename() void GEOMToolsGUI::OnRename()
{ {
SALOME_ListIO selected; SALOME_ListIO selected;
@ -644,99 +625,6 @@ void GEOMToolsGUI::OnDeflection()
} // end vtkviewer } // end vtkviewer
} }
void GEOMToolsGUI::OnOpen()
{
/*
SALOME_Selection* Sel = SALOME_Selection::Selection(QAD_Application::getDesktop()->getActiveStudy()->getSelection());
_PTR(Study) aStudy = QAD_Application::getDesktop()->getActiveStudy()->getStudyDocument();
SALOME_ListIteratorOfListIO It(Sel->StoredIObjects());
Handle(SALOME_InteractiveObject) anIObject;
for(;It.More();It.Next()) {
anIObject = It.Value();
_PTR(SObject) obj ( aStudy->FindObjectID(anIObject->getEntry()) );
_PTR(AttributePersistentRef) aPersist;
_PTR(AttributeIOR) anIOR;
if(obj) {
// this SObject may be GEOM module root SObject
_PTR(ChildIterator) anIter ( aStudy->NewChildIterator() );
_PTR(GenericAttribute) anAttr;
bool useSubItems = false;
while (anIter->More() && !useSubItems) {
_PTR(SObject) subobj ( anIter->Value() );
if (subobj->FindAttribute(anAttr, "AttributePersistentRef")) {
useSubItems = true;
obj = subobj;
}
else
anIter->Next();
}
obj->FindAttribute(anAttr, "AttributePersistentRef");
while(useSubItems?anIter->More():!anAttr->_is_nil()) {
if(!obj->FindAttribute(anAttr, "AttributeIOR") &&
obj->FindAttribute(anAttr, "AttributePersistentRef")) {
_PTR(SComponent) FComp ( obj->GetFatherComponent() );
if (FComp) {
if (FComp->FindAttribute(anAttr, "AttributeName")) {
_PTR(AttributeName) aName ( anAttr );
QString compName = QAD_Application::getDesktop()->getComponentName(aName->Value().c_str());
// parent->loadComponentData(parent->getComponentName(aName->Value()));
Engines::Component_var comp ;
if ( compName.compare("SUPERV") == 0 ) {
comp = QAD_Application::getDesktop()->getEngine( "SuperVisionContainer", compName) ;
}
else {
comp = QAD_Application::getDesktop()->getEngine( "FactoryServer", compName);
if ( comp->_is_nil() )
comp = QAD_Application::getDesktop()->getEngine( "FactoryServerPy", compName);
}
if (!CORBA::is_nil(comp)) {
SALOMEDS::Driver_var driver = SALOMEDS::Driver::_narrow(comp);
if (!CORBA::is_nil(driver)) {
SALOMEDS::StudyBuilder_var B = dynamic_cast<SALOMEDS_Study*>(aStudy.get())->GetStudy()->NewBuilder();
if (!CORBA::is_nil(B)) {
B->LoadWith(FComp,driver);
} else {
return;
}
}
else {
MESSAGE("loadComponentData(): Driver is null");
return;
}
}
else {
MESSAGE("loadComponentData(): Engine is null");
return;
}
// // load
// Engines::Component_var comp = QAD_Application::getDesktop()->getEngine("FactoryServer","GEOM");
// if (!CORBA::is_nil(comp)) {
// SALOMEDS::Driver_var driver = SALOMEDS::Driver::_narrow(comp);
// SALOMEDS::StudyBuilder_var aStudyBuilder = aStudy->NewBuilder();
// SALOMEDS::SComponent_var SC = aStudy->FindComponent("GEOM");
// if (!CORBA::is_nil(SC))
// aStudyBuilder->LoadWith(SC,driver);
}
}
else {
MESSAGE("Component is null");
}
}
if(useSubItems) {
anIter->Next();
obj.reset( anIter->Value() );
}
else
anAttr = NULL;
}
}
}
*/
}
void GEOMToolsGUI::OnSelectOnly(int mode) void GEOMToolsGUI::OnSelectOnly(int mode)
{ {
SalomeApp_Application* app = dynamic_cast< SalomeApp_Application* >( SUIT_Session::session()->activeApplication() ); SalomeApp_Application* app = dynamic_cast< SalomeApp_Application* >( SUIT_Session::session()->activeApplication() );

9
src/GenerationGUI/GenerationGUI.cxx
View File

@ -26,6 +26,7 @@
#include "GenerationGUI.h" #include "GenerationGUI.h"
#include <GeometryGUI.h> #include <GeometryGUI.h>
#include "GeometryGUI_Operations.h"
#include <SUIT_Desktop.h> #include <SUIT_Desktop.h>
#include <SalomeApp_Application.h> #include <SalomeApp_Application.h>
@ -67,10 +68,10 @@ bool GenerationGUI::OnGUIEvent( int theCommandID, SUIT_Desktop* parent )
QDialog* aDlg = NULL; QDialog* aDlg = NULL;
switch ( theCommandID ) { switch ( theCommandID ) {
case 4031: aDlg = new GenerationGUI_PrismDlg ( getGeometryGUI(), parent ); break; case GEOMOp::OpPrism: aDlg = new GenerationGUI_PrismDlg ( getGeometryGUI(), parent ); break;
case 4032: aDlg = new GenerationGUI_RevolDlg ( getGeometryGUI(), parent ); break; case GEOMOp::OpRevolution: aDlg = new GenerationGUI_RevolDlg ( getGeometryGUI(), parent ); break;
case 4033: aDlg = new GenerationGUI_FillingDlg ( getGeometryGUI(), parent ); break; case GEOMOp::OpFilling: aDlg = new GenerationGUI_FillingDlg ( getGeometryGUI(), parent ); break;
case 4034: aDlg = new GenerationGUI_PipeDlg ( getGeometryGUI(), parent ); break; case GEOMOp::OpPipe: aDlg = new GenerationGUI_PipeDlg ( getGeometryGUI(), parent ); break;
default: app->putInfo( tr( "GEOM_PRP_COMMAND" ).arg( theCommandID ) ); break; default: app->putInfo( tr( "GEOM_PRP_COMMAND" ).arg( theCommandID ) ); break;
} }

8
src/GroupGUI/GroupGUI.cxx
View File

@ -27,6 +27,8 @@
#include "GroupGUI_GroupDlg.h" #include "GroupGUI_GroupDlg.h"
#include <GeometryGUI.h> #include <GeometryGUI.h>
#include "GeometryGUI_Operations.h"
#include <GEOMBase.h> #include <GEOMBase.h>
#include <GEOMImpl_Types.hxx> #include <GEOMImpl_Types.hxx>
@ -80,11 +82,11 @@ bool GroupGUI::OnGUIEvent( int theCommandID, SUIT_Desktop* parent )
} }
switch ( theCommandID ) { switch ( theCommandID ) {
case 800: case GEOMOp::OpGroupCreate:
case 8001: // CREATE GROUP case GEOMOp::OpGroupCreatePopup: // CREATE GROUP
aDlg = new GroupGUI_GroupDlg( GroupGUI_GroupDlg::CreateGroup, getGeometryGUI(), parent ); aDlg = new GroupGUI_GroupDlg( GroupGUI_GroupDlg::CreateGroup, getGeometryGUI(), parent );
break; break;
case 801: // EDIT GROUP case GEOMOp::OpGroupEdit: // EDIT GROUP
{ {
SALOME_ListIO aList; SALOME_ListIO aList;
aList.Clear(); aList.Clear();

27
src/MeasureGUI/MeasureGUI.cxx
View File

@ -26,6 +26,7 @@
#include "MeasureGUI.h" #include "MeasureGUI.h"
#include <GeometryGUI.h> #include <GeometryGUI.h>
#include "GeometryGUI_Operations.h"
#include <SUIT_Desktop.h> #include <SUIT_Desktop.h>
#include <SalomeApp_Application.h> #include <SalomeApp_Application.h>
@ -74,40 +75,40 @@ bool MeasureGUI::OnGUIEvent( int theCommandID, SUIT_Desktop* parent )
QDialog* dlg = 0; QDialog* dlg = 0;
switch ( theCommandID ) { switch ( theCommandID ) {
case 701: case GEOMOp::OpProperties:
dlg = new MeasureGUI_PropertiesDlg( getGeometryGUI(), parent ); dlg = new MeasureGUI_PropertiesDlg( getGeometryGUI(), parent );
break; // LENGTH, AREA AND VOLUME break; // LENGTH, AREA AND VOLUME
case 702: case GEOMOp::OpCenterMass:
dlg = new MeasureGUI_CenterMassDlg( getGeometryGUI(), parent ); dlg = new MeasureGUI_CenterMassDlg( getGeometryGUI(), parent );
break; // CENTER MASS break; // CENTER MASS7
case 703: case GEOMOp::OpInertia:
dlg = new MeasureGUI_InertiaDlg( getGeometryGUI(), parent ); dlg = new MeasureGUI_InertiaDlg( getGeometryGUI(), parent );
break; // INERTIA break; // INERTIA
case 704 : case GEOMOp::OpNormale :
dlg = new MeasureGUI_NormaleDlg( getGeometryGUI(), parent ); dlg = new MeasureGUI_NormaleDlg( getGeometryGUI(), parent );
break; // NORMALE break; // NORMALE
case 7041: case GEOMOp::OpBoundingBox:
dlg = new MeasureGUI_BndBoxDlg( getGeometryGUI(), parent ); dlg = new MeasureGUI_BndBoxDlg( getGeometryGUI(), parent );
break; // BOUNDING BOX break; // BOUNDING BOX
case 7042: case GEOMOp::OpMinDistance:
dlg = new MeasureGUI_DistanceDlg( getGeometryGUI(), parent ); dlg = new MeasureGUI_DistanceDlg( getGeometryGUI(), parent );
break; // MIN DISTANCE break; // MIN DISTANCE
case 7043: case GEOMOp::OpAngle:
dlg = new MeasureGUI_AngleDlg( getGeometryGUI(), parent ); dlg = new MeasureGUI_AngleDlg( getGeometryGUI(), parent );
break; // ANGLE break; // ANGLE
case 705: case GEOMOp::OpTolerance:
dlg = new MeasureGUI_MaxToleranceDlg( getGeometryGUI(), parent ); dlg = new MeasureGUI_MaxToleranceDlg( getGeometryGUI(), parent );
break; // MAXTOLERANCE break; // MAXTOLERANCE
case 706: case GEOMOp::OpWhatIs:
dlg = new MeasureGUI_WhatisDlg( getGeometryGUI(), parent ); dlg = new MeasureGUI_WhatisDlg( getGeometryGUI(), parent );
break; // WHATIS break; // WHATIS
case 707: case GEOMOp::OpCheckShape:
dlg = new MeasureGUI_CheckShapeDlg( getGeometryGUI(), parent ); dlg = new MeasureGUI_CheckShapeDlg( getGeometryGUI(), parent );
break; // CHECKSHAPE break; // CHECKSHAPE
case 7072: case GEOMOp::OpCheckCompound:
dlg = new MeasureGUI_CheckCompoundOfBlocksDlg( getGeometryGUI(), parent ); dlg = new MeasureGUI_CheckCompoundOfBlocksDlg( getGeometryGUI(), parent );
break; // CHECKCOMPOUND break; // CHECKCOMPOUND
case 708: case GEOMOp::OpPointCoordinates:
dlg = new MeasureGUI_PointDlg( getGeometryGUI(), parent ); dlg = new MeasureGUI_PointDlg( getGeometryGUI(), parent );
break; // POINT COORDINATES break; // POINT COORDINATES
default: default:

17
src/OperationGUI/OperationGUI.cxx
View File

@ -26,6 +26,7 @@
#include "OperationGUI.h" #include "OperationGUI.h"
#include <GeometryGUI.h> #include <GeometryGUI.h>
#include "GeometryGUI_Operations.h"
#include <SUIT_Session.h> #include <SUIT_Session.h>
#include <SUIT_Desktop.h> #include <SUIT_Desktop.h>
@ -73,14 +74,14 @@ bool OperationGUI::OnGUIEvent( int theCommandID, SUIT_Desktop* parent )
getGeometryGUI()->EmitSignalDeactivateDialog(); getGeometryGUI()->EmitSignalDeactivateDialog();
switch ( theCommandID ) { switch ( theCommandID ) {
case 503: ( new OperationGUI_PartitionDlg ( getGeometryGUI(), parent ) )->show(); break; case GEOMOp::OpPartition: ( new OperationGUI_PartitionDlg ( getGeometryGUI(), parent ) )->show(); break;
case 504: ( new OperationGUI_ArchimedeDlg ( getGeometryGUI(), parent ) )->show(); break; case GEOMOp::OpArchimede: ( new OperationGUI_ArchimedeDlg ( getGeometryGUI(), parent ) )->show(); break;
case 505: ( new OperationGUI_FilletDlg ( getGeometryGUI(), parent ) )->show(); break; case GEOMOp::OpFillet3d: ( new OperationGUI_FilletDlg ( getGeometryGUI(), parent ) )->show(); break;
case 506: ( new OperationGUI_ChamferDlg ( getGeometryGUI(), parent ) )->show(); break; case GEOMOp::OpChamfer: ( new OperationGUI_ChamferDlg ( getGeometryGUI(), parent ) )->show(); break;
case 507: ( new OperationGUI_ClippingDlg ( getGeometryGUI(), parent ) )->show(); break; case GEOMOp::OpClipping: ( new OperationGUI_ClippingDlg ( getGeometryGUI(), parent ) )->show(); break;
case 508: ( new OperationGUI_GetShapesOnShapeDlg( getGeometryGUI(), parent ) )->show(); break; case GEOMOp::OpShapesOnShape: ( new OperationGUI_GetShapesOnShapeDlg( getGeometryGUI(), parent ) )->show(); break;
case 510: ( new OperationGUI_Fillet1d2dDlg ( getGeometryGUI(), parent,true ) )->show(); break; case GEOMOp::OpFillet1d: ( new OperationGUI_Fillet1d2dDlg ( getGeometryGUI(), parent, true ) )->show(); break;
case 509: ( new OperationGUI_Fillet1d2dDlg ( getGeometryGUI(), parent,false ) )->show(); break; case GEOMOp::OpFillet2d: ( new OperationGUI_Fillet1d2dDlg ( getGeometryGUI(), parent, false ) )->show(); break;
default: default:
app->putInfo( tr( "GEOM_PRP_COMMAND" ).arg( theCommandID ) ); app->putInfo( tr( "GEOM_PRP_COMMAND" ).arg( theCommandID ) );
} }

15
src/PrimitiveGUI/PrimitiveGUI.cxx
View File

@ -26,6 +26,7 @@
#include "PrimitiveGUI.h" #include "PrimitiveGUI.h"
#include <GeometryGUI.h> #include <GeometryGUI.h>
#include "GeometryGUI_Operations.h"
#include <SUIT_Desktop.h> #include <SUIT_Desktop.h>
#include <SalomeApp_Application.h> #include <SalomeApp_Application.h>
@ -68,25 +69,25 @@ bool PrimitiveGUI::OnGUIEvent( int theCommandID, SUIT_Desktop* parent )
QDialog* aDlg = NULL; QDialog* aDlg = NULL;
switch ( theCommandID ) { switch ( theCommandID ) {
case 4021: // BOX case GEOMOp::OpBox: // BOX
aDlg = new PrimitiveGUI_BoxDlg( getGeometryGUI(), parent ); aDlg = new PrimitiveGUI_BoxDlg( getGeometryGUI(), parent );
break; break;
case 4022: // CYLINDER case GEOMOp::OpCylinder: // CYLINDER
aDlg = new PrimitiveGUI_CylinderDlg( getGeometryGUI(), parent ); aDlg = new PrimitiveGUI_CylinderDlg( getGeometryGUI(), parent );
break; break;
case 4023: // SPHERE case GEOMOp::OpSphere: // SPHERE
aDlg = new PrimitiveGUI_SphereDlg( getGeometryGUI(), parent ); aDlg = new PrimitiveGUI_SphereDlg( getGeometryGUI(), parent );
break; break;
case 4024: // TORUS case GEOMOp::OpTorus: // TORUS
aDlg = new PrimitiveGUI_TorusDlg( getGeometryGUI(), parent ); aDlg = new PrimitiveGUI_TorusDlg( getGeometryGUI(), parent );
break; break;
case 4025: // CONE case GEOMOp::OpCone: // CONE
aDlg = new PrimitiveGUI_ConeDlg( getGeometryGUI(), parent); aDlg = new PrimitiveGUI_ConeDlg( getGeometryGUI(), parent);
break; break;
case 4026: // FACE case GEOMOp::OpRectangle: // FACE
aDlg = new PrimitiveGUI_FaceDlg( getGeometryGUI(), parent); aDlg = new PrimitiveGUI_FaceDlg( getGeometryGUI(), parent);
break; break;
case 4027: // DISK case GEOMOp::OpDisk: // DISK
aDlg = new PrimitiveGUI_DiskDlg( getGeometryGUI(), parent); aDlg = new PrimitiveGUI_DiskDlg( getGeometryGUI(), parent);
break; break;
default: default:

2
src/PrimitiveGUI/PrimitiveGUI_FaceDlg.cxx
View File

@ -57,7 +57,7 @@ PrimitiveGUI_FaceDlg::PrimitiveGUI_FaceDlg( GeometryGUI* theGeometryGUI, QWidget
QPixmap image1 (SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM", tr("ICON_SELECT"))); QPixmap image1 (SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM", tr("ICON_SELECT")));
QPixmap image2 (SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM", tr("ICON_DLG_FACE_HW"))); QPixmap image2 (SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM", tr("ICON_DLG_FACE_HW")));
setWindowTitle( tr( "GEOM_FACE_TITLE" ) ); setWindowTitle( tr( "GEOM_RECTANGLE_TITLE" ) );
/***************************************************************/ /***************************************************************/
mainFrame()->GroupConstructors->setTitle( tr( "GEOM_FACE" ) ); mainFrame()->GroupConstructors->setTitle( tr( "GEOM_FACE" ) );

25
src/RepairGUI/RepairGUI.cxx
View File

@ -26,6 +26,7 @@
#include "RepairGUI.h" #include "RepairGUI.h"
#include <GeometryGUI.h> #include <GeometryGUI.h>
#include "GeometryGUI_Operations.h"
#include <SUIT_Desktop.h> #include <SUIT_Desktop.h>
#include <SUIT_Session.h> #include <SUIT_Session.h>
@ -75,18 +76,18 @@ bool RepairGUI::OnGUIEvent( int theCommandID, SUIT_Desktop* parent )
QDialog* aDlg = NULL; QDialog* aDlg = NULL;
switch ( theCommandID ) { switch ( theCommandID ) {
case 601: aDlg = new RepairGUI_SewingDlg ( getGeometryGUI(), parent ); break; case GEOMOp::OpSewing: aDlg = new RepairGUI_SewingDlg ( getGeometryGUI(), parent ); break;
case 602: aDlg = new RepairGUI_GlueDlg ( getGeometryGUI(), parent ); break; case GEOMOp::OpGlueFaces: aDlg = new RepairGUI_GlueDlg ( getGeometryGUI(), parent ); break;
case 603: aDlg = new RepairGUI_SuppressFacesDlg ( getGeometryGUI(), parent ); break; case GEOMOp::OpSuppressFaces: aDlg = new RepairGUI_SuppressFacesDlg ( getGeometryGUI(), parent ); break;
case 604: aDlg = new RepairGUI_RemoveHolesDlg ( getGeometryGUI(), parent ); break; case GEOMOp::OpSuppressHoles: aDlg = new RepairGUI_RemoveHolesDlg ( getGeometryGUI(), parent ); break;
case 605: aDlg = new RepairGUI_ShapeProcessDlg ( getGeometryGUI(), parent ); break; case GEOMOp::OpShapeProcess: aDlg = new RepairGUI_ShapeProcessDlg ( getGeometryGUI(), parent ); break;
case 606: aDlg = new RepairGUI_CloseContourDlg ( getGeometryGUI(), parent ); break; case GEOMOp::OpCloseContour: aDlg = new RepairGUI_CloseContourDlg ( getGeometryGUI(), parent ); break;
case 607: aDlg = new RepairGUI_RemoveIntWiresDlg ( getGeometryGUI(), parent ); break; case GEOMOp::OpRemoveIntWires: aDlg = new RepairGUI_RemoveIntWiresDlg ( getGeometryGUI(), parent ); break;
case 608: aDlg = new RepairGUI_DivideEdgeDlg ( getGeometryGUI(), parent ); break; case GEOMOp::OpAddPointOnEdge: aDlg = new RepairGUI_DivideEdgeDlg ( getGeometryGUI(), parent ); break;
case 609: aDlg = new RepairGUI_FreeBoundDlg ( getGeometryGUI(), parent ); break; case GEOMOp::OpFreeBoundaries: aDlg = new RepairGUI_FreeBoundDlg ( getGeometryGUI(), parent ); break;
case 610: aDlg = new RepairGUI_FreeFacesDlg ( getGeometryGUI(), parent ); break; case GEOMOp::OpFreeFaces: aDlg = new RepairGUI_FreeFacesDlg ( getGeometryGUI(), parent ); break;
case 611: aDlg = new RepairGUI_ChangeOrientationDlg ( getGeometryGUI(), parent ); break; case GEOMOp::OpOrientation: aDlg = new RepairGUI_ChangeOrientationDlg ( getGeometryGUI(), parent ); break;
case 612: aDlg = new RepairGUI_RemoveExtraEdgesDlg ( getGeometryGUI(), parent ); break; case GEOMOp::OpRemoveExtraEdges: aDlg = new RepairGUI_RemoveExtraEdgesDlg ( getGeometryGUI(), parent ); break;
default: default:
app->putInfo( tr( "GEOM_PRP_COMMAND" ).arg( theCommandID ) ); app->putInfo( tr( "GEOM_PRP_COMMAND" ).arg( theCommandID ) );
break; break;

19
src/TransformationGUI/TransformationGUI.cxx
View File

@ -27,6 +27,7 @@
#include <GEOMBase.h> #include <GEOMBase.h>
#include <GeometryGUI.h> #include <GeometryGUI.h>
#include "GeometryGUI_Operations.h"
#include <SUIT_Desktop.h> #include <SUIT_Desktop.h>
#include <SUIT_ViewModel.h> #include <SUIT_ViewModel.h>
@ -77,31 +78,31 @@ bool TransformationGUI::OnGUIEvent( int theCommandID, SUIT_Desktop* parent )
QDialog* aDlg = NULL; QDialog* aDlg = NULL;
switch ( theCommandID ) { switch ( theCommandID ) {
case 5021: // TRANSLATION case GEOMOp::OpTranslate: // TRANSLATION
aDlg = new TransformationGUI_TranslationDlg( getGeometryGUI(), parent ); aDlg = new TransformationGUI_TranslationDlg( getGeometryGUI(), parent );
break; break;
case 5022: // ROTATION case GEOMOp::OpRotate: // ROTATION
aDlg = new TransformationGUI_RotationDlg( getGeometryGUI(), parent ); aDlg = new TransformationGUI_RotationDlg( getGeometryGUI(), parent );
break; break;
case 5023: // POSITION case GEOMOp::OpChangeLoc: // POSITION
aDlg = new TransformationGUI_PositionDlg( getGeometryGUI(), parent ); aDlg = new TransformationGUI_PositionDlg( getGeometryGUI(), parent );
break; break;
case 5024: // MIRROR case GEOMOp::OpMirror: // MIRROR
aDlg = new TransformationGUI_MirrorDlg( getGeometryGUI(), parent ); aDlg = new TransformationGUI_MirrorDlg( getGeometryGUI(), parent );
break; break;
case 5025: // SCALE case GEOMOp::OpScale: // SCALE
aDlg = new TransformationGUI_ScaleDlg( getGeometryGUI(), parent ); aDlg = new TransformationGUI_ScaleDlg( getGeometryGUI(), parent );
break; break;
case 5026: // OFFSET case GEOMOp::OpOffset: // OFFSET
aDlg = new TransformationGUI_OffsetDlg( getGeometryGUI(), parent ); aDlg = new TransformationGUI_OffsetDlg( getGeometryGUI(), parent );
break; break;
case 5027: // MULTI TRANSLATION case GEOMOp::OpMultiTranslate: // MULTI TRANSLATION
aDlg = new TransformationGUI_MultiTranslationDlg( getGeometryGUI(), parent ); aDlg = new TransformationGUI_MultiTranslationDlg( getGeometryGUI(), parent );
break; break;
case 5028: // MULTI ROTATION case GEOMOp::OpMultiRotate: // MULTI ROTATION
aDlg = new TransformationGUI_MultiRotationDlg( getGeometryGUI(), parent ); aDlg = new TransformationGUI_MultiRotationDlg( getGeometryGUI(), parent );
break; break;
case 5029: // RELOAD IMPORTED SHAPE case GEOMOp::OpReimport: // RELOAD IMPORTED SHAPE
{ {
SalomeApp_Study* anAppStudy = dynamic_cast<SalomeApp_Study*>(app->activeStudy()); SalomeApp_Study* anAppStudy = dynamic_cast<SalomeApp_Study*>(app->activeStudy());