[reprap-commits] SF.net SVN: reprap:[4080] trunk/software/host/src/org/reprap/geometry/ LayerRules.java

[<adr...@us...>]

Revision: 4080
          http://reprap.svn.sourceforge.net/reprap/?rev=4080&view=rev
Author:   adrian-bowyer
Date:     2011-04-06 09:59:25 +0000 (Wed, 06 Apr 2011)

Log Message:
-----------
Improved Z movement code.

Modified Paths:
--------------
    trunk/software/host/src/org/reprap/geometry/LayerRules.java

Modified: trunk/software/host/src/org/reprap/geometry/LayerRules.java
===================================================================
--- trunk/software/host/src/org/reprap/geometry/LayerRules.java	2011-04-04 21:17:01 UTC (rev 4079)
+++ trunk/software/host/src/org/reprap/geometry/LayerRules.java	2011-04-06 09:59:25 UTC (rev 4080)
@@ -361,8 +361,9 @@
 		
 		if(topDown)
 		{
-			machineZ -= (sZ + addToStep);
+			//machineZ -= (sZ + addToStep);
 			machineLayer--;
+			machineZ = sZ*machineLayer + addToStep;
 			ld = getFoundationLayers() - getMachineLayer();
 			if(ld == 2)
 				addToStep = sZ*(1 - e.getSeparationFraction());
@@ -372,8 +373,9 @@
 				addToStep = 0;
 		} else
 		{
-			machineZ += (sZ + addToStep);
+			//machineZ += (sZ + addToStep);
 			machineLayer++;
+			machineZ = sZ*machineLayer + addToStep;
 			ld = getFoundationLayers() - getMachineLayer();
 			if(ld == 2)
 				addToStep = -sZ*(1 - e.getSeparationFraction());
@@ -404,13 +406,14 @@
 		double sZ = e.getExtrusionHeight();
 		if(topDown)
 		{
-			modelZ -= (sZ + addToStep);
-			modelLayer--;			
+			//modelZ -= (sZ + addToStep);
+			modelLayer--;
 		} else
 		{
-			modelZ += (sZ + addToStep);
+			//modelZ += (sZ + addToStep);
 			modelLayer++;
 		}
+		modelZ = modelLayer*sZ + addToStep;
 		addToStep = 0;
 		stepMachine(e);
 	}


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.