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: {
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();
myCurve->undo();
finishCurveModification();
mySectionView->reset();
- updateUndoRedo();
}
void CurveCreator_Widget::onRedo()
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, 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 );
- 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( aSectionPoints );
- for( int i = aSectionPoints.size()-1; i >= 0; i-- ){
- int aPntIndx = aSectionPoints[i];
- myCurve->removePoint( aSectionId, aPntIndx );
- mySectionView->pointsRemoved( aSectionId, aPntIndx );
- }
- }
-#endif
finishCurveModification( SectionToPointList() );
}
finishCurveModification( aSelPoints );
setSelectedPonts();
- updateUndoRedo();
}
void CurveCreator_Widget::moveSelectedPoints( const int theXPosition,
std::deque<float> aChangedPos;
SectionToPointList::const_iterator anIt = myDragPoints.begin(), aLast = myDragPoints.end();
for ( ; anIt != aLast; anIt++ ) {
- aChangedPos = myCurve->getPoint( anIt->first, 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;
-#ifndef USE_SEVERAL_POINTS
- myCurve->setPoint( anIt->first, anIt->second, aChangedPos );
-#endif
+
+ aCoordList.push_back(
+ std::make_pair(std::make_pair( aSectionId, aPointId ),
+ aChangedPos ));
}
-#ifdef USE_SEVERAL_POINTS
myCurve->setSeveralPoints( aCoordList );
-#endif
myDragged = true;
finishCurveModification( myDragPoints );
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;
- gp_Pnt aPnt = BRep_Tool::Pnt( aVertex );
+ TopoDS_Vertex aVertex = TopoDS::Vertex( anAISPoint->Vertex() );
- SectionToPointList aPoints;
- findSectionsToPoints( aPnt.X(), aPnt.Y(), aPoints );
+ if ( aVertex.IsNull() )
+ continue;
- SectionToPointList::const_iterator anIt = aPoints.begin(), aLast = aPoints.end();
- SectionToPoint aPoint;
- for ( ; anIt != aLast; anIt++ ) {
- aPoint = *anIt;
- if ( contains( thePoints, aPoint ) )
- aListToSelect.Append( anAIS );
+ gp_Pnt aPnt = BRep_Tool::Pnt( aVertex );
+
+ 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 ( aPoint.first == aSToPoint.first && aPoint.second == aSToPoint.second )
+ aListToSelect.Append( anAIS );
+ }
}
}
if ( getActionMode() == ModificationMode )
setLocalPointContext( true );
setSelectedPonts( thePoints );
+ updateUndoRedo();
}
/**
