-// Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2011 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
+// 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.
+// 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.
//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-// Lesser General Public License for more details.
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+// Lesser General Public License for more details.
//
-// You should have received a copy of the GNU Lesser General Public
-// License along with this library; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
//
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
//
+
// File : SMESHGUI_MakeNodeAtPointDlg.cxx
// Author : Edward AGAPOV, Open CASCADE S.A.S.
// SMESH includes
setWindowTitle(tr("CAPTION"));
QVBoxLayout* aDlgLay = new QVBoxLayout (mainFrame());
- aDlgLay->setMargin(MARGIN);;
+ aDlgLay->setMargin(0);
aDlgLay->setSpacing(SPACING);
QWidget* aMainFrame = createMainFrame (mainFrame());
// constructor
- QGroupBox* aPixGrp = new QGroupBox(tr("MESH_PASS_THROUGH_POINT"), aFrame);
+ QGroupBox* aPixGrp = new QGroupBox(tr("MOVE_NODE"), aFrame);
QButtonGroup* aBtnGrp = new QButtonGroup(this);
QHBoxLayout* aPixGrpLayout = new QHBoxLayout(aPixGrp);
aPixGrpLayout->setMargin(MARGIN);
// coordinates
- QGroupBox* aCoordGrp = new QGroupBox(tr("SMESH_COORDINATES"), aFrame);
+ QGroupBox* aCoordGrp = new QGroupBox(tr("DESTINATION"), aFrame);
QHBoxLayout* aCoordGrpLayout = new QHBoxLayout(aCoordGrp);
aCoordGrpLayout->setMargin(MARGIN);
aCoordGrpLayout->setSpacing(SPACING);
QLabel* aZLabel = new QLabel(tr("SMESH_Z"), aCoordGrp);
myZ = new SMESHGUI_SpinBox(aCoordGrp);
- myX->RangeStepAndValidator(COORD_MIN, COORD_MAX, 10.0, DBL_DIGITS_DISPLAY);
- myY->RangeStepAndValidator(COORD_MIN, COORD_MAX, 10.0, DBL_DIGITS_DISPLAY);
- myZ->RangeStepAndValidator(COORD_MIN, COORD_MAX, 10.0, DBL_DIGITS_DISPLAY);
+ myX->RangeStepAndValidator(COORD_MIN, COORD_MAX, 10.0, "length_precision");
+ myY->RangeStepAndValidator(COORD_MIN, COORD_MAX, 10.0, "length_precision");
+ myZ->RangeStepAndValidator(COORD_MIN, COORD_MAX, 10.0, "length_precision");
aCoordGrpLayout->addWidget(myCoordBtn);
aCoordGrpLayout->addWidget(aXLabel);
aCoordGrpLayout->addWidget(myY);
aCoordGrpLayout->addWidget(aZLabel);
aCoordGrpLayout->addWidget(myZ);
-
- // Method selection
-
- QGroupBox* aMethodGrp = new QGroupBox(tr("METHOD"), aFrame);
- QHBoxLayout* aMethodGrpLayout = new QHBoxLayout(aMethodGrp);
- aMethodGrpLayout->setMargin(MARGIN);
- aMethodGrpLayout->setSpacing(SPACING);
-
- myMoveRBtn = new QRadioButton(tr("MOVE_EXISTING_METHOD"), aMethodGrp);
- myCreateRBtn = new QRadioButton(tr("CREATE_NEW_METHOD"), aMethodGrp);
-
- aMethodGrpLayout->addWidget(myMoveRBtn);
- aMethodGrpLayout->addWidget(myCreateRBtn);
+ aCoordGrpLayout->setStretchFactor(myX, 1);
+ aCoordGrpLayout->setStretchFactor(myY, 1);
+ aCoordGrpLayout->setStretchFactor(myZ, 1);
// node ID
myIdBtn->setCheckable(true);
myId = new QLineEdit(myNodeToMoveGrp);
myId->setValidator(new SMESHGUI_IdValidator(this, 1));
+
+ QWidget* aCoordWidget = new QWidget(myNodeToMoveGrp);
+
+ QLabel* aCurrentXLabel = new QLabel(tr("SMESH_X"), aCoordWidget);
+ myCurrentX = new SMESHGUI_SpinBox(aCoordWidget);
+ myCurrentX->setButtonSymbols(QAbstractSpinBox::NoButtons);
+ myCurrentX->setReadOnly(true);
+
+ QLabel* aCurrentYLabel = new QLabel(tr("SMESH_Y"), aCoordWidget);
+ myCurrentY = new SMESHGUI_SpinBox(aCoordWidget);
+ myCurrentY->setButtonSymbols(QAbstractSpinBox::NoButtons);
+ myCurrentY->setReadOnly(true);
+
+ QLabel* aCurrentZLabel = new QLabel(tr("SMESH_Z"), aCoordWidget);
+ myCurrentZ = new SMESHGUI_SpinBox(aCoordWidget);
+ myCurrentZ->setButtonSymbols(QAbstractSpinBox::NoButtons);
+ myCurrentZ->setReadOnly(true);
+
+ QLabel* aDXLabel = new QLabel(tr("SMESH_DX"), aCoordWidget);
+ myDX = new SMESHGUI_SpinBox(aCoordWidget);
+ myDX->setButtonSymbols(QAbstractSpinBox::NoButtons);
+ myDX->setReadOnly(true);
+
+ QLabel* aDYLabel = new QLabel(tr("SMESH_DY"), aCoordWidget);
+ myDY = new SMESHGUI_SpinBox(aCoordWidget);
+ myDY->setButtonSymbols(QAbstractSpinBox::NoButtons);
+ myDY->setReadOnly(true);
+
+ QLabel* aDZLabel = new QLabel(tr("SMESH_DZ"), aCoordWidget);
+ myDZ = new SMESHGUI_SpinBox(aCoordWidget);
+ myDZ->setButtonSymbols(QAbstractSpinBox::NoButtons);
+ myDZ->setReadOnly(true);
+
+ myCurrentX->RangeStepAndValidator(COORD_MIN, COORD_MAX, 10.0, "length_precision");
+ myCurrentY->RangeStepAndValidator(COORD_MIN, COORD_MAX, 10.0, "length_precision");
+ myCurrentZ->RangeStepAndValidator(COORD_MIN, COORD_MAX, 10.0, "length_precision");
+ myDX->RangeStepAndValidator(COORD_MIN, COORD_MAX, 10.0, "length_precision");
+ myDY->RangeStepAndValidator(COORD_MIN, COORD_MAX, 10.0, "length_precision");
+ myDZ->RangeStepAndValidator(COORD_MIN, COORD_MAX, 10.0, "length_precision");
+
+ QGridLayout* aCoordLayout = new QGridLayout(aCoordWidget);
+ aCoordLayout->setMargin(0);
+ aCoordLayout->setSpacing(SPACING);
+ aCoordLayout->addWidget(aCurrentXLabel, 0, 0);
+ aCoordLayout->addWidget(myCurrentX, 0, 1);
+ aCoordLayout->addWidget(aCurrentYLabel, 0, 2);
+ aCoordLayout->addWidget(myCurrentY, 0, 3);
+ aCoordLayout->addWidget(aCurrentZLabel, 0, 4);
+ aCoordLayout->addWidget(myCurrentZ, 0, 5);
+ aCoordLayout->addWidget(aDXLabel, 1, 0);
+ aCoordLayout->addWidget(myDX, 1, 1);
+ aCoordLayout->addWidget(aDYLabel, 1, 2);
+ aCoordLayout->addWidget(myDY, 1, 3);
+ aCoordLayout->addWidget(aDZLabel, 1, 4);
+ aCoordLayout->addWidget(myDZ, 1, 5);
+ aCoordLayout->setColumnStretch(1, 1);
+ aCoordLayout->setColumnStretch(3, 1);
+ aCoordLayout->setColumnStretch(5, 1);
+
myAutoSearchChkBox = new QCheckBox( tr("AUTO_SEARCH"), myNodeToMoveGrp);
myPreviewChkBox = new QCheckBox( tr("PREVIEW"), myNodeToMoveGrp);
myNodeToMoveGrpLayout->addWidget( idLabel, 0, 0 );
myNodeToMoveGrpLayout->addWidget( myIdBtn, 0, 1 );
myNodeToMoveGrpLayout->addWidget( myId, 0, 2 );
- myNodeToMoveGrpLayout->addWidget( myAutoSearchChkBox, 1, 0, 1, 3 );
- myNodeToMoveGrpLayout->addWidget( myPreviewChkBox, 2, 0, 1, 3 );
+ myNodeToMoveGrpLayout->addWidget( aCoordWidget, 1, 0, 1, 3 );
+ myNodeToMoveGrpLayout->addWidget( myAutoSearchChkBox, 2, 0, 1, 3 );
+ myNodeToMoveGrpLayout->addWidget( myPreviewChkBox, 3, 0, 1, 3 );
QVBoxLayout* aLay = new QVBoxLayout(aFrame);
aLay->addWidget(aPixGrp);
aLay->addWidget(aCoordGrp);
- aLay->addWidget(aMethodGrp);
aLay->addWidget(myNodeToMoveGrp);
connect(myCoordBtn, SIGNAL (toggled(bool)), this, SLOT(ButtonToggled(bool)));
- connect(myMoveRBtn, SIGNAL (toggled(bool)), this, SLOT(ButtonToggled(bool)));
- connect(myCreateRBtn, SIGNAL (toggled(bool)), this, SLOT(ButtonToggled(bool)));
connect(myIdBtn, SIGNAL (toggled(bool)), this, SLOT(ButtonToggled(bool)));
connect(myAutoSearchChkBox, SIGNAL (toggled(bool)), this, SLOT(ButtonToggled(bool)));
- myMoveRBtn->setChecked(true);
myIdBtn->setChecked(true);
myAutoSearchChkBox->setChecked(true);
{
myCoordBtn->setChecked( !on );
}
- else if ( aSender == myMoveRBtn ) // move node method
- {
- myNodeToMoveGrp->setEnabled( true );
- }
- else if ( aSender == myCreateRBtn ) // create node method
- {
- myNodeToMoveGrp->setEnabled( false );
- myCoordBtn->setChecked( true );
- }
}
if ( aSender == myAutoSearchChkBox ) // automatic node search
{
if ( on ) {
+ myCurrentX->SetValue(0);
+ myCurrentY->SetValue(0);
+ myCurrentZ->SetValue(0);
+ myDX->SetValue(0);
+ myDY->SetValue(0);
+ myDZ->SetValue(0);
myId->setText("");
myId->setReadOnly ( true );
myIdBtn->setChecked( false );
connect(myDlg->myId,SIGNAL (textChanged(const QString&)),SLOT(redisplayPreview()));
connect(myDlg->myPreviewChkBox, SIGNAL (toggled(bool)),SLOT(redisplayPreview()));
connect(myDlg->myAutoSearchChkBox,SIGNAL (toggled(bool)),SLOT(redisplayPreview()));
- connect(myDlg->myMoveRBtn, SIGNAL (toggled(bool)),SLOT(redisplayPreview()));
- connect(myDlg->myCreateRBtn, SIGNAL (toggled(bool)),SLOT(redisplayPreview()));
}
//=======================================================================
myDlg->myX->SetValue(0);
myDlg->myY->SetValue(0);
myDlg->myZ->SetValue(0);
+ myDlg->myCurrentX->SetValue(0);
+ myDlg->myCurrentY->SetValue(0);
+ myDlg->myCurrentZ->SetValue(0);
+ myDlg->myDX->SetValue(0);
+ myDlg->myDY->SetValue(0);
+ myDlg->myDZ->SetValue(0);
myDlg->myId->setText("");
myDlg->show();
if (aMeshEditor->_is_nil())
return true;
- int aResult = 0;
- if ( myDlg->myCreateRBtn->isChecked() )
- {
- aResult = aMeshEditor->AddNode(myDlg->myX->GetValue(),
- myDlg->myY->GetValue(),
- myDlg->myZ->GetValue());
- }
- else
- {
- int anId = myDlg->myId->text().toInt();
- aResult = aMeshEditor->MoveClosestNodeToPoint(myDlg->myX->GetValue(),
- myDlg->myY->GetValue(),
- myDlg->myZ->GetValue(),
- anId);
- }
+ bool ok;
+ int anId = myDlg->myId->text().toInt( &ok );
+ if( !ok || anId < 1 )
+ anId = aMeshEditor->FindNodeClosestTo(myDlg->myX->GetValue(),
+ myDlg->myY->GetValue(),
+ myDlg->myZ->GetValue());
+
+ int aResult = aMeshEditor->MoveNode(anId,
+ myDlg->myX->GetValue(),
+ myDlg->myY->GetValue(),
+ myDlg->myZ->GetValue() );
+
if (aResult)
{
QStringList aParameters;
aParameters << myDlg->myZ->text();
aMesh->SetParameters( aParameters.join(":").toLatin1().constData() );
+ myDlg->myCurrentX->SetValue(0);
+ myDlg->myCurrentY->SetValue(0);
+ myDlg->myCurrentZ->SetValue(0);
+ myDlg->myDX->SetValue(0);
+ myDlg->myDY->SetValue(0);
+ myDlg->myDZ->SetValue(0);
myDlg->myId->setText("");
SALOME_ListIO aList;
aList.Append(myMeshActor->getIO());
selectionMgr()->setSelectedObjects(aList,false);
SMESH::UpdateView();
+ SMESHGUI::Modified();
}
}
catch (const SALOME::SALOME_Exception& S_ex) {
{
bool ok = true;
if ( myMeshActor &&
- myDlg->myMoveRBtn->isChecked() &&
!myDlg->myAutoSearchChkBox->isChecked() )
{
ok = false;
myNoPreview = false;
redisplayPreview();
}
+
+ if (const SMDS_MeshNode* aCurrentNode = aMesh->FindNode(myDlg->myId->text().toInt())) {
+ double x = aCurrentNode->X();
+ double y = aCurrentNode->Y();
+ double z = aCurrentNode->Z();
+ double dx = myDlg->myX->GetValue() - x;
+ double dy = myDlg->myY->GetValue() - y;
+ double dz = myDlg->myZ->GetValue() - z;
+ myDlg->myCurrentX->SetValue(x);
+ myDlg->myCurrentY->SetValue(y);
+ myDlg->myCurrentZ->SetValue(z);
+ myDlg->myDX->SetValue(dx);
+ myDlg->myDY->SetValue(dy);
+ myDlg->myDZ->SetValue(dz);
+ }
}
}
}
SMESH::MeshPreviewStruct_var aMeshPreviewStruct;
bool moveShown = false;
- if ( myDlg->myMoveRBtn->isChecked() && // Move method
- myMeshActor)
+ if ( myMeshActor)
{
const bool autoSearch = myDlg->myAutoSearchChkBox->isChecked();
const bool preview = myDlg->myPreviewChkBox->isChecked();
if ( autoSearch )
+ {
+ myDlg->myCurrentX->SetValue(0);
+ myDlg->myCurrentY->SetValue(0);
+ myDlg->myCurrentZ->SetValue(0);
+ myDlg->myDX->SetValue(0);
+ myDlg->myDY->SetValue(0);
+ myDlg->myDZ->SetValue(0);
myDlg->myId->setText("");
+ }
QString msg;
- if ( preview && ( autoSearch || isValid( msg ) ))
+ if ( autoSearch || isValid( msg ) )
{
try {
SMESH::SMESH_Mesh_var aMesh = SMESH::GetMeshByIO(myMeshActor->getIO());
{
SUIT_OverrideCursor aWaitCursor;
+ int anId = 0;
+ if ( autoSearch )
+ anId = aPreviewer->FindNodeClosestTo(myDlg->myX->GetValue(),
+ myDlg->myY->GetValue(),
+ myDlg->myZ->GetValue());
+ else
+ anId = myDlg->myId->text().toInt();
+
// find id and/or just compute preview
- int anId = aPreviewer->MoveClosestNodeToPoint(myDlg->myX->GetValue(),
- myDlg->myY->GetValue(),
- myDlg->myZ->GetValue(),
- myDlg->myId->text().toInt());
+ aPreviewer->MoveNode(anId,
+ myDlg->myX->GetValue(),
+ myDlg->myY->GetValue(),
+ myDlg->myZ->GetValue());
if ( autoSearch ) { // set found id
QString idTxt("%1");
if ( anId > 0 )
idTxt = "";
myDlg->myId->setText( idTxt );
}
+
+ SMESH::double_array* aXYZ = aMesh->GetNodeXYZ( anId );
+ if( aXYZ && aXYZ->length() >= 3 )
+ {
+ double x = aXYZ->operator[](0);
+ double y = aXYZ->operator[](1);
+ double z = aXYZ->operator[](2);
+ double dx = myDlg->myX->GetValue() - x;
+ double dy = myDlg->myY->GetValue() - y;
+ double dz = myDlg->myZ->GetValue() - z;
+ myDlg->myCurrentX->SetValue(x);
+ myDlg->myCurrentY->SetValue(y);
+ myDlg->myCurrentZ->SetValue(z);
+ myDlg->myDX->SetValue(dx);
+ myDlg->myDY->SetValue(dy);
+ myDlg->myDZ->SetValue(dz);
+ }
+
if ( preview ) { // fill preview data
aMeshPreviewStruct = aPreviewer->GetPreviewData();
moveShown = ( anId > 0 );
