derConsumer.py and derConsumer.html

dpinney · Apr 23, 2024 · 78055d1 · 78055d1
1 parent d5c0704
commit 78055d1
Show file tree

Hide file tree

Showing 2 changed files with 44 additions and 1 deletion.
diff --git a/omf/models/derConsumer.html b/omf/models/derConsumer.html
@@ -1,6 +1,15 @@
 <head>
 	{{ omfHeaders }}
 	<script src="{{pathPrefix}}/static/highcharts4.src.js"></script>
+	<script src="https://cdn.plot.ly/plotly-1.50.1.min.js"></script>	
+
+
+	<script type="text/javascript">
+		$(window).on('pageshow',function(){
+			Plotly.newPlot('plotDemand', JSON.parse(allOutputData['plotDemand']),JSON.parse(allOutputData['plotlyLayout']));
+		});
+	</script>
+
 </head>
 <body>
 	{{ omfModelTitle }}
@@ -197,6 +206,12 @@
 			</div>
 			{{ omfModelButtons }}
 		</form>
+
+
+
+
+
+
 	</div>
 	{{ omfRunDebugBlock }}
 	{% if modelStatus == 'finished' %}
@@ -220,5 +235,9 @@
 		</div>
 		{{ rawOutputFiles }}
 	</div>
+
+	<p class="reportTitle" style="page-break-before:always">Plotly Test Plot</p>
+	<div id="plotDemand" class="tightContent"></div>
+
 	{% endif %}
 </body>
diff --git a/omf/models/derConsumer.py b/omf/models/derConsumer.py
@@ -9,6 +9,8 @@
 from os.path import join as pJoin
 import numpy as np
 import pandas as pd
+import plotly.graph_objs as go
+import plotly.utils
 
 # OMF imports
 from omf import feeder
@@ -61,11 +63,33 @@ def work(modelDir, inputDict):
 		json.dump(vbatResults, jsonFile)
 	outData.update(vbatResults) ## Update output file with vbat results
 
+
+	## Test plot
+	plotData = []
+	testPlot = go.Scatter(x=np.asarray(outData['tempData']), 
+					 y=np.asarray(outData['tempData']), 
+					 mode='lines+markers',
+					 line=dict(color='blue'),  
+					 marker=dict(color='blue')
+	)
+	layout = go.Layout(
+    	title='Plotly Test Plot',
+    	xaxis=dict(title='X Axis Title'),
+    	yaxis=dict(title='Y Axis Title')
+	)
+	plotData.append(testPlot)
+	outData['plotDemand'] = json.dumps(plotData, cls=plotly.utils.PlotlyJSONEncoder)
+	outData['plotlyLayout'] = json.dumps(layout, cls=plotly.utils.PlotlyJSONEncoder)
+
+
 	# Model operations typically ends here.
 	# Stdout/stderr.
 	outData['PV'] = results['outputs']['PV']
 	outData["stdout"] = "Success"
 	outData["stderr"] = ""
+
+	print(outData.keys())
+
 	return outData
 
 def new(modelDir):
@@ -129,7 +153,7 @@ def _tests():
 	# Create New.
 	new(modelLoc)
 	# Pre-run.
-	__neoMetaModel__.renderAndShow(modelLoc) ## Why is there a pre-run?
+	#__neoMetaModel__.renderAndShow(modelLoc) ## Why is there a pre-run?
 	# Run the model.
 	__neoMetaModel__.runForeground(modelLoc)
 	# Show the output.