allpy
changeset 39:b2bcc4e582f7
fixes. compiled
| author | boris (netbook) <bnagaev@gmail.com> |
|---|---|
| date | Wed, 15 Sep 2010 15:28:49 +0400 |
| parents | e59421ec23de |
| children | e1c94228fe10 |
| files | blocks3d-wt-widget.C blocks3d-wt-widget.h |
| diffstat | 2 files changed, 17 insertions(+), 11 deletions(-) [+] |
line diff
1.1 --- a/blocks3d-wt-widget.C Wed Sep 15 15:23:32 2010 +0400 1.2 +++ b/blocks3d-wt-widget.C Wed Sep 15 15:28:49 2010 +0400 1.3 @@ -89,7 +89,7 @@ 1.4 conformity_upload->changed().connect(conformity_upload, &Wt::WFileUpload::upload); 1.5 1.6 timer = new Wt::WTimer(this); 1.7 - timer->timeout()->(this, &Blocks3DWidget::timeout) 1.8 + timer->timeout().connect(this, &Blocks3DWidget::timeout); 1.9 timer->setInterval(Malakite::refresh_period); 1.10 } 1.11 1.12 @@ -160,15 +160,15 @@ 1.13 1.14 std::string r = generateSalt(); 1.15 1.16 - std::string tempfile_alignment = 1.17 + tempfile_alignment = 1.18 str(boost::format("%s/%s_%s") % Malakite::temp_path % r % Malakite::tempfile_alignment); 1.19 - std::string tempfile_conformity = 1.20 + tempfile_conformity = 1.21 str(boost::format("%s/%s_%s") % Malakite::temp_path % r % Malakite::tempfile_conformity); 1.22 - std::string tempfile_html = 1.23 + tempfile_html = 1.24 str(boost::format("%s/%s_%s") % Malakite::temp_path % r % Malakite::tempfile_html); 1.25 - std::string tempfile_check = 1.26 + tempfile_check = 1.27 str(boost::format("%s/%s_%s") % Malakite::temp_path % r % Malakite::tempfile_check); 1.28 - std::string tempfile_sh = 1.29 + tempfile_sh = 1.30 str(boost::format("%s/%s_%s") % Malakite::temp_path % r % Malakite::tempfile_sh); 1.31 1.32 std::ofstream alignment_file; 1.33 @@ -212,7 +212,7 @@ 1.34 // security??? 1.35 system(str(boost::format("sh %s &") % tempfile_sh.c_str()).c_str()); 1.36 new Wt::WBreak(this); 1.37 - new Wt::Wtext("Task start", results_panel); 1.38 + new Wt::WText("Task start", results_panel); 1.39 1.40 timer->start(); 1.41 1.42 @@ -222,7 +222,7 @@ 1.43 { 1.44 // FIXME: check status of task 1.45 std::ifstream check_file; 1.46 - check_file.open(tempfile_check); 1.47 + check_file.open(tempfile_check.c_str()); 1.48 if (!check_file) 1.49 { 1.50 return; 1.51 @@ -232,18 +232,18 @@ 1.52 timer->stop(); 1.53 1.54 std::ifstream tempfile_html_file; 1.55 - tempfile_html_file.open(tempfile_html); 1.56 + tempfile_html_file.open(tempfile_html.c_str()); 1.57 if (!tempfile_html_file) 1.58 { 1.59 //~ Wt::WMessageBox::show("Ok", "Ok", Wt::Ok); 1.60 new Wt::WBreak(this); 1.61 - new Wt::Wtext("Task failed. Please contact developer", results_panel); 1.62 + new Wt::WText("Task failed. Please contact developer", results_panel); 1.63 return; 1.64 } 1.65 tempfile_html_file.close(); 1.66 1.67 new Wt::WBreak(this); 1.68 - new Wt::Wtext("Task finished", results_panel); 1.69 + new Wt::WText("Task finished", results_panel); 1.70 1.71 1.72
2.1 --- a/blocks3d-wt-widget.h Wed Sep 15 15:23:32 2010 +0400 2.2 +++ b/blocks3d-wt-widget.h Wed Sep 15 15:28:49 2010 +0400 2.3 @@ -39,6 +39,12 @@ 2.4 Wt::WContainerWidget* results_panel; 2.5 Wt::WTimer* timer; 2.6 2.7 + std::string tempfile_alignment; 2.8 + std::string tempfile_conformity; 2.9 + std::string tempfile_html; 2.10 + std::string tempfile_check; 2.11 + std::string tempfile_sh; 2.12 + 2.13 void textarea_from_file(Wt::WTextArea* ta, const char* file); 2.14 void go_button_click(); 2.15 void alignment_uploaded();