diff options
| author | dfgdga <dfgdga@cb376a5e-1013-0410-a455-b6b1f9ac8223> | 2009-05-26 17:46:45 +0000 |
|---|---|---|
| committer | dfgdga <dfgdga@cb376a5e-1013-0410-a455-b6b1f9ac8223> | 2009-05-26 17:46:45 +0000 |
| commit | dfaa762d0d0b0ffe5ff30364705de19fe69d2e80 (patch) | |
| tree | 656c559feed4e3285bc9e075aa5353d6d87cabe8 | |
| parent | 074ceccbaf5605096c80cb0042a1b027596d43bf (diff) | |
| download | reprap-backup-dfaa762d0d0b0ffe5ff30364705de19fe69d2e80.tar.gz reprap-backup-dfaa762d0d0b0ffe5ff30364705de19fe69d2e80.zip | |
janatorial: remove unused imports and comment out unused private methods
git-svn-id: https://reprap.svn.sourceforge.net/svnroot/reprap@3092 cb376a5e-1013-0410-a455-b6b1f9ac8223
9 files changed, 320 insertions, 319 deletions
diff --git a/trunk/reprap/host/.settings/org.eclipse.jdt.core.prefs b/trunk/reprap/host/.settings/org.eclipse.jdt.core.prefs new file mode 100644 index 00000000..19977382 --- /dev/null +++ b/trunk/reprap/host/.settings/org.eclipse.jdt.core.prefs @@ -0,0 +1,12 @@ +#Tue Nov 04 16:32:00 GMT 2008 +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 +org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve +org.eclipse.jdt.core.compiler.compliance=1.5 +org.eclipse.jdt.core.compiler.debug.lineNumber=generate +org.eclipse.jdt.core.compiler.debug.localVariable=generate +org.eclipse.jdt.core.compiler.debug.sourceFile=generate +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.source=1.5 diff --git a/trunk/reprap/host/src/org/reprap/Extruder.java b/trunk/reprap/host/src/org/reprap/Extruder.java index 330b2703..e230079c 100644 --- a/trunk/reprap/host/src/org/reprap/Extruder.java +++ b/trunk/reprap/host/src/org/reprap/Extruder.java @@ -1,7 +1,6 @@ package org.reprap; import java.io.IOException; -import org.reprap.geometry.LayerRules; import org.reprap.devices.ExtrudedLength; import javax.media.j3d.Appearance; diff --git a/trunk/reprap/host/src/org/reprap/geometry/LayerProducer.java b/trunk/reprap/host/src/org/reprap/geometry/LayerProducer.java index bc9e465d..eb92bcd4 100644 --- a/trunk/reprap/host/src/org/reprap/geometry/LayerProducer.java +++ b/trunk/reprap/host/src/org/reprap/geometry/LayerProducer.java @@ -10,15 +10,12 @@ import java.io.IOException; import javax.media.j3d.BranchGroup; import org.reprap.Printer; -import org.reprap.Extruder; import org.reprap.Attributes; import org.reprap.Preferences; import org.reprap.ReprapException; import org.reprap.devices.pseudo.LinePrinter; -import org.reprap.devices.GenericExtruder; import org.reprap.geometry.polygons.Rr2Point; import org.reprap.geometry.polygons.RrCSGPolygonList; -import org.reprap.geometry.polygons.RrCSGPolygon; import org.reprap.geometry.polygons.RrPolygon; import org.reprap.geometry.polygons.RrPolygonList; import org.reprap.utilities.Debug; @@ -307,251 +304,251 @@ public class LayerProducer { } } - /** - * look at the layer above where we are, and support everything - * in it that has nothing under it in this layer. - * - */ - private void supportCalculations() - { - // We can only work out support if we're going top down - - if(!layerConditions.getTopDown()) - return; - - // Get the layer immediately above - - RrCSGPolygonList above = layerConditions.getLayerAbove(1); - - // If there was no layer immediately above, record this layer to - // be the one above for the next layer down and return. - - if(above == null) - { - layerConditions.recordThisLayer(csgP); - return; - } - - // Pick up our materials - - Extruder [] es = layerConditions.getPrinter().getExtruders(); - - // A list for the supports for the materials in the layer above - - RrCSGPolygonList supports = new RrCSGPolygonList(); - - // Each material in this layer unioned with the same material in the layer above - // This may be what needs support on the next layer down. - - RrCSGPolygonList thisForTheRecord = new RrCSGPolygonList(); - - // Compute the union of everything on this layer and grow it by the - // extrusion height (i.e. grow to a 45 degree overhang). Nothing in that region - // will need any support. - - RrCSGPolygon allThisLayer = new RrCSGPolygon(); - for(int i = 0; i < csgP.size(); i++) - { - allThisLayer = RrCSGPolygon.union(csgP.get(i), allThisLayer); - if(i > 0) - allThisLayer = allThisLayer.reEvaluate(); - } - RrCSGPolygon allThisLayerGrown = allThisLayer.offset(layerConditions.getZStep()); - - // This material's shape in the above layer, its attributes, - // the extruder used for it, and the name of its support material. - - RrCSGPolygon pgAboveLevel; - Attributes aAboveLevel; - Extruder eAboveLevel; - String supportName; - - // The polygons at this level - - RrCSGPolygon thisLevel; - - // For each material in the layer above... - - for(int i = 0; i < above.size(); i++) - { - // Get this material's shape in the above layer, its attributes, - // the extruder used for it, and the name of its support material. - - pgAboveLevel = above.get(i); - aAboveLevel = pgAboveLevel.getAttributes(); - eAboveLevel = aAboveLevel.getExtruder(es); - supportName = eAboveLevel.getSupportMaterial(); - - // If this stuff's support is not called "null"... - - if(!supportName.contentEquals("null")) - { - // Pick up the support extruder - - Extruder supportExtruder = es[GenericExtruder.getNumberFromMaterial(supportName)]; - - // Find the same material at this level - - thisLevel = csgP.find(aAboveLevel); - - // If the material is in this level and the one above... - - if(thisLevel != null) - { - // The union of them both is the shape that may need support at the next level down - - RrCSGPolygon toRemember = RrCSGPolygon.union(pgAboveLevel, thisLevel); - toRemember = toRemember.reEvaluate(); - thisForTheRecord.add(toRemember); - - // The bit left over of the level above after we subtract all this layer - // is what needs support - - RrCSGPolygon sup = RrCSGPolygon.difference(pgAboveLevel, allThisLayerGrown); - sup = sup.reEvaluate(); - sup.setAttributes(new Attributes(supportName, null, null, - supportExtruder.getAppearance())); - supports.add(sup); - } else - - // If the material wasn't in this layer, carry the need to support it on down - - thisForTheRecord.add(pgAboveLevel); - } - } - - // Add every material in this layer that has no equivalent in the layer - // above as it may need support in the next layer down. - - for(int i = 0; i < csgP.size(); i++) - { - thisLevel = csgP.get(i); - if(above.find(thisLevel.getAttributes()) == null) - thisForTheRecord.add(thisLevel); - } - - // Record everything in this layer as potentially needing support - // in the next layer down. - - layerConditions.recordThisLayer(thisForTheRecord); - - // Add all the supports needed to this layer - - csgP.add(supports); - - } - - /** - * look at the layer above where we are, and calculate the infill depending - * on whether something is an open surface or not. - * - */ - private void inFillCalculations() - { - // We can only work out infill if we're going top down - - if(!layerConditions.getTopDown()) - return; - - // Get the layer immediately above - - RrCSGPolygonList above = layerConditions.getLayerAbove(2); - if(above == null) - { - layerConditions.recordThisLayer(csgP); - return; - } - - // Pick up our materials - - Extruder [] es = layerConditions.getPrinter().getExtruders(); - - //Horrid hack... - - if(layerConditions.getModelLayer() < es[0].getLowerFineLayers()) - return; - - // Compute the union of everything on the layer above - // Nothing in that region will have a free surface in this layer. - - RrCSGPolygon allAboveLayer = new RrCSGPolygon(); - for(int i = 0; i < above.size(); i++) - { - allAboveLayer = RrCSGPolygon.union(above.get(i), allAboveLayer); - if(i > 0) - allAboveLayer = allAboveLayer.reEvaluate(); - } - - - - // A list for the infills - - RrCSGPolygonList inFills = new RrCSGPolygonList(); - - // A list for the free surface bits - - RrCSGPolygonList surfaces = new RrCSGPolygonList(); - - // This material's shape, its attributes, - // the extruder used for it, and the name of its infill material. - - RrCSGPolygon pgThisLevel; - Attributes aThisLevel; - Extruder eThisLevel; - String inFillName; - - // For each material in this layer - - for(int i = 0; i < csgP.size(); i++) - { - // Get this material's shape in the above layer, its attributes, - // the extruder used for it, and the name of its support material. - - pgThisLevel = csgP.get(i); - aThisLevel = pgThisLevel.getAttributes(); - eThisLevel = aThisLevel.getExtruder(es); - inFillName = eThisLevel.getBroadInfillMaterial(); - - // If this stuff's infill is not called "null"... - - if(!inFillName.contentEquals("null")) - { - // Pick up the infill extruder - - Extruder inFillExtruder = es[GenericExtruder.getNumberFromMaterial(inFillName)]; - - // The exposed region is whatever's in this layer that isn't above - - RrCSGPolygon exposed = RrCSGPolygon.difference(pgThisLevel, allAboveLayer); - exposed = exposed.reEvaluate(); - - // Make the exposed layer bigger... - - exposed = exposed.offset(layerConditions.getZStep()*eThisLevel.getLowerFineLayers()); - - // ...Then intersect it with what we have already. That will cause the exposed - // region to penetrate the solid a bit. - - exposed = RrCSGPolygon.intersection(exposed, pgThisLevel); - exposed = exposed.reEvaluate(); - surfaces.add(exposed); - - // What's left of this layer after the exposed bit is subtracted is the infill part - - pgThisLevel = RrCSGPolygon.difference(pgThisLevel, exposed); - pgThisLevel = pgThisLevel.reEvaluate(); - pgThisLevel.setAttributes(new Attributes(inFillName, null, null, - inFillExtruder.getAppearance())); - inFills.add(pgThisLevel); - } - } - - // We now have two new collections of polygons representing this layer - - csgP = inFills; - csgP.add(surfaces); - layerConditions.recordThisLayer(csgP); - } +// /** +// * look at the layer above where we are, and support everything +// * in it that has nothing under it in this layer. +// * +// */ +// private void supportCalculations() +// { +// // We can only work out support if we're going top down +// +// if(!layerConditions.getTopDown()) +// return; +// +// // Get the layer immediately above +// +// RrCSGPolygonList above = layerConditions.getLayerAbove(1); +// +// // If there was no layer immediately above, record this layer to +// // be the one above for the next layer down and return. +// +// if(above == null) +// { +// layerConditions.recordThisLayer(csgP); +// return; +// } +// +// // Pick up our materials +// +// Extruder [] es = layerConditions.getPrinter().getExtruders(); +// +// // A list for the supports for the materials in the layer above +// +// RrCSGPolygonList supports = new RrCSGPolygonList(); +// +// // Each material in this layer unioned with the same material in the layer above +// // This may be what needs support on the next layer down. +// +// RrCSGPolygonList thisForTheRecord = new RrCSGPolygonList(); +// +// // Compute the union of everything on this layer and grow it by the +// // extrusion height (i.e. grow to a 45 degree overhang). Nothing in that region +// // will need any support. +// +// RrCSGPolygon allThisLayer = new RrCSGPolygon(); +// for(int i = 0; i < csgP.size(); i++) +// { +// allThisLayer = RrCSGPolygon.union(csgP.get(i), allThisLayer); +// if(i > 0) +// allThisLayer = allThisLayer.reEvaluate(); +// } +// RrCSGPolygon allThisLayerGrown = allThisLayer.offset(layerConditions.getZStep()); +// +// // This material's shape in the above layer, its attributes, +// // the extruder used for it, and the name of its support material. +// +// RrCSGPolygon pgAboveLevel; +// Attributes aAboveLevel; +// Extruder eAboveLevel; +// String supportName; +// +// // The polygons at this level +// +// RrCSGPolygon thisLevel; +// +// // For each material in the layer above... +// +// for(int i = 0; i < above.size(); i++) +// { +// // Get this material's shape in the above layer, its attributes, +// // the extruder used for it, and the name of its support material. +// +// pgAboveLevel = above.get(i); +// aAboveLevel = pgAboveLevel.getAttributes(); +// eAboveLevel = aAboveLevel.getExtruder(es); +// supportName = eAboveLevel.getSupportMaterial(); +// +// // If this stuff's support is not called "null"... +// +// if(!supportName.contentEquals("null")) +// { +// // Pick up the support extruder +// +// Extruder supportExtruder = es[GenericExtruder.getNumberFromMaterial(supportName)]; +// +// // Find the same material at this level +// +// thisLevel = csgP.find(aAboveLevel); +// +// // If the material is in this level and the one above... +// +// if(thisLevel != null) +// { +// // The union of them both is the shape that may need support at the next level down +// +// RrCSGPolygon toRemember = RrCSGPolygon.union(pgAboveLevel, thisLevel); +// toRemember = toRemember.reEvaluate(); +// thisForTheRecord.add(toRemember); +// +// // The bit left over of the level above after we subtract all this layer +// // is what needs support +// +// RrCSGPolygon sup = RrCSGPolygon.difference(pgAboveLevel, allThisLayerGrown); +// sup = sup.reEvaluate(); +// sup.setAttributes(new Attributes(supportName, null, null, +// supportExtruder.getAppearance())); +// supports.add(sup); +// } else +// +// // If the material wasn't in this layer, carry the need to support it on down +// +// thisForTheRecord.add(pgAboveLevel); +// } +// } +// +// // Add every material in this layer that has no equivalent in the layer +// // above as it may need support in the next layer down. +// +// for(int i = 0; i < csgP.size(); i++) +// { +// thisLevel = csgP.get(i); +// if(above.find(thisLevel.getAttributes()) == null) +// thisForTheRecord.add(thisLevel); +// } +// +// // Record everything in this layer as potentially needing support +// // in the next layer down. +// +// layerConditions.recordThisLayer(thisForTheRecord); +// +// // Add all the supports needed to this layer +// +// csgP.add(supports); +// +// } +// +// /** +// * look at the layer above where we are, and calculate the infill depending +// * on whether something is an open surface or not. +// * +// */ +// private void inFillCalculations() +// { +// // We can only work out infill if we're going top down +// +// if(!layerConditions.getTopDown()) +// return; +// +// // Get the layer immediately above +// +// RrCSGPolygonList above = layerConditions.getLayerAbove(2); +// if(above == null) +// { +// layerConditions.recordThisLayer(csgP); +// return; +// } +// +// // Pick up our materials +// +// Extruder [] es = layerConditions.getPrinter().getExtruders(); +// +// //Horrid hack... +// +// if(layerConditions.getModelLayer() < es[0].getLowerFineLayers()) +// return; +// +// // Compute the union of everything on the layer above +// // Nothing in that region will have a free surface in this layer. +// +// RrCSGPolygon allAboveLayer = new RrCSGPolygon(); +// for(int i = 0; i < above.size(); i++) +// { +// allAboveLayer = RrCSGPolygon.union(above.get(i), allAboveLayer); +// if(i > 0) +// allAboveLayer = allAboveLayer.reEvaluate(); +// } +// +// +// +// // A list for the infills +// +// RrCSGPolygonList inFills = new RrCSGPolygonList(); +// +// // A list for the free surface bits +// +// RrCSGPolygonList surfaces = new RrCSGPolygonList(); +// +// // This material's shape, its attributes, +// // the extruder used for it, and the name of its infill material. +// +// RrCSGPolygon pgThisLevel; +// Attributes aThisLevel; +// Extruder eThisLevel; +// String inFillName; +// +// // For each material in this layer +// +// for(int i = 0; i < csgP.size(); i++) +// { +// // Get this material's shape in the above layer, its attributes, +// // the extruder used for it, and the name of its support material. +// +// pgThisLevel = csgP.get(i); +// aThisLevel = pgThisLevel.getAttributes(); +// eThisLevel = aThisLevel.getExtruder(es); +// inFillName = eThisLevel.getBroadInfillMaterial(); +// +// // If this stuff's infill is not called "null"... +// +// if(!inFillName.contentEquals("null")) +// { +// // Pick up the infill extruder +// +// Extruder inFillExtruder = es[GenericExtruder.getNumberFromMaterial(inFillName)]; +// +// // The exposed region is whatever's in this layer that isn't above +// +// RrCSGPolygon exposed = RrCSGPolygon.difference(pgThisLevel, allAboveLayer); +// exposed = exposed.reEvaluate(); +// +// // Make the exposed layer bigger... +// +// exposed = exposed.offset(layerConditions.getZStep()*eThisLevel.getLowerFineLayers()); +// +// // ...Then intersect it with what we have already. That will cause the exposed +// // region to penetrate the solid a bit. +// +// exposed = RrCSGPolygon.intersection(exposed, pgThisLevel); +// exposed = exposed.reEvaluate(); +// surfaces.add(exposed); +// +// // What's left of this layer after the exposed bit is subtracted is the infill part +// +// pgThisLevel = RrCSGPolygon.difference(pgThisLevel, exposed); +// pgThisLevel = pgThisLevel.reEvaluate(); +// pgThisLevel.setAttributes(new Attributes(inFillName, null, null, +// inFillExtruder.getAppearance())); +// inFills.add(pgThisLevel); +// } +// } +// +// // We now have two new collections of polygons representing this layer +// +// csgP = inFills; +// csgP.add(surfaces); +// layerConditions.recordThisLayer(csgP); +// } /** * Stop printing diff --git a/trunk/reprap/host/src/org/reprap/geometry/polygons/CodeGenerator.java b/trunk/reprap/host/src/org/reprap/geometry/polygons/CodeGenerator.java index 6bd326b0..c53a4f9d 100644 --- a/trunk/reprap/host/src/org/reprap/geometry/polygons/CodeGenerator.java +++ b/trunk/reprap/host/src/org/reprap/geometry/polygons/CodeGenerator.java @@ -897,55 +897,55 @@ public class CodeGenerator return null; } - private static void oneCase3(Variable [] variables, int exp, int j, int k, boolean opposite, boolean fts) - { - BooleanExpression a = new BooleanExpression(variables, exp); - -// FunctionTable tt = new FunctionTable(a); -// System.out.println(tt.toString()+"\n\n"); - - FunctionTable f = new FunctionTable(a, variables[j], variables[k], opposite); - - //BooleanExpression g = findEqualTwo(f, variables[j], variables[3-(j+k)]); - BooleanExpression g = findEqualTwo(f, eliminate(variables, k)); - - int caseVal = 0; - if(opposite) - caseVal |= 1; - if(j == 1) - caseVal |= 2; - if(k == 2) - caseVal |= 4; - caseVal |= exp << 3; - - System.out.println("\tcase " + caseVal + ": "); - if(fts) - { - System.out.println("\t// " + a.toJava()); - System.out.print("\t// " + variables[j].name() + " = "); - if(opposite) - System.out.print("!"); - System.out.println(variables[k].name() + " ->"); - System.out.println(f.toString()); - } - - if(g != null || f.allOnes() || f.allZeros()) - { - if(f.allOnes()) - System.out.println("\t\tr = RrCSG.universe();"); - else if(f.allZeros()) - System.out.println("\t\tr = RrCSG.nothing();"); - else - System.out.println("\t\t" + g.toJava()); -// if(fts) -// { -// FunctionTable h = new FunctionTable(g); -// System.out.println(h.toString()); -// } - } else - System.out.println("\t\t// No equivalence." + "\n"); - System.out.println("\t\tbreak;\n"); - } +// private static void oneCase3(Variable [] variables, int exp, int j, int k, boolean opposite, boolean fts) +// { +// BooleanExpression a = new BooleanExpression(variables, exp); +// +//// FunctionTable tt = new FunctionTable(a); +//// System.out.println(tt.toString()+"\n\n"); +// +// FunctionTable f = new FunctionTable(a, variables[j], variables[k], opposite); +// +// //BooleanExpression g = findEqualTwo(f, variables[j], variables[3-(j+k)]); +// BooleanExpression g = findEqualTwo(f, eliminate(variables, k)); +// +// int caseVal = 0; +// if(opposite) +// caseVal |= 1; +// if(j == 1) +// caseVal |= 2; +// if(k == 2) +// caseVal |= 4; +// caseVal |= exp << 3; +// +// System.out.println("\tcase " + caseVal + ": "); +// if(fts) +// { +// System.out.println("\t// " + a.toJava()); +// System.out.print("\t// " + variables[j].name() + " = "); +// if(opposite) +// System.out.print("!"); +// System.out.println(variables[k].name() + " ->"); +// System.out.println(f.toString()); +// } +// +// if(g != null || f.allOnes() || f.allZeros()) +// { +// if(f.allOnes()) +// System.out.println("\t\tr = RrCSG.universe();"); +// else if(f.allZeros()) +// System.out.println("\t\tr = RrCSG.nothing();"); +// else +// System.out.println("\t\t" + g.toJava()); +//// if(fts) +//// { +//// FunctionTable h = new FunctionTable(g); +//// System.out.println(h.toString()); +//// } +// } else +// System.out.println("\t\t// No equivalence." + "\n"); +// System.out.println("\t\tbreak;\n"); +// } private static void oneCase4(Variable [] variables, int exp, int j, int k, boolean opposite, boolean fts) { @@ -1018,19 +1018,19 @@ public class CodeGenerator System.out.println("\t\tbreak;\n"); } - private static void allCases3(Variable [] variables) - { - for(int exp = 0; exp < 4; exp++) - { - for(int j = 0; j < 2; j++) - for(int k = j+1; k < 3; k++) - { - oneCase3(variables, exp, j, k, false, true); - oneCase3(variables, exp, j, k, true, true); - } - } - } - +// private static void allCases3(Variable [] variables) +// { +// for(int exp = 0; exp < 4; exp++) +// { +// for(int j = 0; j < 2; j++) +// for(int k = j+1; k < 3; k++) +// { +// oneCase3(variables, exp, j, k, false, true); +// oneCase3(variables, exp, j, k, true, true); +// } +// } +// } +// private static void allCases4(Variable [] variables) { for(int exp = 0; exp < 16; exp++) diff --git a/trunk/reprap/host/src/org/reprap/geometry/polygons/RrPolygon.java b/trunk/reprap/host/src/org/reprap/geometry/polygons/RrPolygon.java index ec561de1..5716f0a7 100644 --- a/trunk/reprap/host/src/org/reprap/geometry/polygons/RrPolygon.java +++ b/trunk/reprap/host/src/org/reprap/geometry/polygons/RrPolygon.java @@ -437,7 +437,6 @@ public class RrPolygon */ public RrPolygon newStart(int i) { - int k = i; if(!isClosed()) System.err.println("RrPolygon.newStart(i): reordering an open polygon!"); if(i < 0 || i >= size()) diff --git a/trunk/reprap/host/src/org/reprap/geometry/polygons/STLSlice.java b/trunk/reprap/host/src/org/reprap/geometry/polygons/STLSlice.java index be6b7035..5f3e40e1 100644 --- a/trunk/reprap/host/src/org/reprap/geometry/polygons/STLSlice.java +++ b/trunk/reprap/host/src/org/reprap/geometry/polygons/STLSlice.java @@ -65,8 +65,6 @@ import javax.media.j3d.Group; import javax.media.j3d.SceneGraphObject; import javax.media.j3d.Shape3D; import javax.media.j3d.Transform3D; -import javax.media.j3d.Bounds; -import javax.media.j3d.BoundingBox; import javax.vecmath.Point3d; import javax.vecmath.Tuple3d; diff --git a/trunk/reprap/host/src/org/reprap/gui/botConsole/XYZTabPanel.java b/trunk/reprap/host/src/org/reprap/gui/botConsole/XYZTabPanel.java index 993da23c..fa807a2c 100644 --- a/trunk/reprap/host/src/org/reprap/gui/botConsole/XYZTabPanel.java +++ b/trunk/reprap/host/src/org/reprap/gui/botConsole/XYZTabPanel.java @@ -377,7 +377,7 @@ public void goTo(double xTo, double yTo, double zTo) if(plotExtruderCheck.isSelected()) { int eNum = Integer.parseInt(extruderToPlotWith.getText()); - GenericExtruderTabPanel etp = parentBotConsoleFrame.getGenericExtruderTabPanel(eNum); + GenericExtruderTabPanel etp = BotConsoleFrame.getGenericExtruderTabPanel(eNum); printer.selectExtruder(eNum); printer.getExtruder().setExtrusion(etp.getExtruderSpeed()); printer.machineWait(printer.getExtruder().getExtrusionDelayForLayer()); diff --git a/trunk/reprap/host/src/org/reprap/machines/GCodeRepRap.java b/trunk/reprap/host/src/org/reprap/machines/GCodeRepRap.java index 6062f8ab..68c67c0d 100644 --- a/trunk/reprap/host/src/org/reprap/machines/GCodeRepRap.java +++ b/trunk/reprap/host/src/org/reprap/machines/GCodeRepRap.java @@ -12,11 +12,9 @@ package org.reprap.machines; import org.reprap.ReprapException; import org.reprap.Extruder; -import org.reprap.Preferences; import org.reprap.comms.GCodeReaderAndWriter; import org.reprap.utilities.Debug; import org.reprap.devices.GCodeExtruder; -import org.reprap.devices.ExtrudedLength; import org.reprap.devices.GCodeStepperMotor; import org.reprap.geometry.LayerRules; diff --git a/trunk/reprap/host/src/org/reprap/machines/GenericRepRap.java b/trunk/reprap/host/src/org/reprap/machines/GenericRepRap.java index bf4a6148..3e345f71 100644 --- a/trunk/reprap/host/src/org/reprap/machines/GenericRepRap.java +++ b/trunk/reprap/host/src/org/reprap/machines/GenericRepRap.java @@ -5,8 +5,6 @@ import java.io.IOException; import javax.media.j3d.BranchGroup; import javax.swing.JCheckBoxMenuItem; import javax.swing.JFrame; -import java.util.ArrayList; -import java.util.List; import org.reprap.Attributes; import org.reprap.CartesianPrinter; import org.reprap.Preferences; |