Merging with JR_ASV_2_1_0_deb_with_KERNEL_Head branch, which contains many bug fixes...

[modules/superv.git] / src / SUPERVGUI / SUPERVGUI_CanvasView.h

diff --git a/src/SUPERVGUI/SUPERVGUI_CanvasView.h b/src/SUPERVGUI/SUPERVGUI_CanvasView.h
index 564e28aa9141706bdcfb4b064a42a5297ad9275b..52b5b5f2e323e05eb45603e08a153a271379ecdb 100644 (file)
--- a/src/SUPERVGUI/SUPERVGUI_CanvasView.h
+++ b/src/SUPERVGUI/SUPERVGUI_CanvasView.h
@@ -44,6 +44,7 @@ class SUPERVGUI_CanvasView: public QCanvasView {
     void zoomOut();
     void zoomReset();
     void fitAll();
+    void fitWithinRect();
     void changeBackground();
 
   protected:
@@ -66,18 +67,21 @@ class SUPERVGUI_CanvasView: public QCanvasView {
     SUPERVGUI_Main* myMain;
     QPopupMenu*     myPopup;
     int             myAddStudyItem;
+    int             myPasteNodeItem;
     QPopupMenu*     mySketchPopup;
     int             myDelPntItem;
     int             myOrtoItem;
 
     bool         myIsPanBtnClicked;
     bool         myIsPanActivated;
+    bool         myIsFitWRActivated;
     bool         myIsZoomActivated;
     bool         myIsLinkCreating;
 
-    QCanvasItem* myCurrentItem;
-    QPoint       myPoint;
-    QCursor      myCursor;
+    QCanvasItem*      myCurrentItem;
+    QPoint            myPoint;
+    QCanvasRectangle* mySelectedRect;
+    QCursor           myCursor;
 
     QTimer*  myTimer;   
     QPoint   myGlobalPoint;