QuazarTech · vishnu2709 · Jun 27, 2017 · Jun 27, 2017 · Jun 27, 2017 · Jun 27, 2017
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1 @@
+*.pyc
diff --git a/apps/AppGlobalSettings.pyc b/apps/AppGlobalSettings.pyc
diff --git a/apps/Preferences.pyc b/apps/Preferences.pyc
diff --git a/apps/app_menubar.pyc b/apps/app_menubar.pyc
diff --git a/apps/app_toolbar.pyc b/apps/app_toolbar.pyc
diff --git a/apps/menubar.pyc b/apps/menubar.pyc
diff --git a/apps/toolbar.pyc b/apps/toolbar.pyc
diff --git a/apps/widgets/XWidget.pyc b/apps/widgets/XWidget.pyc
diff --git a/lib/Plot2D.pyc b/lib/Plot2D.pyc
diff --git a/lib/XDict.pyc b/lib/XDict.pyc
diff --git a/lib/XMethod.pyc b/lib/XMethod.pyc
diff --git a/lib/XThread.pyc b/lib/XThread.pyc
diff --git a/lib/tkValidatingEntry.pyc b/lib/tkValidatingEntry.pyc
diff --git a/modules/Cryostat/Cryostat.pyc b/modules/Cryostat/Cryostat.pyc
diff --git a/modules/Cryostat/Cryostat_Constants.pyc b/modules/Cryostat/Cryostat_Constants.pyc
diff --git a/modules/Cryostat/Cryostat_Method.pyc b/modules/Cryostat/Cryostat_Method.pyc
diff --git a/modules/Cryostat/Cryostat_UI.pyc b/modules/Cryostat/Cryostat_UI.pyc
diff --git a/modules/app_modules.pyc b/modules/app_modules.pyc
diff --git a/modules/mgps/MGPS_Banner.pyc b/modules/mgps/MGPS_Banner.pyc
diff --git a/modules/mgps/MGPS_Constants.pyc b/modules/mgps/MGPS_Constants.pyc
diff --git a/modules/mgps/MGPS_DataType.pyc b/modules/mgps/MGPS_DataType.pyc
diff --git a/modules/mgps/MGPS_Method.pyc b/modules/mgps/MGPS_Method.pyc
diff --git a/modules/mgps/app_mgps.pyc b/modules/mgps/app_mgps.pyc
diff --git a/modules/mgps/mgps.pyc b/modules/mgps/mgps.pyc
diff --git a/modules/modules.pyc b/modules/modules.pyc
diff --git a/modules/modules_constants.pyc b/modules/modules_constants.pyc
diff --git a/modules/xhires/XHIRES_Banner.pyc b/modules/xhires/XHIRES_Banner.pyc
diff --git a/modules/xhires/XHIRES_Constants.pyc b/modules/xhires/XHIRES_Constants.pyc
diff --git a/modules/xhires/XHIRES_DataType.pyc b/modules/xhires/XHIRES_DataType.pyc
diff --git a/modules/xhires/XHIRES_Method.pyc b/modules/xhires/XHIRES_Method.pyc
diff --git a/modules/xhires/app_xhires.pyc b/modules/xhires/app_xhires.pyc
diff --git a/modules/xhires/xhires.pyc b/modules/xhires/xhires.pyc
diff --git a/modules/xlia/XLIA_Banner.pyc b/modules/xlia/XLIA_Banner.pyc
diff --git a/modules/xlia/XLIA_Constants.pyc b/modules/xlia/XLIA_Constants.pyc
diff --git a/modules/xlia/XLIA_DataType.pyc b/modules/xlia/XLIA_DataType.pyc
diff --git a/modules/xlia/XLIA_Method.pyc b/modules/xlia/XLIA_Method.pyc
diff --git a/modules/xlia/app_xlia.pyc b/modules/xlia/app_xlia.pyc
diff --git a/modules/xlia/xlia.pyc b/modules/xlia/xlia.pyc
diff --git a/modules/xmc/XMC.pyc b/modules/xmc/XMC.pyc
diff --git a/modules/xmc/XMC_Banner.pyc b/modules/xmc/XMC_Banner.pyc
diff --git a/modules/xmc/XMC_Constants.pyc b/modules/xmc/XMC_Constants.pyc
diff --git a/modules/xmc/XMC_DataType.pyc b/modules/xmc/XMC_DataType.pyc
diff --git a/modules/xmc/appXMC.pyc b/modules/xmc/appXMC.pyc
diff --git a/modules/xsmu/XSMU_Banner.pyc b/modules/xsmu/XSMU_Banner.pyc
diff --git a/modules/xsmu/XSMU_Constants.py b/modules/xsmu/XSMU_Constants.py
@@ -17,6 +17,7 @@
 RUN_MODE_VTime              = C = C + 1
 RUN_MODE_IV                 = C = C + 1
 RUN_MODE_RTime              = C = C + 1
