From 4d183a4b4dce8b04b76932852f8c73e4bac35a75 Mon Sep 17 00:00:00 2001
From: bugmaster <>
Date: Thu, 21 Apr 2011 10:01:21 +0000
Subject: [PATCH] Update of QT samples for problems: 1. Mouse selection issue
 is repeatable 2. Display corrupting during different operation in Viewer

---
 samples/qt/Common/src/View.cxx      | 17 ++++++++++++++++-
 samples/qt/Common/src/View.h        |  1 +
 samples/qt/voxeldemo/inc/Viewer.h   |  1 +
 samples/qt/voxeldemo/src/Viewer.cpp | 14 ++++++++++++++
 4 files changed, 32 insertions(+), 1 deletion(-)

diff --git a/samples/qt/Common/src/View.cxx b/samples/qt/Common/src/View.cxx
index c862324b3b..ce7b137221 100755
--- a/samples/qt/Common/src/View.cxx
+++ b/samples/qt/Common/src/View.cxx
@@ -146,6 +146,13 @@ myViewActions( 0 )
 
     initViewActions();
     initCursors();
+
+	setBackgroundRole( QPalette::NoRole );//NoBackground );
+	// set focus policy to threat QContextMenuEvent from keyboard  
+	setFocusPolicy( Qt::StrongFocus );
+	setAttribute( Qt::WA_PaintOnScreen );
+	setAttribute( Qt::WA_NoSystemBackground );
+
 }
 
 View::~View()
@@ -349,6 +356,14 @@ QList<QAction*>* View::getViewActions()
     return myViewActions;
 }
 
+/*!
+  Get paint engine for the OpenGL viewer. [ virtual public ]
+*/
+QPaintEngine* View::paintEngine() const
+{
+  return 0;
+}
+
 void View::initViewActions()
 {
   if ( myViewActions )
@@ -754,7 +769,7 @@ void View::DragEvent( const int x, const int y, const int TheState )
         theButtonDownY = y;
     }
 
-    if ( TheState == 0 )
+    if ( TheState == 1 )
     {
         myContext->Select( theButtonDownX, theButtonDownY, x, y, myView );
         emit selectionChanged();
diff --git a/samples/qt/Common/src/View.h b/samples/qt/Common/src/View.h
index 5cdd36da17..3d097b01c1 100755
--- a/samples/qt/Common/src/View.h
+++ b/samples/qt/Common/src/View.h
@@ -47,6 +47,7 @@ public:
                                                       Standard_Integer&,
 						                              TopAbs_ShapeEnum& SelectionMode,
 						                              Standard_Boolean& );
+	virtual QPaintEngine*          paintEngine() const;
 signals:
     void                          selectionChanged();
 
diff --git a/samples/qt/voxeldemo/inc/Viewer.h b/samples/qt/voxeldemo/inc/Viewer.h
index dbd71fb636..ee57227eb3 100755
--- a/samples/qt/voxeldemo/inc/Viewer.h
+++ b/samples/qt/voxeldemo/inc/Viewer.h
@@ -27,6 +27,7 @@ public:
 	Handle(V3d_View) getView() const { return myView; }
     Voxel_Selector& getSelector() { return mySelector; }
     void setPrs(const Handle(Voxel_Prs)& prs) { myPrs = prs; }
+	virtual QPaintEngine*          paintEngine() const;
 
 signals:
 	
diff --git a/samples/qt/voxeldemo/src/Viewer.cpp b/samples/qt/voxeldemo/src/Viewer.cpp
index d8a9a5ae6d..d0304bfb54 100755
--- a/samples/qt/voxeldemo/src/Viewer.cpp
+++ b/samples/qt/voxeldemo/src/Viewer.cpp
@@ -63,6 +63,12 @@ Viewer::Viewer(QWidget* parent):QWidget(parent)
     myView->TriedronDisplay(Aspect_TOTP_LEFT_LOWER, Quantity_NOC_BLACK, 0.1, V3d_ZBUFFER);
 
     mySelector.Init(myView);
+
+	setBackgroundRole( QPalette::NoRole );//NoBackground );
+	// set focus policy to threat QContextMenuEvent from keyboard  
+	setFocusPolicy( Qt::StrongFocus );
+	setAttribute( Qt::WA_PaintOnScreen );
+	setAttribute( Qt::WA_NoSystemBackground );
 }
 
 Viewer::~Viewer()
@@ -77,6 +83,14 @@ void Viewer::paintEvent(QPaintEvent * pEvent)
 }
 
 
+/*!
+  Get paint engine for the OpenGL viewer. [ virtual public ]
+*/
+QPaintEngine* Viewer::paintEngine() const
+{
+  return 0;
+}
+
 void Viewer::resizeEvent(QResizeEvent * e)
 {
     if (!myView.IsNull())