← Back to branch summary

~ubuntu-branches/ubuntu/natty/electric/natty

« back to all changes in this revision

Viewing changes to com/sun/electric/tool/io/input/LTSpiceOut.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/input/LTSpiceOut.java
81
81
        /**
82
82
         * Method to read an LTSpice output file.
83
83
         */
84
 
        protected Stimuli readSimulationOutput(URL fileURL, Cell cell)
 
84
        protected void readSimulationOutput(Stimuli sd, URL fileURL, Cell cell)
85
85
                throws IOException
86
86
        {
87
87
                // open the file
88
 
                if (openBinaryInput(fileURL)) return null;
 
88
                if (openBinaryInput(fileURL)) return;
89
89
 
90
90
                // show progress reading .raw file
91
91
                startProgressDialog("LTSpice output", fileURL.getFile());
92
92
 
93
93
                // read the actual signal data from the .raw file
94
 
                Stimuli sd = readRawLTSpiceFile(cell);
 
94
                readRawLTSpiceFile(cell, sd);
95
95
 
96
96
                // stop progress dialog, close the file
97
97
                stopProgressDialog();
98
98
                closeInput();
99
 
 
100
 
                // return the simulation data
101
 
                return sd;
102
99
        }
103
100
 
104
 
        private Stimuli readRawLTSpiceFile(Cell cell)
 
101
        private void readRawLTSpiceFile(Cell cell, Stimuli sd)
105
102
                throws IOException
106
103
        {
107
104
                complexValues = false;
157
154
                                if (signalCount < 0)
158
155
                                {
159
156
                                        System.out.println("Missing variable count in file");
160
 
                                        return null;
 
157
                                        return;
161
158
                                }
162
159
                                signalNames = new String[signalCount];
163
160
                                for(int i=0; i<=signalCount; i++)
189
186
                                if (signalCount < 0)
190
187
                                {
191
188
                                        System.out.println("Missing variable count in file");
192
 
                                        return null;
 
189
                                        return;
193
190
                                }
194
191
                                if (rowCount < 0)
195
192
                                {
196
193
                                        System.out.println("Missing point count in file");
197
 
                                        return null;
 
194
                                        return;
198
195
                                }
199
196
 
200
197
                                // initialize the stimuli object
201
 
                                Stimuli sd = new Stimuli();
202
198
                                SweepAnalysisLT an = new SweepAnalysisLT(sd, aType);
203
199
                                sd.setCell(cell);
204
200
                                if (DEBUG)
280
276
                                        double minTime = 0, maxTime = 0, minValues = 0, maxValues = 0;
281
277
                                        an.addSignal(signalNames[i], context, minTime, maxTime, minValues, maxValues);
282
278
                                }
283
 
                                return sd;
 
279
                                return;
284
280
                        }
285
281
                }
286
 
                return null;
287
282
        }
288
283
 
289
284
        private double getNextDouble()