mirror of
https://git.salome-platform.org/gitpub/modules/smesh.git
synced 2025-02-19 21:53:09 +05:00
Merging with V3_1_0a
This commit is contained in:
apo
parent
4384337d18
commit
e356c6f27e
@ -1,22 +1,22 @@
|
||||
// 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.
|
||||
//
|
||||
// You should have received a copy of the GNU Lesser General Public
|
||||
// License along with this library; if not, write to the Free Software
|
||||
// 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
|
||||
// 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
|
||||
@ -26,8 +26,6 @@
|
||||
|
||||
#include "SMESHGUI.h"
|
||||
|
||||
#include "SMESHGUI_InitMeshDlg.h"
|
||||
#include "SMESHGUI_AddSubMeshDlg.h"
|
||||
#include "SMESHGUI_NodesDlg.h"
|
||||
#include "SMESHGUI_TransparencyDlg.h"
|
||||
#include "SMESHGUI_ClippingDlg.h"
|
||||
@ -66,6 +64,7 @@
|
||||
#include "SMESHGUI_Selection.h"
|
||||
#include "SMESHGUI_CreatePolyhedralVolumeDlg.h"
|
||||
#include "SMESHGUI_MeshOp.h"
|
||||
#include "SMESHGUI_Displayer.h"
|
||||
|
||||
#include "SMESHGUI_Utils.h"
|
||||
#include "SMESHGUI_GEOMGenUtils.h"
|
||||
@ -94,8 +93,9 @@
|
||||
|
||||
#include <SVTK_ViewWindow.h>
|
||||
#include <SVTK_ViewModel.h>
|
||||
|
||||
#include <VTKViewer_ViewManager.h>
|
||||
#include <SVTK_InteractorStyle.h>
|
||||
#include <SVTK_RenderWindowInteractor.h>
|
||||
#include <SVTK_ViewManager.h>
|
||||
|
||||
#include "OB_Browser.h"
|
||||
|
||||
@ -167,7 +167,7 @@ namespace{
|
||||
{
|
||||
QStringList filter;
|
||||
string myExtension;
|
||||
|
||||
|
||||
if(theCommandID == 113){
|
||||
filter.append(QObject::tr("MED files (*.med)"));
|
||||
filter.append(QObject::tr("All files (*)"));
|
||||
@ -296,7 +296,7 @@ namespace{
|
||||
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 );
|
||||
@ -307,7 +307,7 @@ namespace{
|
||||
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"),
|
||||
@ -515,7 +515,7 @@ namespace{
|
||||
SMESH::RepaintCurrentView();
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
void Control( int theCommandID )
|
||||
{
|
||||
SalomeApp_SelectionMgr *aSel = SMESHGUI::selectionMgr();
|
||||
@ -804,12 +804,13 @@ SalomeApp_Module( "SMESH" )
|
||||
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();
|
||||
}
|
||||
@ -822,6 +823,7 @@ SalomeApp_Module( "SMESH" )
|
||||
SMESHGUI::~SMESHGUI()
|
||||
{
|
||||
SMESH::GetFilterManager()->Destroy();
|
||||
SMESH::GetFilterManager() = SMESH::FilterManager::_nil();
|
||||
}
|
||||
|
||||
//=============================================================================
|
||||
@ -1056,6 +1058,10 @@ bool SMESHGUI::OnGUIEvent( int theCommandID )
|
||||
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 );
|
||||
|
||||
@ -1153,12 +1159,46 @@ bool SMESHGUI::OnGUIEvent( int theCommandID )
|
||||
}
|
||||
|
||||
SalomeApp_SelectionMgr *aSel = SMESHGUI::selectionMgr();
|
||||
SALOME_ListIO selected;
|
||||
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()) {
|
||||
@ -1168,13 +1208,13 @@ bool SMESHGUI::OnGUIEvent( int theCommandID )
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
if (anAction == SMESH::eErase) {
|
||||
SALOME_ListIO l1;
|
||||
aSel->setSelectedObjects( l1 );
|
||||
}
|
||||
else
|
||||
aSel->setSelectedObjects( selected );
|
||||
aSel->setSelectedObjects( to_process );
|
||||
break;
|
||||
}
|
||||
|
||||
@ -1189,7 +1229,7 @@ bool SMESHGUI::OnGUIEvent( int theCommandID )
|
||||
}
|
||||
else {
|
||||
SUIT_MessageBox::warn1(desktop(),
|
||||
tr("SMESH_WRN_WARNING"),
|
||||
tr("SMESH_WRN_WARNING"),
|
||||
tr("SMESH_WRN_VIEWER_VTK"),
|
||||
tr("SMESH_BUT_OK"));
|
||||
}
|
||||
@ -1261,7 +1301,7 @@ bool SMESHGUI::OnGUIEvent( int theCommandID )
|
||||
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"));
|
||||
@ -1276,7 +1316,7 @@ bool SMESHGUI::OnGUIEvent( int theCommandID )
|
||||
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"));
|
||||
@ -1314,7 +1354,7 @@ bool SMESHGUI::OnGUIEvent( int theCommandID )
|
||||
}
|
||||
}else{
|
||||
SUIT_MessageBox::warn1(desktop(),
|
||||
tr("SMESH_WRN_WARNING"),
|
||||
tr("SMESH_WRN_WARNING"),
|
||||
tr("SMESH_WRN_VIEWER_VTK"),
|
||||
tr("SMESH_BUT_OK"));
|
||||
}
|
||||
@ -1539,7 +1579,7 @@ bool SMESHGUI::OnGUIEvent( int theCommandID )
|
||||
aGroup->Add(aVolumes.inout());
|
||||
}
|
||||
updateObjBrowser();
|
||||
|
||||
|
||||
}catch(const SALOME::SALOME_Exception & S_ex){
|
||||
SalomeApp_Tools::QtCatchCorbaException(S_ex);
|
||||
}
|
||||
@ -1697,8 +1737,8 @@ bool SMESHGUI::OnGUIEvent( int theCommandID )
|
||||
else
|
||||
new SMESHGUI_StandardMeshInfosDlg( this, "", false);
|
||||
break;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
case 1100: // EDIT HYPOTHESIS
|
||||
{
|
||||
if(checkLock(aStudy)) break;
|
||||
@ -1768,7 +1808,7 @@ bool SMESHGUI::OnGUIEvent( int theCommandID )
|
||||
SMESH::IObjectToInterface<SMESH::SMESH_GroupBase>(IObject);
|
||||
if (!aGroup->_is_nil() )
|
||||
aGroup->SetName( newName.latin1() );
|
||||
|
||||
|
||||
updateObjBrowser();
|
||||
}
|
||||
}
|
||||
@ -1935,7 +1975,7 @@ bool SMESHGUI::OnGUIEvent( int theCommandID )
|
||||
}
|
||||
break;
|
||||
}
|
||||
case 4063: // SYMMETRY
|
||||
case 4063: // SYMMETRY
|
||||
{
|
||||
if(checkLock(aStudy)) break;
|
||||
if(vtkwnd) {
|
||||
@ -1993,7 +2033,7 @@ bool SMESHGUI::OnGUIEvent( int theCommandID )
|
||||
}
|
||||
break;
|
||||
}
|
||||
|
||||
|
||||
case 5105: // Library of selection filters
|
||||
{
|
||||
static QValueList<int> aTypes;
|
||||
@ -2048,7 +2088,7 @@ bool SMESHGUI::OnGUIEvent( int theCommandID )
|
||||
else {
|
||||
SUIT_MessageBox::warn1(desktop(),
|
||||
tr( "SMESH_WRN_WARNING" ),
|
||||
tr( "NOT_A_VTK_VIEWER" ),
|
||||
tr( "NOT_A_VTK_VIEWER" ),
|
||||
tr( "SMESH_BUT_OK" ) );
|
||||
}
|
||||
break;
|
||||
@ -2292,7 +2332,7 @@ void SMESHGUI::initialize( CAM_Application* app )
|
||||
createSMESHAction( 1134, "CLIP" );
|
||||
createSMESHAction( 1135, "DISP_ENT" );
|
||||
createSMESHAction( 2000, "CTRL" );
|
||||
|
||||
|
||||
createSMESHAction( 300, "ERASE" );
|
||||
createSMESHAction( 301, "DISPLAY" );
|
||||
createSMESHAction( 302, "DISPLAY_ONLY" );
|
||||
@ -2546,14 +2586,15 @@ void SMESHGUI::initialize( CAM_Application* app )
|
||||
|
||||
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 );
|
||||
@ -2713,21 +2754,23 @@ void SMESHGUI::initialize( CAM_Application* app )
|
||||
// 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* ) ),
|
||||
connect( application(), SIGNAL( viewManagerAdded( SUIT_ViewManager* ) ),
|
||||
this, SLOT( onViewManagerAdded( SUIT_ViewManager* ) ) );
|
||||
}
|
||||
|
||||
@ -2747,7 +2790,7 @@ bool SMESHGUI::deactivateModule( SUIT_Study* study )
|
||||
setToolShown( false );
|
||||
|
||||
EmitSignalCloseAllDialogs();
|
||||
|
||||
|
||||
return SalomeApp_Module::deactivateModule( study );
|
||||
}
|
||||
|
||||
@ -2767,7 +2810,7 @@ SMESH::SMESH_Gen_var SMESHGUI::GetSMESHGen()
|
||||
{
|
||||
SMESHGUI aGUI; //SRN BugID: IPAL9186: Create an instance of SMESHGUI to initialize myComponentSMESH
|
||||
return aGUI.myComponentSMESH;
|
||||
}
|
||||
}
|
||||
return myComponentSMESH;
|
||||
}
|
||||
|
||||
@ -2798,7 +2841,7 @@ void SMESHGUI::viewManagers( QStringList& list ) const
|
||||
|
||||
void SMESHGUI::onViewManagerAdded( SUIT_ViewManager* mgr )
|
||||
{
|
||||
if ( dynamic_cast<VTKViewer_ViewManager*>( mgr ) )
|
||||
if ( dynamic_cast<SVTK_ViewManager*>( mgr ) )
|
||||
SMESH::UpdateSelectionProp( this );
|
||||
}
|
||||
|
||||
@ -2812,7 +2855,7 @@ void SMESHGUI::createPreferences()
|
||||
int qaGroup = addPreference( tr( "PREF_GROUP_QUALITY" ), genTab );
|
||||
addPreference( tr( "PREF_DISPLAY_ENTITY" ), qaGroup, SalomeApp_Preferences::Bool, "SMESH", "display_entity" );
|
||||
addPreference( tr( "PREF_PRECISION_USE" ), qaGroup, SalomeApp_Preferences::Bool, "SMESH", "use_precision" );
|
||||
|
||||
|
||||
int precGroup = addPreference( tr( "PREF_GROUP_PRECISION" ), genTab );
|
||||
setPreferenceProperty( precGroup, "columns", 1 );
|
||||
|
||||
@ -2828,14 +2871,14 @@ void SMESHGUI::createPreferences()
|
||||
modes.append( "Shading" );
|
||||
modes.append( "Nodes" );
|
||||
modes.append( "Shrink" );
|
||||
QValueList<QVariant> indices;
|
||||
indices.append( 0 );
|
||||
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 );
|
||||
|
||||
@ -2868,10 +2911,10 @@ void SMESHGUI::createPreferences()
|
||||
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" );
|
||||
|
||||
|
||||
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" );
|
||||
@ -2901,17 +2944,17 @@ void SMESHGUI::createPreferences()
|
||||
|
||||
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" );
|
||||
setPreferenceProperty( numcol, "min", 2 );
|
||||
setPreferenceProperty( numcol, "max", 256 );
|
||||
|
||||
setPreferenceProperty( numcol, "max", 256 );
|
||||
|
||||
int numlab = addPreference( tr( "SMESH_NUMBEROFLABELS" ), colorsLabelsGr, SalomeApp_Preferences::IntSpin, "SMESH", "scalar_bar_num_labels" );
|
||||
setPreferenceProperty( numlab, "min", 2 );
|
||||
setPreferenceProperty( numlab, "max", 65 );
|
||||
@ -2924,10 +2967,10 @@ void SMESHGUI::createPreferences()
|
||||
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 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" );
|
||||
setPreferenceProperty( xv, "step", 0.1 );
|
||||
@ -2941,7 +2984,7 @@ void SMESHGUI::createPreferences()
|
||||
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" );
|
||||
@ -2967,6 +3010,11 @@ void SMESHGUI::createPreferences()
|
||||
|
||||
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 );
|
||||
}
|
||||
|
||||
//================================================================================
|
||||
@ -2975,7 +3023,7 @@ void SMESHGUI::preferencesChanged( const QString& sect, const QString& name )
|
||||
* \param theFlags - update flags
|
||||
*
|
||||
* Update viewer or/and object browser etc. in accordance with update flags ( see
|
||||
* SalomeApp_UpdateFlags enumeration ).
|
||||
* SalomeApp_UpdateFlags enumeration ).
|
||||
*/
|
||||
//================================================================================
|
||||
void SMESHGUI::update( const int flags )
|
||||
@ -3022,8 +3070,8 @@ void SMESHGUI::onOperationAborted( SUIT_Operation* )
|
||||
* \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
|
||||
@ -3044,14 +3092,15 @@ SalomeApp_Operation* SMESHGUI::createOperation( const int id ) const
|
||||
default:
|
||||
break;
|
||||
}
|
||||
|
||||
|
||||
if( !op )
|
||||
op = SalomeApp_Module::createOperation( id );
|
||||
return op;
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
SalomeApp_Displayer* SMESHGUI::displayer()
|
||||
{
|
||||
if( !myDisplayer )
|
||||
myDisplayer = new SMESHGUI_Displayer( dynamic_cast<SalomeApp_Study*>( getApp()->activeStudy() ) );
|
||||
return myDisplayer;
|
||||
}
|
||||
|
||||
@ -84,12 +84,16 @@ QtxValue SMESHGUI_Selection::param( const int ind, const QString& p ) const
|
||||
else if ( p=="displayMode" ) val = QtxValue( displayMode( ind ) );
|
||||
else if ( p=="isComputable" ) val = QtxValue( isComputable( ind ) );
|
||||
else if ( p=="hasReference" ) val = QtxValue( hasReference( ind ) );
|
||||
else if ( p=="isVisible" ) val = QtxValue( isVisible( ind ) );
|
||||
// else if ( p=="isVisible" ) val = QtxValue( isVisible( ind ) );
|
||||
|
||||
// printf( "--> param() : [%s] = %s (%s)\n", p.latin1(), val.toString().latin1(), val.typeName() );
|
||||
//if ( val.type() == QVariant::List )
|
||||
//cout << "size: " << val.toList().count() << endl;
|
||||
return val;
|
||||
|
||||
if( val.isValid() )
|
||||
return val;
|
||||
else
|
||||
return SalomeApp_Selection::param( ind, p );
|
||||
}
|
||||
|
||||
//=======================================================================
|
||||
@ -346,6 +350,9 @@ int SMESHGUI_Selection::type( const QString& entry, _PTR(Study) study )
|
||||
if( objComponent->ComponentDataType()!="SMESH" )
|
||||
return -1;
|
||||
|
||||
if( objComponent->GetIOR()==obj->GetIOR() )
|
||||
return COMPONENT;
|
||||
|
||||
int aLevel = obj->Depth() - objComponent->Depth(),
|
||||
aFTag = objFather->Tag(),
|
||||
anOTag = obj->Tag(),
|
||||
@ -427,6 +434,8 @@ QString SMESHGUI_Selection::typeName( const int t )
|
||||
return "Mesh compound";
|
||||
case GROUP:
|
||||
return "Group";
|
||||
case COMPONENT:
|
||||
return "Component";
|
||||
default:
|
||||
return "Unknown";
|
||||
}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user