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
Merge branch 'V8_4_BR'
[modules/gui.git]
/
src
/
GLViewer
/
GLViewer_ViewPort2d.cxx
diff --git
a/src/GLViewer/GLViewer_ViewPort2d.cxx
b/src/GLViewer/GLViewer_ViewPort2d.cxx
index aa9aa39bd44c2cbc7c4fc0f3d0a32efd3e243747..5e06b4b2eb32352a94f3c99b32d9ef0ae12c8333 100644
(file)
--- a/
src/GLViewer/GLViewer_ViewPort2d.cxx
+++ b/
src/GLViewer/GLViewer_ViewPort2d.cxx
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-201
4
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
@@
-95,7
+95,7
@@
GLViewer_ViewPort2d::GLViewer_ViewPort2d( QWidget* parent, GLViewer_ViewFrame* t
myGLWidget = new GLViewer_Widget( this, 0 ) ;
qbl->addWidget( myGLWidget );
myGLWidget->setFocusProxy( this );
myGLWidget = new GLViewer_Widget( this, 0 ) ;
qbl->addWidget( myGLWidget );
myGLWidget->setFocusProxy( this );
- setMouseTracking(
TRUE
);
+ setMouseTracking(
true
);
myIsDragProcess = noDrag;
//myCurDragMousePos = QPoint();
myIsDragProcess = noDrag;
//myCurDragMousePos = QPoint();
@@
-530,7
+530,7
@@
void GLViewer_ViewPort2d::initResize( int x, int y )
GLfloat zoom, xzoom, yzoom;
GLfloat w = x;
GLfloat h = y;
GLfloat zoom, xzoom, yzoom;
GLfloat w = x;
GLfloat h = y;
- bool max =
FALSE
;
+ bool max =
false
;
xzoom = (GLfloat)x / myWidth;
yzoom = (GLfloat)y / myHeight;
xzoom = (GLfloat)x / myWidth;
yzoom = (GLfloat)y / myHeight;
@@
-541,7
+541,7
@@
void GLViewer_ViewPort2d::initResize( int x, int y )
zoom = yzoom;
else
{
zoom = yzoom;
else
{
- max =
TRUE
;
+ max =
true
;
zoom = xzoom > yzoom ? xzoom : yzoom;
}
zoom = xzoom > yzoom ? xzoom : yzoom;
}