OpenCascade/occt
1
0
Fork 0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-04-03 17:56:21 +03:00
Code Packages Releases Activity

0031067: Visualization - Aspect_Window::DoResize() should be a non-const method

Browse Source 
Removed 'const' from Aspect_Window::DoResize() virtual method.
This commit is contained in:
kgv 2019-10-19 15:38:48 +03:00 committed by apn
parent 3818aacaa5
commit 1a5007a920
15 changed files with 38 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dox/dev_guides/upgrade/upgrade.md
View File

@ -1881,6 +1881,10 @@ This change affects following parts:
* Method *Image_PixMap::PixelColor()* has been extended with a new Boolean flag for performing linearization of non-linear sRGB.
This flag is FALSE by default; application should consider passing TRUE instead for further handling *Quantity_Color* properly as linear RGB values.
@subsection upgrade_750_aspectwindow Aspect_Window interface change
Unexpected const-ness of Aspect_Window::DoResize() method has been removed, so that application classes implementing this interface should be updated accordingly.
@subsection upgrade_750_rename Renaming of types
Enumeration BRepOffset_Type is renamed to ChFiDS_TypeOfConcavity.

10
samples/glfw/GlfwOcctWindow.cpp
View File

@ -134,17 +134,17 @@ void GlfwOcctWindow::Unmap() const
// Function : DoResize
// Purpose :
// ================================================================
Aspect_TypeOfResize GlfwOcctWindow::DoResize() const
Aspect_TypeOfResize GlfwOcctWindow::DoResize()
{
if (glfwGetWindowAttrib (myGlfwWindow, GLFW_VISIBLE) == 1)
{
int anXPos = 0, anYPos = 0, aWidth = 0, aHeight = 0;
glfwGetWindowPos (myGlfwWindow, &anXPos, &anYPos);
glfwGetWindowSize(myGlfwWindow, &aWidth, &aHeight);
*const_cast<Standard_Integer*>(&myXLeft ) = anXPos;
*const_cast<Standard_Integer*>(&myXRight ) = anXPos + aWidth;
*const_cast<Standard_Integer*>(&myYTop ) = anYPos;
*const_cast<Standard_Integer*>(&myYBottom) = anYPos + aHeight;
myXLeft = anXPos;
myXRight = anXPos + aWidth;
myYTop = anYPos;
myYBottom = anYPos + aHeight;
}
return Aspect_TOR_UNKNOWN;
}

2
samples/glfw/GlfwOcctWindow.h
View File

@ -65,7 +65,7 @@ public:
virtual Aspect_Drawable NativeParentHandle() const Standard_OVERRIDE { return 0; }
//! Applies the resizing to the window <me>
virtual Aspect_TypeOfResize DoResize() const Standard_OVERRIDE;
virtual Aspect_TypeOfResize DoResize() Standard_OVERRIDE;
//! Returns True if the window <me> is opened and False if the window is closed.
virtual Standard_Boolean IsMapped() const Standard_OVERRIDE;

2
samples/java/jniviewer/jni/OcctJni_Window.hxx
View File

@ -44,7 +44,7 @@ public:
virtual void Unmap() const Standard_OVERRIDE {}
//! Applies the resizing to the window <me>
virtual Aspect_TypeOfResize DoResize() const Standard_OVERRIDE { return Aspect_TOR_UNKNOWN; }
virtual Aspect_TypeOfResize DoResize() Standard_OVERRIDE { return Aspect_TOR_UNKNOWN; }
//! Apply the mapping change to the window <me>
virtual Standard_Boolean DoMapping() const Standard_OVERRIDE { return Standard_True; }

2
samples/qt/AndroidQt/src/AndroidQt_Window.h
View File

@ -44,7 +44,7 @@ public:
virtual void Unmap() const {}
//! Applies the resizing to the window <me>
virtual Aspect_TypeOfResize DoResize() const { return Aspect_TOR_UNKNOWN; }
virtual Aspect_TypeOfResize DoResize() { return Aspect_TOR_UNKNOWN; }
//! Apply the mapping change to the window <me>
virtual Standard_Boolean DoMapping() const { return Standard_True; }

