ForkMaster/geom
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/geom.git synced 2025-02-02 09:20:33 +05:00
Code Issues Packages Projects Releases Wiki Activity

rnc:

Browse Source 
- Fixed a small bug in eventFilter that was inoperative (enter didn't cause Apply operation)
- Prepared a mechanism to apply automatically changes in selection mode if needed (the mechanism is disabled for now)
This commit is contained in:
gdd 2011-06-30 14:49:21 +00:00
parent 7dedbec49c
commit bc4ee77be9
2 changed files with 34 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
src/EntityGUI/EntityGUI_SketcherDlg.cxx
View File

@ -344,29 +344,30 @@ EntityGUI_SketcherDlg::~EntityGUI_SketcherDlg()
//================================================================================= //=================================================================================
bool EntityGUI_SketcherDlg::eventFilter (QObject* object, QEvent* event) bool EntityGUI_SketcherDlg::eventFilter (QObject* object, QEvent* event)
{ {
MESSAGE("EntityGUI_SketcherDlg::eventFilter")
if (event->type() == QEvent::KeyPress) { if (event->type() == QEvent::KeyPress) {
QKeyEvent* ke = (QKeyEvent*)event; QKeyEvent* ke = (QKeyEvent*)event;
if (ke->key() == Qt::Key_Return) { if ( ke->key() == Qt::Key_Return || ke->key() == Qt::Key_Enter ) {
if (object == Group1Spin->SpinBox_DX) { if (object == Group1Spin->SpinBox_DX) {
Group1Spin->buttonApply->animateClick(); Group1Spin->buttonApply->click();
return true; return true;
} else if (object == Group1Sel1Spin->SpinBox_DX) { } else if (object == Group1Sel1Spin->SpinBox_DX) {
Group1Sel1Spin->buttonApply->animateClick(); Group1Sel1Spin->buttonApply->click();
return true; return true;
} else if (object == Group2Spin->SpinBox_DX || } else if (object == Group2Spin->SpinBox_DX ||
object == Group2Spin->SpinBox_DY) { object == Group2Spin->SpinBox_DY) {
Group2Spin->buttonApply->animateClick(); Group2Spin->buttonApply->click();
return true; return true;
} else if (object == Group3Spin->SpinBox_DX || } else if (object == Group3Spin->SpinBox_DX ||
object == Group3Spin->SpinBox_DY || object == Group3Spin->SpinBox_DY ||
object == Group3Spin->SpinBox_DZ) { object == Group3Spin->SpinBox_DZ) {
Group3Spin->buttonApply->animateClick(); Group3Spin->buttonApply->click();
return true; return true;
} else if (object == Group4Spin->SpinBox_DX || } else if (object == Group4Spin->SpinBox_DX ||
object == Group4Spin->SpinBox_DY || object == Group4Spin->SpinBox_DY ||
object == Group4Spin->SpinBox_DZ || object == Group4Spin->SpinBox_DZ ||
object == Group4Spin->SpinBox_DS) { object == Group4Spin->SpinBox_DS) {
Group4Spin->buttonApply->animateClick(); Group4Spin->buttonApply->click();
return true; return true;
} }
} }
@ -385,6 +386,7 @@ bool EntityGUI_SketcherDlg::eventFilter (QObject* object, QEvent* event)
void EntityGUI_SketcherDlg::Init() void EntityGUI_SketcherDlg::Init()
{ {
/* init variables */ /* init variables */
autoApply = false;
myEditCurrentArgument = Group1Sel->LineEdit1; myEditCurrentArgument = Group1Sel->LineEdit1;
myCommand.append( "Sketcher" ); myCommand.append( "Sketcher" );
myUndoCommand.append( "Sketcher" ); myUndoCommand.append( "Sketcher" );
@ -1349,13 +1351,19 @@ void EntityGUI_SketcherDlg::SelectionIntoArgument()
} }
} }
} }
if (nbSel == 0){ if (nbSel == 0){ // If no object selected
myX=tmpX; myX=tmpX; // Don't change the point coordinates
myY=tmpY; myY=tmpY; // and don't redisplay the preview
} }
else{ else if(!autoApply){
GEOMBase_Helper::displayPreview( true, false, true, true, myLineWidth ); GEOMBase_Helper::displayPreview( true, false, true, true, myLineWidth );
} }
if ( autoApply ){
ClickOnApply();
autoApply = false;
}
this->activateWindow();
} }
@ -1444,6 +1452,7 @@ void EntityGUI_SketcherDlg::DeactivateActiveDialog()
//================================================================================= //=================================================================================
void EntityGUI_SketcherDlg::ActivateThisDialog() void EntityGUI_SketcherDlg::ActivateThisDialog()
{ {
MESSAGE("EntityGUI_SketcherDlg::ActivateThisDialog()")
myGeometryGUI->EmitSignalDeactivateDialog(); myGeometryGUI->EmitSignalDeactivateDialog();
setEnabled( true ); setEnabled( true );
myGeometryGUI->SetActiveDialogBox( this ); myGeometryGUI->SetActiveDialogBox( this );
@ -1512,6 +1521,10 @@ void EntityGUI_SketcherDlg::OnPointSelected(Qt::KeyboardModifiers modifiers, con
double x, y; double x, y;
x = y = 0; x = y = 0;
autoApply = ( getPnt2ConstructorId() == 1 && false ); // If no additional argument needed after selection
// -> apply automatically --> disabled for now
if ( getPnt1ConstructorId() == 0 ){ // Relative selection mode if ( getPnt1ConstructorId() == 0 ){ // Relative selection mode
x = thePnt.X() - myLastX1; x = thePnt.X() - myLastX1;
y = thePnt.Y() - myLastY1; y = thePnt.Y() - myLastY1;
@ -1524,20 +1537,23 @@ void EntityGUI_SketcherDlg::OnPointSelected(Qt::KeyboardModifiers modifiers, con
case 1: case 1:
Group2Spin->SpinBox_DX->setValue( x ); Group2Spin->SpinBox_DX->setValue( x );
Group2Spin->SpinBox_DY->setValue( y ); Group2Spin->SpinBox_DY->setValue( y );
Group2Spin->buttonApply->setFocus(); // Previous setFocus (during preview) may have been inoperative if it was disabled
break; break;
case 0: case 0:
Group3Spin->SpinBox_DX->setValue( x ); Group3Spin->SpinBox_DX->setValue( x );
Group3Spin->SpinBox_DY->setValue( y ); Group3Spin->SpinBox_DY->setValue( y );
Group3Spin->buttonApply->setFocus();
break; break;
case 2: case 2:
if (modifiers == Qt::MetaModifier){ // Select center with Meta key if (modifiers == Qt::MetaModifier){ // Select center with Meta key
Group4Spin->SpinBox_DX->setValue( x ); Group4Spin->SpinBox_DX->setValue( x );
Group4Spin->SpinBox_DY->setValue( y ); Group4Spin->SpinBox_DY->setValue( y );
} }
else{ // The select end point else{ // Select end point
Group4Spin->SpinBox_DZ->setValue( x ); Group4Spin->SpinBox_DZ->setValue( x );
Group4Spin->SpinBox_DS->setValue( y ); Group4Spin->SpinBox_DS->setValue( y );
} }
Group4Spin->buttonApply->setFocus();
break; break;
} }
} }
@ -1828,8 +1844,9 @@ void EntityGUI_SketcherDlg::ValueChangedInSpinBox( double newValue )
myLengthStr = vsStr; myLengthStr = vsStr;
} }
} }
GEOMBase_Helper::displayPreview( true, false, true, true, myLineWidth ); if (!autoApply)
GEOMBase_Helper::displayPreview( true, false, true, true, myLineWidth );
double x, y, xc, yc; double x, y, xc, yc;
x = y = xc = yc = 0.0; x = y = xc = yc = 0.0;
@ -2169,38 +2186,24 @@ bool EntityGUI_SketcherDlg::execute( ObjectList& objects )
if ( Group1Sel->isVisible() ) { if ( Group1Sel->isVisible() ) {
Group1Sel->buttonApply->setEnabled( true ); Group1Sel->buttonApply->setEnabled( true );
this->activateWindow();
Group1Sel->buttonApply->setFocus();
} }
if ( Group2Sel->isVisible() ) { if ( Group2Sel->isVisible() ) {
Group2Sel->buttonApply->setEnabled( true ); Group2Sel->buttonApply->setEnabled( true );
this->activateWindow();
Group2Sel->buttonApply->setFocus();
} }
if ( Group1Sel1Spin->isVisible() ) { if ( Group1Sel1Spin->isVisible() ) {
Group1Sel1Spin->buttonApply->setEnabled( true ); Group1Sel1Spin->buttonApply->setEnabled( true );;
this->activateWindow();
Group1Sel1Spin->buttonApply->setFocus();
} }
if ( Group1Spin->isVisible() ) { if ( Group1Spin->isVisible() ) {
Group1Spin->buttonApply->setEnabled( true ); Group1Spin->buttonApply->setEnabled( true );
this->activateWindow();
Group1Spin->buttonApply->setFocus();
} }
if ( Group2Spin->isVisible() ) { if ( Group2Spin->isVisible() ) {
Group2Spin->buttonApply->setEnabled( true ); Group2Spin->buttonApply->setEnabled( true );
this->activateWindow();
Group2Spin->buttonApply->setFocus();
} }
if ( Group3Spin->isVisible() ) { if ( Group3Spin->isVisible() ) {
Group3Spin->buttonApply->setEnabled( true ); Group3Spin->buttonApply->setEnabled( true );
this->activateWindow();
Group3Spin->buttonApply->setFocus();
} }
if ( Group4Spin->isVisible() ) { if ( Group4Spin->isVisible() ) {
Group4Spin->buttonApply->setEnabled( true ); Group4Spin->buttonApply->setEnabled( true );
this->activateWindow();
Group4Spin->buttonApply->setFocus();
} }
} }
@ -2482,7 +2485,6 @@ void EntityGUI_SketcherDlg::FindLocalCS()
} }
} }
//rnc TODO
//================================================================================= //=================================================================================
// function : getPnt1ConstructorId() // function : getPnt1ConstructorId()
// purpose : // purpose :
@ -2490,7 +2492,7 @@ void EntityGUI_SketcherDlg::FindLocalCS()
int EntityGUI_SketcherDlg::getPnt1ConstructorId() const int EntityGUI_SketcherDlg::getPnt1ConstructorId() const
{ {
int buttonId = GroupPt->ButtonGroup->checkedId(); int buttonId = GroupPt->ButtonGroup->checkedId();
MESSAGE("buttonId = "<<buttonId) // MESSAGE("buttonId = "<<buttonId)
return buttonId; return buttonId;
} }
@ -2501,7 +2503,7 @@ int EntityGUI_SketcherDlg::getPnt1ConstructorId() const
int EntityGUI_SketcherDlg::getPnt2ConstructorId() const int EntityGUI_SketcherDlg::getPnt2ConstructorId() const
{ {
int buttonId = GroupPt2->ButtonGroup->checkedId(); int buttonId = GroupPt2->ButtonGroup->checkedId();
MESSAGE("buttonId = "<<buttonId) // MESSAGE("buttonId = "<<buttonId)
return buttonId; return buttonId;
} }

1
src/EntityGUI/EntityGUI_SketcherDlg.h
View File

@ -128,6 +128,7 @@ private:
bool myIsAllAdded; bool myIsAllAdded;
bool myIsApply; bool myIsApply;
bool autoApply;
QLineEdit* myEditCurrentArgument; /* Current LineEdit */ QLineEdit* myEditCurrentArgument; /* Current LineEdit */