Menu
▾
▴
plplot-cvs — For PLplot svn commit messages
You can subscribe to this list here.
| 2000 |
Jan
|
Feb
|
Mar
|
Apr
|
May
(33) |
Jun
|
Jul
(30) |
Aug
(2) |
Sep
|
Oct
(30) |
Nov
(136) |
Dec
(59) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2001 |
Jan
(255) |
Feb
(169) |
Mar
(322) |
Apr
(185) |
May
(33) |
Jun
(89) |
Jul
(47) |
Aug
(59) |
Sep
(40) |
Oct
(31) |
Nov
(74) |
Dec
(84) |
| 2002 |
Jan
(163) |
Feb
(78) |
Mar
(23) |
Apr
(5) |
May
(22) |
Jun
(75) |
Jul
(143) |
Aug
(48) |
Sep
(111) |
Oct
(58) |
Nov
(124) |
Dec
(278) |
| 2003 |
Jan
(106) |
Feb
(276) |
Mar
(354) |
Apr
(97) |
May
(14) |
Jun
(3) |
Jul
(7) |
Aug
(21) |
Sep
(83) |
Oct
(110) |
Nov
(3) |
Dec
(119) |
| 2004 |
Jan
(318) |
Feb
(409) |
Mar
(68) |
Apr
(23) |
May
(105) |
Jun
(147) |
Jul
(69) |
Aug
(53) |
Sep
(23) |
Oct
(14) |
Nov
(15) |
Dec
(63) |
| 2005 |
Jan
(146) |
Feb
(69) |
Mar
(157) |
Apr
(127) |
May
(166) |
Jun
(8) |
Jul
(5) |
Aug
(3) |
Sep
(8) |
Oct
(17) |
Nov
(29) |
Dec
(34) |
| 2006 |
Jan
(3) |
Feb
(4) |
Mar
(1) |
Apr
(70) |
May
(241) |
Jun
(82) |
Jul
(344) |
Aug
(196) |
Sep
(87) |
Oct
(57) |
Nov
(121) |
Dec
(86) |
| 2007 |
Jan
(60) |
Feb
(67) |
Mar
(102) |
Apr
(28) |
May
(13) |
Jun
(29) |
Jul
(38) |
Aug
(56) |
Sep
(91) |
Oct
(89) |
Nov
(50) |
Dec
(68) |
| 2008 |
Jan
(87) |
Feb
(47) |
Mar
(100) |
Apr
(34) |
May
(65) |
Jun
(54) |
Jul
(98) |
Aug
(128) |
Sep
(109) |
Oct
(141) |
Nov
(40) |
Dec
(206) |
| 2009 |
Jan
(176) |
Feb
(226) |
Mar
(134) |
Apr
(84) |
May
(152) |
Jun
(85) |
Jul
(91) |
Aug
(153) |
Sep
(141) |
Oct
(59) |
Nov
(87) |
Dec
(75) |
| 2010 |
Jan
(58) |
Feb
(41) |
Mar
(51) |
Apr
(74) |
May
(81) |
Jun
(39) |
Jul
(30) |
Aug
(43) |
Sep
(76) |
Oct
(59) |
Nov
(62) |
Dec
(52) |
| 2011 |
Jan
(125) |
Feb
(41) |
Mar
(96) |
Apr
(53) |
May
(21) |
Jun
(23) |
Jul
(48) |
Aug
(71) |
Sep
(37) |
Oct
(81) |
Nov
(60) |
Dec
(32) |
| 2012 |
Jan
(51) |
Feb
(23) |
Mar
|
Apr
(8) |
May
(2) |
Jun
|
Jul
(8) |
Aug
(25) |
Sep
(4) |
Oct
(32) |
Nov
(17) |
Dec
(2) |
| 2013 |
Jan
(8) |
Feb
(2) |
Mar
(9) |
Apr
(9) |
May
(37) |
Jun
(48) |
Jul
(63) |
Aug
(42) |
Sep
(59) |
Oct
(83) |
Nov
(141) |
Dec
(133) |
| 2014 |
Jan
(57) |
Feb
(58) |
Mar
(58) |
Apr
(25) |
May
(14) |
Jun
(3) |
Jul
(6) |
Aug
(1) |
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <ai...@us...> - 2014-04-29 18:18:48
|
Revision: 13113
http://sourceforge.net/p/plplot/code/13113
Author: airwin
Date: 2014-04-29 18:18:45 +0000 (Tue, 29 Apr 2014)
Log Message:
-----------
Improved regex for dropping emacs temporary files from release tarball.
Modified Paths:
--------------
trunk/CMakeLists.txt
Modified: trunk/CMakeLists.txt
===================================================================
--- trunk/CMakeLists.txt 2014-04-26 02:43:54 UTC (rev 13112)
+++ trunk/CMakeLists.txt 2014-04-29 18:18:45 UTC (rev 13113)
@@ -270,7 +270,7 @@
# in absolute path + filename to find files or directories to be excluded
# from source tarball.
set(CPACK_SOURCE_IGNORE_FILES
- "\\\\#*\\\\#$"
+ "\\\\#.*$"
"~$"
"\\\\.cvsignore$"
"^${PROJECT_SOURCE_DIR}.*/\\\\.svn/"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ai...@us...> - 2014-04-26 02:43:57
|
Revision: 13112
http://sourceforge.net/p/plplot/code/13112
Author: airwin
Date: 2014-04-26 02:43:54 +0000 (Sat, 26 Apr 2014)
Log Message:
-----------
Drop dependence on libagg since the location of the tarball is still
not settled, and libagg is only needed for one component of the
wxwidgets device driver which is scheduled to be dropped in any case.
Change plplot dependence from qt4_lite to qt5_lite and exclusively use
Qt5 for plplot epa_build and tests.
The epa_build of qt5_lite and the epa_build and test of PLplot
were comprehensively tested (all three build systems all three major
configurations) on Linux with no issues.
Modified Paths:
--------------
trunk/cmake/epa_build/plplot/CMakeLists.txt
Modified: trunk/cmake/epa_build/plplot/CMakeLists.txt
===================================================================
--- trunk/cmake/epa_build/plplot/CMakeLists.txt 2014-04-26 02:38:37 UTC (rev 13111)
+++ trunk/cmake/epa_build/plplot/CMakeLists.txt 2014-04-26 02:43:54 UTC (rev 13112)
@@ -2,7 +2,7 @@
# Configure the build of PLplot.
-# Copyright (C) 2013 Alan W. Irwin
+# Copyright (C) 2013-2014 Alan W. Irwin
# This file is free software; you can redistribute it and/or
# modify it under the terms of the GNU Lesser General Public
@@ -25,7 +25,10 @@
set(ignored_dependencies_LIST ${extra_ignored_dependencies_list})
set(dependencies_LIST
- libagg
+ # agg website now (2014-04-13) a broken link, and this library only
+ # needed in any case for a purpose that may disappear (wxwidgets).
+ # So drop it.
+ #libagg
libharu
libqhull
shapelib
@@ -38,7 +41,7 @@
if(NOT MSYS_PLATFORM)
list(APPEND dependencies_LIST
pango
- qt4_lite
+ qt5_lite
)
endif(NOT MSYS_PLATFORM)
@@ -71,9 +74,14 @@
-DDROP_GTK_PLUS_2_BUILDS=ON
)
+# Only use Qt5 since that is all that is epa_built.
+list(APPEND cmake_args
+ -DPLPLOT_USE_QT5=ON
+ )
+
if(MSYS_PLATFORM)
# Turn off the cairo and qt device drivers for plplot on Windows
- # until the pango and qt4_lite packages and all their dependencies
+ # until the pango and qt5_lite packages and all their dependencies
# build properly on that platform
list(APPEND cmake_args
-DDEFAULT_NO_CAIRO_DEVICES:BOOL=ON
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ai...@us...> - 2014-04-26 02:38:41
|
Revision: 13111
http://sourceforge.net/p/plplot/code/13111
Author: airwin
Date: 2014-04-26 02:38:37 +0000 (Sat, 26 Apr 2014)
Log Message:
-----------
Drop dependence on libagg since the location of the tarball is still not settled, and
libagg is only needed for one component of the wxwidgets device driver
which is scheduled to be dropped in any case.
Modified Paths:
--------------
trunk/cmake/epa_build/plplot_lite/CMakeLists.txt
Modified: trunk/cmake/epa_build/plplot_lite/CMakeLists.txt
===================================================================
--- trunk/cmake/epa_build/plplot_lite/CMakeLists.txt 2014-04-26 02:36:45 UTC (rev 13110)
+++ trunk/cmake/epa_build/plplot_lite/CMakeLists.txt 2014-04-26 02:38:37 UTC (rev 13111)
@@ -3,7 +3,7 @@
# Configure the build of a "lite" version of PLplot (with fewer dependencies
# but with fewer features as well).
-# Copyright (C) 2013 Alan W. Irwin
+# Copyright (C) 2013-2014 Alan W. Irwin
# This file is free software; you can redistribute it and/or
# modify it under the terms of the GNU Lesser General Public
@@ -26,7 +26,10 @@
set(ignored_dependencies_LIST ${extra_ignored_dependencies_list})
set(dependencies_LIST
- libagg
+ # agg website now (2014-04-13) a broken link, and this library only
+ # needed in any case for a purpose that may disappear (wxwidgets).
+ # So drop it.
+ #libagg
libharu
libqhull
shapelib
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ai...@us...> - 2014-04-26 02:36:47
|
Revision: 13110
http://sourceforge.net/p/plplot/code/13110
Author: airwin
Date: 2014-04-26 02:36:45 +0000 (Sat, 26 Apr 2014)
Log Message:
-----------
Bump CMake minimum version to 2.8.12.1 for epa_build project
which insures (among other things) that CMake has the ability
to unpack tar.xz files on Unix and MSYS.
Drop configuration of the qt4_lite epa_build since an epa_build and
install of qt4_lite interferes with the epa_build of qt5_lite and vice
versa.
Modified Paths:
--------------
trunk/cmake/epa_build/CMakeLists.txt
Modified: trunk/cmake/epa_build/CMakeLists.txt
===================================================================
--- trunk/cmake/epa_build/CMakeLists.txt 2014-04-26 02:22:04 UTC (rev 13109)
+++ trunk/cmake/epa_build/CMakeLists.txt 2014-04-26 02:36:45 UTC (rev 13110)
@@ -26,7 +26,7 @@
message(STATUS "CMAKE_GENERATOR = ${CMAKE_GENERATOR}")
message(STATUS "CMAKE_INSTALL_PREFIX = ${CMAKE_INSTALL_PREFIX}")
-cmake_minimum_required(VERSION 2.8.11.2 FATAL_ERROR)
+cmake_minimum_required(VERSION 2.8.12.1 FATAL_ERROR)
set(EPA_BASE ${CMAKE_BINARY_DIR}/epa_build)
message(STATUS "EPA_BASE = ${EPA_BASE}")
@@ -417,7 +417,11 @@
plplot_lite
gtk+
wxwidgets
- qt4_lite
+ # qt4_lite install interferes with qt5_lite build and vice versa.
+ # Therefore, we have commented out the build configuration of
+ # qt4_lite and have chosen to use the build_configuration of
+ # qt5_lite instead.
+ # qt4_lite
qt5_lite
)
endif(BUILD_THE_BUILDTOOLS)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ai...@us...> - 2014-04-26 02:22:09
|
Revision: 13109
http://sourceforge.net/p/plplot/code/13109
Author: airwin
Date: 2014-04-26 02:22:04 +0000 (Sat, 26 Apr 2014)
Log Message:
-----------
Update to be the same as the version from CMake 3.0.0-rc3 except the
tar.xz name patch is applied (see
<http://public.kitware.com/Bug/view.php?id=14318>) so that tar.xz
unpacking abilities of CMake can be used.
Modified Paths:
--------------
trunk/cmake/epa_build/ExternalProject.cmake
Modified: trunk/cmake/epa_build/ExternalProject.cmake
===================================================================
--- trunk/cmake/epa_build/ExternalProject.cmake 2014-04-26 02:11:26 UTC (rev 13108)
+++ trunk/cmake/epa_build/ExternalProject.cmake 2014-04-26 02:22:04 UTC (rev 13109)
@@ -1,7 +1,15 @@
-# - Create custom targets to build projects in external trees
-# The 'ExternalProject_Add' function creates a custom target to drive
+#.rst:
+# ExternalProject
+# ---------------
+#
+# Create custom targets to build projects in external trees
+#
+# The ``ExternalProject_Add`` function creates a custom target to drive
# download, update/patch, configure, build, install and test steps of an
# external project:
+#
+# .. code-block:: cmake
+#
# ExternalProject_Add(<name> # Name for custom target
# [DEPENDS projects...] # Targets on which the project depends
# [PREFIX dir] # Root dir for entire project
@@ -22,6 +30,7 @@
# [SVN_TRUST_CERT 1 ] # Trust the Subversion server site certificate
# [GIT_REPOSITORY url] # URL of git repo
# [GIT_TAG tag] # Git branch name, commit id or tag
+# [GIT_SUBMODULES modules...] # Git submodules that shall be updated, all if empty
# [HG_REPOSITORY url] # URL of mercurial repo
# [HG_TAG tag] # Mercurial branch name, commit id or tag
# [URL /.../src.tgz] # Full path or URL of source
@@ -62,40 +71,45 @@
# #--Custom targets-------------
# [STEP_TARGETS st1 st2 ...] # Generate custom targets for these steps
# )
-# The *_DIR options specify directories for the project, with default
-# directories computed as follows.
-# If the PREFIX option is given to ExternalProject_Add() or the EP_PREFIX
-# directory property is set, then an external project is built and installed
-# under the specified prefix:
-# TMP_DIR = <prefix>/tmp
-# STAMP_DIR = <prefix>/src/<name>-stamp
-# DOWNLOAD_DIR = <prefix>/src
-# SOURCE_DIR = <prefix>/src/<name>
-# BINARY_DIR = <prefix>/src/<name>-build
-# INSTALL_DIR = <prefix>
-# Otherwise, if the EP_BASE directory property is set then components
-# of an external project are stored under the specified base:
-# TMP_DIR = <base>/tmp/<name>
-# STAMP_DIR = <base>/Stamp/<name>
-# DOWNLOAD_DIR = <base>/Download/<name>
-# SOURCE_DIR = <base>/Source/<name>
-# BINARY_DIR = <base>/Build/<name>
-# INSTALL_DIR = <base>/Install/<name>
-# If no PREFIX, EP_PREFIX, or EP_BASE is specified then the default
-# is to set PREFIX to "<name>-prefix".
-# Relative paths are interpreted with respect to the build directory
-# corresponding to the source directory in which ExternalProject_Add is
-# invoked.
#
-# If SOURCE_DIR is explicitly set to an existing directory the project
-# will be built from it.
-# Otherwise a download step must be specified using one of the
-# DOWNLOAD_COMMAND, CVS_*, SVN_*, or URL options.
-# The URL option may refer locally to a directory or source tarball,
-# or refer to a remote tarball (e.g. http://.../src.tgz).
+# The ``*_DIR`` options specify directories for the project, with default
+# directories computed as follows. If the ``PREFIX`` option is given to
+# ``ExternalProject_Add()`` or the ``EP_PREFIX`` directory property is set,
+# then an external project is built and installed under the specified prefix::
#
-# The 'ExternalProject_Add_Step' function adds a custom step to an external
-# project:
+# TMP_DIR = <prefix>/tmp
+# STAMP_DIR = <prefix>/src/<name>-stamp
+# DOWNLOAD_DIR = <prefix>/src
+# SOURCE_DIR = <prefix>/src/<name>
+# BINARY_DIR = <prefix>/src/<name>-build
+# INSTALL_DIR = <prefix>
+#
+# Otherwise, if the ``EP_BASE`` directory property is set then components
+# of an external project are stored under the specified base::
+#
+# TMP_DIR = <base>/tmp/<name>
+# STAMP_DIR = <base>/Stamp/<name>
+# DOWNLOAD_DIR = <base>/Download/<name>
+# SOURCE_DIR = <base>/Source/<name>
+# BINARY_DIR = <base>/Build/<name>
+# INSTALL_DIR = <base>/Install/<name>
+#
+# If no ``PREFIX``, ``EP_PREFIX``, or ``EP_BASE`` is specified then the
+# default is to set ``PREFIX`` to ``<name>-prefix``. Relative paths are
+# interpreted with respect to the build directory corresponding to the
+# source directory in which ``ExternalProject_Add`` is invoked.
+#
+# If ``SOURCE_DIR`` is explicitly set to an existing directory the project
+# will be built from it. Otherwise a download step must be specified
+# using one of the ``DOWNLOAD_COMMAND``, ``CVS_*``, ``SVN_*``, or ``URL``
+# options. The ``URL`` option may refer locally to a directory or source
+# tarball, or refer to a remote tarball (e.g. ``http://.../src.tgz``).
+#
+# The ``ExternalProject_Add_Step`` function adds a custom step to an
+# external project:
+#
+# .. code-block:: cmake
+#
# ExternalProject_Add_Step(<name> <step> # Names of project and custom step
# [COMMAND cmd...] # Command line invoked by this step
# [COMMENT "text..."] # Text printed when step executes
@@ -106,61 +120,66 @@
# [WORKING_DIRECTORY dir] # Working directory for command
# [LOG 1] # Wrap step in script to log output
# )
-# The command line, comment, and working directory of every standard
-# and custom step is processed to replace tokens
-# <SOURCE_DIR>,
-# <BINARY_DIR>,
-# <INSTALL_DIR>,
-# and <TMP_DIR>
-# with corresponding property values.
#
-# Any builtin step that specifies a "<step>_COMMAND cmd..." or custom
-# step that specifies a "COMMAND cmd..." may specify additional command
-# lines using the form "COMMAND cmd...". At build time the commands will
-# be executed in order and aborted if any one fails. For example:
+# The command line, comment, and working directory of every standard and
+# custom step is processed to replace tokens ``<SOURCE_DIR>``,
+# ``<BINARY_DIR>``, ``<INSTALL_DIR>``, and ``<TMP_DIR>`` with
+# corresponding property values.
+#
+# Any builtin step that specifies a ``<step>_COMMAND cmd...`` or custom
+# step that specifies a ``COMMAND cmd...`` may specify additional command
+# lines using the form ``COMMAND cmd...``. At build time the commands
+# will be executed in order and aborted if any one fails. For example::
+#
# ... BUILD_COMMAND make COMMAND echo done ...
-# specifies to run "make" and then "echo done" during the build step.
-# Whether the current working directory is preserved between commands
-# is not defined. Behavior of shell operators like "&&" is not defined.
#
-# The 'ExternalProject_Get_Property' function retrieves external project
-# target properties:
+# specifies to run ``make`` and then ``echo done`` during the build step.
+# Whether the current working directory is preserved between commands is
+# not defined. Behavior of shell operators like ``&&`` is not defined.
+#
+# The ``ExternalProject_Get_Property`` function retrieves external project
+# target properties::
+#
# ExternalProject_Get_Property(<name> [prop1 [prop2 [...]]])
-# It stores property values in variables of the same name.
-# Property names correspond to the keyword argument names of
-# 'ExternalProject_Add'.
#
-# The 'ExternalProject_Add_StepTargets' function generates custom targets for
-# the steps listed:
+# It stores property values in variables of the same name. Property
+# names correspond to the keyword argument names of
+# ``ExternalProject_Add``.
+#
+# The ``ExternalProject_Add_StepTargets`` function generates custom
+# targets for the steps listed::
+#
# ExternalProject_Add_StepTargets(<name> [step1 [step2 [...]]])
#
-# If STEP_TARGETS is set then ExternalProject_Add_StepTargets is automatically
-# called at the end of matching calls to ExternalProject_Add_Step. Pass
-# STEP_TARGETS explicitly to individual ExternalProject_Add calls, or
-# implicitly to all ExternalProject_Add calls by setting the directory property
-# EP_STEP_TARGETS.
+# If ``STEP_TARGETS`` is set then ``ExternalProject_Add_StepTargets`` is
+# automatically called at the end of matching calls to
+# ``ExternalProject_Add_Step``. Pass ``STEP_TARGETS`` explicitly to
+# individual ``ExternalProject_Add`` calls, or implicitly to all
+# ``ExternalProject_Add`` calls by setting the directory property
+# ``EP_STEP_TARGETS``.
#
-# If STEP_TARGETS is not set, clients may still manually call
-# ExternalProject_Add_StepTargets after calling ExternalProject_Add or
-# ExternalProject_Add_Step.
+# If ``STEP_TARGETS`` is not set, clients may still manually call
+# ``ExternalProject_Add_StepTargets`` after calling
+# ``ExternalProject_Add`` or ``ExternalProject_Add_Step``.
#
# This functionality is provided to make it easy to drive the steps
-# independently of each other by specifying targets on build command lines.
-# For example, you may be submitting to a sub-project based dashboard, where
-# you want to drive the configure portion of the build, then submit to the
-# dashboard, followed by the build portion, followed by tests. If you invoke
-# a custom target that depends on a step halfway through the step dependency
-# chain, then all the previous steps will also run to ensure everything is
-# up to date.
+# independently of each other by specifying targets on build command
+# lines. For example, you may be submitting to a sub-project based
+# dashboard, where you want to drive the configure portion of the build,
+# then submit to the dashboard, followed by the build portion, followed
+# by tests. If you invoke a custom target that depends on a step
+# halfway through the step dependency chain, then all the previous steps
+# will also run to ensure everything is up to date.
#
-# For example, to drive configure, build and test steps independently for each
-# ExternalProject_Add call in your project, write the following line prior to
-# any ExternalProject_Add calls in your CMakeLists file:
+# For example, to drive configure, build and test steps independently
+# for each ``ExternalProject_Add`` call in your project, write the following
+# line prior to any ``ExternalProject_Add`` calls in your ``CMakeLists.txt``
+# file::
#
-# set_property(DIRECTORY PROPERTY EP_STEP_TARGETS configure build test)
+# set_property(DIRECTORY PROPERTY EP_STEP_TARGETS configure build test)
#=============================================================================
-# Copyright 2008-2012 Kitware, Inc.
+# Copyright 2008-2013 Kitware, Inc.
#
# Distributed under the OSI-approved BSD License (the "License");
# see accompanying file Copyright.txt for details.
@@ -271,7 +290,7 @@
)
-function(_ep_write_gitclone_script script_filename source_dir git_EXECUTABLE git_repository git_tag src_name work_dir gitclone_infofile gitclone_stampfile)
+function(_ep_write_gitclone_script script_filename source_dir git_EXECUTABLE git_repository git_tag git_submodules src_name work_dir gitclone_infofile gitclone_stampfile)
file(WRITE ${script_filename}
"if(\"${git_tag}\" STREQUAL \"\")
message(FATAL_ERROR \"Tag for git checkout should not be empty.\")
@@ -334,7 +353,7 @@
endif()
execute_process(
- COMMAND \"${git_EXECUTABLE}\" submodule update --recursive
+ COMMAND \"${git_EXECUTABLE}\" submodule update --recursive ${git_submodules}
WORKING_DIRECTORY \"${work_dir}/${src_name}\"
RESULT_VARIABLE error_code
)
@@ -422,7 +441,7 @@
endfunction()
-function(_ep_write_gitupdate_script script_filename git_EXECUTABLE git_tag git_repository work_dir)
+function(_ep_write_gitupdate_script script_filename git_EXECUTABLE git_tag git_submodules git_repository work_dir)
file(WRITE ${script_filename}
"if(\"${git_tag}\" STREQUAL \"\")
message(FATAL_ERROR \"Tag for git checkout should not be empty.\")
@@ -481,7 +500,7 @@
endif()
execute_process(
- COMMAND \"${git_EXECUTABLE}\" submodule update --recursive
+ COMMAND \"${git_EXECUTABLE}\" submodule update --recursive ${git_submodules}
WORKING_DIRECTORY \"${work_dir}/${src_name}\"
RESULT_VARIABLE error_code
)
@@ -567,13 +586,30 @@
endfunction()
-function(_ep_write_verifyfile_script script_filename local hash)
+function(_ep_write_verifyfile_script script_filename local hash retries download_script)
if("${hash}" MATCHES "${_ep_hash_regex}")
set(algo "${CMAKE_MATCH_1}")
string(TOLOWER "${CMAKE_MATCH_2}" expect_value)
set(script_content "set(expect_value \"${expect_value}\")
-file(${algo} \"\${file}\" actual_value)
-if(\"\${actual_value}\" STREQUAL \"\${expect_value}\")
+set(attempt 0)
+set(succeeded 0)
+while(\${attempt} LESS ${retries} OR \${attempt} EQUAL ${retries} AND NOT \${succeeded})
+ file(${algo} \"\${file}\" actual_value)
+ if(\"\${actual_value}\" STREQUAL \"\${expect_value}\")
+ set(succeeded 1)
+ elseif(\${attempt} LESS ${retries})
+ message(STATUS \"${algo} hash of \${file}
+does not match expected value
+ expected: \${expect_value}
+ actual: \${actual_value}
+Retrying download.
+\")
+ file(REMOVE \"\${file}\")
+ execute_process(COMMAND ${CMAKE_COMMAND} -P \"${download_script}\")
+ endif()
+endwhile()
+
+if(\${succeeded})
message(STATUS \"verifying file... done\")
else()
message(FATAL_ERROR \"error: ${algo} hash of
@@ -1112,7 +1148,7 @@
set_property(SOURCE ${stamp_file} PROPERTY SYMBOLIC 1)
set(touch)
else()
- set(touch ${TOUCH_EXECUTABLE} ${stamp_file})
+ set(touch ${CMAKE_COMMAND} -E touch ${stamp_file})
endif()
# Wrap with log script?
@@ -1288,6 +1324,7 @@
if(NOT git_tag)
set(git_tag "master")
endif()
+ get_property(git_submodules TARGET ${name} PROPERTY _EP_GIT_SUBMODULES)
# For the download step, and the git clone operation, only the repository
# should be recorded in a configured RepositoryInfo file. If the repo
@@ -1312,7 +1349,7 @@
# The script will delete the source directory and then call git clone.
#
_ep_write_gitclone_script(${tmp_dir}/${name}-gitclone.cmake ${source_dir}
- ${GIT_EXECUTABLE} ${git_repository} ${git_tag} ${src_name} ${work_dir}
+ ${GIT_EXECUTABLE} ${git_repository} ${git_tag} "${git_submodules}" ${src_name} ${work_dir}
${stamp_dir}/${name}-gitinfo.txt ${stamp_dir}/${name}-gitclone-lastrun.txt
)
set(comment "Performing download step (git clone) for '${name}'")
@@ -1376,6 +1413,8 @@
set(repository "external project URL")
set(module "${url}")
set(tag "${hash}")
+ set(retries 0)
+ set(download_script "")
configure_file(
"${CMAKE_ROOT}/Modules/RepositoryInfo.txt.in"
"${stamp_dir}/${name}-urlinfo.txt"
@@ -1405,16 +1444,17 @@
get_property(timeout TARGET ${name} PROPERTY _EP_TIMEOUT)
get_property(tls_verify TARGET ${name} PROPERTY _EP_TLS_VERIFY)
get_property(tls_cainfo TARGET ${name} PROPERTY _EP_TLS_CAINFO)
- _ep_write_downloadfile_script("${stamp_dir}/download-${name}.cmake"
- "${url}" "${file}" "${timeout}" "${hash}" "${tls_verify}" "${tls_cainfo}")
- set(cmd ${CMAKE_COMMAND} -P ${stamp_dir}/download-${name}.cmake
+ set(download_script "${stamp_dir}/download-${name}.cmake")
+ _ep_write_downloadfile_script("${download_script}" "${url}" "${file}" "${timeout}" "${hash}" "${tls_verify}" "${tls_cainfo}")
+ set(cmd ${CMAKE_COMMAND} -P "${download_script}"
COMMAND)
+ set(retries 3)
set(comment "Performing download step (download, verify and extract) for '${name}'")
else()
set(file "${url}")
set(comment "Performing download step (verify and extract) for '${name}'")
endif()
- _ep_write_verifyfile_script("${stamp_dir}/verify-${name}.cmake" "${file}" "${hash}")
+ _ep_write_verifyfile_script("${stamp_dir}/verify-${name}.cmake" "${file}" "${hash}" "${retries}" "${download_script}")
list(APPEND cmd ${CMAKE_COMMAND} -P ${stamp_dir}/verify-${name}.cmake
COMMAND)
_ep_write_extractfile_script("${stamp_dir}/extract-${name}.cmake" "${name}" "${file}" "${source_dir}")
@@ -1503,8 +1543,9 @@
if(NOT git_tag)
set(git_tag "master")
endif()
+ get_property(git_submodules TARGET ${name} PROPERTY _EP_GIT_SUBMODULES)
_ep_write_gitupdate_script(${tmp_dir}/${name}-gitupdate.cmake
- ${GIT_EXECUTABLE} ${git_tag} ${git_repository} ${work_dir}
+ ${GIT_EXECUTABLE} ${git_tag} "${git_submodules}" ${git_repository} ${work_dir}
)
set(cmd ${CMAKE_COMMAND} -P ${tmp_dir}/${name}-gitupdate.cmake)
set(always 1)
@@ -1782,8 +1823,8 @@
OUTPUT ${complete_outputs}
COMMENT "Completed '${name}'"
COMMAND ${CMAKE_COMMAND} -E make_directory ${cmf_dir}${cfgdir}
- COMMAND ${TOUCH_EXECUTABLE} ${complete_stamp_file}
- COMMAND ${TOUCH_EXECUTABLE} ${done_stamp_file}
+ COMMAND ${CMAKE_COMMAND} -E touch ${complete_stamp_file}
+ COMMAND ${CMAKE_COMMAND} -E touch ${done_stamp_file}
DEPENDS ${install_stamp_file}
VERBATIM
)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ai...@us...> - 2014-04-26 02:11:30
|
Revision: 13108
http://sourceforge.net/p/plplot/code/13108
Author: airwin
Date: 2014-04-26 02:11:26 +0000 (Sat, 26 Apr 2014)
Log Message:
-----------
Update build system for the PLPLOT_USE_QT5 case so that qt_example can
be built successfully in the build tree, and in the installed examples
tree for both the traditional and CMake-based build systems for that
tree. This change removes the last of the restrictions on the
PLPLOT_USE_QT5 case other than the disabling of pyqt4 for this case.
Tested on Linux using the comprehensive test procedure (which tests
all three build systems mentioned above for each of our 3 fundamental build
configurations, i.e., shared libraries/dynamic devices, shared libraries/static
devices, and static libraries/static devices).
Modified Paths:
--------------
trunk/bindings/qt_gui/CMakeLists.txt
trunk/cmake/modules/qt.cmake
trunk/examples/c++/CMakeLists.txt
trunk/src/CMakeLists.txt
Modified: trunk/bindings/qt_gui/CMakeLists.txt
===================================================================
--- trunk/bindings/qt_gui/CMakeLists.txt 2014-04-26 02:02:55 UTC (rev 13107)
+++ trunk/bindings/qt_gui/CMakeLists.txt 2014-04-26 02:11:26 UTC (rev 13108)
@@ -114,15 +114,25 @@
RUNTIME DESTINATION ${BIN_DIR}
)
- # Transform "${QT_LIBRARIES}" to the standard pkg-config form.
- pkg_config_link_flags(
- libplplotqt${LIB_TAG}_LINK_FLAGS
- "${QT_LIBRARIES}"
- )
+ if(PKG_CONFIG_EXECUTABLE)
+ if(PLPLOT_USE_QT5)
+ # For this special case QT_LIBRARIES is not populated so must
+ # use this alternative method to add Qt(5) libraries to the pkg-config file
+ # for the plplotqt library.
+ set(
+ libplplotqt${LIB_TAG}_LINK_FLAGS
+ "${Qt5_library_LINK_FLAGS}"
+ )
+ else(PLPLOT_USE_QT5)
+ # Transform "${QT_LIBRARIES}" to the standard pkg-config form.
+ pkg_config_link_flags(
+ libplplotqt${LIB_TAG}_LINK_FLAGS
+ "${QT_LIBRARIES}"
+ )
+ endif(PLPLOT_USE_QT5)
- # Configure pkg-config *.pc file corresponding to the compile and link
- # flags needed by a Qt GUI executable using extqt to gain access to PLplot.
- if(PKG_CONFIG_EXECUTABLE)
+ # Configure pkg-config *.pc file corresponding to the compile and link
+ # flags needed by a Qt GUI executable using extqt to gain access to PLplot.
if(LIB_TAG)
set(PC_PRECISION "double")
else(LIB_TAG)
Modified: trunk/cmake/modules/qt.cmake
===================================================================
--- trunk/cmake/modules/qt.cmake 2014-04-26 02:02:55 UTC (rev 13107)
+++ trunk/cmake/modules/qt.cmake 2014-04-26 02:11:26 UTC (rev 13108)
@@ -1,6 +1,6 @@
# cmake/modules/qt.cmake
#
-# Copyright (C) 2009 Alan W. Irwin
+# Copyright (C) 2009-2014 Alan W. Irwin
#
# This file is part of PLplot.
#
@@ -65,20 +65,89 @@
endif(DEFAULT_NO_BINDINGS)
if(ENABLE_qt)
- option(PLPLOT_USE_QT5 "Experimental (and currently quite limited) option to try Qt5" OFF)
+ option(PLPLOT_USE_QT5 "Experimental option to try Qt5" OFF)
if(PLPLOT_USE_QT5)
- find_package(Qt5Core 5.2.0)
- if(Qt5Core_FOUND)
+ find_package(Qt5 5.2.0 COMPONENTS Svg Gui PrintSupport)
+ if(Qt5_FOUND)
message(STATUS "Attempting to use Qt5 so have set PLD_epsqt to OFF since Qt5 does not support PostScript")
set(PLD_epsqt OFF CACHE BOOL "Enable Qt EPS device" FORCE)
- else(Qt5Core_FOUND)
+ else(Qt5_FOUND)
message(STATUS
"WARNING: Qt5Core could not be found so falling back to Qt4"
)
set(PLPLOT_USE_QT5 OFF CACHE BOOL "Experimental (and currently quite limited) option to try Qt5" FORCE)
- endif(Qt5Core_FOUND)
+ endif(Qt5_FOUND)
endif(PLPLOT_USE_QT5)
+
+ if(PLPLOT_USE_QT5)
+ # Calculate Qt5_library_COMPILE_FLAGS and Qt5_library_LINK_FLAGS
+ # to be used for the pkg-config case.
+
+ # Note that theoretically you could use execute_process and cmake
+ # --find-package option to determine these flags, but
+ # --find-package is not maintained now and might well disappear in
+ # the future, there is currently a Qt5 CMake support file bug
+ # (badly named GL library) that needs to be addressed for
+ # --find-package to work even at the moment, and also there is a
+ # Qt5 CMake support file bug such that the required macro option
+ # settings are not returned by this approach.
+
+ # Another alternative would be to use the plplotqt target properties,
+ # but translating those into simple compile and link flags is non-trivial
+ # and in fact is the issue that still needs to be addressed
+ # in order for --find-package to work properly for all varieties
+ # of target properties.
+
+ # Therefore, use a brute-force approach (determined by looking at
+ # the compile flags and link flags that CMake finally figures out
+ # to build the plplotqt library).
+
+ # FIXME? This list will need revision whenever the PLplot dependencies
+ # on the Qt5 components are revised.
+ set(Qt5_library_name_list
+ Core
+ Gui
+ PrintSupport
+ Widgets
+ Svg
+ )
+
+ # Qt5 requires position-independent code. Assume -fPIC will
+ # create that although apparently that flag is not supported on
+ # all platforms even for gcc, and may not be supported by other
+ # compilers.
+ set(pc_qt_COMPILE_FLAGS "-fPIC")
+ foreach(Qt5_library_name ${Qt5_library_name_list})
+ string(TOUPPER ${Qt5_library_name} macro_core_name)
+ # Set required macros so headers will be found.
+ set(pc_qt_COMPILE_FLAGS "${pc_qt_COMPILE_FLAGS} -DQT_${macro_core_name}_LIB")
+ find_file(${Qt5_library_name}_header_directory Qt${Qt5_library_name})
+ if(${Qt5_library_name}_header_directory)
+ if(${Qt5_library_name} STREQUAL "Core")
+ get_filename_component(parent_directory ${${Qt5_library_name}_header_directory} DIRECTORY)
+ set(pc_qt_COMPILE_FLAGS "${pc_qt_COMPILE_FLAGS} -I${parent_directory}")
+ endif(${Qt5_library_name} STREQUAL "Core")
+ set(pc_qt_COMPILE_FLAGS "${pc_qt_COMPILE_FLAGS} -I${${Qt5_library_name}_header_directory}")
+ else(${Qt5_library_name}_header_directory)
+ message(STATUS "${Qt5_library_name}_header_directory = ${${Qt5_library_name}_header_directory}")
+ message(FATAL_ERROR "${Qt${Qt5_library_name}} header_directory not found.")
+ endif(${Qt5_library_name}_header_directory)
+ endforeach(Qt5_library_name ${Qt5_library_name_list})
+
+ set(Qt5_library_fullpath_list)
+ foreach(Qt5_library_name ${Qt5_library_name_list})
+ find_library(Qt5${Qt5_library_name}_fullpath Qt5${Qt5_library_name})
+ if(Qt5${Qt5_library_name}_fullpath)
+ list(APPEND Qt5_library_fullpath_list ${Qt5${Qt5_library_name}_fullpath})
+ else(Qt5${Qt5_library_name}_fullpath)
+ message(STATUS "Qt5${Qt5_library_name}_fullpath = ${Qt5${Qt5_library_name}_fullpath}")
+ message(FATAL_ERROR "Qt5${Qt5_library_name} library not found.")
+ endif(Qt5${Qt5_library_name}_fullpath)
+ endforeach(Qt5_library_name ${Qt5_library_name_list})
+
+ pkg_config_link_flags(Qt5_library_LINK_FLAGS "${Qt5_library_fullpath_list}")
+ endif(PLPLOT_USE_QT5)
endif(ENABLE_qt)
if(PLD_bmpqt OR PLD_jpgqt OR PLD_pngqt OR PLD_ppmqt OR PLD_tiffqt OR PLD_epsqt OR PLD_pdfqt OR PLD_qtwidget OR PLD_svgqt OR PLD_extqt OR PLD_memqt)
@@ -205,13 +274,11 @@
set(ENABLE_pyqt4 OFF CACHE BOOL "Enable pyqt4 Python extension module " FORCE)
endif(ENABLE_pyqt4 AND PLPLOT_USE_QT5)
-## FIXME when a method has been found to use Qt5 with the traditional
-## Makefile + pkg-config build system for the installed examples.
-if(ENABLE_qt AND NOT PLPLOT_USE_QT5)
+if(ENABLE_qt)
set(qt_gui_true "")
-else(ENABLE_qt AND NOT PLPLOT_USE_QT5)
+else(ENABLE_qt)
set(qt_gui_true "#")
-endif(ENABLE_qt AND NOT PLPLOT_USE_QT5)
+endif(ENABLE_qt)
if(ANY_QT_DEVICE)
if(ENABLE_DYNDRIVERS)
@@ -228,6 +295,7 @@
# instead to break circular linking.
set(DRIVERS_LINK_FLAGS ${DRIVERS_LINK_FLAGS} ${qt_LINK_FLAGS})
set(qt_SOURCE ${CMAKE_SOURCE_DIR}/bindings/qt_gui/plqt.cpp)
+
endif(ENABLE_DYNDRIVERS)
endif(ANY_QT_DEVICE)
Modified: trunk/examples/c++/CMakeLists.txt
===================================================================
--- trunk/examples/c++/CMakeLists.txt 2014-04-26 02:02:55 UTC (rev 13107)
+++ trunk/examples/c++/CMakeLists.txt 2014-04-26 02:11:26 UTC (rev 13108)
@@ -2,7 +2,7 @@
### Process this file with cmake to produce Makefile
###
# Copyright (C) 2006 Andrew Ross
-# Copyright (C) 2006, 2007, 2008, 2009 Alan W. Irwin
+# Copyright (C) 2006-2014 Alan W. Irwin
#
# This file is part of PLplot.
#
@@ -150,8 +150,9 @@
endif(NOT PLPLOT_USE_QT5 AND NOT QT_LIBRARIES)
else(CORE_BUILD)
if(PLPLOT_USE_QT5)
- message(STATUS "WARNING: Not currently checking for Qt5 in install tree. qt_example not built")
- set(BUILD_qt_example OFF)
+ # qt_example build linking taken care of automatically by importing
+ # the plplotqt library.
+ set(BUILD_qt_example ON)
else(PLPLOT_USE_QT5)
# Must find Qt4 all over again here rather than simply copying variables
# from the core build to this installed examples build so that we can
Modified: trunk/src/CMakeLists.txt
===================================================================
--- trunk/src/CMakeLists.txt 2014-04-26 02:02:55 UTC (rev 13107)
+++ trunk/src/CMakeLists.txt 2014-04-26 02:11:26 UTC (rev 13108)
@@ -428,31 +428,8 @@
if(NOT ENABLE_DYNDRIVERS AND ANY_QT_DEVICE AND PLPLOT_USE_QT5)
# For this special case QT_LIBRARIES is not populated so must
- # this alternative method to add Qt(5) libraries to the pkg-config file
+ # use this alternative method to add Qt(5) libraries to the pkg-config file
# for the plplot library.
-
- # FIXME? This list will need revision whenever the PLplot qt device
- # driver dependencies on the Qt5 components are revised.
- set(Qt5_library_name_list
- Core
- Svg
- Gui
- Widgets
- PrintSupport
- )
-
- set(Qt5_library_fullpath_list)
- foreach(Qt5_library_name ${Qt5_library_name_list})
- find_library(Qt5${Qt5_library_name}_fullpath Qt5${Qt5_library_name})
- if(Qt5${Qt5_library_name}_fullpath)
- list(APPEND Qt5_library_fullpath_list ${Qt5${Qt5_library_name}_fullpath})
- else(Qt5${Qt5_library_name}_fullpath)
- message(STATUS "Qt5${Qt5_library_name}_fullpath = ${Qt5${Qt5_library_name}_fullpath}")
- message(FATAL_ERROR "Qt5${Qt5_library_name} library not found.")
- endif(Qt5${Qt5_library_name}_fullpath)
- endforeach(Qt5_library_name ${Qt5_library_name_list})
-
- pkg_config_link_flags(Qt5_library_LINK_FLAGS "${Qt5_library_fullpath_list}")
set(
libplplot${LIB_TAG}_LINK_FLAGS
"${libplplot${LIB_TAG}_LINK_FLAGS} ${Qt5_library_LINK_FLAGS}"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ai...@us...> - 2014-04-26 02:02:57
|
Revision: 13107
http://sourceforge.net/p/plplot/code/13107
Author: airwin
Date: 2014-04-26 02:02:55 +0000 (Sat, 26 Apr 2014)
Log Message:
-----------
Style previous commit.
Modified Paths:
--------------
trunk/drivers/wingcc.c
Modified: trunk/drivers/wingcc.c
===================================================================
--- trunk/drivers/wingcc.c 2014-04-21 04:34:46 UTC (rev 13106)
+++ trunk/drivers/wingcc.c 2014-04-26 02:02:55 UTC (rev 13107)
@@ -76,17 +76,17 @@
typedef struct
{
- PLFLT scale; // scaling factor to "blow up" to the "virtual" page in removing hidden lines
- PLINT width; // Window width (which can change)
- PLINT height; // Window Height
+ PLFLT scale; // scaling factor to "blow up" to the "virtual" page in removing hidden lines
+ PLINT width; // Window width (which can change)
+ PLINT height; // Window Height
- PLFLT PRNT_scale;
- PLINT PRNT_width;
- PLINT PRNT_height;
+ PLFLT PRNT_scale;
+ PLINT PRNT_width;
+ PLINT PRNT_height;
PLGraphicsIn gin;
- char FT_smooth_text;
+ char FT_smooth_text;
//
// WIN32 API variables
//
@@ -1000,13 +1000,13 @@
{
wingcc_Dev *dev = (wingcc_Dev *) pls->dev;
- HCURSOR crosshair;
- HCURSOR previous;
+ HCURSOR crosshair;
+ HCURSOR previous;
plGinInit( gin );
crosshair = LoadCursor( GetModuleHandle( NULL ), IDC_CROSS );
- previous = SetCursor( crosshair );
+ previous = SetCursor( crosshair );
while ( gin->pX < 0 )
{
@@ -1064,7 +1064,7 @@
void
plD_esc_wingcc( PLStream *pls, PLINT op, void *ptr )
{
- wingcc_Dev *dev = (wingcc_Dev *) pls->dev;
+ wingcc_Dev *dev = (wingcc_Dev *) pls->dev;
PLGraphicsIn *gin = &( dev->gin );
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ai...@us...> - 2014-04-21 04:34:49
|
Revision: 13106
http://sourceforge.net/p/plplot/code/13106
Author: airwin
Date: 2014-04-21 04:34:46 +0000 (Mon, 21 Apr 2014)
Log Message:
-----------
Clean up test logic in the traditional build system for the installed
examples for the (corner) case where -DPLD_ps=OFF.
Tested on Linux for
-DDEFAULT_NO_DEVICES=ON
-DPLD_epsqt=ON
-DPLD_pdfqt=ON
-DPLD_qtwidget=ON
-DPLD_bmpqt=ON
-DPLD_jpgqt=ON
-DPLD_pngqt=ON
-DPLD_=ppmqtON
-DPLD_tiffqt=ON
-DPLD_extqt=ON
-DPLD_memqt=ON
-DPLD_svgqt=ON
-DDEFAULT_NO_BINDINGS=ON
-DENABLE_cxx=ON
-DENABLE_qt=ON
-DPLPLOT_USE_QT5=ON
using the comprehensive test_script and an epa_build of Qt5.
N.B. this is the first completely successful comprehensive test of the
-DPLPLOT_USE_QT5=ON case, but certain Qt-related components of PLplot
are still disabled or not implemented for the Qt5 case as discussed on
list.
Modified Paths:
--------------
trunk/examples/CMakeLists.txt
trunk/examples/Makefile.examples.in
Modified: trunk/examples/CMakeLists.txt
===================================================================
--- trunk/examples/CMakeLists.txt 2014-04-21 00:26:11 UTC (rev 13105)
+++ trunk/examples/CMakeLists.txt 2014-04-21 04:34:46 UTC (rev 13106)
@@ -34,6 +34,10 @@
set(PSC_ADA_COMMENT "#")
endif(NOT ENABLE_ada)
+ if(NOT ENABLE_cxx)
+ set(PSC_CXX_COMMENT "#")
+ endif(NOT ENABLE_cxx)
+
if(NOT ENABLE_d)
set(PSC_D_COMMENT "#")
endif(NOT ENABLE_d)
@@ -73,6 +77,7 @@
else(PLD_ps)
set(PSC_ADA_COMMENT "#")
set(PSC_C_COMMENT "#")
+ set(PSC_CXX_COMMENT "#")
set(PSC_D_COMMENT "#")
set(PSC_F95_COMMENT "#")
set(PSC_JAVA_COMMENT "#")
@@ -81,6 +86,7 @@
set(PSC_PERL_COMMENT "#")
set(PSC_PYTHON_COMMENT "#")
set(PSC_TCL_COMMENT "#")
+ set(PSC_LUA_COMMENT "#")
endif(PLD_ps)
if(NOT(ENABLE_cxx AND (PLD_ps OR ENABLE_qt)))
Modified: trunk/examples/Makefile.examples.in
===================================================================
--- trunk/examples/Makefile.examples.in 2014-04-21 00:26:11 UTC (rev 13105)
+++ trunk/examples/Makefile.examples.in 2014-04-21 04:34:46 UTC (rev 13106)
@@ -32,11 +32,11 @@
cd c; $(MAKE) clean
.PHONY: c_clean
clean: c_clean
-x01c.psc: c/x01c@EXEEXT@
- @echo Generate C results for psc device
- ./plplot-test.sh --verbose --front-end=c --device=psc
-test_noninteractive: x01c.psc
-@COMPARE_COMMENT@compare: x01c.psc
+@PSC...@x0...c: c/x01c@EXEEXT@
+@PSC_C_COMMENT@ @echo Generate C results for psc device
+@PSC_C_COMMENT@ ./plplot-test.sh --verbose --front-end=c --device=psc
+@PSC_C_COMMENT@test_noninteractive: x01c.psc
+@PSC_C_COMMENT@@COMPARE_COMMENT@compare: x01c.psc
# Just for c, c++, and tk directories
test_interactive: c/x01c@EXEEXT@
@@ -60,11 +60,11 @@
@CXX_COMMENT@ cd c++; $(MAKE) clean
@CXX_COMMENT@.PHONY: cxx_clean
@CXX_COMMENT@clean: cxx_clean
-@CXX...@x0...c: c++/x01@EXEEXT@
-@CXX_COMMENT@ @echo Generate C++ results for psc device
-@CXX_COMMENT@ ./plplot-test.sh --verbose --front-end=cxx --device=psc
-@CXX_COMMENT@test_noninteractive: x01cxx.psc
-@CXX_COMMENT@@COMPARE_COMMENT@compare: x01cxx.psc
+@PSC...@x0...c: c++/x01@EXEEXT@
+@PSC_CXX_COMMENT@ @echo Generate C++ results for psc device
+@PSC_CXX_COMMENT@ ./plplot-test.sh --verbose --front-end=cxx --device=psc
+@PSC_CXX_COMMENT@test_noninteractive: x01cxx.psc
+@PSC_CXX_COMMENT@@COMPARE_COMMENT@compare: x01cxx.psc
# Just for c, c++, and tk directories
@CXX_COMMENT@test_interactive: c++/x01@EXEEXT@
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ai...@us...> - 2014-04-21 00:26:14
|
Revision: 13105
http://sourceforge.net/p/plplot/code/13105
Author: airwin
Date: 2014-04-21 00:26:11 +0000 (Mon, 21 Apr 2014)
Log Message:
-----------
Implement and use (in the CMake-based build system for the installed
examples) a cmake-packages approach as documented at
<http://www.cmake.org/cmake/help/git-next/manual/cmake-packages.7.html>
for handling the CMake export of information concerning the PLplot
libraries. This change in approach allows finding Qt5 automatically
as part of the CMake package configuration file. That solves a
linking issue with the previous approach when exporting a static
version of the plplot library that depends on Qt5.
Also refine the condition under which qt_example is tested both
for the core build and the CMake-based build of the installed
examples.
Modified Paths:
--------------
trunk/examples/CMakeLists.txt
trunk/src/CMakeLists.txt
Added Paths:
-----------
trunk/src/plplotConfig.cmake
Modified: trunk/examples/CMakeLists.txt
===================================================================
--- trunk/examples/CMakeLists.txt 2014-04-21 00:16:56 UTC (rev 13104)
+++ trunk/examples/CMakeLists.txt 2014-04-21 00:26:11 UTC (rev 13105)
@@ -332,9 +332,9 @@
# Install qt support file.
if(ANY_QT_DEVICE)
install(FILES
- ${CMAKE_SOURCE_DIR}/cmake/modules/ndp_UseQt4.cmake
- DESTINATION ${DATA_DIR}/examples/cmake/modules
- )
+ ${CMAKE_SOURCE_DIR}/cmake/modules/ndp_UseQt4.cmake
+ DESTINATION ${DATA_DIR}/examples/cmake/modules
+ )
endif(ANY_QT_DEVICE)
# Install PLplot-specific language support files needed for CMake-based
@@ -409,7 +409,7 @@
#Configure variables and enable languages as needed.
include(plplot_configure)
- include(export_plplot)
+ find_package(plplot)
endif(CORE_BUILD)
@@ -857,7 +857,7 @@
endif(WIN32_AND_NOT_CYGWIN)
endif(ENABLE_wxwidgets)
- if(PLD_extqt)
+ if(PLD_extqt AND TARGET qt_example)
add_custom_target(test_qt_example
COMMAND qt_example
DEPENDS
@@ -868,7 +868,7 @@
add_dependencies(test_qt_example test_qt_dyndriver)
endif(FILE_DEPENDS_qt)
list(APPEND interactive_targets_LIST test_qt_example)
- endif(PLD_extqt)
+ endif(PLD_extqt AND TARGET qt_example)
endif(ENABLE_cxx)
Modified: trunk/src/CMakeLists.txt
===================================================================
--- trunk/src/CMakeLists.txt 2014-04-21 00:16:56 UTC (rev 13104)
+++ trunk/src/CMakeLists.txt 2014-04-21 00:26:11 UTC (rev 13105)
@@ -420,8 +420,45 @@
# This exports information for every target in the whole build that
# has the EXPORT export_plplot signature (as above) for the
# install(TARGETS ... # command.
-install(EXPORT export_plplot DESTINATION ${DATA_DIR}/examples/cmake/modules)
+install(EXPORT export_plplot DESTINATION ${LIB_DIR}/cmake/plplot)
+# Install associated CMake package config file.
+
+install(FILES plplotConfig.cmake DESTINATION ${LIB_DIR}/cmake/plplot)
+
+if(NOT ENABLE_DYNDRIVERS AND ANY_QT_DEVICE AND PLPLOT_USE_QT5)
+ # For this special case QT_LIBRARIES is not populated so must
+ # this alternative method to add Qt(5) libraries to the pkg-config file
+ # for the plplot library.
+
+ # FIXME? This list will need revision whenever the PLplot qt device
+ # driver dependencies on the Qt5 components are revised.
+ set(Qt5_library_name_list
+ Core
+ Svg
+ Gui
+ Widgets
+ PrintSupport
+ )
+
+ set(Qt5_library_fullpath_list)
+ foreach(Qt5_library_name ${Qt5_library_name_list})
+ find_library(Qt5${Qt5_library_name}_fullpath Qt5${Qt5_library_name})
+ if(Qt5${Qt5_library_name}_fullpath)
+ list(APPEND Qt5_library_fullpath_list ${Qt5${Qt5_library_name}_fullpath})
+ else(Qt5${Qt5_library_name}_fullpath)
+ message(STATUS "Qt5${Qt5_library_name}_fullpath = ${Qt5${Qt5_library_name}_fullpath}")
+ message(FATAL_ERROR "Qt5${Qt5_library_name} library not found.")
+ endif(Qt5${Qt5_library_name}_fullpath)
+ endforeach(Qt5_library_name ${Qt5_library_name_list})
+
+ pkg_config_link_flags(Qt5_library_LINK_FLAGS "${Qt5_library_fullpath_list}")
+ set(
+ libplplot${LIB_TAG}_LINK_FLAGS
+ "${libplplot${LIB_TAG}_LINK_FLAGS} ${Qt5_library_LINK_FLAGS}"
+ )
+endif(NOT ENABLE_DYNDRIVERS AND ANY_QT_DEVICE AND PLPLOT_USE_QT5)
+
#message("libplplot${LIB_TAG}_LINK_FLAGS = ${libplplot${LIB_TAG}_LINK_FLAGS}")
string(REGEX REPLACE ";" " "
Added: trunk/src/plplotConfig.cmake
===================================================================
--- trunk/src/plplotConfig.cmake (rev 0)
+++ trunk/src/plplotConfig.cmake 2014-04-21 00:26:11 UTC (rev 13105)
@@ -0,0 +1,7 @@
+if(PLPLOT_USE_QT5)
+ # Find Qt5 components that we need.
+ find_package(Qt5 5.2.0 COMPONENTS Svg Gui PrintSupport)
+endif(PLPLOT_USE_QT5)
+
+# Find export files in same directory location as present file.
+include(${CMAKE_CURRENT_LIST_DIR}/export_plplot.cmake)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ai...@us...> - 2014-04-21 00:16:59
|
Revision: 13104
http://sourceforge.net/p/plplot/code/13104
Author: airwin
Date: 2014-04-21 00:16:56 +0000 (Mon, 21 Apr 2014)
Log Message:
-----------
Whitespace changes.
Modified Paths:
--------------
trunk/examples/c++/CMakeLists.txt
Modified: trunk/examples/c++/CMakeLists.txt
===================================================================
--- trunk/examples/c++/CMakeLists.txt 2014-04-21 00:08:04 UTC (rev 13103)
+++ trunk/examples/c++/CMakeLists.txt 2014-04-21 00:16:56 UTC (rev 13104)
@@ -153,51 +153,51 @@
message(STATUS "WARNING: Not currently checking for Qt5 in install tree. qt_example not built")
set(BUILD_qt_example OFF)
else(PLPLOT_USE_QT5)
- # Must find Qt4 all over again here rather than simply copying variables
- # from the core build to this installed examples build so that we can
- # access the qt4_wrap_cpp macro here.
- find_package(Qt4 4.8.2 REQUIRED QtCore QtGui QtSvg)
- # To avoid Qt4 version mismatch make sure the Qt version matches that
- # used by the core build.
- if(QT4_FOUND AND QT_VERSION_MAJOR STREQUAL "${CORE_QT_VERSION_MAJOR}" AND QT_VERSION_MINOR STREQUAL "${CORE_QT_VERSION_MINOR}" AND QT_VERSION_PATCH STREQUAL "${CORE_QT_VERSION_PATCH}")
- include(ndp_UseQt4)
- if(NOT QT_LIBRARIES)
- message(FATAL_ERROR "include(${QT_USE_FILE}) failed in installed examples build examples/c++ subdirectory.")
- endif(NOT QT_LIBRARIES)
- set(BUILD_qt_example ON)
- else(QT4_FOUND AND QT_VERSION_MAJOR STREQUAL "${CORE_QT_VERSION_MAJOR}" AND QT_VERSION_MINOR STREQUAL "${CORE_QT_VERSION_MINOR}" AND QT_VERSION_PATCH STREQUAL "${CORE_QT_VERSION_PATCH}")
- message(STATUS "WARNING: Qt4 not found or wrong version. qt_example not built")
- set(BUILD_qt_example OFF)
- endif(QT4_FOUND AND QT_VERSION_MAJOR STREQUAL "${CORE_QT_VERSION_MAJOR}" AND QT_VERSION_MINOR STREQUAL "${CORE_QT_VERSION_MINOR}" AND QT_VERSION_PATCH STREQUAL "${CORE_QT_VERSION_PATCH}")
+ # Must find Qt4 all over again here rather than simply copying variables
+ # from the core build to this installed examples build so that we can
+ # access the qt4_wrap_cpp macro here.
+ find_package(Qt4 4.8.2 REQUIRED QtCore QtGui QtSvg)
+ # To avoid Qt4 version mismatch make sure the Qt version matches that
+ # used by the core build.
+ if(QT4_FOUND AND QT_VERSION_MAJOR STREQUAL "${CORE_QT_VERSION_MAJOR}" AND QT_VERSION_MINOR STREQUAL "${CORE_QT_VERSION_MINOR}" AND QT_VERSION_PATCH STREQUAL "${CORE_QT_VERSION_PATCH}")
+ include(ndp_UseQt4)
+ if(NOT QT_LIBRARIES)
+ message(FATAL_ERROR "include(${QT_USE_FILE}) failed in installed examples build examples/c++ subdirectory.")
+ endif(NOT QT_LIBRARIES)
+ set(BUILD_qt_example ON)
+ else(QT4_FOUND AND QT_VERSION_MAJOR STREQUAL "${CORE_QT_VERSION_MAJOR}" AND QT_VERSION_MINOR STREQUAL "${CORE_QT_VERSION_MINOR}" AND QT_VERSION_PATCH STREQUAL "${CORE_QT_VERSION_PATCH}")
+ message(STATUS "WARNING: Qt4 not found or wrong version. qt_example not built")
+ set(BUILD_qt_example OFF)
+ endif(QT4_FOUND AND QT_VERSION_MAJOR STREQUAL "${CORE_QT_VERSION_MAJOR}" AND QT_VERSION_MINOR STREQUAL "${CORE_QT_VERSION_MINOR}" AND QT_VERSION_PATCH STREQUAL "${CORE_QT_VERSION_PATCH}")
endif(PLPLOT_USE_QT5)
endif(CORE_BUILD)
if(BUILD_qt_example)
if(PLPLOT_USE_QT5)
- qt5_wrap_cpp(
- QT_MOC_OUTFILES
- ${CMAKE_CURRENT_SOURCE_DIR}/qt_PlotWindow.h
- )
- set_source_files_properties(
- ${QT_MOC_OUTFILES}
- PROPERTIES GENERATED "ON"
- )
- add_executable(qt_example qt_example.cpp qt_PlotWindow.cpp ${QT_MOC_OUTFILES})
- qt5_use_modules(qt_example Svg Gui PrintSupport)
- target_link_libraries(qt_example ${QT_LIBRARIES} plplotqt${LIB_TAG} plplot${LIB_TAG} ${qt_example_TARGETS})
+ qt5_wrap_cpp(
+ QT_MOC_OUTFILES
+ ${CMAKE_CURRENT_SOURCE_DIR}/qt_PlotWindow.h
+ )
+ set_source_files_properties(
+ ${QT_MOC_OUTFILES}
+ PROPERTIES GENERATED "ON"
+ )
+ add_executable(qt_example qt_example.cpp qt_PlotWindow.cpp ${QT_MOC_OUTFILES})
+ qt5_use_modules(qt_example Svg Gui PrintSupport)
+ target_link_libraries(qt_example ${QT_LIBRARIES} plplotqt${LIB_TAG} plplot${LIB_TAG} ${qt_example_TARGETS})
else(PLPLOT_USE_QT5)
- qt4_wrap_cpp(
- QT_MOC_OUTFILES
- ${CMAKE_CURRENT_SOURCE_DIR}/qt_PlotWindow.h
- )
- # message("QT_MOC_OUTFILES = ${QT_MOC_OUTFILES}")
- set_source_files_properties(
- ${QT_MOC_OUTFILES}
- PROPERTIES GENERATED "ON"
- )
- add_executable(qt_example qt_example.cpp qt_PlotWindow.cpp ${QT_MOC_OUTFILES})
- target_link_libraries(qt_example ${QT_LIBRARIES} plplotqt${LIB_TAG} plplot${LIB_TAG})
- # Update the target COMPILE_DEFINITIONS and INCLUDE_DIRECTORIES
- set_qt_target_properties(qt_example)
+ qt4_wrap_cpp(
+ QT_MOC_OUTFILES
+ ${CMAKE_CURRENT_SOURCE_DIR}/qt_PlotWindow.h
+ )
+ # message("QT_MOC_OUTFILES = ${QT_MOC_OUTFILES}")
+ set_source_files_properties(
+ ${QT_MOC_OUTFILES}
+ PROPERTIES GENERATED "ON"
+ )
+ add_executable(qt_example qt_example.cpp qt_PlotWindow.cpp ${QT_MOC_OUTFILES})
+ target_link_libraries(qt_example ${QT_LIBRARIES} plplotqt${LIB_TAG} plplot${LIB_TAG})
+ # Update the target COMPILE_DEFINITIONS and INCLUDE_DIRECTORIES
+ set_qt_target_properties(qt_example)
endif(PLPLOT_USE_QT5)
endif(BUILD_qt_example)
endif(ENABLE_qt)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ai...@us...> - 2014-04-21 00:08:08
|
Revision: 13103
http://sourceforge.net/p/plplot/code/13103
Author: airwin
Date: 2014-04-21 00:08:04 +0000 (Mon, 21 Apr 2014)
Log Message:
-----------
Propagate PLPLOT_USE_QT5 variable to CMake-based build system for the
installed examples.
Modified Paths:
--------------
trunk/examples/plplot_configure.cmake_installed_examples.in
Modified: trunk/examples/plplot_configure.cmake_installed_examples.in
===================================================================
--- trunk/examples/plplot_configure.cmake_installed_examples.in 2014-04-21 00:06:13 UTC (rev 13102)
+++ trunk/examples/plplot_configure.cmake_installed_examples.in 2014-04-21 00:08:04 UTC (rev 13103)
@@ -233,3 +233,6 @@
# WIN32 and CYGWIN derived variables
set(WIN32_AND_NOT_CYGWIN @WIN32_AND_NOT_CYGWIN@)
set(WIN32_OR_CYGWIN @WIN32_OR_CYGWIN@)
+
+#Qt5 support
+set(PLPLOT_USE_QT5 @PLPLOT_USE_QT5@)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ai...@us...> - 2014-04-21 00:06:16
|
Revision: 13102
http://sourceforge.net/p/plplot/code/13102
Author: airwin
Date: 2014-04-21 00:06:13 +0000 (Mon, 21 Apr 2014)
Log Message:
-----------
Refine the condition where qt_example is allowed to be tested by the
traditional build system for the installed examples.
Modified Paths:
--------------
trunk/plplot_test/plplot-test-interactive.sh.in
Modified: trunk/plplot_test/plplot-test-interactive.sh.in
===================================================================
--- trunk/plplot_test/plplot-test-interactive.sh.in 2014-04-20 23:58:47 UTC (rev 13101)
+++ trunk/plplot_test/plplot-test-interactive.sh.in 2014-04-21 00:06:13 UTC (rev 13102)
@@ -177,7 +177,7 @@
COUNT=$(( $COUNT + 1 ))
fi
-if [ "@PLD_extqt@" = "ON" -a "@ENABLE_cxx@" = "ON" ] ; then
+if [ "@PLD_extqt@" = "ON" -a "@ENABLE_cxx@" = "ON" -a "@qt_gui_true@" != "#" ] ; then
INDEX_LIST="$INDEX_LIST $COUNT"
DIRECTORY[$COUNT]="${EXAMPLES_DIR}/c++"
COMMAND[$COUNT]="./qt_example"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ai...@us...> - 2014-04-20 23:58:49
|
Revision: 13101
http://sourceforge.net/p/plplot/code/13101
Author: airwin
Date: 2014-04-20 23:58:47 +0000 (Sun, 20 Apr 2014)
Log Message:
-----------
Spelling fix.
Modified Paths:
--------------
trunk/scripts/comprehensive_test.sh
Modified: trunk/scripts/comprehensive_test.sh
===================================================================
--- trunk/scripts/comprehensive_test.sh 2014-04-08 06:52:52 UTC (rev 13100)
+++ trunk/scripts/comprehensive_test.sh 2014-04-20 23:58:47 UTC (rev 13101)
@@ -287,7 +287,7 @@
$build_command test_interactive >& "$output"
make_rc=$?
if [ "$make_rc" -ne 0 ] ; then
- echo "ERROR: Traditional $build_command test_interactive failed in the installed exaples tree"
+ echo "ERROR: Traditional $build_command test_interactive failed in the installed examples tree"
exit 1
fi
if [ "$do_clean_as_you_go" = "yes" ] ; then
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <arj...@us...> - 2014-04-08 06:52:56
|
Revision: 13100
http://sourceforge.net/p/plplot/code/13100
Author: arjenmarkus
Date: 2014-04-08 06:52:52 +0000 (Tue, 08 Apr 2014)
Log Message:
-----------
Slightly more rational approach to handling keyboard and mouse events. All characters are now passed on to the caller, so the escape character is no longer special - this is left to the calling program, as it should be.
Modified Paths:
--------------
trunk/drivers/wingcc.c
Modified: trunk/drivers/wingcc.c
===================================================================
--- trunk/drivers/wingcc.c 2014-04-07 21:43:17 UTC (rev 13099)
+++ trunk/drivers/wingcc.c 2014-04-08 06:52:52 UTC (rev 13100)
@@ -1028,18 +1028,15 @@
}
break;
case WM_CHAR:
- // Handle escape
- if ( dev->msg.wParam == 0x1b )
- {
- gin->pX = 1; // This point is outside the window, but breaks the loop
- gin->pY = -1;
- gin->dX = (PLFLT) gin->pX / ( dev->width - 1 );
- gin->dY = 1.0 - (PLFLT) gin->pY / ( dev->height - 1 );
+ gin->pX = dev->msg.pt.x;
+ gin->pY = dev->msg.pt.y;
+ gin->dX = (PLFLT) gin->pX / ( dev->width - 1 );
+ gin->dY = 1.0 - (PLFLT) gin->pY / ( dev->height - 1 );
- gin->button = 0;
- gin->state = 0;
- gin->keysym = 0x1a;
- }
+ gin->button = 0;
+ gin->state = 0;
+ gin->keysym = dev->msg.wParam;
+
break;
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ai...@us...> - 2014-04-07 21:43:21
|
Revision: 13099
http://sourceforge.net/p/plplot/code/13099
Author: airwin
Date: 2014-04-07 21:43:17 +0000 (Mon, 07 Apr 2014)
Log Message:
-----------
Fix an integer overflow by only calculating physical coordinates of
the origin of the axes when those additional axes are actually used
(i.e., when the "a" option is specified and the drawn axis is
going to be inside the viewport).
This fix solves an integer overflow issue discovered by Hazen for page
5 and larger for example 29 where the 0., 0., world coordinates of the
unused axes generated with plbox were so far from the actual X
world-coordinate range of the plot that integer overflow occurred when
calculating the unused physical coordinates corresponding the the
0.,0., world coordinates of the axes origin.
Modified Paths:
--------------
trunk/src/plbox.c
Modified: trunk/src/plbox.c
===================================================================
--- trunk/src/plbox.c 2014-04-06 19:41:22 UTC (rev 13098)
+++ trunk/src/plbox.c 2014-04-07 21:43:17 UTC (rev 13099)
@@ -176,11 +176,6 @@
plsc->boxbb_ymax = plsc->vppyma / plsc->ypmm;
}
-// Convert world coordinates to physical
-
- xp0 = plP_wcpcx( x0 );
- yp0 = plP_wcpcy( y0 );
-
// Set plot options from input
lax = plP_stsearch( xopt, 'a' );
@@ -495,6 +490,8 @@
// Draw the horizontal axis.
if ( lax )
{
+ // Convert world coordinates to physical
+ yp0 = plP_wcpcy( y0 );
plP_movphy( vppxmi, (PLINT) yp0 );
plP_draphy( vppxma, (PLINT) yp0 );
if ( ltx && !lxx )
@@ -535,6 +532,8 @@
// Draw the vertical axis.
if ( lay )
{
+ // Convert world coordinates to physical
+ xp0 = plP_wcpcx( x0 );
plP_movphy( (PLINT) xp0, vppymi );
plP_draphy( (PLINT) xp0, vppyma );
if ( lty && !lxy )
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <arj...@us...> - 2014-04-06 19:41:24
|
Revision: 13098
http://sourceforge.net/p/plplot/code/13098
Author: arjenmarkus
Date: 2014-04-06 19:41:22 +0000 (Sun, 06 Apr 2014)
Log Message:
-----------
Implement the PL_ESC_GETC escape to add interactivity to the wingcc device.
Notes:
- No platform-neutral macros to identify the button
- the xwin device I used as a template has more functionality
(XOR-ing lines for instance)
- Not all fields in the PLGraphicsIn structure may be meaningful to
MS Windows. "state" is an example, or perhaps that is my limited
understanding.
Modified Paths:
--------------
trunk/drivers/wingcc.c
Modified: trunk/drivers/wingcc.c
===================================================================
--- trunk/drivers/wingcc.c 2014-04-04 17:33:29 UTC (rev 13097)
+++ trunk/drivers/wingcc.c 2014-04-06 19:41:22 UTC (rev 13098)
@@ -84,6 +84,8 @@
PLINT PRNT_width;
PLINT PRNT_height;
+ PLGraphicsIn gin;
+
char FT_smooth_text;
//
// WIN32 API variables
@@ -987,14 +989,92 @@
dev->pen = CreatePen( PS_SOLID, pls->width, dev->colour );
}
+//--------------------------------------------------------------------------
+// GetCursorCmd()
+//
+// Handle events connected to selecting points (modelled after xwin)
+//--------------------------------------------------------------------------
+
+static void
+GetCursorCmd( PLStream *pls, PLGraphicsIn *gin )
+{
+ wingcc_Dev *dev = (wingcc_Dev *) pls->dev;
+
+ HCURSOR crosshair;
+ HCURSOR previous;
+
+ plGinInit( gin );
+
+ crosshair = LoadCursor( GetModuleHandle( NULL ), IDC_CROSS );
+ previous = SetCursor( crosshair );
+
+ while ( gin->pX < 0 )
+ {
+ GetMessage( &dev->msg, NULL, 0, 0 );
+ TranslateMessage( &dev->msg );
+ switch ( (int) dev->msg.message )
+ {
+ case WM_LBUTTONDOWN:
+ if ( dev->msg.wParam & MK_LBUTTON )
+ {
+ gin->pX = dev->msg.pt.x;
+ gin->pY = dev->msg.pt.y;
+ gin->dX = (PLFLT) gin->pX / ( dev->width - 1 );
+ gin->dY = 1.0 - (PLFLT) gin->pY / ( dev->height - 1 );
+
+ gin->button = 1; // AM: there is no macro to indicate the pressed button!
+ gin->state = 0; // AM: is there an equivalent under Windows?
+ gin->keysym = 0x20;
+ }
+ break;
+ case WM_CHAR:
+ // Handle escape
+ if ( dev->msg.wParam == 0x1b )
+ {
+ gin->pX = 1; // This point is outside the window, but breaks the loop
+ gin->pY = -1;
+ gin->dX = (PLFLT) gin->pX / ( dev->width - 1 );
+ gin->dY = 1.0 - (PLFLT) gin->pY / ( dev->height - 1 );
+
+ gin->button = 0;
+ gin->state = 0;
+ gin->keysym = 0x1a;
+ }
+ break;
+ }
+ }
+
+ // Restore the previous cursor
+ SetCursor( previous );
+
+// if ( GetCursorPos(&p) )
+// {
+// if ( ScreenToClient( dev->hwnd, &p ) )
+// {
+// // Fill the fields, but actually we need to run the event loop
+// // We need to call GetMessage() in a loop. Unclear as yet to the
+// // actual interface: key/button presses?
+// }
+// }
+}
+
+//--------------------------------------------------------------------------
+// plD_esc_wingcc()
+//
+// Handle PLplot escapes
+//--------------------------------------------------------------------------
+
void
plD_esc_wingcc( PLStream *pls, PLINT op, void *ptr )
{
wingcc_Dev *dev = (wingcc_Dev *) pls->dev;
+ PLGraphicsIn *gin = &( dev->gin );
+
switch ( op )
{
case PLESC_GETC:
+ GetCursorCmd( pls, (PLGraphicsIn *) ptr );
break;
case PLESC_FILL:
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ai...@us...> - 2014-04-04 17:33:32
|
Revision: 13097
http://sourceforge.net/p/plplot/code/13097
Author: airwin
Date: 2014-04-04 17:33:29 +0000 (Fri, 04 Apr 2014)
Log Message:
-----------
Solve name clash <https://sourceforge.net/p/plplot/bugs/146/> by
replacing HAVE_CONFIG_H ==> PLPLOT_HAVE_CONFIG_H everywhere within
our source tree.
Modified Paths:
--------------
trunk/examples/CMakeLists.txt
Modified: trunk/examples/CMakeLists.txt
===================================================================
--- trunk/examples/CMakeLists.txt 2014-04-04 17:31:22 UTC (rev 13096)
+++ trunk/examples/CMakeLists.txt 2014-04-04 17:33:29 UTC (rev 13097)
@@ -414,7 +414,7 @@
endif(CORE_BUILD)
if(CORE_BUILD AND BUILD_TEST)
- remove_definitions("-DHAVE_CONFIG_H")
+ remove_definitions("-DPLPLOT_HAVE_CONFIG_H")
endif(CORE_BUILD AND BUILD_TEST)
# Decide on device to be used for generic interactive tests.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ai...@us...> - 2014-04-04 17:31:26
|
Revision: 13096
http://sourceforge.net/p/plplot/code/13096
Author: airwin
Date: 2014-04-04 17:31:22 +0000 (Fri, 04 Apr 2014)
Log Message:
-----------
Solve name clash <https://sourceforge.net/p/plplot/bugs/146/> by
replacing HAVE_CONFIG_H ==> PLPLOT_HAVE_CONFIG_H everywhere within
our source tree.
Modified Paths:
--------------
trunk/CMakeLists.txt
trunk/bindings/ocaml/CMakeLists.txt
trunk/bindings/ocaml/plcairo/CMakeLists.txt
trunk/include/plConfig.h.in
trunk/plplot_config.h.in
Modified: trunk/CMakeLists.txt
===================================================================
--- trunk/CMakeLists.txt 2014-04-04 16:21:39 UTC (rev 13095)
+++ trunk/CMakeLists.txt 2014-04-04 17:31:22 UTC (rev 13096)
@@ -125,7 +125,7 @@
${CMAKE_CURRENT_BINARY_DIR}/plplot_config.h
)
# Allow access to the generated plplot_config.h for this build.
-add_definitions("-DHAVE_CONFIG_H")
+add_definitions("-DPLPLOT_HAVE_CONFIG_H")
# Install top-level files
# Enable testing framework for examples
Modified: trunk/bindings/ocaml/CMakeLists.txt
===================================================================
--- trunk/bindings/ocaml/CMakeLists.txt 2014-04-04 16:21:39 UTC (rev 13095)
+++ trunk/bindings/ocaml/CMakeLists.txt 2014-04-04 17:31:22 UTC (rev 13096)
@@ -98,7 +98,7 @@
${CMAKE_CURRENT_BINARY_DIR}/dllplplot_stubs.so
${CMAKE_CURRENT_BINARY_DIR}/libplplot_stubs.a
COMMAND ${OCAMLC} -ccopt -I${CAMLIDL_LIB_DIR} -c ${CMAKE_CURRENT_BINARY_DIR}/plplot_core_stubs.c
- COMMAND ${OCAMLC} -ccopt -I${CMAKE_SOURCE_DIR}/include -ccopt -I${CMAKE_BINARY_DIR}/include -ccopt -I${CMAKE_SOURCE_DIR}/lib/qsastime -ccopt -I${CMAKE_BINARY_DIR} -ccopt -I${CAMLIDL_LIB_DIR} -ccopt -DHAVE_CONFIG_H -c ${CMAKE_CURRENT_SOURCE_DIR}/plplot_impl.c
+ COMMAND ${OCAMLC} -ccopt -I${CMAKE_SOURCE_DIR}/include -ccopt -I${CMAKE_BINARY_DIR}/include -ccopt -I${CMAKE_SOURCE_DIR}/lib/qsastime -ccopt -I${CMAKE_BINARY_DIR} -ccopt -I${CAMLIDL_LIB_DIR} -ccopt -DPLPLOT_HAVE_CONFIG_H -c ${CMAKE_CURRENT_SOURCE_DIR}/plplot_impl.c
COMMAND ${OCAMLMKLIB} -o plplot_stubs -L${CAMLIDL_LIB_DIR} -lcamlidl -L${CMAKE_BINARY_DIR}/src -lplplot${LIB_TAG} ${CMAKE_CURRENT_BINARY_DIR}/plplot_core_stubs.o ${CMAKE_CURRENT_BINARY_DIR}/plplot_impl.o ${ocaml_STATIC_FLAGS}
DEPENDS
${CMAKE_CURRENT_BINARY_DIR}/plplot_core_stubs.c
Modified: trunk/bindings/ocaml/plcairo/CMakeLists.txt
===================================================================
--- trunk/bindings/ocaml/plcairo/CMakeLists.txt 2014-04-04 16:21:39 UTC (rev 13095)
+++ trunk/bindings/ocaml/plcairo/CMakeLists.txt 2014-04-04 17:31:22 UTC (rev 13096)
@@ -36,7 +36,7 @@
${CMAKE_CURRENT_BINARY_DIR}/plcairo_impl.o
${CMAKE_CURRENT_BINARY_DIR}/dllplcairo_stubs.so
${CMAKE_CURRENT_BINARY_DIR}/libplcairo_stubs.a
- COMMAND ${OCAMLC} -ccopt "${CAIRO_COMPILE_FLAGS}" -cclib "${CAIRO_LINK_FLAGS}" -ccopt -I${CMAKE_SOURCE_DIR}/include -ccopt -I${CMAKE_BINARY_DIR}/include -ccopt -I${CMAKE_SOURCE_DIR}/lib/qsastime -ccopt -I${CMAKE_BINARY_DIR} -ccopt -DHAVE_CONFIG_H -c ${CMAKE_CURRENT_SOURCE_DIR}/plcairo_impl.c
+ COMMAND ${OCAMLC} -ccopt "${CAIRO_COMPILE_FLAGS}" -cclib "${CAIRO_LINK_FLAGS}" -ccopt -I${CMAKE_SOURCE_DIR}/include -ccopt -I${CMAKE_BINARY_DIR}/include -ccopt -I${CMAKE_SOURCE_DIR}/lib/qsastime -ccopt -I${CMAKE_BINARY_DIR} -ccopt -DPLPLOT_HAVE_CONFIG_H -c ${CMAKE_CURRENT_SOURCE_DIR}/plcairo_impl.c
COMMAND ${OCAMLMKLIB} -o plcairo_stubs ${CAIRO_LINK_FLAGS_LIST} -L${CMAKE_BINARY_DIR}/src -lplplot${LIB_TAG} ${CMAKE_CURRENT_BINARY_DIR}/plcairo_impl.o
DEPENDS
${CMAKE_CURRENT_SOURCE_DIR}/plcairo_impl.c
Modified: trunk/include/plConfig.h.in
===================================================================
--- trunk/include/plConfig.h.in 2014-04-04 16:21:39 UTC (rev 13095)
+++ trunk/include/plConfig.h.in 2014-04-04 17:31:22 UTC (rev 13096)
@@ -29,7 +29,7 @@
// any user applications). Therefore, the configured plConfig.h
// should be installed. In contrast, plplot_config.h.in (note,
// plConfig.h #includes plplot_config.h for the core build because
-// HAVE_CONFIG_H is #defined in that case) contains configured macros
+// PLPLOT_HAVE_CONFIG_H is #defined in that case) contains configured macros
// that are only required for the core build. Therefore, in contrast
// to plConfig.h, plplot_config.h should not be installed.
//
@@ -43,7 +43,7 @@
#ifndef __PLCONFIG_H__
#define __PLCONFIG_H__
-#ifdef HAVE_CONFIG_H
+#ifdef PLPLOT_HAVE_CONFIG_H
# include <plplot_config.h>
#endif
Modified: trunk/plplot_config.h.in
===================================================================
--- trunk/plplot_config.h.in 2014-04-04 16:21:39 UTC (rev 13095)
+++ trunk/plplot_config.h.in 2014-04-04 17:31:22 UTC (rev 13096)
@@ -3,7 +3,7 @@
// examples (and presumably any user applications). Therefore, the
// configured plplot_config.h should not be installed. In contrast,
// include/plConfig.h.in (note, the configured plConfig.h result
-// #includes plplot_config.h for the core build because HAVE_CONFIG_H
+// #includes plplot_config.h for the core build because PLPLOT_HAVE_CONFIG_H
// is #defined in that case) contains configured macros that are
// required for the core build, installed examples build, and build of
// user applications. Therefore, in contrast to plplot_config.h,
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ai...@us...> - 2014-04-04 16:21:43
|
Revision: 13095
http://sourceforge.net/p/plplot/code/13095
Author: airwin
Date: 2014-04-04 16:21:39 +0000 (Fri, 04 Apr 2014)
Log Message:
-----------
Because ENABLE_d=ON is known to interfere with wxwidgets linking on
Windows (for unknown reasons) turn it OFF by default on that platform.
Modified Paths:
--------------
trunk/cmake/modules/d.cmake
Modified: trunk/cmake/modules/d.cmake
===================================================================
--- trunk/cmake/modules/d.cmake 2014-04-02 20:46:46 UTC (rev 13094)
+++ trunk/cmake/modules/d.cmake 2014-04-04 16:21:39 UTC (rev 13095)
@@ -24,6 +24,11 @@
# Options to enable D bindings
if(DEFAULT_NO_BINDINGS)
option(ENABLE_d "Enable D bindings" OFF)
+elseif(WIN32_AND_NOT_CYGWIN)
+ option(ENABLE_d "Enable D bindings" OFF)
+ if(ENABLE_d)
+ message(STATUS "WARNING: setting the -DENABLE_d=ON option is considered to be experimental on Windows because it has been found to interfere with wxwidgets linking for unknown reasons")
+ endif(ENABLE_d)
else(DEFAULT_NO_BINDINGS)
option(ENABLE_d "Enable D bindings" ON)
endif(DEFAULT_NO_BINDINGS)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ai...@us...> - 2014-04-02 20:46:51
|
Revision: 13094
http://sourceforge.net/p/plplot/code/13094
Author: airwin
Date: 2014-04-02 20:46:46 +0000 (Wed, 02 Apr 2014)
Log Message:
-----------
Fix bugs (bad order, missing DEPENDS) in implementation of gtk+
dependency of wxwidgets in the Unix case.
Modified Paths:
--------------
trunk/cmake/epa_build/wxwidgets/CMakeLists.txt
Modified: trunk/cmake/epa_build/wxwidgets/CMakeLists.txt
===================================================================
--- trunk/cmake/epa_build/wxwidgets/CMakeLists.txt 2014-04-02 07:42:07 UTC (rev 13093)
+++ trunk/cmake/epa_build/wxwidgets/CMakeLists.txt 2014-04-02 20:46:46 UTC (rev 13094)
@@ -24,7 +24,24 @@
# ignored.
set(ignored_dependencies_LIST ${extra_ignored_dependencies_list})
-set(dependencies_LIST)
+if(MSYS_PLATFORM)
+ # No dependencies required on Windows.
+ set(dependencies_LIST)
+else(MSYS_PLATFORM)
+ # To avoid having to build all of gtk with epa_build in a consistent
+ # manner I tried several alternatives to the gtk toolkit.
+ # e.g.,
+ # set(toolkit_options --with-x11)
+ # set(toolkit_options --with-motif)
+ # But neither of those worked because they are not capable of
+ # supplying the unicode (see --enable-unicode below) capability
+ # that is provided by the default gtk toolkit and needed by the
+ # PLplot build of the wxwidgets device.
+ # The inevitable conclusion is that on Unix, we must use the gtk toolkit
+ # and therefore (now that epa_build has a gtk+ configuration)
+ # we must specificially add gtk+ as a dependency of wxwidgets.
+ set(dependencies_LIST gtk+)
+endif(MSYS_PLATFORM)
# Do boilerplate tasks that must be done for each different project
# that is configured as part of epa_build.
@@ -39,22 +56,9 @@
if(MSYS_PLATFORM)
set(CXXFLAGS "-fno-keep-inline-dllexport $ENV{CXXFLAGS}")
- # No further dependencies required on Windows.
else(MSYS_PLATFORM)
set(CXXFLAGS "$ENV{CXXFLAGS}")
- # To avoid having to build all of gtk with epa_build in a consistent
- # manner I tried several alternatives to the gtk toolkit.
- # e.g.,
- # set(toolkit_options --with-x11)
- # set(toolkit_options --with-motif)
- # But neither of those worked because they are not capable of
- # supplying the unicode (see --enable-unicode below) capability
- # that is provided by the default gtk toolkit and needed by the
- # PLplot build of the wxwidgets device.
- # The inevitable conclusion is that on Unix, we must use the gtk toolkit
- # and therefore (now that epa_build has a gtk+ configuration)
- # we must specificially add gtk+ as a dependency of wxwidgets.
- list(APPEND dependencies_LIST gtk+)
+ # --with-gtk=3 because of gtk+ (version 3) dependency above
set(toolkit_options --enable-debug --enable-debug_gdb --with-gtk=3)
endif(MSYS_PLATFORM)
@@ -75,6 +79,7 @@
ExternalProject_Add(
build_${PACKAGE}
+ DEPENDS "${dependencies_targets}"
URL ${URL}
URL_HASH ${URL_HASH}
CONFIGURE_COMMAND ${ENV_EXECUTABLE} PATH=${EPA_PATH} "CFLAGS=${CFLAGS}" "CXXFLAGS=${CXXFLAGS}" ${source_PATH}/${EPA_CONFIGURE_COMMAND} --enable-shared --enable-unicode ${toolkit_options}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ai...@us...> - 2014-04-02 07:42:11
|
Revision: 13093
http://sourceforge.net/p/plplot/code/13093
Author: airwin
Date: 2014-04-02 07:42:07 +0000 (Wed, 02 Apr 2014)
Log Message:
-----------
Change from "*" ==> "#(728)" for the symbol that is plotted.
This change is from a simple ascii asterisk to the Hershey-indexed
asterisk operator symbol which for both Hershey and Unicode fonts has
much better vertical alignment. The result is much improved looking
plots for standard examples 4, 26 and 33.
Tested on Linux using the test_diff_psc target.
Modified Paths:
--------------
trunk/examples/ada/x04a.adb
trunk/examples/ada/x26a.adb
trunk/examples/ada/x33a.adb
trunk/examples/ada/xthick04a.adb
trunk/examples/ada/xthick26a.adb
trunk/examples/ada/xthick33a.adb
trunk/examples/c/x04c.c
trunk/examples/c/x26c.c
trunk/examples/c/x33c.c
trunk/examples/c++/x04.cc
trunk/examples/c++/x26.cc
trunk/examples/c++/x33.cc
trunk/examples/d/x04d.d
trunk/examples/d/x26d.d
trunk/examples/d/x33d.d
trunk/examples/f95/x04f.f90
trunk/examples/f95/x26f.f90
trunk/examples/f95/x33f.f90
trunk/examples/java/x04.java
trunk/examples/java/x26.java
trunk/examples/java/x33.java
trunk/examples/lua/x04.lua
trunk/examples/lua/x26.lua
trunk/examples/lua/x33.lua
trunk/examples/ocaml/x04.ml
trunk/examples/ocaml/x26.ml
trunk/examples/ocaml/x33.ml
trunk/examples/octave/x04c.m
trunk/examples/octave/x26c.m
trunk/examples/octave/x33c.m
trunk/examples/python/xw04.py
trunk/examples/python/xw26.py
trunk/examples/python/xw33.py
trunk/examples/tcl/x04.tcl
trunk/examples/tcl/x26.tcl
trunk/examples/tcl/x33.tcl
Modified: trunk/examples/ada/x04a.adb
===================================================================
--- trunk/examples/ada/x04a.adb 2014-04-01 20:04:46 UTC (rev 13092)
+++ trunk/examples/ada/x04a.adb 2014-04-02 07:42:07 UTC (rev 13093)
@@ -80,7 +80,7 @@
plbox("", 0.0, 0, "cmstv", 30.0, 3);
plcol0(3);
plline(freql, phase);
- plstring(freql, phase, "*");
+ plstring(freql, phase, "#(728)");
plcol0(3);
plmtex("r", 5.0, 0.5, 0.5, "Phase shift (degrees)");
end if;
@@ -110,7 +110,7 @@
symbol_colors(0) := 3; -- Don't care; not used.
symbol_scales(0) := 1.0; -- Don't care; not used.
symbol_numbers(0) := 4; -- Don't care; not used.
- symbols(0) := To_Unbounded_String("*"); -- Don't care; not used.
+ symbols(0) := To_Unbounded_String("#(728)"); -- Don't care; not used.
-- Second legend entry.
opt_array(1) := Legend_Line + Legend_Symbol;
@@ -122,7 +122,7 @@
symbol_colors(1) := 3;
symbol_scales(1) := 1.0;
symbol_numbers(1) := 4;
- symbols(1) := To_Unbounded_String("*");
+ symbols(1) := To_Unbounded_String("#(728)");
pllegend(legend_width, legend_height,
Legend_Background + Legend_Bounding_Box, 0,
@@ -159,7 +159,7 @@
symbol_colors(0) := 3; -- Don't care; not used.
symbol_scales(0) := 1.0; -- Don't care; not used.
symbol_numbers(0) := 4; -- Don't care; not used.
- symbols(0) := To_Unbounded_String("*"); -- Don't care; not used.
+ symbols(0) := To_Unbounded_String("#(728)"); -- Don't care; not used.
Box_Colors(0) := 0;
Box_Patterns(0) := 0;
Box_Line_Widths(0) := 0.0;
Modified: trunk/examples/ada/x26a.adb
===================================================================
--- trunk/examples/ada/x26a.adb 2014-04-01 20:04:46 UTC (rev 13092)
+++ trunk/examples/ada/x26a.adb 2014-04-02 07:42:07 UTC (rev 13093)
@@ -172,7 +172,7 @@
plbox("", 0.0, 0, "cmstv", 30.0, 3);
plcol0(3);
plline(freql, phase);
- plstring(freql, phase, "*");
+ plstring(freql, phase, "#(728)");
plcol0(3);
plmtex("r", 5.0, 0.5, 0.5, alty_label);
@@ -186,7 +186,7 @@
symbol_colors(0) := 3; -- Don't care; not used.
symbol_scales(0) := 1.0; -- Don't care; not used.
symbol_numbers(0) := 4; -- Don't care; not used.
- symbols(0) := To_Unbounded_String("*"); -- Don't care; not used.
+ symbols(0) := To_Unbounded_String("#(728)"); -- Don't care; not used.
-- Second legend entry.
opt_array(1) := Legend_Line + Legend_Symbol;
@@ -197,7 +197,7 @@
symbol_colors(1) := 3;
symbol_scales(1) := 1.0;
symbol_numbers(1) := 4;
- symbols(1) := To_Unbounded_String("*");
+ symbols(1) := To_Unbounded_String("#(728)");
plscol0a(15, 32, 32, 32, 0.70);
pllegend(legend_width, legend_height,
Modified: trunk/examples/ada/x33a.adb
===================================================================
--- trunk/examples/ada/x33a.adb 2014-04-01 20:04:46 UTC (rev 13092)
+++ trunk/examples/ada/x33a.adb 2014-04-02 07:42:07 UTC (rev 13093)
@@ -304,7 +304,7 @@
line_widths(0) := 1.0;
symbol_scales(0) := 1.0;
symbol_numbers(0) := 4;
- symbols(0) := TUB("*");
+ symbols(0) := TUB("#(728)");
-- Use monotype fonts so that all legends are the same size.
plsfont(PL_FCI_MONO, -1, -1);
@@ -369,7 +369,7 @@
line_widths(k) := 1.0;
symbol_scales(k) := 1.0;
symbol_numbers(k) := 2;
- symbols(k) := TUB("*");
+ symbols(k) := TUB("#(728)");
-- Make 2-digit strings with leading 0 for 0 .. 9.
if k >= 10 then
text(k) := To_Unbounded_String(Trim(Integer'image(k), Left));
@@ -538,7 +538,7 @@
line_widths(k) := 1.0;
symbol_scales(k) := 1.0;
symbol_numbers(k) := 2;
- symbols(k) := TUB("*");
+ symbols(k) := TUB("#(728)");
-- Make 2-digit strings with leading 0 for 0 .. 9.
if k >= 10 then
text(k) := To_Unbounded_String(Trim(Integer'image(k), Left));
Modified: trunk/examples/ada/xthick04a.adb
===================================================================
--- trunk/examples/ada/xthick04a.adb 2014-04-01 20:04:46 UTC (rev 13092)
+++ trunk/examples/ada/xthick04a.adb 2014-04-02 07:42:07 UTC (rev 13093)
@@ -80,7 +80,7 @@
Box_Around_Viewport("", 0.0, 0, "cmstv", 30.0, 3);
Set_Pen_Color(Green);
Draw_Curve(freql, phase);
- Draw_String(freql, phase, "*");
+ Draw_String(freql, phase, "#(728)");
Set_Pen_Color(Green);
Write_Text_Viewport("r", 5.0, 0.5, 0.5, "Phase shift (degrees)");
end if;
@@ -110,7 +110,7 @@
symbol_colors(0) := 3; -- Don't care; not used.
symbol_scales(0) := 1.0; -- Don't care; not used.
symbol_numbers(0) := 4; -- Don't care; not used.
- symbols(0) := To_Unbounded_String("*"); -- Don't care; not used.
+ symbols(0) := To_Unbounded_String("#(728)"); -- Don't care; not used.
-- Second legend entry.
opt_array(1) := Legend_Line + Legend_Symbol;
@@ -122,7 +122,7 @@
symbol_colors(1) := Green;
symbol_scales(1) := 1.0;
symbol_numbers(1) := 4;
- symbols(1) := To_Unbounded_String("*");
+ symbols(1) := To_Unbounded_String("#(728)");
Create_Legend(legend_width, legend_height,
Legend_Background + Legend_Bounding_Box, 0,
@@ -159,7 +159,7 @@
symbol_colors(0) := 3; -- Don't care; not used.
symbol_scales(0) := 1.0; -- Don't care; not used.
symbol_numbers(0) := 4; -- Don't care; not used.
- symbols(0) := To_Unbounded_String("*"); -- Don't care; not used.
+ symbols(0) := To_Unbounded_String("#(728)"); -- Don't care; not used.
Box_Colors(0) := 0;
Box_Patterns(0) := 0;
Box_Line_Widths(0) := 0.0;
Modified: trunk/examples/ada/xthick26a.adb
===================================================================
--- trunk/examples/ada/xthick26a.adb 2014-04-01 20:04:46 UTC (rev 13092)
+++ trunk/examples/ada/xthick26a.adb 2014-04-02 07:42:07 UTC (rev 13093)
@@ -172,7 +172,7 @@
Box_Around_Viewport("", 0.0, 0, "cmstv", 30.0, 3);
Set_Pen_Color(Green);
Draw_Curve(freql, phase);
- Draw_String(freql, phase, "*");
+ Draw_String(freql, phase, "#(728)");
Set_Pen_Color(Green);
Write_Text_Viewport("r", 5.0, 0.5, 0.5, alty_label);
@@ -186,7 +186,7 @@
symbol_colors(0) := 3; -- Don't care; not used.
symbol_scales(0) := 1.0; -- Don't care; not used.
symbol_numbers(0) := 4; -- Don't care; not used.
- symbols(0) := To_Unbounded_String("*"); -- Don't care; not used.
+ symbols(0) := To_Unbounded_String("#(728)"); -- Don't care; not used.
-- Second legend entry.
opt_array(1) := Legend_Line + Legend_Symbol;
@@ -197,7 +197,7 @@
symbol_colors(1) := 3;
symbol_scales(1) := 1.0;
symbol_numbers(1) := 4;
- symbols(1) := To_Unbounded_String("*");
+ symbols(1) := To_Unbounded_String("#(728)");
Set_One_Color_Map_0_And_Alpha(15, 32, 32, 32, 0.70);
Create_Legend(legend_width, legend_height,
Modified: trunk/examples/ada/xthick33a.adb
===================================================================
--- trunk/examples/ada/xthick33a.adb 2014-04-01 20:04:46 UTC (rev 13092)
+++ trunk/examples/ada/xthick33a.adb 2014-04-02 07:42:07 UTC (rev 13093)
@@ -304,7 +304,7 @@
line_widths(0) := 1.0;
symbol_scales(0) := 1.0;
symbol_numbers(0) := 4;
- symbols(0) := TUB("*");
+ symbols(0) := TUB("#(728)");
-- Use monotype fonts so that all legends are the same size.
Set_Font(PL_FCI_MONO, -1, -1);
@@ -369,7 +369,7 @@
line_widths(k) := 1.0;
symbol_scales(k) := 1.0;
symbol_numbers(k) := 2;
- symbols(k) := TUB("*");
+ symbols(k) := TUB("#(728)");
-- Make 2-digit strings with leading 0 for 0 .. 9.
if k >= 10 then
text(k) := To_Unbounded_String(Trim(Integer'image(k), Left));
@@ -538,7 +538,7 @@
line_widths(k) := 1.0;
symbol_scales(k) := 1.0;
symbol_numbers(k) := 2;
- symbols(k) := TUB("*");
+ symbols(k) := TUB("#(728)");
-- Make 2-digit strings with leading 0 for 0 .. 9.
if k >= 10 then
text(k) := To_Unbounded_String(Trim(Integer'image(k), Left));
Modified: trunk/examples/c/x04c.c
===================================================================
--- trunk/examples/c/x04c.c 2014-04-01 20:04:46 UTC (rev 13092)
+++ trunk/examples/c/x04c.c 2014-04-02 07:42:07 UTC (rev 13093)
@@ -109,7 +109,7 @@
plbox( "", 0.0, 0, "cmstv", 30.0, 3 );
plcol0( 3 );
plline( 101, freql, phase );
- plstring( 101, freql, phase, "*" );
+ plstring( 101, freql, phase, "#(728)" );
plcol0( 3 );
plmtex( "r", 5.0, 0.5, 0.5, "Phase shift (degrees)" );
nlegend = 2;
@@ -138,7 +138,7 @@
symbol_colors[1] = 3;
symbol_scales[1] = 1.;
symbol_numbers[1] = 4;
- symbols[1] = "*";
+ symbols[1] = "#(728)";
// from the above opt_arrays we can completely ignore everything
// to do with boxes.
Modified: trunk/examples/c/x26c.c
===================================================================
--- trunk/examples/c/x26c.c 2014-04-01 20:04:46 UTC (rev 13092)
+++ trunk/examples/c/x26c.c 2014-04-02 07:42:07 UTC (rev 13093)
@@ -211,7 +211,7 @@
plbox( "", 0.0, 0, "cmstv", 30.0, 3 );
plcol0( 3 );
plline( 101, freql, phase );
- plstring( 101, freql, phase, "*" );
+ plstring( 101, freql, phase, "#(728)" );
plcol0( 3 );
plmtex( "r", 5.0, 0.5, 0.5, alty_label );
}
@@ -234,7 +234,7 @@
symbol_colors[1] = 3;
symbol_scales[1] = 1.;
symbol_numbers[1] = 4;
- symbols[1] = "*";
+ symbols[1] = "#(728)";
// from the above opt_arrays we can completely ignore everything
// to do with boxes.
Modified: trunk/examples/c/x33c.c
===================================================================
--- trunk/examples/c/x33c.c 2014-04-01 20:04:46 UTC (rev 13092)
+++ trunk/examples/c/x33c.c 2014-04-02 07:42:07 UTC (rev 13093)
@@ -353,7 +353,7 @@
line_widths[0] = 1.;
symbol_scales[0] = 1.;
symbol_numbers[0] = 4;
- symbols[0] = "*";
+ symbols[0] = "#(728)";
// Use monotype fonts so that all legends are the same size.
plsfont( PL_FCI_MONO, -1, -1 );
@@ -399,7 +399,7 @@
line_widths[k] = 1.;
symbol_scales[k] = 1.;
symbol_numbers[k] = 2;
- symbols[k] = "*";
+ symbols[k] = "#(728)";
sprintf( text[k], "%2.2d", k );
text_colors[k] = 1 + ( k % 8 );
line_colors[k] = 1 + ( k % 8 );
@@ -539,7 +539,7 @@
line_widths[k] = 1.;
symbol_scales[k] = 1.;
symbol_numbers[k] = 2;
- symbols[k] = "*";
+ symbols[k] = "#(728)";
sprintf( text[k], "%2.2d", k );
text_colors[k] = 1 + ( k % 8 );
line_colors[k] = 1 + ( k % 8 );
Modified: trunk/examples/c++/x04.cc
===================================================================
--- trunk/examples/c++/x04.cc 2014-04-01 20:04:46 UTC (rev 13092)
+++ trunk/examples/c++/x04.cc 2014-04-02 07:42:07 UTC (rev 13093)
@@ -135,7 +135,7 @@
pls->box( "", 0.0, 0, "cmstv", 30.0, 3 );
pls->col0( 3 );
pls->line( 101, freql, phase );
- pls->string( 101, freql, phase, "*" );
+ pls->string( 101, freql, phase, "#(728)" );
pls->col0( 3 );
pls->mtex( "r", 5.0, 0.5, 0.5, "Phase shift (degrees)" );
nlegend = 2;
@@ -162,7 +162,7 @@
symbol_colors[1] = 3;
symbol_scales[1] = 1.;
symbol_numbers[1] = 4;
- symbols[1] = "*";
+ symbols[1] = "#(728)";
// from the above opt_arrays we can completely ignore everything
// to do with boxes.
Modified: trunk/examples/c++/x26.cc
===================================================================
--- trunk/examples/c++/x26.cc 2014-04-01 20:04:46 UTC (rev 13092)
+++ trunk/examples/c++/x26.cc 2014-04-02 07:42:07 UTC (rev 13093)
@@ -220,7 +220,7 @@
pls->box( "", 0.0, 0, "cmstv", 30.0, 3 );
pls->col0( 3 );
pls->line( 101, freql, phase );
- pls->string( 101, freql, phase, "*" );
+ pls->string( 101, freql, phase, "#(728)" );
pls->col0( 3 );
pls->mtex( "r", 5.0, 0.5, 0.5, alty_label );
}
@@ -244,7 +244,7 @@
symbol_colors[1] = 3;
symbol_scales[1] = 1.;
symbol_numbers[1] = 4;
- symbols[1] = "*";
+ symbols[1] = "#(728)";
// from the above opt_arrays we can completely ignore everything
// to do with boxes.
Modified: trunk/examples/c++/x33.cc
===================================================================
--- trunk/examples/c++/x33.cc 2014-04-01 20:04:46 UTC (rev 13092)
+++ trunk/examples/c++/x33.cc 2014-04-02 07:42:07 UTC (rev 13093)
@@ -358,7 +358,7 @@
line_widths[0] = 1.0;
symbol_scales[0] = 1.;
symbol_numbers[0] = 4;
- symbols[0] = "*";
+ symbols[0] = "#(728)";
// Use monotype fonts so that all legends are the same size.
pls->sfont( PL_FCI_MONO, -1, -1 );
@@ -404,7 +404,7 @@
line_widths[k] = 1.0;
symbol_scales[k] = 1.;
symbol_numbers[k] = 2;
- symbols[k] = "*";
+ symbols[k] = "#(728)";
sprintf( text[k], "%2.2d", k );
text_colors[k] = 1 + ( k % 8 );
line_colors[k] = 1 + ( k % 8 );
@@ -544,7 +544,7 @@
line_widths[k] = 1.0;
symbol_scales[k] = 1.;
symbol_numbers[k] = 2;
- symbols[k] = "*";
+ symbols[k] = "#(728)";
sprintf( text[k], "%2.2d", k );
text_colors[k] = 1 + ( k % 8 );
line_colors[k] = 1 + ( k % 8 );
Modified: trunk/examples/d/x04d.d
===================================================================
--- trunk/examples/d/x04d.d 2014-04-01 20:04:46 UTC (rev 13092)
+++ trunk/examples/d/x04d.d 2014-04-02 07:42:07 UTC (rev 13093)
@@ -103,7 +103,7 @@
plbox( "", 0.0, 0, "cmstv", 30.0, 3 );
plcol0( 3 );
plline( freql, phase );
- plstring( freql, phase, "*" );
+ plstring( freql, phase, "#(728)" );
plcol0( 3 );
plmtex( "r", 5.0, 0.5, 0.5, "Phase shift (degrees)" );
@@ -151,7 +151,7 @@
symbol_colors[1] = 3;
symbol_scales[1] = 1.;
symbol_numbers[1] = 4;
- symbols[1] = "*";
+ symbols[1] = "#(728)";
// Note from the above opt_array the second box array indices
// do not have to be specified
}
Modified: trunk/examples/d/x26d.d
===================================================================
--- trunk/examples/d/x26d.d 2014-04-01 20:04:46 UTC (rev 13092)
+++ trunk/examples/d/x26d.d 2014-04-02 07:42:07 UTC (rev 13093)
@@ -200,7 +200,7 @@
plbox( "", 0.0, 0, "cmstv", 30.0, 3 );
plcol0( 3 );
plline( freql, phase );
- plstring( freql, phase, "*" );
+ plstring( freql, phase, "#(728)" );
plcol0( 3 );
plmtex( "r", 5.0, 0.5, 0.5, alty_label );
}
@@ -238,7 +238,7 @@
symbol_colors[1] = 3;
symbol_scales[1] = 1.;
symbol_numbers[1] = 4;
- symbols[1] = "*";
+ symbols[1] = "#(728)";
// Note from the above opt_array the second box array indices
// do not have to be specified
Modified: trunk/examples/d/x33d.d
===================================================================
--- trunk/examples/d/x33d.d 2014-04-01 20:04:46 UTC (rev 13092)
+++ trunk/examples/d/x33d.d 2014-04-02 07:42:07 UTC (rev 13093)
@@ -324,7 +324,7 @@
line_widths[0] = 1.;
symbol_scales[0] = 1.;
symbol_numbers[0] = 4;
- symbols[0] = "*";
+ symbols[0] = "#(728)";
// Use monotype fonts so that all legends are the same size.
plsfont( PL_FCI_MONO, -1, -1 );
@@ -370,7 +370,7 @@
line_widths[k] = 1.;
symbol_scales[k] = 1.;
symbol_numbers[k] = 2;
- symbols[k] = "*";
+ symbols[k] = "#(728)";
text[k] = format( "%2.2d", k );
text_colors[k] = 1 + ( k % 8 );
line_colors[k] = 1 + ( k % 8 );
@@ -510,7 +510,7 @@
line_widths[k] = 1.;
symbol_scales[k] = 1.;
symbol_numbers[k] = 2;
- symbols[k] = "*";
+ symbols[k] = "#(728)";
text[k] = format( "%2.2d", k );
text_colors[k] = 1 + ( k % 8 );
line_colors[k] = 1 + ( k % 8 );
Modified: trunk/examples/f95/x04f.f90
===================================================================
--- trunk/examples/f95/x04f.f90 2014-04-01 20:04:46 UTC (rev 13092)
+++ trunk/examples/f95/x04f.f90 2014-04-02 07:42:07 UTC (rev 13093)
@@ -47,7 +47,7 @@
integer :: box_colors(0), box_patterns(0)
real(kind=plflt) :: box_line_widths(0)
character(len=20) :: text(2)
- character(len=1) :: symbols(2)
+ character(len=20) :: symbols(2)
call pladv(0)
! Set up data for log plot.
@@ -85,7 +85,7 @@
call plbox(' ', 0.0_plflt, 0, 'cmstv', 30.0_plflt, 3)
call plcol0(3)
call plline(freql, phase)
- call plstring(freql, phase, '*')
+ call plstring(freql, phase, "#(728)")
call plcol0(3)
call plmtex('r', 5.0_plflt, 0.5_plflt, 0.5_plflt, &
'Phase shift (degrees)')
@@ -116,7 +116,7 @@
symbol_colors(2) = 3
symbol_scales(2) = 1.0
symbol_numbers(2) = 4
- symbols(2) = '*'
+ symbols(2) = "#(728)"
! from the above opt_arrays we can completely ignore everything
! to do with boxes. (Hence the size 0 for the associated arrays)
Modified: trunk/examples/f95/x26f.f90
===================================================================
--- trunk/examples/f95/x26f.f90 2014-04-01 20:04:46 UTC (rev 13092)
+++ trunk/examples/f95/x26f.f90 2014-04-02 07:42:07 UTC (rev 13093)
@@ -207,7 +207,7 @@
call plbox("", 0.0_plflt, 0, "cmstv", 30.0_plflt, 3)
call plcol0(3)
call plline(freql, phase)
- call plstring(freql, phase, '*')
+ call plstring(freql, phase, "#(728)")
call plcol0(3)
call plmtex("r", 5.0_plflt, 0.5_plflt, 0.5_plflt, alty_label)
endif
@@ -239,7 +239,7 @@
symbol_colors(2) = 3
symbol_scales(2) = 1.
symbol_numbers(2) = 4
- symbols(2) = "*"
+ symbols(2) = "#(728)"
! from the above opt_arrays we can completely ignore everything
! to do with boxes.
Modified: trunk/examples/f95/x33f.f90
===================================================================
--- trunk/examples/f95/x33f.f90 2014-04-01 20:04:46 UTC (rev 13092)
+++ trunk/examples/f95/x33f.f90 2014-04-02 07:42:07 UTC (rev 13093)
@@ -54,7 +54,7 @@
integer :: symbol_numbers(MAX_NLEGEND), symbol_colors(MAX_NLEGEND)
real(kind=plflt) :: symbol_scales(MAX_NLEGEND)
character(len=200) :: text(MAX_NLEGEND)
- character(len=3) :: symbols(MAX_NLEGEND)
+ character(len=20) :: symbols(MAX_NLEGEND)
real(kind=plflt) :: legend_width, legend_height, x, y, xstart, ystart
real(kind=plflt) :: max_height, text_scale
integer :: opt_base, nrow, ncolumn
@@ -190,7 +190,7 @@
line_widths(1) = 1
symbol_scales(1) = 1._plflt
symbol_numbers(1) = 4
- symbols(1) = '*'
+ symbols(1) = "#(728)"
! Use monotype fonts so that all legends are the same size.
call plsfont( PL_FCI_MONO, -1, -1 )
@@ -239,7 +239,7 @@
line_widths(k) = 1
symbol_scales(k) = 1._plflt
symbol_numbers(k) = 2
- symbols(k) = '*'
+ symbols(k) = "#(728)"
write( text(k), '(i2.2)' ) k-1
text_colors(k) = 1 + mod( k-1, 8 )
line_colors(k) = 1 + mod( k-1, 8 )
@@ -385,7 +385,7 @@
line_widths(k) = 1
symbol_scales(k) = 1._plflt
symbol_numbers(k) = 2
- symbols(k) = '*'
+ symbols(k) = "#(728)"
write( text(k), '(i2.2)' ) k-1
text_colors(k) = 1 + mod( k-1, 8 )
line_colors(k) = 1 + mod( k-1, 8 )
Modified: trunk/examples/java/x04.java
===================================================================
--- trunk/examples/java/x04.java 2014-04-01 20:04:46 UTC (rev 13092)
+++ trunk/examples/java/x04.java 2014-04-02 07:42:07 UTC (rev 13093)
@@ -135,7 +135,7 @@
pls.box( "", 0.0, 0, "cmstv", 30.0, 3 );
pls.col0( 3 );
pls.line( freql, phase );
- pls.string( freql, phase, "*" );
+ pls.string( freql, phase, "#(728)" );
pls.col0( 3 );
pls.mtex( "r", 5.0, 0.5, 0.5, "Phase shift (degrees)" );
nlegend = 2;
@@ -177,7 +177,7 @@
symbol_colors[1] = 3;
symbol_scales[1] = 1.;
symbol_numbers[1] = 4;
- symbols[1] = "*";
+ symbols[1] = "#(728)";
}
// from the above opt_arrays we can completely ignore everything
Modified: trunk/examples/java/x26.java
===================================================================
--- trunk/examples/java/x26.java 2014-04-01 20:04:46 UTC (rev 13092)
+++ trunk/examples/java/x26.java 2014-04-02 07:42:07 UTC (rev 13093)
@@ -215,7 +215,7 @@
pls.box( "", 0.0, 0, "cmstv", 30.0, 3 );
pls.col0( 3 );
pls.line( freql, phase );
- pls.string( freql, phase, "*" );
+ pls.string( freql, phase, "#(728)" );
pls.col0( 3 );
pls.mtex( "r", 5.0, 0.5, 0.5, alty_label );
}
@@ -241,7 +241,7 @@
symbol_colors[1] = 3;
symbol_scales[1] = 1.;
symbol_numbers[1] = 4;
- symbols[1] = "*";
+ symbols[1] = "#(728)";
// from the above opt_arrays we can completely ignore everything
// to do with boxes.
Modified: trunk/examples/java/x33.java
===================================================================
--- trunk/examples/java/x33.java 2014-04-01 20:04:46 UTC (rev 13092)
+++ trunk/examples/java/x33.java 2014-04-02 07:42:07 UTC (rev 13093)
@@ -341,7 +341,7 @@
line_widths[0] = 1.;
symbol_scales[0] = 1.;
symbol_numbers[0] = 4;
- symbols[0] = "*";
+ symbols[0] = "#(728)";
// Use monotype fonts so that all legends are the same size.
pls.sfont( PL_FCI_MONO, -1, -1 );
@@ -401,7 +401,7 @@
line_widths[k] = 1.;
symbol_scales[k] = 1.;
symbol_numbers[k] = 2;
- symbols[k] = "*";
+ symbols[k] = "#(728)";
text[k] = nf.format( k );
text_colors[k] = 1 + ( k % 8 );
line_colors[k] = 1 + ( k % 8 );
@@ -556,7 +556,7 @@
line_widths[k] = 1.;
symbol_scales[k] = 1.;
symbol_numbers[k] = 2;
- symbols[k] = "*";
+ symbols[k] = "#(728)";
text[k] = nf.format( k );
text_colors[k] = 1 + ( k % 8 );
line_colors[k] = 1 + ( k % 8 );
Modified: trunk/examples/lua/x04.lua
===================================================================
--- trunk/examples/lua/x04.lua 2014-04-01 20:04:46 UTC (rev 13092)
+++ trunk/examples/lua/x04.lua 2014-04-02 07:42:07 UTC (rev 13093)
@@ -92,7 +92,7 @@
pl.box("", 0, 0, "cmstv", 30, 3)
pl.col0(3)
pl.line(freql, phase)
- pl.string(freql, phase, "*")
+ pl.string(freql, phase, "#(728)")
pl.col0(3)
pl.mtex("r", 5, 0.5, 0.5, "Phase shift (degrees)")
nlegend = 2
@@ -150,7 +150,7 @@
symbol_colors[2] = 3
symbol_scales[2] = 1.
symbol_numbers[2] = 4
- symbols[2] = "*"
+ symbols[2] = "#(728)"
end
pl.scol0a( 15, 32, 32, 32, 0.70 )
Modified: trunk/examples/lua/x26.lua
===================================================================
--- trunk/examples/lua/x26.lua 2014-04-01 20:04:46 UTC (rev 13092)
+++ trunk/examples/lua/x26.lua 2014-04-02 07:42:07 UTC (rev 13093)
@@ -142,7 +142,7 @@
pl.box("", 0, 0, "cmstv", 30, 3)
pl.col0(3)
pl.line(freql, phase)
- pl.string(freql, phase, "*")
+ pl.string(freql, phase, "#(728)")
pl.col0(3)
pl.mtex("r", 5, 0.5, 0.5, alty_label)
nlegend = 2
@@ -200,7 +200,7 @@
symbol_colors[2] = 3
symbol_scales[2] = 1.
symbol_numbers[2] = 4
- symbols[2] = "*"
+ symbols[2] = "#(728)"
end
pl.scol0a( 15, 32, 32, 32, 0.70 )
Modified: trunk/examples/lua/x33.lua
===================================================================
--- trunk/examples/lua/x33.lua 2014-04-01 20:04:46 UTC (rev 13092)
+++ trunk/examples/lua/x33.lua 2014-04-02 07:42:07 UTC (rev 13093)
@@ -310,7 +310,7 @@
line_widths[1] = 1.
symbol_scales[1] = 1.0
symbol_numbers[1] = 4
-symbols[1] = "*"
+symbols[1] = "#(728)"
-- Use monotype fonts so that all legends are the same size.
pl.sfont(pl.PL_FCI_MONO, -1, -1)
@@ -355,7 +355,7 @@
line_widths[k+1] = 1.
symbol_scales[k+1] = 1.0
symbol_numbers[k+1] = 2
- symbols[k+1] = "*"
+ symbols[k+1] = "#(728)"
text[k+1] = string.format("%2.2d", k)
text_colors[k+1] = 1 + (k % 8)
line_colors[k+1] = 1 + (k % 8)
@@ -495,7 +495,7 @@
line_widths[k+1] = 1.
symbol_scales[k+1] = 1.0
symbol_numbers[k+1] = 2
- symbols[k+1] = "*"
+ symbols[k+1] = "#(728)"
text[k+1] = string.format("%2.2d", k)
text_colors[k+1] = 1 + (k % 8)
line_colors[k+1] = 1 + (k % 8)
Modified: trunk/examples/ocaml/x04.ml
===================================================================
--- trunk/examples/ocaml/x04.ml 2014-04-01 20:04:46 UTC (rev 13092)
+++ trunk/examples/ocaml/x04.ml 2014-04-02 07:42:07 UTC (rev 13093)
@@ -62,7 +62,7 @@
plbox "" 0.0 0 "cmstv" 30.0 3;
plcol0 3;
plline freql phase;
- plstring freql phase "*";
+ plstring freql phase "#(728)";
plcol0 3;
plmtex "r" 5.0 0.5 0.5 "Phase shift (degrees)";
@@ -81,7 +81,7 @@
let symbol_colors = [| 0; 3 |] in
let symbol_scales = [| 0.0; 1.0 |] in
let symbol_numbers = [| 0; 4 |] in
- let symbols = [| ""; "*" |] in
+ let symbols = [| ""; "#(728)" |] in
(* from the above opt_arrays we can completely ignore everything
to do with boxes *)
Modified: trunk/examples/ocaml/x26.ml
===================================================================
--- trunk/examples/ocaml/x26.ml 2014-04-01 20:04:46 UTC (rev 13092)
+++ trunk/examples/ocaml/x26.ml 2014-04-02 07:42:07 UTC (rev 13093)
@@ -155,7 +155,7 @@
plbox "" 0.0 0 "cmstv" 30.0 3;
plcol0 3;
plline freql phase;
- plstring freql phase "*";
+ plstring freql phase "#(728)";
plcol0 3;
plmtex "r" 5.0 0.5 0.5 alty_label;
);
@@ -174,7 +174,7 @@
let symbol_colors = [| 0; 3 |] in
let symbol_scales = [| 0.0; 1.0 |] in
let symbol_numbers = [| 0; 4 |] in
- let symbols = [| ""; "*" |] in
+ let symbols = [| ""; "#(728)" |] in
(* from the above opt_arrays we can completely ignore everything
to do with boxes *)
Modified: trunk/examples/ocaml/x33.ml
===================================================================
--- trunk/examples/ocaml/x33.ml 2014-04-01 20:04:46 UTC (rev 13092)
+++ trunk/examples/ocaml/x33.ml 2014-04-02 07:42:07 UTC (rev 13093)
@@ -103,7 +103,7 @@
line_widths.(0) <- 1.0;
symbol_scales.(0) <- 1.;
symbol_numbers.(0) <- 4;
- symbols.(0) <- "*";
+ symbols.(0) <- "#(728)";
(* Use monotype fonts so that all legends are the same size. *)
plsfont PL_FCI_MONO PL_FCI_STYLE_UNCHANGED PL_FCI_WEIGHT_UNCHANGED;
@@ -150,7 +150,7 @@
line_widths.(k) <- 1.0;
symbol_scales.(k) <- 1.0;
symbol_numbers.(k) <- 2;
- symbols.(k) <- "*";
+ symbols.(k) <- "#(728)";
text.(k) <- sprintf "%2.2d" k;
text_colors.(k) <- 1 + (k mod 8);
line_colors.(k) <- 1 + (k mod 8);
@@ -309,7 +309,7 @@
line_widths.(k) <- 1.0;
symbol_scales.(k) <- 1.;
symbol_numbers.(k) <- 2;
- symbols.(k) <- "*";
+ symbols.(k) <- "#(728)";
text.(k) <- sprintf "%2.2d" k;
text_colors.(k) <- 1 + (k mod 8);
line_colors.(k) <- 1 + (k mod 8);
Modified: trunk/examples/octave/x04c.m
===================================================================
--- trunk/examples/octave/x04c.m 2014-04-01 20:04:46 UTC (rev 13092)
+++ trunk/examples/octave/x04c.m 2014-04-02 07:42:07 UTC (rev 13093)
@@ -89,7 +89,7 @@
plbox("", 0.0, 0, "cmstv", 30.0, 3);
plcol0(3);
plline(freql', phase');
- plstring(freql', phase', "*");
+ plstring(freql', phase', "#(728)");
plcol0(3);
plmtex("r", 5.0, 0.5, 0.5, "Phase shift (degrees)");
nlegend = 2;
@@ -150,7 +150,7 @@
symbol_colors(2) = 3;
symbol_scales(2) = 1.;
symbol_numbers(2) = 4;
- symbols(2,1:length("*")) = "*";
+ symbols(2,1:length("#(768)")) = "#(728)";
endif
plscol0a( 15, 32, 32, 32, 0.70 );
Modified: trunk/examples/octave/x26c.m
===================================================================
--- trunk/examples/octave/x26c.m 2014-04-01 20:04:46 UTC (rev 13092)
+++ trunk/examples/octave/x26c.m 2014-04-02 07:42:07 UTC (rev 13093)
@@ -168,7 +168,7 @@
plbox("", 0.0, 0, "cmstv", 30.0, 3);
plcol0(3);
plline(freql', phase');
- plstring(freql', phase', "*");
+ plstring(freql', phase', "#(728)");
plcol0(3);
plmtex("r", 5.0, 0.5, 0.5, alty_label);
nlegend = 2;
@@ -235,7 +235,7 @@
symbol_colors(2) = 3;
symbol_scales(2) = 1.;
symbol_numbers(2) = 4;
- symbols(2,1:length("*")) = "*";
+ symbols(2,1:length("#(728)")) = "#(728)";
endif
plscol0a( 15, 32, 32, 32, 0.70 );
Modified: trunk/examples/octave/x33c.m
===================================================================
--- trunk/examples/octave/x33c.m 2014-04-01 20:04:46 UTC (rev 13092)
+++ trunk/examples/octave/x33c.m 2014-04-02 07:42:07 UTC (rev 13093)
@@ -296,7 +296,7 @@
line_styles(1) = 1;
line_widths(1) = 1.;
symbol_scales(1) = 1.; symbol_numbers(1) = 4;
- symbols(1,1:length("*")) = "*";
+ symbols(1,1:length("#(728)")) = "#(728)";
## Use monotype fonts so that all legends are the same size.
plsfont( PL_FCI_MONO , -1, -1);
@@ -373,7 +373,7 @@
line_widths(k+1) = 1.;
symbol_scales(k+1) = 1.;
symbol_numbers(k+1) = 2;
- symbols(k+1,1:length("*")) = "*";
+ symbols(k+1,1:length("#(728)")) = "#(728)";
string = sprintf("%2.2d",k);
text(k+1,1:length(string)) = string;
text_colors(k+1) = 1 + mod(k,8);
@@ -551,7 +551,7 @@
line_widths(k+1) = 1.;
symbol_scales(k+1) = 1.;
symbol_numbers(k+1) = 2;
- symbols(k+1,1:length("*")) = "*";
+ symbols(k+1,1:length("#(728)")) = "#(728)";
string = sprintf("%2.2d",k);
text(k+1,1:length(string)) = string;
text_colors(k+1) = 1 + mod(k,8);
Modified: trunk/examples/python/xw04.py
===================================================================
--- trunk/examples/python/xw04.py 2014-04-01 20:04:46 UTC (rev 13092)
+++ trunk/examples/python/xw04.py 2014-04-02 07:42:07 UTC (rev 13093)
@@ -72,7 +72,7 @@
plbox("", 0.0, 0, "cmstv", 30.0, 3)
plcol0(3)
plline(freql, phase)
- plstring(freql, phase, "*")
+ plstring(freql, phase, "#(728)")
plcol0(3)
plmtex("r", 5.0, 0.5, 0.5, "Phase shift (degrees)")
nlegend = 2
@@ -117,7 +117,7 @@
symbol_colors[1] = 3
symbol_scales[1] = 1.
symbol_numbers[1] = 4
- symbols[1] = "*"
+ symbols[1] = "#(728)"
plscol0a( 15, 32, 32, 32, 0.70 )
Modified: trunk/examples/python/xw26.py
===================================================================
--- trunk/examples/python/xw26.py 2014-04-01 20:04:46 UTC (rev 13092)
+++ trunk/examples/python/xw26.py 2014-04-02 07:42:07 UTC (rev 13093)
@@ -142,7 +142,7 @@
plbox("", 0.0, 0, "cmstv", 30.0, 3)
plcol0(3)
plline(freql, phase)
- plstring(freql, phase, "*")
+ plstring(freql, phase, "#(728)")
plcol0(3)
plmtex("r", 5.0, 0.5, 0.5, alty_label)
nlegend = 2
@@ -189,7 +189,7 @@
symbol_colors[1] = 3
symbol_scales[1] = 1.
symbol_numbers[1] = 4
- symbols[1] = "*"
+ symbols[1] = "#(728)"
plscol0a( 15, 32, 32, 32, 0.70 )
Modified: trunk/examples/python/xw33.py
===================================================================
--- trunk/examples/python/xw33.py 2014-04-01 20:04:46 UTC (rev 13092)
+++ trunk/examples/python/xw33.py 2014-04-02 07:42:07 UTC (rev 13093)
@@ -244,7 +244,7 @@
line_widths[0] = 1.
symbol_scales[0] = 1.
symbol_numbers[0] = 4
- symbols[0] = "*"
+ symbols[0] = "#(728)"
# Use monotype fonts so that all legends are the same size.
plsfont(PL_FCI_MONO, -1, -1)
@@ -302,7 +302,7 @@
line_widths[k] = 1.
symbol_scales[k] = 1.
symbol_numbers[k] = 2
- symbols[k] = "*"
+ symbols[k] = "#(728)"
text[k] = "%2.2d" % k
text_colors[k] = 1 + (k % 8)
line_colors[k] = 1 + (k % 8)
@@ -454,7 +454,7 @@
line_widths[k] = 1.
symbol_scales[k] = 1.
symbol_numbers[k] = 2
- symbols[k] = "*"
+ symbols[k] = "#(728)"
text[k] = "%2.2d" % k
text_colors[k] = 1 + (k % 8)
line_colors[k] = 1 + (k % 8)
Modified: trunk/examples/tcl/x04.tcl
===================================================================
--- trunk/examples/tcl/x04.tcl 2014-04-01 20:04:46 UTC (rev 13092)
+++ trunk/examples/tcl/x04.tcl 2014-04-02 07:42:07 UTC (rev 13093)
@@ -61,7 +61,7 @@
$w cmd plbox "" 0.0 0 "cmstv" 30.0 3
$w cmd plcol0 3
$w cmd plline 101 freql phase
- $w cmd plstring 101 freql phase "*"
+ $w cmd plstring 101 freql phase "#(728)"
$w cmd plcol0 3
$w cmd plmtex "r" 5.0 0.5 0.5 "Phase shift (degrees)"
@@ -91,7 +91,7 @@
set symbol_colors [list 0 3]
set symbol_scales [list 0.0 1.0]
set symbol_numbers [list 0 4]
- set symbols [list "" "*"]
+ set symbols [list "" "#(728)"]
# from the above opt_arrays we can completely ignore everything
# to do with boxes.
Modified: trunk/examples/tcl/x26.tcl
===================================================================
--- trunk/examples/tcl/x26.tcl 2014-04-01 20:04:46 UTC (rev 13092)
+++ trunk/examples/tcl/x26.tcl 2014-04-02 07:42:07 UTC (rev 13093)
@@ -177,7 +177,7 @@
$w cmd plbox "" 0.0 0 "cmstv" 30.0 3
$w cmd plcol0 3
$w cmd plline 101 freql phase
- $w cmd plstring 101 freql phase "*"
+ $w cmd plstring 101 freql phase "#(728)"
$w cmd plcol0 3
$w cmd plmtex "r" 5.0 0.5 0.5 $alty_label
}
@@ -202,7 +202,7 @@
set symbol_colors [list 0 3]
set symbol_scales [list 0.0 1.]
set symbol_numbers [list 0 4]
- set symbols [list "" "*"]
+ set symbols [list "" "#(728)"]
# from the above opt_arrays we can completely ignore everything
# to do with boxes.
Modified: trunk/examples/tcl/x33.tcl
===================================================================
--- trunk/examples/tcl/x33.tcl 2014-04-01 20:04:46 UTC (rev 13092)
+++ trunk/examples/tcl/x33.tcl 2014-04-02 07:42:07 UTC (rev 13093)
@@ -164,7 +164,7 @@
set line_widths [list 1.]
set symbol_scales [list 1.]
set symbol_numbers [list 4]
- set symbols [list "*"]
+ set symbols [list "#(728)"]
# Use monotype fonts so that all legends are the same size.
$w cmd plsfont [expr {$::PLPLOT::PL_FCI_MONO}] -1 -1
@@ -218,7 +218,7 @@
lappend line_widths 1.
lappend symbol_scales 1.
lappend symbol_numbers 2
- lappend symbols "*"
+ lappend symbols "#(728)"
lappend text [format "%2.2d" $k]
lappend text_colors [expr {1 + $k % 8}]
lappend line_colors [expr {1 + $k % 8}]
@@ -367,7 +367,7 @@
lappend line_widths 1.
lappend symbol_scales 1.
lappend symbol_numbers 2
- lappend symbols "*"
+ lappend symbols "#(728)"
lappend text [format "%2.2d" $k]
lappend text_colors [expr {1 + $k % 8}]
lappend line_colors [expr {1 + $k % 8}]
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ai...@us...> - 2014-04-01 20:04:51
|
Revision: 13092
http://sourceforge.net/p/plplot/code/13092
Author: airwin
Date: 2014-04-01 20:04:46 +0000 (Tue, 01 Apr 2014)
Log Message:
-----------
Rewrite this important test case demonstrating the vertical offset of
glyphs using many more UTF-8 glyphs.
Modified Paths:
--------------
trunk/examples/python/test_circle.py
Modified: trunk/examples/python/test_circle.py
===================================================================
--- trunk/examples/python/test_circle.py 2014-04-01 19:53:12 UTC (rev 13091)
+++ trunk/examples/python/test_circle.py 2014-04-01 20:04:46 UTC (rev 13092)
@@ -1,4 +1,5 @@
#!/usr/bin/env python
+# -*- coding: utf-8; -*-
# Append to effective python path so that can find plplot modules.
from plplot_python_start import *
@@ -9,16 +10,31 @@
x = [0.5]
y = [0.5]
+
title = [
"Large Circle + Light Diagonal Cross with plptex",
- "Ascii Asterisk with plptex",
- "Plplot Encoded Unicode Indexed Asterisk with plptex",
- "Plplot Encoded Hershey Indexed Asterisk with plptex",
- "Asterisk with plsym",
- "Asterisk with plpoin",
- "Plplot Encoded Hershey Indexed Asterisk with plstring",
+ "UTF-8 plus",
+ "UTF-8 squared plus",
+ "UTF-8 heavy plus",
+ "UTF-8 minus",
+ "UTF-8 squared minus",
+ "UTF-8 heavy minus",
+ "UTF-8 times",
+ "UTF-8 squared times",
+ "UTF-8 heavy multiplication x",
+ "UTF-8 number sign",
+ "UTF-8 full-width number sign",
+ "UTF-8 asterisk",
+ "UTF-8 four teardrop-spoked asterisk",
+ "UTF-8 8-spoked asterisk",
+ "UTF-8 asterisk operator",
+ "UTF-8 Asterisk operator with plptex",
+ "Plplot Encoded Unicode Indexed Asterisk operator with plptex",
+ "Plplot Encoded Hershey Indexed Asterisk operator with plptex",
+ "Hershey Asterisk operator with plsym",
+ "Hershey Asterisk operator with plpoin",
+ "Plplot Encoded Hershey Indexed Asterisk operator with plstring",
]
-
ifunicode = True
# Parse and process command line arguments
@@ -26,7 +42,7 @@
# Initialize plplot
plinit()
-for kind in range(7):
+for kind in range(len(title)):
pladv(0)
plvpor(0.1, 0.9, 0.1, 0.9)
plwind(0., 1., 0., 1.)
@@ -51,31 +67,94 @@
plptex(0.5, 0.5, 1., 0., 0.5, "#[0x2573]")
else:
plschr(0., 4.*size)
+ # Large circle via Hershey fonts.
plptex(0.5, 0.5, 1., 0., 0.5, "#(907)")
elif kind ==1:
- # Print an ascii asterisk using plptex
- plschr(0., 8.*size)
- plptex(0.5, 0.5, 1., 0., 0.5, "*")
+ # Print a utf-8 plus
+ plschr(0., 16.*size)
+ plstring(x, y, "+")
elif kind ==2:
- # Print a (PLplot encoded) unicode indexed asterisk using plptex
- plschr(0., 8.*size)
- plptex(0.5, 0.5, 1., 0., 0.5, "#[0x002a]")
+ # Print a utf-8 squared plus
+ plschr(0., 16.*size)
+ plstring(x, y, "⊞")
elif kind ==3:
- # Print a (PLplot encoded) Hershey indexed asterisk using plptex
- plschr(0., 8.*size)
+ # Print a utf-8 heavy plus
+ plschr(0., 16.*size)
+ plstring(x, y, "➕")
+ elif kind ==4:
+ # Print a utf-8 minus
+ plschr(0., 16.*size)
+ plstring(x, y, "-")
+ elif kind ==5:
+ # Print a utf-8 squared minus
+ plschr(0., 16.*size)
+ plstring(x, y, "⊟")
+ elif kind ==6:
+ # Print a utf-8 heay minus
+ plschr(0., 16.*size)
+ plstring(x, y, "➖")
+ elif kind ==7:
+ # Print a utf-8 times
+ plschr(0., 16.*size)
+ plstring(x, y, "×")
+ elif kind ==8:
+ # Print a utf-8 squared times
+ plschr(0., 16.*size)
+ plstring(x, y, "⊠")
+ elif kind ==9:
+ # Print a utf-8 heavy multiplication x
+ plschr(0., 16.*size)
+ plstring(x, y, "✖")
+ elif kind ==10:
+ # Print a utf-8 number sign
+ plschr(0., 16.*size)
+ plstring(x, y, "##")
+ elif kind ==11:
+ # Print a utf-8 full-width number sign
+ plschr(0., 16.*size)
+ plstring(x, y, "＃")
+ elif kind ==12:
+ # Print a utf-8 asterisk
+ plschr(0., 16.*size)
+ plstring(x, y, "*")
+ elif kind ==13:
+ # Print a utf-8 four teardrop-spoked asterisk
+ plschr(0., 16.*size)
+ plstring(x, y, "✢" )
+ elif kind ==14:
+ # Print a utf-8 8-spoked asterisk
+ plschr(0., 16.*size)
+ plstring(x, y, "✳")
+ elif kind ==15:
+ # Print a utf-8 asterisk operator
+ plschr(0., 16.*size)
+ plstring(x, y, "∗")
+ elif kind ==16:
+ # Print a utf-8 asterisk operator using plptex
+ plschr(0., 16.*size)
+ plptex(0.5, 0.5, 1., 0., 0.5, "∗")
+ elif kind ==17:
+ # Print a (PLplot encoded) unicode indexed asterisk operator using plptex
+ plschr(0., 16.*size)
+ plptex(0.5, 0.5, 1., 0., 0.5, "#[0x2217]")
+ elif kind ==18:
+ # Print a (PLplot encoded) Hershey indexed asterisk operator using plptex
+ plschr(0., 16.*size)
plptex(0.5, 0.5, 1., 0., 0.5, "#(728)")
- elif kind ==4:
- # Print an asterisk using plsym
- plssym(0., 8.*size)
+ elif kind ==19:
+ # Print an asterisk operator using plsym
+ plssym(0., 16.*size)
plsym(x, y, 728)
- elif kind ==5:
- # Print an asterisk using plpoin
- plssym(0., 8.*size)
+ elif kind ==20:
+ # Print an asterisk operator using plpoin
+ plssym(0., 16.*size)
plpoin(x, y, 3)
- elif kind ==6:
- # Print a (PLplot encoded) Hershey indexed asterisk using plstring
- plschr(0., 8.*size)
+ elif kind ==21:
+ # Print a (PLplot encoded) Hershey indexed asterisk operator using plstring
+ plschr(0., 16.*size)
plstring(x, y, "#(728)")
+ else:
+ print("missing kind value: bad code")
# Terminate plplot
plend()
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ai...@us...> - 2014-04-01 19:53:17
|
Revision: 13091
http://sourceforge.net/p/plplot/code/13091
Author: airwin
Date: 2014-04-01 19:53:12 +0000 (Tue, 01 Apr 2014)
Log Message:
-----------
Apply empirically derived (using examples/python/test_circle.py) and
examples/python/x02) vertical offset for all text for the Qt5 case.
This vertical offset is substantial (greater than half the character
box height) and roughly constant for most glyphs/fonts. However, the
final value was optimized for the light diagonal cross glyph in
test_circle.py. That example shows that other glyphs (except for the
well-known asterisk case which is vertically misaligned by font
design) have a dispersion in vertical alignments that is larger than
for cairo which in turn is larger than for qt with Qt4. Both those
latter dispersion results were derived with no empirical vertical
offset at all.
An additional issue which confuses the issue concerning the best
vertical alignment for qt with Qt5, cairo, and qt with Qt4 is the font
selection for all those cases is different (as evidenced by different
sizes/shapes of glyphs in all three cases and missing glyphs (i.e.,
Korean for example 24) for the Qt5 case which are present in the other
cases. I assume all these issues are due to Qt5 version 5.2.1 font
selection and font alignment issues which will be addressed for future
Qt5 versions. And when those Qt5 fixes occur, this empirical vertical
offset will have to be changed or else withdrawn (set to zero).
Modified Paths:
--------------
trunk/bindings/qt_gui/plqt.cpp
Modified: trunk/bindings/qt_gui/plqt.cpp
===================================================================
--- trunk/bindings/qt_gui/plqt.cpp 2014-04-01 19:28:28 UTC (rev 13090)
+++ trunk/bindings/qt_gui/plqt.cpp 2014-04-01 19:53:12 UTC (rev 13091)
@@ -249,8 +249,27 @@
PLFLT old_sscale, sscale, old_soffset, soffset;
PLINT level = 0;
PLFLT dyOffset = 0.;
-
- yOffset = 0.;
+#ifdef PLPLOT_USE_QT5
+ // Empirical Y offset of text (needed for Qt5 for some reason).
+ // Note this was derived using the test_circle.py python script
+ // with the vertical alignment of the light diagonal cross
+ // optimized. That example shows that other glyphs (except for
+ // the well-known asterisk case which is vertically misaligned by
+ // font design) do not have the best vertical alignment. This is
+ // contrary to the results for cairo and qt with Qt4 which need no
+ // special empirical Y offset to get good vertical alignment for
+ // most glyphs of that example (other than the asterisk). An
+ // additional issue which confuses the decision concerning the
+ // best vertical alignment for qt with Qt5 is the font selection
+ // for qt with Qt5 is quite different than that for qt with Qt4 or
+ // cairo. I assume all these issues are due to Qt5 version 5.2.1
+ // font selection and font alignment bugs which will be addressed
+ // for future Qt5 versions.
+ PLFLT empirical_yOffset = -0.63 * chrht * POINTS_PER_INCH / 25.4;
+#else
+ PLFLT empirical_yOffset = 0.;
+#endif
+ yOffset = empirical_yOffset;
xOffset = 0.;
// Scaling factor of 1.45 determined empirically to make all qt results
@@ -292,7 +311,7 @@
// dyOffset = -0.5 * currentFontSize * ( 1.0 - sscale );
// But empirically this change in offset should not be applied
// so leave it at its initial value of zero.
- yOffset = -( currentFontSize * RISE_FACTOR * soffset + dyOffset );
+ yOffset = empirical_yOffset - ( currentFontSize * RISE_FACTOR * soffset + dyOffset );
p.setFont( getFont( fci ) );
break;
@@ -312,7 +331,7 @@
// dyOffset = 0.5 * currentFontSize * ( 1.0 - sscale );
// But empirically this change in offset should not be applied
// so leave it at its initial value of zero.
- yOffset = currentFontSize * RISE_FACTOR * soffset + dyOffset;
+ yOffset = empirical_yOffset + currentFontSize * RISE_FACTOR * soffset + dyOffset;
p.setFont( getFont( fci ) );
break;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ai...@us...> - 2014-04-01 19:28:31
|
Revision: 13090
http://sourceforge.net/p/plplot/code/13090
Author: airwin
Date: 2014-04-01 19:28:28 +0000 (Tue, 01 Apr 2014)
Log Message:
-----------
Use correct precision (PLINT ==> PLFLT) for plwidth argument.
This change successfully tested on Linux using the test_diff_psc target.
Modified Paths:
--------------
trunk/bindings/swig-support/plplotcapi.i
Modified: trunk/bindings/swig-support/plplotcapi.i
===================================================================
--- trunk/bindings/swig-support/plplotcapi.i 2014-03-31 23:38:37 UTC (rev 13089)
+++ trunk/bindings/swig-support/plplotcapi.i 2014-04-01 19:28:28 UTC (rev 13090)
@@ -810,7 +810,7 @@
PLFLT zmax0, PLFLT alt, PLFLT az );
void
-plwidth( PLINT width );
+plwidth( PLFLT width );
void
plwind( PLFLT xmin, PLFLT xmax, PLFLT ymin, PLFLT ymax );
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ai...@us...> - 2014-03-31 23:38:41
|
Revision: 13089
http://sourceforge.net/p/plplot/code/13089
Author: airwin
Date: 2014-03-31 23:38:37 +0000 (Mon, 31 Mar 2014)
Log Message:
-----------
Configure and test epa_build of qt5_lite.
Tested on Linux by running the build_qt5_lite target for epa_build.
That build of Qt5 took almost an hour (56 min) compared to a similar
build of Qt4 which took roughly one fourth that time. The issue
appears to be that some of the configure options that allow dropping
components of Qt4 for the epa_build of qt4_lite do not appear to be
available (as yet) for Qt5. There may be an opportunity
to drop additional parts of the Qt5 build in the future because
I missed a relevant configure option this time or because later
versions of Qt5 may allow dropping more components of the build.
But for now an hour build is acceptable.
Build-time tests were done with PLplot configured with the -DPLPLOT_USE_QT5=ON
option with qmake from the qt5_lite epa_build on the PATH. That
PLplot build had no showstopper issues, and running ldd -r on drivers/qt.so,
bindings/qt_gui/libplplotqt.so, and examples/c++/qt_example showed no
linking issues.
Run-time tests were done with PLplot configured and built as above
using the test_all_qt target without any showstopper errors for the
shared library case in the build tree confirming Andrew's similar good
run-time test results with a system version (as opposed to epa_built
version) of Qt5.
One major rendering issue is all text appears to be vertically offset
by half a character height compared to Qt4 results. Fixing that issue
is next on my agenda.
Modified Paths:
--------------
trunk/cmake/epa_build/CMakeLists.txt
Added Paths:
-----------
trunk/cmake/epa_build/qt5_lite/
trunk/cmake/epa_build/qt5_lite/CMakeLists.txt
Modified: trunk/cmake/epa_build/CMakeLists.txt
===================================================================
--- trunk/cmake/epa_build/CMakeLists.txt 2014-03-31 00:57:53 UTC (rev 13088)
+++ trunk/cmake/epa_build/CMakeLists.txt 2014-03-31 23:38:37 UTC (rev 13089)
@@ -418,6 +418,7 @@
gtk+
wxwidgets
qt4_lite
+ qt5_lite
)
endif(BUILD_THE_BUILDTOOLS)
Added: trunk/cmake/epa_build/qt5_lite/CMakeLists.txt
===================================================================
--- trunk/cmake/epa_build/qt5_lite/CMakeLists.txt (rev 0)
+++ trunk/cmake/epa_build/qt5_lite/CMakeLists.txt 2014-03-31 23:38:37 UTC (rev 13089)
@@ -0,0 +1,172 @@
+# qt5_lite/CMakeLists.txt
+
+# Configure the build of qt5_lite.
+
+# Copyright (C) 2014 Alan W. Irwin
+
+# This file is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+
+# This file is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# Lesser General Public License for more details.
+
+# You should have received a copy of the GNU Lesser General Public
+# License along with this file; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+
+# Many of the details of this epa_build configuration were derived from
+# <http://www.linuxfromscratch.org/blfs/view/svn/x/qt5.html>.
+
+set(PACKAGE qt5_lite)
+
+# List of dependencies (most of which are build tools) which should be
+# ignored.
+set(ignored_dependencies_LIST ${extra_ignored_dependencies_list})
+
+# The assumption here is that for Windows platforms Qt5 is self-contained
+# and therefore does not rely on external libraries (at least if you configure
+# the in-house version of those). For Linux platforms the dependencies will
+# just have to be resolved by system versions rather than building a lot
+# of additional packages.
+set(dependencies_LIST)
+
+# Do boilerplate tasks that must be done for each different project
+# that is configured as part of epa_build.
+epa_boilerplate(
+ ignored_dependencies_LIST
+ PACKAGE
+ dependencies_LIST
+ dependencies_targets
+ EPA_PATH
+ source_PATH
+ )
+
+set(CFLAGS "$ENV{CFLAGS}")
+set(CXXFLAGS "$ENV{CXXFLAGS}")
+
+# Drop -fvisibility=hidden since that option may not work for Qt5.
+# (May test this later if I get everything to work.)
+string(REGEX REPLACE "-fvisibility=hidden" "" CFLAGS "${CFLAGS}")
+string(REGEX REPLACE "-fvisibility=hidden" "" CXXFLAGS "${CXXFLAGS}")
+
+# Data that is related to downloads.
+set(URL http://download.qt-project.org/official_releases/qt/5.2/5.2.1/single/qt-everywhere-opensource-src-5.2.1.tar.xz)
+# Temporary to save download bandwidth/time while debugging this.
+# set(URL /home/software/build_qt5/qt-everywhere-opensource-src-5.2.1.tar.xz)
+set(DOWNLOAD_HASH_TYPE MD5)
+set(DOWNLOAD_HASH 0c8d2aa45f38be9c3f7c9325eb059d9d)
+
+# Many of these are recommended by BLFS, but I have tried to use
+# a consistent install prefix and I have also turned off as
+# much as possible for this "lite" version.
+set(config_arguments
+
+ # Configure options:
+ -release
+ -confirm-license
+ -opensource
+
+ # Try to get rid of everything to do with sql by eliminating all possible
+ # drivers.
+ -no-sql-db2
+ -no-sql-ibase
+ -no-sql-mysql
+ -no-sql-oci
+ -no-sql-odbc
+ -no-sql-psql
+ -no-sql-sqlite
+ -no-sql-sqlite2
+ -no-sql-tds
+
+ -no-javascript-jit
+ -no-qml-debug
+ # Third party libraries (drop if possible but if needed by PLplot, use
+ # in-house Qt5 versions of these to reduce dependencies):
+ -qt-zlib
+ -no-mtdev
+ -no-gif
+ -qt-libpng
+ -qt-libjpeg
+ -qt-freetype
+ -no-openssl
+ -qt-pcre
+ -qt-xcb
+ -qt-xkbcommon
+ -no-xinput2
+ -no-xcb-xlib
+ -no-glib
+ # Additional options:
+
+ # Drop all components other than libs
+ -nomake tools
+ -nomake examples
+ -nomake tests
+
+ -optimized-qmake
+
+ # Need gui which happens by default (there is no -gui option)
+ # if you do not specify -no-gui
+
+ -no-nis
+ -no-cups
+ -no-iconv
+ -no-icu
+ -no-dbus
+
+ # Qt/X11 only: (leave everything default)
+ )
+
+# Note, setting the QT5DIR environment variable to the install prefix
+# as below is recommended by method 2 of BLFS.
+set(QT5DIR ${EPA_CMAKE_INSTALL_PREFIX})
+
+ExternalProject_Add(
+ build_qt5_lite
+ DEPENDS ${dependencies_targets}
+ URL ${URL}
+ URL_HASH ${DOWNLOAD_HASH_TYPE}=${DOWNLOAD_HASH}
+ CONFIGURE_COMMAND ${ENV_EXECUTABLE} PATH=${EPA_PATH} QT5DIR=${QT5DIR} "CFLAGS=${CFLAGS}" "CXXFLAGS=${CXXFLAGS}" ${source_PATH}/${EPA_CONFIGURE_COMMAND} ${config_arguments}
+ BUILD_COMMAND ${ENV_EXECUTABLE} PATH=${EPA_PATH} QT5DIR=${QT5DIR} ${EPA_PARALLEL_MAKE_COMMAND}
+ BUILD_IN_SOURCE 0
+ INSTALL_COMMAND ${ENV_EXECUTABLE} PATH=${EPA_PATH} QT5DIR=${QT5DIR} ${EPA_PARALLEL_MAKE_COMMAND} install
+ #STEP_TARGETS update configure build install test
+ )
+
+file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/install_png.sh
+"install -v -dm755 ${EPA_CMAKE_INSTALL_PREFIX}/usr/share/pixmaps/
+install -v -Dm644 ${EPA_BASE}/Source/build_${PACKAGE}/qttools/src/assistant/assistant/images/assistant-128.png ${EPA_CMAKE_INSTALL_PREFIX}/usr/share/pixmaps/assistant-qt5.png
+install -v -Dm644 ${EPA_BASE}/Source/build_${PACKAGE}/qttools/src/designer/src/designer/images/designer.png ${EPA_CMAKE_INSTALL_PREFIX}/usr/share/pixmaps/designer-qt5.png
+install -v -Dm644 ${EPA_BASE}/Source/build_${PACKAGE}/qttools/src/linguist/linguist/images/icons/linguist-128-32.png ${EPA_CMAKE_INSTALL_PREFIX}/usr/share/pixmaps/linguist-qt5.png
+install -v -Dm644 ${EPA_BASE}/Source/build_${PACKAGE}/qttools/src/qdbus/qdbusviewer/images/qdbusviewer-128.png ${EPA_CMAKE_INSTALL_PREFIX}/usr/share/pixmaps/qdbusviewer-qt5.png
+install -dm755 ${EPA_CMAKE_INSTALL_PREFIX}/usr/share/applications
+"
+ )
+
+add_custom_command(
+ OUTPUT
+ ${EPA_BASE}/Stamp/build_${PACKAGE}/build_${PACKAGE}-install
+ COMMAND ${CMAKE_COMMAND} -E echo "install some addition png files recommended by BLFS."
+ COMMAND ${BASH_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/install_png.sh
+ APPEND
+ )
+
+file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/install_fixups.sh
+"find ${QT5DIR} -name qt_lib_bootstrap_private.pri -exec sed -i -e \"s:$PWD/qtbase:/${QT5DIR}/lib/:g\" {} \;
+find ${QT5DIR} -name \\*.prl -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d' {} \;
+"
+ )
+
+add_custom_command(
+ OUTPUT
+ ${EPA_BASE}/Stamp/build_${PACKAGE}/build_${PACKAGE}-install
+ COMMAND ${CMAKE_COMMAND} -E echo "install fixups recommended by BLFS."
+ COMMAND ${BASH_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/install_fixups.sh
+ APPEND
+ )
+
+# N.B. I have explicitly ignored all post-install Qt5 configuration recommended
+# by BLFS because I don't think that will be needed by PLplot.
Property changes on: trunk/cmake/epa_build/qt5_lite/CMakeLists.txt
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
1 message has been excluded from this view by a project administrator.
