Raw development for ImageViewer.

diff --git a/src/GraphicsView/GraphicsView_Object.h b/src/GraphicsView/GraphicsView_Object.h
index 40c8918670d4d92a2843d6677f53fb2e6b200705..6693df0cc1a013eeccce497b61db9342a48c3c04 100644 (file)
--- a/src/GraphicsView/GraphicsView_Object.h
+++ b/src/GraphicsView/GraphicsView_Object.h
@@ -54,6 +54,8 @@ public:
   virtual bool               isOnTop() const { return myIsOnTop; }
   virtual void               setIsOnTop( bool theIsOnTop ) { myIsOnTop = theIsOnTop; }
 
+  virtual bool               hasSpecificZValue() const { return false; }
+
   virtual bool               isSelectable() const { return true; }
   virtual bool               isMovable() const { return true; }
 

diff --git a/src/GraphicsView/GraphicsView_PrsImage.cxx b/src/GraphicsView/GraphicsView_PrsImage.cxx
index f327118f43167133af8e9d190de1491f6aae9b6d..86c3a317143e8aa9ad7b54ecbb18850a59142705 100644 (file)
--- a/src/GraphicsView/GraphicsView_PrsImage.cxx
+++ b/src/GraphicsView/GraphicsView_PrsImage.cxx
@@ -33,6 +33,7 @@
 
 #include <math.h>
 
+#define PREVIEW_Z_VALUE 2000
 #define EPSILON 1e-6
 #define PI 3.14159265359
 
@@ -42,6 +43,7 @@
 //=======================================================================
 GraphicsView_PrsImage::GraphicsView_PrsImage()
 : GraphicsView_Object(),
+  myIsLockAspectRatio( false ),
   myPixmapItem( 0 ),
   myPreviewPixmapItem( 0 ),
   myImageFrame( 0 ),
@@ -178,6 +180,24 @@ void GraphicsView_PrsImage::getRotationAngle( double& theRotationAngle ) const
   theRotationAngle = myRotationAngle;
 }
 
+//================================================================
+// Function : setIsLockAspectRatio
+// Purpose  : 
+//================================================================
+void GraphicsView_PrsImage::setIsLockAspectRatio( const bool theIsLockAspectRatio )
+{
+  myIsLockAspectRatio = theIsLockAspectRatio;
+}
+
+//================================================================
+// Function : getIsLockAspectRatio
+// Purpose  : 
+//================================================================
+bool GraphicsView_PrsImage::getIsLockAspectRatio() const
+{
+  return myIsLockAspectRatio;
+}
+
 //================================================================
 // Function : boundingRect
 // Purpose  : 
@@ -209,8 +229,6 @@ void GraphicsView_PrsImage::compute()
     myImageFrame->setPrsImage( this );
   }
 
-  setZValue( 0 );
-
   QSize aSourceSize = myPixmap.size();
   QSize aScaledSize( aSourceSize.width() * myScaleX,
                      aSourceSize.height() * myScaleY );
@@ -235,6 +253,18 @@ void GraphicsView_PrsImage::addTo( GraphicsView_ViewPort* theViewPort )
   GraphicsView_Object::addTo( theViewPort );
   theViewPort->addItem( myImageFrame );
   theViewPort->addItem( myPreviewPixmapItem );
+
+  double aZValue = 0;
+  GraphicsView_ObjectListIterator anIter( theViewPort->getObjects() );
+  while( anIter.hasNext() )
+  {
+    if( GraphicsView_PrsImage* aPrs = dynamic_cast<GraphicsView_PrsImage*>( anIter.next() ) )
+    {
+      double aZValueRef = aPrs->zValue();
+      aZValue = qMax( aZValue, aZValueRef );
+    }
+  }
+  setZValue( aZValue + 1 );
 }
 
 //================================================================
