Skip to content

Commit f9ab345

Browse files
28raining28raining
committed
Adding several features
1 parent aa43f16 commit f9ab345

17 files changed

Lines changed: 1893 additions & 663 deletions

File tree

‎circuitSolver/images/shapeGnd.js‎

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,14 @@
22

33
var shapeGnd = draw2d.SVGFigure.extend({
44

5-
init : function(attr)
6-
{
7-
this._super(extend({width:32, height:32},attr));
8-
this.ressvgs = `
9-
<svg xmlns="http://www.w3.org/2000/svg">
10-
<path stroke-linecap="round" stroke="#000" stroke-miterlimit="10" stroke-width="10" d="M29,21v-16m0,16h22q10,0,4,8l-20,32q-6,8,-12,0l-20,-32q-6,-8,4,-8h22" pointer-events="stroke"/>
11-
</svg>`;
12-
},
13-
getSVG: function(){
14-
return this.ressvgs;
15-
}
5+
init: function (attr) {
6+
this._super(extend({ width: 32, height: 32 }, attr));
7+
this.ressvgs = `
8+
<svg xmlns="http://www.w3.org/2000/svg">
9+
<path stroke-linecap="round" stroke="#000" stroke-miterlimit="10" stroke-width="10" d="M29,21v-16m0,16h22q10,0,4,8l-20,32q-6,8,-12,0l-20,-32q-6,-8,4,-8h22" pointer-events="stroke"/>
10+
</svg>`;
11+
},
12+
getSVG: function () {
13+
return this.ressvgs;
14+
}
1615
});

‎circuitSolver/images/shapeIin.js‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
2+
3+
var shapeIin = draw2d.SVGFigure.extend({
4+
5+
init: function (attr) {
6+
this._super(extend({ width: 32, height: 80 }, attr));
7+
this.ressvgs = `
8+
<svg xmlns="http://www.w3.org/2000/svg">
9+
<circle cx="33" cy="64" r="32" fill="#FFF" stroke="#000" stroke-width="10" pointer-events="all"/>
10+
<path stroke-linecap="round" fill="none" stroke="#000" stroke-miterlimit="10" stroke-width="10" d="M33,32v-32m0,112v-16m0,16h22q10,0,4,8l-20,32q-6,8,-12,0l-20,-32q-6,-8,4,-8h22" pointer-events="stroke"/>
11+
<path stroke-linecap="round" fill="none" stroke="#000" stroke-miterlimit="10" d="M33,80v-32m-12,20l12,12m0,0l12,-12" pointer-events="stroke"/>
12+
</svg>
13+
`;
14+
},
15+
getSVG: function () {
16+
return this.ressvgs;
17+
}
18+
});

