From 1fd2eba2db730ff074199e1e122f9c3dbd4adb78 Mon Sep 17 00:00:00 2001 From: myk002 Date: Thu, 9 Sep 2021 10:08:50 -0700 Subject: [PATCH] give generated blueprints proper labels --- .../library/test/ecosystem/in/allbuildings-build.csv | 2 +- .../library/test/ecosystem/in/allbuildings-dig.csv | 2 +- .../library/test/ecosystem/in/basic-build.csv | 2 +- .../blueprints/library/test/ecosystem/in/basic-dig.csv | 2 +- .../library/test/ecosystem/in/basic-place.csv | 2 +- plugins/blueprint.cpp | 10 +++++++++- 6 files changed, 14 insertions(+), 6 deletions(-) diff --git a/data/blueprints/library/test/ecosystem/in/allbuildings-build.csv b/data/blueprints/library/test/ecosystem/in/allbuildings-build.csv index 51ec706ef..0eadad027 100644 --- a/data/blueprints/library/test/ecosystem/in/allbuildings-build.csv +++ b/data/blueprints/library/test/ecosystem/in/allbuildings-build.csv @@ -1,4 +1,4 @@ -#build +#build label(build) a,Mg, ,CS,trackN, , , , , ,`, ,`,`,`, , , , ,`,`,`,`,`,# b,Mh(1x1),S,CSa,trackS, , , , , ,Mw, ,`,wm,`, , , , ,`,`,`,`,`,# c,Mhs(1x1),m,CSaa,trackE, ,`, , , ,`, ,`,`,`, , , , ,`,`,D,`,`,# diff --git a/data/blueprints/library/test/ecosystem/in/allbuildings-dig.csv b/data/blueprints/library/test/ecosystem/in/allbuildings-dig.csv index dc2c48d2c..efeb82ebb 100644 --- a/data/blueprints/library/test/ecosystem/in/allbuildings-dig.csv +++ b/data/blueprints/library/test/ecosystem/in/allbuildings-dig.csv @@ -1,4 +1,4 @@ -#dig +#dig label(dig) d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,# d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,# d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,# diff --git a/data/blueprints/library/test/ecosystem/in/basic-build.csv b/data/blueprints/library/test/ecosystem/in/basic-build.csv index 82b7fdf48..f9ba95fa3 100644 --- a/data/blueprints/library/test/ecosystem/in/basic-build.csv +++ b/data/blueprints/library/test/ecosystem/in/basic-build.csv @@ -1,4 +1,4 @@ -#build +#build label(build) , ,d, , ,# ,f, , , ,# d, ,b, ,d,# diff --git a/data/blueprints/library/test/ecosystem/in/basic-dig.csv b/data/blueprints/library/test/ecosystem/in/basic-dig.csv index 391bf8fc5..1a9ecd11b 100644 --- a/data/blueprints/library/test/ecosystem/in/basic-dig.csv +++ b/data/blueprints/library/test/ecosystem/in/basic-dig.csv @@ -1,4 +1,4 @@ -#dig +#dig label(dig) , ,d, , ,# ,d,d,d, ,# d,d,d,d,d,# diff --git a/data/blueprints/library/test/ecosystem/in/basic-place.csv b/data/blueprints/library/test/ecosystem/in/basic-place.csv index a32e03b9b..c6c45b61e 100644 --- a/data/blueprints/library/test/ecosystem/in/basic-place.csv +++ b/data/blueprints/library/test/ecosystem/in/basic-place.csv @@ -1,4 +1,4 @@ -#place +#place label(place) , , , , ,# , , , , ,# ,f(1x1), ,f(1x1), ,# diff --git a/plugins/blueprint.cpp b/plugins/blueprint.cpp index 1564f5a72..4077b1190 100644 --- a/plugins/blueprint.cpp +++ b/plugins/blueprint.cpp @@ -628,6 +628,14 @@ static bool get_filename(string &fname, return true; } +static string get_modeline(const string &phase) +{ + std::ostringstream modeline; + modeline << "#" << phase << " label(" << phase << ")"; + + return modeline.str(); +} + static bool write_blueprint(color_ostream &out, std::map &output_files, const blueprint_options &opts, @@ -641,7 +649,7 @@ static bool write_blueprint(color_ostream &out, output_files[fname] = new ofstream(fname, ofstream::trunc); ofstream &ofile = *output_files[fname]; - ofile << "#" << phase << endl; + ofile << get_modeline(phase) << endl; ofile << stream.str(); return true; }