10
samples/qt/Common/src/OcctWindow.cxx
View File

@ -81,7 +81,7 @@ void OcctWindow::Unmap() const
// function : DoResize
// purpose :
// =======================================================================
Aspect_TypeOfResize OcctWindow::DoResize() const
Aspect_TypeOfResize OcctWindow::DoResize()
{
int aMask = 0;
Aspect_TypeOfResize aMode = Aspect_TOR_UNKNOWN;
@ -126,10 +126,10 @@ Aspect_TypeOfResize OcctWindow::DoResize() const
break;
} // end switch
*( ( Standard_Integer* )&myXLeft ) = myWidget->rect().left();
*( ( Standard_Integer* )&myXRight ) = myWidget->rect().right();
*( ( Standard_Integer* )&myYTop ) = myWidget->rect().top();
*( ( Standard_Integer* )&myYBottom) = myWidget->rect().bottom();
myXLeft = myWidget->rect().left();
myXRight = myWidget->rect().right();
myYTop = myWidget->rect().top();
myYBottom = myWidget->rect().bottom();
}
return aMode;

2
samples/qt/Common/src/OcctWindow.h
View File

@ -51,7 +51,7 @@ public:
virtual Aspect_Drawable NativeParentHandle() const;
//! Applies the resizing to the window <me>
virtual Aspect_TypeOfResize DoResize() const;
virtual Aspect_TypeOfResize DoResize();
//! Returns True if the window <me> is opened
//! and False if the window is closed.

2
src/Aspect/Aspect_NeutralWindow.hxx
View File

@ -59,7 +59,7 @@ public:
virtual void Unmap() const Standard_OVERRIDE { myIsMapped = Standard_False; }
//! Resize window - do nothing.
virtual Aspect_TypeOfResize DoResize() const Standard_OVERRIDE { return Aspect_TOR_UNKNOWN; }
virtual Aspect_TypeOfResize DoResize() Standard_OVERRIDE { return Aspect_TOR_UNKNOWN; }
//! Map window - do nothing.
virtual Standard_Boolean DoMapping() const Standard_OVERRIDE { return Standard_True; }

2
src/Aspect/Aspect_Window.hxx
View File

@ -58,7 +58,7 @@ public:
Standard_EXPORT virtual void Unmap() const = 0;
//! Apply the resizing to the window <me>.
Standard_EXPORT virtual Aspect_TypeOfResize DoResize() const = 0;
Standard_EXPORT virtual Aspect_TypeOfResize DoResize() = 0;
//! Apply the mapping change to the window <me>.
//! and returns TRUE if the window is mapped at screen.

2
src/Cocoa/Cocoa_Window.hxx
View File

@ -91,7 +91,7 @@ public:
Standard_EXPORT virtual void Unmap() const Standard_OVERRIDE;
//! Applies the resizing to the window <me>
Standard_EXPORT virtual Aspect_TypeOfResize DoResize() const Standard_OVERRIDE;
Standard_EXPORT virtual Aspect_TypeOfResize DoResize() Standard_OVERRIDE;
//! Apply the mapping change to the window <me>
Standard_EXPORT virtual Standard_Boolean DoMapping() const Standard_OVERRIDE;

10
src/Cocoa/Cocoa_Window.mm
View File

