ForkMaster/geom
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/geom.git synced 2024-11-15 10:08:35 +05:00
Code Issues Packages Projects Releases Wiki Activity

Fixed visualization bugs in the sketcher:

Browse Source 
- created object were violet)
- preferences values were not used for preview linewidth and edge and wire colors
This commit is contained in:
rnc 2012-03-08 14:36:13 +00:00
parent aa7f259f2c
commit db7d2b88d3
2 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/EntityGUI/EntityGUI_SketcherDlg.cxx
View File

@ -58,6 +58,7 @@
#include <Sketcher_Profile.hxx>
#include <SalomeApp_Study.h>
#include <SalomeApp_Tools.h>
#include <gp_Pln.hxx>
@ -2260,11 +2261,17 @@ void EntityGUI_SketcherDlg::displayPreview( GEOM::GEOM_Object_ptr object,
const int displayMode,
const int color )
{
// Set color for preview shape
getDisplayer()->SetColor( Quantity_NOC_RED );
SUIT_ResourceMgr* resMgr = SUIT_Session::session()->resourceMgr();
QColor aColor = resMgr->colorValue("Geometry","line_color",QColor(255,0,0));
Quantity_NameOfColor line_color = SalomeApp_Tools::color( aColor ).Name();
// set width of displayed shape
getDisplayer()->SetWidth( (lineWidth == -1)?myLineWidth:lineWidth );
int lw = lineWidth;
if(lw == -1) {
lw = resMgr->integerValue("Geometry", "preview_edge_width", -1);
}
getDisplayer()->SetWidth( lw );
// Disable activation of selection
getDisplayer()->SetToActivate( activate );
@ -2279,6 +2286,7 @@ void EntityGUI_SketcherDlg::displayPreview( GEOM::GEOM_Object_ptr object,
return;
// Build prs
getDisplayer()->SetColor( line_color );
SALOME_Prs* aPrs = getDisplayer()->BuildPrs( anApplyedWire );
if ( aPrs != 0 && !aPrs->IsNull() )
GEOMBase_Helper::displayPreview( aPrs, append, update );
@ -2288,6 +2296,8 @@ void EntityGUI_SketcherDlg::displayPreview( GEOM::GEOM_Object_ptr object,
if ( aPrs != 0 && !aPrs->IsNull() )
GEOMBase_Helper::displayPreview( aPrs, append, update );
getDisplayer()->SetColor( line_color );
getDisplayer()->UnsetName();
// Enable activation of displayed objects

2
src/EntityGUI/EntityGUI_SketcherDlg.h
View File

@ -68,7 +68,7 @@ class EntityGUI_SketcherDlg : public QDialog, GEOMBase_Helper
public:
EntityGUI_SketcherDlg( GeometryGUI*, QWidget* = 0, bool = false, Qt::WindowFlags = 0,
const double = 2. );
const double = -1 );
~EntityGUI_SketcherDlg();
bool eventFilter (QObject* object, QEvent* event);