PAL13456 : enlarge line width for sketcher preview only (1 pixel before, 2 now)

This commit is contained in:
amx 2007-01-25 08:37:21 +00:00
parent 560d0907b9
commit b5df458bed
2 changed files with 18 additions and 14 deletions

View File

@ -64,12 +64,14 @@ using namespace std;
// TRUE to construct a modal dialog. // TRUE to construct a modal dialog.
//================================================================================= //=================================================================================
EntityGUI_SketcherDlg::EntityGUI_SketcherDlg(GeometryGUI* GUI, QWidget* parent, EntityGUI_SketcherDlg::EntityGUI_SketcherDlg(GeometryGUI* GUI, QWidget* parent,
const char* name, bool modal, WFlags fl) const char* name, bool modal, WFlags fl,
const double lineWidth)
:EntityGUI_Skeleton_QTD(parent, name, modal, WStyle_Customize | :EntityGUI_Skeleton_QTD(parent, name, modal, WStyle_Customize |
WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu | WDestructiveClose), WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu | WDestructiveClose),
myIsAllAdded( false ), myIsAllAdded( false ),
GEOMBase_Helper( dynamic_cast<SUIT_Desktop*>( parent ) ), GEOMBase_Helper( dynamic_cast<SUIT_Desktop*>( parent ) ),
myGeometryGUI( GUI ) myGeometryGUI( GUI ),
myLineWidth( lineWidth )
{ {
myGeometryGUI->SetActiveDialogBox(this); myGeometryGUI->SetActiveDialogBox(this);
@ -344,7 +346,7 @@ void EntityGUI_SketcherDlg::Init()
resize( 0, 0 ); resize( 0, 0 );
TypeClicked(0); TypeClicked(0);
GEOMBase_Helper::displayPreview(); GEOMBase_Helper::displayPreview(false, true, true, myLineWidth);
} }
@ -443,7 +445,7 @@ void EntityGUI_SketcherDlg::PointClicked(int constructorId)
Group2Spin->show(); Group2Spin->show();
Group2Spin->buttonApply->setFocus(); Group2Spin->buttonApply->setFocus();
GEOMBase_Helper::displayPreview(); GEOMBase_Helper::displayPreview(false, true, true, myLineWidth);
} }
else if ( constructorId == 0 ) else if ( constructorId == 0 )
{ // DXDY { // DXDY
@ -459,7 +461,7 @@ void EntityGUI_SketcherDlg::PointClicked(int constructorId)
Group2Spin->show(); Group2Spin->show();
Group2Spin->buttonApply->setFocus(); Group2Spin->buttonApply->setFocus();
GEOMBase_Helper::displayPreview(); GEOMBase_Helper::displayPreview(false, true, true, myLineWidth);
} }
else if ( constructorId == 2 ) else if ( constructorId == 2 )
{ // Selection { // Selection
@ -693,7 +695,7 @@ void EntityGUI_SketcherDlg::Dir2Clicked(int constructorId)
} }
} }
GEOMBase_Helper::displayPreview(); GEOMBase_Helper::displayPreview(false, true, true, myLineWidth);
} }
@ -764,7 +766,7 @@ bool EntityGUI_SketcherDlg::ClickOnApply()
setEnabledUndo(true); setEnabledUndo(true);
setEnabledRedo(false); setEnabledRedo(false);
GEOMBase_Helper::displayPreview(); GEOMBase_Helper::displayPreview(false, true, true, myLineWidth);
// Set focus to SpinBox_DX // Set focus to SpinBox_DX
if (sender() == Group1Spin->buttonApply) { if (sender() == Group1Spin->buttonApply) {
@ -826,7 +828,7 @@ void EntityGUI_SketcherDlg::ClickOnUndo()
setEnabledRedo(true); setEnabledRedo(true);
GEOMBase_Helper::displayPreview(); GEOMBase_Helper::displayPreview(false, true, true, myLineWidth);
} }
//================================================================================= //=================================================================================
@ -847,7 +849,7 @@ void EntityGUI_SketcherDlg::ClickOnRedo()
if(myUndoCommand.count() == 1) if(myUndoCommand.count() == 1)
setEnabledRedo(false); setEnabledRedo(false);
GEOMBase_Helper::displayPreview(); GEOMBase_Helper::displayPreview(false, true, true, myLineWidth);
} }
//================================================================================= //=================================================================================
@ -911,7 +913,7 @@ void EntityGUI_SketcherDlg::SelectionIntoArgument()
} }
} }
GEOMBase_Helper::displayPreview(); GEOMBase_Helper::displayPreview(false, true, true, myLineWidth);
} }
@ -985,7 +987,7 @@ void EntityGUI_SketcherDlg::ActivateThisDialog()
myEditCurrentArgument = Group1Sel->LineEdit1; myEditCurrentArgument = Group1Sel->LineEdit1;
myEditCurrentArgument->setFocus(); myEditCurrentArgument->setFocus();
GEOMBase_Helper::displayPreview(); GEOMBase_Helper::displayPreview(false, true, true, myLineWidth);
} }
@ -1180,7 +1182,7 @@ void EntityGUI_SketcherDlg::ValueChangedInSpinBox(double newValue)
} }
} }
GEOMBase_Helper::displayPreview(); GEOMBase_Helper::displayPreview(false, true, true, myLineWidth);
} }
@ -1443,7 +1445,7 @@ void EntityGUI_SketcherDlg::displayPreview( GEOM::GEOM_Object_ptr object,
getDisplayer()->SetColor( Quantity_NOC_RED ); getDisplayer()->SetColor( Quantity_NOC_RED );
// set width of displayed shape // set width of displayed shape
getDisplayer()->SetWidth( lineWidth ); getDisplayer()->SetWidth( (lineWidth == -1)?myLineWidth:lineWidth );
// Disable activation of selection // Disable activation of selection
getDisplayer()->SetToActivate( activate ); getDisplayer()->SetToActivate( activate );

View File

@ -63,7 +63,8 @@ class EntityGUI_SketcherDlg : public EntityGUI_Skeleton_QTD, public GEOMBase_Hel
public: public:
EntityGUI_SketcherDlg(GeometryGUI* GUI, QWidget* parent = 0, EntityGUI_SketcherDlg(GeometryGUI* GUI, QWidget* parent = 0,
const char* name = 0, bool modal = FALSE, WFlags fl = 0); const char* name = 0, bool modal = FALSE, WFlags fl = 0,
const double lineWidth = 2.);
~EntityGUI_SketcherDlg(); ~EntityGUI_SketcherDlg();
bool eventFilter (QObject* object, QEvent* event); bool eventFilter (QObject* object, QEvent* event);
@ -125,6 +126,7 @@ private :
DIR_TAN_LENGTH, DIR_TAN_X, DIR_TAN_Y, DIR_TAN_LENGTH, DIR_TAN_X, DIR_TAN_Y,
DIR_DXDY_LENGTH, DIR_DXDY_X, DIR_DXDY_Y}; DIR_DXDY_LENGTH, DIR_DXDY_X, DIR_DXDY_Y};
double myLineWidth;
virtual void displayPreview ( GEOM::GEOM_Object_ptr obj, virtual void displayPreview ( GEOM::GEOM_Object_ptr obj,
const bool append = false, const bool append = false,
const bool activate = false, const bool activate = false,