*** qtmeasurementtooldialog.h.orig	Wed Jun 19 11:59:30 2002
--- qtmeasurementtooldialog.h	Fri Jan 24 18:41:26 2003
***************
*** 148,153 ****
--- 148,154 ----
  };
  
  
+ class qtMeasurementToolDialog;
  
  // This class implements a visual dragger for pick templates
  
***************
*** 157,163 ****
  
  public:
  
! 	FigureEditor(QCanvas& c, QWidget* parent=0, const char* name=0, WFlags f=0) : QCanvasView(&c,parent,name,f) {}    
      void clear();
      void resizeEvent( QResizeEvent* e );
  protected:
--- 158,164 ----
  
  public:
  
! 	 FigureEditor(qtMeasurementToolDialog &measurement_dialog, QCanvas& c, QWidget* parent=0, const char* name=0, WFlags f=0) : QCanvasView(&c,parent,name,f), MeasurementDialog(measurement_dialog) {}
      void clear();
      void resizeEvent( QResizeEvent* e );
  protected:
***************
*** 174,180 ****
  	GridItem* sizing;
  	GridItem* unshearing;
      QPoint moving_start;
! 	
  };
  
  
--- 175,181 ----
  	GridItem* sizing;
  	GridItem* unshearing;
      QPoint moving_start;
!     qtMeasurementToolDialog &MeasurementDialog;	
  };
  
  
***************
*** 201,208 ****
  
  	BOOL LoadConfig();
  	void SaveConfig();
! 
! 
  
  public slots:
  
--- 202,208 ----
  
  	BOOL LoadConfig();
  	void SaveConfig();
! 	void Reload();
  
  public slots:
  
*** qtmeasurementtooldialog.cpp.orig	Wed Jun 19 11:59:30 2002
--- qtmeasurementtooldialog.cpp	Fri Jan 24 18:42:26 2003
***************
*** 39,44 ****
--- 39,45 ----
  #include "qtlcmswidgets.h"
  #include "qtmeasurementtooldialog.h"
  
+ 
  #ifdef USE_KDE
  #include <kfiledialog.h>
  #endif
***************
*** 402,407 ****
--- 403,409 ----
  {
    QCanvasView::resizeEvent( e );
    canvas()->resize(width()-4,height()-4);
+   MeasurementDialog.Reload();
  }
  
  void FigureEditor::contentsMousePressEvent(QMouseEvent* e)
***************
*** 429,442 ****
  
      }
      else
      if (e -> button() & Qt::RightButton) {
!         
              sizing = (GridItem*) *it;                   
              contentsMouseMoveEvent(e);
      }
      else 
      if (e -> button() & Qt::LeftButton) {
- 
              moving = (GridItem*) *it;
              moving_start = e->pos();
      }
--- 431,446 ----
  
      }
      else
+ #if 0
      if (e -> button() & Qt::RightButton) {
! #else
!     if (e -> state() & Qt::ShiftButton) {
! #endif
              sizing = (GridItem*) *it;                   
              contentsMouseMoveEvent(e);
      }
      else 
      if (e -> button() & Qt::LeftButton) {
              moving = (GridItem*) *it;
              moving_start = e->pos();
      }
***************
*** 450,455 ****
--- 454,460 ----
  
  void FigureEditor::contentsMouseMoveEvent(QMouseEvent* e)
  {
+ 
      if ( moving ) {
  
          moving->moveBy(e->pos().x() - moving_start.x(),
***************
*** 529,535 ****
  
      Canvas = new QCanvas(w-4, h-4); 
      Canvas -> setAdvancePeriod(30);   
!     FigEditor = new FigureEditor(*Canvas, CanvasFrame);
      FigEditor -> clear();
      //  FigEditor-> resize(w, h);
      CanvasFrameLayout->addWidget(FigEditor);
--- 534,540 ----
  
      Canvas = new QCanvas(w-4, h-4); 
      Canvas -> setAdvancePeriod(30);   
!     FigEditor = new FigureEditor(*this, *Canvas, CanvasFrame);
      FigEditor -> clear();
      //  FigEditor-> resize(w, h);
      CanvasFrameLayout->addWidget(FigEditor);
***************
*** 839,844 ****
--- 844,857 ----
  
  }
  
+ void qtMeasurementToolDialog::Reload()
+ {
+     TheImage -> Reload(fn, MonitorProfileSelector ->getFilename(),
+                                  InputProfileSelector->getFilename(),  
+                                  Canvas);
+ }
+ 
+ 
  
  // ------------------------------------------------------------------------------ Slots
  
***************
*** 910,916 ****
  
              } else
              {
!                 Status->setText("Click & drag mouse to place the grid: Left - Move, Right - Size, Ctrl - UnShear. PICK when finished.");
                  PickBtn->show();                                        
                  ProofToggle -> show();
              }
--- 923,929 ----
  
              } else
              {
!                 Status->setText("Click & drag mouse to place the grid: Left - Move, Shift - Size, Ctrl - UnShear. PICK when finished.");
                  PickBtn->show();                                        
                  ProofToggle -> show();
              }