//#include "CurveCreator_NewPointDlg.h"
#include "CurveCreator_NewSectionDlg.h"
#include "CurveCreator_Utils.h"
+#include "CurveCreator_TableView.h"
#include <SUIT_Session.h>
#include <SUIT_Desktop.h>
connect( mySectionView, SIGNAL(customContextMenuRequested(QPoint)), this, SLOT(onContextMenu(QPoint)) );
myLocalPointView = new QTableWidget();
+ myLocalPointView->setItemDelegate( new CurveCreator_TableItemDelegate( myLocalPointView ) );
myLocalPointView->setVisible( false );
myLocalPointView->setColumnCount( 4 );
myLocalPointView->setColumnWidth( 0, SECTION_NAME_COLUMN_WIDTH );
QList<ActionId> anEnabledAct;
if( myCurve ){
anEnabledAct << NEW_SECTION_ID << MODIFICATION_MODE_ID;
- if ( getActionMode() == ModificationMode )
+ if ( removeEnabled() )
anEnabledAct << REMOVE_ID;
QList<int> aSelSections = mySectionView->getSelectedSections();
QList< QPair< int, int > > aSelPoints = mySectionView->getSelectedPoints();
}*/
if( aSelSections.size() == 1 ){
anEnabledAct << ADDITION_MODE_ID << DETECTION_MODE_ID;
- anEnabledAct << REMOVE_ID;
}
switch ( getActionMode() ) {
case AdditionMode: {
bool isClosed = myNewSectionEditor->isClosed();
CurveCreator::SectionType aSectType = myNewSectionEditor->getSectionType();
// myCurve->startOperation();
- myCurve->setClosed( isClosed, mySection );
- myCurve->setSectionName( mySection , aName.toStdString() );
- myCurve->setSectionType( mySection, aSectType );
+ if( myCurve->getSectionName(mySection) != aName.toStdString() )
+ myCurve->setSectionName( mySection , aName.toStdString() );
+
+ if( myCurve->getSectionType(mySection) != aSectType )
+ myCurve->setSectionType( mySection, aSectType );
+
+ if( myCurve->isClosed(mySection) != isClosed )
+ myCurve->setClosed( mySection, isClosed );
// myCurve->finishOperation();
mySectionView->sectionChanged(mySection);
updateUndoRedo();
// myCurve->startOperation();
QList<int> aSelSections = mySectionView->getSelectedSections();
for( int i = 0 ; i < aSelSections.size() ; i++ ){
- myCurve->setClosed(true, aSelSections[i]);
+ myCurve->setClosed(aSelSections[i], true);
mySectionView->sectionChanged(aSelSections[i]);
}
// myCurve->finishOperation();
// myCurve->startOperation();
QList<int> aSelSections = mySectionView->getSelectedSections();
for( int i = 0 ; i < aSelSections.size() ; i++ ){
- myCurve->setClosed(false, aSelSections[i]);
+ myCurve->setClosed(aSelSections[i], false);
mySectionView->sectionChanged(aSelSections[i]);
}
// myCurve->finishOperation();
{
if( !myCurve )
return;
+
+ CurveCreator_Widget::SectionToPointList aPoints;
+ startCurveModification( aPoints, false );
myCurve->undo();
+ finishCurveModification();
mySectionView->reset();
- updateUndoRedo();
}
void CurveCreator_Widget::onRedo()
{
if( !myCurve )
return;
+ CurveCreator_Widget::SectionToPointList aPoints;
+ startCurveModification( aPoints, false );
myCurve->redo();
+ finishCurveModification();
mySectionView->reset();
- updateUndoRedo();
}
void CurveCreator_Widget::updateUndoRedo()
return mySectionView->getSelectedPoints();
}
+/**
+ * According to the widget state, performs the remove action
+ */
+void CurveCreator_Widget::removeSelected()
+{
+ onRemove();
+}
+
+/**
+ * Checks whether there are some selection to be removed
+ */
+bool CurveCreator_Widget::removeEnabled()
+{
+ bool isEnabled = getActionMode() == ModificationMode;
+ if ( !isEnabled ) {
+ QList<int> aSelSections = mySectionView->getSelectedSections();
+ CurveCreator_TreeView::SelectionType aSelType = mySectionView->getSelectionType();
+ isEnabled = aSelType == CurveCreator_TreeView::ST_SECTIONS &&
+ aSelSections.size() == 1;
+ }
+ return isEnabled;
+}
+
+
//=================================================================================
// function : GeometryGUI::onGetCoordsByClick()
// purpose : Manage mouse press events in Additon mode
SectionToPointList aSelPoints;
startCurveModification( aSelPoints );
- double aX = myLocalPointView->item( theRow, 2 )->text().toDouble();
- double anY = myLocalPointView->item( theRow, 3 )->text().toDouble();
+ double aX = myLocalPointView->item( theRow, 2 )->data( Qt::UserRole ).toDouble();
+ double anY = myLocalPointView->item( theRow, 3 )->data( Qt::UserRole ).toDouble();
std::deque<float> aChangedPos;
aChangedPos.push_back( aX );
aChangedPos.push_back( anY );
SectionToPointList aSelPoints;
startCurveModification( aSelPoints, false );
- // the points should be removed in a decreased order
- QMap<int, QList<int> > aConvPoints;
- convert( aPoints, aConvPoints );
- QMap<int, QList<int> >::const_iterator anIt = aConvPoints.begin(),
- aLast = aConvPoints.end();
- for ( ; anIt != aLast; anIt++ ) {
- int aSectionId = anIt.key();
-
- QList<int> aSectionPoints = anIt.value();
- qSort( aPoints );
- for( int i = aSectionPoints.size()-1; i >= 0; i-- ){
- int aPntIndx = aSectionPoints[i];
- myCurve->removePoint( aSectionId, aPntIndx );
- mySectionView->pointsRemoved( aSectionId, aPntIndx );
- }
- }
-
+ myCurve->removeSeveralPoints( aPoints );
finishCurveModification( SectionToPointList() );
}
finishCurveModification( aSelPoints );
setSelectedPonts();
- updateUndoRedo();
}
void CurveCreator_Widget::moveSelectedPoints( const int theXPosition,
double aXDelta = aStartPnt.X() - anEndPnt.X();
double anYDelta = aStartPnt.Y() - anEndPnt.Y();
- int aSectionId;
- int aPointId;
+ CurveCreator_ICurve::SectionToPointCoordsList aCoordList;
std::deque<float> aChangedPos;
SectionToPointList::const_iterator anIt = myDragPoints.begin(), aLast = myDragPoints.end();
for ( ; anIt != aLast; anIt++ ) {
- aSectionId = anIt->first;
- aPointId = anIt->second;
+ int aSectionId = anIt->first;
+ int aPointId = anIt->second;
aChangedPos = myCurve->getPoint( aSectionId, aPointId );
if ( aChangedPos.size() < 2 )
continue;
aChangedPos[0] = aChangedPos[0] - aXDelta;
aChangedPos[1] = aChangedPos[1] - anYDelta;
- myCurve->setPoint( aSectionId, aPointId, aChangedPos );
+
+ aCoordList.push_back(
+ std::make_pair(std::make_pair( aSectionId, aPointId ),
+ aChangedPos ));
}
+ myCurve->setSeveralPoints( aCoordList );
+
myDragged = true;
finishCurveModification( myDragPoints );
}
aCurrentY = myLocalPointView->item( i, 3 )->data( Qt::UserRole ).toDouble();
if ( fabs( aCurrentX - theX ) < LOCAL_SELECTION_TOLERANCE &&
fabs( aCurrentY - theY ) < LOCAL_SELECTION_TOLERANCE ) {
- aPoint = qMakePair( getSectionId( i ), getPointId( i ) );
- if ( !aSkipList.contains( aPoint ) )
- aSkipList.append( aPoint );
+ aPoint = std::make_pair<int, int>( getSectionId( i ), getPointId( i ) );
+ if ( !contains( aSkipList, aPoint ) )
+ aSkipList.push_back( aPoint );
}
}
if ( aSkipList.size() == aPoints.size() )
SectionToPointList::const_iterator anIt = aPoints.begin(), aLast = aPoints.end();
for ( ; anIt != aLast; anIt++ ) {
aPoint = *anIt;
- if ( aSkipList.contains( aPoint ) )
+ if ( contains( aSkipList, aPoint ) )
continue;
myLocalPointView->setRowCount( aRowId+1 );
{
thePoints.clear();
for ( int i = 0, aNb = myLocalPointView->rowCount(); i < aNb; i++ )
- thePoints.append( qMakePair( getSectionId( i ), getPointId( i ) ) );
+ thePoints.push_back( std::make_pair( getSectionId( i ), getPointId( i ) ) );
}
void CurveCreator_Widget::setSelectedPonts( const CurveCreator_Widget::SectionToPointList& thePoints )
AIS_ListOfInteractive aDisplayedList;
ic->DisplayedObjects( aDisplayedList );
- for ( AIS_ListIteratorOfListOfInteractive it( aDisplayedList ); it.More(); it.Next() )
- {
- Handle(AIS_InteractiveObject) anAIS = it.Value();
- if ( anAIS.IsNull() )
- continue;
- Handle(AIS_Point) anAISPoint = Handle(AIS_Point)::DownCast( anAIS );
- if ( anAISPoint.IsNull() )
- continue;
- TopoDS_Vertex aVertex = TopoDS::Vertex( anAISPoint->Vertex() );
+ SectionToPointList::const_iterator anIt = thePoints.begin(), aLast = thePoints.end();
+ SectionToPoint aSToPoint;
+ for( ; anIt != aLast; anIt++ ) {
+ aSToPoint = *anIt;
- if ( aVertex.IsNull() )
- continue;
+ for ( AIS_ListIteratorOfListOfInteractive it( aDisplayedList ); it.More(); it.Next() )
+ {
+ Handle(AIS_InteractiveObject) anAIS = it.Value();
+ if ( anAIS.IsNull() )
+ continue;
+ Handle(AIS_Point) anAISPoint = Handle(AIS_Point)::DownCast( anAIS );
+ if ( anAISPoint.IsNull() )
+ continue;
+
+ TopoDS_Vertex aVertex = TopoDS::Vertex( anAISPoint->Vertex() );
+
+ if ( aVertex.IsNull() )
+ continue;
- gp_Pnt aPnt = BRep_Tool::Pnt( aVertex );
+ gp_Pnt aPnt = BRep_Tool::Pnt( aVertex );
- SectionToPointList aPoints;
- findSectionsToPoints( aPnt.X(), aPnt.Y(), aPoints );
+ SectionToPointList aPoints;
+ findSectionsToPoints( aPnt.X(), aPnt.Y(), aPoints );
- SectionToPointList::const_iterator anIt = aPoints.begin(), aLast = aPoints.end();
- SectionToPoint aPoint;
- for ( ; anIt != aLast; anIt++ ) {
- aPoint = *anIt;
- if ( thePoints.contains( aPoint ) )
- aListToSelect.Append( anAIS );
+ SectionToPointList::const_iterator anIt = aPoints.begin(), aLast = aPoints.end();
+ SectionToPoint aPoint;
+ for ( ; anIt != aLast; anIt++ ) {
+ aPoint = *anIt;
+ if ( aPoint.first == aSToPoint.first && aPoint.second == aSToPoint.second )
+ aListToSelect.Append( anAIS );
+ }
}
}
void CurveCreator_Widget::finishCurveModification(
const CurveCreator_Widget::SectionToPointList& thePoints )
{
- setLocalPointContext( true );
- int aSectionId = 0;
+ if ( getActionMode() == ModificationMode )
+ setLocalPointContext( true );
setSelectedPonts( thePoints );
+ updateUndoRedo();
}
/**
aPointId = findLocalPointIndex( i, theX, theY );
if ( aPointId < 0 )
continue;
- SectionToPoint aPoint = qMakePair( i, aPointId );
- if ( !thePoints.contains( aPoint ) )
- thePoints.append( aPoint );
+ SectionToPoint aPoint = std::make_pair( i, aPointId );
+ if ( !contains( thePoints, aPoint ) )
+ thePoints.push_back( aPoint );
}
}
{
return myLocalPointView->item( theRowId, 1 )->data( Qt::UserRole ).toInt();
}
+
+/**
+ * Returns whethe the container has the value
+ * \param theList a container of values
+ * \param theValue a value
+ */
+bool CurveCreator_Widget::contains( const CurveCreator_Widget::SectionToPointList& theList,
+ const CurveCreator_Widget::SectionToPoint& theValue ) const
+{
+ bool isFound = false;
+
+ SectionToPointList::const_iterator anIt = theList.begin(), aLast = theList.end();
+ for ( ; anIt != aLast && !isFound; anIt++ )
+ isFound = anIt->first == theValue.first && anIt->second == theValue.second;
+
+ return isFound;
+}