← Back to branch summary

~ubuntu-branches/ubuntu/vivid/electric/vivid

« back to all changes in this revision

Viewing changes to com/sun/electric/tool/user/ui/StatusBar.java

  • Committer: Package Import Robot
  • Author(s): Markus Koschany
  • Date: 2014-07-08 21:54:23 UTC
  • mfrom: (1.1.6) (3.1.9 sid)
  • Revision ID: package-import@ubuntu.com-20140708215423-4zrgsca1e28tzcoc
Tags: 9.05+dfsg-1
* Imported Upstream version 9.05+dfsg.
* Add signing-key.pgp and check for valid upstream tarballs with uscan's
  pgpsigurlmangle feature.
* Move the package to Git.

Show diffs side-by-side

added added

removed removed

Lines of Context:
com/sun/electric/tool/user/ui/StatusBar.java
128
128
 
129
129
        fieldHierCoords = new JLabel(" ");
130
130
        fieldHierCoords.setHorizontalAlignment(JLabel.RIGHT);
131
 
        addField(fieldHierCoords, 0, 2, 7, 0.0);
 
131
        addField(fieldHierCoords, 1, 2, 6, 0.0);
132
132
 
133
133
        if (Job.getDebug()) {
134
 
            gbc = new GridBagConstraints();
135
 
            gbc.gridx = 0;
136
 
            gbc.gridy = 1;
137
 
            gbc.fill = GridBagConstraints.HORIZONTAL;
138
 
            gbc.gridwidth = 7;
139
 
            add(new JSeparator(JSeparator.HORIZONTAL), gbc);
 
134
//            gbc = new GridBagConstraints();
 
135
//            gbc.gridx = 0;
 
136
//            gbc.gridy = 1;
 
137
//            gbc.fill = GridBagConstraints.HORIZONTAL;
 
138
//            gbc.gridwidth = 7;
 
139
//            add(new JSeparator(JSeparator.HORIZONTAL), gbc);
140
140
 
141
141
            memoryUsage = new JLabel(" ");
142
 
            memoryUsage.setHorizontalAlignment(JLabel.RIGHT);
143
 
            addField(memoryUsage, 0, 2, 7, 0.0);
 
142
            memoryUsage.setHorizontalAlignment(JLabel.LEFT);
 
143
            addField(memoryUsage, 0, 2, 1, 0.0);
144
144
        }
145
145
 
146
146
        // add myself as listener for highlight and database changes
340
340
    }
341
341
 
342
342
    private void updateUsedMemory() {
343
 
        if (fieldHierCoords.getText().trim().length() > 0) memoryUsage.setText(""); else
344
 
                memoryUsage.setText(MemoryUsage.getInstance().toString());
 
343
        memoryUsage.setText("  " + MemoryUsage.getInstance().toString());
 
344
//      if (fieldHierCoords.getText().trim().length() > 0) memoryUsage.setText(""); else
 
345
//              memoryUsage.setText(MemoryUsage.getInstance().toString());
345
346
    }
346
347
 
347
348
    private void redoStatusBar() {
376
377
        fieldSize.setText(sizeMsg = "  " + sizeMsg + "  ");
377
378
        fieldSize.setToolTipText(sizeMsg);
378
379
 
379
 
        Technology tech = Technology.getCurrent();
 
380
        Technology tech = (cell != null) ? cell.getTechnology() : Technology.getCurrent();
380
381
        if (tech != null) {
381
382
            String message = "TECH: " + tech.getTechName();
382
383
            String foundry = tech.getPrefFoundry();