-// Copyright (C) 2007-2013 CEA/DEN, EDF R&D
+// Copyright (C) 2007-2022 CEA/DEN, EDF R&D
//
// 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.
+// version 2.1 of the License, or (at your option) any later version.
//
// This library is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
#include <SMESHGUI_Utils.h>
#include <SMESHGUI_HypothesesUtils.h>
-#include "SMESH_NumberFilter.hxx"
+#include <SMESH_NumberFilter.hxx>
+#include <SMESH_AdvOptionsWdg.h>
#include "utilities.h"
-#include CORBA_SERVER_HEADER(HexoticPlugin_Algorithm)
-
#include <SUIT_Session.h>
#include <SUIT_ResourceMgr.h>
+#include <SUIT_MessageBox.h>
#include <SUIT_FileDlg.h>
#include <SalomeApp_Tools.h>
#include <QtxIntSpinBox.h>
// Main widget tabs identification
enum {
STD_TAB = 0,
- SMP_TAB
+ ADV_TAB,
+ SMP_TAB,
+ VL_TAB
};
// Size maps tab, table columns order
SIZE_COL
};
+//
+// Size map table widget delegate
+//
+
+SizeMapsTableWidgetDelegate::SizeMapsTableWidgetDelegate(QObject *parent)
+ : QItemDelegate(parent)
+{
+}
+
+QWidget* SizeMapsTableWidgetDelegate::createEditor(QWidget *parent,
+ const QStyleOptionViewItem &/* option */,
+ const QModelIndex &/* index */) const
+{
+ SMESHGUI_SpinBox *editor = new SMESHGUI_SpinBox(parent);
+ editor->RangeStepAndValidator(0.0, COORD_MAX, 10.0, "length_precision");
+ return editor;
+}
+
+void SizeMapsTableWidgetDelegate::setEditorData(QWidget *editor,
+ const QModelIndex &index) const
+{
+ double value = index.model()->data(index, Qt::EditRole).toDouble();
+ SMESHGUI_SpinBox *spinBox = static_cast<SMESHGUI_SpinBox*>(editor);
+ spinBox->setValue(value);
+}
+
+void SizeMapsTableWidgetDelegate::setModelData(QWidget *editor, QAbstractItemModel *model,
+ const QModelIndex &index) const
+{
+ SMESHGUI_SpinBox *spinBox = static_cast<SMESHGUI_SpinBox*>(editor);
+ spinBox->interpretText();
+ double value = spinBox->value();
+ if ( value == 0 )
+ SUIT_MessageBox::critical( spinBox, tr( "SMESH_ERROR" ), tr( "Hexotic_NULL_LOCAL_SIZE" ) );
+ else
+ model->setData(index, value, Qt::EditRole);
+}
+
+void SizeMapsTableWidgetDelegate::updateEditorGeometry(QWidget *editor,
+ const QStyleOptionViewItem &option,
+ const QModelIndex &/* index */) const
+{
+ editor->setGeometry(option.rect);
+}
+
+// END Delegate
+
+
+
HexoticPluginGUI_HypothesisCreator::HexoticPluginGUI_HypothesisCreator( const QString& theHypType )
-: SMESHGUI_GenericHypothesisCreator( theHypType ),
- myIs3D( true ),
- mySizeMapsToRemove ()
+ : SMESHGUI_GenericHypothesisCreator( theHypType ),
+ myIs3D( true ),
+ mySizeMapsToRemove()
{
}
bool HexoticPluginGUI_HypothesisCreator::checkParams(QString& msg) const
{
msg.clear();
+
+ HexoticPlugin::HexoticPlugin_Hypothesis_var h =
+ HexoticPlugin::HexoticPlugin_Hypothesis::_narrow( hypothesis() );
+
+ myAdvWidget->myOptionTable->setFocus();
+ QApplication::instance()->processEvents();
+
+ QString name, value;
+ bool isDefault, ok = true;
+ int iRow = 0, nbRows = myAdvWidget->myOptionTable->topLevelItemCount();
+ for ( ; iRow < nbRows; ++iRow )
+ {
+ QTreeWidgetItem* row = myAdvWidget->myOptionTable->topLevelItem( iRow );
+ myAdvWidget->GetOptionAndValue( row, name, value, isDefault );
+
+ if ( name.simplified().isEmpty() )
+ continue; // invalid custom option
+
+ if ( isDefault ) // not selected option
+ value.clear();
+
+ try {
+ h->SetOptionValue( name.toLatin1().constData(), value.toLatin1().constData() );
+ }
+ catch ( const SALOME::SALOME_Exception& ex )
+ {
+ msg = ex.details.text.in();
+ ok = false;
+ break;
+ }
+ }
+
+ if ( !ok )
+ {
+ h->SetOptionValues( myOptions ); // restore values
+ return false;
+ }
+
HexoticHypothesisData data_old, data_new;
- readParamsFromHypo( data_old );
- readParamsFromWidgets( data_new );
+ readParamsFromHypo( data_old ); // new values of advanced options ( myOptions ) are read
- bool res = storeParamsToHypo( data_new );
+ bool res = readParamsFromWidgets( data_new );
+ if ( !res ){
+ return res;
+ }
+
+
+ res = data_old.myMinSize <= data_old.myMaxSize;
if ( !res ) {
- storeParamsToHypo( data_old );
+ msg = tr(QString("Min size (%1) is higher than max size (%2)").arg(data_old.myMinSize).arg(data_old.myMaxSize).toStdString().c_str());
return res;
}
- res = data_new.myMinSize <= data_new.myMaxSize;
+ res = data_old.myHexesMinLevel == 0 || \
+ ( data_old.myHexesMinLevel != 0 && (data_old.myHexesMinLevel < data_old.myHexesMaxLevel) );
if ( !res ) {
- msg = tr(QString("Min size (%1) is higher than max size (%2)").arg(data_new.myMinSize).arg(data_new.myMaxSize).toStdString().c_str());
+ msg = tr(QString("Min hexes level (%1) is higher than max hexes level (%2)").arg(data_old.myHexesMinLevel).arg(data_old.myHexesMaxLevel).toStdString().c_str());
return res;
}
- res = data_new.myHexesMinLevel == 0 || \
- ( data_new.myHexesMinLevel != 0 && (data_new.myHexesMinLevel < data_new.myHexesMaxLevel) );
+ res = storeParamsToHypo( data_new );
if ( !res ) {
- msg = tr(QString("Min hexes level (%1) is higher than max hexes level (%2)").arg(data_new.myHexesMinLevel).arg(data_new.myHexesMaxLevel).toStdString().c_str());
+ storeParamsToHypo( data_old );
return res;
}
QVBoxLayout* lay = new QVBoxLayout( fr );
lay->setMargin( 0 );
lay->setSpacing( 6 );
-
+
// main TabWidget of the dialog
QTabWidget* aTabWidget = new QTabWidget( fr );
aTabWidget->setTabShape( QTabWidget::Rounded );
QGridLayout* l = new QGridLayout( aStdGroup );
l->setSpacing( 6 );
l->setMargin( 11 );
-
+
int row = 0;
myName = 0;
if( isCreation() ) {
myName->setMinimumWidth( 150 );
}
- HexoticPlugin::HexoticPlugin_Hypothesis_var h =
- HexoticPlugin::HexoticPlugin_Hypothesis::_narrow( initParamsHypothesis() );
-
myStdWidget = new HexoticPluginGUI_StdWidget(aStdGroup);
l->addWidget( myStdWidget, row++, 0, 1, 3 );
myStdWidget->onSdModeSelected(SD_MODE_4);
+ //myStdWidget->gridLayout->setRowStretch( 1, 2 );
+
+ // Advanced TAB
+ myAdvWidget = new HexoticPluginGUI_AdvWidget( aTabWidget );
+ //myAdvWidget->gridLayout->setRowStretch( 0, 2 );
// SIZE MAPS TAB
- QWidget* aSmpGroup = new QWidget();
- lay->addWidget( aSmpGroup );
-
- // Size map widget creation and initialisation
- mySmpWidget = new HexoticPluginGUI_SizeMapsWidget(aSmpGroup);
+ mySmpWidget = new HexoticPluginGUI_SizeMapsWidget( aTabWidget );
+ mySmpWidget->doubleSpinBox->RangeStepAndValidator(0.0, COORD_MAX, 1.0, "length_precision");
mySmpWidget->doubleSpinBox->setValue(0.0);
-
+
// Filters of selection
- TColStd_MapOfInteger SM_ShapeTypes;
+ TColStd_MapOfInteger SM_ShapeTypes;
SM_ShapeTypes.Add( TopAbs_VERTEX );
SM_ShapeTypes.Add( TopAbs_EDGE );
SM_ShapeTypes.Add( TopAbs_WIRE );
SM_ShapeTypes.Add( TopAbs_FACE );
SM_ShapeTypes.Add( TopAbs_SOLID );
- SM_ShapeTypes.Add( TopAbs_COMPOUND );
+ SM_ShapeTypes.Add( TopAbs_COMPOUND );
SMESH_NumberFilter* aFilter = new SMESH_NumberFilter("GEOM", TopAbs_SHAPE, 0, SM_ShapeTypes);
-
- myGeomSelWdg = new StdMeshersGUI_ObjectReferenceParamWdg( aFilter, mySmpWidget, /*multiSel=*/false,/*stretch=*/false);
+
+ // Selection widget
+ myGeomSelWdg = new StdMeshersGUI_ObjectReferenceParamWdg( aFilter, mySmpWidget, /*multiSel=*/false);
myGeomSelWdg->SetDefaultText(tr("Hexotic_SEL_SHAPE"), "QLineEdit { color: grey }");
mySmpWidget->gridLayout->addWidget(myGeomSelWdg, 0, 1);
-
- QHBoxLayout* aSmpLayout = new QHBoxLayout( aSmpGroup );
- aSmpLayout->setMargin( 0 );
- aSmpLayout->addWidget( mySmpWidget);
-
+
+ // Configuration of the table widget
QStringList headerLabels;
headerLabels << tr("Hexotic_ENTRY")<< tr("Hexotic_NAME")<< tr("Hexotic_SIZE");
mySmpWidget->tableWidget->setHorizontalHeaderLabels(headerLabels);
mySmpWidget->label->setText(tr("LOCAL_SIZE"));
mySmpWidget->pushButton_1->setText(tr("Hexotic_ADD"));
mySmpWidget->pushButton_2->setText(tr("Hexotic_REMOVE"));
-
-
-// resizeEvent();
-
- aTabWidget->insertTab( STD_TAB, aStdGroup, tr( "SMESH_ARGUMENTS" ) );
- aTabWidget->insertTab( SMP_TAB, aSmpGroup, tr( "LOCAL_SIZE" ) );
-
+
+ // Setting a custom delegate for the size column
+ SizeMapsTableWidgetDelegate* delegate = new SizeMapsTableWidgetDelegate();
+ mySmpWidget->tableWidget->setItemDelegateForColumn(SIZE_COL, delegate);
+
+
+ // Viscous Layers tab
+
+ // Viscous layers widget creation and initialisation
+ myVLWidget = new HexoticPluginGUI_ViscousLayersWidget( aTabWidget );
+
+ QString aMainEntry = SMESHGUI_GenericHypothesisCreator::getMainShapeEntry();
+ QString aSubEntry = SMESHGUI_GenericHypothesisCreator::getShapeEntry();
+
+ if ( !aMainEntry.isEmpty() )
+ {
+ myVLWidget->myFacesWithLayers->SetGeomShapeEntry( aSubEntry, aMainEntry );
+ myVLWidget->myImprintedFaces->SetGeomShapeEntry( aSubEntry, aMainEntry );
+ }
+ else
+ {
+ myVLWidget->labelFacesWithLayers->setVisible(false);
+ myVLWidget->myFacesWithLayers->setVisible(false);
+ myVLWidget->labelImprintedFaces->setVisible(false);
+ myVLWidget->myImprintedFaces->setVisible(false);
+ }
+
+ aTabWidget->insertTab( STD_TAB, aStdGroup, tr( "SMESH_ARGUMENTS" ));
+ aTabWidget->insertTab( ADV_TAB, myAdvWidget, tr( "SMESH_ADVANCED" ));
+ aTabWidget->insertTab( SMP_TAB, mySmpWidget, tr( "LOCAL_SIZE" ));
+ aTabWidget->insertTab( VL_TAB, myVLWidget, tr( "Hexotic_VISCOUS_LAYERS"));
+
myIs3D = true;
-
+
// Size Maps
mySizeMapsToRemove.clear();
- connect( mySmpWidget->pushButton_1, SIGNAL( clicked() ), this, SLOT( onAddLocalSize() ) );
- connect( mySmpWidget->pushButton_2, SIGNAL( clicked() ), this, SLOT( onRemoveLocalSize() ) );
-
+ connect( mySmpWidget->pushButton_1, SIGNAL( clicked() ), this, SLOT( onAddLocalSize() ) );
+ connect( mySmpWidget->pushButton_2, SIGNAL( clicked() ), this, SLOT( onRemoveLocalSize() ) );
+ connect( aTabWidget, SIGNAL( currentChanged(int)), this, SLOT( onTabChanged( int ) ) );
+ connect( myAdvWidget->addBtn, SIGNAL( clicked() ), this, SLOT( onAddOption() ) );
+ connect( myAdvWidget->dirBtn, SIGNAL( clicked() ), this, SLOT( onDirBtnClicked() ) );
return fr;
}
void HexoticPluginGUI_HypothesisCreator::onAddLocalSize()
{
int rowCount = mySmpWidget->tableWidget->rowCount();
- int columnCount = mySmpWidget->tableWidget->columnCount();
-
+ //int columnCount = mySmpWidget->tableWidget->columnCount();
+
// Get the selected object properties
GEOM::GEOM_Object_var sizeMapObject = myGeomSelWdg->GetObject< GEOM::GEOM_Object >(0);
+ if (sizeMapObject->_is_nil())
+ return;
+
std::string entry, shapeName;
entry = (std::string) sizeMapObject->GetStudyEntry();
shapeName = sizeMapObject->GetName();
-
+
// Check if the object is already in the widget
QList<QTableWidgetItem *> listFound = mySmpWidget->tableWidget
->findItems( QString(entry.c_str()), Qt::MatchExactly );
// Get the size value
double size = mySmpWidget->doubleSpinBox->value();
+ if (size == 0)
+ {
+ SUIT_MessageBox::critical( mySmpWidget, tr( "SMESH_ERROR" ), tr( "Hexotic_NULL_LOCAL_SIZE" ) );
+ return;
+ }
// Set items for the inserted row
insertLocalSizeInWidget( entry, shapeName, size, rowCount );
double size,
int row ) const
{
- MESSAGE("HexoticPluginGUI_HypothesisCreator:insertLocalSizeInWidget")
+ MESSAGE("HexoticPluginGUI_HypothesisCreator:insertLocalSizeInWidget");
int columnCount = mySmpWidget->tableWidget->columnCount();
// Add a row at the end of the table
switch ( col )
{
case ENTRY_COL:
+ item->setFlags( 0 );
value = QVariant( entry.c_str() );
+ item->setData(Qt::DisplayRole, value );
break;
case NAME_COL:
+ item->setFlags( Qt::ItemIsSelectable | Qt::ItemIsEnabled );
value = QVariant( shapeName.c_str() );
+ item->setData(Qt::DisplayRole, value );
break;
case SIZE_COL:
+ item->setFlags( Qt::ItemIsSelectable | Qt::ItemIsEditable | Qt::ItemIsEnabled);
value = QVariant( size );
+ item->setData(Qt::EditRole, value );
break;
}
- item->setData(Qt::DisplayRole, value );
mySmpWidget->tableWidget->setItem(row,col,item);
}
}
{
// Remove the selected rows in the table
QList<QTableWidgetSelectionRange> ranges = mySmpWidget->tableWidget->selectedRanges();
- if ( ranges.isEmpty() ) // If none is selected remove the last one
+ if ( ranges.isEmpty() && mySmpWidget->tableWidget->rowCount() > 0) // If none is selected remove the last one
{
int lastRow = mySmpWidget->tableWidget->rowCount() - 1;
std::string entry = mySmpWidget->tableWidget->item( lastRow, ENTRY_COL )->text().toStdString();
}
else
{
- QTableWidgetSelectionRange& range = ranges.first();
- for ( int row = range.topRow(); row < range.rowCount(); row++ )
+ QList<QTableWidgetSelectionRange>::iterator it;
+ for ( it = ranges.begin(); it != ranges.end(); ++it )
{
- std::string entry = mySmpWidget->tableWidget->item( row, ENTRY_COL )->text().toStdString();
- mySizeMapsToRemove.push_back(entry);
+ for ( int row = it->topRow(); row <= it->bottomRow(); row++ )
+ {
+ std::string entry = mySmpWidget->tableWidget->item( row, ENTRY_COL )->text().toStdString();
+ mySizeMapsToRemove.push_back(entry);
+ MESSAGE("ADDING entry : "<<entry<<"to the Size Maps to remove");
+ }
+ mySmpWidget->tableWidget->model()->removeRows(it->topRow(), it->rowCount());
}
- mySmpWidget->tableWidget->model()->removeRows(range.topRow(), range.rowCount());
}
}
QSize scaledSize = myStdWidget->imageSdMode.size();
scaledSize.scale(myStdWidget->sdModeLabel->size(), Qt::KeepAspectRatioByExpanding);
if (!myStdWidget->sdModeLabel->pixmap() || scaledSize != myStdWidget->sdModeLabel->pixmap()->size())
- myStdWidget->sdModeLabel->setPixmap(myStdWidget->imageSdMode.scaled(myStdWidget->sdModeLabel->size(),
- Qt::KeepAspectRatio,
- Qt::SmoothTransformation));
+ myStdWidget->sdModeLabel->setPixmap(myStdWidget->imageSdMode.scaled(myStdWidget->sdModeLabel->size(),
+ Qt::KeepAspectRatio,
+ Qt::SmoothTransformation));
}
void HexoticPluginGUI_HypothesisCreator::retrieveParams() const
if( myName )
myName->setText( data.myName );
+ myStdWidget->myPhySizeType->setCurrentIndex( data.myMinSize > 0 || data.myMaxSize > 0 );
+
myStdWidget->myMinSize->setCleared(data.myMinSize == 0);
if (data.myMinSize == 0)
myStdWidget->myMinSize->setText("");
else
myStdWidget->myMaxSize->setValue( data.myMaxSize );
- myStdWidget->myHexesMinLevel->setCleared(data.myHexesMinLevel == 0);
- if (data.myHexesMinLevel == 0)
- myStdWidget->myHexesMinLevel->setText("");
- else
- myStdWidget->myHexesMinLevel->setValue( data.myHexesMinLevel );
+ myStdWidget->myGeomSizeType->setCurrentIndex( data.myApproxAngle > 0 );
- myStdWidget->myHexesMaxLevel->setCleared(data.myHexesMaxLevel == 0);
- if (data.myHexesMaxLevel == 0)
- myStdWidget->myHexesMaxLevel->setText("");
+ myStdWidget->myGeomApproxAngle->setCleared( data.myApproxAngle == 0 );
+ if (data.myApproxAngle == 0)
+ myStdWidget->myGeomApproxAngle->setText("");
else
- myStdWidget->myHexesMaxLevel->setValue( data.myHexesMaxLevel );
+ myStdWidget->myGeomApproxAngle->setValue( data.myApproxAngle );
- myStdWidget->myHexoticIgnoreRidges->setChecked( data.myHexoticIgnoreRidges );
- myStdWidget->myHexoticInvalidElements->setChecked( data.myHexoticInvalidElements );
-
- myStdWidget->myHexoticSharpAngleThreshold->setCleared(data.myHexoticSharpAngleThreshold == 0);
- if (data.myHexoticSharpAngleThreshold == 0)
- myStdWidget->myHexoticSharpAngleThreshold->setText("");
- else
- myStdWidget->myHexoticSharpAngleThreshold->setValue( data.myHexoticSharpAngleThreshold );
+ myAdvWidget->myHexoticWorkingDir->setText( data.myHexoticWorkingDir );
- myStdWidget->myHexoticNbProc->setValue( data.myHexoticNbProc );
- myStdWidget->myHexoticWorkingDir->setText( data.myHexoticWorkingDir );
+ myAdvWidget->myHexoticVerbosity->setValue( data.myHexoticVerbosity );
- myStdWidget->myHexoticVerbosity->setValue( data.myHexoticVerbosity );
+ myStdWidget->myHexoticSdMode->setCurrentIndex(data.myHexoticSdMode);
- myStdWidget->myHexoticMaxMemory->setValue( data.myHexoticMaxMemory );
+ //myAdvWidget->SetCustomOptions(data.myTextOptions);
+
+ if ( myOptions.operator->() ) {
+ for ( int i = 0, nb = myOptions->length(); i < nb; ++i )
+ myAdvWidget->AddOption( myOptions[i].in() );
+ }
+ if ( myCustomOptions.operator->() ) {
+ for ( int i = 0, nb = myCustomOptions->length(); i < nb; ++i )
+ myAdvWidget->AddOption( myCustomOptions[i].in() );
+ }
+ myAdvWidget->myOptionTable->resizeColumnToContents( OPTION_NAME_COLUMN );
+
+ myAdvWidget->keepWorkingFilesCheck->setChecked( data.myKeepFiles );
+ myAdvWidget->logInFileCheck->setChecked( !data.myLogInStandardOutput );
+ myAdvWidget->removeLogOnSuccessCheck->setChecked( data.myRemoveLogOnSuccess );
- myStdWidget->myHexoticSdMode->setCurrentIndex(data.myHexoticSdMode);
-
HexoticPlugin_Hypothesis::THexoticSizeMaps::const_iterator it = data.mySizeMaps.begin();
for ( int row = 0; it != data.mySizeMaps.end(); it++, row++ )
{
GEOM::GEOM_Object_var anObject = entryToObject( entry );
std::string shapeName = anObject->GetName();
- MESSAGE(" Insert local size, entry : "<<entry<<", size : "<<size<<", at row : "<<row)
+ MESSAGE(" Insert local size, entry : "<<entry<<", size : "<<size<<", at row : "<<row);
insertLocalSizeInWidget( entry, shapeName, size , row );
}
- std::cout << "myStdWidget->myMinSize->value(): " << myStdWidget->myMinSize->value() << std::endl;
- std::cout << "myStdWidget->myMaxSize->value(): " << myStdWidget->myMaxSize->value() << std::endl;
- std::cout << "myStdWidget->myHexesMinLevel->value(): " << myStdWidget->myHexesMinLevel->value() << std::endl;
- std::cout << "myStdWidget->myHexesMaxLevel->value(): " << myStdWidget->myHexesMaxLevel->value() << std::endl;
- std::cout << "myStdWidget->myHexoticSharpAngleThreshold->value(): " << myStdWidget->myHexoticSharpAngleThreshold->value() << std::endl;
+ myVLWidget->myNbLayers->setCleared(data.myNbLayers == 0);
+ if (data.myNbLayers == 0)
+ myVLWidget->myNbLayers->setText("");
+ else
+ myVLWidget->myNbLayers->setValue( data.myNbLayers );
+
+ myVLWidget->myFirstLayerSize->setCleared(data.myFirstLayerSize == 0);
+ if (data.myFirstLayerSize == 0)
+ myVLWidget->myFirstLayerSize->setText("");
+ else
+ myVLWidget->myFirstLayerSize->setValue( data.myFirstLayerSize );
+
+ myVLWidget->myDirection->setCurrentIndex( data.myDirection ? 0 : 1 );
+ myVLWidget->myGrowth->setCleared(data.myGrowth == 0);
+ if (data.myGrowth == 0)
+ myVLWidget->myGrowth->setText("");
+ else
+ myVLWidget->myGrowth->setValue( data.myGrowth );
+
+ std::vector<int> vector = data.myFacesWithLayers;
+ SMESH::long_array_var aVec = new SMESH::long_array;
+ aVec->length(vector.size());
+ for (size_t i = 0; i < vector.size(); i++)
+ aVec[i]=vector.at(i);
+ myVLWidget->myFacesWithLayers->SetListOfIDs(aVec);
+ vector = data.myImprintedFaces;
+ aVec = new SMESH::long_array;
+ aVec->length(vector.size());
+ for (size_t i = 0; i < vector.size(); i++)
+ aVec[i]=vector.at(i);
+ myVLWidget->myImprintedFaces->SetListOfIDs(aVec);
}
valStr += tr("Hexotic_VERBOSITY") + " = " + QString::number( data.myHexoticVerbosity ) + "; ";
valStr += tr("Hexotic_MAX_MEMORY") + " = " + QString::number( data.myHexoticMaxMemory ) + "; ";
valStr += tr("Hexotic_SD_MODE") + " = " + QString::number( data.myHexoticSdMode ) + "; ";
+ valStr += tr("Hexotic_TEXT_OPTIONS") + " = " + data.myTextOptions + ";";
std::cout << "Data: " << valStr.toStdString() << std::endl;
}
valStr += tr("Hexotic_VERBOSITY") + " = " + QString::number( data.myHexoticVerbosity) + "; ";
valStr += tr("Hexotic_MAX_MEMORY") + " = " + QString::number( data.myHexoticMaxMemory ) + "; ";
valStr += tr("Hexotic_SD_MODE") + " = " + QString::number( data.myHexoticSdMode) + "; ";
+ valStr += tr("Hexotic_TEXT_OPTIONS") + " = " + data.myTextOptions + "; ";
+
+ valStr += tr("Hexotic_NB_LAYERS") + " = " + QString::number(data.myNbLayers) + ";";
+ valStr += tr("Hexotic_FIRST_LAYER_SIZE") + " = " + QString::number(data.myFirstLayerSize) + ";";
+ valStr += tr("Hexotic_DIRECTION") + " = " + QString::number(data.myDirection) + ";";
+ valStr += tr("Hexotic_GROWTH") + " = " + QString::number(data.myGrowth) + ";";
// std::cout << "Data: " << valStr.toStdString() << std::endl;
h_data.myName = isCreation() && data ? data->Label : "";
h_data.myMinSize = h->GetMinSize();
h_data.myMaxSize = h->GetMaxSize();
+ h_data.myApproxAngle = h->GetGeomApproxAngle();
h_data.myHexesMinLevel = h->GetHexesMinLevel();
h_data.myHexesMaxLevel = h->GetHexesMaxLevel();
h_data.myHexoticIgnoreRidges = h->GetHexoticIgnoreRidges();
h_data.myHexoticVerbosity = h->GetHexoticVerbosity();
h_data.myHexoticMaxMemory = h->GetHexoticMaxMemory();
h_data.myHexoticSdMode = h->GetHexoticSdMode()-1;
-
+ h_data.myKeepFiles = h->GetKeepFiles();
+ h_data.myLogInStandardOutput = h->GetStandardOutputLog();
+ h_data.myRemoveLogOnSuccess = h->GetRemoveLogOnSuccess();
+ //h_data.myTextOptions = h->GetAdvancedOption();
+
+ HexoticPluginGUI_HypothesisCreator* that = (HexoticPluginGUI_HypothesisCreator*)this;
+ that->myOptions = h->GetOptionValues();
+ that->myCustomOptions = h->GetAdvancedOptionValues();
+
// Size maps
HexoticPlugin::HexoticPluginSizeMapsList_var sizeMaps = h->GetSizeMaps();
- for ( int i = 0 ; i < sizeMaps->length() ; i++)
+ for ( CORBA::ULong i = 0 ; i < sizeMaps->length() ; i++)
{
HexoticPlugin::HexoticPluginSizeMap aSizeMap = sizeMaps[i];
std::string entry = CORBA::string_dup(aSizeMap.entry.in());
double size = aSizeMap.size;
h_data.mySizeMaps[ entry ] = size;
- MESSAGE("READING Size map : entry "<<entry<<" size : "<<size)
+ MESSAGE("READING Size map : entry "<<entry<<" size : "<<size);
}
+ // Viscous layers
+ h_data.myNbLayers = h->GetNbLayers();
+ h_data.myFirstLayerSize = h->GetFirstLayerSize();
+ h_data.myDirection = h->GetDirection();
+ h_data.myGrowth = h->GetGrowth();
+ SMESH::long_array_var vector = h->GetFacesWithLayers();
+ for ( CORBA::ULong i = 0; i < vector->length(); i++)
+ h_data.myFacesWithLayers.push_back(vector[i]);
+ vector = h->GetImprintedFaces();
+ for ( CORBA::ULong i = 0; i < vector->length(); i++)
+ h_data.myImprintedFaces.push_back(vector[i]);
+
return true;
}
h->SetMinSize( h_data.myMinSize );
h->SetMaxSize( h_data.myMaxSize );
- h->SetHexesMinLevel( h_data.myHexesMinLevel );
- h->SetHexesMaxLevel( h_data.myHexesMaxLevel );
- h->SetHexoticIgnoreRidges( h_data.myHexoticIgnoreRidges );
- h->SetHexoticInvalidElements( h_data.myHexoticInvalidElements );
- h->SetHexoticSharpAngleThreshold( h_data.myHexoticSharpAngleThreshold );
- h->SetHexoticNbProc( h_data.myHexoticNbProc );
+ h->SetGeomApproxAngle( h_data.myApproxAngle );
h->SetHexoticWorkingDirectory( h_data.myHexoticWorkingDir.toLatin1().constData() );
h->SetHexoticVerbosity( h_data.myHexoticVerbosity );
- h->SetHexoticMaxMemory( h_data.myHexoticMaxMemory );
h->SetHexoticSdMode( h_data.myHexoticSdMode+1 );
+ h->SetKeepFiles( h_data.myKeepFiles );
+ h->SetStandardOutputLog( h_data.myLogInStandardOutput );
+ h->SetRemoveLogOnSuccess( h_data.myRemoveLogOnSuccess );
HexoticPlugin_Hypothesis::THexoticSizeMaps::const_iterator it;
for ( it = h_data.mySizeMaps.begin(); it != h_data.mySizeMaps.end(); it++ )
{
h->SetSizeMapEntry( it->first.c_str(), it->second );
- MESSAGE("STORING Size map : entry "<<it->first.c_str()<<" size : "<<it->second)
+ MESSAGE("STORING Size map : entry "<<it->first.c_str()<<" size : "<<it->second);
}
std::vector< std::string >::const_iterator entry_it;
for ( entry_it = mySizeMapsToRemove.begin(); entry_it!= mySizeMapsToRemove.end(); entry_it++ )
{
h->UnsetSizeMapEntry(entry_it->c_str());
}
+
+ // Viscous layers
+ h->SetNbLayers( h_data.myNbLayers );
+ h->SetFirstLayerSize( h_data.myFirstLayerSize );
+ h->SetDirection( h_data.myDirection );
+ h->SetGrowth( h_data.myGrowth );
+
+ std::vector<int> vector = h_data.myFacesWithLayers;
+ SMESH::long_array_var aVec = new SMESH::long_array;
+ aVec->length(vector.size());
+ for ( size_t i = 0; i < vector.size(); i++)
+ aVec[i]=vector.at(i);
+ h->SetFacesWithLayers( aVec );
+
+ vector = h_data.myImprintedFaces;
+ aVec = new SMESH::long_array;
+ aVec->length(vector.size());
+ for ( size_t i = 0; i < vector.size(); i++)
+ aVec[i]=vector.at(i);
+ h->SetImprintedFaces( aVec );
}
catch(const SALOME::SALOME_Exception& ex)
{
{
h_data.myName = myName ? myName->text() : "";
- h_data.myHexoticIgnoreRidges = myStdWidget->myHexoticIgnoreRidges->isChecked();
- h_data.myHexoticInvalidElements = myStdWidget->myHexoticInvalidElements->isChecked();
-
- h_data.myHexoticNbProc = myStdWidget->myHexoticNbProc->value();
- h_data.myHexoticWorkingDir = myStdWidget->myHexoticWorkingDir->text();
- h_data.myHexoticVerbosity = myStdWidget->myHexoticVerbosity->value();
- h_data.myHexoticMaxMemory = myStdWidget->myHexoticMaxMemory->value();
- h_data.myHexoticSdMode = myStdWidget->myHexoticSdMode->currentIndex();
-
h_data.myMinSize = myStdWidget->myMinSize->text().isEmpty() ? 0.0 : myStdWidget->myMinSize->value();
h_data.myMaxSize = myStdWidget->myMaxSize->text().isEmpty() ? 0.0 : myStdWidget->myMaxSize->value();
- h_data.myHexesMinLevel = myStdWidget->myHexesMinLevel->text().isEmpty() ? 0 : myStdWidget->myHexesMinLevel->value();
- h_data.myHexesMaxLevel = myStdWidget->myHexesMaxLevel->text().isEmpty() ? 0 : myStdWidget->myHexesMaxLevel->value();
- h_data.myHexoticSharpAngleThreshold = myStdWidget->myHexoticSharpAngleThreshold->text().isEmpty() ? 0 : myStdWidget->myHexoticSharpAngleThreshold->value();
+ h_data.myApproxAngle = myStdWidget->myGeomApproxAngle->text().isEmpty() ? 0.0 : myStdWidget->myGeomApproxAngle->value();
+ h_data.myHexoticSdMode = myStdWidget->myHexoticSdMode->currentIndex();
+
+ h_data.myHexoticWorkingDir = myAdvWidget->myHexoticWorkingDir->text();
+ h_data.myHexoticVerbosity = myAdvWidget->myHexoticVerbosity->value();
+ h_data.myKeepFiles = myAdvWidget->keepWorkingFilesCheck->isChecked();
+ h_data.myLogInStandardOutput = !myAdvWidget->logInFileCheck->isChecked();
+ h_data.myRemoveLogOnSuccess = myAdvWidget->removeLogOnSuccessCheck->isChecked();
// Size maps reading
bool ok = readSizeMapsFromWidgets( h_data );
if ( !ok )
return false;
+ h_data.myNbLayers = myVLWidget->myNbLayers->text().isEmpty() ? 0.0 : myVLWidget->myNbLayers->value();
+ h_data.myFirstLayerSize = myVLWidget->myFirstLayerSize->text().isEmpty() ? 0.0 : myVLWidget->myFirstLayerSize->value();
+ h_data.myDirection = myVLWidget->myDirection->currentIndex() == 0 ? true : false;
+ h_data.myGrowth = myVLWidget->myGrowth->text().isEmpty() ? 0.0 : myVLWidget->myGrowth->value();
+ SMESH::long_array_var ids = myVLWidget->myFacesWithLayers->GetListOfIDs();
+ for ( CORBA::ULong i = 0; i < ids->length(); i++)
+ h_data.myFacesWithLayers.push_back( ids[i] );
+ ids = myVLWidget->myImprintedFaces->GetListOfIDs();
+ for ( CORBA::ULong i = 0; i < ids->length(); i++)
+ h_data.myImprintedFaces.push_back( ids[i] );
+
printData(h_data);
return true;
// Set the size maps
h_data.mySizeMaps[ entry ] = size;
- MESSAGE("READING Size map from WIDGET: entry "<<entry<<" size : "<<size)
- }
+ MESSAGE("READING Size map from WIDGET: entry "<<entry<<" size : "<<size);
+ }
+ return true;
}
GEOM::GEOM_Object_var HexoticPluginGUI_HypothesisCreator::entryToObject( std::string entry) const
{
- SMESH_Gen_i* smeshGen_i = SMESH_Gen_i::GetSMESHGen();
- SALOMEDS::Study_var myStudy = smeshGen_i->GetCurrentStudy();
GEOM::GEOM_Object_var aGeomObj;
- SALOMEDS::SObject_var aSObj = myStudy->FindObjectID( entry.c_str() );
+ SALOMEDS::SObject_var aSObj = SMESH_Gen_i::GetSMESHGen()->getStudyServant()->FindObjectID( entry.c_str() );
if (!aSObj->_is_nil()) {
CORBA::Object_var obj = aSObj->GetObject();
aGeomObj = GEOM::GEOM_Object::_narrow(obj);
{
return "hexotic_hypo_page.html";
}
+
+void HexoticPluginGUI_HypothesisCreator::onTabChanged(int i)
+{
+ myVLWidget->myFacesWithLayers->ShowPreview( i == VL_TAB );
+ myVLWidget->myImprintedFaces->ShowPreview( false );
+}
+
+void HexoticPluginGUI_HypothesisCreator::onAddOption()
+{
+ myAdvWidget->AddOption( NULL, true );
+}
+
+void HexoticPluginGUI_HypothesisCreator::onDirBtnClicked()
+{
+ QString dir = SUIT_FileDlg::getExistingDirectory( dlg(), myAdvWidget->myHexoticWorkingDir->text(), QString() );
+ if ( !dir.isEmpty() )
+ myAdvWidget->myHexoticWorkingDir->setText( dir );
+}