@ -293,7 +293,7 @@ void Cocoa_Window::Unmap() const
// function : DoResize
// purpose :
// =======================================================================
Aspect_TypeOfResize Cocoa_Window::DoResize() const
Aspect_TypeOfResize Cocoa_Window::DoResize()
{
if (myHView == NULL)
{
@ -326,10 +326,10 @@ Aspect_TypeOfResize Cocoa_Window::DoResize() const
default: break;
}
*((Standard_Integer* )&myXLeft ) = (Standard_Integer )aBounds.origin.x;
*((Standard_Integer* )&myXRight ) = (Standard_Integer )(aBounds.origin.x + aBounds.size.width);
*((Standard_Integer* )&myYTop ) = (Standard_Integer )aBounds.origin.y;
*((Standard_Integer* )&myYBottom ) = (Standard_Integer )(aBounds.origin.y + aBounds.size.height);
myXLeft = (Standard_Integer )aBounds.origin.x;
myXRight = (Standard_Integer )(aBounds.origin.x + aBounds.size.width);
myYTop = (Standard_Integer )aBounds.origin.y;
myYBottom = (Standard_Integer )(aBounds.origin.y + aBounds.size.height);
return aMode;
}

10
src/WNT/WNT_Window.cxx
View File

@ -205,7 +205,7 @@ void WNT_Window::Unmap() const
// function : DoResize
// purpose :
// =======================================================================
Aspect_TypeOfResize WNT_Window::DoResize() const
Aspect_TypeOfResize WNT_Window::DoResize()
{
if (IsVirtual())
{
@ -259,10 +259,10 @@ Aspect_TypeOfResize WNT_Window::DoResize() const
break;
} // end switch
*((Standard_Integer* )&aXLeft ) = wp.rcNormalPosition.left;
*((Standard_Integer* )&aXRight ) = wp.rcNormalPosition.right;
*((Standard_Integer* )&aYTop ) = wp.rcNormalPosition.top;
*((Standard_Integer* )&aYBottom) = wp.rcNormalPosition.bottom;
aXLeft = wp.rcNormalPosition.left;
aXRight = wp.rcNormalPosition.right;
aYTop = wp.rcNormalPosition.top;
aYBottom = wp.rcNormalPosition.bottom;
}
return mode;

2
src/WNT/WNT_Window.hxx
View File

@ -83,7 +83,7 @@ public:
Standard_EXPORT virtual void Unmap() const Standard_OVERRIDE;
//! Applies the resizing to the window <me>.
Standard_EXPORT virtual Aspect_TypeOfResize DoResize() const Standard_OVERRIDE;
Standard_EXPORT virtual Aspect_TypeOfResize DoResize() Standard_OVERRIDE;
//! Apply the mapping change to the window <me>
//! and returns TRUE if the window is mapped at screen.

10
src/Xw/Xw_Window.cxx
View File

@ -389,7 +389,7 @@ void Xw_Window::Unmap() const
// function : DoResize
// purpose :
// =======================================================================
Aspect_TypeOfResize Xw_Window::DoResize() const
Aspect_TypeOfResize Xw_Window::DoResize()
{
if (myXWindow == 0)
{
@ -425,10 +425,10 @@ Aspect_TypeOfResize Xw_Window::DoResize() const
default: break;
}
*((Standard_Integer* )&myXLeft ) = aWinAttr.x;
*((Standard_Integer* )&myXRight ) = aWinAttr.x + aWinAttr.width;
*((Standard_Integer* )&myYTop ) = aWinAttr.y;
*((Standard_Integer* )&myYBottom ) = aWinAttr.y + aWinAttr.height;
myXLeft = aWinAttr.x;
myXRight = aWinAttr.x + aWinAttr.width;
myYTop = aWinAttr.y;
myYBottom = aWinAttr.y + aWinAttr.height;
return aMode;
}

2
src/Xw/Xw_Window.hxx
View File

@ -71,7 +71,7 @@ public:
Standard_EXPORT virtual void Unmap() const Standard_OVERRIDE;
//! Applies the resizing to the window <me>
Standard_EXPORT virtual Aspect_TypeOfResize DoResize() const Standard_OVERRIDE;
Standard_EXPORT virtual Aspect_TypeOfResize DoResize() Standard_OVERRIDE;
//! Apply the mapping change to the window <me>
Standard_EXPORT virtual Standard_Boolean DoMapping() const Standard_OVERRIDE;