Merge branch 'master' of fias.uni-frankfurt.de:scm/pypsa

openego · May 22, 2017 · b6b03a4 · b6b03a4
2 parents 45541e1 + edf7597
commit b6b03a4
Show file tree

Hide file tree

Showing 18 changed files with 2 additions and 1 deletion.
diff --git a/.gitignore b/.gitignore
@@ -22,7 +22,7 @@ test/results/*
 
 doc/_build/
 
-doc/img/
+# doc/img/
 
 build/
 

diff --git a/doc/img/buses.png b/doc/img/buses.png
diff --git a/doc/img/euro-pie-pre-7-branch_limit-1-256.png b/doc/img/euro-pie-pre-7-branch_limit-1-256.png
diff --git a/doc/img/line-equivalent.png b/doc/img/line-equivalent.png
diff --git a/doc/img/line-loading.png b/doc/img/line-loading.png
diff --git a/doc/img/lmp.png b/doc/img/lmp.png
diff --git a/doc/img/meshed-ac-dc.png b/doc/img/meshed-ac-dc.png
diff --git a/doc/img/nuclear-dispatch.png b/doc/img/nuclear-dispatch.png
diff --git a/doc/img/p_max_pu.png b/doc/img/p_max_pu.png
diff --git a/doc/img/reactive-power.png b/doc/img/reactive-power.png
diff --git a/doc/img/scigrid-curtailment.png b/doc/img/scigrid-curtailment.png
diff --git a/doc/img/stacked-gen.png b/doc/img/stacked-gen.png
diff --git a/doc/img/storage-scigrid.png b/doc/img/storage-scigrid.png
diff --git a/doc/img/transformer-pi-equivalent-tap-hv.png b/doc/img/transformer-pi-equivalent-tap-hv.png
diff --git a/doc/img/transformer-pi-equivalent-tap-lv.png b/doc/img/transformer-pi-equivalent-tap-lv.png
diff --git a/doc/img/transformer-t-equivalent-tap-hv.png b/doc/img/transformer-t-equivalent-tap-hv.png
diff --git a/doc/img/transformer-t-equivalent-tap-lv.png b/doc/img/transformer-t-equivalent-tap-lv.png
diff --git a/pypsa/plot.py b/pypsa/plot.py
@@ -97,6 +97,7 @@ def plot(network, margin=0.05, ax=None, basemap=True, bus_colors='b',
     defaults_for_branches = {
         'Link': dict(color="cyan", width=2),
         'Line': dict(color="b", width=2)
+        'Transformer': dict(color='green', width=2)
     }
 
     if not plt_present:
-Original file line number
+Diff line change
@@ Expand Up / @@ -22,7 +22,7 @@ test/results/* @@
     doc/_build/
-    doc/img/
+    # doc/img/
     build/
@@ Expand Down @@