Mirrors/circuitjs1
2
0
Fork 0
mirror of https://github.com/pfalstad/circuitjs1.git synced 2026-02-20 01:41:22 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into websocket

Browse Source
This commit is contained in:
Paul Falstad
2022-09-10 19:15:47 -07:00
parent 961292cce8 f75b61ac8d
commit 86eef8b2db
40 changed files with 34 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/lushprojects/circuitjs1/client/AudioInputElm.java
View File

@@ -24,8 +24,6 @@ import java.util.HashMap;
import com.google.gwt.dom.client.Element;
import com.google.gwt.event.dom.client.ChangeEvent;
import com.google.gwt.event.dom.client.ChangeHandler;
import com.google.gwt.event.dom.client.ClickEvent;
import com.google.gwt.event.dom.client.ClickHandler;
import com.google.gwt.user.client.ui.FileUpload;
class AudioFileEntry {

2
src/com/lushprojects/circuitjs1/client/CCVSElm.java
View File

@@ -21,8 +21,6 @@ package com.lushprojects.circuitjs1.client;
import java.util.Vector;
import com.lushprojects.circuitjs1.client.ChipElm.Pin;
class CCVSElm extends VCCSElm {
static int FLAG_SPICE = 2;
VoltageElm voltageSources[];

4
src/com/lushprojects/circuitjs1/client/ChipElm.java
View File

@@ -260,7 +260,7 @@ abstract class ChipElm extends CircuitElm {
}
}
if (vsc != getVoltageSourceCount())
sim.console("voltage source count does not match number of outputs");
CirSim.console("voltage source count does not match number of outputs");
}
void execute() {}
void doStep() {
@@ -309,7 +309,7 @@ abstract class ChipElm extends CircuitElm {
void writeOutput(int n, boolean value) {
if (!pins[n].output)
sim.console("pin " + n + " is not an output!");
CirSim.console("pin " + n + " is not an output!");
pins[n].value = value;
}

5
src/com/lushprojects/circuitjs1/client/CirSim.java
View File

@@ -31,11 +31,9 @@ import java.util.Map;
import java.util.Random;
import java.lang.Math;
import com.gargoylesoftware.htmlunit.javascript.host.Console;
import com.google.gwt.canvas.client.Canvas;
import com.google.gwt.user.client.ui.Button;
import com.google.gwt.user.client.ui.CellPanel;
import com.google.gwt.user.client.ui.DialogBox;
import com.google.gwt.user.client.ui.DockLayoutPanel;
import com.google.gwt.user.client.ui.Label;
import com.google.gwt.user.client.ui.RootLayoutPanel;
@@ -57,7 +55,6 @@ import com.google.gwt.user.client.Event.NativePreviewEvent;
import com.google.gwt.user.client.Event.NativePreviewHandler;
import com.google.gwt.event.dom.client.MouseWheelEvent;
import com.google.gwt.event.dom.client.MouseWheelHandler;
import com.google.gwt.event.logical.shared.CloseEvent;
import com.google.gwt.core.client.Callback;
import com.google.gwt.core.client.GWT;
import com.google.gwt.core.client.JavaScriptObject;
@@ -92,12 +89,10 @@ import com.google.gwt.storage.client.Storage;
import com.google.gwt.user.client.ui.PopupPanel;
import static com.google.gwt.event.dom.client.KeyCodes.*;
import com.google.gwt.user.client.ui.Frame;
import com.google.gwt.user.client.ui.HasHorizontalAlignment;
import com.google.gwt.user.client.ui.Widget;
import com.lushprojects.circuitjs1.client.util.PerfMonitor;
import com.google.gwt.user.client.Window.ClosingEvent;
import com.google.gwt.user.client.Window.Navigator;
import com.google.gwt.event.logical.shared.CloseHandler;
import com.google.gwt.event.logical.shared.ResizeEvent;
import com.google.gwt.event.logical.shared.ResizeHandler;

3
src/com/lushprojects/circuitjs1/client/CustomCompositeElm.java
View File

@@ -4,7 +4,6 @@ import java.util.Vector;
import com.google.gwt.user.client.Window;
import com.google.gwt.user.client.ui.Button;
import com.lushprojects.circuitjs1.client.ChipElm.Pin;
// instances of subcircuits
@@ -218,7 +217,7 @@ public class CustomCompositeElm extends CompositeElm {
}
if (n == 5) {
sim.readCircuit(model.modelCircuit);
sim.editDialog.closeDialog();
CirSim.editDialog.closeDialog();
}
}

2
src/com/lushprojects/circuitjs1/client/CustomCompositeModel.java
View File

@@ -7,8 +7,6 @@ import java.util.Map;
import java.util.Vector;
import com.google.gwt.storage.client.Storage;
import com.google.gwt.user.client.Window;
import com.google.gwt.user.client.ui.TextArea;
// model for subcircuits

1
src/com/lushprojects/circuitjs1/client/CustomLogicElm.java
View File

@@ -1,7 +1,6 @@
package com.lushprojects.circuitjs1.client;
import com.google.gwt.user.client.ui.Button;
import com.lushprojects.circuitjs1.client.ChipElm.Pin;
public class CustomLogicElm extends ChipElm {
String modelName;

2
src/com/lushprojects/circuitjs1/client/DCMotorElm.java
View File

@@ -191,7 +191,7 @@ class DCMotorElm extends CircuitElm {
getBasicInfo(arr);
arr[3] = sim.LS("speed") + " = " + getUnitText(60*Math.abs(speed)/(2*Math.PI), sim.LS("RPM"));
arr[4] = "L = " + getUnitText(inductance, "H");
arr[5] = "R = " + getUnitText(resistance, sim.ohmString);
arr[5] = "R = " + getUnitText(resistance, CirSim.ohmString);
arr[6] = "P = " + getUnitText(getPower(), "W");
}
public EditInfo getEditInfo(int n) {

6
src/com/lushprojects/circuitjs1/client/DataInputElm.java
View File

@@ -19,15 +19,11 @@
package com.lushprojects.circuitjs1.client;
import com.google.gwt.core.client.JsArrayNumber;
import java.util.ArrayList;
import java.util.HashMap;
import com.google.gwt.dom.client.Element;
import com.google.gwt.event.dom.client.ChangeEvent;
import com.google.gwt.event.dom.client.ChangeHandler;
import com.google.gwt.event.dom.client.ClickEvent;
import com.google.gwt.event.dom.client.ClickHandler;
import com.google.gwt.user.client.ui.FileUpload;
class DataFileEntry {
@@ -183,7 +179,7 @@ class DataInputElm extends RailElm {
double d = Double.parseDouble(arr[i]);
data.add(d);
} catch (Exception e) {
sim.console("parse error on line " + i);
CirSim.console("parse error on line " + i);
}
}
}

4
src/com/lushprojects/circuitjs1/client/DiacElm.java
View File

@@ -129,8 +129,8 @@ class DiacElm extends CircuitElm {
arr[0] = "DIAC";
getBasicInfo(arr);
arr[3] = state ? "on" : "off";
arr[4] = "Ron = " + getUnitText(onresistance, sim.ohmString);
arr[5] = "Roff = " + getUnitText(offresistance, sim.ohmString);
arr[4] = "Ron = " + getUnitText(onresistance, CirSim.ohmString);
arr[5] = "Roff = " + getUnitText(offresistance, CirSim.ohmString);
arr[6] = "Vbrkdn = " + getUnitText(breakdown, "V");
arr[7] = "Ihold = " + getUnitText(holdcurrent, "A");
arr[8] = "P = " + getUnitText(getPower(), "W");

9
src/com/lushprojects/circuitjs1/client/EditCompositeModelDialog.java
View File

@@ -23,10 +23,6 @@ import java.util.Collections;
import java.util.Comparator;
import java.util.Date;
import java.util.HashSet;
import java.util.Set;
import java.util.Vector;
import com.google.gwt.user.client.ui.DialogBox;
import com.google.gwt.user.client.ui.HasHorizontalAlignment;
import com.google.gwt.user.client.ui.HorizontalPanel;
import com.google.gwt.user.client.Window;
@@ -50,7 +46,6 @@ import com.google.gwt.canvas.dom.client.Context2d;
import com.google.gwt.event.dom.client.ClickEvent;
import com.google.gwt.user.client.ui.Label;
import com.google.gwt.user.client.ui.TextBox;
import com.google.gwt.i18n.client.DateTimeFormat;
public class EditCompositeModelDialog extends Dialog implements MouseDownHandler, MouseMoveHandler, MouseUpHandler, MouseOutHandler, MouseOverHandler {
@@ -244,9 +239,9 @@ public class EditCompositeModelDialog extends Dialog implements MouseDownHandler
if (dx < 0 || dy < 0) {
for (int i = 0; i != postCount; i++) {
Pin p = chip.pins[i];
if (dx < 0 && (p.side == chip.SIDE_N || p.side == chip.SIDE_S) && p.pos >= chip.sizeX+dx)
if (dx < 0 && (p.side == ChipElm.SIDE_N || p.side == ChipElm.SIDE_S) && p.pos >= chip.sizeX+dx)
return;
if (dy < 0 && (p.side == chip.SIDE_E || p.side == chip.SIDE_W) && p.pos >= chip.sizeY+dy)
if (dy < 0 && (p.side == ChipElm.SIDE_E || p.side == ChipElm.SIDE_W) && p.pos >= chip.sizeY+dy)
return;
}
}

9
src/com/lushprojects/circuitjs1/client/EditDialog.java
View File

@@ -20,7 +20,6 @@
package com.lushprojects.circuitjs1.client;
import com.google.gwt.user.client.ui.DialogBox;
import com.google.gwt.user.client.ui.HTML;
import com.google.gwt.user.client.ui.Button;
import com.google.gwt.user.client.ui.VerticalPanel;
@@ -312,10 +311,10 @@ class EditDialog extends Dialog {
public void closeDialog()
{
super.closeDialog();
if (cframe.editDialog == this)
cframe.editDialog = null;
if (cframe.customLogicEditDialog == this)
cframe.customLogicEditDialog = null;
if (CirSim.editDialog == this)
CirSim.editDialog = null;
if (CirSim.customLogicEditDialog == this)
CirSim.customLogicEditDialog = null;
}
}

1
src/com/lushprojects/circuitjs1/client/EditInfo.java
View File

@@ -20,7 +20,6 @@
package com.lushprojects.circuitjs1.client;
import com.google.gwt.user.client.ui.TextBox;
import com.google.gwt.user.client.ui.Widget;
import com.google.gwt.user.client.ui.Anchor;
import com.google.gwt.user.client.ui.Button;
import com.google.gwt.user.client.ui.TextArea;

1
src/com/lushprojects/circuitjs1/client/ExportAsImageDialog.java
View File

@@ -20,7 +20,6 @@
package com.lushprojects.circuitjs1.client;
import java.util.Date;
import com.google.gwt.user.client.ui.DialogBox;
import com.google.gwt.user.client.ui.Anchor;
import com.google.gwt.user.client.ui.Button;
import com.google.gwt.user.client.ui.VerticalPanel;

1
src/com/lushprojects/circuitjs1/client/ExportAsLocalFileDialog.java
View File

@@ -20,7 +20,6 @@
package com.lushprojects.circuitjs1.client;
import java.util.Date;
import com.google.gwt.user.client.ui.DialogBox;
import com.google.gwt.user.client.ui.HasHorizontalAlignment;
import com.google.gwt.user.client.ui.HorizontalPanel;
import com.google.gwt.user.client.ui.Anchor;

1
src/com/lushprojects/circuitjs1/client/ExportAsTextDialog.java
View File

@@ -19,7 +19,6 @@
package com.lushprojects.circuitjs1.client;
import com.google.gwt.user.client.ui.DialogBox;
import com.google.gwt.user.client.ui.HasHorizontalAlignment;
import com.google.gwt.user.client.ui.HorizontalPanel;
import com.google.gwt.user.client.ui.TextArea;

2
src/com/lushprojects/circuitjs1/client/ExportAsUrlDialog.java
View File

@@ -19,7 +19,6 @@
package com.lushprojects.circuitjs1.client;
import com.google.gwt.user.client.ui.DialogBox;
import com.google.gwt.user.client.ui.TextArea;
import com.google.gwt.user.client.ui.HasHorizontalAlignment;
import com.google.gwt.user.client.ui.HorizontalPanel;
@@ -31,7 +30,6 @@ import com.google.gwt.http.client.URL;
import com.google.gwt.core.client.GWT;
import com.google.gwt.event.dom.client.ClickEvent;
import com.google.gwt.user.client.ui.Label;
import com.google.gwt.user.client.ui.RichTextArea;
import com.google.gwt.http.client.RequestBuilder;
import com.google.gwt.http.client.RequestCallback;
import com.google.gwt.http.client.RequestException;

2
src/com/lushprojects/circuitjs1/client/FuseElm.java
View File

@@ -146,7 +146,7 @@ class FuseElm extends CircuitElm {
void getInfo(String arr[]) {
arr[0] = blown ? "fuse (blown)" : "fuse";
getBasicInfo(arr);
arr[3] = "R = " + getUnitText(resistance, sim.ohmString);
arr[3] = "R = " + getUnitText(resistance, CirSim.ohmString);
arr[4] = "I2t = " + i2t;
if (!blown)
arr[5] = ((int)(heat*100/i2t)) + "% " + sim.LS("melted");

5
src/com/lushprojects/circuitjs1/client/ImportFromDropboxDialog.java
View File

@@ -1,13 +1,8 @@
package com.lushprojects.circuitjs1.client;
import java.util.Date;
import com.google.gwt.event.dom.client.ClickEvent;
import com.google.gwt.event.dom.client.ClickHandler;
import com.google.gwt.i18n.client.DateTimeFormat;
import com.google.gwt.user.client.ui.Anchor;
import com.google.gwt.user.client.ui.Button;
import com.google.gwt.user.client.ui.DialogBox;
import com.google.gwt.user.client.ui.HasHorizontalAlignment;
import com.google.gwt.user.client.ui.Label;
import com.google.gwt.user.client.ui.TextArea;

1
src/com/lushprojects/circuitjs1/client/ImportFromTextDialog.java
View File

@@ -19,7 +19,6 @@
package com.lushprojects.circuitjs1.client;
import com.google.gwt.user.client.ui.DialogBox;
import com.google.gwt.user.client.ui.TextArea;
import com.google.gwt.user.client.ui.Button;
import com.google.gwt.user.client.ui.VerticalPanel;

2
src/com/lushprojects/circuitjs1/client/LDRElm.java
View File

@@ -157,7 +157,7 @@ class LDRElm extends CircuitElm implements Command, MouseWheelHandler {
arr[0] = "photoresistor";
arr[1] = "I = "+ getCurrentDText(current); //getBasicInfo(arr);
arr[2] = "Vd = "+ getVoltageDText(getVoltageDiff());
arr[3] = "R = " + getUnitText(resistance, sim.ohmString);
arr[3] = "R = " + getUnitText(resistance, CirSim.ohmString);
arr[4] = "P = " + getUnitText(getPower(), "W");
}
public EditInfo getEditInfo(int n) {

2
src/com/lushprojects/circuitjs1/client/LampElm.java
View File

@@ -165,7 +165,7 @@ package com.lushprojects.circuitjs1.client;
void getInfo(String arr[]) {
arr[0] = "lamp";
getBasicInfo(arr);
arr[3] = "R = " + getUnitText(resistance, sim.ohmString);
arr[3] = "R = " + getUnitText(resistance, CirSim.ohmString);
arr[4] = "P = " + getUnitText(getPower(), "W");
arr[5] = "T = " + ((int) temp) + " K";
}

2
src/com/lushprojects/circuitjs1/client/MemristorElm.java
View File

@@ -116,7 +116,7 @@ class MemristorElm extends CircuitElm {
void getInfo(String arr[]) {
arr[0] = "memristor";
getBasicInfo(arr);
arr[3] = "R = " + getUnitText(resistance, sim.ohmString);
arr[3] = "R = " + getUnitText(resistance, CirSim.ohmString);
arr[4] = "P = " + getUnitText(getPower(), "W");
}
double getScopeValue(int x) {

6
src/com/lushprojects/circuitjs1/client/OhmMeterElm.java
View File

@@ -21,12 +21,12 @@ public class OhmMeterElm extends CurrentElm {
setPowerColor(g, false);
drawThickCircle(g, center.x, center.y, cr);
drawCenteredText(g, sim.ohmString, center.x, center.y, true);
drawCenteredText(g, CirSim.ohmString, center.x, center.y, true);
setBbox(point1, point2, cr);
doDots(g);
if (sim.showValuesCheckItem.getState() && current != 0) {
String s = getShortUnitText(getVoltageDiff()/current, sim.ohmString);
String s = getShortUnitText(getVoltageDiff()/current, CirSim.ohmString);
if (dx == 0 || dy == 0)
drawValues(g, s, cr);
}
@@ -57,6 +57,6 @@ public class OhmMeterElm extends CurrentElm {
if (current == 0)
arr[1] = "R = \u221e";
else
arr[1] = "R = " + getUnitText(getVoltageDiff()/current, sim.ohmString);
arr[1] = "R = " + getUnitText(getVoltageDiff()/current, CirSim.ohmString);
}
}

6
src/com/lushprojects/circuitjs1/client/PotElm.java
View File

@@ -255,7 +255,7 @@ class PotElm extends CircuitElm implements Command, MouseWheelHandler {
dpx = 0;
dpy = -hs;
}
sim.console("dv " + dpx + " " + w);
CirSim.console("dv " + dpx + " " + w);
if (dpx == 0)
g.drawString(s, xc-w/2, yc-abs(dpy)-2);
else {
@@ -293,8 +293,8 @@ class PotElm extends CircuitElm implements Command, MouseWheelHandler {
void getInfo(String arr[]) {
arr[0] = "potentiometer";
arr[1] = "Vd = " + getVoltageDText(getVoltageDiff());
arr[2] = "R1 = " + getUnitText(resistance1, sim.ohmString);
arr[3] = "R2 = " + getUnitText(resistance2, sim.ohmString);
arr[2] = "R1 = " + getUnitText(resistance1, CirSim.ohmString);
arr[3] = "R2 = " + getUnitText(resistance2, CirSim.ohmString);
arr[4] = "I1 = " + getCurrentDText(current1);
arr[5] = "I2 = " + getCurrentDText(current2);
}

3
src/com/lushprojects/circuitjs1/client/QueryParameters.java
View File

@@ -20,12 +20,11 @@
package com.lushprojects.circuitjs1.client;
import java.util.HashMap;
import java.util.Map;
import com.google.gwt.http.client.URL;
public class QueryParameters
{
private Map map = new HashMap();
private HashMap<String, String> map = new HashMap<String, String>();
public QueryParameters()
{

4
src/com/lushprojects/circuitjs1/client/ResistorElm.java
View File

@@ -99,11 +99,11 @@ import com.google.gwt.canvas.dom.client.CanvasGradient;
void getInfo(String arr[]) {
arr[0] = "resistor";
getBasicInfo(arr);
arr[3] = "R = " + getUnitText(resistance, sim.ohmString);
arr[3] = "R = " + getUnitText(resistance, CirSim.ohmString);
arr[4] = "P = " + getUnitText(getPower(), "W");
}
@Override String getScopeText(int v) {
return sim.LS("resistor") + ", " + getUnitText(resistance, sim.ohmString);
return sim.LS("resistor") + ", " + getUnitText(resistance, CirSim.ohmString);
}
public EditInfo getEditInfo(int n) {
// ohmString doesn't work here on linux

3
src/com/lushprojects/circuitjs1/client/Scope.java
View File

@@ -20,16 +20,13 @@
package com.lushprojects.circuitjs1.client;
import com.google.gwt.event.dom.client.MouseWheelEvent;
import com.google.gwt.safehtml.shared.SafeHtmlUtils;
import com.google.gwt.storage.client.Storage;
import java.util.Vector;
import com.gargoylesoftware.htmlunit.javascript.host.Console;
import com.google.gwt.canvas.client.Canvas;
import com.google.gwt.canvas.dom.client.Context2d;
import com.google.gwt.core.client.GWT;
// plot of single value on a scope
class ScopePlot {

4
src/com/lushprojects/circuitjs1/client/ScopeElm.java
View File

@@ -19,8 +19,6 @@
package com.lushprojects.circuitjs1.client;
import java.util.Vector;
class ScopeElm extends CircuitElm {
Scope elmScope;
@@ -101,7 +99,7 @@ class ScopeElm extends CircuitElm {
void draw(Graphics g) {
g.setColor(needsHighlight() ? selectColor : whiteColor);
g.context.save();
g.context.setTransform(sim.devicePixelRatio(), 0, 0, sim.devicePixelRatio(), 0, 0);
g.context.setTransform(CirSim.devicePixelRatio(), 0, 0, CirSim.devicePixelRatio(), 0, 0);
setScopeRect();
elmScope.position = -1;
elmScope.draw(g);

2
src/com/lushprojects/circuitjs1/client/ScopePropertiesDialog.java
View File

@@ -1,6 +1,5 @@
package com.lushprojects.circuitjs1.client;
import com.google.gwt.core.client.GWT;
import com.google.gwt.dom.client.Style.FontWeight;
import com.google.gwt.event.dom.client.ClickEvent;
import com.google.gwt.event.dom.client.ClickHandler;
@@ -9,7 +8,6 @@ import com.google.gwt.event.logical.shared.ValueChangeHandler;
import com.google.gwt.user.client.Command;
import com.google.gwt.user.client.Window;
import com.google.gwt.user.client.ui.Button;
import com.google.gwt.user.client.ui.DialogBox;
import com.google.gwt.user.client.ui.FlowPanel;
import com.google.gwt.user.client.ui.FocusWidget;
import com.google.gwt.user.client.ui.Grid;

11
src/com/lushprojects/circuitjs1/client/SearchDialog.java
View File

@@ -19,8 +19,6 @@
package com.lushprojects.circuitjs1.client;
import com.google.gwt.user.client.ui.DialogBox;
import com.google.gwt.user.client.ui.FlexTable;
import com.google.gwt.user.client.ui.HasHorizontalAlignment;
import com.google.gwt.user.client.ui.HorizontalPanel;
import com.google.gwt.user.client.ui.TextArea;
@@ -29,25 +27,16 @@ import com.google.gwt.user.client.ui.Button;
import com.google.gwt.user.client.ui.VerticalPanel;
import com.google.gwt.event.dom.client.ClickHandler;
import com.google.gwt.event.dom.client.DoubleClickEvent;
import com.google.gwt.event.dom.client.KeyDownEvent;
import com.google.gwt.event.dom.client.KeyUpEvent;
import java.util.Vector;
import java.util.Collections;
import java.util.Comparator;
import com.google.gwt.event.dom.client.ChangeEvent;
import com.google.gwt.event.dom.client.ChangeHandler;
import com.google.gwt.event.dom.client.KeyUpHandler;
import com.google.gwt.event.dom.client.KeyDownHandler;
import com.google.gwt.event.dom.client.DoubleClickHandler;
import com.google.gwt.event.logical.shared.ValueChangeEvent;
import com.google.gwt.event.logical.shared.ValueChangeHandler;
import com.google.gwt.event.dom.client.ClickEvent;
import com.google.gwt.user.client.ui.Label;
import com.google.gwt.user.client.ui.ListBox;
import com.google.gwt.user.client.ui.ScrollPanel;
import com.google.gwt.safehtml.shared.SafeHtml;
public class SearchDialog extends Dialog {

3
src/com/lushprojects/circuitjs1/client/ShortcutsDialog.java
View File

@@ -19,7 +19,6 @@
package com.lushprojects.circuitjs1.client;
import com.google.gwt.user.client.ui.DialogBox;
import com.google.gwt.user.client.ui.FlexTable;
import com.google.gwt.user.client.ui.HasHorizontalAlignment;
import com.google.gwt.user.client.ui.HorizontalPanel;
@@ -34,9 +33,7 @@ import java.util.Vector;
import com.google.gwt.event.dom.client.ChangeEvent;
import com.google.gwt.event.dom.client.ChangeHandler;
import com.google.gwt.event.dom.client.ClickEvent;
import com.google.gwt.user.client.ui.Label;
import com.google.gwt.user.client.ui.ScrollPanel;
import com.google.gwt.safehtml.shared.SafeHtml;
public class ShortcutsDialog extends Dialog {

6
src/com/lushprojects/circuitjs1/client/SliderDialog.java
View File

@@ -20,8 +20,6 @@
package com.lushprojects.circuitjs1.client;
import com.google.gwt.user.client.ui.DialogBox;
import com.google.gwt.user.client.ui.HTML;
import com.google.gwt.user.client.ui.Button;
import com.google.gwt.user.client.ui.VerticalPanel;
import com.google.gwt.user.client.ui.HorizontalPanel;
@@ -172,7 +170,7 @@ class SliderDialog extends Dialog {
// continue;
try {
adj.sliderText = ei.labelBox == null ? "" : ei.labelBox.getText();
sim.console("slidertext " + adj.sliderText + " " + ei.labelBox);
CirSim.console("slidertext " + adj.sliderText + " " + ei.labelBox);
if (adj.label != null)
adj.label.setText(adj.sliderText);
double d = EditDialog.parseUnits(ei.minBox.getText());
@@ -180,7 +178,7 @@ class SliderDialog extends Dialog {
d = EditDialog.parseUnits(ei.maxBox.getText());
adj.maxValue = d;
adj.setSliderValue(ei.value);
} catch (Exception e) { sim.console(e.toString()); }
} catch (Exception e) { CirSim.console(e.toString()); }
}
}

4
src/com/lushprojects/circuitjs1/client/SparkGapElm.java
View File

@@ -103,8 +103,8 @@ class SparkGapElm extends CircuitElm {
arr[0] = "spark gap";
getBasicInfo(arr);
arr[3] = state ? "on" : "off";
arr[4] = "Ron = " + getUnitText(onresistance, sim.ohmString);
arr[5] = "Roff = " + getUnitText(offresistance, sim.ohmString);
arr[4] = "Ron = " + getUnitText(onresistance, CirSim.ohmString);
arr[5] = "Roff = " + getUnitText(offresistance, CirSim.ohmString);
arr[6] = "Vbreakdown = " + getUnitText(breakdown, "V");
}
public EditInfo getEditInfo(int n) {

2
src/com/lushprojects/circuitjs1/client/ThermistorNTCElm.java
View File

@@ -173,7 +173,7 @@ class ThermistorNTCElm extends CircuitElm implements Command, MouseWheelHandler
arr[0] = "thermistor";
arr[1] = "I = "+ getCurrentDText(current); //getBasicInfo(arr);
arr[2] = "Vd = "+ getVoltageDText(getVoltageDiff());
arr[3] = "R = " + getUnitText(resistance, sim.ohmString);
arr[3] = "R = " + getUnitText(resistance, CirSim.ohmString);
arr[4] = "P = " + getUnitText(getPower(), "W");
arr[5] = "T = " + getUnitText(temperature, "\u00b0C");
}

2
src/com/lushprojects/circuitjs1/client/TransLineElm.java
View File

@@ -212,7 +212,7 @@ class TransLineElm extends CircuitElm {
}
void getInfo(String arr[]) {
arr[0] = "transmission line";
arr[1] = getUnitText(imped, sim.ohmString);
arr[1] = getUnitText(imped, CirSim.ohmString);
// use velocity factor for RG-58 cable (65%)
arr[2] = "length = " + getUnitText(.65*2.9979e8*delay, "m");
arr[3] = "delay = " + getUnitText(delay, "s");

5
src/com/lushprojects/circuitjs1/client/UnijunctionElm.java
View File

@@ -19,11 +19,6 @@
package com.lushprojects.circuitjs1.client;
import java.util.Vector;
import com.google.gwt.user.client.Window;
import com.google.gwt.user.client.ui.Button;
class UnijunctionElm extends CompositeElm {
// node 0 = E
// node 1 = B1

2
src/com/lushprojects/circuitjs1/client/VoltageElm.java
View File

@@ -294,7 +294,7 @@ class VoltageElm extends CircuitElm {
getUnitText(2.9979e8/frequency, "m");
}
if (waveform == WF_DC && current != 0 && sim.showResistanceInVoltageSources)
arr[i++] = "(R = " + getUnitText(maxVoltage/current, sim.ohmString) + ")";
arr[i++] = "(R = " + getUnitText(maxVoltage/current, CirSim.ohmString) + ")";
arr[i++] = "P = " + getUnitText(getPower(), "W");
}
public EditInfo getEditInfo(int n) {

2
src/com/lushprojects/circuitjs1/client/ZenerElm.java
View File

@@ -19,8 +19,6 @@
package com.lushprojects.circuitjs1.client;
import com.google.gwt.user.client.Window;
// Zener code contributed by J. Mike Rollins
// http://www.camotruck.net/rollins/simulator.html
class ZenerElm extends DiodeElm {

1
src/com/lushprojects/circuitjs1/client/circuitjs1.java
View File

@@ -32,7 +32,6 @@ import com.google.gwt.http.client.RequestException;
import com.google.gwt.http.client.Response;
import com.google.gwt.storage.client.Storage;
import com.google.gwt.user.client.Window;
import com.google.gwt.user.client.Window.ClosingEvent;
public class circuitjs1 implements EntryPoint {