From 8f1655c874e822c42ee111a7134bca5bc4c618ef Mon Sep 17 00:00:00 2001 From: Ethereal Date: Tue, 25 Jan 2011 09:22:45 -0700 Subject: [PATCH] The Visualizer's GUI design is being threshed out nicely now. Hopefully, I will be able to complete the design by the end of the week. --- include/visualizer/RootWindow.h | 3 ++- modules/informer/src/SConscript | 1 - modules/informer/src/collector/informer.c | 2 +- visualizer/src/RootWindow.cpp | 12 +++++------- visualizer/src/resources.qrc | 2 +- 5 files changed, 9 insertions(+), 11 deletions(-) diff --git a/include/visualizer/RootWindow.h b/include/visualizer/RootWindow.h index 1021932..ce02f8e 100644 --- a/include/visualizer/RootWindow.h +++ b/include/visualizer/RootWindow.h @@ -12,13 +12,14 @@ #ifndef AesalonVisualizer_RootWindow_H #define AesalonVisualizer_RootWindow_H +#include #include namespace Visualizer { class RootWindow : public QMainWindow { Q_OBJECT private: - + QSplitter *m_splitter; public: RootWindow(); virtual ~RootWindow(); diff --git a/modules/informer/src/SConscript b/modules/informer/src/SConscript index ef154b5..8fb94af 100644 --- a/modules/informer/src/SConscript +++ b/modules/informer/src/SConscript @@ -1,6 +1,5 @@ Import("env") -#env.Append(CPPPATH = ["../../../include/"]) env.Append(CCFLAGS = ["-W", "-Wall", "-D_GNU_SOURCE"]) env.Append(LIBS = ["rt", "dl"]) diff --git a/modules/informer/src/collector/informer.c b/modules/informer/src/collector/informer.c index 0eac080..f949497 100644 --- a/modules/informer/src/collector/informer.c +++ b/modules/informer/src/collector/informer.c @@ -392,7 +392,7 @@ void AI_CreateMonitoringThread(void *(func)(void *), void *arg) { threadSetup.argument = arg; pthread_t pt; /* TODO: use the actual pthread_create, not default. */ - pthread_create(&pt, NULL, AI_startMonitoringThread, &threadSetup); + AI_pthreadCreate(&pt, NULL, AI_startMonitoringThread, &threadSetup); AI_StopCollection(pt); } diff --git a/visualizer/src/RootWindow.cpp b/visualizer/src/RootWindow.cpp index f5f7f02..7bbfbeb 100644 --- a/visualizer/src/RootWindow.cpp +++ b/visualizer/src/RootWindow.cpp @@ -12,7 +12,6 @@ #include "RootWindow.h" #include #include -#include #include namespace Visualizer { @@ -31,7 +30,7 @@ void RootWindow::initialSetup() { setMinimumHeight(400); /* Icon . . . */ - setWindowIcon(QIcon(":/data/aesalon-icon-96x96.png")); + setWindowIcon(QIcon(":/icon.png")); /* Menus . . . */ QMenu *menu = NULL; @@ -47,12 +46,11 @@ void RootWindow::initialSetup() { tr("&Close")); connect(action, SIGNAL(triggered(bool)), SLOT(close())); - QDockWidget *testWidget = new QDockWidget(tr("Test"), this); - testWidget->setAllowedAreas(Qt::LeftDockWidgetArea | Qt::RightDockWidgetArea); - testWidget->setWidget(new QLabel("Testing")); - addDockWidget(Qt::LeftDockWidgetArea, testWidget); + m_splitter = new QSplitter(); - setCentralWidget(new QLabel("main")); + m_splitter->setOrientation(Qt::Horizontal); + + setCentralWidget(m_splitter); } void RootWindow::newRootWindow() { diff --git a/visualizer/src/resources.qrc b/visualizer/src/resources.qrc index 0defb3d..53a102f 100644 --- a/visualizer/src/resources.qrc +++ b/visualizer/src/resources.qrc @@ -1,6 +1,6 @@ -data/aesalon-icon-96x96.png +data/aesalon-icon-96x96.png -- 2.11.4.GIT