Salome HOME
debug of DTM object
[modules/hydro.git] / src / HYDROGUI / HYDROGUI_Tool.cxx
index 27d50dcb8b481af27295cdfb3449fb4026457744..f86499f2b94171631fa6e7e5688ecdeb05ebc8ee 100644 (file)
@@ -1,12 +1,8 @@
-// Copyright (C) 2007-2013  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-// Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
-//
+// Copyright (C) 2014-2015  EDF-R&D
 // 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.
+// 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
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
 
-#include "HYDROGUI_Tool.h"
-
-#include "HYDROGUI_DataModel.h"
-#include "HYDROGUI_DataObject.h"
-#include "HYDROGUI_Module.h"
-#include "HYDROGUI_Prs.h"
-
+#include <HYDROGUI_Tool.h>
 #include <HYDROData_Document.h>
 #include <HYDROData_Iterator.h>
-#include <HYDROData_Zone.h>
-
-#include <GraphicsView_Viewer.h>
-
-#include <LightApp_Application.h>
-#include <LightApp_DataOwner.h>
-#include <LightApp_SelectionMgr.h>
-
-#include <OCCViewer_ViewModel.h>
-
-#include <QtxWorkstack.h>
-
-#include <STD_TabDesktop.h>
-
-#include <SUIT_Study.h>
-#include <SUIT_ViewManager.h>
-#include <SUIT_ViewWindow.h>
-
-#include <QTextCodec>
+#include <HYDROData_Profile.h>
+#include <TCollection_ExtendedString.hxx>
+#include <TCollection_HAsciiString.hxx>
+#include <TCollection_HExtendedString.hxx>
+#include <Image_PixMap.hxx>
+#include <QDir>
 #include <QDockWidget>
+#include <QFile>
+#include <QFileInfo>
+#include <QLocale>
+#include <QStringList>
+#include <QTextCodec>
+#include <QWidget>
 
 // Definition of this id allows to use 'latin1' (Qt alias for 'ISO-8859-1')
 // encoding instead of default 'System'
 #define USE_LATIN1_ENCODING
 
