[SCM] GeoGebra: Dynamic mathematics software for education branch, upstream, updated. upstream/3.2.43.0+dfsg1-1-gf0d14de

Giovanni Mascellani gio at alioth.debian.org
Sun Aug 1 17:38:09 UTC 2010


This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GeoGebra: Dynamic mathematics software for education".

The branch, upstream has been updated
       via  f0d14dec0a643af6026866ed3014ad9b57341f72 (commit)
      from  5ba78c0a46567b13b856917d6cfa4c3b5d2c8351 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:
 geogebra/GeoGebra.java                |    4 ++--
 geogebra/euclidian/DrawRay.java       |   20 ++++++++++----------
 unix/usr/share/man/man1/geogebra.1.gz |  Bin 613 -> 620 bytes
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/geogebra/GeoGebra.java b/geogebra/GeoGebra.java
index e042af5..318d533 100644
--- a/geogebra/GeoGebra.java
+++ b/geogebra/GeoGebra.java
@@ -19,9 +19,9 @@ import java.net.URL;
 public class GeoGebra extends Object {
 	
 	// GeoGebra version
-	public static final String BUILD_DATE = "July 21, 2010";
+	public static final String BUILD_DATE = "July 25, 2010";
 	
-	public static final String VERSION_STRING = "3.2.43.0";
+	public static final String VERSION_STRING = "3.2.44.0";
 	public static final String SHORT_VERSION_STRING = "3.2"; // used for online archive
 		
 	// File format versions
diff --git a/geogebra/euclidian/DrawRay.java b/geogebra/euclidian/DrawRay.java
index 64d9f71..dd16981 100644
--- a/geogebra/euclidian/DrawRay.java
+++ b/geogebra/euclidian/DrawRay.java
@@ -79,7 +79,15 @@ implements Previewable {
         if (isVisible) { 
 			labelVisible = showLabel && geo.isLabelVisible();       
 			updateStrokes(ray);
-						
+					
+			// calc start point of ray in screen coords
+	    	A = ray.getStartPoint();
+			A.getInhomCoords(a);
+			view.toScreenCoords(a);
+			// calc direction vector of ray in screen coords
+			v[0] = ray.y * view.xscale;
+			v[1] = ray.x * view.yscale;
+			
 			setClippedLine();
 			
 			 // line on screen?		
@@ -124,16 +132,8 @@ implements Previewable {
     }
     
     private void setClippedLine() {
-    	A = ray.getStartPoint();			
-		
-		// calc start point of ray in screen coords
-		A.getInhomCoords(a);
-		boolean onscreenA = view.toScreenCoords(a);
+		boolean onscreenA = view.isOnScreen(a);
 
-		// calc direction vector of ray in screen coords
-		v[0] = ray.y * view.xscale;
-		v[1] = ray.x * view.yscale;
-		    	    	
 		// calc clip point C = a + lambda * v
 		double lambda;
 		if (Math.abs(v[0]) > Math.abs(v[1])) {
diff --git a/unix/usr/share/man/man1/geogebra.1.gz b/unix/usr/share/man/man1/geogebra.1.gz
index 4b76848..fb40284 100644
Binary files a/unix/usr/share/man/man1/geogebra.1.gz and b/unix/usr/share/man/man1/geogebra.1.gz differ


hooks/post-receive
-- 
GeoGebra: Dynamic mathematics software for education



More information about the pkg-java-commits mailing list