X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FSMESHGUI%2FSMESHGUI_FilterDlg.cxx;h=c153396ac6769e5f2e91de803b2a236cbc69e0fe;hb=7abad597ce551f1465e71bcea533b5ac558679f6;hp=badc87709ffda3ac8d7ea9c786df6d9ef3b5b3ce;hpb=7a713be33b27d6a8c77f983460f0e97e52c6ff7c;p=modules%2Fsmesh.git diff --git a/src/SMESHGUI/SMESHGUI_FilterDlg.cxx b/src/SMESHGUI/SMESHGUI_FilterDlg.cxx index badc87709..c153396ac 100755 --- a/src/SMESHGUI/SMESHGUI_FilterDlg.cxx +++ b/src/SMESHGUI/SMESHGUI_FilterDlg.cxx @@ -856,7 +856,7 @@ QList SMESHGUI_FilterTable::Table::selectedRows() /* Class : SMESHGUI_FilterTable - Description : Frame containig + Description : Frame containing - Button group for switching entity type - Table for displaying filter criterions - Buttons for editing table and filter libraries @@ -1369,8 +1369,7 @@ void SMESHGUI_FilterTable::SetCriterion (const int theRow, { if ( strlen( theCriterion.ThresholdID ) > 0 ) // shape ID -> name { - _PTR(SObject) sobj = - SMESH::GetActiveStudyDocument()->FindObjectID( theCriterion.ThresholdID.in() ); + _PTR(SObject) sobj = SMESH::getStudy()->FindObjectID( theCriterion.ThresholdID.in() ); if ( !sobj ) aTable->item( theRow, 2 )->setText( QString( theCriterion.ThresholdID ) ); else @@ -2058,7 +2057,7 @@ void SMESHGUI_FilterTable::addRow (Table* theTable, const int theType, const boo } myIsLocked = false; - // IPAL19372 - to prevent calling onCriterionChaged() slot before completion of setItem() + // IPAL19372 - to prevent calling onCriterionChanged() slot before completion of setItem() bool isSignalsBlocked = theTable->signalsBlocked(); theTable->blockSignals( true ); @@ -2741,7 +2740,7 @@ void SMESHGUI_FilterDlg::construct (const QList& theTypes) aDlgLay->setStretchFactor(myMainFrame, 1); - myHelpFileName = "selection_filter_library_page.html"; + myHelpFileName = "selection_filter_library.html"; Init(myTypes); } @@ -3073,7 +3072,7 @@ void SMESHGUI_FilterDlg::onHelp() //======================================================================= // name : SMESHGUI_FilterDlg::onDeactivate -// Purpose : SLOT called when dialog must be deativated +// Purpose : SLOT called when dialog must be deactivated //======================================================================= void SMESHGUI_FilterDlg::onDeactivate() { @@ -3199,8 +3198,7 @@ bool SMESHGUI_FilterDlg::isValid() const QString aName; myTable->GetThreshold(i, aName); - std::vector<_PTR(SObject)> aList = - SMESH::GetActiveStudyDocument()->FindObjectByName(aName.toLatin1().constData(), "GEOM"); + std::vector<_PTR(SObject)> aList = SMESH::getStudy()->FindObjectByName(aName.toUtf8().constData(), "GEOM"); if (aList.size() == 0) { SUIT_MessageBox::information(SMESHGUI::desktop(), tr("SMESH_INSUFFICIENT_DATA"), tr("BAD_SHAPE_NAME").arg(aName));