A revision of documentation changes in the new version. Very minor corrections.

[modules/gui.git] / src / OCCViewer / OCCViewer_Utilities.cxx

diff --git a/src/OCCViewer/OCCViewer_Utilities.cxx b/src/OCCViewer/OCCViewer_Utilities.cxx
old mode 100644 (file)
new mode 100755 (executable)
index fd9c924..51c3883
--- a/src/OCCViewer/OCCViewer_Utilities.cxx
+++ b/src/OCCViewer/OCCViewer_Utilities.cxx
@@ -1,4 +1,23 @@
+// Copyright (C) 2014  CEA/DEN, EDF R&D, OPEN CASCADE
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
 
+// internal includes
 #include "OCCViewer_Utilities.h"
 #include "OCCViewer_ViewFrame.h"
 #include "OCCViewer_ViewModel.h"
@@ -6,11 +25,55 @@
 
 #include "SUIT_ViewManager.h"
 #include "QtxActionToolMgr.h"
+#include "QtxMultiAction.h"
 
+// KERNEL includes
+#include <Basics_OCCTVersion.hxx>
+
+// OCC includes
 #include <V3d_View.hxx>
 
+// QT includes
+#include <QImage>
 #include <QAction>
 
+Handle(Image_PixMap) OCCViewer_Utilities::imageToPixmap( const QImage& anImage )
+{
+  Handle(Image_PixMap) aPixmap = new Image_PixMap();
+  if ( !anImage.isNull() ) {
+    aPixmap->InitTrash( Image_PixMap::ImgBGRA, anImage.width(), anImage.height() );
+    aPixmap->SetTopDown( Standard_True );
+
+    const uchar* aImageBytes = anImage.bits();
+      
+    for ( int aLine = anImage.height() - 1; aLine >= 0; --aLine ) {
+#if OCC_VERSION_LARGE > 0x06070100
+      // convert pixels from ARGB to renderer-compatible RGBA
+      for ( int aByte = 0; aByte < anImage.width(); ++aByte ) {
+           Image_ColorBGRA& aPixmapBytes = aPixmap->ChangeValue<Image_ColorBGRA>(aLine, aByte);
+
+           aPixmapBytes.b() = (Standard_Byte) *aImageBytes++;
+           aPixmapBytes.g() = (Standard_Byte) *aImageBytes++;
+           aPixmapBytes.r() = (Standard_Byte) *aImageBytes++;
+           aPixmapBytes.a() = (Standard_Byte) *aImageBytes++;
+         }
+#else
+         Image_ColorBGRA* aPixmapBytes = aPixmap->EditData<Image_ColorBGRA>().ChangeRow(aLine);
+       
+      // convert pixels from ARGB to renderer-compatible RGBA
+      for ( int aByte = 0; aByte < anImage.width(); ++aByte ) {
+           aPixmapBytes->b() = (Standard_Byte) *aImageBytes++;
+           aPixmapBytes->g() = (Standard_Byte) *aImageBytes++;
+           aPixmapBytes->r() = (Standard_Byte) *aImageBytes++;
+           aPixmapBytes->a() = (Standard_Byte) *aImageBytes++;
+           aPixmapBytes++;
+      }
+#endif
+    }
+  }
+  return aPixmap;
+}
+
 OCCViewer_ViewWindow::Mode2dType OCCViewer_Utilities::setViewer2DMode
                                          ( OCCViewer_Viewer* theViewer,
                                            const OCCViewer_ViewWindow::Mode2dType& theMode )
@@ -33,7 +96,7 @@ OCCViewer_ViewWindow::Mode2dType OCCViewer_Utilities::setViewer2DMode
                << OCCViewer_ViewWindow::RotationId
                << OCCViewer_ViewWindow::FrontId
                << OCCViewer_ViewWindow::BackId
-               << OCCViewer_ViewWindow::TopId
+               //<< OCCViewer_ViewWindow::TopId
                << OCCViewer_ViewWindow::BottomId
                << OCCViewer_ViewWindow::LeftId
                << OCCViewer_ViewWindow::RightId
@@ -48,6 +111,9 @@ OCCViewer_ViewWindow::Mode2dType OCCViewer_Utilities::setViewer2DMode
     if ( anAction )
       anAction->setEnabled( !is2dMode );
   }
+  QAction* aTop = aToolMgr->action( OCCViewer_ViewWindow::TopId );
+  QtxMultiAction* aMulti = dynamic_cast<QtxMultiAction*>( aTop->parent() );
+  aMulti->setActiveAction( aTop );
 
   // change view position
   Handle(V3d_View) aView3d = aView->getViewPort()->getView();