Correct zoom volume.

diff --git a/src/QxGraph/QxGraph_CanvasView.cxx b/src/QxGraph/QxGraph_CanvasView.cxx
index a563bc5c2f5ed4696e65abb915bcf974871d40ad..4e0f848a8581a3f50d0047e6e3ec5b509f11836a 100644 (file)
--- a/src/QxGraph/QxGraph_CanvasView.cxx
+++ b/src/QxGraph/QxGraph_CanvasView.cxx
@@ -235,11 +235,12 @@ void QxGraph_CanvasView::contentsMouseMoveEvent(QMouseEvent* theEvent)
 
   if ( myOperation == ZOOMVIEW )
   { // Zoom
+    QWMatrix m = worldMatrix();
+
     double dx = aGlobalPoint.x() - myGlobalPoint.x();
-    double s = 1. + fabs(dx)/10.;
+    double s = 1. + fabs(dx)*( (m.m11() < 1) ? m.m11() : 1. )/70.;
     if (dx < 0) s = 1./s;
     
-    QWMatrix m = worldMatrix();
     m.scale(s, s);
     setWorldMatrix(m);
 

diff --git a/src/QxGraph/QxGraph_Def.h b/src/QxGraph/QxGraph_Def.h
index e8dc2487f885296849d16d7878c744340f251093..88937e32536d24c1f066cdce81aea54930eb0b8b 100644 (file)
--- a/src/QxGraph/QxGraph_Def.h
+++ b/src/QxGraph/QxGraph_Def.h
@@ -26,8 +26,8 @@
 #define DEF_BACK_COLOR QColor(144, 208, 211)
 #define RECTANGLE_BODY QColor(255,249,147)
 
-#define GRAPH_WIDTH  1050
-#define GRAPH_HEIGHT 750
+#define GRAPH_WIDTH  1250
+#define GRAPH_HEIGHT 950
 
 #define GRAPH_MARGIN 50