← 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/SpiceOut.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/SpiceOut.java
46
46
        /**
47
47
         * Method to read an Spice output file.
48
48
         */
49
 
        protected Stimuli readSimulationOutput(URL fileURL, Cell cell)
 
49
        protected void readSimulationOutput(Stimuli sd, URL fileURL, Cell cell)
50
50
                throws IOException
51
51
        {
52
52
                // open the file
53
 
                if (openTextInput(fileURL)) return null;
 
53
                if (openTextInput(fileURL)) return;
54
54
 
55
55
                // show progress reading .spo file
56
56
                startProgressDialog("Spice output", fileURL.getFile());
57
57
 
58
58
                // read the actual signal data from the .spo file
59
 
                Stimuli sd = readSpiceFile(cell);
 
59
                readSpiceFile(cell, sd);
60
60
 
61
61
                // stop progress dialog, close the file
62
62
                stopProgressDialog();
63
63
                closeInput();
64
 
 
65
 
                // return the simulation data
66
 
                return sd;
67
64
        }
68
65
 
69
66
        private final static String CELLNAME_HEADER = "*** SPICE deck for cell ";
70
67
 
71
 
        private Stimuli readSpiceFile(Cell cell)
 
68
        private void readSpiceFile(Cell cell, Stimuli sd)
72
69
                throws IOException
73
70
        {
74
71
                boolean dataMode = false;
93
90
                                        {
94
91
                                                System.out.println("This is an HSPICE file, not a SPICE2 file");
95
92
                                                System.out.println("Change the SPICE format (in Preferences) and reread");
96
 
                                                return null;
 
93
                                                return;
97
94
                                        }
98
95
                                }
99
96
                        }
176
173
                if (mostSignals <= 0)
177
174
                {
178
175
                        System.out.println("No data found in the file");
179
 
                        return null;
 
176
                        return;
180
177
                }
181
178
 
182
 
                Stimuli sd = new Stimuli();
183
179
                AnalogAnalysis an = new AnalogAnalysis(sd, AnalogAnalysis.ANALYSIS_SIGNALS, false);
184
180
                sd.setCell(cell);
185
181
 
201
197
                        }
202
198
                        an.addSignal("Signal " + (j+1), null, values);
203
199
                }
204
 
                return sd;
205
200
        }
206
201
 
207
202
}