@@ -529,7 +559,7 @@ void GraphicsView_PrsImage::enablePreview( const bool theState )
 {
   if( theState )
   {
-    myPreviewPixmapItem->setZValue( 100 );
+    myPreviewPixmapItem->setZValue( PREVIEW_Z_VALUE );
     myPreviewPixmapItem->setOpacity( opacity() / 2. );
 
     myPreviewPixmapItem->setPos( pos() );

diff --git a/src/GraphicsView/GraphicsView_PrsImage.h b/src/GraphicsView/GraphicsView_PrsImage.h
index a63440c4ee43b443d3f4dd265a28a4bf122f2978..5faadb72a6e791276207b08d7145fb07d4650a53 100644 (file)
--- a/src/GraphicsView/GraphicsView_PrsImage.h
+++ b/src/GraphicsView/GraphicsView_PrsImage.h
@@ -54,6 +54,9 @@ public:
   void                            setRotationAngle( const double theRotationAngle );
   void                            getRotationAngle( double& theRotationAngle ) const;
 
+  void                            setIsLockAspectRatio( const bool theIsLockAspectRatio );
+  bool                            getIsLockAspectRatio() const;
+
 public:
   // from QGraphicsItem
   virtual QRectF                  boundingRect() const;
@@ -99,6 +102,8 @@ protected:
 protected:
   QPixmap                         myPixmap;
 
+  bool                            myIsLockAspectRatio;
+
   QGraphicsPixmapItem*            myPixmapItem;
   QGraphicsPixmapItem*            myPreviewPixmapItem;
 

diff --git a/src/GraphicsView/GraphicsView_PrsImageFrame.cxx b/src/GraphicsView/GraphicsView_PrsImageFrame.cxx
index d3ebcdd32ae0dfa8c85ff9211a1a5337fe77ed11..649147683c7ef793c2b95bf6a5e31e71ae7efef3 100644 (file)
--- a/src/GraphicsView/GraphicsView_PrsImageFrame.cxx
+++ b/src/GraphicsView/GraphicsView_PrsImageFrame.cxx
@@ -32,9 +32,9 @@
 
 #include <math.h>
 
-#define PI 3.14159265359
-
+#define FRAME_Z_VALUE 1000
 #define ANCHOR_RADIUS 10
+#define PI 3.14159265359
 
 //=======================================================================
 // name    : GraphicsView_PrsImageFrame
@@ -137,7 +137,7 @@ void GraphicsView_PrsImageFrame::compute()
     }
   }
 
-  setZValue( 1000 );
+  setZValue( FRAME_Z_VALUE );
 
   computeAnchorItems();
   updateAnchorItems();

diff --git a/src/GraphicsView/GraphicsView_PrsImageFrame.h b/src/GraphicsView/GraphicsView_PrsImageFrame.h
index 07b443a86e76c98aa85a8831a6eb1fffb993d4a2..24b5f7a3b332a26ab6bd23d36e12787b1b38dd25 100644 (file)
--- a/src/GraphicsView/GraphicsView_PrsImageFrame.h
+++ b/src/GraphicsView/GraphicsView_PrsImageFrame.h
@@ -58,6 +58,8 @@ public:
   // from GraphicsView_Object
   virtual void                    compute();
 
+  virtual bool                    hasSpecificZValue() const { return true; }
+
   virtual bool                    isMovable() const { return false; }
 
   virtual bool                    checkHighlight( double theX, double theY, QCursor& theCursor ) const;

diff --git a/src/GraphicsView/GraphicsView_PrsPropDlg.cxx b/src/GraphicsView/GraphicsView_PrsPropDlg.cxx
index d134f5ff3743ff753af8bbf115036ed213484890..3a4e654d48fb7a79d7c7067524b27796270d4f3b 100644 (file)
--- a/src/GraphicsView/GraphicsView_PrsPropDlg.cxx
+++ b/src/GraphicsView/GraphicsView_PrsPropDlg.cxx
@@ -24,6 +24,7 @@
 
 #include <QtxDoubleSpinBox.h>
 
+#include <QCheckBox>
 #include <QGroupBox>
 #include <QLabel>
 #include <QLayout>
@@ -56,6 +57,14 @@ GraphicsView_PrsPropDlg::GraphicsView_PrsPropDlg( QWidget* theParent )
   QLabel* aRotationAngleLabel = new QLabel( tr( "ROTATION_ANGLE" ), aPropGroup );
   myRotationAngle = new QtxDoubleSpinBox( -1e6, 1e6, 1, aPropGroup );
 
