1 files changed, 7 insertions, 9 deletions
diff --git a/src/main/scala/scalam/plotting/Plot.scala b/src/main/scala/scalam/plotting/Plot.scala
index 38a4da6..f354997 100644
--- a/src/main/scala/scalam/plotting/Plot.scala
+++ b/src/main/scala/scalam/plotting/Plot.scala
@@ -14,7 +14,7 @@ class Plot(
   grid: Boolean = true,
   legend: Boolean = true,
   fontSize: Int = 10,
-  styleSchemes: Seq[StyleScheme[Style]] = Seq(),
+  styles: Seq[Style[_]] = Seq(),
   name: String = "plot" + Plot.next) {
 
   val directory = Path(name)
@@ -28,7 +28,7 @@ class Plot(
   lazy val statements: List[Statement] = {
     def loadData(dataSet: RichDataSet) = Assign(dataSet.id, Function(Identifier("load"), StringLiteral(dataSet.localPath.path)))
     
-    val (initial: Seq[Seq[Statement]], styleMaps: Seq[DataSet => Style]) = styleSchemes.map(_.apply(dataSets)).unzip
+    val (initial: Seq[Seq[Statement]], styleMaps: Iterable[DataSet => StyleElement]) = styles.map(_.apply(dataSets)).unzip
     
     val figureId = Identifier("fh")
     val on = StringLiteral("on")
@@ -52,7 +52,6 @@ class Plot(
     }
     def legend(dataSets: Seq[DataSet]) =
       Evaluate(Function(Identifier("legend"), (for (d <- dataSets) yield StringLiteral(d.name)): _*)) :: Nil
-    def wait(figureId: Identifier) = List(Evaluate(Function(Identifier("waitfor"), Variable(figureId))))
 
     val commands = new scala.collection.mutable.ListBuffer[Statement]
     commands ++= (for (d <- richDataSets) yield loadData(d))
@@ -66,7 +65,6 @@ class Plot(
     commands += yLabel(this.yLabel)
     commands ++= (for (d <- richDataSets) yield plot(d))
     if (this.legend) commands ++= legend(dataSets)
-    commands ++= wait(figureId)
     commands.toList
   }
 
@@ -74,10 +72,10 @@ class Plot(
     val df = new java.text.SimpleDateFormat("EEE, d MMM yyyy HH:mm:ss")
     val now = (new java.util.Date(System.currentTimeMillis()))
 
-    "%%%%%%%%%%%%%%%%%%%%%%%%%%%%%\n" +
-      "% Generated by scalam, v1.0 %\n" +
-      "% " + df.format(now) + " %\n" +
-      "%%%%%%%%%%%%%%%%%%%%%%%%%%%%%\n"
+    
+      "%% Generated by scalam, v1.0\n" +
+      "%% " + df.format(now) + "\n"
+      
   }
 
   def save() = {
@@ -109,7 +107,7 @@ object Plot {
    private def randomDataSet(length: Int) = {
     import scala.util.Random
     val data = for (i <- 0 until length) yield (i * 1.0, Random.nextDouble() * 10)
-    val name = Random.nextString(10)
+    val name = "a"
     new DataSet(data, name)
   }