-// Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2010 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
//
// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
//
+
// GEOM GEOMGUI : GUI for Geometry component
// File : TransformationGUI_TranslationDlg.cxx
// Author : Lucien PIGNOLONI, Open CASCADE S.A.S.
#include <SUIT_Session.h>
#include <SUIT_ResourceMgr.h>
+#include <SUIT_Desktop.h>
+#include <SUIT_ViewWindow.h>
+#include <SUIT_ViewManager.h>
#include <SalomeApp_Application.h>
#include <LightApp_SelectionMgr.h>
+#include <GEOM_AISVector.hxx>
+#include <SOCC_Prs.h>
+#include <SOCC_ViewModel.h>
// OCCT Includes
#include <TopoDS_Shape.hxx>
#include <TopoDS_Edge.hxx>
+#include <TopoDS_Vertex.hxx>
#include <TopoDS.hxx>
#include <TopExp.hxx>
#include <TColStd_IndexedMapOfInteger.hxx>
#include <TopTools_IndexedMapOfShape.hxx>
+#include <ShapeAnalysis_Edge.hxx>
+#include <BRep_Tool.hxx>
+#include <BRepBuilderAPI_MakeEdge.hxx>
+#include <BRep_Builder.hxx>
#include <GEOMImpl_Types.hxx>
double step = resMgr->doubleValue("Geometry", "SettingsGeomStep", 100);
// min, max, step and decimals for spin boxes & initial values
- initSpinBox(GroupPoints->SpinBox1, COORD_MIN, COORD_MAX, step, 3); // VSR: TODO: DBL_DIGITS_DISPLAY
- initSpinBox(GroupPoints->SpinBox2, COORD_MIN, COORD_MAX, step, 3); // VSR: TODO: DBL_DIGITS_DISPLAY
- initSpinBox(GroupPoints->SpinBox3, COORD_MIN, COORD_MAX, step, 3); // VSR: TODO: DBL_DIGITS_DISPLAY
+ initSpinBox(GroupPoints->SpinBox1, COORD_MIN, COORD_MAX, step, "length_precision" );
+ initSpinBox(GroupPoints->SpinBox2, COORD_MIN, COORD_MAX, step, "length_precision" );
+ initSpinBox(GroupPoints->SpinBox3, COORD_MIN, COORD_MAX, step, "length_precision" );
GroupPoints->SpinBox1->setValue(0.0);
GroupPoints->SpinBox2->setValue(0.0);
return false;
initName();
+
+ myObjects.length(0);
+ myEditCurrentArgument = GroupPoints->LineEdit1;
+ myEditCurrentArgument->setText("");
+
// activate selection and connect selection manager
ConstructorsClicked(getConstructorId());
return true;
//Find SubShape Object in Father
GEOM::GEOM_Object_var aFindedObject = findObjectInFather(aSelectedObject, aName);
- if (aFindedObject == GEOM::GEOM_Object::_nil()) { // Object not found in study
+ if (aFindedObject->_is_nil()) { // Object not found in study
GEOM::GEOM_IShapesOperations_var aShapesOp =
getGeomEngine()->GetIShapesOperations(getStudyId());
aSelectedObject = aShapesOp->GetSubShape(aSelectedObject, anIndex);
}
// clear selection
- disconnect(myGeomGUI->getApp()->selectionMgr(), 0, this, 0);
+ /* disconnect(myGeomGUI->getApp()->selectionMgr(), 0, this, 0);
myGeomGUI->getApp()->selectionMgr()->clearSelected();
connect(myGeomGUI->getApp()->selectionMgr(), SIGNAL(currentSelectionChanged()),
- this, SLOT(SelectionIntoArgument()));
+ this, SLOT(SelectionIntoArgument()));*/
+ // here commented, because multiple objects can be selected IPAL 21437
displayPreview();
}
{
GEOMBase_Skeleton::ActivateThisDialog();
connect( myGeomGUI->getApp()->selectionMgr(), SIGNAL( currentSelectionChanged() ),
- this, SLOT( SelectionIntoArgument() ) );
+ this, SLOT( SelectionIntoArgument() ) );
ConstructorsClicked( getConstructorId() );
}
GEOM::GEOM_Object_var anObj;
+ GEOM::GEOM_ITransformOperations_var anOper = GEOM::GEOM_ITransformOperations::_narrow(getOperation());
+
switch (getConstructorId()) {
case 0:
{
if (toCreateCopy) {
for (int i = 0; i < myObjects.length(); i++) {
myCurrObject = myObjects[i];
- anObj = GEOM::GEOM_ITransformOperations::_narrow(getOperation())->
- TranslateDXDYDZCopy(myObjects[i], dx, dy, dz);
+ anObj = anOper->TranslateDXDYDZCopy(myObjects[i], dx, dy, dz);
if (!anObj->_is_nil()) {
if(!IsPreview())
- anObj->SetParameters(GeometryGUI::JoinObjectParameters(aParameters));
+ anObj->SetParameters(aParameters.join(":").toLatin1().constData());
objects.push_back(anObj._retn());
}
}
else {
for (int i = 0; i < myObjects.length(); i++) {
myCurrObject = myObjects[i];
- anObj = GEOM::GEOM_ITransformOperations::_narrow(getOperation())->
- TranslateDXDYDZ(myObjects[i], dx, dy, dz);
+ anObj = anOper->TranslateDXDYDZ(myObjects[i], dx, dy, dz);
if (!anObj->_is_nil()) {
if(!IsPreview()) {
- anObj->SetParameters(GeometryGUI::JoinObjectParameters(aParameters));
- updateAttributes(anObj, aParameters);
- }
+ anObj->SetParameters(aParameters.join(":").toLatin1().constData());
+ updateAttributes(anObj, aParameters);
+ }
objects.push_back(anObj._retn());
- }
+ }
}
}
res = true;
if (toCreateCopy) {
for (int i = 0; i < myObjects.length(); i++) {
myCurrObject = myObjects[i];
- anObj = GEOM::GEOM_ITransformOperations::_narrow(getOperation())->
- TranslateTwoPointsCopy(myObjects[i], myPoint1, myPoint2);
+ anObj = anOper->TranslateTwoPointsCopy(myObjects[i], myPoint1, myPoint2);
if (!anObj->_is_nil())
objects.push_back(anObj._retn());
}
else {
for (int i = 0; i < myObjects.length(); i++) {
myCurrObject = myObjects[i];
- anObj = GEOM::GEOM_ITransformOperations::_narrow(getOperation())->
- TranslateTwoPoints(myObjects[i], myPoint1, myPoint2);
+ anObj = anOper->TranslateTwoPoints(myObjects[i], myPoint1, myPoint2);
if (!anObj->_is_nil())
objects.push_back(anObj._retn());
}
QStringList aParameters;
aParameters<<GroupPoints->SpinBox3->text();
bool byDistance = GroupPoints->CheckBox1->isChecked();
+ createPathPreview( myVector );
+
if (byDistance) {
double aDistance = GroupPoints->SpinBox3->value();
for (int i = 0; i < myObjects.length(); i++) {
myCurrObject = myObjects[i];
- anObj = GEOM::GEOM_ITransformOperations::_narrow(getOperation())->
- TranslateVectorDistance(myObjects[i], myVector, aDistance, toCreateCopy);
+ anObj = anOper->TranslateVectorDistance(myObjects[i], myVector, aDistance, toCreateCopy);
if (!anObj->_is_nil()) {
- if(!IsPreview()) {
- anObj->SetParameters(GeometryGUI::JoinObjectParameters(aParameters));
- if (!toCreateCopy)
- updateAttributes(anObj, aParameters);
- }
+ if(!IsPreview()) {
+ anObj->SetParameters(aParameters.join(":").toLatin1().constData());
+ if (!toCreateCopy)
+ updateAttributes(anObj, aParameters);
+ }
objects.push_back(anObj._retn());
}
}
if (toCreateCopy) {
for (int i = 0; i < myObjects.length(); i++) {
myCurrObject = myObjects[i];
- anObj = GEOM::GEOM_ITransformOperations::_narrow(getOperation())->
- TranslateVectorCopy(myObjects[i], myVector);
+ anObj = anOper->TranslateVectorCopy(myObjects[i], myVector);
if (!anObj->_is_nil())
objects.push_back(anObj._retn());
}
else {
for (int i = 0; i < myObjects.length(); i++) {
myCurrObject = myObjects[i];
- anObj = GEOM::GEOM_ITransformOperations::_narrow(getOperation())->
- TranslateVector(myObjects[i], myVector);
+ anObj = anOper->TranslateVector(myObjects[i], myVector);
if (!anObj->_is_nil())
objects.push_back(anObj._retn());
}
anArgs[0] = myCurrObject;
getGeomEngine()->RestoreSubShapesSO(theStudy, theSObject, anArgs,
/*theFindMethod=*/GEOM::FSM_Transformed,
- /*theInheritFirstArg=*/true);
+ /*theInheritFirstArg=*/true,
+ mainFrame()->CheckBoxAddPrefix->isChecked());
}
}
addSubshapesToFather(objMap);
}
}
+
+//=================================================================================
+// function : createPathPreview
+// purpose :
+//=================================================================================
+void TransformationGUI_TranslationDlg::createPathPreview ( GEOM::GEOM_Object_var thePath )
+{
+ if ( IsPreview() ) {
+ TopoDS_Shape aShape;
+ GEOMBase::GetShape( thePath, aShape, TopAbs_SHAPE );
+ TopoDS_Edge anEdge = TopoDS::Edge( aShape );
+ ShapeAnalysis_Edge aShapeAnal;
+ TopoDS_Vertex aFirst = aShapeAnal.FirstVertex( anEdge );
+ TopoDS_Vertex aLast = aShapeAnal.LastVertex( anEdge );
+ TopoDS_Shape aVector = BRepBuilderAPI_MakeEdge(BRep_Tool::Pnt(aFirst), BRep_Tool::Pnt(aLast)).Shape();
+ const char* aName = "tmpVector";
+ Handle(GEOM_AISVector) anIO = new GEOM_AISVector( aVector, aName );
+
+ // add Prs to preview
+ SUIT_ViewWindow* vw = SUIT_Session::session()->activeApplication()->desktop()->activeWindow();
+ SOCC_Prs* aPrs = dynamic_cast<SOCC_Prs*>(((SOCC_Viewer*)(vw->getViewManager()->getViewModel()))->CreatePrs(0));
+ if (aPrs)
+ aPrs->AddObject(anIO);
+ GEOMBase_Helper::displayPreview( aPrs, false, true );
+ }
+}
