-// Copyright (C) 2007-2013 CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2014 CEA/DEN, EDF R&D, OPEN CASCADE
//
// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
// 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 <SalomeApp_Application.h>
+#include <Qtx.h>
+
// IDL includes
#include <SALOMEconfig.h>
#include CORBA_SERVER_HEADER(SMESH_MeshEditor)
}
namespace SMESH
{
- class TElementSimulation {
+ class TElementSimulationQuad {
SalomeApp_Application* myApplication;
SUIT_ViewWindow* myViewWindow;
SVTK_ViewWindow* myVTKViewWindow;
SMESH_FaceOrientationFilter* myFaceOrientationFilter;
public:
- TElementSimulation (SalomeApp_Application* theApplication)
+ TElementSimulationQuad (SalomeApp_Application* theApplication)
{
myApplication = theApplication;
SUIT_ViewManager* mgr = theApplication->activeViewManager();
myPreviewActor->PickableOff();
myPreviewActor->VisibilityOff();
myPreviewActor->SetMapper(myMapper);
-
+
+ QColor ffc, bfc;
+ int delta;
vtkProperty* myProp = vtkProperty::New();
- double aRGB[3], aBackRGB[3];
- GetColor( "SMESH", "fill_color", aRGB[0], aRGB[1], aRGB[2], QColor( 0, 170, 255 ) );
- myProp->SetColor( aRGB[0], aRGB[1], aRGB[2] );
+ SMESH::GetColor( "SMESH", "preview_color", ffc, delta, "0, 255, 0|-100" ) ;
+
+ myProp->SetColor( ffc.red() / 255. , ffc.green() / 255. , ffc.blue() / 255. );
myPreviewActor->SetProperty( myProp );
myProp->Delete();
vtkProperty* myBackProp = vtkProperty::New();
- GetColor( "SMESH", "backface_color", aBackRGB[0], aBackRGB[1], aBackRGB[2], QColor( 0, 0, 255 ) );
- myBackProp->SetColor( aBackRGB[0], aBackRGB[1], aBackRGB[2] );
+ bfc = Qtx::mainColorToSecondary(ffc, delta);
+ myBackProp->SetColor( bfc.red() / 255. , bfc.green() / 255. , bfc.blue() / 255. );
myPreviewActor->SetBackfaceProperty( myBackProp );
myBackProp->Delete();
myFaceOrientation->SetMapper(myFaceOrientationDataMapper);
vtkProperty* anOrientationProp = vtkProperty::New();
+ double aRGB[3];
GetColor( "SMESH", "orientation_color", aRGB[0], aRGB[1], aRGB[2], QColor( 255, 255, 255 ) );
anOrientationProp->SetColor( aRGB[0], aRGB[1], aRGB[2] );
myFaceOrientation->SetProperty( anOrientationProp );
}
- ~TElementSimulation()
+ ~TElementSimulationQuad()
{
if (FindVtkViewWindow(myApplication->activeViewManager(), myViewWindow)) {
myVTKViewWindow->RemoveActor(myPreviewActor);
\brief Simple 'busy state' flag locker.
\internal
*/
-
class BusyLocker
{
public:
\brief Simple editable table item.
\internal
*/
-
class IdEditItem: public QTableWidgetItem
{
public:
// function : SMESHGUI_AddQuadraticElementDlg()
// purpose : constructor
//=================================================================================
+
SMESHGUI_AddQuadraticElementDlg::SMESHGUI_AddQuadraticElementDlg( SMESHGUI* theModule,
const SMDSAbs_EntityType theType )
: QDialog( SMESH::GetDesktop( theModule ) ),
SalomeApp_Application* anApp = dynamic_cast<SalomeApp_Application*>
(SUIT_Session::session()->activeApplication());
- mySimulation = new SMESH::TElementSimulation (anApp);
+ mySimulation = new SMESH::TElementSimulationQuad (anApp);
mySelector = (SMESH::GetViewWindow( mySMESHGUI ))->GetSelector();
QString anElementName;
case SMDSEntity_BiQuad_Quadrangle:
anElementName = QString("BIQUADRATIC_QUADRANGLE");
break;
+ case SMDSEntity_BiQuad_Triangle:
+ anElementName = QString("BIQUADRATIC_TRIANGLE");
+ break;
case SMDSEntity_Quad_Tetra:
anElementName = QString("QUADRATIC_TETRAHEDRON");
break;
// function : ~SMESHGUI_AddQuadraticElementDlg()
// purpose : Destroys the object and frees any allocated resources
//=================================================================================
+
SMESHGUI_AddQuadraticElementDlg::~SMESHGUI_AddQuadraticElementDlg()
{
delete mySimulation;
// function : Init()
// purpose :
//=================================================================================
+
void SMESHGUI_AddQuadraticElementDlg::Init()
{
myRadioButton1->setChecked(true);
myNbCorners = 3;
myHelpFileName = "adding_quadratic_elements_page.html#?"; //Adding_triangles
break;
+ case SMDSEntity_BiQuad_Triangle:
+ aNumRows = 3;
+ myNbCorners = 3;
+ myNbCenterNodes = 1;
+ myHelpFileName = "adding_quadratic_elements_page.html#?"; //Adding_triangles
+ break;
case SMDSEntity_Quad_Quadrangle:
aNumRows = 4;
myNbCorners = 4;
// function : ClickOnApply()
// purpose :
//=================================================================================
-void SMESHGUI_AddQuadraticElementDlg::ClickOnApply()
+
+bool SMESHGUI_AddQuadraticElementDlg::ClickOnApply()
{
if( !isValid() )
- return;
+ return false;
if ( mySMESHGUI->isActiveStudyLocked() || myBusy || !IsValid() )
- return;
+ return false;
BusyLocker lock( myBusy );
break;
case SMDSEntity_Quad_Triangle:
case SMDSEntity_Quad_Quadrangle:
+ case SMDSEntity_BiQuad_Triangle:
case SMDSEntity_BiQuad_Quadrangle:
case SMDSEntity_Quad_Tetra:
case SMDSEntity_Quad_Pyramid:
int res = SUIT_MessageBox::question( this, tr( "SMESH_WRN_WARNING" ),
tr( "MESH_STANDALONE_GRP_CHOSEN" ).arg( aGroupName ),
tr( "SMESH_BUT_YES" ), tr( "SMESH_BUT_NO" ), 0, 1 );
- if ( res == 1 ) return;
+ if ( res == 1 ) return false;
}
aGroup = myGroups[idx-1];
}
anElemId = aMeshEditor->AddEdge(anArrayOfIdeces.inout()); break;
case SMDSEntity_Quad_Triangle:
case SMDSEntity_Quad_Quadrangle:
+ case SMDSEntity_BiQuad_Triangle:
case SMDSEntity_BiQuad_Quadrangle:
anElementType = SMESH::FACE;
anElemId = aMeshEditor->AddFace(anArrayOfIdeces.inout()); break;
updateButtons();
SMESHGUI::Modified();
+
+ return true;
}
//=================================================================================
// function : ClickOnOk()
// purpose :
//=================================================================================
+
void SMESHGUI_AddQuadraticElementDlg::ClickOnOk()
{
- ClickOnApply();
- reject();
+ if ( ClickOnApply() )
+ reject();
}
//=================================================================================
// function : reject()
// purpose :
//=================================================================================
+
void SMESHGUI_AddQuadraticElementDlg::reject()
{
mySelectionMgr->clearSelected();
// function : ClickOnHelp()
// purpose :
//=================================================================================
+
void SMESHGUI_AddQuadraticElementDlg::ClickOnHelp()
{
LightApp_Application* app = (LightApp_Application*)(SUIT_Session::session()->activeApplication());
// function : onTextChange()
// purpose :
//=================================================================================
+
void SMESHGUI_AddQuadraticElementDlg::onTextChange (const QString& theNewText)
{
if (myBusy) return;
// function : SelectionIntoArgument()
// purpose : Called when selection has changed
//=================================================================================
+
void SMESHGUI_AddQuadraticElementDlg::SelectionIntoArgument()
{
if (myBusy) return;
// get selected mesh
SALOME_ListIO aList;
- mySelectionMgr->selectedObjects(aList,SVTK_Viewer::Type());
+ mySelectionMgr->selectedObjects(aList);
if (aList.Extent() != 1)
{
anElementType = SMESH::EDGE; break;
case SMDSEntity_Quad_Triangle:
case SMDSEntity_Quad_Quadrangle:
+ case SMDSEntity_BiQuad_Triangle:
case SMDSEntity_BiQuad_Quadrangle:
anElementType = SMESH::FACE; break;
case SMDSEntity_Quad_Tetra:
// function : displaySimulation()
// purpose :
//=================================================================================
+
void SMESHGUI_AddQuadraticElementDlg::displaySimulation()
{
if ( IsValid() )
{
- SMESH::TElementSimulation::TVTKIds anIds;
+ SMESH::TElementSimulationQuad::TVTKIds anIds;
// Collect ids from the dialog
int anID;
// function : SetCurrentSelection()
// purpose :
//=================================================================================
+
void SMESHGUI_AddQuadraticElementDlg::SetCurrentSelection()
{
QPushButton* send = (QPushButton*)sender();
// function : DeactivateActiveDialog()
// purpose :
//=================================================================================
+
void SMESHGUI_AddQuadraticElementDlg::DeactivateActiveDialog()
{
if (GroupConstructors->isEnabled()) {
// function : ActivateThisDialog()
// purpose :
//=================================================================================
+
void SMESHGUI_AddQuadraticElementDlg::ActivateThisDialog()
{
/* Emit a signal to deactivate the active dialog */
// function : enterEvent()
// purpose :
//=================================================================================
+
void SMESHGUI_AddQuadraticElementDlg::enterEvent (QEvent*)
{
if (GroupConstructors->isEnabled())
// function : onReverse()
// purpose :
//=================================================================================
+
void SMESHGUI_AddQuadraticElementDlg::onReverse (int state)
{
mySimulation->SetVisibility(false);
updateButtons();
}
-
//=================================================================================
// function : IsValid()
// purpose :
//=================================================================================
+
bool SMESHGUI_AddQuadraticElementDlg::IsValid()
{
SMDS_Mesh* aMesh = 0;
// function : UpdateTable()
// purpose :
//=================================================================================
+
void SMESHGUI_AddQuadraticElementDlg::UpdateTable( bool theConersValidity )
{
QStringList aListCorners = myCornerNodes->text().split(" ", QString::SkipEmptyParts);
aLastColIds = LastEdgeIds;
break;
case SMDSEntity_Quad_Triangle:
+ case SMDSEntity_BiQuad_Triangle:
aFirstColIds = FirstTriangleIds;
aLastColIds = LastTriangleIds;
break;
}
}
-
//=================================================================================
// function : onTableActivate()
// purpose :
//=================================================================================
+
void SMESHGUI_AddQuadraticElementDlg::onCellDoubleClicked( int theRow, int theCol )
{
myCurrentLineEdit = 0;
updateButtons();
}
-
//=================================================================================
// function : onCellTextChange()
// purpose :
//=================================================================================
+
void SMESHGUI_AddQuadraticElementDlg::onCellTextChange(int theRow, int theCol)
{
myCurrentLineEdit = 0;
// function : keyPressEvent()
// purpose :
//=================================================================================
+
void SMESHGUI_AddQuadraticElementDlg::keyPressEvent( QKeyEvent* e )
{
QDialog::keyPressEvent( e );
}
}
+//=======================================================================
+//function : updateButtons
+//purpose :
+//=======================================================================
+
void SMESHGUI_AddQuadraticElementDlg::updateButtons()
{
bool valid = IsValid();
// function : isValid
// purpose :
//=================================================================================
+
bool SMESHGUI_AddQuadraticElementDlg::isValid()
{
if( GroupGroups->isChecked() && ComboBox_GroupName->currentText().isEmpty() ) {
