0023701: Add Cocoa support to Qt samples

Adapted Qt samples for using Cocoa on Mac OS X

diff --git a/samples/qt/Common/src/View.cxx b/samples/qt/Common/src/View.cxx
index ce7b1372219c4b8ffb90fed3f75e0a2e042390d8..342c17d14b4216f88b3bdf667f066a1c1139ff00 100755 (executable)
--- a/samples/qt/Common/src/View.cxx
+++ b/samples/qt/Common/src/View.cxx
@@ -18,9 +18,11 @@
 #include <Graphic3d_ExportFormat.hxx>
 #include <QWindowsStyle>
   
-#ifdef WNT
+#if defined(_WIN32) || defined(__WIN32__)
 #include <WNT_Window.hxx>
 #include <Graphic3d_WNTGraphicDevice.hxx>
+#elif defined(__APPLE__) && !defined(MACOSX_USE_GLX)
+#include <Cocoa_Window.hxx>
 #else
 #include <QX11Info>
 #include <GL/glx.h>
@@ -53,7 +55,7 @@ View::View( Handle(AIS_InteractiveContext) theContext, QWidget* parent )
 : QWidget( parent ),
 myViewActions( 0 )
 {
-#ifndef WNT
+#if !defined(_WIN32) && !defined(__WIN32__) && (!defined(__APPLE__) || defined(MACOSX_USE_GLX))
   //XSynchronize( x11Display(),true ); // it is possible to use QApplication::syncX();
   XSynchronize( x11Info().display(),true ); // it is possible to use QApplication::syncX();
 #endif
@@ -70,7 +72,7 @@ myViewActions( 0 )
        setAttribute(Qt::WA_PaintOnScreen);
     setAttribute(Qt::WA_NoSystemBackground);
 
-#if !defined WNT
+#if !defined(_WIN32) && !defined(__WIN32__) && (!defined(__APPLE__) || defined(MACOSX_USE_GLX))
     XVisualInfo* pVisualInfo;
     if ( x11Info().display() )
     {
@@ -161,22 +163,28 @@ View::~View()
 
 void View::init()
 {
-    if(myView.IsNull())
-    myView = myContext->CurrentViewer()->CreateView();
-    int windowHandle = (int) winId();
-    short hi, lo;
-    lo = (short) windowHandle;
-    hi = (short) (windowHandle >> 16);
-#ifdef WNT
-    Handle(WNT_Window) hWnd = new WNT_Window(Handle(Graphic3d_WNTGraphicDevice)::DownCast(myContext->CurrentViewer()->Device()),(int) hi,(int) lo);
+  if (myView.IsNull())
+  myView = myContext->CurrentViewer()->CreateView();
+#if defined(_WIN32) || defined(__WIN32__)
+  Aspect_Handle aWindowHandle = (Aspect_Handle )winId();
+  Handle(WNT_Window) hWnd = new WNT_Window (Handle(Graphic3d_WNTGraphicDevice)::DownCast (myContext->CurrentViewer()->Device()),
+                                            aWindowHandle);
+#elif defined(__APPLE__) && !defined(MACOSX_USE_GLX)
+  NSView* aViewHandle = (NSView* )winId();
+  Handle(Cocoa_Window) hWnd = new Cocoa_Window (aViewHandle);
 #else
-    Handle(Xw_Window) hWnd = new Xw_Window(Handle(Graphic3d_GraphicDevice)::DownCast(myContext->CurrentViewer()->Device()),(int) hi,(int) lo,Xw_WQ_SAMEQUALITY);
+  Aspect_Handle aWindowHandle = (Aspect_Handle )winId();
+  Handle(Xw_Window) hWnd = new Xw_Window (Handle(Graphic3d_GraphicDevice)::DownCast (myContext->CurrentViewer()->Device()),
+                                          aWindowHandle,
+                                          Xw_WQ_SAMEQUALITY);
 #endif // WNT
-    myView->SetWindow( hWnd );
-    if ( !hWnd->IsMapped() )
-        hWnd->Map();
-    myView->SetBackgroundColor(Quantity_NOC_BLACK);
-    myView->MustBeResized();
+  myView->SetWindow (hWnd);
+  if (!hWnd->IsMapped())
+  {
+    hWnd->Map();
+  }
+  myView->SetBackgroundColor (Quantity_NOC_BLACK);
+  myView->MustBeResized();
 }
 
 void View::paintEvent( QPaintEvent * e )

diff --git a/samples/qt/IESample/IESample.pro b/samples/qt/IESample/IESample.pro
index f7fb980604782fc1d47d1c64be131e8f6a659d50..3dc34ab6b97d7f2bb12bcc096dc9b86a1ba11afb 100755 (executable)
--- a/samples/qt/IESample/IESample.pro
+++ b/samples/qt/IESample/IESample.pro
@@ -30,9 +30,13 @@ unix {
        OBJECTS_DIR = ./$$UNAME/obj
        MOC_DIR = ./$$UNAME/src
     }
-    INCLUDEPATH += $$QMAKE_INCDIR_X11 $$QMAKE_INCDIR_OPENGL $$QMAKE_INCDIR_THREAD
-    DEFINES += LIN LININTEL OCC_CONVERT_SIGNALS HAVE_CONFIG_H HAVE_WOK_CONFIG_H QT_NO_STL
-    LIBS += -L$$QMAKE_LIBDIR_X11 $$QMAKE_LIBS_X11 -L$$QMAKE_LIBDIR_OPENGL $$QMAKE_LIBS_OPENGL $$QMAKE_LIBS_THREAD
+
+    MACOSX_USE_GLX = $$(MACOSX_USE_GLX)
+
+    !macx | equals(MACOSX_USE_GLX, true): INCLUDEPATH += $$QMAKE_INCDIR_X11 $$QMAKE_INCDIR_OPENGL $$QMAKE_INCDIR_THREAD
+    !macx | equals(MACOSX_USE_GLX, true): DEFINES += LIN LININTEL
+    DEFINES += OCC_CONVERT_SIGNALS HAVE_CONFIG_H HAVE_WOK_CONFIG_H QT_NO_STL
+    !macx | equals(MACOSX_USE_GLX, true): LIBS += -L$$QMAKE_LIBDIR_X11 $$QMAKE_LIBS_X11 -L$$QMAKE_LIBDIR_OPENGL $$QMAKE_LIBS_OPENGL $$QMAKE_LIBS_THREAD
     LIBS += -lfreeimageplus
     LIBS += -ltbb -ltbbmalloc
 }

diff --git a/samples/qt/IESample/make.sh b/samples/qt/IESample/make.sh
old mode 100644 (file)
new mode 100755 (executable)
index 7654298..f2af5ab
--- a/samples/qt/IESample/make.sh
+++ b/samples/qt/IESample/make.sh
@@ -4,4 +4,6 @@ export aSamplePath="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 if [ -e "${aSamplePath}/env.sh" ]; then source "${aSamplePath}/env.sh"; fi
 cd $aSamplePath
 qmake IESample.pro
-make
+if test `uname -s` != "Darwin"; then
+  make
+fi

diff --git a/samples/qt/IESample/run.sh b/samples/qt/IESample/run.sh
index 200b06ba3e658ca31ec83254f92db8e6260c6216..7fec2ea8c97f47f995fc3b7650c05d966bd1938b 100755 (executable)
--- a/samples/qt/IESample/run.sh
+++ b/samples/qt/IESample/run.sh
@@ -8,7 +8,17 @@ host=`uname -s`
 STATION=$host
 
 RES_DIR="${aSamplePath}/res"
-BIN_DIR="${aSamplePath}/${STATION}/bin"
+
+aSystem=`uname -s`
+if [ "$aSystem" == "Darwin" ]; then
+  if [ "${CASDEB}" == "d" ]; then
+    BIN_DIR="${aSamplePath}/build/Debug/IESample.app/Contents/MacOS"
+  else
+    BIN_DIR="${aSamplePath}/build/Release/IESample.app/Contents/MacOS"
+  fi
+else
+  BIN_DIR="${aSamplePath}/${STATION}/bin${CASDEB}"
+fi
 
 CSF_ResourcesDefaults="${RES_DIR}"
 CSF_IEResourcesDefaults="${RES_DIR}"
@@ -19,9 +29,13 @@ export CSF_IEResourcesDefaults CSF_ResourcesDefaults
 export PATH
 
 if test ! -r "${BIN_DIR}/IESample"; then
-   echo "Executable \"${BIN_DIR}/IESample\" not found."
-   echo "Probably you don't compile the application. Execute \"make\"."
-   exit 1
+  echo "Executable \"${BIN_DIR}/IESample\" not found."
+  if [ "$aSystem" == "Darwin" ]; then
+    echo "Probably you don't compile the application. Build it with Xcode."
+  else
+    echo "Probably you don't compile the application. Execute \"make\"."
+  fi
+  exit 1
 fi
 
 ${BIN_DIR}/IESample

diff --git a/samples/qt/Tutorial/Tutorial.pro b/samples/qt/Tutorial/Tutorial.pro
index 586e2dd8d2425c9e2b5bd24f95ba059e15afbf0f..273a3301a0b1b4560986b1d5616d8fc58c7dbca9 100755 (executable)
--- a/samples/qt/Tutorial/Tutorial.pro
+++ b/samples/qt/Tutorial/Tutorial.pro
@@ -32,11 +32,15 @@ unix {
        OBJECTS_DIR = ./$$UNAME/obj
        MOC_DIR = ./$$UNAME/src
     }
-    INCLUDEPATH += $$QMAKE_INCDIR_X11 $$QMAKE_INCDIR_OPENGL $$QMAKE_INCDIR_THREAD
-    DEFINES += LIN LININTEL OCC_CONVERT_SIGNALS HAVE_CONFIG_H HAVE_WOK_CONFIG_H
-    LIBS += -L$$QMAKE_LIBDIR_X11 $$QMAKE_LIBS_X11 -L$$QMAKE_LIBDIR_OPENGL $$QMAKE_LIBS_OPENGL $$QMAKE_LIBS_THREAD
-       LIBS += -lfreeimageplus
-       LIBS += -ltbb -ltbbmalloc
+
+    MACOSX_USE_GLX = $$(MACOSX_USE_GLX)
+
+    !macx | equals(MACOSX_USE_GLX, true): INCLUDEPATH += $$QMAKE_INCDIR_X11 $$QMAKE_INCDIR_OPENGL $$QMAKE_INCDIR_THREAD
+    !macx | equals(MACOSX_USE_GLX, true): DEFINES += LIN LININTEL
+    DEFINES += OCC_CONVERT_SIGNALS HAVE_CONFIG_H HAVE_WOK_CONFIG_H QT_NO_STL
+    !macx | equals(MACOSX_USE_GLX, true): LIBS += -L$$QMAKE_LIBDIR_X11 $$QMAKE_LIBS_X11 -L$$QMAKE_LIBDIR_OPENGL $$QMAKE_LIBS_OPENGL $$QMAKE_LIBS_THREAD
+    LIBS += -lfreeimageplus
+    LIBS += -ltbb -ltbbmalloc
 }
 
 win32 {

diff --git a/samples/qt/Tutorial/make.sh b/samples/qt/Tutorial/make.sh
index 1f7b3acd2964df1f41812fb58c885477e683e991..2420cf295837970806c91d8b9c9dccbf4dd1ed77 100644 (file)
--- a/samples/qt/Tutorial/make.sh
+++ b/samples/qt/Tutorial/make.sh
@@ -4,4 +4,6 @@ export aSamplePath="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 if [ -e "${aSamplePath}/env.sh" ]; then source "${aSamplePath}/env.sh"; fi
 cd $aSamplePath
 qmake Tutorial.pro
-make
+if test `uname -s` != "Darwin"; then
+  make
+fi

diff --git a/samples/qt/Tutorial/run.sh b/samples/qt/Tutorial/run.sh
index bd6790906fb577db5857f69e80e50fe7b2b936b3..8e440fe82fed7620ce1e9f6bffadb6f99b6d9132 100755 (executable)
--- a/samples/qt/Tutorial/run.sh
+++ b/samples/qt/Tutorial/run.sh
@@ -8,7 +8,17 @@ host=`uname -s`
 STATION=$host
 
 RES_DIR="${aSamplePath}/res"
-BIN_DIR="${aSamplePath}/${STATION}/bin"
+
+aSystem=`uname -s`
+if [ "$aSystem" == "Darwin" ]; then
+  if [ "${CASDEB}" == "d" ]; then
+    BIN_DIR="${aSamplePath}/build/Debug/Tutorial.app/Contents/MacOS"
+  else
+    BIN_DIR="${aSamplePath}/build/Release/Tutorial.app/Contents/MacOS"
+  fi
+else
+  BIN_DIR="${aSamplePath}/${STATION}/bin${CASDEB}"
+fi
 
 CSF_ResourcesDefaults="${RES_DIR}"
 CSF_TutorialResourcesDefaults="${RES_DIR}"
@@ -19,9 +29,13 @@ export CSF_TutorialResourcesDefaults CSF_ResourcesDefaults
 export PATH
 
 if test ! -r "${BIN_DIR}/Tutorial"; then
-   echo "Executable \"${BIN_DIR}/Tutorial\" not found."
-   echo "Probably you don't compile the application. Execute \"make\"."
-   exit 1
+  echo "Executable \"${BIN_DIR}/Tutorial\" not found."
+  if [ "$aSystem" == "Darwin" ]; then
+    echo "Probably you don't compile the application. Build it with Xcode."
+  else
+    echo "Probably you don't compile the application. Execute \"make\"."
+  fi
+  exit 1
 fi
 
 ${BIN_DIR}/Tutorial