Analog Models Added

26 files changed, 172 insertions, 8 deletions

diff --git a/src/configuration/Appconfig.pyc b/src/configuration/Appconfig.pyc
index 7d047db5..9e78df71 100644
--- a/src/configuration/Appconfig.pyc
+++ b/src/configuration/Appconfig.pyc
diff --git a/src/configuration/__init__.pyc b/src/configuration/__init__.pyc
index 4997c274..5d054b24 100644
--- a/src/configuration/__init__.pyc
+++ b/src/configuration/__init__.pyc
diff --git a/src/frontEnd/Application.py b/src/frontEnd/Application.py
index ae92939b..9c845ed4 100755
--- a/src/frontEnd/Application.py
+++ b/src/frontEnd/Application.py
@@ -29,7 +29,6 @@ import Workspace
 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 fe22b7f0..392fa27b 100644
--- a/src/frontEnd/ProjectExplorer.pyc
+++ b/src/frontEnd/ProjectExplorer.pyc
diff --git a/src/frontEnd/ViewManagement.py b/src/frontEnd/ViewManagement.py
index 2160be8b..d3269a93 100755
--- a/src/frontEnd/ViewManagement.py
+++ b/src/frontEnd/ViewManagement.py
@@ -23,7 +23,7 @@ from PyQt4 import QtCore
 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 ef6ae7ee..6511e9ea 100644
--- a/src/frontEnd/ViewManagement.pyc
+++ b/src/frontEnd/ViewManagement.pyc
diff --git a/src/frontEnd/Workspace.pyc b/src/frontEnd/Workspace.pyc
index 935ed8d5..576e6ba1 100644
--- a/src/frontEnd/Workspace.pyc
+++ b/src/frontEnd/Workspace.pyc
diff --git a/src/modelParamXML/Analog/aswitch.xml b/src/modelParamXML/Analog/aswitch.xml
new file mode 100644
index 00000000..fe50ecd3
--- /dev/null
+++ b/src/modelParamXML/Analog/aswitch.xml
@@ -0,0 +1,14 @@
+<model>
+<name>aswitch</name>
+<type>Analog</type>
+<node_number>3</node_number>
+<title>Add Parameters for Analog Switch</title>
+<split>1-NV:2-V</split>
+<param>
+	<cntl_off default="0.0">Enter Control OFF value (default=0.0)</cntl_off>
+	<cntl_on default="1.0">Enter Control ON value(default=1.0)</cntl_on>
+	<r_off default="1.0e12">Enter OFF Resistance (default=1.0e12)</r_off>
+	<r_on default="1.0">Enter ON Resistance (default=1.0)</r_on>
+	<log default="TRUE">Enter Log (default=TRUE)</log>
+</param>
+</model>
diff --git a/src/modelParamXML/Analog/climit.xml b/src/modelParamXML/Analog/climit.xml
new file mode 100644
index 00000000..0d1f9c7e
--- /dev/null
+++ b/src/modelParamXML/Analog/climit.xml
@@ -0,0 +1,15 @@
+<model>
+<name>climit</name>
+<type>Analog</type>
+<node_number>4</node_number>
+<title>Add Parameters for Controlled Limiter</title>
+<split>None</split>
+<param>
+	<in_offset default="0.0">Enter offset for Input (default=0.0)</in_offset>
+	<gain default="1.0">Enter value for Gain (default=1.0)</gain>
+	<upper_delta default="0.0">Enter Output Upper Delta (default=0.0)</upper_delta>
+	<lower_delta default="0.0">Enter Output Lower Delta (default=0.0)</lower_delta>
+	<limit_range default="1.0e-6">Enter Limit Range (default=1.0e-6)</limit_range>
+	<fraction default="false">Enter Fraction (default=false)</fraction>
+</param>
+</model>
\ 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 00000000..65494392
--- /dev/null
+++ b/src/modelParamXML/Analog/d_dt.xml
@@ -0,0 +1,14 @@
+<model>
+<name>d_dt</name>
+<type>Analog</type>
+<node_number>2</node_number>
+<title>Add Parameters for Differentiator</title>
+<split>None</split>
+<param>
+	<gain default="1.0">Enter value for Gain (default=1.0)</gain>
+	<out_offset default="0.0">Enter offset for Output (default=0.0)</out_offset>
+	<out_lower_limit default="0.0">Enter Output Lower Limit (default=0.0)</out_lower_limit>
+	<out_upper_limit default="1.0">Enter Output Upper Limit (default=1.0)</out_upper_limit>
+	<limit_range default="1.0e-6">Enter Limit Range (default=1.0e-6)</limit_range>
+</param>
+</model>
diff --git a/src/modelParamXML/Analog/divide.xml b/src/modelParamXML/Analog/divide.xml
new file mode 100644
index 00000000..d501ae4e
--- /dev/null
+++ b/src/modelParamXML/Analog/divide.xml
@@ -0,0 +1,18 @@
+<model>
+<name>divide</name>
+<type>Analog</type>
+<node_number>3</node_number>
+<title>Add Parameters for Multiplier</title>
+<split>None</split>
+<param>
+	<num_offset default="0.0">Enter offset for Numerator (default=0.0)</num_offset>
+	<num_gain default="1.0">Enter gain for Numerator (default=1.0)</num_gain>
+	<den_offset default="0.0">Enter offset for Denominator (default=0.0)</den_offset>
+	<den_gain default="1.0">Enter gain for Denominator (default=1.0)</den_gain>
+	<den_lower_limit default="1.0e-10">Enter Denominator Lower Limit (default=1.0e-10)</den_lower_limit>
+	<den_domain default="1.0e-10">Enter Denominator Domain (default=1.0e-10)</den_domain>
+	<fraction default="false">Enter Fraction (default=false)</fraction>
+	<out_gain default="1.0">Enter gain for output (default=1.0)</out_gain>
+	<out_offset default="0.0">Enter offset for output (default=0.0)</out_offset>
+</param>
+</model>
diff --git a/src/modelParamXML/Analog/gain.xml b/src/modelParamXML/Analog/gain.xml
index 20f00004..ff71d46a 100644
--- a/src/modelParamXML/Analog/gain.xml
+++ b/src/modelParamXML/Analog/gain.xml
@@ -2,7 +2,7 @@
 <name>gain</name>
 <type>Analog</type>
 <node_number>2</node_number>
