-// Copyright (C) 2007-2014 CEA/DEN, EDF R&D
+// Copyright (C) 2007-2015 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
// Main widget tabs identification
enum {
STD_TAB = 0,
- SMP_TAB
+ SMP_TAB,
+ VL_TAB
};
// Size maps tab, table columns order
SMESH_NumberFilter* aFilter = new SMESH_NumberFilter("GEOM", TopAbs_SHAPE, 0, SM_ShapeTypes);
// Selection widget
- myGeomSelWdg = new StdMeshersGUI_ObjectReferenceParamWdg( aFilter, mySmpWidget, /*multiSel=*/false,/*stretch=*/false);
+ myGeomSelWdg = new StdMeshersGUI_ObjectReferenceParamWdg( aFilter, mySmpWidget, /*multiSel=*/false);
myGeomSelWdg->SetDefaultText(tr("Hexotic_SEL_SHAPE"), "QLineEdit { color: grey }");
mySmpWidget->gridLayout->addWidget(myGeomSelWdg, 0, 1);
aSmpLayout->setMargin( 0 );
aSmpLayout->addWidget( mySmpWidget);
-
+ // Viscous Layers tab
+ QWidget* aVLGroup = new QWidget();
+ lay->addWidget( aVLGroup );
+
+ // Viscous layers widget creation and initialisation
+ myVLWidget = new HexoticPluginGUI_ViscousLayersWidget(aVLGroup);
+
+ 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);
+ }
+
+ // Add the viscous layers widget to a layout
+ QHBoxLayout* aVLLayout = new QHBoxLayout( aVLGroup );
+ aVLLayout->setSpacing( 6 );
+ aVLLayout->setMargin( 11 );
+ aVLLayout->addWidget( myVLWidget );
+
// resizeEvent();
aTabWidget->insertTab( STD_TAB, aStdGroup, tr( "SMESH_ARGUMENTS" ) );
aTabWidget->insertTab( SMP_TAB, aSmpGroup, tr( "LOCAL_SIZE" ) );
+ aTabWidget->insertTab( VL_TAB, aVLGroup, 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 ) ) );
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);
myStdWidget->myHexoticSdMode->setCurrentIndex(data.myHexoticSdMode);
+ myStdWidget->myTextOptions->setText(data.myTextOptions);
+
HexoticPlugin_Hypothesis::THexoticSizeMaps::const_iterator it = data.mySizeMaps.begin();
for ( int row = 0; it != data.mySizeMaps.end(); it++, row++ )
{
insertLocalSizeInWidget( entry, shapeName, size , row );
}
+ 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);
+
+
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;
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.myHexoticVerbosity = h->GetHexoticVerbosity();
h_data.myHexoticMaxMemory = h->GetHexoticMaxMemory();
h_data.myHexoticSdMode = h->GetHexoticSdMode()-1;
+ h_data.myTextOptions = h->GetTextOptions();
// 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());
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->SetHexoticVerbosity( h_data.myHexoticVerbosity );
h->SetHexoticMaxMemory( h_data.myHexoticMaxMemory );
h->SetHexoticSdMode( h_data.myHexoticSdMode+1 );
+ h->SetTextOptions( h_data.myTextOptions.toLatin1().constData() );
HexoticPlugin_Hypothesis::THexoticSizeMaps::const_iterator 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.myHexoticVerbosity = myStdWidget->myHexoticVerbosity->value();
h_data.myHexoticMaxMemory = myStdWidget->myHexoticMaxMemory->value();
h_data.myHexoticSdMode = myStdWidget->myHexoticSdMode->currentIndex();
+ h_data.myTextOptions = myStdWidget->myTextOptions->text();
h_data.myMinSize = myStdWidget->myMinSize->text().isEmpty() ? 0.0 : myStdWidget->myMinSize->value();
h_data.myMaxSize = myStdWidget->myMaxSize->text().isEmpty() ? 0.0 : myStdWidget->myMaxSize->value();
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;
{
return "hexotic_hypo_page.html";
}
+
+void HexoticPluginGUI_HypothesisCreator::onTabChanged(int i)
+{
+ myVLWidget->myFacesWithLayers->ShowPreview( i == VL_TAB );
+ myVLWidget->myImprintedFaces->ShowPreview( false );
+}