+  QLabel* anOpacityLabel = new QLabel( tr( "OPACITY" ), aPropGroup );
+  myOpacity = new QtxDoubleSpinBox( 0, 1, 0.1, aPropGroup );
+
+  QLabel* aZValueLabel = new QLabel( tr( "Z_VALUE" ), aPropGroup );
+  myZValue = new QtxDoubleSpinBox( -1e6, 1e6, 1, aPropGroup );
+
+  myIsLockAspectRatio = new QCheckBox( tr( "LOCK_ASPECT_RATIO" ), aPropGroup );
+
   QGridLayout* aPropLayout = new QGridLayout( aPropGroup );
   aPropLayout->setMargin( 5 );
   aPropLayout->setSpacing( 5 );
@@ -69,6 +78,11 @@ GraphicsView_PrsPropDlg::GraphicsView_PrsPropDlg( QWidget* theParent )
   aPropLayout->addWidget( myScalingY,          3, 1 );
   aPropLayout->addWidget( aRotationAngleLabel, 4, 0 );
   aPropLayout->addWidget( myRotationAngle,     4, 1 );
+  aPropLayout->addWidget( aZValueLabel,        5, 0 );
+  aPropLayout->addWidget( myZValue,            5, 1 );
+  aPropLayout->addWidget( anOpacityLabel,      6, 0 );
+  aPropLayout->addWidget( myOpacity,           6, 1 );
+  aPropLayout->addWidget( myIsLockAspectRatio, 7, 0, 1, 2 );
   aPropLayout->setColumnStretch( 1, 1 );
 
   QVBoxLayout* aMainLayout = new QVBoxLayout( aMainFrame );
@@ -97,13 +111,19 @@ void GraphicsView_PrsPropDlg::setData( const double thePositionX,
                                        const double thePositionY,
                                        const double theScalingX,
                                        const double theScalingY,
-                                       const double theRotationAngle )
+                                       const double theRotationAngle,
+                                       const double theZValue,
+                                       const double theOpacity,
+                                       const bool theIsLockAspectRatio )
 {
   myPositionX->setValue( thePositionX );
   myPositionY->setValue( thePositionY );
   myScalingX->setValue( theScalingX );
   myScalingY->setValue( theScalingY );
   myRotationAngle->setValue( theRotationAngle );
+  myZValue->setValue( theZValue );
+  myOpacity->setValue( theOpacity );
+  myIsLockAspectRatio->setChecked( theIsLockAspectRatio );
 }
 
 //=============================================================================
@@ -114,11 +134,17 @@ void GraphicsView_PrsPropDlg::getData( double& thePositionX,
                                        double& thePositionY,
                                        double& theScalingX,
                                        double& theScalingY,
-                                       double& theRotationAngle ) const
+                                       double& theRotationAngle,
+                                       double& theZValue,
+                                       double& theOpacity,
+                                       bool& theIsLockAspectRatio ) const
 {
   thePositionX = myPositionX->value();
   thePositionY = myPositionY->value();
   theScalingX = myScalingX->value();
   theScalingY = myScalingY->value();
   theRotationAngle = myRotationAngle->value();
+  theZValue = myZValue->value();
+  theOpacity = myOpacity->value();
+  theIsLockAspectRatio = myIsLockAspectRatio->isChecked();
 }

diff --git a/src/GraphicsView/GraphicsView_PrsPropDlg.h b/src/GraphicsView/GraphicsView_PrsPropDlg.h
index 52b07a8ad42811fd4c76edb7d86e341174f5a3e1..b870d4902a985f1969592002dfd9f07ea23a2202 100644 (file)
--- a/src/GraphicsView/GraphicsView_PrsPropDlg.h
+++ b/src/GraphicsView/GraphicsView_PrsPropDlg.h
@@ -27,6 +27,8 @@
 
 #include <QtxDialog.h>
 
