From 9d1cfc0ffac36a8e8b2f0aac8f2ea63cd88d2d31 Mon Sep 17 00:00:00 2001 From: Kolan Sh Date: Thu, 9 Feb 2017 13:23:16 +0300 Subject: [PATCH] Initial directory tree structure created. --- .gitmodules | 6 ++ AUTHORS | 1 + CMakeLists.txt | 21 +++++ COPYING | 165 ++++++++++++++++++++++++++++++++++++++ INSTALL | 84 +++++++++++++++++++ MAINTAINERS | 2 + cmake/backbone | 1 + cpack/CMakeLists.txt | 10 +++ pkg-config/CMakeLists.txt | 13 +++ po/CMakeLists.txt | 1 + po/ru/CMakeLists.txt | 1 + src/CMakeLists.txt | 9 +++ src/GtkChart.vala | 53 ++++++++++++ test/CMakeLists.txt | 7 ++ test/ChartTest.vala | 43 ++++++++++ util/backbone | 1 + valadoc_env | 2 + 17 files changed, 420 insertions(+) create mode 100644 .gitmodules create mode 100644 AUTHORS create mode 100644 CMakeLists.txt create mode 100644 COPYING create mode 100644 INSTALL create mode 100644 MAINTAINERS create mode 160000 cmake/backbone create mode 100644 cpack/CMakeLists.txt create mode 100644 pkg-config/CMakeLists.txt create mode 100644 po/CMakeLists.txt create mode 100644 po/ru/CMakeLists.txt create mode 100644 src/CMakeLists.txt create mode 100644 src/GtkChart.vala create mode 100644 test/CMakeLists.txt create mode 100644 test/ChartTest.vala create mode 160000 util/backbone create mode 100644 valadoc_env diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000..50bba8b --- /dev/null +++ b/.gitmodules @@ -0,0 +1,6 @@ +[submodule "cmake/backbone"] + path = cmake/backbone + url = git@git.backbone.ws:cmake/backbone.git +[submodule "util/backbone-utils"] + path = util/backbone + url = git@git.backbone.ws:cmake/backbone-utils.git diff --git a/AUTHORS b/AUTHORS new file mode 100644 index 0000000..609258d --- /dev/null +++ b/AUTHORS @@ -0,0 +1 @@ +Kolan Sh diff --git a/CMakeLists.txt b/CMakeLists.txt new file mode 100644 index 0000000..ba3a742 --- /dev/null +++ b/CMakeLists.txt @@ -0,0 +1,21 @@ +PROJECT (GtkChart C) + +CMAKE_MINIMUM_REQUIRED (VERSION 2.8) + +SET (PROJECT_LOWERCASE_NAME "gtk-chart") +SET (PROJECT_DESCRIPTION "GtkChart for Gtk.DrawingArea.") + +SET (MAJOR 0) +SET (MINOR 0) +SET (PATCH 0) + +LIST (APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/backbone) + +ADD_SUBDIRECTORY (src) +ADD_SUBDIRECTORY (po) +ADD_SUBDIRECTORY (pkg-config) +ADD_SUBDIRECTORY (test) +ADD_SUBDIRECTORY (cpack) + +# enable testing +#ENABLE_TESTING () diff --git a/COPYING b/COPYING new file mode 100644 index 0000000..65c5ca8 --- /dev/null +++ b/COPYING @@ -0,0 +1,165 @@ + GNU LESSER GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + + This version of the GNU Lesser General Public License incorporates +the terms and conditions of version 3 of the GNU General Public +License, supplemented by the additional permissions listed below. + + 0. Additional Definitions. + + As used herein, "this License" refers to version 3 of the GNU Lesser +General Public License, and the "GNU GPL" refers to version 3 of the GNU +General Public License. + + "The Library" refers to a covered work governed by this License, +other than an Application or a Combined Work as defined below. + + An "Application" is any work that makes use of an interface provided +by the Library, but which is not otherwise based on the Library. +Defining a subclass of a class defined by the Library is deemed a mode +of using an interface provided by the Library. + + A "Combined Work" is a work produced by combining or linking an +Application with the Library. The particular version of the Library +with which the Combined Work was made is also called the "Linked +Version". + + The "Minimal Corresponding Source" for a Combined Work means the +Corresponding Source for the Combined Work, excluding any source code +for portions of the Combined Work that, considered in isolation, are +based on the Application, and not on the Linked Version. + + The "Corresponding Application Code" for a Combined Work means the +object code and/or source code for the Application, including any data +and utility programs needed for reproducing the Combined Work from the +Application, but excluding the System Libraries of the Combined Work. + + 1. Exception to Section 3 of the GNU GPL. + + You may convey a covered work under sections 3 and 4 of this License +without being bound by section 3 of the GNU GPL. + + 2. Conveying Modified Versions. + + If you modify a copy of the Library, and, in your modifications, a +facility refers to a function or data to be supplied by an Application +that uses the facility (other than as an argument passed when the +facility is invoked), then you may convey a copy of the modified +version: + + a) under this License, provided that you make a good faith effort to + ensure that, in the event an Application does not supply the + function or data, the facility still operates, and performs + whatever part of its purpose remains meaningful, or + + b) under the GNU GPL, with none of the additional permissions of + this License applicable to that copy. + + 3. Object Code Incorporating Material from Library Header Files. + + The object code form of an Application may incorporate material from +a header file that is part of the Library. You may convey such object +code under terms of your choice, provided that, if the incorporated +material is not limited to numerical parameters, data structure +layouts and accessors, or small macros, inline functions and templates +(ten or fewer lines in length), you do both of the following: + + a) Give prominent notice with each copy of the object code that the + Library is used in it and that the Library and its use are + covered by this License. + + b) Accompany the object code with a copy of the GNU GPL and this license + document. + + 4. Combined Works. + + You may convey a Combined Work under terms of your choice that, +taken together, effectively do not restrict modification of the +portions of the Library contained in the Combined Work and reverse +engineering for debugging such modifications, if you also do each of +the following: + + a) Give prominent notice with each copy of the Combined Work that + the Library is used in it and that the Library and its use are + covered by this License. + + b) Accompany the Combined Work with a copy of the GNU GPL and this license + document. + + c) For a Combined Work that displays copyright notices during + execution, include the copyright notice for the Library among + these notices, as well as a reference directing the user to the + copies of the GNU GPL and this license document. + + d) Do one of the following: + + 0) Convey the Minimal Corresponding Source under the terms of this + License, and the Corresponding Application Code in a form + suitable for, and under terms that permit, the user to + recombine or relink the Application with a modified version of + the Linked Version to produce a modified Combined Work, in the + manner specified by section 6 of the GNU GPL for conveying + Corresponding Source. + + 1) Use a suitable shared library mechanism for linking with the + Library. A suitable mechanism is one that (a) uses at run time + a copy of the Library already present on the user's computer + system, and (b) will operate properly with a modified version + of the Library that is interface-compatible with the Linked + Version. + + e) Provide Installation Information, but only if you would otherwise + be required to provide such information under section 6 of the + GNU GPL, and only to the extent that such information is + necessary to install and execute a modified version of the + Combined Work produced by recombining or relinking the + Application with a modified version of the Linked Version. (If + you use option 4d0, the Installation Information must accompany + the Minimal Corresponding Source and Corresponding Application + Code. If you use option 4d1, you must provide the Installation + Information in the manner specified by section 6 of the GNU GPL + for conveying Corresponding Source.) + + 5. Combined Libraries. + + You may place library facilities that are a work based on the +Library side by side in a single library together with other library +facilities that are not Applications and are not covered by this +License, and convey such a combined library under terms of your +choice, if you do both of the following: + + a) Accompany the combined library with a copy of the same work based + on the Library, uncombined with any other library facilities, + conveyed under the terms of this License. + + b) Give prominent notice with the combined library that part of it + is a work based on the Library, and explaining where to find the + accompanying uncombined form of the same work. + + 6. Revised Versions of the GNU Lesser General Public License. + + The Free Software Foundation may publish revised and/or new versions +of the GNU Lesser General Public License from time to time. Such new +versions will be similar in spirit to the present version, but may +differ in detail to address new problems or concerns. + + Each version is given a distinguishing version number. If the +Library as you received it specifies that a certain numbered version +of the GNU Lesser General Public License "or any later version" +applies to it, you have the option of following the terms and +conditions either of that published version or of any later version +published by the Free Software Foundation. If the Library as you +received it does not specify a version number of the GNU Lesser +General Public License, you may choose any version of the GNU Lesser +General Public License ever published by the Free Software Foundation. + + If the Library as you received it specifies that a proxy can decide +whether future versions of the GNU Lesser General Public License shall +apply, that proxy's public statement of acceptance of any version is +permanent authorization for you to choose that version for the +Library. diff --git a/INSTALL b/INSTALL new file mode 100644 index 0000000..3e899a5 --- /dev/null +++ b/INSTALL @@ -0,0 +1,84 @@ + Requirements + ------------ + + Build-Time Dependencies + +Vala: https://wiki.gnome.org/Projects/Vala +Gee: https://wiki.gnome.org/Projects/Libgee +CMake: http://www.cmake.org +NSIS (W32): http://nsis.sourceforge.net + + Run-Time Dependencies + +Gee: https://wiki.gnome.org/Projects/Libgee + + Operation Systems + + * GNU/Linux (Gentoo, Debian, etc.) + * MS Windows (Windows 5.1 aka XP) + * BSD-based (FreeBSD, OpenBSD, NetBSD, Mac OS X) + +If you need support of one more OS, be free in writing of patches and sending +pull-requests to the mainstream. + + + Compilation + ----------- + + Compilation under GNU/Linux + +$ mkdir build-gcc && cd build-gcc +$ cmake .. -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr +$ make -j$((`getconf _NPROCESSORS_ONLN`+1)) + + Compilation under MS Windows + +$ mkdir build-mingw && cd build-mingw +$ cmake -G "MSYS Makefiles" .. -DCMAKE_BUILD_TYPE=Release +$ make -j$((NUMBER_OF_PROCESSORS + 1)) + + Compilation under BSD-based Systems. + +TODO: add description here. + + + Packing/Installation + -------------------- + + Packing/Installation under GNU/Linux + +$ cpack +Install using System Package Manager. + + Packing/Installation under MS Windows + +$ cpack +Install using generated by NSIS executable. + + Packing/Installation under BSD-based + +$ cpack +Install using System Package Manager. + + + Testing + ------- + + Testing under GNU/Linux + +$ ctest -j$((`getconf _NPROCESSORS_ONLN`+1)) + +Automated tests for memory leaks: +$ ctest -j$((NUMBER_OF_PROCESSORS + 1)) -D NightlyMemCheck && grep definitely Testing/Temporary/LastDynamicAnalysis_*.log + + Testing under MS Windows + +$ ctest -j$((NUMBER_OF_PROCESSORS + 1)) +Automated tests for memory leaks are not available as far as Valgrind not +present on this platform. + + Testing under BSD-based + +$ ctest +Automated tests for memory leaks are not available as far as Valgrind not +present on this platform. diff --git a/MAINTAINERS b/MAINTAINERS new file mode 100644 index 0000000..f2b408a --- /dev/null +++ b/MAINTAINERS @@ -0,0 +1,2 @@ +Kolan Sh +email: backbone@backbone.ws diff --git a/cmake/backbone b/cmake/backbone new file mode 160000 index 0000000..784ca10 --- /dev/null +++ b/cmake/backbone @@ -0,0 +1 @@ +Subproject commit 784ca10a530e629885236e9df7fdf5647ddffa7c diff --git a/cpack/CMakeLists.txt b/cpack/CMakeLists.txt new file mode 100644 index 0000000..c895094 --- /dev/null +++ b/cpack/CMakeLists.txt @@ -0,0 +1,10 @@ +SET (CONTACT "backbone@backbone.ws") +SET (DEBIAN_DEPENDENCIES "valac (>= 0.24), libgtk-3-0 (>= 3.20)") +SET (DEBIAN_SECTION "Libraries") +SET (REDHAT_DEPENDENCIES "vala >= 0.24, gtk+ >= 3.20") +SET (REDHAT_SECTION "Development/Libraries") +SET (LICENSE "LGPLv3+") +SET (WIN32_UNINSTALL_NAME "GtkChart") # <= 8 symbols for the name +SET (CPACK_NSIS_MENU_LINKS "https://redmine.backbone.ws/projects/gtkchart" + "Homepage for GtkChart") +INCLUDE (CPackCommonRules) diff --git a/pkg-config/CMakeLists.txt b/pkg-config/CMakeLists.txt new file mode 100644 index 0000000..3c5e0f4 --- /dev/null +++ b/pkg-config/CMakeLists.txt @@ -0,0 +1,13 @@ +INCLUDE (PkgConfigCommonRules) + +SET (PkgConfigLibs "-L\${libdir}") +IF (WIN32) + SET (PkgConfigLibs "${PkgConfigLibs} -l${PROJECT_LOWERCASE_NAME}-${MAJOR}") +ELSE (WIN32) + SET (PkgConfigLibs "${PkgConfigLibs} -l${PROJECT_LOWERCASE_NAME}.so.${MAJOR}") +ENDIF (WIN32) + +CONFIGURE_FILE ( + "${CMAKE_SOURCE_DIR}/cmake/backbone/templates/pkg-config.pc.in" + "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_LOWERCASE_NAME}-${MAJOR}.pc" +) diff --git a/po/CMakeLists.txt b/po/CMakeLists.txt new file mode 100644 index 0000000..c191c1b --- /dev/null +++ b/po/CMakeLists.txt @@ -0,0 +1 @@ +INCLUDE (GettextCommonRules) diff --git a/po/ru/CMakeLists.txt b/po/ru/CMakeLists.txt new file mode 100644 index 0000000..0b6020c --- /dev/null +++ b/po/ru/CMakeLists.txt @@ -0,0 +1 @@ +INCLUDE (GettextLangRules) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt new file mode 100644 index 0000000..3c61731 --- /dev/null +++ b/src/CMakeLists.txt @@ -0,0 +1,9 @@ +SET (LibName ${PROJECT_LOWERCASE_NAME}) +FILE (GLOB_RECURSE LibSources RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.vala) +SET (LibPackages cairo) +SET (LibPkgModules gtk+-3.0) +SET (LibInstall ON) +SET (LibExtraSources ${CMAKE_CURRENT_BINARY_DIR}/library_constructor.c) +SET (LC_RELATIVE_PREFIX "..") +CONFIGURE_FILE ( "${CMAKE_SOURCE_DIR}/cmake/backbone/templates/library_constructor.c.in" "${LibExtraSources}") +INCLUDE (ValaLibCommonRules) diff --git a/src/GtkChart.vala b/src/GtkChart.vala new file mode 100644 index 0000000..97d226a --- /dev/null +++ b/src/GtkChart.vala @@ -0,0 +1,53 @@ +public class Gtk.Chart { + public Chart () { + } + + public virtual signal bool draw(Cairo.Context context) { + + double width = context.copy_clip_rectangle_list().rectangles[0].width; + double height = context.copy_clip_rectangle_list().rectangles[0].height; + + // Line width + context.set_line_width (1); + + // Axis + context.move_to (30, 30); + context.line_to (30, height - 30); + context.line_to (width - 30, height - 30); + context.stroke (); + + // Arrows (X) + context.move_to (width - 40, height - 35); + context.line_to (width - 30, height - 30); + context.line_to (width - 40, height - 25); + context.stroke (); + + // Arrows (Y) + context.move_to (25, 40); + context.line_to (30, 30); + context.line_to (35, 40); + context.stroke (); + + // Text: + context.set_source_rgb (0.1, 0.1, 0.1); + context.select_font_face ("Adventure", Cairo.FontSlant.NORMAL, Cairo.FontWeight.BOLD); + context.set_font_size (20); + context.move_to (10, 40); + context.show_text ("Y"); + context.move_to (width - 45, height - 7); + context.show_text ("X"); + + // Grid (X) + + // Grid (Y) + + // Marks (X) + + // Marks (Y) + + // Legend + + + return true; + } +} diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt new file mode 100644 index 0000000..b2ac63e --- /dev/null +++ b/test/CMakeLists.txt @@ -0,0 +1,7 @@ +SET (BinName chart_test) +FILE (GLOB_RECURSE BinSources RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} ChartTest.vala) +SET (BinPackages gtk+-3.0) +SET (BinCustomVapis ${CMAKE_BINARY_DIR}/src/${PROJECT_LOWERCASE_NAME}-${MAJOR}.vapi) +SET (BinLinkLibs ${PROJECT_LOWERCASE_NAME}) +INCLUDE_DIRECTORIES ("${CMAKE_BINARY_DIR}/src") +INCLUDE (ValaBinCommonRules) diff --git a/test/ChartTest.vala b/test/ChartTest.vala new file mode 100644 index 0000000..958319e --- /dev/null +++ b/test/ChartTest.vala @@ -0,0 +1,43 @@ +using Gtk; + +int main (string[] args) { + init (ref args); + + var window = new Window (); + window.title = "Gtk.Chart Test."; + window.border_width = 10; + window.window_position = WindowPosition.CENTER; + window.set_default_size (640, 480); + window.destroy.connect (main_quit); + + var da = new DrawingArea(); + var chart = new Gtk.Chart(); + var label = new Label ("Gtk.Chart Test!"); + var button = new Button.with_label("Click me"); + button.clicked.connect (() => { + da.draw.connect((context) => { + chart.draw(context); + return true; + }); + + da.queue_draw_area(0, 0, da.get_allocated_width(), da.get_allocated_height()); + }); + + var vbox2 = new Box(Orientation.VERTICAL, 0); + vbox2.pack_end(button, false, false, 0); + + var hbox = new Box(Orientation.HORIZONTAL, 0); + hbox.pack_start(da, true, true, 0); + hbox.pack_end(vbox2, false, false, 0); + + var vbox = new Box(Orientation.VERTICAL, 0); + vbox.pack_start(label, false, false, 0); + vbox.pack_end(hbox, true, true, 0); + + window.add(vbox); + + window.show_all(); + + Gtk.main(); + return 0; +} diff --git a/util/backbone b/util/backbone new file mode 160000 index 0000000..11c998a --- /dev/null +++ b/util/backbone @@ -0,0 +1 @@ +Subproject commit 11c998aca2aa1b787286b336e579e5a4e31f471a diff --git a/valadoc_env b/valadoc_env new file mode 100644 index 0000000..57510e2 --- /dev/null +++ b/valadoc_env @@ -0,0 +1,2 @@ +BASEDIR=src +PKGS=gtk+-3.0