-<title>Add Parameter for model gain</title>
+<title>Add Parameters for model Gain</title>
 <split>None</split>
 <param>
 	<in_offset default="0.0">Enter offset for input (default=0.0)</in_offset>
diff --git a/src/modelParamXML/Analog/hyst.xml b/src/modelParamXML/Analog/hyst.xml
new file mode 100644
index 00000000..56a60c0f
--- /dev/null
+++ b/src/modelParamXML/Analog/hyst.xml
@@ -0,0 +1,16 @@
+<model>
+<name>hyst</name>
+<type>Analog</type>
+<node_number>2</node_number>
+<title>Add Parameters for Hysteresis</title>
+<split>None</split>
+<param>
+	<in_low default="0.0">Enter Input Low Value (default=0.0)</in_low>
+	<in_high default="1.0">Enter Input High Value (default=1.0)</in_high>
+	<hyst default="0.1">Enter Hysteresis (default=0.1)</hyst>
+	<out_lower_limit default="0.0">Enter Output Lower Limit (default=0.0)</out_lower_limit>
+	<out_upper_limit default="1.0">Enter Output Upper Limit (default=1.0)</out_upper_limit>
+	<input_domain default="0.01">Enter Input Domain Value (default=0.01)</input_domain>
+	<fraction default="TRUE">Enter Fraction (default=TRUE)</fraction>
+</param>
+</model>
diff --git a/src/modelParamXML/Analog/ilimit.xml b/src/modelParamXML/Analog/ilimit.xml
new file mode 100644
index 00000000..32b2149f
--- /dev/null
+++ b/src/modelParamXML/Analog/ilimit.xml
@@ -0,0 +1,19 @@
+<model>
+<name>ilimit</name>
+<type>Analog</type>
+<node_number>4</node_number>
+<title>Add Parameters for Current Limiter </title>
+<split>None</split>
+<param>
+	<in_offset default="0.0">Enter offset for Input (default=0.0)</in_offset>
+	<gain default="1.0">Enter value for Gain (default=1.0)</gain>
+	<r_out_source default="1.0">Enter value for Sourcing Resistance (default=1.0)</r_out_source>
+	<r_out_sink default="1.0">Enter value for Sinking Resistance (default=1.0)</r_out_sink>
+	<i_limit_source default="1.0e-12">Enter Current Sourcing Limit (default=1.0e-12)</i_limit_source>
+	<i_limit_sink default="1.0e-12">Enter Current Sinking Limit (default=1.0e-12)</i_limit_sink>
+	<v_pwr_range default="1.0e-6">Enter Power Supply Range (default=1.0e-6)</v_pwr_range>
+	<i_source_range default="1.0e-9">Enter Current Sourcing Range (default=1.0e-9)</i_source_range>
+	<i_sink_range default="1.0e-9">Enter Current Sinking Range (default=1.0e-9)</i_sink_range>
+	<r_out_domain default="1.0e-9">Enter Voltage Delta Range (default=1.0e-9)</r_out_domain>	
+</param>
+</model>
diff --git a/src/modelParamXML/Analog/int.xml b/src/modelParamXML/Analog/int.xml
new file mode 100644
index 00000000..6ccec625
--- /dev/null
+++ b/src/modelParamXML/Analog/int.xml
@@ -0,0 +1,15 @@
+<model>
+<name>int</name>
+<type>Analog</type>
+<node_number>2</node_number>
+<title>Add Parameters for int</title>
+<split>None</split>
+<param>
+	<in_offset default="0.0">Enter offset for Input (default=0.0)</in_offset>
+	<gain default="1.0">Enter value for Gain (default=1.0)</gain>
+	<out_lower_limit default="0.0">Enter Output Lower Limit (default=0.0)</out_lower_limit>
+	<out_upper_limit default="1.0">Enter Output Upper Limit (default=1.0)</out_upper_limit>
+	<limit_range default="1.0e-6">Enter Limit Range (default=1.0e-6)</limit_range>
+	<out_ic default="0.0">Enter Output Initial Condition (default=0.0)</out_ic>
+</param>
+</model>
diff --git a/src/modelParamXML/Analog/limit.xml b/src/modelParamXML/Analog/limit.xml
new file mode 100644
index 00000000..c2a1f382
--- /dev/null
+++ b/src/modelParamXML/Analog/limit.xml
@@ -0,0 +1,15 @@
+<model>
+<name>limit</name>
+<type>Analog</type>
+<node_number>2</node_number>
+<title>Add Parameters for Limiter</title>
+<split>None</split>
+<param>
+	<in_offset default="0.0">Enter offset for Input (default=0.0)</in_offset>
+	<gain default="1.0">Enter value for Gain (default=1.0)</gain>
+	<out_lower_limit default="0.0">Enter Output Lower Limit (default=0.0)</out_lower_limit>
+	<out_upper_limit default="1.0">Enter Output Upper Limit (default=1.0)</out_upper_limit>
+	<limit_range default="1.0e-6">Enter Limit Range (default=1.0e-6)</limit_range>
+	<fraction default="false">Enter Fraction (default=false)</fraction>
+</param>
+</model>
diff --git a/src/modelParamXML/Analog/mult.xml b/src/modelParamXML/Analog/mult.xml
new file mode 100644
index 00000000..e41463ff
--- /dev/null
+++ b/src/modelParamXML/Analog/mult.xml
@@ -0,0 +1,13 @@
+<model>
+<name>mult</name>
+<type>Analog</type>
+<node_number>3</node_number>
+<title>Add Parameters for Multiplier</title>
+<split>2-V:1-NV</split>
+<param>
+	<in_offset vector="2" default="0.0">Enter offset for input (default=0.0)</in_offset>
+	<in_gain vector="2" default="1.0">Enter gain for input(default=1.0)</in_gain>
+	<out_gain default="1.0">Enter gain for output (default=1.0)</out_gain>
+	<out_offset default="0.0">Enter offset for output (default=0.0)</out_offset>
+</param>
+</model>
diff --git a/src/modelParamXML/Analog/slew.xml b/src/modelParamXML/Analog/slew.xml
new file mode 100644
index 00000000..2eafde2d
--- /dev/null
+++ b/src/modelParamXML/Analog/slew.xml
@@ -0,0 +1,12 @@
+<model>
+<name>slew</name>
+<type>Analog</type>
+<node_number>2</node_number>
+<title>Add Parameters for slew</title>
+<split>None</split>
+<param>
+	<rise_slope default="1.0e9">Enter Rising Slope Value (default=1.0e9)</rise_slope>
+	<fall_slop default="1.0e9">Enter Falling Slope Value (default=1.0e9)</fall_slop>
+	<range default="0.1">Enter Range (default=0.1)</range>
+</param>
+</model>
diff --git a/src/modelParamXML/Analog/summer.xml b/src/modelParamXML/Analog/summer.xml
index 5f8b3d52..d9856b62 100644
--- a/src/modelParamXML/Analog/summer.xml
+++ b/src/modelParamXML/Analog/summer.xml
@@ -2,12 +2,12 @@
 <name>summer</name>
 <type>Analog</type>
 <node_number>3</node_number>
