const int SCENE_PIXEL_TOLERANCE = 10;
+//#define USE_SEVERAL_POINTS
+
CurveCreator_Widget::CurveCreator_Widget(QWidget* parent,
CurveCreator_ICurve *theCurve,
Qt::WindowFlags fl)
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: {
{
if( !myCurve )
return;
+
+ CurveCreator_Widget::SectionToPointList aPoints;
+ startCurveModification( aPoints, false );
myCurve->undo();
+ finishCurveModification();
mySectionView->reset();
updateUndoRedo();
}
{
if( !myCurve )
return;
+ CurveCreator_Widget::SectionToPointList aPoints;
+ startCurveModification( aPoints, false );
myCurve->redo();
+ finishCurveModification();
mySectionView->reset();
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, false );
+#ifdef USE_SEVERAL_POINTS
+ myCurve->removeSeveralPoints( aPoints );
+#else
// the points should be removed in a decreased order
QMap<int, QList<int> > aConvPoints;
convert( aPoints, aConvPoints );
mySectionView->pointsRemoved( aSectionId, aPntIndx );
}
}
-
+#endif
finishCurveModification( SectionToPointList() );
}
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;
- aChangedPos = myCurve->getPoint( aSectionId, aPointId );
+ aChangedPos = myCurve->getPoint( anIt->first, anIt->second );
if ( aChangedPos.size() < 2 )
continue;
aChangedPos[0] = aChangedPos[0] - aXDelta;
aChangedPos[1] = aChangedPos[1] - anYDelta;
- myCurve->setPoint( aSectionId, aPointId, aChangedPos );
+#ifndef USE_SEVERAL_POINTS
+ myCurve->setPoint( anIt->first, anIt->second, aChangedPos );
+#endif
}
+#ifdef USE_SEVERAL_POINTS
+ myCurve->setSeveralPoints( aCoordList );
+#endif
+
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 )
SectionToPoint aPoint;
for ( ; anIt != aLast; anIt++ ) {
aPoint = *anIt;
- if ( thePoints.contains( aPoint ) )
+ if ( contains( thePoints, aPoint ) )
aListToSelect.Append( anAIS );
}
}
void CurveCreator_Widget::finishCurveModification(
const CurveCreator_Widget::SectionToPointList& thePoints )
{
- setLocalPointContext( true );
- int aSectionId = 0;
+ if ( getActionMode() == ModificationMode )
+ setLocalPointContext( true );
setSelectedPonts( thePoints );
}
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;
+}