ForkMaster/smesh
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/smesh.git synced 2025-01-15 12:20:34 +05:00
Code Issues Packages Projects Releases Wiki Activity

PAL19566

Browse Source
This commit is contained in:
asl 2008-04-21 08:11:59 +00:00
parent cf4a3af54c
commit 17397a8eee
2 changed files with 19 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/SMESHGUI/SMESHGUI_FilterDlg.cxx
View File

@ -1004,9 +1004,9 @@ void SMESHGUI_FilterTable::GetCriterion (const int theRow,
} }
else else
{ {
theCriterion.ThresholdStr = CORBA::string_dup( aTable->text(theRow, 2).toLatin1().constData() ); theCriterion.ThresholdStr = aTable->text(theRow, 2).toLatin1().constData();
if ( aCriterionType != SMESH::FT_RangeOfIds ) if ( aCriterionType != SMESH::FT_RangeOfIds )
theCriterion.ThresholdID = CORBA::string_dup( aTable->text( theRow, 5 ).toLatin1().constData() ); theCriterion.ThresholdID = aTable->text( theRow, 5 ).toLatin1().constData();
} }
QTableWidgetItem* anItem = aTable->item(theRow, 0); QTableWidgetItem* anItem = aTable->item(theRow, 0);
@ -1391,6 +1391,8 @@ void SMESHGUI_FilterTable::addRow (Table* theTable, const int theType, const boo
// Logical operation AND / OR // Logical operation AND / OR
theTable->setItem(aCurrRow, 4, new QTableWidgetItem()); theTable->setItem(aCurrRow, 4, new QTableWidgetItem());
theTable->setItem(aCurrRow, 5, new QTableWidgetItem());
theTable->blockSignals( isSignalsBlocked ); theTable->blockSignals( isSignalsBlocked );
// Logical binary operation for previous value // Logical binary operation for previous value
@ -2375,7 +2377,7 @@ bool SMESHGUI_FilterDlg::isValid() const
myTable->GetThreshold(i, aName); myTable->GetThreshold(i, aName);
std::vector<_PTR(SObject)> aList = std::vector<_PTR(SObject)> aList =
SMESH::GetActiveStudyDocument()->FindObjectByName(aName.toLatin1().data(), "GEOM"); SMESH::GetActiveStudyDocument()->FindObjectByName(aName.toLatin1().constData(), "GEOM");
if (aList.size() == 0) { if (aList.size() == 0) {
SUIT_MessageBox::information(SMESHGUI::desktop(), tr("SMESH_INSUFFICIENT_DATA"), SUIT_MessageBox::information(SMESHGUI::desktop(), tr("SMESH_INSUFFICIENT_DATA"),
tr("BAD_SHAPE_NAME").arg(aName)); tr("BAD_SHAPE_NAME").arg(aName));

28
src/SMESHGUI/SMESHGUI_FilterLibraryDlg.cxx
View File

@ -431,7 +431,7 @@ bool SMESHGUI_FilterLibraryDlg::onApply()
} }
if (myFileName->text() != myLibrary->GetFileName()) if (myFileName->text() != myLibrary->GetFileName())
myLibrary->SetFileName(myFileName->text().toLatin1().data()); myLibrary->SetFileName( myFileName->text().toLatin1().constData() );
bool aResult = false; bool aResult = false;
@ -439,8 +439,8 @@ bool SMESHGUI_FilterLibraryDlg::onApply()
aResult = true; aResult = true;
} else if (myMode == EDIT || myMode == ADD_TO) { } else if (myMode == EDIT || myMode == ADD_TO) {
SMESH::Filter_var aFilter = createFilter(); SMESH::Filter_var aFilter = createFilter();
if (!myLibrary->Replace(myCurrFilterName.toLatin1().data(), if (!myLibrary->Replace(myCurrFilterName.toLatin1().constData(),
myName->text().toLatin1().data(), myName->text().toLatin1().constData(),
aFilter.in())) { aFilter.in())) {
SUIT_MessageBox::information(SMESHGUI::desktop(), tr("SMESH_ERROR"), SUIT_MessageBox::information(SMESHGUI::desktop(), tr("SMESH_ERROR"),
tr("ERROR_OF_EDITING")); tr("ERROR_OF_EDITING"));
@ -672,7 +672,7 @@ void SMESHGUI_FilterLibraryDlg::processNewLibrary()
if (aFilterMgr->_is_nil()) if (aFilterMgr->_is_nil())
return; return;
myLibrary = aFilterMgr->LoadLibrary(autoExtension(getFileName()).toLatin1().data()); myLibrary = aFilterMgr->LoadLibrary(autoExtension(getFileName()).toLatin1().constData());
if (myLibrary->_is_nil()) { if (myLibrary->_is_nil()) {
if (myMode == COPY_FROM) { if (myMode == COPY_FROM) {
SUIT_MessageBox::information(SMESHGUI::desktop(), tr("SMESH_ERROR"), SUIT_MessageBox::information(SMESHGUI::desktop(), tr("SMESH_ERROR"),
@ -680,7 +680,7 @@ void SMESHGUI_FilterLibraryDlg::processNewLibrary()
return; return;
} else { } else {
myLibrary = aFilterMgr->CreateLibrary(); myLibrary = aFilterMgr->CreateLibrary();
myLibrary->SetFileName(getFileName().toLatin1().data()); myLibrary->SetFileName(getFileName().toLatin1().constData());
} }
} }
@ -815,7 +815,7 @@ bool SMESHGUI_FilterLibraryDlg::isValid(const bool theMess) const
//======================================================================= //=======================================================================
void SMESHGUI_FilterLibraryDlg::onFilterChanged( QListWidgetItem* item, QListWidgetItem* ) void SMESHGUI_FilterLibraryDlg::onFilterChanged( QListWidgetItem* item, QListWidgetItem* )
{ {
QString theName = item->text(); QString theName = item ? item->text() : QString::null;
if (myLibrary->_is_nil()) if (myLibrary->_is_nil())
return; return;
@ -832,14 +832,14 @@ void SMESHGUI_FilterLibraryDlg::onFilterChanged( QListWidgetItem* item, QListWid
} }
SMESH::Filter_var aFilter = createFilter(); SMESH::Filter_var aFilter = createFilter();
myLibrary->Replace(myCurrFilterName.toLatin1().data(), myLibrary->Replace(myCurrFilterName.toLatin1().constData(),
myName->text().toLatin1().data(), myName->text().toLatin1().constData(),
aFilter); aFilter);
} }
// Fill table with filter parameters // Fill table with filter parameters
SMESH::Filter_var aFilter = myLibrary->Copy(theName.toLatin1().data()); SMESH::Filter_var aFilter = myLibrary->Copy(theName.toLatin1().constData());
myCurrFilterName = theName; myCurrFilterName = theName;
myCurrFilter = myListBox->currentRow(); myCurrFilter = myListBox->currentRow();
myName->setText(theName); myName->setText(theName);
@ -975,8 +975,8 @@ void SMESHGUI_FilterLibraryDlg::addFilterToLib (const QString& theName)
// add new filter in library // add new filter in library
bool aResult = !aFilter->GetPredicate()->_is_nil() bool aResult = !aFilter->GetPredicate()->_is_nil()
? myLibrary->Add(aName.toLatin1().data(), aFilter) ? myLibrary->Add(aName.toLatin1().constData(), aFilter)
: myLibrary->AddEmpty(aName.toLatin1().data(), (SMESH::ElementType)myTable->GetType()); : myLibrary->AddEmpty(aName.toLatin1().constData(), (SMESH::ElementType)myTable->GetType());
if (!aResult) { if (!aResult) {
SUIT_MessageBox::information(SMESHGUI::desktop(), tr("SMESH_ERROR"), SUIT_MessageBox::information(SMESHGUI::desktop(), tr("SMESH_ERROR"),
@ -1096,7 +1096,7 @@ void SMESHGUI_FilterLibraryDlg::onDeleteBtnPressed()
int anIndex = getIndex(myCurrFilterName); int anIndex = getIndex(myCurrFilterName);
if (anIndex == -1 || !myLibrary->Delete(myCurrFilterName.toLatin1().data())) { if (anIndex == -1 || !myLibrary->Delete(myCurrFilterName.toLatin1().constData())) {
SUIT_MessageBox::information(SMESHGUI::desktop(), tr("SMESH_ERROR"), SUIT_MessageBox::information(SMESHGUI::desktop(), tr("SMESH_ERROR"),
tr("ERROR_OF_DELETING")); tr("ERROR_OF_DELETING"));
} else { } else {
@ -1188,8 +1188,8 @@ void SMESHGUI_FilterLibraryDlg::onNeedValidation()
if (valid) if (valid)
{ {
SMESH::Filter_var aFilter = createFilter(myTable->GetType()); SMESH::Filter_var aFilter = createFilter(myTable->GetType());
myLibrary->Replace(myCurrFilterName.toLatin1().data(), myLibrary->Replace(myCurrFilterName.toLatin1().constData(),
myName->text().toLatin1().data(), myName->text().toLatin1().constData(),
aFilter); aFilter);
} }
} }