hover text on the additional graphs

* grapher/Graph.cxx (window2GraphCoords): Take the entire graph's
  position into account too.
* grapher/GraphWidget.cxx (GraphWidget): Hook up the data dialog's OK
  button.
  (onDataDialogOpen): If a data set doesn't have a title, use it's
  name (key) instead.

diff --git a/grapher/Graph.cxx b/grapher/Graph.cxx
index 57f1dc9a33119e2b1e6fe2e898d619dfbb697f8c..b3429ef73841adb922968eea98545ae183ced9a1 100644 (file)
--- a/grapher/Graph.cxx
+++ b/grapher/Graph.cxx
@@ -210,6 +210,6 @@ namespace systemtap
                                  double& xgraph, double& ygraph)
   {
     xgraph = x -_xOffset;
-    ygraph = -y + _yOffset + _graphHeight;
+    ygraph = -(y - _graphY) + _yOffset + _graphHeight;
   }
 }

diff --git a/grapher/GraphWidget.cxx b/grapher/GraphWidget.cxx
index e37485b83b491d9964b1908219ab4ee72dbf3377..3d38627f32bfe8181307d3f4fe508a0a0e2ed181 100644 (file)
--- a/grapher/GraphWidget.cxx
+++ b/grapher/GraphWidget.cxx
@@ -50,6 +50,11 @@ namespace systemtap
         _refXmlDataDialog->get_widget("dialog1", _dataDialog);
         Gtk::Button* button = 0;
         _refXmlDataDialog->get_widget("cancelbutton1", button);
+        button->signal_clicked()
+          .connect(sigc::mem_fun(*this, &GraphWidget::onDataDialogCancel),
+                   false);
+        // XXX
+        _refXmlDataDialog->get_widget("okbutton1", button);
         button->signal_clicked()
           .connect(sigc::mem_fun(*this, &GraphWidget::onDataDialogCancel),
                    false);
@@ -263,7 +268,10 @@ namespace systemtap
       {
           Gtk::TreeModel::iterator litr = _listStore->append();
           Gtk::TreeModel::Row row = *litr;
-          row[_dataColumns._dataName] = (*itr)->title;
+          if (!(*itr)->title.empty())
+              row[_dataColumns._dataName] = (*itr)->title;
+          else
+              row[_dataColumns._dataName] = (*itr)->name;
           row[_dataColumns._graphData] = *itr;
       }
   }