|
Diff of LegoBuilder.java
|
|
Version 1.3
|
Version 1.4
|
|
|
|
|
|
|
|
|
/**
|
/**
|
|
* @author Joy Kyriakopulos (joyk@fnal.gov)
|
* @author Joy Kyriakopulos (joyk@fnal.gov)
|
|
* @version $Id: LegoBuilder.java,v 1.3 2001/06/21 07:16:23 joyk Exp $
|
* @version $Id: LegoBuilder.java,v 1.4 2001/06/21 23:19:54 joyk Exp $
|
|
*/
|
*/
|
|
public class LegoBuilder extends AbstractPlotBuilder
|
public class LegoBuilder extends AbstractPlotBuilder
|
|
{
|
{
|
|
|
|
|
targetSwitch.addChild(lineShape); // sparse "wire-frame" added second
|
targetSwitch.addChild(lineShape); // sparse "wire-frame" added second
|
|
|
|
|
//If necessary, create geometry for a sparsified plot
|
//If necessary, create geometry for a sparsified plot
|
|
if (linesWhileAnim && shapeIsLego || popBins > numWireLines/2) { // if too many bins populated
|
if (linesWhileAnim && (shapeIsLego || popBins > numWireLines/2)) { // if too many bins populated
|
|
lineShape.setGeometry(buildWireGeometry(data)); // build alternate view
|
lineShape.setGeometry(buildWireGeometry(data)); // build alternate view
|
|
targetSwitch.setUserData(Boolean.TRUE);
|
targetSwitch.setUserData(Boolean.TRUE);
|
|
}
|
}
|
|
|
|
|
targetSwitch.setUserData(Boolean.FALSE);
|
targetSwitch.setUserData(Boolean.FALSE);
|
|
|
|
|
targetSwitch.setWhichChild(fullPlotChild); // full plot displayed by default
|
targetSwitch.setWhichChild(fullPlotChild); // full plot displayed by default
|
|
|
// System.out.println("buildContent: linesWhileAnim = "+linesWhileAnim+", popBins = "+popBins+", numWireLines = "+numWireLines+", shapeIsLego = "+shapeIsLego);
|
|
System.out.println("buildContent: linesWhileAnim = "+linesWhileAnim+", popBins = "+popBins+", numWireLines = "+numWireLines+", shapeIsLego = "+shapeIsLego);
|
|
|
|
|
|
return targetSwitch;
|
return targetSwitch;
|
|
}
|
}
|
|
public void updatePlot(NormalizedBinned2DData data)
|
public void updatePlot(NormalizedBinned2DData data)
|
|
|
|
|
}
|
}
|
|
|
|
|
//If necessary, create geometry for a sparsified plot
|
//If necessary, create geometry for a sparsified plot
|
|
System.out.println("in updatePlot: linesWhileAnim = "+linesWhileAnim+", popBins = "+popBins+", numWireLines = "+numWireLines+", shapeIsLego = "+shapeIsLego);
|
// System.out.println("in updatePlot: linesWhileAnim = "+linesWhileAnim+", popBins = "+popBins+", numWireLines = "+numWireLines+", shapeIsLego = "+shapeIsLego);
|
|
if (linesWhileAnim && (shapeIsLego || popBins > numWireLines/2)) { // if too many bins populated
|
if (linesWhileAnim && (shapeIsLego || popBins > numWireLines/2)) { // if too many bins populated
|
|
lineShape.setGeometry(buildWireGeometry(data)); // build alternate view
|
lineShape.setGeometry(buildWireGeometry(data)); // build alternate view
|
|
targetSwitch.setUserData(Boolean.TRUE); // flags whether there is line content
|
targetSwitch.setUserData(Boolean.TRUE); // flags whether there is line content
|
|
|
|
|
if (binInc[0] < 1) binInc[0] = 1;
|
if (binInc[0] < 1) binInc[0] = 1;
|
|
if (binInc[1] < 1) binInc[1] = 1;
|
if (binInc[1] < 1) binInc[1] = 1;
|
|
}
|
}
|
|
System.out.println("in calcXYfactors: " + binInc[0] + " " + binInc[1]);
|
// System.out.println("in calcXYfactors: " + binInc[0] + " " + binInc[1]);
|
|
return binInc;
|
return binInc;
|
|
}
|
}
|
|
|
|
-- Legend --
|
Removed in v.1.3
|
|
|
changed lines
|
| |
Inserted in v.1.4
|
|
|
Index: freehep/org/freehep/j3d/plot/LegoBuilder.java
===================================================================
RCS file: /cvs/freehep/freehep/org/freehep/j3d/plot/LegoBuilder.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -w -r1.3 -r1.4
--- freehep/org/freehep/j3d/plot/LegoBuilder.java 21 Jun 2001 07:16:23 -0000 1.3
+++ freehep/org/freehep/j3d/plot/LegoBuilder.java 21 Jun 2001 23:19:54 -0000 1.4
@@ -7,7 +7,7 @@
/**
* @author Joy Kyriakopulos (joyk@fnal.gov)
- * @version $Id: LegoBuilder.java,v 1.3 2001/06/21 07:16:23 joyk Exp $
+ * @version $Id: LegoBuilder.java,v 1.4 2001/06/21 23:19:54 joyk Exp $
*/
public class LegoBuilder extends AbstractPlotBuilder
{
@@ -73,7 +73,7 @@
targetSwitch.addChild(lineShape); // sparse "wire-frame" added second
//If necessary, create geometry for a sparsified plot
- if (linesWhileAnim && shapeIsLego || popBins > numWireLines/2) { // if too many bins populated
+ if (linesWhileAnim && (shapeIsLego || popBins > numWireLines/2)) { // if too many bins populated
lineShape.setGeometry(buildWireGeometry(data)); // build alternate view
targetSwitch.setUserData(Boolean.TRUE);
}
@@ -81,9 +81,7 @@
targetSwitch.setUserData(Boolean.FALSE);
targetSwitch.setWhichChild(fullPlotChild); // full plot displayed by default
-
- System.out.println("buildContent: linesWhileAnim = "+linesWhileAnim+", popBins = "+popBins+", numWireLines = "+numWireLines+", shapeIsLego = "+shapeIsLego);
-
+ // System.out.println("buildContent: linesWhileAnim = "+linesWhileAnim+", popBins = "+popBins+", numWireLines = "+numWireLines+", shapeIsLego = "+shapeIsLego);
return targetSwitch;
}
public void updatePlot(NormalizedBinned2DData data)
@@ -107,7 +105,7 @@
}
//If necessary, create geometry for a sparsified plot
- System.out.println("in updatePlot: linesWhileAnim = "+linesWhileAnim+", popBins = "+popBins+", numWireLines = "+numWireLines+", shapeIsLego = "+shapeIsLego);
+ // System.out.println("in updatePlot: linesWhileAnim = "+linesWhileAnim+", popBins = "+popBins+", numWireLines = "+numWireLines+", shapeIsLego = "+shapeIsLego);
if (linesWhileAnim && (shapeIsLego || popBins > numWireLines/2)) { // if too many bins populated
lineShape.setGeometry(buildWireGeometry(data)); // build alternate view
targetSwitch.setUserData(Boolean.TRUE); // flags whether there is line content
@@ -458,7 +456,7 @@
if (binInc[0] < 1) binInc[0] = 1;
if (binInc[1] < 1) binInc[1] = 1;
}
- System.out.println("in calcXYfactors: " + binInc[0] + " " + binInc[1]);
+ // System.out.println("in calcXYfactors: " + binInc[0] + " " + binInc[1]);
return binInc;
}