← Back to branch summary

~ubuntu-branches/ubuntu/oneiric/electric/oneiric

« back to all changes in this revision

Viewing changes to com/sun/electric/tool/io/output/GDS.java

  • Committer: Bazaar Package Importer
  • Author(s): Onkar Shinde
  • Date: 2010-01-09 16:26:04 UTC
  • mfrom: (1.1.4 upstream) (3.1.6 sid)
  • Revision ID: james.westby@ubuntu.com-20100109162604-1ypvmy8ijmlc6oq7
Tags: 8.10-1
* New upstream version.
* debian/control
  - Add libjava3d-java and quilt build dependencies.
  - Update standards version to 3.8.3.
  - Add libjava3d-java as recommends to binary package.
* debian/rules
  - Use quilt patch system instead of simple patchsys.
  - Add java3d related jar files to DEB_JARS.
* debian/patches/*
  - Update as per current upstream source. Convert to quilt.
* debian/ant.properties
  - Do not disable 3D plugin anymore.
  - Use new property to disable compilation of OS X related classes.
* debian/wrappers/electric
  - Add java3d related jar files to runtime classpath.
* debian/README.source
  - Change text to the appropriate one for quilt.

Show diffs side-by-side

added added

removed removed

Lines of Context:
com/sun/electric/tool/io/output/GDS.java
34
34
import com.sun.electric.database.hierarchy.View;
35
35
import com.sun.electric.database.prototype.PortOriginal;
36
36
import com.sun.electric.database.prototype.PortProto;
37
 
import com.sun.electric.database.prototype.NodeProto;
38
37
import com.sun.electric.database.text.TextUtils;
39
38
import com.sun.electric.database.topology.ArcInst;
40
39
import com.sun.electric.database.topology.NodeInst;
129
128
        /** Current layer for gds output */                     private static GDSLayers currentLayerNumbers;
130
129
        /** Position of next byte in the buffer */      private static int bufferPosition;
131
130
        /** Number data buffers output so far */        private static int blockCount;
132
 
        /** constant for GDS units */                           private static double scaleFactor;
 
131
        /** constant for GDS units */                           private double scaleFactor;
133
132
        /** cell naming map */                                          private Map<Cell,String> cellNames;
134
133
        /** layer number map */                                         private Map<Layer,GDSLayers> layerNumbers;
135
134
        /** separator string for lib + cell concatanated cell names */  public static final String concatStr = ".";
150
149
                int cellNameLenMax = IOTool.getGDSCellNameLenMax();
151
150
                boolean outUpperCase = IOTool.isGDSOutUpperCase();
152
151
        boolean includeText = IOTool.isGDSInIncludesText();
 
152
        double outputScale =  IOTool.getGDSOutputScale();
153
153
 
154
154
        public GDSPreferences(boolean factory)
155
155
                {
389
389
                outputAngle(angle);
390
390
                outputShort((short)12);
391
391
                outputShort(HDR_XY);
392
 
                Poly portPoly = pp.getOriginalPort().getPoly();
 
392
                Poly portPoly = pp.getPoly();
393
393
                outputInt(scaleDBUnit(portPoly.getCenterX()));
394
394
                outputInt(scaleDBUnit(portPoly.getCenterY()));
395
395
 
665
665
                for (int i=0; i<DSIZE; i++) emptyBuffer[i] = 0;
666
666
 
667
667
                Technology tech = topCell.getTechnology();
668
 
                scaleFactor = tech.getScale();
 
668
                scaleFactor = tech.getScale() * localPrefs.outputScale;
669
669
                layerNumbers = new HashMap<Layer,GDSLayers>();
670
670
                nameRemapping = new HashMap<String,Set<String>>();
671
671