+class QCheckBox;
+
 class QtxDoubleSpinBox;
 
 /*
@@ -46,13 +48,19 @@ public:
                                     const double thePositionY,
                                     const double theScalingX,
                                     const double theScalingY,
-                                    const double theRotationAngle );
+                                    const double theRotationAngle,
+                                    const double theZValue,
+                                    const double theOpacity,
+                                    const bool theIsLockAspectRatio );
 
   void                     getData( double& thePositionX,
                                     double& thePositionY,
                                     double& theScalingX,
                                     double& theScalingY,
-                                    double& theRotationAngle ) const;
+                                    double& theRotationAngle,
+                                    double& theZValue,
+                                    double& theOpacity,
+                                    bool& theIsLockAspectRatio ) const;
 
 private:
   QtxDoubleSpinBox*        myPositionX;
@@ -60,6 +68,9 @@ private:
   QtxDoubleSpinBox*        myScalingX;
   QtxDoubleSpinBox*        myScalingY;
   QtxDoubleSpinBox*        myRotationAngle;
+  QtxDoubleSpinBox*        myOpacity;
+  QtxDoubleSpinBox*        myZValue;
+  QCheckBox*               myIsLockAspectRatio;
 };
 
 #endif

diff --git a/src/GraphicsView/GraphicsView_ViewPort.cxx b/src/GraphicsView/GraphicsView_ViewPort.cxx
index 8892099ceec5219fc74380c825afcb6daf2d6996..49f809f45be8155b854aa3c8db504dbe50782af8 100644 (file)
--- a/src/GraphicsView/GraphicsView_ViewPort.cxx
+++ b/src/GraphicsView/GraphicsView_ViewPort.cxx
@@ -278,57 +278,80 @@ void GraphicsView_ViewPort::removeItem( QGraphicsItem* theItem )
 // Function : getObjects
 // Purpose  : 
 //================================================================
-GraphicsView_ObjectList GraphicsView_ViewPort::getObjects( bool theIsSortSelected ) const
+GraphicsView_ObjectList GraphicsView_ViewPort::getObjects( SortType theSortType ) const
 {
-  if( !theIsSortSelected )
-    return myObjects;
-
-  // to append selected objects after their non-selected siblings with similar priority
-  int aCurrentPriority = -1;
-  GraphicsView_ObjectList aSelectedObjects;
-  GraphicsView_ObjectList aTopmostObjects;
-
-  GraphicsView_ObjectList aList;
-  GraphicsView_ObjectListIterator anIter( myObjects );
-  while( anIter.hasNext() )
+  if( theSortType == SelectedFirst )
   {
-    if( GraphicsView_Object* anObject = anIter.next() )
+    // to append selected objects after their non-selected siblings with similar priority
+    int aCurrentPriority = -1;
+    GraphicsView_ObjectList aSelectedObjects;
+    GraphicsView_ObjectList aTopmostObjects;
+
+    GraphicsView_ObjectList aList;
+    GraphicsView_ObjectListIterator anIter( myObjects );
+    while( anIter.hasNext() )
     {
-      if( anObject->isOnTop() )
+      if( GraphicsView_Object* anObject = anIter.next() )
       {
-        aTopmostObjects.append( anObject );
-        continue;
-      }
+        if( anObject->isOnTop() )
+        {
+          aTopmostObjects.append( anObject );
+          continue;
+        }
 
-      int aPriority = anObject->getPriority();
-      if( aPriority > aCurrentPriority  )
-      {
-        if( !aSelectedObjects.isEmpty() )
+        int aPriority = anObject->getPriority();
+        if( aPriority > aCurrentPriority  )
         {
-          aList.append( aSelectedObjects );
-          aSelectedObjects.clear();
+          if( !aSelectedObjects.isEmpty() )
+          {
+            aList.append( aSelectedObjects );
+            aSelectedObjects.clear();
+          }
+          aCurrentPriority = aPriority;
         }
-        aCurrentPriority = aPriority;
+
+        if( anObject->isSelected() )
+          aSelectedObjects.append( anObject );
+        else
+          aList.append( anObject );
       }
+    }
 
-      if( anObject->isSelected() )
-        aSelectedObjects.append( anObject );
-      else
-        aList.append( anObject );
+    // for selected objects with highest priority,
+    // which were not pushed to the result list yet
+    if( !aSelectedObjects.isEmpty() )
+    {
+      aList.append( aSelectedObjects );
+      aSelectedObjects.clear();
     }
+
+    aList.append( aTopmostObjects );
+
+    return aList;
   }
 
-  // for selected objects with highest priority,
-  // which were not pushed to the result list yet
-  if( !aSelectedObjects.isEmpty() )
+  if( theSortType == SortByZLevel ) // double loop, needs to be optimized
   {
-    aList.append( aSelectedObjects );
-    aSelectedObjects.clear();
-  }
+    GraphicsView_ObjectList aList;
 
-  aList.append( aTopmostObjects );
+    GraphicsView_ObjectListIterator anIter( myObjects );
+    while( anIter.hasNext() )
+    {
+      if( GraphicsView_Object* anObject = anIter.next() )
+      {
+        double aZValue = anObject->zValue();
+        GraphicsView_ObjectList::iterator anIter1, anIter1End = aList.end();
+        for( anIter1 = aList.begin(); anIter1 != anIter1End; anIter1++ )
+          if( GraphicsView_Object* anObjectRef = *anIter1 )
+            if( anObjectRef->zValue() > aZValue )
+              break;
+        aList.insert( anIter1, anObject );
+      }
+    }
+    return aList;
+  }
 
-  return aList;
+  return myObjects; // theSortType == NoSorting
 }
 
 //================================================================
@@ -893,7 +916,7 @@ void GraphicsView_ViewPort::highlight( double theX, double theY )
 
   QCursor aCursor;
 
-  GraphicsView_ObjectList aList = getObjects( false );
+  GraphicsView_ObjectList aList = getObjects( SortByZLevel );
   GraphicsView_ObjectListIterator anIter( aList );
   anIter.toBack(); // objects with higher priority have to be checked earlier
   while( anIter.hasPrevious() )

diff --git a/src/GraphicsView/GraphicsView_ViewPort.h b/src/GraphicsView/GraphicsView_ViewPort.h
index e3420e07c202128b1a2285a06b457df18bc35a84..6dbc7402345d21fb973ac727419fb316b624f315 100644 (file)
--- a/src/GraphicsView/GraphicsView_ViewPort.h
+++ b/src/GraphicsView/GraphicsView_ViewPort.h
@@ -82,7 +82,8 @@ public:
   void                             addItem( QGraphicsItem* theItem );
   void                             removeItem( QGraphicsItem* theItem );
 
-  GraphicsView_ObjectList          getObjects( bool theIsSortSelected = false ) const;
+  enum SortType { NoSorting, SelectedFirst, SortByZLevel };
+  GraphicsView_ObjectList          getObjects( SortType theSortType = NoSorting ) const;
 
   QRectF                           objectsBoundingRect( bool theOnlyVisible = false ) const;
 
@@ -170,7 +171,6 @@ public:
 
   const GraphicsView_ObjectList&   getSelectedObjects() const { return mySelectedObjects; }
 
-
   // rectangle selection
   void                             startSelectByRect( int x, int y );
   void                             drawSelectByRect( int x, int y );

diff --git a/src/GraphicsView/GraphicsView_Viewer.cxx b/src/GraphicsView/GraphicsView_Viewer.cxx
index 360433f1b4c6276b7222ad4c17030e1bb8747383..df19f1b75ea8a51f8e3a2faaee2cf1748a87f261 100644 (file)
--- a/src/GraphicsView/GraphicsView_Viewer.cxx
+++ b/src/GraphicsView/GraphicsView_Viewer.cxx
@@ -116,14 +116,18 @@ void GraphicsView_Viewer::contextMenuPopup( QMenu* thePopup )
     }
     else
     {
+      thePopup->addAction( tr( "BRING_TO_FRONT" ), this, SLOT( onBringToFront() ) );
+      thePopup->addAction( tr( "SEND_TO_BACK" ), this, SLOT( onSendToBack() ) );
+      thePopup->addAction( tr( "BRING_FORWARD" ), this, SLOT( onBringForward() ) );
+      thePopup->addAction( tr( "SEND_BACKWARD" ), this, SLOT( onSendBackward() ) );
+      thePopup->addSeparator();
+
       if( aNbSelected == 1 )
       {
-        thePopup->addAction( tr( "BRING_FORWARD" ), this, SLOT( onBringForward() ) );
-        thePopup->addAction( tr( "SEND_BACKWARD" ), this, SLOT( onSendBackward() ) );
-        thePopup->addSeparator();
         thePopup->addAction( tr( "PROPERTIES" ), this, SLOT( onPrsProperties() ) );
         thePopup->addSeparator();
       }
+
       thePopup->addAction( tr( "REMOVE_IMAGES" ), this, SLOT( onRemoveImages() ) );
     }
     thePopup->addSeparator();
@@ -580,13 +584,31 @@ void GraphicsView_Viewer::onRemoveImages()
   }
 }
 
+//================================================================
+// Function : onBringToFront
+// Purpose  : 
+//================================================================
+void GraphicsView_Viewer::onBringToFront()
+{
+  processQueueOperation( BringToFront );
+}
+
+//================================================================
+// Function : onSendToBack
+// Purpose  : 
+//================================================================
+void GraphicsView_Viewer::onSendToBack()
+{
+  processQueueOperation( SendToBack );
+}
+
 //================================================================
 // Function : onBringForward
 // Purpose  : 
 //================================================================
 void GraphicsView_Viewer::onBringForward()
 {
-  // to do
+  processQueueOperation( BringForward );
 }
 
 //================================================================
@@ -595,7 +617,89 @@ void GraphicsView_Viewer::onBringForward()
 //================================================================
 void GraphicsView_Viewer::onSendBackward()
 {
-  // to do
+  processQueueOperation( SendBackward );
+}
+
+//================================================================
+// Function : processQueueOperation
+// Purpose  : 
+//================================================================
+void GraphicsView_Viewer::processQueueOperation( const QueueOperation theOperation )
+{
+  if( GraphicsView_ViewPort* aViewPort = getActiveViewPort() )
+  {
+    const GraphicsView_ObjectList& aSelectedList = aViewPort->getSelectedObjects();
+
+    GraphicsView_ObjectList aSortedList;
+
+    GraphicsView_ObjectList aList = aViewPort->getObjects();
+    GraphicsView_ObjectListIterator anIter( aList );
+    while( anIter.hasNext() )
+    {
+      if( GraphicsView_Object* anObject = anIter.next() )
+      {
+        if( !anObject->hasSpecificZValue() )
+        {
+          double aZValue = anObject->zValue();
+          GraphicsView_ObjectList::iterator anIter1, anIter1End = aSortedList.end();
+          for( anIter1 = aSortedList.begin(); anIter1 != anIter1End; anIter1++ )
+            if( GraphicsView_Object* anObjectRef = *anIter1 )
+              if( !anObjectRef->hasSpecificZValue() && anObjectRef->zValue() > aZValue )
+                break;
+          aSortedList.insert( anIter1, anObject );
+        }
+      }
+    }
+
+    QList<int> anIndicesToMove;
+
+    int anIndex = 0;
+    anIter = aSortedList;
+    while( anIter.hasNext() )
+    {
+      if( GraphicsView_Object* anObject = anIter.next() )
+        if( aSelectedList.contains( anObject ) )
+          anIndicesToMove.append( anIndex );
+      anIndex++;
+    }
+
+    bool anIsReverse = theOperation == BringToFront || theOperation == BringForward;
+    QListIterator<int> anIndicesIter( anIndicesToMove );
+    if( anIsReverse )
+      anIndicesIter.toBack();
+
+    int aShiftForMultiple = 0;
+    int anObjectCount = aSortedList.count();
+    while( anIsReverse ? anIndicesIter.hasPrevious() : anIndicesIter.hasNext() )
+    {
+      int anIndex = anIsReverse ? anIndicesIter.previous() : anIndicesIter.next();
+      int aNewIndex = anIndex;
+      switch( theOperation )
+      {
+        case BringToFront: aNewIndex = anObjectCount - 1 - aShiftForMultiple; break;
+        case SendToBack:   aNewIndex = aShiftForMultiple; break;
+        case BringForward: aNewIndex = anIndex + 1; break;
+        case SendBackward: aNewIndex = anIndex - 1; break;
+      }
+      aShiftForMultiple++;
+
+      if( aNewIndex < 0 || aNewIndex > anObjectCount - 1 )
+        break;
+
+      aSortedList.move( anIndex, aNewIndex );
+    }
+
+    double aZValue = 1.0;
+    anIter = aSortedList;
+    while( anIter.hasNext() )
+    {
+      if( GraphicsView_Object* anObject = anIter.next() )
+      {
+        anObject->setZValue( aZValue );
+        aZValue += 1.0;
+      }
+    }
+  }
 }
 
 //================================================================
@@ -616,14 +720,28 @@ void GraphicsView_Viewer::onPrsProperties()
         aPrs->getScaling( aScaleX, aScaleY );
         aPrs->getRotationAngle( aRotationAngle );
 
+        double aZValue = aPrs->zValue();
+        double anOpacity = aPrs->opacity();
+
+        bool anIsLockAspectRatio = aPrs->getIsLockAspectRatio();
+
         GraphicsView_PrsPropDlg aDlg( aViewPort );
-        aDlg.setData( aPosX, aPosY, aScaleX, aScaleY, aRotationAngle );
+        aDlg.setData( aPosX, aPosY, aScaleX, aScaleY, aRotationAngle,
+                      aZValue, anOpacity, anIsLockAspectRatio );
         if( aDlg.exec() )
         {
-          aDlg.getData( aPosX, aPosY, aScaleX, aScaleY, aRotationAngle );
+          aDlg.getData( aPosX, aPosY, aScaleX, aScaleY, aRotationAngle,
+                        aZValue, anOpacity, anIsLockAspectRatio );
+
           aPrs->setPosition( aPosX, aPosY );
           aPrs->setScaling( aScaleX, aScaleY );
           aPrs->setRotationAngle( aRotationAngle );
+
+          aPrs->setZValue( aZValue );
+          aPrs->setOpacity( anOpacity );
+
+          aPrs->setIsLockAspectRatio( anIsLockAspectRatio );
+
           aPrs->compute();
         }
       }

diff --git a/src/GraphicsView/GraphicsView_Viewer.h b/src/GraphicsView/GraphicsView_Viewer.h
index a9aac5e5445cd5d3097fe77c0c5d5100e2bb34a5..3dcce3db57702adff4f503baadd9c5f0d7e802ea 100644 (file)
--- a/src/GraphicsView/GraphicsView_Viewer.h
+++ b/src/GraphicsView/GraphicsView_Viewer.h
@@ -102,6 +102,8 @@ protected slots:
   // testing ImageViewer
   void                          onAddImage();
   void                          onRemoveImages();
+  void                          onBringToFront();
+  void                          onSendToBack();
   void                          onBringForward();
   void                          onSendBackward();
   void                          onPrsProperties();
@@ -115,6 +117,10 @@ private:
   void                          handleMouseRelease( QGraphicsSceneMouseEvent* );
   void                          handleWheel( QGraphicsSceneWheelEvent* );
 
+  // testing ImageViewer
+  enum QueueOperation { BringToFront, SendToBack, BringForward, SendBackward };
+  void                          processQueueOperation( const QueueOperation );
+
 protected:
   GraphicsView_Selector*        mySelector;
   GraphicsView_ViewTransformer* myTransformer;

diff --git a/src/GraphicsView/resources/GraphicsView_msg_en.ts b/src/GraphicsView/resources/GraphicsView_msg_en.ts
index 6c0eaae65c92f107ccf9bf6e621e320d051fe252..dcb33723dc3859a00d7785af6c4e7548051a03ea 100644 (file)
--- a/src/GraphicsView/resources/GraphicsView_msg_en.ts
+++ b/src/GraphicsView/resources/GraphicsView_msg_en.ts
@@ -85,6 +85,14 @@
       <source>REMOVE_IMAGES</source>
       <translation>Remove image(s)</translation>
     </message>
+    <message>
+      <source>BRING_TO_FRONT</source>
+      <translation>Bring to front</translation>
+    </message>
+    <message>
+      <source>SEND_TO_BACK</source>
+      <translation>Send to back</translation>
+    </message>
     <message>
       <source>BRING_FORWARD</source>
       <translation>Bring forward</translation>
@@ -135,5 +143,17 @@
       <source>ROTATION_ANGLE</source>
       <translation>Rotation angle</translation>
     </message>
+    <message>
+      <source>Z_VALUE</source>
+      <translation>Z value</translation>
+    </message>
+    <message>
+      <source>OPACITY</source>
+      <translation>Opacity</translation>
+    </message>
+    <message>
+      <source>LOCK_ASPECT_RATIO</source>
+      <translation>Lock aspect ratio</translation>
+    </message>
   </context>
 </TS>