+// #define DEB_GROUPS 1
+
 QString HYDROGUI_Tool::ToQString( const TCollection_AsciiString& src )
 {
 #ifdef USE_LATIN1_ENCODING
@@ -134,382 +119,223 @@ Handle(TCollection_HExtendedString) HYDROGUI_Tool::ToHExtString( const QString&
   return new TCollection_HExtendedString( ToExtString( src ) );
 }
 
-bool HYDROGUI_Tool::IsEqual( const Handle(HYDROData_Object)& theObj1,
-                             const Handle(HYDROData_Object)& theObj2 )
-{
-  if( !theObj1.IsNull() && !theObj2.IsNull() )
-    return theObj1->Label() == theObj2->Label(); //ouv: check that the names can be used here
-  return false;
-}
-
-void HYDROGUI_Tool::SetActiveViewManager( HYDROGUI_Module* theModule,
-                                          SUIT_ViewManager* theViewManager )
-{
-  if( theViewManager )
-    if( SUIT_ViewWindow* aViewWindow = theViewManager->getActiveView() )
-      if( STD_TabDesktop* aTabDesktop = dynamic_cast<STD_TabDesktop*>( theModule->getApp()->desktop() ) )
-        if( QtxWorkstack* aWorkstack = aTabDesktop->workstack() )
-          aWorkstack->setActiveWindow( aViewWindow );
-}
-
-void HYDROGUI_Tool::GetPrsSubObjects( HYDROGUI_Module* theModule,
-                                      HYDROData_SequenceOfObjects& theSeq )
+QString HYDROGUI_Tool::GetTempDir( const bool theToCreate )
 {
-  Handle(HYDROData_Document) aDocument = HYDROData_Document::Document( theModule->getStudyId() );
-  if( aDocument.IsNull() )
-    return;
-
-  HYDROData_Iterator anIterator( aDocument, KIND_IMAGE );
-  for( ; anIterator.More(); anIterator.Next() )
-  {
-    Handle(HYDROData_Object) anObject = anIterator.Current();
-    if( !anObject.IsNull() )
-      theSeq.Append( anObject );
-  }
-
-  anIterator = HYDROData_Iterator( aDocument, KIND_POLYLINE );
-  for( ; anIterator.More(); anIterator.Next() )
-  {
-    Handle(HYDROData_Object) anObject = anIterator.Current();
-    if( !anObject.IsNull() )
-      theSeq.Append( anObject );
-  }
+  QString aRes;
 
-  anIterator = HYDROData_Iterator( aDocument, KIND_ZONE );
-  for( ; anIterator.More(); anIterator.Next() )
+  char* tmpdir = getenv ( "HYDRO_TMP_DIR" );
+  if ( tmpdir )
   {
-    Handle(HYDROData_Object) anObject = anIterator.Current();
-    if( !anObject.IsNull() )
-      theSeq.Append( anObject );
-  }
-}
-
-HYDROGUI_Prs* HYDROGUI_Tool::GetPresentation( const Handle(HYDROData_Object)& theObj,
-                                              const GraphicsView_ObjectList& theObjects )
-{
-  if( !theObj.IsNull() )
-  {
-    GraphicsView_ObjectListIterator anIter( theObjects );
-    while( anIter.hasNext() )
+    // try to create folder if it does not exist
+    QFileInfo fi( tmpdir );
+    if ( !fi.exists() && theToCreate )
     {
-      if( HYDROGUI_Prs* aPrs = dynamic_cast<HYDROGUI_Prs*>( anIter.next() ) )
-      {
-        Handle(HYDROData_Object) anObj = aPrs->getObject();
-        if( IsEqual( anObj, theObj ) )
-          return aPrs;
-      }
+      if ( QDir().mkdir( tmpdir ) )
+        QFile::setPermissions( tmpdir, (QFile::Permissions)0x4FFFF );
+       QFileInfo fi( tmpdir );
+       if ( !fi.exists() || !fi.isWritable() )
+         tmpdir = 0;
     }
   }
-  return NULL;
-}
-
-GraphicsView_ObjectList HYDROGUI_Tool::GetPrsList( GraphicsView_ViewPort* theViewPort )
-{
-  GraphicsView_ObjectList aList;
-  if( theViewPort )
+  if ( !tmpdir )
+    tmpdir = getenv ( "TEMP" );
+  if ( !tmpdir )
+    tmpdir = getenv ( "TMP" );
+  if ( !tmpdir )
   {
-    GraphicsView_ObjectListIterator anIter( theViewPort->getObjects() );
-    while( anIter.hasNext() )
-      if( HYDROGUI_Prs* aPrs = dynamic_cast<HYDROGUI_Prs*>( anIter.next() ) )
-        aList.append( aPrs );
+#ifdef WNT
+    tmpdir = "C:\\";
+#else
+    tmpdir = strdup( "/tmp" );
+#endif
   }
-  return aList;
+  aRes = tmpdir;
+  
+  QFileInfo fi( aRes );
+  if ( !fi.exists() || !fi.isWritable() )
+    aRes = QString::null;
+
+  return aRes;
 }
 
-HYDROData_SequenceOfObjects HYDROGUI_Tool::GetSelectedObjects( HYDROGUI_Module* theModule )
+void HYDROGUI_Tool::GetObjectReferences( const Handle(HYDROData_Entity)& theObj,
+                                         HYDROData_SequenceOfObjects& theRefObjects,
+                                         QStringList& theRefNames )
 {
-  HYDROData_SequenceOfObjects aSeq;
-
-  HYDROGUI_DataModel* aModel = theModule->getDataModel();
+  if( theObj.IsNull() )
+    return;
 
-  SUIT_SelectionMgr* aSelectionMgr = theModule->getApp()->selectionMgr();
-  SUIT_DataOwnerPtrList anOwners;
-  aSelectionMgr->selected( anOwners );
+  HYDROData_SequenceOfObjects anAllRefObjects = theObj->GetAllReferenceObjects();
+  theRefObjects.Append( anAllRefObjects );
 
-  QStringList aCollectedNameList; // to avoid duplication
-  foreach( SUIT_DataOwner* aSUITOwner, anOwners )
+  for( int i = 1, n = anAllRefObjects.Length(); i <= n; ++i )
   {
-    if( LightApp_DataOwner* anOwner = dynamic_cast<LightApp_DataOwner*>( aSUITOwner ) )
-    {
-      Handle(HYDROData_Object) anObject = aModel->objectByEntry( anOwner->entry() );
-      if( !anObject.IsNull() )
-      {
-        QString aName = anObject->GetName();
-        if( !aCollectedNameList.contains( aName ) )
-        {
-          aSeq.Append( anObject );
-          aCollectedNameList.append( aName );
-        }
-      }
-    }
-  }
-  return aSeq;
-}
-
-Handle(HYDROData_Object) HYDROGUI_Tool::GetSelectedObject( HYDROGUI_Module* theModule )
-{
-  HYDROData_SequenceOfObjects aSeq = GetSelectedObjects( theModule );
-  if( !aSeq.IsEmpty() )
-    return aSeq.First();
-  return NULL;
-}
-
-ObjectKind HYDROGUI_Tool::GetSelectedPartition( HYDROGUI_Module* theModule )
-{
-  HYDROGUI_DataModel* aModel = theModule->getDataModel();
+    Handle(HYDROData_Entity) aRefObj = theRefObjects.Value( i );
+    if( aRefObj.IsNull() || aRefObj->IsRemoved() )
+      continue;
 
-  SUIT_SelectionMgr* aSelectionMgr = theModule->getApp()->selectionMgr();
-  SUIT_DataOwnerPtrList anOwners;
-  aSelectionMgr->selected( anOwners );
+    QString aRefObjectName = aRefObj->GetName();
+    if( theRefNames.contains( aRefObjectName ) )
+      continue;
 
-  if( anOwners.size() != 1 )
-    return KIND_UNKNOWN;
+    theRefObjects.Append( aRefObj );
+    theRefNames.append( aRefObjectName );
 
-  if( LightApp_DataOwner* anOwner = dynamic_cast<LightApp_DataOwner*>( anOwners.first().operator->() ) )
-  {
-    QString anEntry = anOwner->entry();
-    QString aPrefix = HYDROGUI_DataObject::entryPrefix();
-    if( anEntry.left( aPrefix.length() ) == aPrefix )
-    {
-      anEntry.remove( aPrefix );
-      for( ObjectKind anObjectKind = KIND_UNKNOWN + 1; anObjectKind <= KIND_LAST; anObjectKind++ )
-        if( HYDROGUI_DataModel::partitionName( anObjectKind ) == anEntry )
-          return anObjectKind;
-    }
+    GetObjectReferences( aRefObj, theRefObjects, theRefNames );
   }
-  return KIND_UNKNOWN;
 }
 
-Handle(HYDROData_Object) HYDROGUI_Tool::FindObjectByName( HYDROGUI_Module* theModule,
-                                                          const QString&   theName,
-                                                          const ObjectKind theObjectKind )
+HYDROData_SequenceOfObjects HYDROGUI_Tool::GetObjectBackReferences( const Handle(HYDROData_Entity)& theObj )
 {
-  Handle(HYDROData_Object) anObject;
-  if ( theName.isEmpty() )
-    return anObject;
+  if( theObj.IsNull() )
+    return HYDROData_SequenceOfObjects();
 
-  QStringList aNamesList;
-  aNamesList << theName;
+  QString anObjName = theObj->GetName();
 
-  HYDROData_SequenceOfObjects aSeqOfObjs = FindObjectsByNames( theModule, aNamesList, theObjectKind );
-  if( aSeqOfObjs.IsEmpty() )
-    return anObject;
-  
-  anObject = aSeqOfObjs.First();
-  return anObject;
+  Handle(HYDROData_Document) aDoc = HYDROData_Document::Document( theObj->Label() );
+  QMap<QString,HYDROData_SequenceOfObjects> aMapOfBackRefs =
+    GetObjectsBackReferences( aDoc, QStringList() << anObjName );
+
+  return aMapOfBackRefs[ anObjName ];
 }
 
-HYDROData_SequenceOfObjects HYDROGUI_Tool::FindObjectsByNames( HYDROGUI_Module*   theModule,
-                                                               const QStringList& theNames,
-                                                               const ObjectKind   theObjectKind )
+QMap<QString,HYDROData_SequenceOfObjects> HYDROGUI_Tool::GetObjectsBackReferences(
+  const Handle_HYDROData_Document& theDocument, const QStringList& theObjectNames )
 {
-  HYDROData_SequenceOfObjects aResSeq;
-  if ( theNames.isEmpty() )
-    return aResSeq;
+  QMap<QString,HYDROData_SequenceOfObjects> aResMap;
 
-  Handle(HYDROData_Document) aDocument = HYDROData_Document::Document( theModule->getStudyId() );
-  if( aDocument.IsNull() )
-    return aResSeq;
+  if( theObjectNames.isEmpty() )
+    return aResMap;
 
-  QStringList aNamesList = theNames;
+  if( theDocument.IsNull() )
+    return aResMap;
 
-  HYDROData_Iterator anIter( aDocument, theObjectKind );
-  for( ; anIter.More(); anIter.Next() )
+  HYDROData_Iterator anIterator( theDocument );
+  for( ; anIterator.More(); anIterator.Next() )
   {
-    Handle(HYDROData_Object) anObjectRef = anIter.Current();
-    if( anObjectRef.IsNull() )
+    Handle(HYDROData_Entity) anObject = anIterator.Current();
+    if( anObject.IsNull() || anObject->IsRemoved() )
       continue;
 
-    QString anObjName = anObjectRef->GetName();
-    if ( anObjName.isEmpty() || !aNamesList.contains( anObjName ) )
+    QString anObjectName = anObject->GetName();
+    if ( theObjectNames.contains( anObjectName ) )
       continue;
 
-    aResSeq.Append( anObjectRef );
+    HYDROData_SequenceOfObjects aRefObjects = anObject->GetAllReferenceObjects();
+    for ( int i = 1, n = aRefObjects.Length(); i <= n; ++i )
+    {
+      Handle(HYDROData_Entity) aRefObject = aRefObjects.Value( i );
+      if( aRefObject.IsNull() || aRefObject->IsRemoved() )
+        continue;
 
-    aNamesList.removeAll( anObjName );
-    if ( aNamesList.isEmpty() )
-      break;
+      QString aRefObjectName = aRefObject->GetName();
+      if ( !theObjectNames.contains( aRefObjectName ) )
+        continue;
+
+      aResMap[ aRefObjectName ].Append( anObject );
+    }
   }
 
-  return aResSeq;
+  return aResMap;
 }
 
-QString HYDROGUI_Tool::GenerateObjectName( HYDROGUI_Module*   theModule,
-                                           const QString&     thePrefix,
-                                           const QStringList& theUsedNames )
+QDockWidget* HYDROGUI_Tool::WindowDock( QWidget* wid )
 {
-  QString aName;
-  int anId = 1;
-  while( anId < 100 )
-  {
-    aName = QString( "%1_%2" ).arg( thePrefix ).arg( QString::number( anId++ ) );
-
-    if ( theUsedNames.contains( aName ) )
-      continue;
+  if ( !wid )
+    return 0;
 
-    // check that there are no other objects with the same name in the document
-    Handle(HYDROData_Object) anObject = FindObjectByName( theModule, aName, KIND_UNKNOWN );
-    if( anObject.IsNull() )
-      break;
+  QDockWidget* dock = 0;
+  QWidget* w = wid->parentWidget();
+  while ( w && !dock )
+  {
+    dock = ::qobject_cast<QDockWidget*>( w );
+    w = w->parentWidget();
   }
-  return aName;
+  return dock;
 }
 
-size_t HYDROGUI_Tool::GetActiveViewId( HYDROGUI_Module* theModule,
-                                       const QString&   theViewId )
+QStringList HYDROGUI_Tool::FindExistingObjectsNames( const Handle(HYDROData_Document)& theDoc, 
+                                                     const ObjectKind theObjectKind,
+                                                     bool isCheckValidProfile )
 {
-  size_t aViewId = 0;
-  SUIT_ViewManager* aViewMgr = theModule->getApp()->activeViewManager();
-  if( !aViewMgr || ( !theViewId.isEmpty() && aViewMgr->getType() != theViewId ) )
-    return aViewId;
-
-  if( SUIT_ViewModel* aViewer = aViewMgr->getViewModel() )
-    aViewId = (size_t)aViewer;
-  return aViewId;
-}
+  QStringList aNames;
 
-size_t HYDROGUI_Tool::GetActiveGraphicsViewId( HYDROGUI_Module* theModule )
-{
-  return GetActiveViewId( theModule, GraphicsView_Viewer::Type() );
-}
+  HYDROData_Iterator anIter( theDoc, theObjectKind );
+  for ( ; anIter.More(); anIter.Next() ) {
+    Handle(HYDROData_Entity) anObject = anIter.Current();
 
-size_t HYDROGUI_Tool::GetActiveOCCViewId( HYDROGUI_Module* theModule )
-{
-  return GetActiveViewId( theModule, OCCViewer_Viewer::Type() );
-}
-
-QList<size_t> getViewIdList( HYDROGUI_Module* theModule,
-                             const QString&   theViewId )
-{
-  QList<size_t> aList;
-  ViewManagerList aViewMgrs;
-  theModule->getApp()->viewManagers( theViewId, aViewMgrs );
-  QListIterator<SUIT_ViewManager*> anIter( aViewMgrs );
-  while( anIter.hasNext() )
-  {
-    if( SUIT_ViewManager* aViewMgr = anIter.next() )
+    bool isOK = !anObject.IsNull();
+    
+    if( isOK && isCheckValidProfile )
     {
-      if( SUIT_ViewModel* aViewer = aViewMgr->getViewModel() )
-        aList.append( (size_t)aViewer );
+      Handle_HYDROData_Profile aProfile = Handle_HYDROData_Profile::DownCast( anObject );
+      if( !aProfile.IsNull() && !aProfile->IsValid() )
+        isOK = false;
     }
+      
+    if( isOK )
+      aNames.append( anObject->GetName() );
   }
-  return aList;
-}
 
-QList<size_t> HYDROGUI_Tool::GetGraphicsViewIdList( HYDROGUI_Module* theModule )
-{
-  return getViewIdList( theModule, GraphicsView_Viewer::Type() );
+  return aNames;
 }
 
-QList<size_t> HYDROGUI_Tool::GetOCCViewIdList( HYDROGUI_Module* theModule )
+QString HYDROGUI_Tool::GetCoordinateString( const double theNumber, bool isInLocale )
 {
-  return getViewIdList( theModule, OCCViewer_Viewer::Type() );
+  if( isInLocale )
+  {
+    static QLocale aLocale( QLocale::English, QLocale::France );
+    return aLocale.toString( theNumber, 'f', 2 );
+  }
+  else
+    return QString::number( theNumber, 'f', 2 );
 }
 
-void HYDROGUI_Tool::GetObjectReferences( const Handle(HYDROData_Image)& theImage,
-                                         HYDROData_SequenceOfObjects& theRefObjects,
-                                         QStringList& theRefNames )
+Handle(Image_PixMap) HYDROGUI_Tool::Pixmap( const QImage& theImage )
 {
-  if( theImage.IsNull() )
-    return;
-
-  for( int anIndex = 0, aNbRef = theImage->NbReferences(); anIndex < aNbRef; anIndex++ )
-  {
-    Handle(HYDROData_Object) aRefObj = theImage->Reference( anIndex );
-    if( !aRefObj.IsNull() && !aRefObj->IsRemoved() )
+    Handle(Image_PixMap) pix;
+    if ( theImage.isNull() || theImage.format() == QImage::Format_Invalid )
+        return pix;
+
+    Handle(Image_PixMap) tmpPix = new Image_PixMap();
+    tmpPix->SetTopDown( false );
+    QImage anImage = theImage.mirrored();
+    if ( !anImage.hasAlphaChannel() && anImage.allGray() )
     {
-      QString aName = aRefObj->GetName();
-      if( !theRefNames.contains( aName ) )
-      {
-        theRefObjects.Append( aRefObj );
-        theRefNames.append( aRefObj->GetName() );
-        if( aRefObj->GetKind() == KIND_IMAGE )
+        tmpPix->InitTrash( Image_PixMap::ImgGray, anImage.width(), anImage.height(), anImage.width() );
+        for ( int r = 0; r < anImage.height(); r++ )
         {
-          Handle(HYDROData_Image) aRefImage = Handle(HYDROData_Image)::DownCast( aRefObj );
-          if( !aRefImage.IsNull() )
-            GetObjectReferences( aRefImage, theRefObjects, theRefNames );
+            Standard_Byte* aRowData = tmpPix->ChangeRow( anImage.height() - r - 1 );
+            for  ( int p = 0; p < anImage.width(); p++ )
+                aRowData[p] = qRed( anImage.pixel( p, r ) );
         }
-      }
     }
-  }
-}
-
-void HYDROGUI_Tool::GetObjectBackReferences( HYDROGUI_Module* theModule,
-                                             const Handle(HYDROData_Object)& theObj,
-                                             HYDROData_SequenceOfObjects& theBackRefObjects,
-                                             QStringList& theBackRefNames )
-{
-  if( theObj.IsNull() )
-    return;
-
-  Handle(HYDROData_Document) aDocument = HYDROData_Document::Document( theModule->getStudyId() );
-  if( aDocument.IsNull() )
-    return;
-
-  QString aName = theObj->GetName();
-
-  HYDROData_Iterator anIterator( aDocument, KIND_IMAGE );
-  for( ; anIterator.More(); anIterator.Next() )
-  {
-    Handle(HYDROData_Image) anImage = Handle(HYDROData_Image)::DownCast( anIterator.Current() );
-    if( !anImage.IsNull() )
+    else
     {
-      HYDROData_SequenceOfObjects aRefObjects;
-      QStringList aRefNames;
-      GetObjectReferences( anImage, aRefObjects, aRefNames );
-      if( aRefNames.contains( aName ) )
-      {
-        theBackRefObjects.Append( anImage );
-        theBackRefNames.append( anImage->GetName() );
-      }
-    }
-  }
-}
-
-
-QDockWidget* HYDROGUI_Tool::WindowDock( QWidget* wid )
-{
-  if ( !wid )
-    return 0;
-
-  QDockWidget* dock = 0;
-  QWidget* w = wid->parentWidget();
-  while ( w && !dock )
-  {
-    dock = ::qobject_cast<QDockWidget*>( w );
-    w = w->parentWidget();
-  }
-  return dock;
-}
+        Image_PixMap::ImgFormat aFormat;
+        if ( anImage.hasAlphaChannel() )
+        {
+            if ( anImage.format() != QImage::Format_ARGB32 )
+                anImage = anImage.convertToFormat( QImage::Format_ARGB32 );
+            aFormat = Image_PixMap::ImgRGBA;
+        }
+        else
+        {
+            if ( anImage.format() != QImage::Format_RGB888 )
+                anImage = anImage.convertToFormat( QImage::Format_RGB888 );
+            aFormat = Image_PixMap::ImgRGB;
+        }
 
-QColor HYDROGUI_Tool::GenerateFillingColor( HYDROGUI_Module*   theModule,
-                                            const QStringList& theZoneNames )
-{
-  QColor aFillingColor( HYDROData_Zone::DefaultFillingColor() );
+        tmpPix->InitWrapper( aFormat, (Standard_Byte*)anImage.bits(), anImage.width(), anImage.height(), anImage.bytesPerLine() );
+    }
 
-  int aCounter = 0;
-  int aR = 0, aG = 0, aB = 0;
-  QStringListIterator aZoneNameIter( theZoneNames );
-  while( aZoneNameIter.hasNext() )
-  {
-    const QString& aZoneName = aZoneNameIter.next();
-    Handle(HYDROData_Zone) aRefZone = Handle(HYDROData_Zone)::DownCast(
-      FindObjectByName( theModule, aZoneName, KIND_ZONE ) );
-    if( !aRefZone.IsNull() )
+    if ( !tmpPix.IsNull() )
     {
-      QColor aRefColor = aRefZone->GetFillingColor();
-      aR += aRefColor.red();
-      aG += aRefColor.green();
-      aB += aRefColor.blue();
-      aCounter++;
+        pix = new Image_PixMap();
+        pix->InitCopy( *tmpPix.operator->() );
+        pix->SetTopDown( tmpPix->IsTopDown() );
     }
-  }
-  
-  if( aCounter > 0 )
-  {
-    aFillingColor = QColor( aR / aCounter, aG / aCounter, aB / aCounter );
-  }
 
-  return aFillingColor;
+    return pix;
 }