From owner-svn-src-user@FreeBSD.ORG Sun Jun 24 09:12:49 2012 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id DF72C1065677; Sun, 24 Jun 2012 09:12:49 +0000 (UTC) (envelope-from adrian@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id B22B78FC15; Sun, 24 Jun 2012 09:12:49 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q5O9CneD099790; Sun, 24 Jun 2012 09:12:49 GMT (envelope-from adrian@svn.freebsd.org) Received: (from adrian@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q5O9CnP5099786; Sun, 24 Jun 2012 09:12:49 GMT (envelope-from adrian@svn.freebsd.org) Message-Id: <201206240912.q5O9CnP5099786@svn.freebsd.org> From: Adrian Chadd Date: Sun, 24 Jun 2012 09:12:49 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r237530 - user/adrian/ath_radar_stuff/src/qt-hpktlog X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 24 Jun 2012 09:12:50 -0000 Author: adrian Date: Sun Jun 24 09:12:49 2012 New Revision: 237530 URL: http://svn.freebsd.org/changeset/base/237530 Log: Change the window title to be something useful, so I can easily determine what's going on with multiple windows. Modified: user/adrian/ath_radar_stuff/src/qt-hpktlog/MainApp.cpp user/adrian/ath_radar_stuff/src/qt-hpktlog/MainApp.h user/adrian/ath_radar_stuff/src/qt-hpktlog/main.cpp Modified: user/adrian/ath_radar_stuff/src/qt-hpktlog/MainApp.cpp ============================================================================== --- user/adrian/ath_radar_stuff/src/qt-hpktlog/MainApp.cpp Sun Jun 24 08:47:19 2012 (r237529) +++ user/adrian/ath_radar_stuff/src/qt-hpktlog/MainApp.cpp Sun Jun 24 09:12:49 2012 (r237530) @@ -1,3 +1,5 @@ +#include + #include #include #include @@ -64,6 +66,13 @@ MainApp::~MainApp() delete q_plot; } +void +MainApp::SetTitle(std::string s) +{ + + q_plot->setTitle(QString::fromStdString(s)); +} + // // This causes the radar entry to get received and replotted. // It's quite possible we should just fire off a 1ms timer event Modified: user/adrian/ath_radar_stuff/src/qt-hpktlog/MainApp.h ============================================================================== --- user/adrian/ath_radar_stuff/src/qt-hpktlog/MainApp.h Sun Jun 24 08:47:19 2012 (r237529) +++ user/adrian/ath_radar_stuff/src/qt-hpktlog/MainApp.h Sun Jun 24 09:12:49 2012 (r237530) @@ -2,6 +2,7 @@ #define __MAINAPP_H__ #include +#include #include #include @@ -64,6 +65,8 @@ class MainApp : public QMainWindow void timerEvent(QTimerEvent *event); + void SetTitle(std::string s); + public slots: void getRadarEntry(struct radar_entry re); Modified: user/adrian/ath_radar_stuff/src/qt-hpktlog/main.cpp ============================================================================== --- user/adrian/ath_radar_stuff/src/qt-hpktlog/main.cpp Sun Jun 24 08:47:19 2012 (r237529) +++ user/adrian/ath_radar_stuff/src/qt-hpktlog/main.cpp Sun Jun 24 09:12:49 2012 (r237530) @@ -79,6 +79,7 @@ main(int argc, char *argv[]) QApplication a(argc, argv); PktSource ps; MainApp m; + std::string title; int type = 0; @@ -94,6 +95,12 @@ main(int argc, char *argv[]) // Ensure the chip is correct ps.SetChipId(type); + title = "Scatterplot "; + title.append(argv[1]); + title.append(" ("); + title.append(argv[2]); + title.append(")"); + m.SetTitle(title); // Connect the ps source -> mainapp handler QObject::connect(&ps, SIGNAL(emitRadarEntry(struct radar_entry)),