see Changelog

Author: Koen Deforche

CMakeLists.txt

@@ -60,6 +60,8 @@ OPTION(ENABLE_HARU "Enable Haru Free PDF Library, which is used to provide suppo
 OPTION(ENABLE_EXT "Build Wt Ext library with JavaScript-only widgets (http://extjs.com/)" ON)
 OPTION(ENABLE_SQLITE "Build SQLite3 backend for Wt::Dbo" ON)
 OPTION(ENABLE_POSTGRES "Build PostgreSQL backend for Wt::Dbo" ON)
+OPTION(WT_NO_STD_LOCALE "Build Wt ro run on a system without std::locale support" OFF)
+OPTION(WT_NO_STD_WSTRING "Build Wt ro run on a system without std::wstring support" OFF)
 
 IF(NOT SHARED_LIBS)
   IF(WIN32)

Changelog

@@ -1,3 +1,7 @@
+10-23-2010:
+	* Chart/WCartesianChart: support ToolTipRole data using WAbstractArea
+	areas
+
 10-15-2010:
 	* Dbo/Sesion: add rereadAll()
 

WConfig.h.in

@@ -30,6 +30,8 @@
 #cmakedefine WT_HAS_WPDFIMAGE
 
 #cmakedefine WT_NO_BOOST_INTRUSIVE
+#cmakedefine WT_NO_STD_LOCALE
+#cmakedefine WT_NO_STD_WSTRING
 
 #if ${WT_DEBUG_ENABLED}
 #ifndef WT_TARGET_JAVA

examples/charts/ChartsExample.C

@@ -44,9 +44,21 @@ namespace {
       readFromCsv(f, model);
 
       for (int row = 0; row < model->rowCount(); ++row)
-	for (int col = 0; col < model->columnCount(); ++col)
+	for (int col = 0; col < model->columnCount(); ++col) {
 	  model->item(row, col)->setFlags(ItemIsSelectable | ItemIsEditable);
 
+	  /*
+	    Example of tool tips (disabled here because they are not updated
+	    when editing data)
+ 	   */
+
+	  /*
+	  WString toolTip = asString(model->headerData(col)) + ": "
+	    + asString(model->item(row, col)->data(DisplayRole), "%.f");
+	  model->item(row, col)->setToolTip(toolTip);
+	   */
+	}
+
       return model;
     } else {
       WString error(WString::tr("error-missing-data"));
@@ -73,8 +85,8 @@ CategoryExample::CategoryExample(Wt::WContainerWidget *parent):
 {
   new WText(WString::tr("category chart"), this);
 
-  WAbstractItemModel *model = readCsvFile(
-    WApplication::appRoot() + "category.csv", this);
+  WAbstractItemModel *model = readCsvFile(WApplication::appRoot() + "category.csv",
+					  this);
 
   if (!model)
     return;
@@ -128,7 +140,7 @@ CategoryExample::CategoryExample(Wt::WContainerWidget *parent):
   chart->setPlotAreaPadding(50, Top | Bottom);
 
   /*
-   *   Add all (but first) column as bar series
+   * Add all (but first) column as bar series
    */
   for (int i = 1; i < model->columnCount(); ++i) {
     WDataSeries s(i, BarSeries);
@@ -164,7 +176,7 @@ TimeSeriesExample::TimeSeriesExample(Wt::WContainerWidget *parent):
   for (int i = 0; i < model->rowCount(); ++i) {
     WString s = asString(model->data(i, 0));
     WDate d = WDate::fromString(s, "dd/MM/yy");
-    model->setData(i, 0, boost::any(d));
+    model->setData(i, 0, d);
   }
 
   // Show a view that allows editing of the model.
@@ -242,14 +254,14 @@ ScatterPlotExample::ScatterPlotExample(WContainerWidget *parent):
   new WText(WString::tr("scatter plot 2"), this);
 
   WStandardItemModel *model = new WStandardItemModel(40, 2, this);
-  model->setHeaderData(0, boost::any(WString("X")));
-  model->setHeaderData(1, boost::any(WString("Y = sin(X)")));
+  model->setHeaderData(0, WString("X"));
+  model->setHeaderData(1, WString("Y = sin(X)"));
 
   for (unsigned i = 0; i < 40; ++i) {
     double x = (static_cast<double>(i) - 20) / 4;
 
-    model->setData(i, 0, boost::any(x));
-    model->setData(i, 1, boost::any(sin(x)));
+    model->setData(i, 0, x);
+    model->setData(i, 1, sin(x));
   }
 
   /*
@@ -294,29 +306,30 @@ PieExample::PieExample(WContainerWidget *parent):
 
   //headers
   model->insertColumns(model->columnCount(), 2);
-  model->setHeaderData(0, boost::any(WString("Item")));
-  model->setHeaderData(1, boost::any(WString("Sales")));
+  model->setHeaderData(0, WString("Item"));
+  model->setHeaderData(1, WString("Sales"));
 
   //data
   model->insertRows(model->rowCount(), 6);
   int row = 0;
-  model->setData(row, 0, boost::any(WString("Blueberry")));
-  model->setData(row, 1, boost::any(120));
+  model->setData(row, 0, WString("Blueberry"));
+  model->setData(row, 1, 120);
+  // model->setData(row, 1, WString("Blueberry"), ToolTipRole);
   row++;
-  model->setData(row, 0, boost::any(WString("Cherry")));
-  model->setData(row, 1, boost::any(30));
+  model->setData(row, 0, WString("Cherry"));
+  model->setData(row, 1, 30);
   row++;
-  model->setData(row, 0, boost::any(WString("Apple")));
-  model->setData(row, 1, boost::any(260));
+  model->setData(row, 0, WString("Apple"));
+  model->setData(row, 1, 260);
   row++;
-  model->setData(row, 0, boost::any(WString("Boston Cream")));
-  model->setData(row, 1, boost::any(160));
+  model->setData(row, 0, WString("Boston Cream"));
+  model->setData(row, 1, 160);
   row++;
-  model->setData(row, 0, boost::any(WString("Other")));
-  model->setData(row, 1, boost::any(40));
+  model->setData(row, 0, WString("Other"));
+  model->setData(row, 1, 40);
   row++;
-  model->setData(row, 0, boost::any(WString("Vanilla Cream")));
-  model->setData(row, 1, boost::any(120));
+  model->setData(row, 0, WString("Vanilla Cream"));
+  model->setData(row, 1, 120);
   row++;
 
   //set all items to be editable and selectable

examples/widgetgallery/ControlsWidget.C

@@ -8,6 +8,8 @@
 #include <Wt/WText>
 #include <sstream>
 
+#include <boost/algorithm/string.hpp>
+
 using namespace Wt;
 
 ControlsWidget::ControlsWidget(EventDisplayer *ed, bool hasSubMenu)
@@ -34,21 +36,37 @@ std::string ControlsWidget::escape(const std::string &name) const
   return ss.str();
 }
 
-std::string ControlsWidget::doxygenAnchor(const std::string &classname) const
+std::string ControlsWidget::docAnchor(const std::string &classname) const
 {
   std::stringstream ss;
+
+#if !defined(WT_TARGET_JAVA)
   ss << "<a href=\"http://www.webtoolkit.eu/wt/doc/reference/html/class"
      << escape("Wt::" + classname)
      << ".html\" target=\"_blank\">doc</a>";
+#else
+  std::string cn = boost::replace_all(classname, "Chart::","chart/");
+  ss << "<a href=\"http://www.webtoolkit.eu/"
+     << "jwt/latest/doc/javadoc/eu/webtoolkit/jwt/"
+     << classname
+    << ".html\" target=\"_blank\">doc</a>";
+#endif
 
   return ss.str();
 }
 
 std::string ControlsWidget::title(const std::string& classname) const
 {
-  return "<span class=\"title\">" + classname + "</span> "
-    + "<span class=\"doc\">["
-    + doxygenAnchor(classname) + "]</span>";
+  std::string cn;
+#if defined(WT_TARGET_JAVA)
+    cn = boost::replace_all(classname, "Chart::","");
+#else
+    cn = classname;
+#endif
+
+    return std::string("<span class=\"title\">") + cn + "</span> "
+      + "<span class=\"doc\">["
+      + docAnchor(classname) + "]</span>";
 }
 
 void ControlsWidget::topic(const std::string &classname,

examples/widgetgallery/ControlsWidget.h

@@ -47,7 +47,7 @@ class ControlsWidget : public Wt::WContainerWidget
 private:
   bool hasSubMenu_;
 
-  std::string doxygenAnchor(const std::string &classname) const;
+  std::string docAnchor(const std::string &classname) const;
   std::string title(const std::string &classname) const;
   std::string escape(const std::string &name) const;
 };

examples/widgetgallery/DeferredWidget.h

@@ -12,6 +12,7 @@
  * We use this to defer widget creation until needed, which also defers
  * loading auxiliary javascript libraries.
  */
+#if !defined(WT_TARGET_JAVA)
 template <typename Function>
 class DeferredWidget : public Wt::WContainerWidget
 {
@@ -33,5 +34,16 @@ DeferredWidget<Function> *deferCreate(Function f)
 {
   return new DeferredWidget<Function>(f);
 }
+#else
+class DeferredWidget : public Wt::WContainerWidget {
+public:
+  DeferredWidget(boost::bound f) {}
+};
+DeferredWidget *deferCreate(boost::bound b) 
+{
+  return new DeferredWidget(b);
+}
+
+#endif
 
 #endif // DEFERRED_WIDGET_H_

examples/widgetgallery/DialogWidgets.C

@@ -50,8 +50,10 @@ void DialogWidgets::populateSubMenu(WMenu *menu)
 {
   menu->addItem("WDialog", wDialog());
   menu->addItem("WMessageBox", wMessageBox());
+#ifndef WT_TARGET_JAVA
   menu->addItem("Ext Dialogs",
 		deferCreate(boost::bind(&DialogWidgets::eDialogs, this)));
+#endif
 }
 
 WWidget *DialogWidgets::wDialog()
@@ -97,6 +99,7 @@ WWidget *DialogWidgets::wMessageBox()
   return result;
 }
 
+#ifndef WT_TARGET_JAVA
 WWidget *DialogWidgets::eDialogs()
 {
   WContainerWidget *result = new WContainerWidget();
@@ -122,6 +125,7 @@ WWidget *DialogWidgets::eDialogs()
 
   return result;
 }
+#endif
 
 void DialogWidgets::messageBox1()
 {
@@ -221,6 +225,7 @@ void DialogWidgets::customModal()
   }
 }
 
+#ifndef WT_TARGET_JAVA
 void DialogWidgets::createExtMessageBox()
 {
   Ext::MessageBox *mb = new Ext::MessageBox();
@@ -327,4 +332,5 @@ void DialogWidgets::deleteExtDialog()
   }
   delete extDialog_;
 }
+#endif
 

examples/widgetgallery/DialogWidgets.h

@@ -66,12 +66,13 @@ class DialogWidgets : public ControlsWidget
   Wt::WMessageBox *messageBox_;
   Wt::WText *status_;
 
+#ifndef WT_TARGET_JAVA
   void createExtDialog();
   void createExtMessageBox();
   void createExtProgress();
   void deleteExtDialog();
   Wt::Ext::Dialog *extDialog_;
-
+#endif
 };
 
 #endif

examples/widgetgallery/EventDisplayer.h

@@ -35,6 +35,7 @@ class EventDisplayer: public Wt::WContainerWidget
   void showEventImpl(const Wt::WString& str);
 };
 
+#ifndef WT_TARGET_JAVA
 template<typename T>
 void EventDisplayer::showSignal(T &s, const std::string& str)
 {
@@ -46,5 +47,6 @@ void EventDisplayer::showEvent(T &s, const Wt::WString& str)
 {
   s.connect(boost::bind(&EventDisplayer::showEventImpl, this, str));
 }
+#endif
 
 #endif