Sfoglia il codice sorgente

Bart's front-end is working

Yentl Van Tendeloo 8 anni fa
parent
commit
fd83260a9b
3 ha cambiato i file con 9 aggiunte e 13 eliminazioni
  1. 3 10
      interface/plot/main.py
  2. 3 3
      interface/plot/plot.py
  3. 3 0
      models/trace_mapper.mvc

File diff suppressed because it is too large
+ 3 - 10
interface/plot/main.py


+ 3 - 3
interface/plot/plot.py

@@ -39,11 +39,11 @@ class DataPoint(Serializable):
         
 class Color:
     # enumeration of all colors
-    BLUE, GREEN, RED, CYAN, MAGENTA, YELLOW, BLACK, WHITE = range(8)
+    BLUE, GREEN, RED, CYAN, MAGENTA, YELLOW, BLACK, WHITE = ("blue", "green", "red", "cyan", "magenta", "yellow", "black", "white")
 
 class LineStyle:
     # enumeration of all line styles
-    SOLID, DASHED, DASHDOT, DOTTED, PIXEL, POINT, CIRCLE, STAR, PLUS, X = range(10)
+    SOLID, DASHED, DASHDOT, DOTTED, PIXEL, POINT, CIRCLE, STAR, PLUS, X = ("solid", "dashed", "dashdot", "dotted", "pixel", "point", "circle", "star", "plus", "x")
         
 class Axis(Serializable):
     
@@ -59,4 +59,4 @@ class Axis(Serializable):
 
 class XAxis(Axis): pass
 class YAxis(Axis): pass
-        
+        

+ 3 - 0
models/trace_mapper.mvc

@@ -73,6 +73,9 @@ A B {
                 Post_MM_rendered_plot/y (post_ds_1, post_ds_5) {
                     label = "7"
                 }
+                Post_MM_rendered_plot/data (post_ds_1, post_ds_2) {
+                    label = "8"
+                }
             }
         }