-<title>Add parameters for Summer </title>
+<title>Add Parameters for Summer</title>
 <split>2-V:1-NV</split>
 <param>
-	<in_offset vector="2" default="0.0">Enter offset for input (default=0.0):</in_offset>
-	<in_gain vector="2" default="1.0">Enter gain for input(default=1.0):</in_gain>
-	<out_gain default="1.0">Enter gain for output (default=1.0):</out_gain>
-	<out_offset default="0.0">Enter offset for output (default=0.0):</out_offset>
+	<in_offset vector="2" default="0.0">Enter offset for input (default=0.0)</in_offset>
+	<in_gain vector="2" default="1.0">Enter gain for input(default=1.0)</in_gain>
+	<out_gain default="1.0">Enter gain for output (default=1.0)</out_gain>
+	<out_offset default="0.0">Enter offset for output (default=0.0)</out_offset>
 </param>
 </model>
diff --git a/src/modelParamXML/Analog/zener.xml b/src/modelParamXML/Analog/zener.xml
new file mode 100644
index 00000000..c6e32c36
--- /dev/null
+++ b/src/modelParamXML/Analog/zener.xml
@@ -0,0 +1,14 @@
+<model>
+<name>zener</name>
+<type>Analog</type>
+<node_number>2</node_number>
+<title>Add Parameters for Zener Diode</title>
+<split>None</split>
+<param>
+	<v_breakdown default="5.6">Enter Breakdown Voltage (default=5.6)</v_breakdown>
+	<i_breakdown default="2.0e-2">Enter Breakdown Current (default=2.0e-2)</i_breakdown>
+	<i_sat default="1.0e-12">Enter Saturation Current (default=1.0e-12)</i_sat>
+	<n_forward default="1.0">Enter Forward Emission Coefficient (default=1.0)</n_forward>
+	<limit_switch default="FALSE">Enter Switch for Limiting (default=FALSE)</limit_switch>
+</param>
+</model>
diff --git a/src/projManagement/Kicad.pyc b/src/projManagement/Kicad.pyc
index 3cb015de..7f977180 100644
--- a/src/projManagement/Kicad.pyc
+++ b/src/projManagement/Kicad.pyc
diff --git a/src/projManagement/Validation.pyc b/src/projManagement/Validation.pyc
index a1bbf393..54ae7db1 100644
--- a/src/projManagement/Validation.pyc
+++ b/src/projManagement/Validation.pyc
diff --git a/src/projManagement/Worker.pyc b/src/projManagement/Worker.pyc
index 4f8652b7..b8f921e3 100644
--- a/src/projManagement/Worker.pyc
+++ b/src/projManagement/Worker.pyc
diff --git a/src/projManagement/__init__.pyc b/src/projManagement/__init__.pyc
index 2f39d337..a5c33b52 100644
--- a/src/projManagement/__init__.pyc
+++ b/src/projManagement/__init__.pyc
diff --git a/src/projManagement/newProject.pyc b/src/projManagement/newProject.pyc
index a5fbed82..9a413352 100644
--- a/src/projManagement/newProject.pyc
+++ b/src/projManagement/newProject.pyc
diff --git a/src/projManagement/openProject.pyc b/src/projManagement/openProject.pyc
index 49ac9b28..c4b544ae 100644
--- a/src/projManagement/openProject.pyc
+++ b/src/projManagement/openProject.pyc