← Back to branch summary

~tux-style/libosmscout/libosmscout-repo

« back to all changes in this revision

Viewing changes to libosmscout-map/parser/OSS/OSS.atg

  • Committer: tteuling
  • Date: 2018-04-07 04:35:51 UTC
  • Revision ID: git-v1:531e9cf325e46ab93ad445de51a7fb63ab50aa51
Allow passing a color pprepocessing you to the style config parser.

Show diffs side-by-side

added added

removed removed

Lines of Context:
libosmscout-map/parser/OSS/OSS.atg
1904
1904
                  }
1905
1905
 
1906
1906
                  if (!errors->hasErrors) {
1907
 
                    color=osmscout::Color::FromHexString(c);
 
1907
                    color=PostprocessColor(osmscout::Color::FromHexString(c));
1908
1908
                  }
1909
1909
                .)
1910
1910
               .
1943
1943
                  "lighten" "(" COLOR<color> "," UDOUBLE<factor> ")"
1944
1944
                  (.
1945
1945
                    if (factor>=0.0 && factor<=1.0) {
1946
 
                      color=color.Lighten(factor);
 
1946
                      color=PostprocessColor(color.Lighten(factor));
1947
1947
                    }
1948
1948
                    else {
1949
1949
                     std::string e="Factor must be in the range [0..1]";
1955
1955
                  "darken" "(" COLOR<color> "," UDOUBLE<factor> ")"
1956
1956
                  (.
1957
1957
                    if (factor>=0.0 && factor<=1.0) {
1958
 
                      color=color.Darken(factor);
 
1958
                      color=PostprocessColor(color.Darken(factor));
1959
1959
                    }
1960
1960
                    else {
1961
1961
                     std::string e="Factor must be in the range [0..1]";
1964
1964
                    }
1965
1965
                  .)
1966
1966
                | COLOR_VALUE<color>
 
1967
                  (.
 
1968
                    color=PostprocessColor(color);
 
1969
                  .)
1967
1970
                | CONSTANT<constant>
1968
1971
                  (.
1969
1972
                    if (!constant) {