+RUN_MODE_IV_TIME_RESOLVED   = C = C + 1
 
 START_RUN                   = C = C + 1
 FINISH_RUN                  = C = C + 1
@@ -31,6 +32,7 @@
 METER_SETTINGS_DIALOG       = C = C + 1
 ACQUISITION_SETTINGS_DIALOG = C = C + 1
 IV_RAMP_SETTINGS_DIALOG     = C = C + 1
+IV_TIME_RESOLVED_RAMP_SETTINGS_DIALOG = C = C + 1
 OHMMETER_SETTINGS_DIALOG    = C = C + 1
 
 APPLY                       = C = C + 1

diff --git a/modules/xsmu/XSMU_Constants.pyc b/modules/xsmu/XSMU_Constants.pyc
diff --git a/modules/xsmu/XSMU_DataType.pyc b/modules/xsmu/XSMU_DataType.pyc
diff --git a/modules/xsmu/XSMU_Method.py b/modules/xsmu/XSMU_Method.py
@@ -71,6 +71,21 @@ def set_IV_RampSettings (self, finalCurrent, finalVoltage, maxPower,
 		}
 
 	# +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+
+	def set_IV_TimeResolvedRampSettings (self, finalCurrent, finalVoltage, maxPower,
+							 currentStep, voltageStep, bipolar, resTrackMode):
+
+		self['IV_RampSettings'] = {
+			'finalCurrent' : finalCurrent,
+			'finalVoltage' : finalVoltage,
+			'maxPower'     : maxPower,
+			'currentStep'  : currentStep,
+			'voltageStep'  : voltageStep,
+			'bipolar'      : bipolar,
+			'resTrackMode' : resTrackMode
+		}
+
+	# +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 
 	def setOhmmeterSettings (self, maxCurrent, maxVoltage,
 							 maxPower, bipolar, resTrackMode):
@@ -172,6 +187,33 @@ def get_IV_RampSettings (self,
 			currentStep, voltageStep, bipolar, resTrackMode)
 
 	# +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+
+	def get_IV_TimeResolvedRampSettings (self,
+							 finalCurrent = None,
+							 finalVoltage = None,
+							 maxPower     = None,
+							 currentStep  = None,
+							 voltageStep  = None,
+							 bipolar      = None,
+							 resTrackMode = None):
+
+		try:
+			settings = self['IV_RampSettings']
+			finalCurrent = settings.get ('finalCurrent' , finalCurrent)
+			finalVoltage = settings.get ('finalVoltage' , finalVoltage)
+			maxPower     = settings.get ('maxPower'     , maxPower    )
+			currentStep  = settings.get ('currentStep'  , currentStep )
+			voltageStep  = settings.get ('voltageStep'  , voltageStep )
+			bipolar      = settings.get ('bipolar'      , bipolar     )
+			resTrackMode = settings.get ('resTrackMode' , resTrackMode)
+
+		except KeyError : pass
+
+		return (
+			finalCurrent, finalVoltage, maxPower,
+			currentStep, voltageStep, bipolar, resTrackMode)
+
+	# +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 
 	def getOhmmeterSettings (self,
 							 maxCurrent   = None,

diff --git a/modules/xsmu/XSMU_Method.pyc b/modules/xsmu/XSMU_Method.pyc