From 981aee4c14d73077804347c11fbde3f287a8d695 Mon Sep 17 00:00:00 2001 From: GauravSupal Date: Tue, 5 May 2015 10:59:19 +0000 Subject: [PATCH] Analog Models Added --- src/configuration/Appconfig.pyc | Bin 1388 -> 1391 bytes src/configuration/__init__.pyc | Bin 143 -> 144 bytes src/frontEnd/Application.py | 1 - src/frontEnd/ProjectExplorer.pyc | Bin 3009 -> 3015 bytes src/frontEnd/ViewManagement.py | 2 +- src/frontEnd/ViewManagement.pyc | Bin 2902 -> 2875 bytes src/frontEnd/Workspace.pyc | Bin 3526 -> 3533 bytes src/modelParamXML/Analog/aswitch.xml | 14 ++++++++++++++ src/modelParamXML/Analog/climit.xml | 15 +++++++++++++++ src/modelParamXML/Analog/d_dt.xml | 14 ++++++++++++++ src/modelParamXML/Analog/divide.xml | 18 ++++++++++++++++++ src/modelParamXML/Analog/gain.xml | 2 +- src/modelParamXML/Analog/hyst.xml | 16 ++++++++++++++++ src/modelParamXML/Analog/ilimit.xml | 19 +++++++++++++++++++ src/modelParamXML/Analog/int.xml | 15 +++++++++++++++ src/modelParamXML/Analog/limit.xml | 15 +++++++++++++++ src/modelParamXML/Analog/mult.xml | 13 +++++++++++++ src/modelParamXML/Analog/slew.xml | 12 ++++++++++++ src/modelParamXML/Analog/summer.xml | 10 +++++----- src/modelParamXML/Analog/zener.xml | 14 ++++++++++++++ src/projManagement/Kicad.pyc | Bin 4302 -> 4309 bytes src/projManagement/Validation.pyc | Bin 2397 -> 2404 bytes src/projManagement/Worker.pyc | Bin 1501 -> 1507 bytes src/projManagement/__init__.pyc | Bin 144 -> 145 bytes src/projManagement/newProject.pyc | Bin 3743 -> 3749 bytes src/projManagement/openProject.pyc | Bin 1767 -> 1771 bytes 26 files changed, 172 insertions(+), 8 deletions(-) create mode 100644 src/modelParamXML/Analog/aswitch.xml create mode 100644 src/modelParamXML/Analog/climit.xml create mode 100644 src/modelParamXML/Analog/d_dt.xml create mode 100644 src/modelParamXML/Analog/divide.xml create mode 100644 src/modelParamXML/Analog/hyst.xml create mode 100644 src/modelParamXML/Analog/ilimit.xml create mode 100644 src/modelParamXML/Analog/int.xml create mode 100644 src/modelParamXML/Analog/limit.xml create mode 100644 src/modelParamXML/Analog/mult.xml create mode 100644 src/modelParamXML/Analog/slew.xml create mode 100644 src/modelParamXML/Analog/zener.xml diff --git a/src/configuration/Appconfig.pyc b/src/configuration/Appconfig.pyc index 7d047db573c37c642ea8cca5528c9d62f87afb3d..9e78df71ce73e5f820a0e3b2a84ce8bd98cd22af 100644 GIT binary patch delta 94 zcmaFE^`48J`7_N;zRtyXb`WgATsru=OrA3Kl`sJImm?apoh)>R9)}4HS NB^0}q&g39gDF7HS8^Ztq delta 91 zcmaFQ^@fX``7_Nh($ delta 36 rcmbQh*w4t${F#^Qn6BMKb~8Z>1_lQGjQreG{j|i4%v}BOiT;iNuwe=@ diff --git a/src/frontEnd/Application.py b/src/frontEnd/Application.py index ae92939b4..9c845ed46 100755 --- a/src/frontEnd/Application.py +++ b/src/frontEnd/Application.py @@ -29,7 +29,6 @@ import sys import time import subprocess -import TestView class Application(QtGui.QMainWindow): diff --git a/src/frontEnd/ProjectExplorer.pyc b/src/frontEnd/ProjectExplorer.pyc index fe22b7f0c5d508db21e33f63674f6888fd84bb3c..392fa27ba851b4c2774aaa994777d01141b4475c 100644 GIT binary patch delta 175 zcmX>oeq5ZL`7@qAu)(i{``WgATsru=OrA3Kl`sI^#IrKIsvFu{TE_V#O cu-;@N&MUa2T)7HxNqyle#xA8hc`3IH0F!St9smFU delta 169 zcmX>ueo&m9`7I)+tL bZ?Y-p6&y02Tm?8}esUFKmC>ENnp*|{e+)0_ diff --git a/src/frontEnd/ViewManagement.py b/src/frontEnd/ViewManagement.py index 2160be8b0..d3269a933 100755 --- a/src/frontEnd/ViewManagement.py +++ b/src/frontEnd/ViewManagement.py @@ -23,7 +23,7 @@ from PyQt4 import QtGui from projManagement.Kicad import Kicad from ProjectExplorer import ProjectExplorer -from Plotting import Plotting + class ViewManagement(QtGui.QSplitter): diff --git a/src/frontEnd/ViewManagement.pyc b/src/frontEnd/ViewManagement.pyc index ef6ae7ee9db8db702fdac49904720803583d4560..6511e9ea9754d36743b347629259fa8e0c5f7169 100644 GIT binary patch delta 424 zcmca6wp&b^`7xNI zUs95pmp<8;*-V=cD4@XzB!aj>EFgvu#W>92+ts*%5=M^6 z``C{#vQKX2&{rhNq{#=EStc`cR&uk0tOWTqhm64;gL zO0fV{$O3UO7m#3MW@F;y0`o>P$A{7UBVgnE)dg GvH$>z%2rGO delta 493 zcmdljc1=v0`7m+C`6nA%&G8hm9eZjUkGSfiZ=RA(e?C zi=82jks*bhp@o5=nSmiPii07AgCSUhb7HN(kOm`Aa|s8K2*}AVDap)B-*~2&QP2`7 zpr4VSo2s9dn30*QA3iydNtcm*ay?TYYY+=ia0FXd<0?fkh6Dg2$Wr4UDq?wJGjfsmeO8*C`7U08kcDqa}?XG}nI delta 197 zcmX>reN392`7 +aswitch +Analog +3 +Add Parameters for Analog Switch +1-NV:2-V + + Enter Control OFF value (default=0.0) + Enter Control ON value(default=1.0) + Enter OFF Resistance (default=1.0e12) + Enter ON Resistance (default=1.0) + Enter Log (default=TRUE) + + diff --git a/src/modelParamXML/Analog/climit.xml b/src/modelParamXML/Analog/climit.xml new file mode 100644 index 000000000..0d1f9c7e6 --- /dev/null +++ b/src/modelParamXML/Analog/climit.xml @@ -0,0 +1,15 @@ + +climit +Analog +4 +Add Parameters for Controlled Limiter +None + + Enter offset for Input (default=0.0) + Enter value for Gain (default=1.0) + Enter Output Upper Delta (default=0.0) + Enter Output Lower Delta (default=0.0) + Enter Limit Range (default=1.0e-6) + Enter Fraction (default=false) + + \ No newline at end of file diff --git a/src/modelParamXML/Analog/d_dt.xml b/src/modelParamXML/Analog/d_dt.xml new file mode 100644 index 000000000..654943925 --- /dev/null +++ b/src/modelParamXML/Analog/d_dt.xml @@ -0,0 +1,14 @@ + +d_dt +Analog +2 +Add Parameters for Differentiator +None + + Enter value for Gain (default=1.0) + Enter offset for Output (default=0.0) + Enter Output Lower Limit (default=0.0) + Enter Output Upper Limit (default=1.0) + Enter Limit Range (default=1.0e-6) + + diff --git a/src/modelParamXML/Analog/divide.xml b/src/modelParamXML/Analog/divide.xml new file mode 100644 index 000000000..d501ae4e4 --- /dev/null +++ b/src/modelParamXML/Analog/divide.xml @@ -0,0 +1,18 @@ + +divide +Analog +3 +Add Parameters for Multiplier +None + + Enter offset for Numerator (default=0.0) + Enter gain for Numerator (default=1.0) + Enter offset for Denominator (default=0.0) + Enter gain for Denominator (default=1.0) + Enter Denominator Lower Limit (default=1.0e-10) + Enter Denominator Domain (default=1.0e-10) + Enter Fraction (default=false) + Enter gain for output (default=1.0) + Enter offset for output (default=0.0) + + diff --git a/src/modelParamXML/Analog/gain.xml b/src/modelParamXML/Analog/gain.xml index 20f00004e..ff71d46a6 100644 --- a/src/modelParamXML/Analog/gain.xml +++ b/src/modelParamXML/Analog/gain.xml @@ -2,7 +2,7 @@ gain Analog 2 -Add Parameter for model gain +Add Parameters for model Gain None Enter offset for input (default=0.0) diff --git a/src/modelParamXML/Analog/hyst.xml b/src/modelParamXML/Analog/hyst.xml new file mode 100644 index 000000000..56a60c0f9 --- /dev/null +++ b/src/modelParamXML/Analog/hyst.xml @@ -0,0 +1,16 @@ + +hyst +Analog +2 +Add Parameters for Hysteresis +None + + Enter Input Low Value (default=0.0) + Enter Input High Value (default=1.0) + Enter Hysteresis (default=0.1) + Enter Output Lower Limit (default=0.0) + Enter Output Upper Limit (default=1.0) + Enter Input Domain Value (default=0.01) + Enter Fraction (default=TRUE) + + diff --git a/src/modelParamXML/Analog/ilimit.xml b/src/modelParamXML/Analog/ilimit.xml new file mode 100644 index 000000000..32b2149f0 --- /dev/null +++ b/src/modelParamXML/Analog/ilimit.xml @@ -0,0 +1,19 @@ + +ilimit +Analog +4 +Add Parameters for Current Limiter +None + + Enter offset for Input (default=0.0) + Enter value for Gain (default=1.0) + Enter value for Sourcing Resistance (default=1.0) + Enter value for Sinking Resistance (default=1.0) + Enter Current Sourcing Limit (default=1.0e-12) + Enter Current Sinking Limit (default=1.0e-12) + Enter Power Supply Range (default=1.0e-6) + Enter Current Sourcing Range (default=1.0e-9) + Enter Current Sinking Range (default=1.0e-9) + Enter Voltage Delta Range (default=1.0e-9) + + diff --git a/src/modelParamXML/Analog/int.xml b/src/modelParamXML/Analog/int.xml new file mode 100644 index 000000000..6ccec625a --- /dev/null +++ b/src/modelParamXML/Analog/int.xml @@ -0,0 +1,15 @@ + +int +Analog +2 +Add Parameters for int +None + + Enter offset for Input (default=0.0) + Enter value for Gain (default=1.0) + Enter Output Lower Limit (default=0.0) + Enter Output Upper Limit (default=1.0) + Enter Limit Range (default=1.0e-6) + Enter Output Initial Condition (default=0.0) + + diff --git a/src/modelParamXML/Analog/limit.xml b/src/modelParamXML/Analog/limit.xml new file mode 100644 index 000000000..c2a1f3829 --- /dev/null +++ b/src/modelParamXML/Analog/limit.xml @@ -0,0 +1,15 @@ + +limit +Analog +2 +Add Parameters for Limiter +None + + Enter offset for Input (default=0.0) + Enter value for Gain (default=1.0) + Enter Output Lower Limit (default=0.0) + Enter Output Upper Limit (default=1.0) + Enter Limit Range (default=1.0e-6) + Enter Fraction (default=false) + + diff --git a/src/modelParamXML/Analog/mult.xml b/src/modelParamXML/Analog/mult.xml new file mode 100644 index 000000000..e41463ff6 --- /dev/null +++ b/src/modelParamXML/Analog/mult.xml @@ -0,0 +1,13 @@ + +mult +Analog +3 +Add Parameters for Multiplier +2-V:1-NV + + Enter offset for input (default=0.0) + Enter gain for input(default=1.0) + Enter gain for output (default=1.0) + Enter offset for output (default=0.0) + + diff --git a/src/modelParamXML/Analog/slew.xml b/src/modelParamXML/Analog/slew.xml new file mode 100644 index 000000000..2eafde2dd --- /dev/null +++ b/src/modelParamXML/Analog/slew.xml @@ -0,0 +1,12 @@ + +slew +Analog +2 +Add Parameters for slew +None + + Enter Rising Slope Value (default=1.0e9) + Enter Falling Slope Value (default=1.0e9) + Enter Range (default=0.1) + + diff --git a/src/modelParamXML/Analog/summer.xml b/src/modelParamXML/Analog/summer.xml index 5f8b3d524..d9856b621 100644 --- a/src/modelParamXML/Analog/summer.xml +++ b/src/modelParamXML/Analog/summer.xml @@ -2,12 +2,12 @@ summer Analog 3 -Add parameters for Summer +Add Parameters for Summer 2-V:1-NV - Enter offset for input (default=0.0): - Enter gain for input(default=1.0): - Enter gain for output (default=1.0): - Enter offset for output (default=0.0): + Enter offset for input (default=0.0) + Enter gain for input(default=1.0) + Enter gain for output (default=1.0) + Enter offset for output (default=0.0) diff --git a/src/modelParamXML/Analog/zener.xml b/src/modelParamXML/Analog/zener.xml new file mode 100644 index 000000000..c6e32c362 --- /dev/null +++ b/src/modelParamXML/Analog/zener.xml @@ -0,0 +1,14 @@ + +zener +Analog +2 +Add Parameters for Zener Diode +None + + Enter Breakdown Voltage (default=5.6) + Enter Breakdown Current (default=2.0e-2) + Enter Saturation Current (default=1.0e-12) + Enter Forward Emission Coefficient (default=1.0) + Enter Switch for Limiting (default=FALSE) + + diff --git a/src/projManagement/Kicad.pyc b/src/projManagement/Kicad.pyc index 3cb015de124cb7539e33ec70a3762250e9132398..7f977180f715d93489fbe52798eb71a859089e52 100644 GIT binary patch delta 205 zcmX@7cvX>|`7`7e tgI$Nw=7}6TuuExeZsjhaIavSz diff --git a/src/projManagement/Validation.pyc b/src/projManagement/Validation.pyc index a1bbf393eae1a52bedefcb09ba7b2146ccc5e65e..54ae7db1fd935145db00dce1abb8ee4e8f34af76 100644 GIT binary patch delta 205 zcmcaB^hAiA`7`NJiY#10A^fU5vQ}xpmON$cA^vfqFvgvPr!#D}2+&*SM noN_*_EZF2WC$eQ?69?HfnTw+WyEF7AALMYxE~P)&g;Np$v5q|d delta 198 zcmaDNbXSO-`7`NI1tr-{?^fU5vQ}xplGct4a!zWK<*5CY=aS|4(%@dhx mu?T~8__MO$lA6M1g+ppGKSu>t7wAns&f$zzMt`z5rz8No^*QnY diff --git a/src/projManagement/Worker.pyc b/src/projManagement/Worker.pyc index 4f8652b7713086af207444c2c68f3b8a99de0457..b8f921e36495242e2685f943a079a7b04b38f996 100644 GIT binary patch delta 174 zcmcc1{g|7b`7?;|CEEpIV^fU5vQ}xpmON$cA^vfq7WbDK)tTnlnX*w>c baOM}-rL-qkv!vjXl4i}uE~Pd3Agc@jsfITg delta 169 zcmaFNeV3b^`7?;`s%^4UN^fU5vQ}xplGct4a!zUXsYfXN`7>`v(dvXWU fG)$Sz2FyaZjH+Wv#nb?{M4mMVtBm&K6RgqzB_c2H diff --git a/src/projManagement/__init__.pyc b/src/projManagement/__init__.pyc index 2f39d337b4a2ce59138f700676eb05f5c96e8957..a5c33b528923ebce69c5730d40a3b5770a0979d4 100644 GIT binary patch delta 37 scmbQhIFXT^`7}En%3=9nV8Tq-X`ss}G%i ijfD-HoIKBQY{L3X`jgdo6L3i#-3Aya_mDPV?4amC>8r&L;-|P@FEk diff --git a/src/projManagement/openProject.pyc b/src/projManagement/openProject.pyc index 49ac9b288f9963840c145440bf166be683a04d34..c4b544ae15a6ce31e0124a70eb6920bb17b57b54 100644 GIT binary patch delta 121 zcmaFP`9 delta 117 zcmaFO`<$1Z`7