1.1 --- a/blocks3d-wt-widget.C	Wed Sep 15 00:05:57 2010 +0400
     1.2 +++ b/blocks3d-wt-widget.C	Wed Sep 15 00:28:21 2010 +0400
     1.3 @@ -11,10 +11,10 @@
     1.4  #include <Wt/WMessageBox>
     1.5  
     1.6  #include <fstream>
     1.7 +#include <boost/lexical_cast.hpp>
     1.8  
     1.9 -
    1.10 -Blocks3DWidget::Blocks3DWidget(WContainerWidget *parent) :
    1.11 -  WContainerWidget(parent)
    1.12 +Blocks3DWidget::Blocks3DWidget(Wt::WContainerWidget *parent) :
    1.13 +  Wt::WContainerWidget(parent)
    1.14  {
    1.15    alignment_upload = new Wt::WFileUpload();
    1.16    alignment_textarea = new Wt::WTextArea();
    1.17 @@ -35,30 +35,30 @@
    1.18    table->elementAt(2, 1)->addWidget(conformity_upload);
    1.19    
    1.20    new Wt::WBreak(this);
    1.21 -  delta_input = new Wt::WLineEdit(Malakite::default::delta, this);
    1.22 -  Wt::WDoubleValidator *delta_validator = new Wt::WDoubleValidator(0.0, 10.0);
    1.23 +  delta_input = new Wt::WLineEdit(Malakite::defaults::delta, this);
    1.24 +  delta_validator = new Wt::WDoubleValidator(0.0, 10.0);
    1.25    delta_input->setValidator(delta_validator);  
    1.26    Wt::WLabel *delta_label = new Wt::WLabel("Distance spreading", this);
    1.27    delta_label->setBuddy(delta_input);
    1.28    
    1.29    new Wt::WBreak(this);
    1.30 -  min_block_width_input = new Wt::WLineEdit(Malakite::default::min_block_width, this);
    1.31 -  Wt::WIntValidator *min_block_width_validator = new Wt::WIntValidator(3, 9999);
    1.32 +  min_block_width_input = new Wt::WLineEdit(Malakite::defaults::min_block_width, this);
    1.33 +  min_block_width_validator = new Wt::WIntValidator(3, 9999);
    1.34    min_block_width_input->setValidator(min_block_width_validator);  
    1.35    Wt::WLabel *min_block_width_label = new Wt::WLabel("Min block width", this);
    1.36    min_block_width_label->setBuddy(min_block_width_input);
    1.37    
    1.38    new Wt::WBreak(this);
    1.39 -  timeout_input = new Wt::WLineEdit(Malakite::default::timeout, this);
    1.40 -  Wt::WIntValidator *timeout_validator = new Wt::WIntValidator(-1, 30*24*3600);
    1.41 +  timeout_input = new Wt::WLineEdit(Malakite::defaults::timeout, this);
    1.42 +  timeout_validator = new Wt::WIntValidator(-1, 30*24*3600);
    1.43    timeout_input->setValidator(timeout_validator);  
    1.44    Wt::WLabel *timeout_label = new Wt::WLabel(
    1.45      "Bron-Kerbosh (couple cores) timeout", this);
    1.46    timeout_label->setBuddy(timeout_input);
    1.47    
    1.48    new Wt::WBreak(this);
    1.49 -  timeout2_input = new Wt::WLineEdit(Malakite::default::timeout2, this);
    1.50 -  Wt::WIntValidator *timeout2_validator = new Wt::WIntValidator(-1, 30*24*3600);
    1.51 +  timeout2_input = new Wt::WLineEdit(Malakite::defaults::timeout2, this);
    1.52 +  timeout2_validator = new Wt::WIntValidator(-1, 30*24*3600);
    1.53    timeout2_input->setValidator(timeout2_validator);  
    1.54    Wt::WLabel *timeout2_label = new Wt::WLabel(
    1.55      "Bron-Kerbosh (blocks) timeout", this);
    1.56 @@ -67,14 +67,14 @@
    1.57    
    1.58    new Wt::WBreak(this);
    1.59    Wt::WPushButton *go_button = new Wt::WPushButton("Run", this);  
    1.60 -  go_button->clicked().connect(go_button, &Blocks3DWidget::go_button_click);
    1.61 -  //~ go_button->clicked().connect(go_button, &Wt::WPushButton::disable);
    1.62 -  go_button->clicked().connect(alignment_upload, Wt::WFileUpload::upload);
    1.63 -  go_button->clicked().connect(conformity_upload, Wt::WFileUpload::upload);
    1.64 -  alignment_upload->uploaded().connect(this, &Blocks3DWidget::alignment_uploaded);
    1.65 -  conformity_upload->uploaded().connect(this, &Blocks3DWidget::conformity_uploaded);
    1.66 -  alignment_upload->fileTooLarge().connect(this, &Blocks3DWidget::fileTooLarge);
    1.67 -  conformity_upload->fileTooLarge().connect(this, &Blocks3DWidget::fileTooLarge);
    1.68 +  //go_button->clicked().connect(go_button, &Blocks3DWidget::go_button_click);
    1.69 +  ////~ go_button->clicked().connect(go_button, &Wt::WPushButton::disable);
    1.70 +  //go_button->clicked().connect(alignment_upload, &Wt::WFileUpload::upload);
    1.71 +  //go_button->clicked().connect(conformity_upload, &Wt::WFileUpload::upload);
    1.72 +  //alignment_upload->uploaded().connect(this, &Blocks3DWidget::alignment_uploaded);
    1.73 +  //conformity_upload->uploaded().connect(this, &Blocks3DWidget::conformity_uploaded);
    1.74 +  //alignment_upload->fileTooLarge().connect(this, &Blocks3DWidget::fileTooLarge);
    1.75 +  //conformity_upload->fileTooLarge().connect(this, &Blocks3DWidget::fileTooLarge);
    1.76    
    1.77    
    1.78  }
    1.79 @@ -88,10 +88,10 @@
    1.80  {
    1.81    std::string temp("");
    1.82    std::string total("");
    1.83 -  ifstream uploaded_file;
    1.84 +  std::ifstream uploaded_file;
    1.85  
    1.86    uploaded_file.open(file);
    1.87 -  if (!inFile) 
    1.88 +  if (!uploaded_file) 
    1.89    {
    1.90      return;
    1.91    }
    1.92 @@ -106,41 +106,39 @@
    1.93  
    1.94  void Blocks3DWidget::alignment_uploaded()
    1.95  {
    1.96 -  textarea_from_file(alignment_textarea, alignment_upload->spoolFileName());
    1.97 +  textarea_from_file(alignment_textarea, 
    1.98 +    boost::lexical_cast<char*>(alignment_upload->spoolFileName()));
    1.99    try_to_run();
   1.100  }
   1.101  
   1.102  void Blocks3DWidget::conformity_uploaded()
   1.103  {
   1.104 -  textarea_from_file(conformity_textarea, conformity_upload->spoolFileName());
   1.105 +  textarea_from_file(conformity_textarea, 
   1.106 +    boost::lexical_cast<char*>(conformity_upload->spoolFileName()));
   1.107    try_to_run();
   1.108  }
   1.109  
   1.110  void Blocks3DWidget::try_to_run()
   1.111  {
   1.112 -  std::string alignment = conformity_textarea->text();
   1.113 -  std::string conformity = conformity_textarea->text();
   1.114 -  if (!alignment || !conformity)
   1.115 +  std::string alignment = conformity_textarea->text().toUTF8();
   1.116 +  std::string conformity = conformity_textarea->text().toUTF8();
   1.117 +  if (alignment.empty() || conformity.empty())
   1.118    {
   1.119      return;
   1.120    }
   1.121 -  if (delta_validator->validate() != Wt::WValidator::Valid)
   1.122 +  if (delta_input->validate() != Wt::WValidator::Valid)
   1.123    {
   1.124      return;
   1.125    }
   1.126 -  if (min_block_width_validator->validate() != Wt::WValidator::Valid)
   1.127 +  if (min_block_width_input->validate() != Wt::WValidator::Valid)
   1.128    {
   1.129      return;
   1.130    }
   1.131 -  if (min_block_width_validator->validate() != Wt::WValidator::Valid)
   1.132 +  if (timeout_input->validate() != Wt::WValidator::Valid)
   1.133    {
   1.134      return;
   1.135    }
   1.136 -  if (timeout_validator->validate() != Wt::WValidator::Valid)
   1.137 -  {
   1.138 -    return;
   1.139 -  }
   1.140 -  if (timeout2_validator->validate() != Wt::WValidator::Valid)
   1.141 +  if (timeout2_input->validate() != Wt::WValidator::Valid)
   1.142    {
   1.143      return;
   1.144    }

     2.1 --- a/blocks3d-wt-widget.h	Wed Sep 15 00:05:57 2010 +0400
     2.2 +++ b/blocks3d-wt-widget.h	Wed Sep 15 00:28:21 2010 +0400
     2.3 @@ -2,7 +2,6 @@
     2.4  #include "config.h"
     2.5  #include <stdlib.h>
     2.6  
     2.7 -#include <Wt/WSelectionBox>
     2.8  #include <Wt/WPanel>
     2.9  #include <Wt/WString>
    2.10  #include <Wt/WHBoxLayout>
    2.11 @@ -17,10 +16,10 @@
    2.12  
    2.13  #include <stdlib.h>
    2.14  
    2.15 -class Blocks3DWidget : public WContainerWidget
    2.16 +class Blocks3DWidget : public Wt::WContainerWidget
    2.17  {
    2.18  public:
    2.19 -  Blocks3DWidget(WContainerWidget *parent=0);
    2.20 +  Blocks3DWidget(Wt::WContainerWidget *parent=0);
    2.21  private:
    2.22    Wt::WFileUpload* alignment_upload;
    2.23    Wt::WTextArea* alignment_textarea;
    2.24 @@ -32,6 +31,11 @@
    2.25    Wt::WLineEdit* timeout_input;
    2.26    Wt::WLineEdit* timeout2_input;
    2.27    
    2.28 +  Wt::WDoubleValidator *delta_validator;
    2.29 +  Wt::WIntValidator *min_block_width_validator;
    2.30 +  Wt::WIntValidator *timeout_validator;
    2.31 +  Wt::WIntValidator *timeout2_validator;
    2.32 +  
    2.33    void textarea_from_file(Wt::WTextArea* ta, char* file);
    2.34    void go_button_click();
    2.35    void alignment_uploaded();

     3.1 --- a/blocks3d-wt.C	Wed Sep 15 00:05:57 2010 +0400
     3.2 +++ b/blocks3d-wt.C	Wed Sep 15 00:28:21 2010 +0400
     3.3 @@ -7,37 +7,37 @@
     3.4  #include <Wt/WServer>
     3.5  
     3.6  
     3.7 -class Blocks3DApplication : public WApplication
     3.8 +class Blocks3DApplication : public Wt::WApplication
     3.9  {
    3.10  public:
    3.11 -  Blocks3DApplication(const WEnvironment& env);
    3.12 +  Blocks3DApplication(const Wt::WEnvironment& env);
    3.13  private:
    3.14    Blocks3DWidget* blocks3d_widget;
    3.15  };
    3.16  
    3.17 -Blocks3DApplication::Blocks3DApplication(const WEnvironment& env) : 
    3.18 -  WApplication(env)
    3.19 +Blocks3DApplication::Blocks3DApplication(const Wt::WEnvironment& env) : 
    3.20 +  Wt::WApplication(env)
    3.21  {
    3.22 -  blocks3d_widget = new Blocks3DWidget(this);
    3.23 +  blocks3d_widget = new Blocks3DWidget(root());
    3.24  }
    3.25  
    3.26  
    3.27  
    3.28  
    3.29 -Blocks3DApplication* createApplication(const WEnvironment& env)
    3.30 +Wt::WApplication* createApplication(const Wt::WEnvironment& env)
    3.31  {
    3.32    return new Blocks3DApplication(env);
    3.33  }
    3.34  
    3.35  int main(int argc, char **argv)
    3.36  {
    3.37 -  WServer server(argv[0]);
    3.38 +  Wt::WServer server(argv[0]);
    3.39    server.setServerConfiguration(argc, argv, WTHTTP_CONFIGURATION);
    3.40    
    3.41 -  server.addEntryPoint(Application, createApplication, Malakite::main_url);
    3.42 +  server.addEntryPoint(Wt::Application, createApplication, Malakite::main_url);
    3.43    
    3.44    if (server.start()) {
    3.45 -    WServer::waitForShutdown();
    3.46 +    Wt::WServer::waitForShutdown();
    3.47      server.stop();
    3.48    }
    3.49  }

     4.1 --- a/config.C	Wed Sep 15 00:05:57 2010 +0400
     4.2 +++ b/config.C	Wed Sep 15 00:28:21 2010 +0400
     4.3 @@ -12,11 +12,11 @@
     4.4  const char* main_url = "/";
     4.5  
     4.6  
     4.7 -namespace default
     4.8 +namespace defaults
     4.9  {
    4.10  
    4.11  const char* delta = "2.0";
    4.12 -const char* min_block_width_input = "3";
    4.13 +const char* min_block_width = "3";
    4.14  const char* timeout = "10";
    4.15  const char* timeout2 = "10";
    4.16  

     5.1 --- a/config.h	Wed Sep 15 00:05:57 2010 +0400
     5.2 +++ b/config.h	Wed Sep 15 00:28:21 2010 +0400
     5.3 @@ -9,12 +9,14 @@
     5.4  
     5.5  extern const char* main_url;
     5.6  
     5.7 -namespace default
     5.8 +namespace defaults
     5.9  {
    5.10  
    5.11  extern const char* delta;
    5.12 -extern const char* min_block_width_input;
    5.13 +extern const char* min_block_width;
    5.14  extern const char* timeout;
    5.15  extern const char* timeout2;
    5.16  
    5.17  }
    5.18 +
    5.19 +}