diff options
author | Jakob Odersky <jodersky@gmail.com> | 2012-11-01 11:46:54 +0100 |
---|---|---|
committer | Jakob Odersky <jodersky@gmail.com> | 2012-11-01 11:46:54 +0100 |
commit | cde13945605fb9f543cfb960728c5c7d48d6f3f5 (patch) | |
tree | 6bf8055115061ac54cd24083a178abbb63af914a /src/main/scala/scalam/plotting/styles/styles.scala | |
parent | 604c0af33343169f9d19e6e3f350c8f10a4d577f (diff) | |
parent | 9e226e73e6e145e6a45dc580d3bbba9cee6a3c9e (diff) | |
download | scalam-cde13945605fb9f543cfb960728c5c7d48d6f3f5.tar.gz scalam-cde13945605fb9f543cfb960728c5c7d48d6f3f5.tar.bz2 scalam-cde13945605fb9f543cfb960728c5c7d48d6f3f5.zip |
Merge branch 'new-plot'
Diffstat (limited to 'src/main/scala/scalam/plotting/styles/styles.scala')
-rw-r--r-- | src/main/scala/scalam/plotting/styles/styles.scala | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/main/scala/scalam/plotting/styles/styles.scala b/src/main/scala/scalam/plotting/styles/styles.scala index 705b88b..e7d59fc 100644 --- a/src/main/scala/scalam/plotting/styles/styles.scala +++ b/src/main/scala/scalam/plotting/styles/styles.scala @@ -6,13 +6,13 @@ import scalam.m.ast._ trait StyleElement { //command line option - def name: StringLiteral + def name: Expression //expression def expression: Expression } trait Style[+S <: StyleElement] { - def apply(dataSets: Seq[DataSet]): Tuple2[Seq[Statement], DataSet => S] + def apply(dataSets: Seq[DataSet]): Tuple2[Seq[Root], DataSet => S] } case class Uniform[S <: StyleElement](element: S) extends Style[S] { |