Salome HOME
projects
/
modules
/
gui.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Upgrade to paraview 5.4
[modules/gui.git]
/
src
/
GLViewer
/
GLViewer_BaseObjects.cxx
diff --git
a/src/GLViewer/GLViewer_BaseObjects.cxx
b/src/GLViewer/GLViewer_BaseObjects.cxx
index bec5bf103c12b334a65aee293de90c7adba4a6ca..cf12ae7ba5d29b1c5520cba1e17c03af4f09be15 100644
(file)
--- a/
src/GLViewer/GLViewer_BaseObjects.cxx
+++ b/
src/GLViewer/GLViewer_BaseObjects.cxx
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-201
5
CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-201
6
CEA/DEN, EDF R&D, OPEN CASCADE
//
// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
//
// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@
-1096,7
+1096,7
@@
GLboolean GLViewer_Polyline::select( GLfloat x, GLfloat y, GLfloat tol, GLViewer
GLfloat xa, xb, ya, yb, l;
GLfloat rsin, rcos, r, ra, rb;
// GLboolean update;
GLfloat xa, xb, ya, yb, l;
GLfloat rsin, rcos, r, ra, rb;
// GLboolean update;
- GLboolean selected = myIsSel;
+
//
GLboolean selected = myIsSel;
myIsSel = GL_FALSE;
myIsSel = GL_FALSE;
@@
-1438,16
+1438,15
@@
bool GLViewer_TextObject::translateToEMF( HDC dc, GLViewer_CoordSystem* aViewerC
y = double( yPos );
aViewerCS->transform( *aEMFCS, x, y );
y = double( yPos );
aViewerCS->transform( *aEMFCS, x, y );
- const char* str = aText.toAscii();
int nHeight = 35*14; // height of font
int nWidth = 35*12; // average character width
int nEscapement = 0; // angle of escapement
int nOrientation = 0; // base-line orientation angle
int fnWeight = FW_NORMAL; // font weight
int nHeight = 35*14; // height of font
int nWidth = 35*12; // average character width
int nEscapement = 0; // angle of escapement
int nOrientation = 0; // base-line orientation angle
int fnWeight = FW_NORMAL; // font weight
- DWORD fdwItalic =
FALSE
; // italic attribute option
- DWORD fdwUnderline =
FALSE
; // underline attribute option
- DWORD fdwStrikeOut =
FALSE
; // strikeout attribute option
+ DWORD fdwItalic =
false
; // italic attribute option
+ DWORD fdwUnderline =
false
; // underline attribute option
+ DWORD fdwStrikeOut =
false
; // strikeout attribute option
DWORD fdwCharSet = ANSI_CHARSET; // character set identifier
DWORD fdwOutputPrecision = OUT_DEFAULT_PRECIS; // output precision
DWORD fdwClipPrecision = CLIP_DEFAULT_PRECIS; // clipping precision
DWORD fdwCharSet = ANSI_CHARSET; // character set identifier
DWORD fdwOutputPrecision = OUT_DEFAULT_PRECIS; // output precision
DWORD fdwClipPrecision = CLIP_DEFAULT_PRECIS; // clipping precision
@@
-1467,7
+1466,7
@@
bool GLViewer_TextObject::translateToEMF( HDC dc, GLViewer_CoordSystem* aViewerC
HGDIOBJ old1 = SelectObject( dc, aFont );
HGDIOBJ old2 = SelectObject( dc, aBrush );
HGDIOBJ old1 = SelectObject( dc, aFont );
HGDIOBJ old2 = SelectObject( dc, aBrush );
- TextOut( dc, x, y,
str
, aText.length() );
+ TextOut( dc, x, y,
aText.toLatin1().constData()
, aText.length() );
SelectObject ( dc, old1 );
SelectObject ( dc, old2 );
SelectObject ( dc, old1 );
SelectObject ( dc, old2 );