diff options
| -rw-r--r-- | grapher/Graph.cxx | 2 | ||||
| -rw-r--r-- | grapher/GraphWidget.cxx | 10 |
2 files changed, 10 insertions, 2 deletions
diff --git a/grapher/Graph.cxx b/grapher/Graph.cxx index 57f1dc9a..b3429ef7 100644 --- 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 e37485b8..3d38627f 100644 --- a/grapher/GraphWidget.cxx +++ b/grapher/GraphWidget.cxx @@ -53,6 +53,11 @@ namespace systemtap 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); _refXmlDataDialog->get_widget("button1", button); button->signal_clicked() .connect(sigc::mem_fun(*this, &GraphWidget::onDataAdd), 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; } } |