// SMESH SMESHGUI : GUI for SMESH component
//
// Copyright (C) 2003 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
-//
+// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
-// License as published by the Free Software Foundation; either
-// version 2.1 of the License.
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+// Lesser General Public License for more details.
//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-// Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public
-// License along with this library; if not, write to the Free Software
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-//
+//
// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org
//
// File : SMESHGUI.cxx
#include "SMESHGUI.h"
-#include "SMESHGUI_InitMeshDlg.h"
-#include "SMESHGUI_AddSubMeshDlg.h"
#include "SMESHGUI_NodesDlg.h"
#include "SMESHGUI_TransparencyDlg.h"
#include "SMESHGUI_ClippingDlg.h"
#include "SMESHGUI_Selection.h"
#include "SMESHGUI_CreatePolyhedralVolumeDlg.h"
#include "SMESHGUI_MeshOp.h"
+#include "SMESHGUI_Displayer.h"
#include "SMESHGUI_Utils.h"
#include "SMESHGUI_GEOMGenUtils.h"
#include "SalomeApp_Tools.h"
#include "SalomeApp_Study.h"
-#include "SalomeApp_NameDlg.h"
-#include "SalomeApp_DataOwner.h"
+#include "LightApp_NameDlg.h"
+#include "LightApp_DataOwner.h"
#include "SalomeApp_Application.h"
-#include "SalomeApp_Preferences.h"
-#include "SalomeApp_VTKSelector.h"
-#include "SalomeApp_Operation.h"
-#include "SalomeApp_UpdateFlags.h"
+#include "LightApp_Preferences.h"
+#include "LightApp_VTKSelector.h"
+#include "LightApp_Operation.h"
+#include "LightApp_UpdateFlags.h"
#include "SalomeApp_ImportOperation.h"
#include <SVTK_ViewModel.h>
#include <SVTK_InteractorStyle.h>
#include <SVTK_RenderWindowInteractor.h>
-
-#include <VTKViewer_ViewManager.h>
+#include <SVTK_ViewManager.h>
#include "OB_Browser.h"
{
QStringList filter;
string myExtension;
-
+
if(theCommandID == 113){
filter.append(QObject::tr("MED files (*.med)"));
filter.append(QObject::tr("All files (*)"));
void ExportMeshToFile( int theCommandID )
{
- SalomeApp_SelectionMgr *aSel = SMESHGUI::selectionMgr();
+ LightApp_SelectionMgr *aSel = SMESHGUI::selectionMgr();
SALOME_ListIO selected;
if( aSel )
aSel->selectedObjects( selected );
QStringList filters;
for ( QMap<QString, SMESH::MED_VERSION>::const_iterator it = aFilterMap.begin(); it != aFilterMap.end(); ++it )
filters.push_back( it.key() );
-
+
SUIT_FileDlg* fd = new SUIT_FileDlg( SMESHGUI::desktop(), false, true, true );
fd->setCaption( aTitle );
fd->setFilters( filters );
+ fd->setSelectedFilter( QObject::tr("MED 2.2 (*.med)") );
bool is_ok = false;
while(!is_ok){
fd->exec();
aFormat = aFilterMap[fd->selectedFilter()];
is_ok = true;
if( !aFilename.isEmpty()
- && (aMesh->NbPolygons()>0 or aMesh->NbPolyhedrons()>0)
+ && (aMesh->NbPolygons()>0 or aMesh->NbPolyhedrons()>0)
&& aFormat==SMESH::MED_V2_1){
int aRet = SUIT_MessageBox::warn2(SMESHGUI::desktop(),
QObject::tr("SMESH_WRN_WARNING"),
}
void SetDisplayEntity(int theCommandID){
- SalomeApp_SelectionMgr *aSel = SMESHGUI::selectionMgr();
+ LightApp_SelectionMgr *aSel = SMESHGUI::selectionMgr();
SALOME_ListIO selected;
if( aSel )
aSel->selectedObjects( selected );
}
void SetDisplayMode(int theCommandID){
- SalomeApp_SelectionMgr *aSel = SMESHGUI::selectionMgr();
+ LightApp_SelectionMgr *aSel = SMESHGUI::selectionMgr();
SALOME_ListIO selected;
if( aSel )
aSel->selectedObjects( selected );
SMESH::RepaintCurrentView();
}
}
-
+
void Control( int theCommandID )
{
- SalomeApp_SelectionMgr *aSel = SMESHGUI::selectionMgr();
+ LightApp_SelectionMgr *aSel = SMESHGUI::selectionMgr();
SALOME_ListIO selected;
if( aSel )
aSel->selectedObjects( selected );
aTitle = QObject::tr( "SKEW_ELEMENTS" );
aControl = SMESH_Actor::eSkew;
break;
+ case 6009:
+ aTitle = QObject::tr( "SMESH_VOLUME" );
+ aControl = SMESH_Actor::eVolume3D;
+ break;
}
anActor->SetControlMode(aControl);
anActor->GetScalarBarActor()->SetTitle(aTitle.latin1());
+ SMESH::RepaintCurrentView();
}
}
}
if( !theIO.IsNull() )
{
entry = theIO->getEntry();
- SalomeApp_DataOwner owner( entry );
+ LightApp_DataOwner owner( entry );
if ( aTypeFilter.isOk( &owner )) {
theOutTypeName = theInTypeName;
return true;
QString CheckHomogeneousSelection()
{
//SUIT_Study* aStudy = SMESH::GetActiveStudy();
- SalomeApp_SelectionMgr *aSel = SMESHGUI::selectionMgr();
+ LightApp_SelectionMgr *aSel = SMESHGUI::selectionMgr();
SALOME_ListIO selected;
if( aSel )
aSel->selectedObjects( selected );
void SMESHGUI::OnEditDelete()
{
// VSR 17/11/04: check if all objects selected belong to SMESH component --> start
- SalomeApp_SelectionMgr* aSel = SMESHGUI::selectionMgr();
- SALOME_ListIO selected; aSel->selectedObjects( selected );
+ LightApp_SelectionMgr* aSel = SMESHGUI::selectionMgr();
+ SALOME_ListIO selected; aSel->selectedObjects( selected, QString::null, false );
QString aParentComponent = QString::null;
for( SALOME_ListIteratorOfListIO anIt( selected ); anIt.More(); anIt.Next() )
myComponentSMESH = SMESH::SMESH_Gen::_narrow( comp );
}
- myActiveDialogBox = 0 ;
- myState = -1 ;
+ myActiveDialogBox = 0;
+ myState = -1;
+ myDisplayer = 0;
SMESH::GetFilterManager();
SMESH::GetPattern();
-
+
/* load resources for all available meshers */
SMESH::InitAvailableHypotheses();
}
SMESHGUI::~SMESHGUI()
{
SMESH::GetFilterManager()->Destroy();
+ SMESH::GetFilterManager() = SMESH::FilterManager::_nil();
}
//=============================================================================
*
*/
//=============================================================================
-SalomeApp_SelectionMgr* SMESHGUI::selectionMgr()
+LightApp_SelectionMgr* SMESHGUI::selectionMgr()
{
SalomeApp_Application* anApp = dynamic_cast<SalomeApp_Application*>( SUIT_Session::session()->activeApplication() );
if( anApp )
- return dynamic_cast<SalomeApp_SelectionMgr*>( anApp->selectionMgr() );
+ return dynamic_cast<LightApp_SelectionMgr*>( anApp->selectionMgr() );
else
return 0;
}
if( !mgr )
return false;
+ if (CORBA::is_nil(GetSMESHGen()->GetCurrentStudy())) {
+ GetSMESHGen()->SetCurrentStudy(_CAST(Study,aStudy)->GetStudy());
+ }
+
SUIT_ViewWindow* view = application()->desktop()->activeWindow();
SVTK_ViewWindow* vtkwnd = dynamic_cast<SVTK_ViewWindow*>( view );
case 200: // SCALAR BAR
{
- SalomeApp_SelectionMgr *aSel = SMESHGUI::selectionMgr();
+ LightApp_SelectionMgr *aSel = SMESHGUI::selectionMgr();
SALOME_ListIO selected;
if( aSel )
aSel->selectedObjects( selected );
SMESH::UpdateView();
SALOME_ListIO l;
- SalomeApp_SelectionMgr *aSel = SMESHGUI::selectionMgr();
+ LightApp_SelectionMgr *aSel = SMESHGUI::selectionMgr();
aSel->setSelectedObjects( l );
break;
}
case 302: anAction = SMESH::eDisplayOnly; break;
}
- SalomeApp_SelectionMgr *aSel = SMESHGUI::selectionMgr();
- SALOME_ListIO selected;
+ LightApp_SelectionMgr *aSel = SMESHGUI::selectionMgr();
+ SALOME_ListIO sel_objects, to_process;
if (aSel)
- aSel->selectedObjects( selected );
+ aSel->selectedObjects( sel_objects );
+
+ SALOME_ListIteratorOfListIO anIt( sel_objects );
+ for( ; anIt.More(); anIt.Next() )
+ {
+ Handle( SALOME_InteractiveObject ) obj = anIt.Value();
+ if( obj->hasEntry() )
+ {
+ _PTR(SObject) SO = activeStudy()->studyDS()->FindObjectID( obj->getEntry() );
+ if( SO && QString( SO->GetID().c_str() ) == SO->GetFatherComponent()->GetID().c_str() )
+ { //component is selected
+ _PTR(SComponent) SC( SO->GetFatherComponent() );
+ _PTR(ChildIterator) anIter ( activeStudy()->studyDS()->NewChildIterator( SC ) );
+ anIter->InitEx( true );
+ while( anIter->More() )
+ {
+ _PTR(SObject) valSO ( anIter->Value() );
+ _PTR(SObject) refSO;
+ if( !valSO->ReferencedObject( refSO ) )
+ {
+ QString id = valSO->GetID().c_str(),
+ comp = SC->ComponentDataType().c_str(),
+ val = valSO->GetName().c_str();
+
+ Handle( SALOME_InteractiveObject ) new_obj =
+ new SALOME_InteractiveObject( id.latin1(), comp.latin1(), val.latin1() );
+ to_process.Append( new_obj );
+ }
+ anIter->Next();
+ }
+ continue;
+ }
+ }
+ to_process.Append( obj );
+ }
if (vtkwnd) {
- SALOME_ListIteratorOfListIO It (selected);
+ SALOME_ListIteratorOfListIO It( to_process );
for (; It.More(); It.Next()) {
Handle(SALOME_InteractiveObject) IOS = It.Value();
if (IOS->hasEntry()) {
}
}
}
- SALOME_ListIO l1;
- aSel->setSelectedObjects( l1 );
+
+ if (anAction == SMESH::eErase) {
+ SALOME_ListIO l1;
+ aSel->setSelectedObjects( l1 );
+ }
+ else
+ aSel->setSelectedObjects( to_process );
break;
}
}
else {
SUIT_MessageBox::warn1(desktop(),
- tr("SMESH_WRN_WARNING"),
+ tr("SMESH_WRN_WARNING"),
tr("SMESH_WRN_VIEWER_VTK"),
tr("SMESH_BUT_OK"));
}
{
if(checkLock(aStudy)) break;
if ( vtkwnd ) {
- SalomeApp_SelectionMgr *Sel = selectionMgr();
+ LightApp_SelectionMgr *Sel = selectionMgr();
SALOME_ListIO selected; Sel->selectedObjects( selected );
int nbSel = selected.Extent();
SMESH::ModifiedMesh(aMeshSObj,true);
// TO Do : change icon of all submeshes
else
- SUIT_MessageBox::warn1(desktop(),
+ SUIT_MessageBox::warn1(desktop(),
tr("SMESH_WRN_WARNING"),
tr("SMESH_WRN_COMPUTE_FAILED"),
tr("SMESH_BUT_OK"));
if(!refShapeObject->_is_nil()){
bool compute = GetSMESHGen()->IsReadyToCompute(aMesh,refShapeObject);
if(!compute){
- SUIT_MessageBox::warn1(desktop(),
+ SUIT_MessageBox::warn1(desktop(),
tr("SMESH_WRN_WARNING"),
tr("SMESH_WRN_MISSING_PARAMETERS"),
tr("SMESH_BUT_OK"));
}
}else{
SUIT_MessageBox::warn1(desktop(),
- tr("SMESH_WRN_WARNING"),
+ tr("SMESH_WRN_WARNING"),
tr("SMESH_WRN_VIEWER_VTK"),
tr("SMESH_BUT_OK"));
}
EmitSignalDeactivateDialog();
SMESH::SMESH_Mesh_var aMesh = SMESH::SMESH_Mesh::_nil();
- SalomeApp_SelectionMgr *aSel = SMESHGUI::selectionMgr();
+ LightApp_SelectionMgr *aSel = SMESHGUI::selectionMgr();
SALOME_ListIO selected;
if( aSel )
aSel->selectedObjects( selected );
if(checkLock(aStudy)) break;
EmitSignalDeactivateDialog();
- SalomeApp_SelectionMgr *aSel = SMESHGUI::selectionMgr();
+ LightApp_SelectionMgr *aSel = SMESHGUI::selectionMgr();
SALOME_ListIO selected;
if( aSel )
aSel->selectedObjects( selected );
aGroup->Add(aVolumes.inout());
}
updateObjBrowser();
-
+
}catch(const SALOME::SALOME_Exception & S_ex){
SalomeApp_Tools::QtCatchCorbaException(S_ex);
}
if(checkLock(aStudy)) break;
EmitSignalDeactivateDialog();
- SalomeApp_SelectionMgr *aSel = SMESHGUI::selectionMgr();
+ LightApp_SelectionMgr *aSel = SMESHGUI::selectionMgr();
SALOME_ListIO selected;
if( aSel )
aSel->selectedObjects( selected );
case 900: // MESH INFOS
{
EmitSignalDeactivateDialog();
- SalomeApp_SelectionMgr *aSel = SMESHGUI::selectionMgr();
+ LightApp_SelectionMgr *aSel = SMESHGUI::selectionMgr();
SALOME_ListIO selected;
if( aSel )
aSel->selectedObjects( selected );
case 902: // STANDARD MESH INFOS
{
EmitSignalDeactivateDialog();
- SalomeApp_SelectionMgr *aSel = SMESHGUI::selectionMgr();
+ LightApp_SelectionMgr *aSel = SMESHGUI::selectionMgr();
SALOME_ListIO selected;
if( aSel )
aSel->selectedObjects( selected );
else
new SMESHGUI_StandardMeshInfosDlg( this, "", false);
break;
- }
-
+ }
+
case 1100: // EDIT HYPOTHESIS
{
if(checkLock(aStudy)) break;
- SalomeApp_SelectionMgr *aSel = SMESHGUI::selectionMgr();
+ LightApp_SelectionMgr *aSel = SMESHGUI::selectionMgr();
SALOME_ListIO selected;
if( aSel )
aSel->selectedObjects( selected );
if ( checkLock( aStudy ) )
break;
- SalomeApp_SelectionMgr *aSel = SMESHGUI::selectionMgr();
+ LightApp_SelectionMgr *aSel = SMESHGUI::selectionMgr();
SALOME_ListIO selected;
if( aSel )
aSel->selectedObjects( selected );
{
aName = anAttr;
QString newName = QString(aName->Value().c_str());
- newName = SalomeApp_NameDlg::getName( desktop(), newName );
+ newName = LightApp_NameDlg::getName( desktop(), newName );
if ( !newName.isEmpty() )
{
//old source: aStudy->renameIObject( IObject, newName );
SMESH::IObjectToInterface<SMESH::SMESH_GroupBase>(IObject);
if (!aGroup->_is_nil() )
aGroup->SetName( newName.latin1() );
-
+
updateObjBrowser();
}
}
if(checkLock(aStudy)) break;
SUIT_OverrideCursor wc;
- SalomeApp_SelectionMgr *aSel = SMESHGUI::selectionMgr();
+ LightApp_SelectionMgr *aSel = SMESHGUI::selectionMgr();
SALOME_ListIO selected;
if( aSel )
- aSel->selectedObjects( selected );
+ aSel->selectedObjects( selected, QString::null, false );
SALOME_ListIteratorOfListIO It(selected);
for (int i = 0; It.More(); It.Next(), i++) {
}
break;
}
- case 4063: // SYMMETRY
+ case 4063: // SYMMETRY
{
if(checkLock(aStudy)) break;
if(vtkwnd) {
}
break;
}
-
+
case 5105: // Library of selection filters
{
static QValueList<int> aTypes;
case 6002:
case 6003:
case 6004:
+ case 6009:
if ( vtkwnd ) {
- SalomeApp_SelectionMgr* mgr = selectionMgr();
+ LightApp_SelectionMgr* mgr = selectionMgr();
SALOME_ListIO selected; mgr->selectedObjects( selected );
if ( selected.Extent() == 1 && selected.First()->hasEntry() ) {
else {
SUIT_MessageBox::warn1(desktop(),
tr( "SMESH_WRN_WARNING" ),
- tr( "NOT_A_VTK_VIEWER" ),
+ tr( "NOT_A_VTK_VIEWER" ),
tr( "SMESH_BUT_OK" ) );
}
break;
case 9010:
{
- SalomeApp_SelectionMgr* mgr = selectionMgr();
+ LightApp_SelectionMgr* mgr = selectionMgr();
SALOME_ListIO selected; mgr->selectedObjects( selected );
if (selected.Extent() == 1) {
}
case 9011:
{
- SalomeApp_SelectionMgr* mgr = selectionMgr();
+ LightApp_SelectionMgr* mgr = selectionMgr();
SALOME_ListIO selected; mgr->selectedObjects( selected );
if (selected.Extent() == 1) {
createSMESHAction( 6017, "ASPECT_3D", "ICON_ASPECT_3D", 0, true );
createSMESHAction( 6018, "LENGTH_2D", "ICON_LENGTH_2D", 0, true );
createSMESHAction( 6019, "CONNECTION_2D", "ICON_CONNECTION_2D", 0, true );
+ createSMESHAction( 6009, "VOLUME_3D", "ICON_VOLUME_3D", 0, true );
createSMESHAction( 400, "NODE", "ICON_DLG_NODE" );
createSMESHAction( 401, "EDGE", "ICON_DLG_EDGE" );
createSMESHAction( 4021, "TRIANGLE", "ICON_DLG_TRIANGLE" );
createSMESHAction( 1134, "CLIP" );
createSMESHAction( 1135, "DISP_ENT" );
createSMESHAction( 2000, "CTRL" );
-
+
createSMESHAction( 300, "ERASE" );
createSMESHAction( 301, "DISPLAY" );
createSMESHAction( 302, "DISPLAY_ONLY" );
createMenu( 6016, ctrlId, -1 );
createMenu( separator(), ctrlId, -1 );
createMenu( 6017, ctrlId, -1 );
+ createMenu( 6009, ctrlId, -1 );
createMenu( separator(), ctrlId, -1 );
createMenu( 400, addId, -1 );
createTool( 6016, ctrlTb );
createTool( separator(), ctrlTb );
createTool( 6017, ctrlTb );
+ createTool( 6009, ctrlTb );
createTool( separator(), ctrlTb );
createTool( 400, addRemTb );
createPopupItem( 801, OB, mesh ); // CREATE_GROUP
createPopupItem( 802, OB, subMesh ); // CONSTRUCT_GROUP
popupMgr()->insert( separator(), -1, 0 );
- createPopupItem( 1100, OB, hypo, "&& $hasReference={false}" ); // EDIT HYPOTHESIS
+ createPopupItem( 1100, OB, hypo, "" /*"&& $hasReference={false}"*/ ); // EDIT HYPOTHESIS
createPopupItem( 1102, OB, hyp_alg ); // REMOVE HYPOTHESIS / ALGORITHMS
- createPopupItem( 1101, OB, mesh_group + " " + hyp_alg, "&& $hasReference={false}" ); // RENAME
+ createPopupItem( 1101, OB, mesh_group + " " + hyp_alg, "" /*"&& $hasReference={false}"*/ ); // RENAME
popupMgr()->insert( separator(), -1, 0 );
- createPopupItem( 125, OB, mesh ); // EXPORT_MED
- createPopupItem( 126, OB, mesh ); // EXPORT_UNV
+
+ QString only_one_non_empty = QString( " && %1=1 && numberOfNodes>0" ).arg( QtxPopupMgr::Selection::defSelCountParam() );
+ createPopupItem( 125, OB, mesh, only_one_non_empty ); // EXPORT_MED
+ createPopupItem( 126, OB, mesh, only_one_non_empty ); // EXPORT_UNV
createPopupItem( 33, OB, subMesh + " " + group ); // DELETE
popupMgr()->insert( separator(), -1, 0 );
QString lc = QtxPopupMgr::Selection::defEquality();
QString aClient = QString( "%1client in {%2}" ).arg( lc ).arg( "'VTKViewer'" );
- QString aType = QString( "%1type in {%2}" ).arg( QtxPopupMgr::Selection::defEquality() ).arg( mesh_group );
+ QString aType = QString( "%1type in {%2}" ).arg( QtxPopupMgr::Selection::defEquality() );
+ aType = aType.arg( mesh_group );
QString aMeshInVTK = aClient + "&&" + aType;
-
+
//-------------------------------------------------
// Numbering
//-------------------------------------------------
anId = popupMgr()->insert( tr( "MEN_NUM" ), -1, -1 );
-
+
popupMgr()->insert( action( 9010 ), anId, -1 );
popupMgr()->setRule( action( 9010 ), aMeshInVTK + "&& isVisible &&" + hasNodes, true );
popupMgr()->setRule( action( 9010 ), "{'Point'} in labeledTypes", false );
popupMgr()->setRule( action( 6017 ), aMeshInVtkHasVolumes, true );
popupMgr()->setRule( action( 6017 ), "controlMode = 'eAspectRatio3D'", false );
+ popupMgr()->insert ( action( 6009 ), anId, -1 ); // VOLUME_3D
+ popupMgr()->setRule( action( 6009 ), aMeshInVtkHasVolumes, true );
+ popupMgr()->setRule( action( 6009 ), "controlMode = 'eVolume3D'", false );
+
popupMgr()->insert( separator(), anId, -1 );
popupMgr()->insert( action( 201 ), anId, -1 ); // SCALAR_BAR_PROP
// Display / Erase
//-------------------------------------------------
aClient = "($client in {'VTKViewer' 'ObjectBrowser'})";
- QString anActiveVTK = QString("activeView = '%1'").arg(VTKViewer_Viewer::Type());
+ QString anActiveVTK = QString("activeView = '%1'").arg(SVTK_Viewer::Type());
QString aSelCount = QString( "%1 > 0" ).arg( QtxPopupMgr::Selection::defSelCountParam() );
- QString aRule = aClient + " and " + aType + " and " + aSelCount + " and " + anActiveVTK;
+
+ QString aRule = "$component={'SMESH'} and ( type='Component' or (" + aClient + " and " +
+ aType + " and " + aSelCount + " and " + anActiveVTK + " and " + isNotEmpty + " %1 ) )";
popupMgr()->insert( action( 301 ), -1, -1 ); // DISPLAY
- popupMgr()->setRule( action( 301 ), aRule + "&&" + isNotEmpty + "&&" + isInvisible, true);
+ popupMgr()->setRule( action( 301 ), aRule.arg( "and (not isVisible)" ), true);
popupMgr()->insert( action( 300 ), -1, -1 ); // ERASE
- popupMgr()->setRule( action( 300 ), aRule + "&&" + isNotEmpty + "&& isVisible", true );
+ popupMgr()->setRule( action( 300 ), aRule.arg( "and isVisible" ), true );
popupMgr()->insert( action( 302 ), -1, -1 ); // DISPLAY_ONLY
- popupMgr()->setRule( action( 302 ), aRule + "&&" + isNotEmpty, true );
+ popupMgr()->setRule( action( 302 ), aRule.arg( "" ), true );
popupMgr()->insert( separator(), -1, -1 );
- connect( application(), SIGNAL( viewManagerAdded( SUIT_ViewManager* ) ),
- this, SLOT( onViewManagerAdded( SUIT_ViewManager* ) ) );
+ connect( application(), SIGNAL( viewManagerActivated( SUIT_ViewManager* ) ),
+ this, SLOT( onViewManagerActivated( SUIT_ViewManager* ) ) );
}
bool SMESHGUI::activateModule( SUIT_Study* study )
setToolShown( false );
EmitSignalCloseAllDialogs();
-
+
return SalomeApp_Module::deactivateModule( study );
}
{
SMESHGUI aGUI; //SRN BugID: IPAL9186: Create an instance of SMESHGUI to initialize myComponentSMESH
return aGUI.myComponentSMESH;
- }
+ }
return myComponentSMESH;
}
list.append( SVTK_Viewer::Type() );
}
-void SMESHGUI::onViewManagerAdded( SUIT_ViewManager* mgr )
+void SMESHGUI::onViewManagerActivated( SUIT_ViewManager* mgr )
{
- if ( dynamic_cast<VTKViewer_ViewManager*>( mgr ) )
+ if ( dynamic_cast<SVTK_ViewManager*>( mgr ) )
SMESH::UpdateSelectionProp( this );
}
{
int genTab = addPreference( tr( "PREF_TAB_GENERAL" ) );
+ int updateGroup = addPreference( tr( "PREF_GROUP_UPDATE" ), genTab );
+ addPreference( tr( "PREF_AUTO_UPDATE" ), updateGroup, LightApp_Preferences::Bool, "SMESH", "auto_update" );
+
int qaGroup = addPreference( tr( "PREF_GROUP_QUALITY" ), genTab );
- addPreference( tr( "PREF_DISPLAY_ENTITY" ), qaGroup, SalomeApp_Preferences::Bool, "SMESH", "display_entity" );
- addPreference( tr( "PREF_AUTO_UPDATE" ), qaGroup, SalomeApp_Preferences::Bool, "SMESH", "auto_update" );
+ addPreference( tr( "PREF_DISPLAY_ENTITY" ), qaGroup, LightApp_Preferences::Bool, "SMESH", "display_entity" );
+ addPreference( tr( "PREF_PRECISION_USE" ), qaGroup, LightApp_Preferences::Bool, "SMESH", "use_precision" );
int precGroup = addPreference( tr( "PREF_GROUP_PRECISION" ), genTab );
setPreferenceProperty( precGroup, "columns", 1 );
- addPreference( tr( "PREF_PRECISION_USE" ), precGroup, SalomeApp_Preferences::Bool );
- int prec = addPreference( tr( "PREF_PRECISION_VALUE" ), precGroup, SalomeApp_Preferences::IntSpin, "SMESH", "controls_precision" );
+ int prec = addPreference( tr( "PREF_PRECISION_VALUE" ), precGroup, LightApp_Preferences::IntSpin, "SMESH", "controls_precision" );
setPreferenceProperty( prec, "min", 0 );
setPreferenceProperty( prec, "max", 16 );
int dispgroup = addPreference( tr( "PREF_DISPLAY_MODE" ), genTab );
- int dispmode = addPreference( tr( "PREF_DISPLAY_MODE" ), dispgroup, SalomeApp_Preferences::Selector, "SMESH", "display_mode" );
+ int dispmode = addPreference( tr( "PREF_DISPLAY_MODE" ), dispgroup, LightApp_Preferences::Selector, "SMESH", "display_mode" );
QStringList modes;
modes.append( "Wireframe" );
modes.append( "Shading" );
- modes.append( "Shrink" );
modes.append( "Nodes" );
+ modes.append( "Shrink" );
+ QValueList<QVariant> indices;
+ indices.append( 0 );
+ indices.append( 1 );
+ indices.append( 2 );
+ indices.append( 3 );
setPreferenceProperty( dispmode, "strings", modes );
-
+ setPreferenceProperty( dispmode, "indexes", indices );
+
int meshTab = addPreference( tr( "PREF_TAB_MESH" ) );
int nodeGroup = addPreference( tr( "PREF_GROUP_NODES" ), meshTab );
- addPreference( tr( "PREF_COLOR" ), nodeGroup, SalomeApp_Preferences::Color, "SMESH", "node_color" );
- int nodeSz = addPreference( tr( "PREF_SIZE" ), nodeGroup, SalomeApp_Preferences::IntSpin, "SMESH", "node_size" );
+ addPreference( tr( "PREF_COLOR" ), nodeGroup, LightApp_Preferences::Color, "SMESH", "node_color" );
+ int nodeSz = addPreference( tr( "PREF_SIZE" ), nodeGroup, LightApp_Preferences::IntSpin, "SMESH", "node_size" );
setPreferenceProperty( nodeSz, "min", 1 );
setPreferenceProperty( nodeSz, "max", 5 );
int elemGroup = addPreference( tr( "PREF_GROUP_ELEMENTS" ), meshTab );
- addPreference( tr( "PREF_FILL" ), elemGroup, SalomeApp_Preferences::Color, "SMESH", "fill_color" );
- addPreference( tr( "PREF_OUTLINE" ), elemGroup, SalomeApp_Preferences::Color, "SMESH", "outline_color" );
- addPreference( tr( "PREF_BACKFACE" ), elemGroup, SalomeApp_Preferences::Color, "SMESH", "backface_color" );
- addPreference( "", elemGroup, SalomeApp_Preferences::Space );
+ addPreference( tr( "PREF_FILL" ), elemGroup, LightApp_Preferences::Color, "SMESH", "fill_color" );
+ addPreference( tr( "PREF_OUTLINE" ), elemGroup, LightApp_Preferences::Color, "SMESH", "outline_color" );
+ addPreference( tr( "PREF_BACKFACE" ), elemGroup, LightApp_Preferences::Color, "SMESH", "backface_color" );
+ addPreference( "", elemGroup, LightApp_Preferences::Space );
- int elemW = addPreference( tr( "PREF_WIDTH" ), elemGroup, SalomeApp_Preferences::IntSpin, "SMESH", "element_width" );
- int shrink = addPreference( tr( "PREF_SHRINK_COEFF" ), elemGroup, SalomeApp_Preferences::IntSpin, "SMESH", "shrink_coeff" );
+ int elemW = addPreference( tr( "PREF_WIDTH" ), elemGroup, LightApp_Preferences::IntSpin, "SMESH", "element_width" );
+ int shrink = addPreference( tr( "PREF_SHRINK_COEFF" ), elemGroup, LightApp_Preferences::IntSpin, "SMESH", "shrink_coeff" );
setPreferenceProperty( elemW, "min", 1 );
setPreferenceProperty( elemW, "max", 5 );
int selGroup = addPreference( tr( "PREF_GROUP_SELECTION" ), selTab );
- addPreference( tr( "PREF_OBJECT_COLOR" ), selGroup, SalomeApp_Preferences::Color, "SMESH", "selection_object_color" );
- addPreference( tr( "PREF_ELEMENT_COLOR" ), selGroup, SalomeApp_Preferences::Color, "SMESH", "selection_element_color" );
- int selW = addPreference( tr( "PREF_WIDTH" ), selGroup, SalomeApp_Preferences::IntSpin, "SMESH", "selection_width" );
-
+ addPreference( tr( "PREF_OBJECT_COLOR" ), selGroup, LightApp_Preferences::Color, "SMESH", "selection_object_color" );
+ addPreference( tr( "PREF_ELEMENT_COLOR" ), selGroup, LightApp_Preferences::Color, "SMESH", "selection_element_color" );
+ int selW = addPreference( tr( "PREF_WIDTH" ), selGroup, LightApp_Preferences::IntSpin, "SMESH", "selection_width" );
+
setPreferenceProperty( selW, "min", 1 );
setPreferenceProperty( selW, "max", 5 );
-
+
int preGroup = addPreference( tr( "PREF_GROUP_PRESELECTION" ), selTab );
- addPreference( tr( "PREF_HIGHLIGHT_COLOR" ), preGroup, SalomeApp_Preferences::Color, "SMESH", "highlight_color" );
- int preW = addPreference( tr( "PREF_WIDTH" ), preGroup, SalomeApp_Preferences::IntSpin, "SMESH", "highlight_width" );
+ addPreference( tr( "PREF_HIGHLIGHT_COLOR" ), preGroup, LightApp_Preferences::Color, "SMESH", "highlight_color" );
+ int preW = addPreference( tr( "PREF_WIDTH" ), preGroup, LightApp_Preferences::IntSpin, "SMESH", "highlight_width" );
setPreferenceProperty( preW, "min", 1 );
setPreferenceProperty( preW, "max", 5 );
int precSelGroup = addPreference( tr( "PREF_GROUP_PRECISION" ), selTab );
- addPreference( tr( "PREF_NODES" ), precSelGroup, SalomeApp_Preferences::Double, "SMESH", "selection_precision_node" );
- addPreference( tr( "PREF_ELEMENTS" ), precSelGroup, SalomeApp_Preferences::Double, "SMESH", "selection_precision_element" );
+ addPreference( tr( "PREF_NODES" ), precSelGroup, LightApp_Preferences::Double, "SMESH", "selection_precision_node" );
+ addPreference( tr( "PREF_ELEMENTS" ), precSelGroup, LightApp_Preferences::Double, "SMESH", "selection_precision_element" );
int sbarTab = addPreference( tr( "SMESH_SCALARBAR" ) );
int fontGr = addPreference( tr( "SMESH_FONT_SCALARBAR" ), sbarTab );
- int tfont = addPreference( tr( "SMESH_TITLE" ), fontGr, SalomeApp_Preferences::Font, "SMESH", "scalar_bar_title_font" );
- addPreference( tr( "SMESH_TITLE" ), fontGr, SalomeApp_Preferences::Color, "SMESH", "scalar_bar_title_color" );
- int lfont = addPreference( tr( "SMESH_LABELS" ), fontGr, SalomeApp_Preferences::Font, "SMESH", "scalar_bar_label_font" );
- addPreference( tr( "SMESH_LABELS" ), fontGr, SalomeApp_Preferences::Color, "SMESH", "scalar_bar_label_color" );
+ int tfont = addPreference( tr( "SMESH_TITLE" ), fontGr, LightApp_Preferences::Font, "SMESH", "scalar_bar_title_font" );
+ addPreference( tr( "SMESH_TITLE" ), fontGr, LightApp_Preferences::Color, "SMESH", "scalar_bar_title_color" );
+ int lfont = addPreference( tr( "SMESH_LABELS" ), fontGr, LightApp_Preferences::Font, "SMESH", "scalar_bar_label_font" );
+ addPreference( tr( "SMESH_LABELS" ), fontGr, LightApp_Preferences::Color, "SMESH", "scalar_bar_label_color" );
QStringList fam;
fam.append( tr( "SMESH_FONT_ARIAL" ) );
setPreferenceProperty( tfont, "families", fam );
setPreferenceProperty( tfont, "system", false );
- setPreferenceProperty( tfont, "widget_flags", wflag );
+ setPreferenceProperty( tfont, "widget_flags", wflag );
setPreferenceProperty( lfont, "families", fam );
setPreferenceProperty( lfont, "system", false );
setPreferenceProperty( lfont, "widget_flags", wflag );
-
+
int colorsLabelsGr = addPreference( tr( "SMESH_LABELS_COLORS_SCALARBAR" ), sbarTab );
- int numcol = addPreference( tr( "SMESH_NUMBEROFCOLORS" ), colorsLabelsGr, SalomeApp_Preferences::IntSpin, "SMESH", "scalar_bar_num_colors" );
+ int numcol = addPreference( tr( "SMESH_NUMBEROFCOLORS" ), colorsLabelsGr, LightApp_Preferences::IntSpin, "SMESH", "scalar_bar_num_colors" );
setPreferenceProperty( numcol, "min", 2 );
- setPreferenceProperty( numcol, "max", 256 );
-
- int numlab = addPreference( tr( "SMESH_NUMBEROFLABELS" ), colorsLabelsGr, SalomeApp_Preferences::IntSpin, "SMESH", "scalar_bar_num_labels" );
+ setPreferenceProperty( numcol, "max", 256 );
+
+ int numlab = addPreference( tr( "SMESH_NUMBEROFLABELS" ), colorsLabelsGr, LightApp_Preferences::IntSpin, "SMESH", "scalar_bar_num_labels" );
setPreferenceProperty( numlab, "min", 2 );
setPreferenceProperty( numlab, "max", 65 );
int orientGr = addPreference( tr( "SMESH_ORIENTATION" ), sbarTab );
- int orient = addPreference( tr( "SMESH_ORIENTATION" ), orientGr, SalomeApp_Preferences::Selector, "SMESH", "scalar_bar_orientation" );
+ int orient = addPreference( tr( "SMESH_ORIENTATION" ), orientGr, LightApp_Preferences::Selector, "SMESH", "scalar_bar_orientation" );
QStringList orients;
orients.append( tr( "SMESH_VERTICAL" ) );
orients.append( tr( "SMESH_HORIZONTAL" ) );
- QValueList<QVariant> indices; indices.append( 0 ); indices.append( 1 );
+ indices.clear(); indices.append( 0 ); indices.append( 1 );
setPreferenceProperty( orient, "strings", orients );
setPreferenceProperty( orient, "indexes", indices );
-
+
int posVSizeGr = addPreference( tr( "SMESH_POSITION_SIZE_SCALARBAR" ) + " " + tr( "SMESH_VERTICAL" ), sbarTab );
- int xv = addPreference( tr( "SMESH_X_SCALARBAR" ), posVSizeGr, SalomeApp_Preferences::DblSpin, "SMESH", "scalar_bar_vertical_x" );
- int yv = addPreference( tr( "SMESH_Y_SCALARBAR" ), posVSizeGr, SalomeApp_Preferences::DblSpin, "SMESH", "scalar_bar_vertical_y" );
- int wv = addPreference( tr( "SMESH_WIDTH" ), posVSizeGr, SalomeApp_Preferences::DblSpin, "SMESH", "scalar_bar_vertical_width" );
- int hv = addPreference( tr( "SMESH_HEIGHT" ), posVSizeGr, SalomeApp_Preferences::DblSpin, "SMESH", "scalar_bar_vertical_height" );
+ int xv = addPreference( tr( "SMESH_X_SCALARBAR" ), posVSizeGr, LightApp_Preferences::DblSpin, "SMESH", "scalar_bar_vertical_x" );
+ int yv = addPreference( tr( "SMESH_Y_SCALARBAR" ), posVSizeGr, LightApp_Preferences::DblSpin, "SMESH", "scalar_bar_vertical_y" );
+ int wv = addPreference( tr( "SMESH_WIDTH" ), posVSizeGr, LightApp_Preferences::DblSpin, "SMESH", "scalar_bar_vertical_width" );
+ int hv = addPreference( tr( "SMESH_HEIGHT" ), posVSizeGr, LightApp_Preferences::DblSpin, "SMESH", "scalar_bar_vertical_height" );
setPreferenceProperty( xv, "step", 0.1 );
setPreferenceProperty( xv, "min", 0.0 );
setPreferenceProperty( xv, "max", 1.0 );
setPreferenceProperty( wv, "max", 1.0 );
setPreferenceProperty( hv, "min", 0.0 );
setPreferenceProperty( hv, "max", 1.0 );
- setPreferenceProperty( hv, "step", 0.1 );
+ setPreferenceProperty( hv, "step", 0.1 );
int posHSizeGr = addPreference( tr( "SMESH_POSITION_SIZE_SCALARBAR" ) + " " + tr( "SMESH_HORIZONTAL" ), sbarTab );
- int xh = addPreference( tr( "SMESH_X_SCALARBAR" ), posHSizeGr, SalomeApp_Preferences::DblSpin, "SMESH", "scalar_bar_horizontal_x" );
- int yh = addPreference( tr( "SMESH_Y_SCALARBAR" ), posHSizeGr, SalomeApp_Preferences::DblSpin, "SMESH", "scalar_bar_horizontal_y" );
- int wh = addPreference( tr( "SMESH_WIDTH" ), posHSizeGr, SalomeApp_Preferences::DblSpin, "SMESH", "scalar_bar_horizontal_width" );
- int hh = addPreference( tr( "SMESH_HEIGHT" ), posHSizeGr, SalomeApp_Preferences::DblSpin, "SMESH", "scalar_bar_horizontal_height" );
+ int xh = addPreference( tr( "SMESH_X_SCALARBAR" ), posHSizeGr, LightApp_Preferences::DblSpin, "SMESH", "scalar_bar_horizontal_x" );
+ int yh = addPreference( tr( "SMESH_Y_SCALARBAR" ), posHSizeGr, LightApp_Preferences::DblSpin, "SMESH", "scalar_bar_horizontal_y" );
+ int wh = addPreference( tr( "SMESH_WIDTH" ), posHSizeGr, LightApp_Preferences::DblSpin, "SMESH", "scalar_bar_horizontal_width" );
+ int hh = addPreference( tr( "SMESH_HEIGHT" ), posHSizeGr, LightApp_Preferences::DblSpin, "SMESH", "scalar_bar_horizontal_height" );
setPreferenceProperty( xv, "min", 0.0 );
setPreferenceProperty( xv, "max", 1.0 );
setPreferenceProperty( xv, "step", 0.1 );
void SMESHGUI::preferencesChanged( const QString& sect, const QString& name )
{
+ if( sect=="SMESH" )
+ if( name=="selection_object_color" || name=="selection_element_color" ||
+ name=="selection_width" || name=="highlight_color" || name=="highlight_width" ||
+ name=="selection_precision_node" || name=="selection_precision_element" )
+ SMESH::UpdateSelectionProp( this );
}
//================================================================================
* \param theFlags - update flags
*
* Update viewer or/and object browser etc. in accordance with update flags ( see
-* SalomeApp_UpdateFlags enumeration ).
+* LightApp_UpdateFlags enumeration ).
*/
//================================================================================
void SMESHGUI::update( const int flags )
* \param id - identifier of operation to be started
* \return Pointer on created operation or NULL if operation is not created
*
-* Virtual method redefined from the base class creates operation with given id.
-* It is called called automatically from startOperation method of base class.
+* Virtual method redefined from the base class creates operation with given id.
+* It is called called automatically from startOperation method of base class.
*/
//================================================================================
-SalomeApp_Operation* SMESHGUI::createOperation( const int id ) const
+LightApp_Operation* SMESHGUI::createOperation( const int id ) const
{
- SalomeApp_Operation* op = 0;
+ LightApp_Operation* op = 0;
// to do : create operation here
switch( id )
{
default:
break;
}
-
+
+ if( !op )
+ op = SalomeApp_Module::createOperation( id );
return op;
}
-
-
-
-
-
-
-
+LightApp_Displayer* SMESHGUI::displayer()
+{
+ if( !myDisplayer )
+ myDisplayer = new SMESHGUI_Displayer( dynamic_cast<SalomeApp_Study*>( getApp()->activeStudy() ) );
+ return myDisplayer;
+}