‎circuitSolver/images/shapeVin.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ var shapeVin = draw2d.SVGFigure.extend({
88
this.ressvgs = `
99
<svg xmlns="http://www.w3.org/2000/svg">
1010
<circle cx="33" cy="64" r="32" fill="#FFF" stroke="#000" stroke-width="10" pointer-events="all"/>
11-
<path fill="none" stroke="#000" stroke-miterlimit="10" d="M33,64v-16m-8,8h16m-16,16h16" pointer-events="stroke"/>
12-
<path fill="none" stroke="#000" stroke-miterlimit="10" stroke-width="10" d="M33,33v-32m0,112v-16m0,16h22q10,0,4,8l-20,32q-6,8,-12,0l-20,-32q-6,-8,4,-8h22" pointer-events="stroke"/>
11+
<path stroke-linecap="round" fill="none" stroke="#000" stroke-miterlimit="10" d="M33,64v-16m-8,8h16m-16,16h16" pointer-events="stroke"/>
12+
<path stroke-linecap="round" fill="none" stroke="#000" stroke-miterlimit="10" stroke-width="10" d="M33,33v-32m0,112v-16m0,16h22q10,0,4,8l-20,32q-6,8,-12,0l-20,-32q-6,-8,4,-8h22" pointer-events="stroke"/>
1313
</svg> `;
1414
},
1515
getSVG: function(){

‎circuitSolver/index.html‎

Lines changed: 62 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -1,61 +1,64 @@
1-
<!doctype html>
1+
<!DOCTYPE html>
22
<html lang="en">
3+
<head>
4+
<meta charset="utf-8" />
5+
<meta name="viewport" content="width=device-width, initial-scale=1" />
6+
<meta name="author" content="Will Kelsey" />
7+
<meta name="description" content="Free Online Circuit Solving Tool" />
8+
<meta
9+
name="keywords"
10+
content="circuit,transfer,laplace,rlc,resistor,inductor,capacitor,solver,solve,free,online,opamp,op-amp,operational,amplifier,frequency,bilinear,transform" />
311

4-
<head>
5-
<meta charset="utf-8">
6-
<meta name="viewport" content="width=device-width, initial-scale=1">
7-
<meta name="author" content="Will Kelsey">
8-
<meta name="description" content="Free Online Circuit Solving Tool">
9-
<meta name="keywords"
10-
content="circuit,transfer,laplace,rlc,resistor,inductor,capacitor,solver,solve,free,online,opamp,op-amp,operational,amplifier,frequency,bilinear,transform">
11-
12-
<title>Circuit Solver</title>
13-
<link href="https://cdn.jsdelivr.net/npm/bootstrap@5.2.1/dist/css/bootstrap.min.css" rel="stylesheet"
14-
integrity="sha384-iYQeCzEYFbKjA/T2uDLTpkwGzCiq6soy8tYaI1GyVh/UjpbCx/TYkiZhlZB6+fzT" crossorigin="anonymous">
15-
<!-- <script src="https://cdn.plot.ly/plotly-2.14.0.min.js"></script> -->
16-
<script src="js/plotly-2.14.0.min.js"></script>
17-
<script src="js/algebrite.bundle-for-browser-min.js"></script>
18-
<!-- <script src="js/algebrite_v1p2.bundle-for-browser-min.js"></script> -->
19-
<script src="js/startupSchematic.js"></script>
20-
<script src="https://fred-wang.github.io/mathml.css/mspace.js"></script>
21-
<script type="module" src="https://unpkg.com/giscus?module"></script>
22-
23-
<!-- <link type="text/css" rel="stylesheet" href="application.css" /> -->
24-
25-
<script src="./js/jquery.js"></script>
26-
<script src="./js/jquery-ui.js"></script>
27-
<script src="./js/jquery.browser.js"></script>
28-
29-
<script src="js/draw2d.js"></script>
30-
<script src="images/shapeRes.js"></script>
31-
<script src="images/shapeCap.js"></script>
32-
<script src="images/shapeGnd.js"></script>
33-
<script src="images/shapeVin.js"></script>
34-
<script src="images/shapeVout.js"></script>
35-
<script src="images/shapeInductor.js"></script>
36-
<script src="images/opAmp.js"></script>
37-
<link href="style.css" rel="stylesheet">
38-
39-
<!-- <script type="module" src="./modules/ciruitToLaplace.mjs"></script> -->
40-
<style>
41-
42-
</style>
43-
<script type="module" src="./modules/main.js"></script>
44-
</head>
45-
46-
<!-- Google tag (gtag.js) -->
47-
<script async src="https://www.googletagmanager.com/gtag/js?id=G-49JWX5SWFL"></script>
48-
<script>
49-
window.dataLayer = window.dataLayer || [];
50-
function gtag(){dataLayer.push(arguments);}
51-
gtag('js', new Date());
52-
53-
gtag('config', 'G-49JWX5SWFL');
54-
</script>
55-
56-
<body>
57-
<div id="app"></div>
58-
</body>
59-
60-
61-
</html>
12+
<title>Circuit Solver</title>
13+
<link href="https://cdn.jsdelivr.net/npm/bootstrap@5.3/dist/css/bootstrap.min.css" rel="stylesheet" crossorigin="anonymous" />
14+
<script
15+
src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.0/dist/js/bootstrap.bundle.min.js"
16+
integrity="sha384-geWF76RCwLtnZ8qwWowPQNguL3RmwHVBC9FhGdlKrxdiJJigb/j/68SIy3Te4Bkz"
17+
crossorigin="anonymous"></script>
18+
<!-- <script src="https://cdn.plot.ly/plotly-2.14.0.min.js"></script> -->
19+
<script src="js/plotly-2.14.0.min.js"></script>
20+
<script src="js/algebrite.bundle-for-browser-min.js"></script>
21+
<script src="js/mathml2latex.js"></script>
22+
<!-- <script src="js/algebrite_v1p2.bundle-for-browser-min.js"></script> -->
23+
<script src="js/startupSchematic.js"></script>
24+
<script src="https://fred-wang.github.io/mathml.css/mspace.js"></script>
25+
<script type="module" src="https://unpkg.com/giscus?module"></script>
26+
27+
<!-- <link type="text/css" rel="stylesheet" href="application.css" /> -->
28+
29+
<script src="./js/jquery.js"></script>
30+
<script src="./js/jquery-ui.min.js"></script>
31+
<script src="./js/jquery.browser.js"></script>
32+
33+
<script src="js/draw2d.js"></script>
34+
<script src="images/shapeRes.js"></script>
35+
<script src="images/shapeCap.js"></script>
36+
<script src="images/shapeGnd.js"></script>
37+
<script src="images/shapeVin.js"></script>
38+
<script src="images/shapeIin.js"></script>
39+
<script src="images/shapeVout.js"></script>
40+
<script src="images/shapeInductor.js"></script>
41+
<script src="images/opAmp.js"></script>
42+
<link href="style.css" rel="stylesheet" />
43+
44+
<!-- <script type="module" src="./modules/ciruitToLaplace.mjs"></script> -->
45+
<style></style>
46+
<script type="module" src="./modules/main.js"></script>
47+
</head>
48+
49+
<!-- Google tag (gtag.js) -->
50+
<script async src="https://www.googletagmanager.com/gtag/js?id=G-49JWX5SWFL"></script>
51+
<script>
52+
window.dataLayer = window.dataLayer || [];
53+
function gtag() {
54+
dataLayer.push(arguments);
55+
}
56+
gtag("js", new Date());
57+
58+
gtag("config", "G-49JWX5SWFL");
59+
</script>
60+
61+
<body>
62+
<div id="app"></div>
63+
</body>
64+
</html>

‎circuitSolver/js/draw2d.js‎

Lines changed: 36 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎circuitSolver/js/jquery-ui.min.js‎

Lines changed: 6 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎circuitSolver/js/jquery.js‎

Lines changed: 2 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)