-// GEOM GEOMGUI : GUI for Geometry component
+// Copyright (C) 2007-2010 CEA/DEN, EDF R&D, OPEN CASCADE
//
-// Copyright (C) 2003 OPEN CASCADE
-//
-// 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.
-//
-// 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
+// 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 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
//
-// File : BasicGUI_CurveDlg.cxx
-// Author : Nicolas REJNERI
-// Module : GEOM
-// $Header$
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-#include "BasicGUI_CurveDlg.h"
+// GEOM GEOMGUI : GUI for Geometry component
+// File : BasicGUI_CurveDlg.cxx
+// Author : Lucien PIGNOLONI, Open CASCADE S.A.S.
-#include "SUIT_Desktop.h"
-#include "SUIT_Session.h"
-#include "SalomeApp_Application.h"
-#include "SalomeApp_Study.h"
-#include "LightApp_SelectionMgr.h"
+#include "BasicGUI_CurveDlg.h"
-#include <qlabel.h>
+#include <DlgRef.h>
+#include <GeometryGUI.h>
+#include <GEOMBase.h>
-#include "utilities.h"
+#include <SUIT_ResourceMgr.h>
+#include <SUIT_Session.h>
+#include <SalomeApp_Application.h>
+#include <SalomeApp_Study.h>
+#include <LightApp_SelectionMgr.h>
-#include "SALOME_ListIteratorOfListIO.hxx"
-#include "SALOME_ListIO.hxx"
+#include <SALOME_ListIteratorOfListIO.hxx>
+#include <SALOME_ListIO.hxx>
#include <TopoDS_Shape.hxx>
#include <TopoDS.hxx>
#include <TColStd_IndexedMapOfInteger.hxx>
#include <TopTools_IndexedMapOfShape.hxx>
-#include "GEOMImpl_Types.hxx"
-
-using namespace std;
-#include <string>
+#include <GEOMImpl_Types.hxx>
//=================================================================================
// class : BasicGUI_CurveDlg()
-// purpose : Constructs a BasicGUI_CurveDlg which is a child of 'parent', with the
+// purpose : Constructs a BasicGUI_CurveDlg which is a child of 'parent', with the
// name 'name' and widget flags set to 'f'.
// The dialog will by default be modeless, unless you set 'modal' to
// TRUE to construct a modal dialog.
//=================================================================================
-BasicGUI_CurveDlg::BasicGUI_CurveDlg(GeometryGUI* theGeometryGUI, QWidget* parent,
- const char* name, bool modal, WFlags fl)
- :GEOMBase_Skeleton(theGeometryGUI, parent, name, modal, WStyle_Customize |
- WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu)
+BasicGUI_CurveDlg::BasicGUI_CurveDlg( GeometryGUI* theGeometryGUI, QWidget* parent,
+ bool modal, Qt::WindowFlags fl )
+ : GEOMBase_Skeleton( theGeometryGUI, parent, modal, fl )
{
- QPixmap image0(SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM",tr("ICON_DLG_POLYLINE")));
- QPixmap image2(SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM",tr("ICON_DLG_SPLINE")));
- QPixmap image3(SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM",tr("ICON_DLG_BEZIER")));
+ QPixmap image0( SUIT_Session::session()->resourceMgr()->loadPixmap( "GEOM", tr( "ICON_DLG_POLYLINE" ) ) );
+ QPixmap image2( SUIT_Session::session()->resourceMgr()->loadPixmap( "GEOM", tr( "ICON_DLG_SPLINE" ) ) );
+ QPixmap image3( SUIT_Session::session()->resourceMgr()->loadPixmap( "GEOM", tr( "ICON_DLG_BEZIER" ) ) );
+ QPixmap image1( SUIT_Session::session()->resourceMgr()->loadPixmap( "GEOM", tr( "ICON_SELECT" ) ) );
- QPixmap image1(SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM",tr("ICON_SELECT")));
-
- setCaption(tr("GEOM_CURVE_TITLE"));
+ setWindowTitle( tr( "GEOM_CURVE_TITLE" ) );
/***************************************************************/
- RadioButton1->setPixmap( image0 );
- RadioButton2->setPixmap( image3 );
- RadioButton3->setPixmap( image2 );
+ mainFrame()->RadioButton1->setIcon( image0 );
+ mainFrame()->RadioButton2->setIcon( image3 );
+ mainFrame()->RadioButton3->setIcon( image2 );
+
+ GroupPoints = new DlgRef_1Sel3Check( centralWidget() );
- GroupPoints = new DlgRef_1Sel_QTD( this, "GroupPoints" );
GroupPoints->GroupBox1->setTitle( tr( "GEOM_NODES" ) );
- GroupPoints->TextLabel1->setText( tr("GEOM_POINTS") );
- GroupPoints->PushButton1->setPixmap(image1);
+ GroupPoints->TextLabel1->setText( tr( "GEOM_POINTS" ) );
+ GroupPoints->PushButton1->setIcon( image1 );
+ GroupPoints->PushButton1->setDown( true );
GroupPoints->LineEdit1->setReadOnly( true );
- Layout1->addWidget(GroupPoints, 2, 0);
+ GroupPoints->CheckButton1->setText( tr( "GEOM_IS_CLOSED" ) );
+ GroupPoints->CheckButton1->setChecked(false);
+ //GroupPoints->CheckButton1->hide();
+
+ GroupPoints->CheckButton2->setText( tr( "GEOM_IS_REORDER" ) );
+ GroupPoints->CheckButton2->setChecked(false);
+ GroupPoints->CheckButton2->hide();
+
+ GroupPoints->CheckButton3->hide();
+
+ QVBoxLayout* layout = new QVBoxLayout( centralWidget() );
+ layout->setMargin( 0 ); layout->setSpacing( 6 );
+ layout->addWidget( GroupPoints );
/***************************************************************/
- setHelpFileName("create_curve_page.html");
+ setHelpFileName( "create_curve_page.html" );
Init();
}
/* init variables */
myEditCurrentArgument = GroupPoints->LineEdit1;
- myPoints = new GEOM::ListOfGO();
- myPoints->length( 0 );
+ myPoints.clear();
globalSelection(); // close local contexts, if any
- localSelection(GEOM::GEOM_Object::_nil(), TopAbs_VERTEX);
+ localSelection( GEOM::GEOM_Object::_nil(), TopAbs_VERTEX );
+
+ showOnlyPreviewControl();
/* signals and slots connections */
- connect(buttonCancel, SIGNAL(clicked()), this, SLOT(ClickOnCancel()));
- connect(myGeomGUI, SIGNAL(SignalDeactivateActiveDialog()), this, SLOT(DeactivateActiveDialog()));
- connect(myGeomGUI, SIGNAL(SignalCloseAllDialogs()), this, SLOT(ClickOnCancel()));
-
- connect(buttonOk, SIGNAL(clicked()), this, SLOT(ClickOnOk()));
- connect(buttonApply, SIGNAL(clicked()), this, SLOT(ClickOnApply()));
- connect(GroupConstructors, SIGNAL(clicked(int)), this, SLOT(ConstructorsClicked(int)));
+ connect( myGeomGUI, SIGNAL( SignalDeactivateActiveDialog() ), this, SLOT( DeactivateActiveDialog( ) ) );
+ connect( myGeomGUI, SIGNAL( SignalCloseAllDialogs() ), this, SLOT( ClickOnCancel() ) );
+
+ connect( buttonOk(), SIGNAL( clicked() ), this, SLOT( ClickOnOk() ) );
+ connect( buttonApply(), SIGNAL( clicked() ), this, SLOT( ClickOnApply() ) );
+
+ connect( this, SIGNAL( constructorsClicked( int ) ), this, SLOT( ConstructorsClicked( int ) ) );
- connect(GroupPoints->PushButton1, SIGNAL(clicked()), this, SLOT(SetEditCurrentArgument()));
- connect(GroupPoints->LineEdit1, SIGNAL(returnPressed()), this, SLOT(LineEditReturnPressed()));
+ connect( GroupPoints->PushButton1, SIGNAL( clicked() ), this, SLOT( SetEditCurrentArgument() ) );
- connect(myGeomGUI->getApp()->selectionMgr(),
- SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument())) ;
+ connect( GroupPoints->CheckButton1, SIGNAL( toggled(bool) ), this, SLOT( CheckButtonToggled() ) );
+ connect( GroupPoints->CheckButton2, SIGNAL( toggled(bool) ), this, SLOT( CheckButtonToggled() ) );
+
+ connect( myGeomGUI->getApp()->selectionMgr(),
+ SIGNAL( currentSelectionChanged() ), this, SLOT( SelectionIntoArgument() ) );
initName( tr( "GEOM_CURVE" ) );
- ConstructorsClicked( 0 );
+ resize(100,100);
+ ConstructorsClicked( 0 );
}
//=================================================================================
void BasicGUI_CurveDlg::ConstructorsClicked( int id )
{
QString aTitle = tr( id == 0 ? "GEOM_POLYLINE" : id == 1 ? "GEOM_BEZIER" : "GEOM_INTERPOL" );
- GroupConstructors->setTitle( aTitle );
-
- myPoints = new GEOM::ListOfGO();
- myPoints->length( 0 );
+ mainFrame()->GroupConstructors->setTitle( aTitle );
- myEditCurrentArgument->setText("");
+ if (id == 0) { // polyline (wire)
+ //GroupPoints->CheckButton1->hide();
+ GroupPoints->CheckButton1->setText( tr( "GEOM_BUILD_CLOSED_WIRE" ) );
+ GroupPoints->CheckButton2->hide();
+ }
+ else if (id == 1) { // bezier
+ //GroupPoints->CheckButton1->hide();
+ GroupPoints->CheckButton1->setText( tr( "GEOM_IS_CLOSED" ) );
+ GroupPoints->CheckButton2->hide();
+ }
+ else { // b-spline
+ //GroupPoints->CheckButton1->show();
+ GroupPoints->CheckButton1->setText( tr( "GEOM_IS_CLOSED" ) );
+ GroupPoints->CheckButton2->show();
+ }
+
+ myPoints.clear();
+
+ myEditCurrentArgument->setText( "" );
+ qApp->processEvents();
+ updateGeometry();
+ resize( minimumSizeHint() );
+ SelectionIntoArgument();
}
//=================================================================================
void BasicGUI_CurveDlg::SetEditCurrentArgument()
{
- if ( sender() == GroupPoints->PushButton1 )
+ if ( sender() == GroupPoints->PushButton1 )
myEditCurrentArgument = GroupPoints->LineEdit1;
myEditCurrentArgument->setFocus();
SelectionIntoArgument();
}
-
//=================================================================================
-// function : LineEditReturnPressed()
+// function : CheckButtonToggled()
// purpose :
//=================================================================================
-void BasicGUI_CurveDlg::LineEditReturnPressed()
+void BasicGUI_CurveDlg::CheckButtonToggled()
{
- if ( sender() == GroupPoints->LineEdit1 )
- {
- myEditCurrentArgument = GroupPoints->LineEdit1;
- GEOMBase_Skeleton::LineEditReturnPressed();
- }
+ processPreview();
}
//=================================================================================
//=================================================================================
void BasicGUI_CurveDlg::ClickOnOk()
{
+ setIsApplyAndClose( true );
if ( ClickOnApply() )
ClickOnCancel();
}
return false;
initName();
- ConstructorsClicked( getConstructorId() );
globalSelection(); // close local contexts, if any
- localSelection(GEOM::GEOM_Object::_nil(), TopAbs_VERTEX);
+ localSelection( GEOM::GEOM_Object::_nil(), TopAbs_VERTEX );
return true;
}
-//=======================================================================
-// function : ClickOnCancel()
-// purpose :
-//=======================================================================
-void BasicGUI_CurveDlg::ClickOnCancel()
-{
- GEOMBase_Skeleton::ClickOnCancel();
-}
-
-//=================================================================================
-/*! function : isPointInList()
- * purpose : Check is point (theObject) in the list \a thePoints.
- * \author enk
- * \retval -1, if point not in list, else 1 in list
- */
-//=================================================================================
-static int isPointInList(list<GEOM::GEOM_Object_var>& thePoints,
- GEOM::GEOM_Object_var& theObject)
+static void synchronize( QList<GEOM::GeomObjPtr>& left, QList<GEOM::GeomObjPtr>& right )
{
- int len = thePoints.size();
-
- if(len<1){
- return -1;
- }
-
- for(list<GEOM::GEOM_Object_var>::iterator i=thePoints.begin();i!=thePoints.end();i++)
- if (string((*i)->GetEntry()) == string(theObject->GetEntry())){
- return 1;
- }
-
- return -1;
-}
-
-//=================================================================================
-/*! function : removeUnnecessaryPnt()
- * purpose : Remove unnecessary points from list \a theOldPoints
- * \author enk
- * \li \a theOldPoints - ordered sequence with unnecessary point
- * \li \a theNewPoints - not ordered sequence with necessary points
- */
-//=================================================================================
-static void removeUnnecessaryPnt(list<GEOM::GEOM_Object_var>& theOldPoints,
- GEOM::ListOfGO_var& theNewPoints)
-{
- list<GEOM::GEOM_Object_var> objs_to_remove;
- for(list<GEOM::GEOM_Object_var>::iterator i=theOldPoints.begin();i!=theOldPoints.end();i++){
+ // 1. remove items from the "left" list that are not in the "right" list
+ QMutableListIterator<GEOM::GeomObjPtr> it1( left );
+ while ( it1.hasNext() ) {
+ GEOM::GeomObjPtr o1 = it1.next();
bool found = false;
- for (int j=0;j<theNewPoints->length() && !found ; j++){
- if(string((*i)->GetEntry()) == string(theNewPoints[j]->GetEntry())){
- found = true;
- }
- }
- if(!found){
- objs_to_remove.push_back(*i);
- //cout << "removed: " << (*i)->GetEntry() << endl;
- }
+ QMutableListIterator<GEOM::GeomObjPtr> it2( right );
+ while ( it2.hasNext() && !found )
+ found = o1 == it2.next();
+ if ( !found )
+ it1.remove();
}
- for(list<GEOM::GEOM_Object_var>::iterator i=objs_to_remove.begin();i!=objs_to_remove.end();i++){
- theOldPoints.remove(*i);
+ // 2. add items from the "right" list that are not in the "left" list (to keep selection order)
+ it1 = right;
+ while ( it1.hasNext() ) {
+ GEOM::GeomObjPtr o1 = it1.next();
+ bool found = false;
+ QMutableListIterator<GEOM::GeomObjPtr> it2( left );
+ while ( it2.hasNext() && !found )
+ found = o1 == it2.next();
+ if ( !found )
+ left << o1;
}
}
//=================================================================================
void BasicGUI_CurveDlg::SelectionIntoArgument()
{
- myEditCurrentArgument->setText("");
-
- Standard_Boolean aRes = Standard_False;
- int IOC = IObjectCount();
- // bool is_append = myPoints->length() < IOC; // if true - add point, else remove
- // myPoints->length( IOC ); // this length may be greater than number of objects,
- // that will actually be put into myPoints
-
- LightApp_SelectionMgr* aSelMgr = myGeomGUI->getApp()->selectionMgr();
- SalomeApp_Application* app =
- dynamic_cast< SalomeApp_Application* >( SUIT_Session::session()->activeApplication() );
- SalomeApp_Study* appStudy = dynamic_cast<SalomeApp_Study*>( app->activeStudy() );
- _PTR(Study) aDStudy = appStudy->studyDS();
- GEOM::GEOM_IShapesOperations_var aShapesOp = getGeomEngine()->GetIShapesOperations( getStudyId() );
-
- int anIndex;
- TopoDS_Shape aShape;
- TColStd_IndexedMapOfInteger aMapIndexes;
- GEOM::GEOM_Object_var anObject;
- std::list<GEOM::GEOM_Object_var> aList;
- SALOME_ListIO selected;
- aSelMgr->selectedObjects( selected, QString::null, false );
-
- for ( SALOME_ListIteratorOfListIO anIt( selected ); anIt.More(); anIt.Next() )
- {
- GEOM::GEOM_Object_var aSelectedObject = GEOMBase::ConvertIOinGEOMObject( anIt.Value(), aRes );
-
- if ( !CORBA::is_nil( aSelectedObject ) && aRes )
- {
- if ( GEOMBase::GetShape( aSelectedObject, aShape, TopAbs_SHAPE ) && !aShape.IsNull() )
- {
- aSelMgr->GetIndexes( anIt.Value(), aMapIndexes );
-
- if ( aMapIndexes.Extent() > 0 )
- {
- for (int ii=1; ii <= aMapIndexes.Extent(); ii++) {
- anIndex = aMapIndexes(ii);
- QString aName = GEOMBase::GetName( aSelectedObject );
- aName = aName + ":vertex_" + QString::number( anIndex );
- anObject = aShapesOp->GetSubShape(aSelectedObject, anIndex);
- //Find Object in study
- _PTR(SObject) obj ( aDStudy->FindObjectID( anIt.Value()->getEntry() ) );
- bool inStudy = false;
- for (_PTR(ChildIterator) iit (aDStudy->NewChildIterator(obj)); iit->More(); iit->Next()) {
- _PTR(SObject) child (iit->Value());
- QString aChildName = child->GetName();
- if (aChildName == aName) {
- inStudy = true;
- CORBA::Object_var corbaObj = GeometryGUI::ClientSObjectToObject(iit->Value());
- anObject = GEOM::GEOM_Object::_narrow( corbaObj );
- }
- }
-
- if (!inStudy)
- GeometryGUI::GetGeomGen()->AddInStudy(GeometryGUI::ClientStudyToStudy(aDStudy),
- anObject, aName, aSelectedObject);
-
- int pos = isPointInList(myOrderedSel, anObject);
- if (pos==-1) {
- myOrderedSel.push_back(anObject);
- }
- // if (!inStudy)
- aList.push_back(anObject);
- }
- } else { // aMap.Extent() == 0
- int pos = isPointInList(myOrderedSel,aSelectedObject);
- if(pos==-1)
- myOrderedSel.push_back(aSelectedObject);
- aList.push_back(aSelectedObject);
- }
- }
- }
- }
-
- myPoints->length( aList.size() );
-
- int k=0;
- for (list<GEOM::GEOM_Object_var>::iterator j=aList.begin();j!=aList.end();j++)
- myPoints[k++] = *j;
-
- if(IOC == 0)
- myOrderedSel.clear();
+ QList<GEOM::GeomObjPtr> points = getSelected( TopAbs_VERTEX, -1 );
+ synchronize( myPoints, points );
+ if ( !myPoints.isEmpty() )
+ GroupPoints->LineEdit1->setText( QString::number( myPoints.count() ) + "_" + tr( "GEOM_POINT" ) + tr( "_S_" ) );
else
- removeUnnecessaryPnt(myOrderedSel, myPoints);
-
- // if ( myOrderedSel.size() == myPoints->length() ) {
- myPoints->length( myOrderedSel.size() );
- k=0;
- for (list<GEOM::GEOM_Object_var>::iterator j=myOrderedSel.begin();j!=myOrderedSel.end();j++)
- myPoints[k++] = *j;
- // }
-
- if ( myPoints->length() > 0 )
- GroupPoints->LineEdit1->setText( QString::number( myPoints->length() ) + "_" + tr( "GEOM_POINT" ) + tr( "_S_" ) );
-
- displayPreview();
+ GroupPoints->LineEdit1->setText( "" );
+ processPreview();
}
void BasicGUI_CurveDlg::ActivateThisDialog()
{
GEOMBase_Skeleton::ActivateThisDialog();
- connect(myGeomGUI->getApp()->selectionMgr(), SIGNAL(currentSelectionChanged()),
- this, SLOT(SelectionIntoArgument()));
+ connect( myGeomGUI->getApp()->selectionMgr(), SIGNAL( currentSelectionChanged() ),
+ this, SLOT( SelectionIntoArgument() ) );
globalSelection(); // close local contexts, if any
localSelection( GEOM::GEOM_Object::_nil(), TopAbs_VERTEX );
+
ConstructorsClicked( getConstructorId() );
}
// function : enterEvent()
// purpose :
//=================================================================================
-void BasicGUI_CurveDlg::enterEvent(QEvent* e)
+void BasicGUI_CurveDlg::enterEvent( QEvent* )
{
- if ( !GroupConstructors->isEnabled() )
+ if ( !mainFrame()->GroupConstructors->isEnabled() )
ActivateThisDialog();
}
//=================================================================================
bool BasicGUI_CurveDlg::isValid( QString& msg )
{
- return myPoints->length() > 1;
+ return myPoints.count() > 1;
}
//=================================================================================
GEOM::GEOM_Object_var anObj;
- switch ( getConstructorId() )
- {
+ GEOM::GEOM_ICurvesOperations_var anOper = GEOM::GEOM_ICurvesOperations::_narrow( getOperation() );
+
+ GEOM::ListOfGO_var points = new GEOM::ListOfGO();
+ points->length( myPoints.count() );
+ for ( int i = 0; i < myPoints.count(); i++ )
+ points[i] = myPoints[i].copy();
+
+ switch ( getConstructorId() ) {
case 0 :
- anObj = GEOM::GEOM_ICurvesOperations::_narrow( getOperation() )->MakePolyline( myPoints );
+ anObj = anOper->MakePolyline( points.in(), GroupPoints->CheckButton1->isChecked() );
res = true;
break;
case 1 :
- anObj = GEOM::GEOM_ICurvesOperations::_narrow( getOperation() )->MakeSplineBezier( myPoints );
+ anObj = anOper->MakeSplineBezier( points.in(), GroupPoints->CheckButton1->isChecked() );
res = true;
break;
case 2 :
- anObj = GEOM::GEOM_ICurvesOperations::_narrow( getOperation() )->MakeSplineInterpolation( myPoints );
+ anObj = anOper->MakeSplineInterpolation( points.in(), GroupPoints->CheckButton1->isChecked(),
+ GroupPoints->CheckButton2->isChecked() );
res = true;
break;
}
}
//=================================================================================
-// function : closeEvent
-// purpose :
+// function : addSubshapeToStudy
+// purpose : virtual method to add new SubObjects if local selection
//=================================================================================
-void BasicGUI_CurveDlg::closeEvent( QCloseEvent* e )
+void BasicGUI_CurveDlg::addSubshapesToStudy()
{
- GEOMBase_Skeleton::closeEvent( e );
+ for ( int i = 0; i < myPoints.count(); i++ )
+ GEOMBase::PublishSubObject( myPoints[i].get() );
}
-