Salome HOME
Merge from SKV_CCreator_from_HYDRO branch
authorvsr <vsr@opencascade.com>
Fri, 10 Oct 2014 09:37:00 +0000 (13:37 +0400)
committervsr <vsr@opencascade.com>
Fri, 10 Oct 2014 09:37:00 +0000 (13:37 +0400)
1  2 
src/OCCViewer/OCCViewer_Utilities.cxx
src/OCCViewer/OCCViewer_Utilities.h

index 5b9a8797d077148187591c840534cf07d675cc56,fd9c9242c9f19df55ae21e925b6bad7d61e87c97..51c38836558f9c4a08c47fe8896aff39498fc52f
mode 100755,100644..100755
  
  #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>
  
- void OCCViewer_Utilities::setViewer2DMode( OCCViewer_Viewer* theViewer,
 +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 )
  {
+   OCCViewer_ViewWindow::Mode2dType anOldMode = OCCViewer_ViewWindow::No2dMode;
    OCCViewer_ViewFrame* aFrame = dynamic_cast<OCCViewer_ViewFrame*>
                                       ( theViewer->getViewManager()->getActiveView() );
    OCCViewer_ViewWindow* aView = aFrame ? aFrame->getView( OCCViewer_ViewFrame::MAIN_VIEW ) : 0;
index 1cbbacf2442a7c4239ef38d9ba9e52dd112aa934,8319bf74d6ba155eb120c045a1c4ccc9a9af0575..fee76863f4f44c140d755b243956e2ab7d521e4e
mode 100755,100644..100755