Changeset 1040 in Sophya

Timestamp:

Jun 8, 2000, 4:52:56 PM (25 years ago)

Author:

ercodmgr

Message:

Correction bug zoom/10 ds PIImage, Reza 8/6/2000

Location:

trunk/SophyaPI/PI

Files:

• parradapter.cc (modified) (1 diff)
• piimage.cc (modified) (2 diffs)

trunk/SophyaPI/PI/parradapter.cc

@@ -336 +336 @@
 double vpx;
 
-
-if ( (XSize() <= 0) || (YSize() <= 0) || (lut == NULL) ) 
+/*
+printf("Debug_ComputePixmap off= %d %d zm=%d Size=(%d,%d) \n", 
+      ofx, ofy, zm, XSize(), YSize());
+*/
+
+if ( (XSize() <= 0) || (YSize() <= 0) || (lut == NULL) || (ofx < 0) || (ofy < 0) ) 
   { *oxsp = *oysp = 0; return(NULL); }
 

trunk/SophyaPI/PI/piimage.cc

@@ -952 +952 @@
 
 zm = zoom+4;
+// Calcul du facteur de zoom pour la petite fenetre de zoom
+float fzm = 1.0;
+if (zoom < 0) fzm = -1./(float)zoom;
+else  fzm = zoom;
+
+if (fzm < 0.25) zm = (-1./(fzm*4.0))-0.1;
+else if (fzm < 3.5)  zm = fzm*4.+0.1;
+else if (fzm < 7.5) zm = fzm*3.+0.1;
+
 if ( (zm==-1) || (zm == 0) ) zm = 1;
 if (zm > 0)
@@ -960 +969 @@
 else 
   {
-  lofx = xpav+(xwsz*zm/2);
-  lofy = ypav+(ywsz*zm/2);
+  lofx = xpav-(-((int)xwsz)*zm/2);
+  lofy = ypav-(-((int)ywsz)*zm/2);
   }
 if (lofx < 0)  lofx = 0;