Mercurial > octave
comparison libgui/graphics/Logger.cc @ 18498:2e7cad6f180c gui-release
Initial integration of QtHandles.
* configure.ac: Check for QtOpenGL module.
* libgui/Makefile.am: Include libgui/graphics/module.mk.
(liboctgui_la_LIBADD): Include graphics/libgui-graphics.la in the
list.
(rcc-command): Pass "-name DIR" to rcc command.
* main-window.cc (main_window::construct): Install qt functions and
register qt toolkit.
* libgui/src/module.mk (src_libgui_src_la_CPPFLAGS): Include
$(FONTCONFIG_CPPFLAGS) and -I$(srcdir)/graphics in the list.
* graphics.cc (gtk_manager::gtk_manager): Make qt the default toolkit
if it is available.
* libgui/graphics/Backend.cc, libgui/graphics/Backend.h,
libgui/graphics/BaseControl.cc, libgui/graphics/BaseControl.h,
libgui/graphics/ButtonControl.cc, libgui/graphics/ButtonControl.h,
libgui/graphics/Canvas.cc, libgui/graphics/Canvas.h,
libgui/graphics/CheckBoxControl.cc, libgui/graphics/CheckBoxControl.h,
libgui/graphics/Container.cc, libgui/graphics/Container.h,
libgui/graphics/ContextMenu.cc, libgui/graphics/ContextMenu.h,
libgui/graphics/EditControl.cc, libgui/graphics/EditControl.h,
libgui/graphics/Figure.cc, libgui/graphics/Figure.h,
libgui/graphics/FigureWindow.cc, libgui/graphics/FigureWindow.h,
libgui/graphics/GLCanvas.cc, libgui/graphics/GLCanvas.h, ,
libgui/graphics/GenericEventNotify.h, libgui/graphics/KeyMap.cc,
libgui/graphics/KeyMap.h, libgui/graphics/ListBoxControl.cc,
libgui/graphics/ListBoxControl.h, libgui/graphics/Logger.cc,
libgui/graphics/Logger.h, libgui/graphics/Menu.cc,
libgui/graphics/Menu.h, libgui/graphics/MenuContainer.h,
libgui/graphics/MouseModeActionGroup.cc,
libgui/graphics/MouseModeActionGroup.h, libgui/graphics/Object.cc,
libgui/graphics/Object.h, libgui/graphics/ObjectFactory.cc,
libgui/graphics/ObjectFactory.h, libgui/graphics/ObjectProxy.cc,
libgui/graphics/ObjectProxy.h, libgui/graphics/Panel.cc,
libgui/graphics/Panel.h, libgui/graphics/PopupMenuControl.cc,
libgui/graphics/PopupMenuControl.h,
libgui/graphics/PushButtonControl.cc,
libgui/graphics/PushButtonControl.h, libgui/graphics/PushTool.cc,
libgui/graphics/PushTool.h, libgui/graphics/RadioButtonControl.cc,
libgui/graphics/RadioButtonControl.h,
libgui/graphics/SliderControl.cc, libgui/graphics/SliderControl.h,
libgui/graphics/TextControl.cc, libgui/graphics/TextControl.h,
libgui/graphics/TextEdit.cc, libgui/graphics/TextEdit.h,
libgui/graphics/ToggleButtonControl.cc,
libgui/graphics/ToggleButtonControl.h, libgui/graphics/ToggleTool.cc,
libgui/graphics/ToggleTool.h, libgui/graphics/ToolBar.cc,
libgui/graphics/ToolBar.h, libgui/graphics/ToolBarButton.cc,
libgui/graphics/ToolBarButton.h, libgui/graphics/Utils.cc,
libgui/graphics/Utils.h, libgui/graphics/__init_qt__.cc,
libgui/graphics/__init_qt__.h, libgui/graphics/gl-select.cc,
libgui/graphics/gl-select.h, libgui/graphics/images/README,
libgui/graphics/images/pan.png, libgui/graphics/images/rotate.png,
libgui/graphics/images/select.png, libgui/graphics/images/zoom.png,
libgui/graphics/module.mk, libgui/graphics/qthandles.qrc:
New files.
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Thu, 20 Feb 2014 14:05:45 -0500 |
parents | |
children | 49877d3be064 |
comparison
equal
deleted
inserted
replaced
18495:1ec884e5ff00 | 18498:2e7cad6f180c |
---|---|
1 /* | |
2 | |
3 Copyright (C) 2011 Michael Goffioul. | |
4 | |
5 This file is part of QtHandles. | |
6 | |
7 Foobar is free software: you can redistribute it and/or modify | |
8 it under the terms of the GNU General Public License as published by | |
9 the Free Software Foundation, either version 3 of the License, or | |
10 (at your option) any later version. | |
11 | |
12 QtHandles is distributed in the hope that it will be useful, | |
13 but WITHOUT ANY WARRANTY; without even the implied warranty of | |
14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
15 GNU General Public License for more details. | |
16 | |
17 You should have received a copy of the GNU General Public License | |
18 along with Foobar. If not, see <http://www.gnu.org/licenses/>. | |
19 | |
20 */ | |
21 | |
22 #ifdef HAVE_CONFIG_H | |
23 #include <config.h> | |
24 #endif | |
25 | |
26 #include <QMutex> | |
27 #include <QMutexLocker> | |
28 #include <QProcessEnvironment> | |
29 | |
30 #include <cstdio> | |
31 | |
32 #include "Logger.h" | |
33 | |
34 ////////////////////////////////////////////////////////////////////////////// | |
35 | |
36 namespace QtHandles | |
37 { | |
38 | |
39 ////////////////////////////////////////////////////////////////////////////// | |
40 | |
41 Logger* Logger::s_instance = 0; | |
42 QMutex* Logger::s_mutex = 0; | |
43 | |
44 ////////////////////////////////////////////////////////////////////////////// | |
45 | |
46 Logger::Logger (void) | |
47 : m_debugEnabled (false) | |
48 { | |
49 QProcessEnvironment pe (QProcessEnvironment::systemEnvironment ()); | |
50 | |
51 if (pe.value ("QTHANDLES_DEBUG", "0") != "0") | |
52 m_debugEnabled = true; | |
53 } | |
54 | |
55 ////////////////////////////////////////////////////////////////////////////// | |
56 | |
57 Logger::~Logger (void) | |
58 { | |
59 } | |
60 | |
61 ////////////////////////////////////////////////////////////////////////////// | |
62 | |
63 Logger* Logger::instance (void) | |
64 { | |
65 if (! s_instance) | |
66 { | |
67 s_instance = new Logger (); | |
68 s_mutex = new QMutex (); | |
69 } | |
70 | |
71 return s_instance; | |
72 } | |
73 | |
74 ////////////////////////////////////////////////////////////////////////////// | |
75 | |
76 #define STATIC_LOGGER(fun) \ | |
77 void Logger::fun (const char* fmt, ...) \ | |
78 { \ | |
79 QMutexLocker lock (s_mutex); \ | |
80 va_list vl; \ | |
81 va_start (vl, fmt); \ | |
82 instance ()->fun ## V (fmt, vl); \ | |
83 va_end (vl); \ | |
84 } | |
85 | |
86 STATIC_LOGGER (debug) | |
87 | |
88 ////////////////////////////////////////////////////////////////////////////// | |
89 | |
90 void Logger::debugV (const char* fmt, va_list arg) | |
91 { | |
92 if (m_debugEnabled) | |
93 { | |
94 vfprintf (stderr, fmt, arg); | |
95 fprintf (stderr, "\n"); | |
96 } | |
97 } | |
98 | |
99 ////////////////////////////////////////////////////////////////////////////// | |
100 | |
101 }; // namespace QtHandles |