#include "SUIT_Desktop.h"
#include "SUIT_FileDlg.h"
-#include "SalomeApp_SelectionMgr.h"
+#include "LightApp_SelectionMgr.h"
#include "SalomeApp_Tools.h"
#include "SalomeApp_Study.h"
WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu),
myBusy(false),
mySMESHGUI( theModule ),
- mySelectionMgr( SMESH::GetSelectionMgr( theModule ) ),
- myViewWindow( SMESH::GetViewWindow( theModule ) ),
- mySelector( myViewWindow->GetSelector() )
+ mySelectionMgr( SMESH::GetSelectionMgr( theModule ) )
{
setCaption(tr("CAPTION"));
aDlgLay->setStretchFactor(aMainFrame, 1);
myCreationDlg = 0;
+
+ mySelector = (SMESH::GetViewWindow( mySMESHGUI ))->GetSelector();
+
Init();
}
QPixmap iconSlct ( mgr->loadPixmap("SMESH", tr("ICON_SELECT")));
QPixmap icon2d ( mgr->loadPixmap("SMESH", tr("ICON_PATTERN_2d")));
QPixmap icon3d ( mgr->loadPixmap("SMESH", tr("ICON_PATTERN_3d")));
- QPixmap iconOpen ( mgr->loadPixmap("SMESH", tr("ICON_FILE_OPEN")));
+ QPixmap iconOpen ( mgr->loadPixmap("STD", tr("ICON_FILE_OPEN")));
QPixmap iconSample2d ( mgr->loadPixmap("SMESH", tr("ICON_PATTERN_SAMPLE_2D")));
QPixmap iconSample3d ( mgr->loadPixmap("SMESH", tr("ICON_PATTERN_SAMPLE_3D")));
bool toCreatePolyedrs = myCreatePolyedrsChk->isChecked();
if ( myPattern->MakeMesh( myMesh, toCreatePolygons, toCreatePolyedrs ) ) {
mySelectionMgr->clearSelected();
- SUIT_ResourceMgr* mgr = SMESH::GetResourceMgr( mySMESHGUI );
- bool autoUpdate = false;
- if (mgr && mgr->stringValue("SMESH", "AutomaticUpdate").compare("true") == 0)
- autoUpdate = true;
+ bool autoUpdate = SMESHGUI::automaticUpdate();
if (!isRefine() && autoUpdate) {
_PTR(SObject) aSO = SMESH::FindSObject(myMesh.in());
SMESH_Actor* anActor = SMESH::FindActorByEntry(aSO->GetID().c_str());
}
}
SMESH::UpdateView();
-
+
mySMESHGUI->updateObjBrowser(true);
return true;
} else {
{
mySelectionMgr->clearFilters();
SMESH::SetPickable();
- myViewWindow->SetSelectionMode(ActorSelection);
+ if ( SVTK_ViewWindow* aViewWindow = SMESH::GetViewWindow( mySMESHGUI ))
+ aViewWindow->SetSelectionMode(ActorSelection);
disconnect(mySelectionMgr, 0, this, 0);
disconnect(mySMESHGUI, 0, this, 0);
mySMESHGUI->ResetState();
} else if (mySelInput == Ids) {
SALOME_ListIO aList;
mySelectionMgr->selectedObjects(aList,SVTK_Viewer::Type());
+ if (aList.Extent() != 1)
+ return;
QString anIds;
if (!SMESH::GetNameOfSelectedElements(mySelector, aList.First(), anIds))
{
myPattern = SMESH::SMESH_Pattern::_duplicate(myCreationDlg->GetPattern());
myName->setText(myCreationDlg->GetPatternName());
+
+ updateWgState();
displayPreview();
+
setEnabled(true);
myIsCreateDlgOpen = false;
}
aProp->SetRepresentationToWireframe();
aProp->SetColor(250, 0, 250);
if (SMESH::FindActorByObject(myMesh))
- aProp->SetLineWidth(SMESH::GetFloat("SMESH:SettingsWidth", 1) +1);
+ aProp->SetLineWidth( SMESH::GetFloat( "SMESH:element_width", 1 ) + 1 );
else
aProp->SetLineWidth(1);
myPreviewActor->SetProperty(aProp);
}
QValueList<int> ids;
- if (!CORBA::is_nil(myPattern) && getIds(ids)) {
+ if (!CORBA::is_nil(myPattern)/* && getIds(ids)*/) {
SMESH::long_array_var keyPoints = myPattern->GetKeyPoints();
if (keyPoints->length()) {
myNode1->setEnabled(true);
SMESH::SetPickable(anActor);
if (myType == Type_2d)
- myViewWindow->SetSelectionMode(FaceSelection);
+ {
+ if ( SVTK_ViewWindow* aViewWindow = SMESH::GetViewWindow( mySMESHGUI ))
+ aViewWindow->SetSelectionMode(FaceSelection);
+ }
else
- myViewWindow->SetSelectionMode(CellSelection);
+ {
+ if ( SVTK_ViewWindow* aViewWindow = SMESH::GetViewWindow( mySMESHGUI ))
+ aViewWindow->SetSelectionMode(CellSelection);
+ }
}
else {
SMESH::SetPickable();
//mySelectionMgr->setSelectionModes(ActorSelection);
- myViewWindow->SetSelectionMode(ActorSelection);
+ if ( SVTK_ViewWindow* aViewWindow = SMESH::GetViewWindow( mySMESHGUI ))
+ aViewWindow->SetSelectionMode(ActorSelection);
}
if (mySelInput == Object && !myMeshShape->_is_nil()) {
if (aMesh) {
QStringList aListId = QStringList::split(" ", theNewText, false);
- SALOME_ListIO aList;
- aList.Append(anActor->getIO());
- mySelectionMgr->setSelectedObjects(aList, false);
-
- TColStd_IndexedMapOfInteger selectedIndices;
TColStd_MapOfInteger newIndices;
- mySelector->GetIndex(anActor->getIO(), selectedIndices);
for (int i = 0; i < aListId.count(); i++) {
const SMDS_MeshElement * e = aMesh->FindElement(aListId[ i ].toInt());
- if (e && e->GetType() == (myType == Type_2d ? SMDSAbs_Face : SMDSAbs_Volume)) {
- if (selectedIndices.Add(e->GetID())) {
- newIndices.Add(e->GetID());
- }
- }
- }
- if (newIndices.Extent() > 0)
- {
- mySelector->AddOrRemoveIndex( anActor->getIO(), newIndices, true);
- myViewWindow->highlight( anActor->getIO(), true, true );
+ if (e && e->GetType() == (myType == Type_2d ? SMDSAbs_Face : SMDSAbs_Volume))
+ newIndices.Add(e->GetID());
}
+ mySelector->AddOrRemoveIndex( anActor->getIO(), newIndices, false);
+ if ( SVTK_ViewWindow* aViewWindow = SMESH::GetViewWindow( mySMESHGUI ))
+ aViewWindow->highlight( anActor->getIO(), true, true );
}
myBusy = false;
+
+ displayPreview();
}
//=======================================================================