mirror of
https://git.salome-platform.org/gitpub/modules/geom.git
synced 2025-01-22 12:00:33 +05:00
Added help page and revert some changes for a better ergonomy
This commit is contained in:
parent
f04d9d5e1f
commit
ee148cc6a5
8
doc/salome/gui/GEOM/input/extruded_boss_operation.doc
Normal file
8
doc/salome/gui/GEOM/input/extruded_boss_operation.doc
Normal file
@ -0,0 +1,8 @@
|
|||||||
|
/*!
|
||||||
|
|
||||||
|
\page extruded_boss_operation_page Extruded boss
|
||||||
|
|
||||||
|
The "Extruded boss" operation allows you to add material to an object by extruding a profile or a face
|
||||||
|
along the normal to its plane.
|
||||||
|
|
||||||
|
*/
|
8
doc/salome/gui/GEOM/input/extruded_cut_operation.doc
Normal file
8
doc/salome/gui/GEOM/input/extruded_cut_operation.doc
Normal file
@ -0,0 +1,8 @@
|
|||||||
|
/*!
|
||||||
|
|
||||||
|
\page extruded_cut_operation_page Extruded cut
|
||||||
|
|
||||||
|
The "Extruded cut" operation allows you to remove material from an object by extruding a profile or a face
|
||||||
|
along the normal to its plane.
|
||||||
|
|
||||||
|
*/
|
@ -24,6 +24,8 @@ which allow to:
|
|||||||
corners of a Wire with Planar Edges.</li>
|
corners of a Wire with Planar Edges.</li>
|
||||||
<li>Produce a \subpage fillet2d_operation_page "2D Fillet" on the corners of a Planar Face.</li>
|
<li>Produce a \subpage fillet2d_operation_page "2D Fillet" on the corners of a Planar Face.</li>
|
||||||
<li>Produce a \subpage chamfer_operation_page "Chamfer" on the selected edges of an object.</li>
|
<li>Produce a \subpage chamfer_operation_page "Chamfer" on the selected edges of an object.</li>
|
||||||
|
<li>Remove matter from an object by producing an \subpage extruded_cut_operation_page "Extruded Cut".</li>
|
||||||
|
<li>Add matter to an object by producing an \subpage extruded_boss_operation_page "Extruded Boss".</li>
|
||||||
</ul>
|
</ul>
|
||||||
|
|
||||||
*/
|
*/
|
||||||
|
@ -75,10 +75,12 @@ OperationGUI_ExtrudedFeatureDlg::OperationGUI_ExtrudedFeatureDlg(const int theOp
|
|||||||
case OperationGUI::BOSS:
|
case OperationGUI::BOSS:
|
||||||
image0 = QPixmap(aResMgr->loadPixmap("GEOM", tr("ICO_EXTRUDED_BOSS")));
|
image0 = QPixmap(aResMgr->loadPixmap("GEOM", tr("ICO_EXTRUDED_BOSS")));
|
||||||
aTitle = tr("GEOM_EXTRUDED_BOSS");
|
aTitle = tr("GEOM_EXTRUDED_BOSS");
|
||||||
|
setHelpFileName("extruded_boss_operation_page.html");
|
||||||
break;
|
break;
|
||||||
case OperationGUI::CUT:
|
case OperationGUI::CUT:
|
||||||
image0 = QPixmap( aResMgr->loadPixmap("GEOM", tr("ICO_EXTRUDED_CUT")));
|
image0 = QPixmap( aResMgr->loadPixmap("GEOM", tr("ICO_EXTRUDED_CUT")));
|
||||||
aTitle = tr("GEOM_EXTRUDED_CUT");
|
aTitle = tr("GEOM_EXTRUDED_CUT");
|
||||||
|
setHelpFileName("extruded_cut_operation_page.html");
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -209,8 +211,8 @@ void OperationGUI_ExtrudedFeatureDlg::SetEditCurrentArgument()
|
|||||||
|
|
||||||
myGroup->PushButton2->setDown(false);
|
myGroup->PushButton2->setDown(false);
|
||||||
myGroup->LineEdit2->setEnabled(false);
|
myGroup->LineEdit2->setEnabled(false);
|
||||||
|
|
||||||
globalSelection(); // close local selection
|
// globalSelection(); // close local selection
|
||||||
}
|
}
|
||||||
else if (send == myGroup->PushButton2) {
|
else if (send == myGroup->PushButton2) {
|
||||||
myEditCurrentArgument = myGroup->LineEdit2;
|
myEditCurrentArgument = myGroup->LineEdit2;
|
||||||
@ -218,9 +220,15 @@ void OperationGUI_ExtrudedFeatureDlg::SetEditCurrentArgument()
|
|||||||
myGroup->PushButton1->setDown(false);
|
myGroup->PushButton1->setDown(false);
|
||||||
myGroup->LineEdit1->setEnabled(false);
|
myGroup->LineEdit1->setEnabled(false);
|
||||||
|
|
||||||
globalSelection(); // close local selection to clear it
|
// globalSelection(); // close local selection to clear it
|
||||||
// localSelection( GEOM::GEOM_Object::_nil(), TopAbs_EDGE );
|
|
||||||
localSelection( GEOM::GEOM_Object::_nil(), TopAbs_FACE );
|
// // localSelection( GEOM::GEOM_Object::_nil(), TopAbs_EDGE );
|
||||||
|
// if (myObject1)
|
||||||
|
// {
|
||||||
|
// localSelection( myObject1.get(), TopAbs_FACE );
|
||||||
|
// // localSelection( myObject1.get(), TopAbs_EDGE );
|
||||||
|
// }
|
||||||
|
// /* localSelection( GEOM::GEOM_Object::_nil(), TopAbs_EDGE ); */
|
||||||
}
|
}
|
||||||
|
|
||||||
// enable line edit
|
// enable line edit
|
||||||
@ -360,7 +368,7 @@ bool OperationGUI_ExtrudedFeatureDlg::execute (ObjectList& objects)
|
|||||||
bool isProtrusion = (myOperation == OperationGUI::BOSS);
|
bool isProtrusion = (myOperation == OperationGUI::BOSS);
|
||||||
|
|
||||||
// Hide the initial shape in order to see the modifications on the preview
|
// Hide the initial shape in order to see the modifications on the preview
|
||||||
getDisplayer()->Erase(myObject1.get(),false,false);
|
erase(myObject1.get(),false);
|
||||||
|
|
||||||
GEOM::GEOM_Object_var anObj = anOper->MakeDraftPrism(myObject1.get(), myObject2.get(),
|
GEOM::GEOM_Object_var anObj = anOper->MakeDraftPrism(myObject1.get(), myObject2.get(),
|
||||||
myGroup->SpinBox_DX->value(),
|
myGroup->SpinBox_DX->value(),
|
||||||
@ -372,14 +380,14 @@ bool OperationGUI_ExtrudedFeatureDlg::execute (ObjectList& objects)
|
|||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
//=================================================================================
|
// //=================================================================================
|
||||||
// function : addSubshapeToStudy
|
// // function : addSubshapeToStudy
|
||||||
// purpose : virtual method to add new SubObjects if local selection
|
// // purpose : virtual method to add new SubObjects if local selection
|
||||||
//=================================================================================
|
// //=================================================================================
|
||||||
void OperationGUI_ExtrudedFeatureDlg::addSubshapesToStudy()
|
// void OperationGUI_ExtrudedFeatureDlg::addSubshapesToStudy()
|
||||||
{
|
// {
|
||||||
GEOMBase::PublishSubObject( myObject2.get() );
|
// GEOMBase::PublishSubObject( myObject2.get() );
|
||||||
}
|
// }
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
@ -61,7 +61,7 @@ protected:
|
|||||||
virtual GEOM::GEOM_IOperations_ptr createOperation();
|
virtual GEOM::GEOM_IOperations_ptr createOperation();
|
||||||
virtual bool isValid( QString& );
|
virtual bool isValid( QString& );
|
||||||
virtual bool execute( ObjectList& );
|
virtual bool execute( ObjectList& );
|
||||||
virtual void addSubshapesToStudy();
|
// virtual void addSubshapesToStudy();
|
||||||
|
|
||||||
private:
|
private:
|
||||||
void Init();
|
void Init();
|
||||||
|
Loading…
Reference in New Issue
Block a user