diff --git a/.ci/docker/Dockerfile-post b/.ci/docker/Dockerfile-post index 42b6b5e..aa277fd 100644 --- a/.ci/docker/Dockerfile-post +++ b/.ci/docker/Dockerfile-post @@ -1,7 +1,7 @@ -FROM dactl-debian +FROM dactl-debian:latest -RUN apt install --no-install-recommends -qq -y libcomedi-dev -RUN updatedb +RUN apt install --no-install-recommends -qq -y \ + libcomedi-dev RUN useradd -ms /bin/bash user @@ -9,13 +9,11 @@ USER user WORKDIR /home/user COPY --chown=user:user . dactl - -RUN tar -zcvf libdactl_1.0.orig.tar.gz ./dactl - WORKDIR /home/user/dactl - +RUN meson -Dprefix=/usr _build \ + && ninja -C _build +RUN tar -zcvf ../libdactl_1.0.orig.tar.gz ./ RUN export PKG_CONFIG_PATH=/usr/lib/x86_64-linux-gnu/pkgconfig/ - RUN debuild WORKDIR /home/user diff --git a/.dockerignore b/.dockerignore new file mode 100644 index 0000000..69fa449 --- /dev/null +++ b/.dockerignore @@ -0,0 +1 @@ +_build/ diff --git a/.gitignore b/.gitignore index 9238358..3fe78a5 100644 --- a/.gitignore +++ b/.gitignore @@ -3,22 +3,16 @@ \#*.*\# _build/ -debian/dactl-1.0-0.debhelper.log -debian/dactl-1.0-dev.debhelper.log -debian/gir1.2-dactl-1.0.debhelper.log + +# ignore unwanted packaging files obj-x86_64-linux-gnu/ +debian/dactl/ +debian/files +debian/tmp/ debian/.debhelper/ +debian/**/*.log +debian/**/*.substvars debian/debhelper-build-stamp -debian/tmp/ -debian/files -debian/gir1.2-dactl-1.0.substvars debian/gir1.2-dactl-1.0/ -debian/libdactl-1.0-0.debhelper.log -debian/libdactl-1.0-0.substvars debian/libdactl-1.0-0/ -debian/libdactl-1.0-dev.debhelper.log -debian/libdactl-1.0-dev.substvars debian/libdactl-1.0-dev/ -debian/dactl.debhelper.log -debian/dactl.substvars -debian/dactl/ diff --git a/doc/manual/source/setup.rst b/doc/manual/source/setup.rst index 57ae4cd..aa1388c 100644 --- a/doc/manual/source/setup.rst +++ b/doc/manual/source/setup.rst @@ -11,96 +11,93 @@ Requirements * GNOME 3 is the only tested DE * Vala -Building from Source -==================== - -The source code is hosted on `GitHub `_. - -Pre-installation Setup ----------------------- - -Install Fedora 19 .. 23 dependencies -^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +Install from PackageCloud +========================== .. code-block:: none :linenos: - sudo dnf install -y automake autoconf libtool gnome-common intltool gcc vala - sudo dnf install -y glib2-devel gtk3-devel libxml2-devel libgee-devel \ - json-glib-devel clutter-devel clutter-gtk-devel gsl-devel gtksourceview3-devel \ - libmatheval-devel sqlite-devel gobject-introspection-devel gettext-devel \ - gettext-common-devel libmodbus-devel comedilib-devel librsvg2-devel \ - python3-devel pygobject3-devel libpeas-devel libsoup-devel webkitgtk4-devel + sudo apt update + sudo apt install --no-install-recommends -qq -y curl ca-certificates + sudo curl -s https://packagecloud.io/install/repositories/coanda/public/script.deb.sh | sudo bash -Install Ubuntu 14.04 dependencies -^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + # just dactl + sudo apt install dactl -Notice: These commands have only been tested as part of a Travis-CI build. + # libdactl + sudo apt install -y libdactl-1.0 -.. code-block:: none - :linenos: + # devlopment + sudo apt install -y libdactl-1.0-dev - sudo add-apt-repository ppa:vala-team/ppa -y - sudo apt-get update -qq - sudo apt-get install -qq gnome-common libglib2.0-dev libjson-glib-dev \ - libgee-0.8-dev libvala-0.22-dev libgsl0-dev libsqlite0-dev libxml2-dev \ - libmatheval-dev libmodbus-dev libcomedi-dev valac-0.22 librsvg2-dev \ - libgirepository1.0-dev libgtk-3-dev libclutter-1.0-dev libclutter-gtk-1.0-dev \ - python3-dev python-gobject-dev +Building from Source +==================== -Compiled Dependencies ---------------------- +The source code is hosted on `GitHub `_. +The api documentation is hosted on `GitHub `_. -Install Vala dependencies -^^^^^^^^^^^^^^^^^^^^^^^^^ +Install Fedora 30 +------------------------------- .. code-block:: none :linenos: - git clone https://github.com/geoffjay/modbus-vapi.git - git clone https://github.com/geoffjay/comedi-vapi.git - sudo mkdir -p /usr/local/lib/pkgconfig - sudo cp comedi-vapi/comedi.pc /usr/local/lib/pkgconfig/ - ver=`vala --version | sed -e 's/.*\([0-9]\.[0-9][0-9]\).*/\1/'` - sudo cp comedi-vapi/comedi.vapi /usr/share/vala-$ver/vapi/ - sudo cp modbus-vapi/libmodbus.vapi /usr/share/vala-$ver/vapi/ + sudo dnf update + sudo dnf install -y git \ + meson \ + ninja-build \ + gnome-common \ + intltool \ + gcc \ + vala \ + libgee-devel \ + json-glib-devel \ + gsl-devel \ + libxml2-devel \ + libmatheval-devel \ + comedilib-devel \ + libpeas-devel \ + libsoup-devel \ + gtksourceview-devel \ + librsvg2-devel \ + webkit2gtk3-devel + + export PKG_CONFIG_PATH=/usr/local/lib64/pkgconfig/ + sudo ninja -C _build install + echo "/usr/local/lib64" | sudo tee --append /etc/ld.so.conf + sudo ldconfig -Install libcld -^^^^^^^^^^^^^^ +Install Debian 10 +------------------------------ .. code-block:: none :linenos: - git clone https://github.com/geoffjay/libcld.git - cd libcld - git checkout ca85cde6f53632bcf6b298cd10f336e31f071f2c - export PKG_CONFIG_PATH=/usr/local/lib/pkgconfig - ./autogen.sh - make && sudo make install - cd .. - echo "/usr/local/lib" | sudo tee --append /etc/ld.so.conf + sudo apt install -y git \ + meson \ + gcc \ + valac \ + libpeas-dev \ + libsoup2.4-dev \ + libgtksourceview-3.0-dev \ + librsvg2-dev \ + libwebkit2gtk-4.0-dev \ + gettext + + export PKG_CONFIG_PATH=/usr/local/lib/x86_64-linux-gnu/pkgconfig/ + git clone git@github.com:coanda/dactl.git + cd dactl + meson _build + sudo ninja -C _build install + echo "/usr/local/lib/x86_64-linux-gnu" | sudo tee --append /etc/ld.so.conf sudo ldconfig -Compile and Install dactl -------------------------- - .. warning:: Installation overwrites the configuration file at `$(sysconfdir)/dactl/`, if an alternate value wasn't provided for `--prefix` than this is probably `/usr/local/etc/dactl`. It's recommended that the existing configuration is copied over `data/config/dactl.xml` or backed up and dealt with separately. -.. code-block:: none - :linenos: - - git clone https://github.com/coanda/dactl.git - cd dactl - git checkout v0.3.x-hotfix - export PKG_CONFIG_PATH=/usr/local/lib/pkgconfig - ./autogen.sh - sudo cp vapi/glib-extra.vapi /usr/share/vala-0.32/vapi/ - make && sudo make install - Post-installation Configuration ------------------------------- diff --git a/doc/meson.build b/doc/meson.build index 5bda6c6..01bf7c7 100644 --- a/doc/meson.build +++ b/doc/meson.build @@ -2,3 +2,4 @@ valadoc = find_program('valadoc', required : false) gtkdoc = dependency('gtk-doc', required : false) subdir('reference') +subdir('manual') diff --git a/doc/reference/meson.build b/doc/reference/meson.build index 42df4c4..0c2a8da 100644 --- a/doc/reference/meson.build +++ b/doc/reference/meson.build @@ -7,29 +7,108 @@ if valadoc.found() '--directory', '@OUTPUT@', '--vapidir', join_paths(meson.source_root(), 'vapi'), '--vapidir', join_paths(meson.source_root(), 'src', 'config'), - '--pkg', 'dactl-config', '--pkg', 'cld-1.0', + '--pkg', 'comedilib', + '--pkg', 'dactl-config', '--pkg', 'gio-2.0', '--pkg', 'gee-0.8', '--pkg', 'gmodule-2.0', '--pkg', 'libpeas-1.0', '--pkg', 'libxml-2.0', - '--pkg', 'comedilib', '--pkg', 'linux', '--pkg', 'posix' ] - custom_target('valadoc-core', - input: libdactl_core_sources, - output: 'valadoc', + #custom_target('valadoc-core', + #input: libdactl_core_sources, + #output: 'valadoc-core', + #depends : libdactl, + #build_by_default : get_option('with-valadoc'), + #command : + #[ + #valadoc, + #core_doc_common_args, + #'-o', 'valadoc', + #libdactl_core_sources + #] + #) + + dactl_doc_common_args = [ + '--package-name', 'dactl', + '--package-version', api_version, + '-b', join_paths(meson.source_root(), 'src', 'dactl'), + '--force', + '--directory', '@OUTPUT@', + '--vapidir', join_paths(meson.source_root(), 'vapi'), + '--vapidir', join_paths(meson.source_root(), 'src', 'config'), + '--pkg', 'cld-1.0', + '--pkg', 'comedilib', + '--pkg', 'dactl-1.0', + '--pkg', 'dactl-config', + '--pkg', 'gee-0.8', + '--pkg', 'glib-2.0', + '--pkg', 'glib-extra', + '--pkg', 'gobject-2.0', + '--pkg', 'gtk+-3.0', + '--pkg', 'gtksourceview-3.0', + '--pkg', 'json-glib-1.0', + '--pkg', 'libxml-2.0', + '--pkg', 'librsvg-2.0', + '--pkg', 'libpeas-1.0', + '--pkg', 'posix', + '--pkg', 'webkit2gtk-4.0', + ] + + custom_target('valadoc-dactl', + input: dactl_sources_object, + output: 'valadoc-dactl', + depends : libdactl, + build_by_default : get_option('with-valadoc'), + command : + [ + valadoc, + dactl_doc_common_args, + '-o', 'valadoc', + dactl_sources_object + ] + ) + + ui_doc_common_args = [ + '--verbose', + '--package-name', 'libdactl', + '--package-version', api_version, + '-b', join_paths(meson.source_root(), 'src', 'libdactl'), + '--force', + '--directory', '@OUTPUT@', + '--vapidir', join_paths(meson.source_root(), 'vapi'), + '--vapidir', join_paths(meson.source_root(), 'src', 'config'), + '--pkg', 'cld-1.0', + '--pkg', 'comedilib', + '--pkg', 'dactl-config', + '--pkg', 'gee-0.8', + '--pkg', 'gmodule-2.0', + '--pkg', 'gsl', + '--pkg', 'gtk+-3.0', + '--pkg', 'libpeas-1.0', + '--pkg', 'libxml-2.0', + '--pkg', 'librsvg-2.0', + '--pkg', 'linux', + '--pkg', 'posix', + '--pkg', 'webkit2gtk-4.0', + ] + + core_ui_sources = [libdactl_core_sources, ui_sources_object] + custom_target('valadoc-dactl-ui', + input: core_ui_sources, + output: 'valadoc-dactl-ui', depends : libdactl, build_by_default : get_option('with-valadoc'), command : [ valadoc, - core_doc_common_args, + ui_doc_common_args, '-o', 'valadoc', - libdactl_core_sources + core_ui_sources, ] ) @@ -53,6 +132,26 @@ if valadoc.found() ] ) + #custom_target('gtkdoc-dactl', + #input : libdactl_core_sources, + #output : 'gtkdoc', + #depends : libdactl, + #build_by_default : get_option('with-gtkdoc'), + #command : + #[ + #valadoc, + #'--doclet', 'gtkdoc', + #'-o', 'gtkdoc', + #core_doc_common_args, + #'-X', join_paths(meson.build_root(), 'src/libdactl/dactl.h'), + #'-X', '-l', + #'-X', join_paths(meson.build_root(), 'src/libdactl/libdactl-1.0.so'), + #'-b', join_paths(meson.source_root(), 'src', 'libdactl'), + #libdactl_core_sources + #] + #) + endif + # TODO: implement gtkdoc creation - see https://gitlab.gnome.org/sbacher/rygel/tree/master/doc/reference/librygel-core/gtkdoc ## if get_option('with-gtkdoc') ## install_subdir('gtkdoc/html', @@ -60,5 +159,4 @@ if valadoc.found() ## strip_directory : true ## ) ## endif - endif endif diff --git a/meson.build b/meson.build index cef7a3f..441bc6d 100644 --- a/meson.build +++ b/meson.build @@ -1,7 +1,7 @@ project('dactl', [ 'c', 'vala' ], license: 'LGPL3+', version: '0.4.4', - meson_version: '>= 0.50.0', + meson_version: '>= 0.49.2', default_options: [ 'c_std=gnu11', 'warning_level=2', @@ -62,7 +62,7 @@ dir_vapi = join_paths(meson.current_source_dir(), 'vapi') add_project_arguments([ ['--vapidir', dir_vapi], - '--disable-warnings', + #'--disable-warnings', ], language: 'vala') dep_cld = dependency('cld-1.0') diff --git a/src/dactl/application-toolbar.vala b/src/dactl/application-toolbar.vala index c9b21d6..b84a300 100644 --- a/src/dactl/application-toolbar.vala +++ b/src/dactl/application-toolbar.vala @@ -4,18 +4,6 @@ private class Dactl.ApplicationToolbar : Gtk.HeaderBar { [GtkChild] private Gtk.MenuButton btn_settings; - [GtkChild] - private Gtk.Button btn_previous; - - [GtkChild] - private Gtk.Button btn_next; - - [GtkChild] - private Gtk.Image img_previous; - - [GtkChild] - private Gtk.Image img_next; - construct { var app = Dactl.UI.Application.get_default (); var model = app.model; diff --git a/src/dactl/application-view.vala b/src/dactl/application-view.vala index d28956c..b2f4aa1 100644 --- a/src/dactl/application-view.vala +++ b/src/dactl/application-view.vala @@ -49,12 +49,6 @@ public class Dactl.UI.ApplicationView : Gtk.ApplicationWindow, Dactl.Application [GtkChild] private Dactl.ConfigurationEditor configuration; - [GtkChild] - private Gtk.Box main_vbox; - - [GtkChild] - private Gtk.Overlay overlay; - private uint configure_id; public static const uint configure_id_timeout = 100; // ms @@ -254,7 +248,6 @@ public class Dactl.UI.ApplicationView : Gtk.ApplicationWindow, Dactl.Application private void treeview_channel_selected_cb (string id) { debug ("Selected channel `%s' to be highlighted on chart", id); - var channel = model.ctx.get_object (id); /** * FIXME: the stripchart class doesn't use the chart as its base yet diff --git a/src/dactl/application.vala b/src/dactl/application.vala index ba820c8..bd6d38e 100644 --- a/src/dactl/application.vala +++ b/src/dactl/application.vala @@ -3,7 +3,7 @@ * on the changes made to the model. * * XXX should consider adding signals where necessary in the model and only - * update the view when it fires a signal to improve performance. + * update the view when it fires a signal to improve performance. */ public class Dactl.UI.Application : Gtk.Application { @@ -602,29 +602,6 @@ public class Dactl.UI.Application : Gtk.Application { (dialog as Gtk.Dialog).run (); } - /** - * Action callback for acquire. - */ - private void acquire_activated_cb (SimpleAction action, Variant? parameter) { - this.hold (); - Variant state = action.get_state (); - bool active = state.get_boolean (); - action.set_state (new Variant.boolean (!active)); - /* XXX locking the model may not be necessary, from older version */ - if (!active) { - lock (model) { - controller.start_acquisition (); - controller.start_device_output (); - } - } else { - lock (model) { - controller.stop_acquisition (); - controller.stop_device_output (); - } - } - this.release (); - } - /** * Action callback for defaults. */ diff --git a/src/dactl/configuration/toolbar.vala b/src/dactl/configuration/toolbar.vala index 1437da2..90e2e19 100644 --- a/src/dactl/configuration/toolbar.vala +++ b/src/dactl/configuration/toolbar.vala @@ -1,9 +1,6 @@ [GtkTemplate (ui = "/org/coanda/dactl/ui/configuration-toolbar.ui")] private class Dactl.ConfigurationToolbar : Gtk.HeaderBar { - [GtkChild] - private Gtk.Button back_button; - [GtkChild] private Gtk.Image back_image; diff --git a/src/dactl/dbus-service.vala b/src/dactl/dbus-service.vala index 46146de..3ab8dc3 100644 --- a/src/dactl/dbus-service.vala +++ b/src/dactl/dbus-service.vala @@ -15,39 +15,39 @@ internal class Dactl.DBusService : GLib.Object, Dactl.DBusInterface { this.main.exit (0); } - public int log_get_verbosity () { - return log.verbosity; + public int log_get_verbosity () throws GLib.DBusError, GLib.IOError { + return SysLog.verbosity; } - public void log_set_verbosity (int level) { - log.verbosity = level; + public void log_set_verbosity (int level) throws GLib.DBusError, GLib.IOError { + SysLog.verbosity = level; } - public void log_add (string filename) { - log.add (filename); + public void log_add (string filename) throws GLib.DBusError, GLib.IOError { + SysLog.add (filename); } - public void log_remove (string filename) { - log.remove (filename); + public void log_remove (string filename) throws GLib.DBusError, GLib.IOError { + SysLog.remove (filename); } - public void log_test_message () { + public void log_test_message () throws GLib.DBusError, GLib.IOError { message ("test message"); } - public void log_test_debug () { + public void log_test_debug () throws GLib.DBusError, GLib.IOError { debug ("test message"); } - public void log_test_warning () { + public void log_test_warning () throws GLib.DBusError, GLib.IOError { warning ("test message"); - } + } - public void log_test_critical () { + public void log_test_critical () throws GLib.DBusError, GLib.IOError { critical ("test message"); } - public void log_test_error () { + public void log_test_error () throws GLib.DBusError, GLib.IOError { error ("test message"); } @@ -101,7 +101,7 @@ internal class Dactl.DBusService : GLib.Object, Dactl.DBusInterface { /*** Test Methods ***/ - public void ping (GLib.BusName sender) { + public void ping (GLib.BusName sender) throws GLib.DBusError, GLib.IOError { message (("Received ping from: %s"), sender); pong (); } diff --git a/src/dactl/loader-toolbar.vala b/src/dactl/loader-toolbar.vala index 9174260..2735838 100644 --- a/src/dactl/loader-toolbar.vala +++ b/src/dactl/loader-toolbar.vala @@ -1,9 +1,6 @@ [GtkTemplate (ui = "/org/coanda/dactl/ui/loader-toolbar.ui")] private class Dactl.LoaderToolbar : Gtk.HeaderBar { - [GtkChild] - private Gtk.Button back_button; - [GtkChild] private Gtk.Image back_image; diff --git a/src/dactl/meson.build b/src/dactl/meson.build index b706826..012bc84 100644 --- a/src/dactl/meson.build +++ b/src/dactl/meson.build @@ -34,6 +34,8 @@ dactl_sources = [ 'settings/treeview.vala', ] +dactl_sources_object = files(dactl_sources) + dactl_c_args = [ '-DG_LOG_DOMAIN="dactl"', ] diff --git a/src/dactl/settings/dialog.vala b/src/dactl/settings/dialog.vala index 958cc13..60005ec 100644 --- a/src/dactl/settings/dialog.vala +++ b/src/dactl/settings/dialog.vala @@ -16,9 +16,6 @@ public class Dactl.SettingsDialog : Gtk.Window { [GtkChild] private Dactl.LogSettings log; - [GtkChild] - private Dactl.PluginSettings plugin; - [GtkChild] private Dactl.WidgetSettings widget; diff --git a/src/dactl/settings/general.vala b/src/dactl/settings/general.vala index bb9cd91..9a7b283 100644 --- a/src/dactl/settings/general.vala +++ b/src/dactl/settings/general.vala @@ -13,8 +13,6 @@ public class Dactl.GeneralSettings : Gtk.Box { [GtkChild] private Gtk.Entry entry_name; - private Gtk.StackSwitcher switcher; - private Dactl.UI.Application app; construct { diff --git a/src/dactl/settings/sidebar.vala b/src/dactl/settings/sidebar.vala index 60b9de8..e36dd6d 100644 --- a/src/dactl/settings/sidebar.vala +++ b/src/dactl/settings/sidebar.vala @@ -1,15 +1,9 @@ [GtkTemplate (ui = "/org/coanda/dactl/ui/settings-sidebar.ui")] private class Dactl.SettingsSidebar : Gtk.Box { - [GtkChild] - private Gtk.ListStore listmodel; - [GtkChild] private Gtk.TreeModelFilter model_filter; - [GtkChild] - private Gtk.TreeSelection selection; - [GtkChild] private Gtk.TreeView tree_view; @@ -28,14 +22,6 @@ private class Dactl.SettingsSidebar : Gtk.Box { tree_view.set_cursor (path, null, false); } - private void list_append (string label, bool visible) { - Gtk.TreeIter iter; - - listmodel.append (out iter); - listmodel.set (iter, 0, label); - listmodel.set (iter, 1, visible); - } - private void populate () { /* *foreach (var page in Dactl.SettingsStackPage.all ()) { diff --git a/src/dactl/settings/toolbar.vala b/src/dactl/settings/toolbar.vala index c8ea1b3..2d63fda 100644 --- a/src/dactl/settings/toolbar.vala +++ b/src/dactl/settings/toolbar.vala @@ -4,9 +4,6 @@ private class Dactl.SettingsToolbar : Gtk.HeaderBar { [GtkChild] private Gtk.Button btn_ok; - [GtkChild] - private Gtk.Button btn_cancel; - public signal void ok (); public signal void cancel (); diff --git a/src/dactl/settings/topbar.vala b/src/dactl/settings/topbar.vala index f5e0ee5..69ce7a0 100644 --- a/src/dactl/settings/topbar.vala +++ b/src/dactl/settings/topbar.vala @@ -23,9 +23,11 @@ private class Dactl.SettingsTopbar : Gtk.Stack { settings_toolbar.cancel.connect (do_cancel); } - public void set_subtitle (string subtitle) { - settings_toolbar.set_subtitle (subtitle); - } + /* + *public void set_subtitle (string subtitle) { + * settings_toolbar.set_subtitle (subtitle); + *} + */ private void do_ok () { ok (); diff --git a/src/dactl/topbar.vala b/src/dactl/topbar.vala index 7da9adc..a20bcbe 100644 --- a/src/dactl/topbar.vala +++ b/src/dactl/topbar.vala @@ -13,15 +13,6 @@ private class Dactl.Topbar : Gtk.Stack { [GtkChild] public Dactl.ApplicationToolbar application_toolbar; - [GtkChild] - public Dactl.LoaderToolbar loader_toolbar; - - [GtkChild] - public Dactl.ConfigurationToolbar configuration_toolbar; - - //[GtkChild] - //public Dactl.SettingsToolbar settings_toolbar; - construct { // FIXME: doesn't work from .ui file transition_type = Gtk.StackTransitionType.CROSSFADE; diff --git a/src/dactl/ux-manager.vala b/src/dactl/ux-manager.vala index 4d320ce..58f6752 100644 --- a/src/dactl/ux-manager.vala +++ b/src/dactl/ux-manager.vala @@ -34,7 +34,7 @@ public class Dactl.UI.UxManager : GLib.Object { // XXX not sure of whether to use a generic or variant??? } - public void @get (string property) { + public void @get (string property) throws GLib.DBusError, GLib.IOError { } /** @@ -42,7 +42,7 @@ public class Dactl.UI.UxManager : GLib.Object { * * @return Array of strings with the page ID values */ - public string[] list_pages () { + public string[] list_pages () throws GLib.DBusError, GLib.IOError { var page_map = view.model.get_object_map (typeof (Dactl.Page)); string[] pages = {}; @@ -133,7 +133,7 @@ public class Dactl.UI.UxManager : GLib.Object { * @param parent ID value to remove the child from * @param child ID value of the child to remove */ - public void remove_widget (string parent, string child) { + public void remove_widget (string parent, string child) throws GLib.DBusError, GLib.IOError { var parent_obj = view.model.get_object (parent); if (parent_obj is Dactl.Container) { var child_obj = (parent_obj as Dactl.Container).get_object (child); @@ -146,7 +146,7 @@ public class Dactl.UI.UxManager : GLib.Object { * * @param id ID value for the window to toggle the fullscreen state of */ - public void fullscreen (string id) { + public void fullscreen (string id) throws GLib.DBusError, GLib.IOError { var window = view.model.get_object (id); if (window is Dactl.UI.Window) { (window as GLib.ActionGroup).activate_action ("fullscreen", null); diff --git a/src/libdactl/core/application-config.vala b/src/libdactl/core/application-config.vala index 7b6ddd3..cdfb92b 100644 --- a/src/libdactl/core/application-config.vala +++ b/src/libdactl/core/application-config.vala @@ -82,9 +82,6 @@ public class Dactl.ApplicationConfig : GLib.Object { return nodes; } - private int depth = 0; - private int indent = 0; - /** * XXX this doesn't work * diff --git a/src/libdactl/core/log.vala b/src/libdactl/core/log.vala index 013962b..1afb3e3 100644 --- a/src/libdactl/core/log.vala +++ b/src/libdactl/core/log.vala @@ -1,7 +1,6 @@ /* * This file is a modified version taken from gnome-builder. */ - public enum Dactl.LogLevel { LEVEL_TRACE = LogLevelFlags.LEVEL_DEBUG + 1; } diff --git a/src/libdactl/core/object.vala b/src/libdactl/core/object.vala index 5334b15..e9bf28f 100644 --- a/src/libdactl/core/object.vala +++ b/src/libdactl/core/object.vala @@ -41,7 +41,6 @@ public interface Dactl.Object : GLib.Object { result += " %-24s%-35s%-24s%-20s\n".printf ("Name:", "Value:", "Value Type:", "Owner Type:"); foreach (ParamSpec spec in ocl.list_properties ()) { - string value; Type ptype = spec.value_type; string name = spec.get_name (); Value number = Value (ptype); diff --git a/src/libdactl/meson.build b/src/libdactl/meson.build index 8dc434d..37d7176 100644 --- a/src/libdactl/meson.build +++ b/src/libdactl/meson.build @@ -51,12 +51,14 @@ gir_sources = libdactl_sources + libdactl_headers + libdactl_generated_headers + join_paths(meson.current_build_dir(), 'dactl.h') ] +dir_gir = join_paths(get_option('prefix'), 'share', 'gir-1.0') + libdactl_gir = gnome.generate_gir(libdactl, sources: gir_sources, namespace: 'Dactl', nsversion: '@0@'.format(api_version), dependencies: dactl_deps, - include_directories: [include_directories('/usr/local/share/gir-1.0')], + include_directories: [include_directories(dir_gir)], includes: [ 'cairo-1.0', 'Cld-1.0', diff --git a/src/libdactl/ui/ai-control.vala b/src/libdactl/ui/ai-control.vala index 616f229..106ab00 100644 --- a/src/libdactl/ui/ai-control.vala +++ b/src/libdactl/ui/ai-control.vala @@ -1,3 +1,11 @@ +/** + * Displays the values of a {@link Cld.AIChannel} + * + * Example XML code: + * {{{ + * + * }}} + */ [GtkTemplate (ui = "/org/coanda/libdactl/ui/ai-control.ui")] public class Dactl.AIControl : Dactl.CompositeWidget, Dactl.CldAdapter { @@ -10,33 +18,12 @@ public class Dactl.AIControl : Dactl.CompositeWidget, Dactl.CldAdapter { [GtkChild] private Gtk.Box box_secondary; - [GtkChild] - private Gtk.Button btn_primary; - - [GtkChild] - private Gtk.Button btn_secondary; - [GtkChild] private Gtk.Label lbl_tag; [GtkChild] private Gtk.Label lbl_value; - [GtkChild] - private Gtk.Label lbl_avg; - - [GtkChild] - private Gtk.Label lbl_stddev; - - [GtkChild] - private Gtk.Label lbl_variance; - - [GtkChild] - private Gtk.Image img_primary; - - [GtkChild] - private Gtk.Image img_secondary; - private Gee.Map _objects; private string _xml = """ @@ -110,6 +97,12 @@ public class Dactl.AIControl : Dactl.CompositeWidget, Dactl.CldAdapter { request_data.begin (); } + /** + * Alternate construction that uses an XML node to set the object up. + * + * @param node an {@link Xml.Node} + * @see Dactl.Box + */ public AIControl.from_xml_node (Xml.Node *node) { build_from_xml_node (node); @@ -119,6 +112,8 @@ public class Dactl.AIControl : Dactl.CompositeWidget, Dactl.CldAdapter { /** * {@inheritDoc} + * @param node an {@link Xml.Node} + * @see Dactl.Box */ public override void build_from_xml_node (Xml.Node *node) { if (node->type == Xml.ElementType.ELEMENT_NODE && diff --git a/src/libdactl/ui/ao-control.vala b/src/libdactl/ui/ao-control.vala index 4f169d2..604be98 100644 --- a/src/libdactl/ui/ao-control.vala +++ b/src/libdactl/ui/ao-control.vala @@ -1,3 +1,12 @@ +/** + * Displays the values of a {@link Cld.AIChannel} + * + * Example XML code: + * {{{ + * + * }}} + * + */ [GtkTemplate (ui = "/org/coanda/libdactl/ui/ao-control.ui")] public class Dactl.AOControl : Dactl.CompositeWidget, Dactl.CldAdapter { @@ -22,12 +31,6 @@ public class Dactl.AOControl : Dactl.CompositeWidget, Dactl.CldAdapter { [GtkChild] private Gtk.Box box_secondary; - [GtkChild] - private Gtk.Button btn_next; - - [GtkChild] - private Gtk.Button btn_previous; - [GtkChild] private Gtk.Label lbl_tag; @@ -93,6 +96,12 @@ public class Dactl.AOControl : Dactl.CompositeWidget, Dactl.CldAdapter { //public AOControl (string ai_ref) {} + /** + * Alternate construction that uses an XML node to set the object up. + * + * @param node an {@link Xml.Node} + * @see Dactl.Box + */ public AOControl.from_xml_node (Xml.Node *node) { build_from_xml_node (node); @@ -102,6 +111,8 @@ public class Dactl.AOControl : Dactl.CompositeWidget, Dactl.CldAdapter { /** * {@inheritDoc} + * @param node an {@link Xml.Node} + * @see Dactl.Box */ public override void build_from_xml_node (Xml.Node *node) { if (node->type == Xml.ElementType.ELEMENT_NODE && diff --git a/src/libdactl/ui/box.vala b/src/libdactl/ui/box.vala index b23bbcb..b6357c7 100644 --- a/src/libdactl/ui/box.vala +++ b/src/libdactl/ui/box.vala @@ -1,5 +1,40 @@ /** * Box class used to act as a layout for other interface classes. + * + * Example XML code: + * {{{ + * + * + * true + * horizontal + * false + * false + * 5 + * 5 + * 5 + * 5 + * 5 + * true + * false + * + * + * }}} */ [GtkTemplate (ui = "/org/coanda/libdactl/ui/box.ui")] public class Dactl.Box : Dactl.CompositeWidget { @@ -96,6 +131,9 @@ public class Dactl.Box : Dactl.CompositeWidget { /** * {@inheritDoc} + * Alternate construction that uses an XML node to set the object up. + * @param node an {@link Xml.Node} + * @see Dactl.CompositeWidget */ public override void build_from_xml_node (Xml.Node *node) { string type; diff --git a/src/libdactl/ui/channel-matrix.vala b/src/libdactl/ui/channel-matrix.vala index bf4cced..f153c40 100644 --- a/src/libdactl/ui/channel-matrix.vala +++ b/src/libdactl/ui/channel-matrix.vala @@ -203,8 +203,6 @@ public class Dactl.ChannelMatrix : GLib.Object, Dactl.Object, } } - private int index = 0; - /** * {@inheritDoc} */ diff --git a/src/libdactl/ui/channel-vector.vala b/src/libdactl/ui/channel-vector.vala index d2b183b..6260ff8 100644 --- a/src/libdactl/ui/channel-vector.vala +++ b/src/libdactl/ui/channel-vector.vala @@ -154,8 +154,6 @@ public class Dactl.ChannelVector : GLib.Object, Dactl.Object, } } - private int index = 0; - /** * {@inheritDoc} */ @@ -235,7 +233,6 @@ public class Dactl.ChannelVector : GLib.Object, Dactl.Object, } } - int count = 0; private void new_value_cb (string uri, double value) { var xvalue = channel_xvalues.get (uri); int ix = channel_indexes.get (uri); diff --git a/src/libdactl/ui/chart-axis.vala b/src/libdactl/ui/chart-axis.vala index b93eb93..2a06691 100644 --- a/src/libdactl/ui/chart-axis.vala +++ b/src/libdactl/ui/chart-axis.vala @@ -93,8 +93,6 @@ public class Dactl.Axis : Dactl.Canvas, Dactl.Buildable, Dactl.Object { public int div_minor { get; set; default = 2; } - private bool dragging = false; - public signal void range_changed (double min, double max); public signal void label_changed (string label); @@ -109,12 +107,6 @@ public class Dactl.Axis : Dactl.Canvas, Dactl.Buildable, Dactl.Object { //private double cursor_y; - private double start_drag_x; - - private double start_drag_y; - - private bool reversed = false; - /** * {@inheritDoc} */ diff --git a/src/libdactl/ui/chart-colormap.vala b/src/libdactl/ui/chart-colormap.vala index 17dbadb..31fbaaa 100644 --- a/src/libdactl/ui/chart-colormap.vala +++ b/src/libdactl/ui/chart-colormap.vala @@ -102,8 +102,6 @@ protected class Dactl.ColorMap : Dactl.Canvas, Dactl.Buildable, Dactl.Object { public int div_minor { get; set; default = 2; } - private bool dragging = false; - public signal void range_changed (double min, double max); public signal void label_changed (string label); @@ -365,7 +363,6 @@ protected class Dactl.ColorMap : Dactl.Canvas, Dactl.Buildable, Dactl.Object { var x = 0; var y = 0; - Cairo.Pattern pat1 = new Cairo.Pattern.linear (0.0, 0.0, 0.0, h); for (int i = 0; i < h; i++) { double value = (double)i / (double)h; Gdk.RGBA color = Gdk.RGBA (); @@ -416,7 +413,6 @@ protected class Dactl.ColorMap : Dactl.Canvas, Dactl.Buildable, Dactl.Object { layout.set_font_description (desc); string markup = "%s".printf (tick_label); layout.set_markup (markup, -1); - var context = layout.get_context (); tick_layout_list.append (layout); } diff --git a/src/libdactl/ui/chart-trace.vala b/src/libdactl/ui/chart-trace.vala index 90ba307..bb74011 100644 --- a/src/libdactl/ui/chart-trace.vala +++ b/src/libdactl/ui/chart-trace.vala @@ -347,10 +347,12 @@ public class Dactl.Trace : GLib.Object, Dactl.Object, pixel_data.clear (); for (int i = 0; i < points; i++) { var x = (int)(i * width / (points - 1)); - var t1 = accel.find (scaled_xdata, x); - var x1 = scaled_xdata[t1]; - var x2 = scaled_xdata[t1 + 1]; - var t =(double)t1 * (1 + (x - x1)/(x2 - x1)); + //var t1 = accel.find (scaled_xdata, x); + /* + *var x1 = scaled_xdata[t1]; + *var x2 = scaled_xdata[t1 + 1]; + *var t =(double)t1 * (1 + (x - x1)/(x2 - x1)); + */ var deque = pixel_data as Gee.Deque; var point = new Dactl.Point (0, 0); /* Check if x value is inside the x range of the raw data */ diff --git a/src/libdactl/ui/chart-widget.vala b/src/libdactl/ui/chart-widget.vala index ff3062f..64bac12 100644 --- a/src/libdactl/ui/chart-widget.vala +++ b/src/libdactl/ui/chart-widget.vala @@ -227,7 +227,6 @@ public class Dactl.StripChartWidget : Dactl.ChartWidget { } public override void add_point_to_series (string id, double x, double y) { - bool has_next; if (!(chart_area as Dactl.ChartArea).data_series.has_key (id)) return; @@ -276,7 +275,7 @@ public class Dactl.XAxisArea : Gtk.DrawingArea { public override bool draw (Cairo.Context cr) { var w = get_allocated_width (); - var h = get_allocated_height (); + //var h = get_allocated_height (); /* ticks */ var x = 0; @@ -434,8 +433,10 @@ public class Dactl.ChartArea : Gtk.DrawingArea { } public override bool draw (Cairo.Context cr) { - var w = get_allocated_width (); - var h = get_allocated_height (); + /* + *var w = get_allocated_width (); + *var h = get_allocated_height (); + */ Gee.List color = new Gee.ArrayList (); /* Chart back */ diff --git a/src/libdactl/ui/chart.vala b/src/libdactl/ui/chart.vala index 43c6da2..a83d08f 100644 --- a/src/libdactl/ui/chart.vala +++ b/src/libdactl/ui/chart.vala @@ -57,7 +57,6 @@ protected class Dactl.ChartCanvas : Dactl.Canvas { var w = get_allocated_width (); var h = get_allocated_height (); - var parent = get_parent (); var grid_surface = new Cairo.ImageSurface (Cairo.Format.ARGB32, w, h); var grid = new Dactl.ChartGrid (grid_surface); diff --git a/src/libdactl/ui/drawing.vala b/src/libdactl/ui/drawing.vala index d4d2a02..ffde64e 100644 --- a/src/libdactl/ui/drawing.vala +++ b/src/libdactl/ui/drawing.vala @@ -281,7 +281,6 @@ public class Dactl.PolarChartGrid : Cairo.Context { var scale_y = (double)h / (y_max - y_min); scale = scale_x < scale_y ? scale_x : scale_y; scale = scale * zoom; - var d = w < h ? w : h; /* reposition it in the center of the window */ var dx = (w - scale * (x_max - x_min)) / 2; var dy = (h - scale * (y_max - y_min)) / 2; @@ -609,9 +608,6 @@ private class Dactl.Vector : Cairo.Context { public Vector (Cairo.Surface target) { base (target); } - - public void draw () { - } } [Compact] @@ -620,9 +616,6 @@ private class Dactl.VectorField : Cairo.Context { public VectorField (Cairo.Surface target) { base (target); } - - public void draw () { - } } [Compact] diff --git a/src/libdactl/ui/heatmap.vala b/src/libdactl/ui/heatmap.vala index fb4b112..0d6ab46 100644 --- a/src/libdactl/ui/heatmap.vala +++ b/src/libdactl/ui/heatmap.vala @@ -563,11 +563,6 @@ public class Dactl.HeatMap : GLib.Object, Dactl.Object, Dactl.Container, } } - /* Set a color for cells that have no channel reference (ie. raw data) */ - private void interpolate () { - /* XXX TBD */ - } - /** * {@inheritDoc} */ diff --git a/src/libdactl/ui/log-control.vala b/src/libdactl/ui/log-control.vala index 81485c6..c1c178c 100644 --- a/src/libdactl/ui/log-control.vala +++ b/src/libdactl/ui/log-control.vala @@ -22,12 +22,6 @@ public class Dactl.LogControl : Dactl.CompositeWidget, Dactl.CldAdapter { [GtkChild] private Gtk.Box box_secondary; - [GtkChild] - private Gtk.Button btn_start; - - [GtkChild] - private Gtk.Button btn_stop; - [GtkChild] private Gtk.Label lbl_id; @@ -37,12 +31,6 @@ public class Dactl.LogControl : Dactl.CompositeWidget, Dactl.CldAdapter { [GtkChild] private Gtk.Label lbl_logging_path; - [GtkChild] - private Gtk.Image img_start; - - [GtkChild] - private Gtk.Image img_stop; - public string log_ref { get; set; } private weak Cld.Log _log; diff --git a/src/libdactl/ui/meson.build b/src/libdactl/ui/meson.build index 3435799..5910fae 100644 --- a/src/libdactl/ui/meson.build +++ b/src/libdactl/ui/meson.build @@ -53,6 +53,7 @@ ui_sources = [ 'window.vala', ] + gsl_lib = meson.get_compiler('c').find_library('gsl') gsl_vapi = meson.get_compiler('vala').find_library('gsl', dirs: dir_vapi) dep_gsl = declare_dependency(dependencies: [gsl_lib, gsl_vapi]) @@ -96,4 +97,6 @@ install_headers(ui_headers, subdir: join_paths(libdactl_header_subdir, 'ui') ) +ui_sources_object = files(ui_sources) + endif diff --git a/src/libdactl/ui/pid-control.vala b/src/libdactl/ui/pid-control.vala index 481ef06..a4e8cce 100644 --- a/src/libdactl/ui/pid-control.vala +++ b/src/libdactl/ui/pid-control.vala @@ -22,30 +22,12 @@ public class Dactl.PidControl : Dactl.CompositeWidget, Dactl.CldAdapter { [GtkChild] private Gtk.Viewport viewport_off; - [GtkChild] - private Gtk.Button btn_control_start; - - [GtkChild] - private Gtk.Button btn_control_stop; - - [GtkChild] - private Gtk.Button btn_settings; - [GtkChild] private Gtk.SpinButton btn_output; [GtkChild] private Gtk.SpinButton btn_sp; - [GtkChild] - private Gtk.SpinButton btn_kp; - - [GtkChild] - private Gtk.SpinButton btn_ki; - - [GtkChild] - private Gtk.SpinButton btn_kd; - [GtkChild] private Gtk.Label lbl_input; @@ -58,15 +40,6 @@ public class Dactl.PidControl : Dactl.CompositeWidget, Dactl.CldAdapter { [GtkChild] private Gtk.Revealer settings; - [GtkChild] - private Gtk.Image img_control_start; - - [GtkChild] - private Gtk.Image img_control_stop; - - [GtkChild] - private Gtk.Image img_settings; - [GtkChild] private Gtk.Label lbl_id; diff --git a/src/libdactl/ui/pnid.vala b/src/libdactl/ui/pnid.vala index 310c942..38611e6 100644 --- a/src/libdactl/ui/pnid.vala +++ b/src/libdactl/ui/pnid.vala @@ -197,7 +197,7 @@ private class Dactl.PnidCanvas : Dactl.Canvas { */ public override bool draw (Cairo.Context cr) { - string xmlstr, hi; + string xmlstr; // All of the SVG manipulations happen on each iteration, couldn't find // a more efficient way of using XPath on a file stream @@ -546,15 +546,6 @@ public class Dactl.Pnid : Dactl.CompositeWidget, Dactl.CldAdapter { message ("`%s' satisfied now", id); } - /** - * Connect any signals including the notifications from the model. - */ - private void connect_signals () { - /* - *canvas.draw.connect (on_draw); - */ - } - /** * Callback to perform on the timeout interval. */ diff --git a/src/libdactl/ui/polar-axis.vala b/src/libdactl/ui/polar-axis.vala index 0950204..8a6570e 100644 --- a/src/libdactl/ui/polar-axis.vala +++ b/src/libdactl/ui/polar-axis.vala @@ -126,20 +126,12 @@ public class Dactl.PolarAxis : GLib.Object, Dactl.Buildable, Dactl.Object { public int div_minor { get; set; default = 2; } - private bool dragging = false; - public signal void range_changed (double min, double max); public signal void label_changed (string label); public signal void orientation_changed (Dactl.Orientation orientation); - private double start_drag_x; - - private double start_drag_y; - - private bool reversed = false; - /** * {@inheritDoc} */ diff --git a/src/libdactl/ui/polar-canvas.vala b/src/libdactl/ui/polar-canvas.vala index 9cc8465..0f863cd 100644 --- a/src/libdactl/ui/polar-canvas.vala +++ b/src/libdactl/ui/polar-canvas.vala @@ -38,7 +38,6 @@ protected class Dactl.PolarChartCanvas : Dactl.Canvas { var w = get_allocated_width (); var h = get_allocated_height (); - var parent = get_parent (); var grid_surface = new Cairo.ImageSurface (Cairo.Format.ARGB32, w, h); grid = new Dactl.PolarChartGrid (grid_surface); diff --git a/src/libdactl/ui/polar-chart.vala b/src/libdactl/ui/polar-chart.vala index 05ab556..0312978 100644 --- a/src/libdactl/ui/polar-chart.vala +++ b/src/libdactl/ui/polar-chart.vala @@ -144,8 +144,9 @@ public class Dactl.PolarChart : Dactl.CompositeWidget { drawables = get_object_map (typeof (Dactl.Drawable)); foreach (var drawable in drawables.values) { if (drawable is Dactl.PolarHeatMap) { - var binding = bind_property ("zoom", drawable as Dactl.PolarHeatMap, - "zoom", GLib.BindingFlags.DEFAULT); + bind_property ("zoom", drawable as Dactl.PolarHeatMap, + "zoom", GLib.BindingFlags.DEFAULT); + (drawable as Dactl.PolarHeatMap).zoom = zoom; } } @@ -422,10 +423,7 @@ public class Dactl.PolarChart : Dactl.CompositeWidget { double x_max, x_min, y_max, y_min; var w = canvas.get_allocated_width (); var h = canvas.get_allocated_height (); - var mag_min = mag_axis.min; - var mag_max = mag_axis.max; - var angle_min = angle_axis.min; - var angle_max = angle_axis.max; + /* XXX can image surface set be put in Dactl.Drawable as virtual */ var image_surface = new Cairo.ImageSurface (Cairo.Format.ARGB32, w, h); diff --git a/src/libdactl/ui/polar-heatmap.vala b/src/libdactl/ui/polar-heatmap.vala index 744a5d1..afc0df8 100644 --- a/src/libdactl/ui/polar-heatmap.vala +++ b/src/libdactl/ui/polar-heatmap.vala @@ -496,11 +496,6 @@ public class Dactl.PolarHeatMap : GLib.Object, Dactl.Object, Dactl.Container, } } - /* Set a color for cells that have no channel reference (ie. raw data) */ - private void interpolate () { - /* XXX TBD */ - } - /** * {@inheritDoc} */ @@ -512,7 +507,6 @@ public class Dactl.PolarHeatMap : GLib.Object, Dactl.Object, Dactl.Container, var scale_y = (double)h / (y_max - y_min); var scale = scale_x < scale_y ? scale_x : scale_y; scale = scale * zoom; - var d = w < h ? w : h; /* calculate the offset from the center of the window */ var dx = (w - scale * (x_max - x_min)) / 2; var dy = (h - scale * (y_max - y_min)) / 2; diff --git a/src/libdactl/ui/rt-chart.vala b/src/libdactl/ui/rt-chart.vala index 7ab802b..5e905f3 100644 --- a/src/libdactl/ui/rt-chart.vala +++ b/src/libdactl/ui/rt-chart.vala @@ -268,11 +268,7 @@ public class Dactl.RTChartSettings : Gtk.ScrolledWindow, Dactl.SettingsWidget { [GtkChild] private Gtk.Adjustment adj_y_max; - [GtkChild] - private Gtk.ListBox listbox_traces; - construct { - populate_traces (); show_all (); connect_notify_signals (); } @@ -327,32 +323,6 @@ public class Dactl.RTChartSettings : Gtk.ScrolledWindow, Dactl.SettingsWidget { }); } - private void populate_traces () { - /*var traces = (parent as Dactl.Container).get_object_map (typeof (Dactl.RTTrace));*/ - /*var app = Dactl.UI.Application.get_default ();*/ -/* - * var channels = app.model.ctx.get_object_map (typeof (Cld.Channel)); - * foreach (var row in listbox_traces.get_children ()) - * remove (row); - * - * foreach (var trace in traces.values) { - * var box = new Gtk.Box (Gtk.Orientation.HORIZONTAL, 5); - * var btn_remove = new Gtk.Button.with_label (Remove); - * var combo = new Gtk.ComboBoxText.with_entry ("???"); - * var btn_edit = new Gtk.Button.with_label (Edit); - * foreach (var channel in channels.values) { - * combo.append (null, channel.uri); - * } - * box.pack_start (btn_remove); - * box_pack_start (combo); - * box.pack_start (btn_edit); - * - * var row = new Gtk.ListBoxRow (); - * row.add (box); - * } - */ - } - [GtkCallback] private void entry_title_activate_cb () { title = entry_title.get_text (); diff --git a/src/libdactl/ui/rt-multichannel-trace.vala b/src/libdactl/ui/rt-multichannel-trace.vala index 6b65f2b..176496f 100644 --- a/src/libdactl/ui/rt-multichannel-trace.vala +++ b/src/libdactl/ui/rt-multichannel-trace.vala @@ -6,7 +6,6 @@ public class Dactl.RTMultiChannelTrace : Dactl.Trace, Dactl.Container { private Gee.Map _objects; public Dactl.ChannelVector channel_vector { get; private set; } public bool highlight { get; set; default = false; } - private Dactl.SimplePoint [] points_array; /** * {@inheritDoc} diff --git a/src/libdactl/ui/stripchart.vala b/src/libdactl/ui/stripchart.vala index 2f1da76..eea81e4 100644 --- a/src/libdactl/ui/stripchart.vala +++ b/src/libdactl/ui/stripchart.vala @@ -685,12 +685,6 @@ private class Dactl.StripChartCanvas : Dactl.Canvas { return false; } - private bool update () { - redraw (); - - return true; - } - public void redraw () { var window = get_window (); if (window == null) { @@ -727,7 +721,6 @@ public class Dactl.StripChart : Dactl.CompositeWidget, Dactl.CldAdapter { private int stride_min = int.MAX; /* The number of data points per second */ private double pps = 0; - bool once = false; private Gee.Map _objects; diff --git a/src/libdactl/ui/video-processor.vala b/src/libdactl/ui/video-processor.vala index 844019c..80ca4c2 100644 --- a/src/libdactl/ui/video-processor.vala +++ b/src/libdactl/ui/video-processor.vala @@ -1,9 +1,6 @@ [GtkTemplate (ui = "/org/coanda/libdactl/ui/video-processor.ui")] public class Dactl.VideoProcessor : Dactl.CompositeWidget, Dactl.CldAdapter { - [GtkChild] - private Gtk.Image img_capture; - private Gee.Map _objects; private string _xml = """ diff --git a/src/libdactl/ui/widget.vala b/src/libdactl/ui/widget.vala index 079fb5a..a5b967f 100644 --- a/src/libdactl/ui/widget.vala +++ b/src/libdactl/ui/widget.vala @@ -197,8 +197,6 @@ public interface Dactl.Widget : GLib.Object { */ public abstract class Dactl.Canvas : Gtk.DrawingArea, Dactl.Object { - private Xml.Node* _node; - /** * {@inheritDoc} */