Merge branch 'master' of https://scm.cri.ensmp.fr/git/Faustine

[Faustine.git] / interpreter / preprocessor / faust-0.9.47mr3 / compiler / boxes / ppbox.cpp

diff --git a/interpreter/preprocessor/faust-0.9.47mr3/compiler/boxes/ppbox.cpp b/interpreter/preprocessor/faust-0.9.47mr3/compiler/boxes/ppbox.cpp
index c54701b..a44dcbf 100644 (file)
--- a/interpreter/preprocessor/faust-0.9.47mr3/compiler/boxes/ppbox.cpp
+++ b/interpreter/preprocessor/faust-0.9.47mr3/compiler/boxes/ppbox.cpp
@@ -185,6 +185,7 @@ ostream& boxpp::print (ostream& fout) const
        else if (isBoxISum(box, t1, t2, t3))    fout << "sum(" << boxpp(t1) << ", " << boxpp(t2) << ") {" << boxpp(t3) << "}";
        else if (isBoxIProd(box, t1, t2, t3))   fout << "prod(" << boxpp(t1) << ", " << boxpp(t2) << ") {" << boxpp(t3) << "}";
 
        else if (isBoxISum(box, t1, t2, t3))    fout << "sum(" << boxpp(t1) << ", " << boxpp(t2) << ") {" << boxpp(t3) << "}";
        else if (isBoxIProd(box, t1, t2, t3))   fout << "prod(" << boxpp(t1) << ", " << boxpp(t2) << ") {" << boxpp(t3) << "}";
 

+/* 

        // user interface
        else if (isBoxButton(box, label))       fout << "button(" << tree2str(label) << ')';
        else if (isBoxCheckbox(box, label))     fout << "checkbox(" << tree2str(label) << ')';
        // user interface
        else if (isBoxButton(box, label))       fout << "button(" << tree2str(label) << ')';
        else if (isBoxCheckbox(box, label))     fout << "checkbox(" << tree2str(label) << ')';


@@ -233,6 +234,37 @@ ostream& boxpp::print (ostream& fout) const
                         << boxpp(max) << ", "
                         << boxpp(step)<< ')';
        }
                         << boxpp(max) << ", "
                         << boxpp(step)<< ')';
        }

+*/
+
+       // user interface   -----------   Edited by Haisheng WANG for Faustine, 16/09/2013.
+       else if (isBoxButton(box, label))       fout << "button";
+       else if (isBoxCheckbox(box, label))     fout << "checkbox";
+       else if (isBoxVSlider(box, label, cur, min, max, step))         {
+               fout << "vslider";
+       }
+       else if (isBoxHSlider(box, label, cur, min, max, step))         {
+               fout << "hslider";
+       }
+       else if (isBoxVGroup(box, label, t1)) {
+               fout << "vgroup";
+       }
+       else if (isBoxHGroup(box, label, t1)) {
+               fout << "hgroup";
+       }
+       else if (isBoxTGroup(box, label, t1)) {
+               fout << "tgroup";
+       }
+       else if (isBoxHBargraph(box, label, min, max))  {
+               fout << "hbargraph";
+       }
+       else if (isBoxVBargraph(box, label, min, max))  {
+               fout << "vbargraph";
+       }
+       else if (isBoxNumEntry(box, label, cur, min, max, step))        {
+               fout << "nentry";
+       }
+       // end user interface
+

        else if (isNil(box)) {
                fout << "()" ;
        }
        else if (isNil(box)) {
                fout << "()" ;
        }