allpy
changeset 1062:5f8b5a13adfa
pair-cores/web: add field "Execution log"
Execution log is printed on main application page
| author | Boris Nagaev <bnagaev@gmail.com> |
|---|---|
| date | Wed, 16 May 2012 23:21:30 +0400 |
| parents | e733948b76a2 |
| children | 6f2f17139d76 |
| files | pair_cores/web/approot/locales/pair-cores-web.xml pair_cores/web/approot/locales/pair-cores-web_ru.xml pair_cores/web/docroot/css/pair-cores.css pair_cores/web/pair-cores.cpp |
| diffstat | 4 files changed, 11 insertions(+), 0 deletions(-) [+] |
line diff
1.1 --- a/pair_cores/web/approot/locales/pair-cores-web.xml Wed May 16 23:20:28 2012 +0400 1.2 +++ b/pair_cores/web/approot/locales/pair-cores-web.xml Wed May 16 23:21:30 2012 +0400 1.3 @@ -50,6 +50,7 @@ 1.4 <message id='pair.out.High_html'>HTML file with high blocks</message> 1.5 <message id='pair.out.High_pymol'>PyMol file with high blocks</message> 1.6 <message id='pair.out.Homology'>Homology file</message> 1.7 + <message id='pair.out.Log'>Execution log</message> 1.8 <message id='pair.out.Pair_blocks'>Pair cores file</message> 1.9 <message id='pair.out.Pair_html'>Pair cores HTML file</message> 1.10 <message id='pair.out.Pymol'>Pair cores PyMol file</message>
2.1 --- a/pair_cores/web/approot/locales/pair-cores-web_ru.xml Wed May 16 23:20:28 2012 +0400 2.2 +++ b/pair_cores/web/approot/locales/pair-cores-web_ru.xml Wed May 16 23:21:30 2012 +0400 2.3 @@ -40,6 +40,7 @@ 2.4 <message id='pair.out.High_html'>Вертикальные блоки (HTML)</message> 2.5 <message id='pair.out.High_pymol'>Вертикальные блоки (PyMol)</message> 2.6 <message id='pair.out.Homology'>Файл гомологии</message> 2.7 + <message id='pair.out.Log'>Журнал выполнения</message> 2.8 <message id='pair.out.Pair_blocks'>Парные блоки (текст)</message> 2.9 <message id='pair.out.Pair_html'>Парные блоки (HTML)</message> 2.10 <message id='pair.out.Pymol'>Парные блоки (PyMol-скрипт)</message>
3.1 --- a/pair_cores/web/docroot/css/pair-cores.css Wed May 16 23:20:28 2012 +0400 3.2 +++ b/pair_cores/web/docroot/css/pair-cores.css Wed May 16 23:21:30 2012 +0400 3.3 @@ -12,3 +12,7 @@ 3.4 color: red; 3.5 } 3.6 3.7 +.wt_tableform_name { 3.8 + vertical-align: top !important; 3.9 +} 3.10 +
4.1 --- a/pair_cores/web/pair-cores.cpp Wed May 16 23:20:28 2012 +0400 4.2 +++ b/pair_cores/web/pair-cores.cpp Wed May 16 23:21:30 2012 +0400 4.3 @@ -162,6 +162,11 @@ 4.4 high_html->set_suggested_gen(boost::bind(name_gen2, "html")); 4.5 task->add_output(high_html, tr("pair.out.High_html")); 4.6 // 4.7 + PrintFileOutput* execution_log = new PrintFileOutput("&>"); 4.8 + execution_log->set_suggested_gen(boost::bind(name_gen2, "log")); 4.9 + execution_log->set_selectable(false); 4.10 + task->add_output(execution_log, tr("pair.out.Log")); 4.11 + // 4.12 task->set_runner(new ForkingRunner("pair-cores")); 4.13 task->set_queue(&queue); 4.14 task->set_validator(boost::bind(validate, task, input_markup, input_aln));