Build: #6 failed
Job: Tag Branch for Packages was successful
Build log
The build generated 409 lines of output. Download or view full build log.
11-Oct-2018 16:13:59 | Build ARD - Build And Package - ARD-master-sb - Tag Branch for Packages #6 (ARD-BPT6-TBFP-6) started building on agent cbt-el7-4.cv.nrao.edu |
11-Oct-2018 16:13:59 | Remote agent on host cbt-el7-4.cv.nrao.edu |
11-Oct-2018 16:13:59 | Build working directory is /export/home/cbt-el7-4/bamboohome/xml-data/build-dir/ARD-BPT6-TBFP |
11-Oct-2018 16:13:59 | Executing build ARD - Build And Package - ARD-master-sb - Tag Branch for Packages #6 (ARD-BPT6-TBFP-6) |
11-Oct-2018 16:13:59 | Skipping execution of task 'Checkout Default Repository' as it is disabled |
11-Oct-2018 16:13:59 | Running pre-build action: VCS Version Collector |
11-Oct-2018 16:13:59 | Skipping execution of task 'Checkout Default Repository' as it is disabled |
11-Oct-2018 16:13:59 | Substituting variable: ${bamboo.repository.branch.name} with ARD-master-sb |
11-Oct-2018 16:13:59 | Substituting variable: ${bamboo.buildNumber} with 6 |
11-Oct-2018 16:13:59 | Substituting variable: ${bamboo.planRepository.revision} with 815995456934a9b393b2d938ebf24b4175830f50 |
11-Oct-2018 16:13:59 | Substituting variable: ${bamboo.planRepository.repositoryUrl} with ssh://git@open-bitbucket.nrao.edu:7999/casa/casa.git |
11-Oct-2018 16:13:59 | Substituting variable: ${bamboo.planRepository.repositoryUrl} with ssh://git@open-bitbucket.nrao.edu:7999/casa/casa.git |
11-Oct-2018 16:13:59 | Substituting variable: ${bamboo.build.working.directory} with /export/home/cbt-el7-4/bamboohome/xml-data/build-dir/ARD-BPT6-TBFP |
11-Oct-2018 16:13:59 | Substituting variable: ${bamboo.planRepository.repositoryUrl} with ssh://git@open-bitbucket.nrao.edu:7999/casa/casa.git |
11-Oct-2018 16:13:59 | Substituting variable: ${bamboo.repository.branch.name} with ARD-master-sb |
11-Oct-2018 16:13:59 | Substituting variable: ${bamboo.build.working.directory} with /export/home/cbt-el7-4/bamboohome/xml-data/build-dir/ARD-BPT6-TBFP |
11-Oct-2018 16:13:59 | Substituting variable: ${bamboo.repository.branch.name} with ARD-master-sb |
11-Oct-2018 16:13:59 | Substituting variable: ${bamboo.build.working.directory} with /export/home/cbt-el7-4/bamboohome/xml-data/build-dir/ARD-BPT6-TBFP |
11-Oct-2018 16:13:59 | Substituting variable: ${bamboo.planRepository.repositoryUrl} with ssh://git@open-bitbucket.nrao.edu:7999/casa/casa.git |
11-Oct-2018 16:13:59 | Starting task 'Script' of type 'com.atlassian.bamboo.plugins.scripttask:task.builder.script' |
11-Oct-2018 16:13:59 | Beginning to execute external process for build 'ARD - Build And Package - ARD-master-sb - Tag Branch for Packages #6 (ARD-BPT6-TBFP-6)' ... running command line: /bin/sh /export/home/cbt-el7-4/bamboohome/temp/ARD-BPT6-TBFP-6-ScriptBuildTask-413546224662856239.sh ... in: /export/home/cbt-el7-4/bamboohome/xml-data/build-dir/ARD-BPT6-TBFP ... using extra environment variables: bamboo_planRepository_1_branch=ARD-master-sb bamboo_capability_buildmachinetype=build bamboo_planRepository_2_branch=master bamboo_planRepository_1_branchDisplayName=ARD-master-sb bamboo_repository_revision_number=815995456934a9b393b2d938ebf24b4175830f50 bamboo_repository_20938876_previous_revision_number=96876322838addeba9028788e302c98bac48b1cb bamboo_resultsUrl=https://open-bamboo.nrao.edu/browse/ARD-BPT6-TBFP-6 bamboo_repository_25001989_git_repositoryUrl=ssh://git@open-bitbucket.nrao.edu:7999/casa/casa.git bamboo_repository_20938876_git_username= bamboo_planRepository_1_name=OPEN-CASA-FULL bamboo_build_working_directory=/export/home/cbt-el7-4/bamboohome/xml-data/build-dir/ARD-BPT6-TBFP bamboo_buildKey=ARD-BPT6-TBFP bamboo_repository_25001989_previous_revision_number=440f83e2e6da30e2dea491e01476f5d7f32d330e bamboo_shortPlanName=ARD-master-sb bamboo_capability_hostname=cbt-el7-4.cv.nrao.edu bamboo_planRepository_2_username= bamboo_planRepository_name=OPEN-CASA-FULL bamboo_buildNumber=6 bamboo_planRepository_2_branchDisplayName=master bamboo_capability_system_jdk_JDK_1_8_0_131=/usr/lib/jvm/java-1.8.0-openjdk-1.8.0.131-2.b11.el7_3.x86_64 bamboo_shortJobName=Tag Branch for Packages bamboo_buildResultsUrl=https://open-bamboo.nrao.edu/browse/ARD-BPT6-TBFP-6 bamboo_repository_25001989_git_branch=ARD-master-sb bamboo_planRepository_repositoryUrl=ssh://git@open-bitbucket.nrao.edu:7999/casa/casa.git bamboo_agentId=6160386 bamboo_planName=ARD - Build And Package - ARD-master-sb bamboo_shortPlanKey=BPT6 bamboo_shortJobKey=TBFP bamboo_planRepository_2_name=OPEN-CASA-PKG bamboo_planRepository_revision=815995456934a9b393b2d938ebf24b4175830f50 bamboo_repository_previous_revision_number=440f83e2e6da30e2dea491e01476f5d7f32d330e bamboo_buildTimeStamp=2018-10-11T16:13:59.159-04:00 bamboo_casaadm_password=******** bamboo_planRepository_previousRevision=440f83e2e6da30e2dea491e01476f5d7f32d330e bamboo_repository_20938876_git_branch=master bamboo_repository_25001989_revision_number=815995456934a9b393b2d938ebf24b4175830f50 bamboo_repository_20938876_branch_name=master bamboo_repository_20938876_name=OPEN-CASA-PKG bamboo_capability_system_jdk_JDK_1_8_0_144=/usr/lib/jvm/java-1.8.0-openjdk-1.8.0.144-0.b01.el7_4.x86_64 bamboo_buildResultKey=ARD-BPT6-TBFP-6 bamboo_repository_git_branch=ARD-master-sb bamboo_repository_branch_name=ARD-master-sb bamboo_buildPlanName=ARD - Build And Package - ARD-master-sb - Tag Branch for Packages bamboo_capability_system_jdk_JDK_1_8_0_102=/usr/lib/jvm/java-1.8.0-openjdk-1.8.0.102-1.b14.el7_2.x86_64 bamboo_planRepository_1_revision=815995456934a9b393b2d938ebf24b4175830f50 bamboo_capability_system_jdk_JDK_1_8_0_141=/usr/lib/jvm/java-1.8.0-openjdk-1.8.0.141-2.b16.el7_4.x86_64 bamboo_capability_system_hg_executable=/bin/hg bamboo_repository_name=OPEN-CASA-PKG bamboo_repository_25001989_branch_name=ARD-master-sb bamboo_repository_25001989_git_username= bamboo_planRepository_2_previousRevision=96876322838addeba9028788e302c98bac48b1cb bamboo_dependenciesDisabled=false bamboo_buildFailed=false bamboo_capability_isCIMachine=true bamboo_planRepository_branch=ARD-master-sb bamboo_agentWorkingDirectory=/export/home/cbt-el7-4/bamboohome/xml-data/build-dir bamboo_planRepository_2_revision=96876322838addeba9028788e302c98bac48b1cb bamboo_capability_system_git_executable=/bin/git bamboo_planRepository_1_previousRevision=440f83e2e6da30e2dea491e01476f5d7f32d330e bamboo_capability_tag=true bamboo_capability_system_jdk_JDK_1_8_0_111=/usr/lib/jvm/java-1.8.0-openjdk-1.8.0.111-2.b15.el7_3.x86_64 bamboo_repository_git_username= bamboo_capability_operating_system=EL7 bamboo_planRepository_branchDisplayName=ARD-master-sb bamboo_capability_system_jdk_JDK_1_8_0_151=/usr/lib/jvm/java-1.8.0-openjdk-1.8.0.151-5.b12.el7_4.x86_64 bamboo_planRepository_1_type=bbserver bamboo_planRepository_branchName=ARD-master-sb bamboo_capability_project=CASA bamboo_repository_25001989_name=OPEN-CASA-FULL bamboo_planRepository_2_type=bbserver bamboo_repository_20938876_revision_number=96876322838addeba9028788e302c98bac48b1cb bamboo_capability_system_jdk_JDK=/usr/lib/jvm/java-1.8.0-openjdk-1.8.0.102-1.b14.el7_2.x86_64 bamboo_plan_storageTag=plan-24805405 bamboo_planRepository_2_repositoryUrl=ssh://git@open-bitbucket.nrao.edu:7999/casa/casa-pkg.git bamboo_planRepository_type=bbserver bamboo_planRepository_1_username= bamboo_ManualBuildTriggerReason_userName=sbhatnag bamboo_repository_git_repositoryUrl=ssh://git@open-bitbucket.nrao.edu:7999/casa/casa.git bamboo_planRepository_2_branchName=master bamboo_capability_system_builder_ant_Ant=/usr bamboo_working_directory=/export/home/cbt-el7-4/bamboohome/xml-data/build-dir/ARD-BPT6-TBFP bamboo_planKey=ARD-BPT6 bamboo_planRepository_1_repositoryUrl=ssh://git@open-bitbucket.nrao.edu:7999/casa/casa.git bamboo_planRepository_username= bamboo_capability_system_jdk_JDK_1_8=/usr/lib/jvm/java-1.8.0-openjdk-1.8.0.102-1.b14.el7_2.x86_64 bamboo_repository_20938876_git_repositoryUrl=ssh://git@open-bitbucket.nrao.edu:7999/casa/casa-pkg.git bamboo_capability_system_jdk_JDK_1_8_0_161=/usr/lib/jvm/java-1.8.0-openjdk-1.8.0.161-0.b14.el7_4.x86_64 bamboo_planRepository_1_branchName=ARD-master-sb |
11-Oct-2018 16:13:59 | 6 |
11-Oct-2018 16:13:59 | 815995456934a9b393b2d938ebf24b4175830f50 |
11-Oct-2018 16:13:59 | ssh://git@open-bitbucket.nrao.edu:7999/casa/casa.git |
11-Oct-2018 16:13:59 | Fetching origin |
11-Oct-2018 16:13:59 | Already up-to-date. |
11-Oct-2018 16:14:00 | :compileJava UP-TO-DATE |
11-Oct-2018 16:14:00 | :compileGroovy UP-TO-DATE |
11-Oct-2018 16:14:00 | :processResources UP-TO-DATE |
11-Oct-2018 16:14:00 | :classes UP-TO-DATE |
11-Oct-2018 16:14:00 | :jar UP-TO-DATE |
11-Oct-2018 16:14:00 | :compileTestJava UP-TO-DATE |
11-Oct-2018 16:14:00 | :compileTestGroovy UP-TO-DATE |
11-Oct-2018 16:14:00 | :processTestResources UP-TO-DATE |
11-Oct-2018 16:14:00 | :testClasses UP-TO-DATE |
11-Oct-2018 16:14:00 | :test UP-TO-DATE |
11-Oct-2018 16:14:00 | :uploadArchives |
11-Oct-2018 16:14:00 | |
11-Oct-2018 16:14:00 | BUILD SUCCESSFUL |
11-Oct-2018 16:14:00 | |
11-Oct-2018 16:14:00 | Total time: 1.097 secs |
11-Oct-2018 16:14:02 | :createTag |
11-Oct-2018 16:14:02 | workdir: /export/home/cbt-el7-4/bamboohome/xml-data/build-dir/ARD-BPT6-TBFP/taggitworkdir |
11-Oct-2018 16:14:02 | sourcedir: /export/home/cbt-el7-4/bamboohome/xml-data/build-dir/ARD-BPT6-TBFP/taggitworkdir/casa |
11-Oct-2018 16:14:02 | gitremote: ssh://git@open-bitbucket.nrao.edu:7999/casa/casa.git |
11-Oct-2018 16:14:02 | branch: ARD-master-sb |
11-Oct-2018 16:14:02 | Push option: true |
11-Oct-2018 16:14:02 | Switched to branch 'master' |
11-Oct-2018 16:14:02 | |
11-Oct-2018 16:14:02 | Fetching origin |
11-Oct-2018 16:14:02 | From ssh://open-bitbucket.nrao.edu:7999/casa/casa |
11-Oct-2018 16:14:02 | 440f83e..8159954 ARD-master-sb -> origin/ARD-master-sb |
11-Oct-2018 16:14:02 | Already up-to-date. |
11-Oct-2018 16:14:02 | |
11-Oct-2018 16:14:02 | edu.nrao.gradle.casa.build.GitRepository@37726322 |
11-Oct-2018 16:14:02 | getLastTag called with |
11-Oct-2018 16:14:02 | branch: ARD-master-sb |
11-Oct-2018 16:14:02 | env: [bamboo_planRepository_1_branch=ARD-master-sb, PATH=/bin:/usr/lib64/qt-3.3/bin:/usr/lib64/ccache:/usr/local/bin:/usr/bin:/usr/local/sbin:/usr/sbin, bamboo_planRepository_2_branch=master, HISTCONTROL=ignoredups, bamboo_repository_revision_number=815995456934a9b393b2d938ebf24b4175830f50, bamboo_planRepository_1_branchDisplayName=ARD-master-sb, bamboo_repository_20938876_previous_revision_number=96876322838addeba9028788e302c98bac48b1cb, GUESTFISH_RESTORE=\e[0m, bamboo_repository_20938876_git_username=, WRAPPER_BITS=32, bamboo_buildKey=ARD-BPT6-TBFP, bamboo_repository_25001989_previous_revision_number=440f83e2e6da30e2dea491e01476f5d7f32d330e, PROMPT_COMMAND=history -a, PWD=/export/home/cbt-el7-4/bamboohome/xml-data/build-dir/ARD-BPT6-TBFP/casa-pkg/gradle/casa-tag, bamboo_capability_system_jdk_JDK_1_8_0_131=/usr/lib/jvm/java-1.8.0-openjdk-1.8.0.131-2.b11.el7_3.x86_64, bamboo_planRepository_2_branchDisplayName=master, HISTTIMEFORMAT=%Y-%m-%d %T: , bamboo_shortJobName=Tag Branch for Packages, bamboo_buildResultsUrl=https://open-bamboo.nrao.edu/browse/ARD-BPT6-TBFP-6, bamboo_repository_25001989_git_branch=ARD-master-sb, bamboo_planRepository_repositoryUrl=ssh://git@open-bitbucket.nrao.edu:7999/casa/casa.git, LESSOPEN=||/usr/bin/lesspipe.sh %s, QT_GRAPHICSSYSTEM_CHECKED=1, QTINC=/usr/lib64/qt-3.3/include, bamboo_agentId=6160386, GUESTFISH_INIT=\e[1;34m, bamboo_planRepository_revision=815995456934a9b393b2d938ebf24b4175830f50, bamboo_casaadm_password=********, bamboo_planRepository_previousRevision=440f83e2e6da30e2dea491e01476f5d7f32d330e, bamboo_repository_20938876_git_branch=master, bamboo_repository_25001989_revision_number=815995456934a9b393b2d938ebf24b4175830f50, bamboo_repository_20938876_name=OPEN-CASA-PKG, bamboo_capability_system_jdk_JDK_1_8_0_144=/usr/lib/jvm/java-1.8.0-openjdk-1.8.0.144-0.b01.el7_4.x86_64, bamboo_repository_branch_name=ARD-master-sb, SHLVL=3, bamboo_capability_system_jdk_JDK_1_8_0_141=/usr/lib/jvm/java-1.8.0-openjdk-1.8.0.141-2.b16.el7_4.x86_64, QT_PLUGIN_PATH=/usr/lib64/kde4/plugins:/usr/lib/kde4/plugins, LOADEDMODULES=, WRAPPER_OS=linux, HISTSIZE=100000, bamboo_repository_25001989_git_username=, TERM=xterm-256color, bamboo_dependenciesDisabled=false, XDG_SESSION_ID=4970, bamboo_capability_isCIMachine=true, GRADLE_USER_HOME=/users/casaci/.gradle.el6.cbt-el7-4, bamboo_planRepository_branch=ARD-master-sb, bamboo_capability_tag=true, bamboo_capability_system_jdk_JDK_1_8_0_151=/usr/lib/jvm/java-1.8.0-openjdk-1.8.0.151-5.b12.el7_4.x86_64, bamboo_planRepository_branchName=ARD-master-sb, bamboo_planRepository_1_type=bbserver, WRAPPER_FILE_SEPARATOR=/, bamboo_repository_20938876_revision_number=96876322838addeba9028788e302c98bac48b1cb, bamboo_capability_system_jdk_JDK=/usr/lib/jvm/java-1.8.0-openjdk-1.8.0.102-1.b14.el7_2.x86_64, SSH_CLIENT=10.2.103.226 49818 22, SSH_TTY=/dev/pts/0, CVS_RSH=ssh, WRAPPER_PATH_SEPARATOR=:, bamboo_planRepository_type=bbserver, bamboo_planRepository_1_username=, bamboo_ManualBuildTriggerReason_userName=sbhatnag, bamboo_planRepository_2_branchName=master, bamboo_capability_system_builder_ant_Ant=/usr, SSH_CONNECTION=10.2.103.226 49818 10.2.96.145 22, bamboo_planKey=ARD-BPT6, bamboo_planRepository_username=, NLSPATH=/usr/dt/lib/nls/msg/%L/%N.cat, BASH_FUNC_module()=() { eval `/usr/bin/modulecmd bash $*` |
11-Oct-2018 16:14:02 | }, bamboo_capability_system_jdk_JDK_1_8_0_161=/usr/lib/jvm/java-1.8.0-openjdk-1.8.0.161-0.b14.el7_4.x86_64, bamboo_planRepository_1_branchName=ARD-master-sb, bamboo_capability_buildmachinetype=build, XDG_DATA_DIRS=/users/casaci/.local/share/flatpak/exports/share/:/var/lib/flatpak/exports/share/:/usr/local/share/:/usr/share/, bamboo_resultsUrl=https://open-bamboo.nrao.edu/browse/ARD-BPT6-TBFP-6, bamboo_repository_25001989_git_repositoryUrl=ssh://git@open-bitbucket.nrao.edu:7999/casa/casa.git, MODULEPATH=/usr/share/Modules/modulefiles:/etc/modulefiles, bamboo_build_working_directory=/export/home/cbt-el7-4/bamboohome/xml-data/build-dir/ARD-BPT6-TBFP, bamboo_planRepository_1_name=OPEN-CASA-FULL, QT_GRAPHICSSYSTEM=native, bamboo_shortPlanName=ARD-master-sb, bamboo_capability_hostname=cbt-el7-4.cv.nrao.edu, MAIL=/var/spool/mail/casaci, bamboo_planRepository_2_username=, bamboo_planRepository_name=OPEN-CASA-FULL, LOGNAME=casaci, bamboo_buildNumber=6, SHELL=/bin/bash, bamboo_planName=ARD - Build And Package - ARD-master-sb, bamboo_shortPlanKey=BPT6, OLDPWD=/usr/lib/jvm/gradle-3.2.1, bamboo_shortJobKey=TBFP, bamboo_planRepository_2_name=OPEN-CASA-PKG, SSH_ASKPASS=/usr/libexec/openssh/gnome-ssh-askpass, bamboo_repository_previous_revision_number=440f83e2e6da30e2dea491e01476f5d7f32d330e, bamboo_buildTimeStamp=2018-10-11T16:13:59.159-04:00, bamboo_repository_20938876_branch_name=master, bamboo_buildResultKey=ARD-BPT6-TBFP-6, bamboo_repository_git_branch=ARD-master-sb, bamboo_capability_system_jdk_JDK_1_8_0_102=/usr/lib/jvm/java-1.8.0-openjdk-1.8.0.102-1.b14.el7_2.x86_64, bamboo_buildPlanName=ARD - Build And Package - ARD-master-sb - Tag Branch for Packages, LS_COLORS=rs=0:di=38;5;27:ln=38;5;51:mh=44;38;5;15:pi=40;38;5;11:so=38;5;13:do=38;5;5:bd=48;5;232;38;5;11:cd=48;5;232;38;5;3:or=48;5;232;38;5;9:mi=05;48;5;232;38;5;15:su=48;5;196;38;5;15:sg=48;5;11;38;5;16:ca=48;5;196;38;5;226:tw=48;5;10;38;5;16:ow=48;5;10;38;5;21:st=48;5;21;38;5;15:ex=38;5;34:*.tar=38;5;9:*.tgz=38;5;9:*.arc=38;5;9:*.arj=38;5;9:*.taz=38;5;9:*.lha=38;5;9:*.lz4=38;5;9:*.lzh=38;5;9:*.lzma=38;5;9:*.tlz=38;5;9:*.txz=38;5;9:*.tzo=38;5;9:*.t7z=38;5;9:*.zip=38;5;9:*.z=38;5;9:*.Z=38;5;9:*.dz=38;5;9:*.gz=38;5;9:*.lrz=38;5;9:*.lz=38;5;9:*.lzo=38;5;9:*.xz=38;5;9:*.bz2=38;5;9:*.bz=38;5;9:*.tbz=38;5;9:*.tbz2=38;5;9:*.tz=38;5;9:*.deb=38;5;9:*.rpm=38;5;9:*.jar=38;5;9:*.war=38;5;9:*.ear=38;5;9:*.sar=38;5;9:*.rar=38;5;9:*.alz=38;5;9:*.ace=38;5;9:*.zoo=38;5;9:*.cpio=38;5;9:*.7z=38;5;9:*.rz=38;5;9:*.cab=38;5;9:*.jpg=38;5;13:*.jpeg=38;5;13:*.gif=38;5;13:*.bmp=38;5;13:*.pbm=38;5;13:*.pgm=38;5;13:*.ppm=38;5;13:*.tga=38;5;13:*.xbm=38;5;13:*.xpm=38;5;13:*.tif=38;5;13:*.tiff=38;5;13:*.png=38;5;13:*.svg=38;5;13:*.svgz=38;5;13:*.mng=38;5;13:*.pcx=38;5;13:*.mov=38;5;13:*.mpg=38;5;13:*.mpeg=38;5;13:*.m2v=38;5;13:*.mkv=38;5;13:*.webm=38;5;13:*.ogm=38;5;13:*.mp4=38;5;13:*.m4v=38;5;13:*.mp4v=38;5;13:*.vob=38;5;13:*.qt=38;5;13:*.nuv=38;5;13:*.wmv=38;5;13:*.asf=38;5;13:*.rm=38;5;13:*.rmvb=38;5;13:*.flc=38;5;13:*.avi=38;5;13:*.fli=38;5;13:*.flv=38;5;13:*.gl=38;5;13:*.dl=38;5;13:*.xcf=38;5;13:*.xwd=38;5;13:*.yuv=38;5;13:*.cgm=38;5;13:*.emf=38;5;13:*.axv=38;5;13:*.anx=38;5;13:*.ogv=38;5;13:*.ogx=38;5;13:*.aac=38;5;45:*.au=38;5;45:*.flac=38;5;45:*.mid=38;5;45:*.midi=38;5;45:*.mka=38;5;45:*.mp3=38;5;45:*.mpc=38;5;45:*.ogg=38;5;45:*.ra=38;5;45:*.wav=38;5;45:*.axa=38;5;45:*.oga=38;5;45:*.spx=38;5;45:*.xspf=38;5;45:, bamboo_planRepository_1_revision=815995456934a9b393b2d938ebf24b4175830f50, bamboo_capability_system_hg_executable=/bin/hg, bamboo_repository_name=OPEN-CASA-PKG, bamboo_repository_25001989_branch_name=ARD-master-sb, bamboo_planRepository_2_previousRevision=96876322838addeba9028788e302c98bac48b1cb, XFILESEARCHPATH=/usr/dt/app-defaults/%L/Dt, LANG=en_US.UTF-8, bamboo_buildFailed=false, HISTFILESIZE=200000, bamboo_agentWorkingDirectory=/export/home/cbt-el7-4/bamboohome/xml-data/build-dir, bamboo_capability_system_git_executable=/bin/git, bamboo_planRepository_2_revision=96876322838addeba9028788e302c98bac48b1cb, bamboo_capability_system_jdk_JDK_1_8_0_111=/usr/lib/jvm/java-1.8.0-openjdk-1.8.0.111-2.b15.el7_3.x86_64, bamboo_planRepository_1_previousRevision=440f83e2e6da30e2dea491e01476f5d7f32d330e, bamboo_repository_git_username=, bamboo_capability_operating_system=EL7, bamboo_planRepository_branchDisplayName=ARD-master-sb, bamboo_capability_project=CASA, bamboo_repository_25001989_name=OPEN-CASA-FULL, bamboo_planRepository_2_type=bbserver, GUESTFISH_PS1=\[\e[1;32m\]><fs>\[\e[0;31m\] , bamboo_plan_storageTag=plan-24805405, USER=casaci, bamboo_planRepository_2_repositoryUrl=ssh://git@open-bitbucket.nrao.edu:7999/casa/casa-pkg.git, bamboo_repository_git_repositoryUrl=ssh://git@open-bitbucket.nrao.edu:7999/casa/casa.git, bamboo_working_directory=/export/home/cbt-el7-4/bamboohome/xml-data/build-dir/ARD-BPT6-TBFP, HOSTNAME=cbt-el7-4, QTDIR=/usr/lib64/qt-3.3, MODULESHOME=/usr/share/Modules, bamboo_planRepository_1_repositoryUrl=ssh://git@open-bitbucket.nrao.edu:7999/casa/casa.git, bamboo_capability_system_jdk_JDK_1_8=/usr/lib/jvm/java-1.8.0-openjdk-1.8.0.102-1.b14.el7_2.x86_64, WRAPPER_ARCH=x86, KDEDIRS=/usr, bamboo_repository_20938876_git_repositoryUrl=ssh://git@open-bitbucket.nrao.edu:7999/casa/casa-pkg.git, XDG_RUNTIME_DIR=/run/user/9285, GUESTFISH_OUTPUT=\e[0m, HOME=/users/casaci, QTLIB=/usr/lib64/qt-3.3/lib] |
11-Oct-2018 16:14:02 | sourceDir: /export/home/cbt-el7-4/bamboohome/xml-data/build-dir/ARD-BPT6-TBFP/taggitworkdir/casa |
11-Oct-2018 16:14:02 | Resolving CAS-/feature/bugfix tag |
11-Oct-2018 16:14:02 | Branch parts: [ARD-master-sb] |
11-Oct-2018 16:14:02 | Checking for an existing tag for the branch |
11-Oct-2018 16:14:02 | tagGrep: grep test-ARD-master-sb |
11-Oct-2018 16:14:02 | java.lang.UNIXProcess@4c2b7b7c | java.lang.UNIXProcess@4201bd03 | java.lang.UNIXProcess@7e8e1121 | java.lang.UNIXProcess@1ead9d2d |
11-Oct-2018 16:14:02 | Checking out ARD-master-sb |
11-Oct-2018 16:14:02 | Switched to branch 'ARD-master-sb' |
11-Oct-2018 16:14:02 | Your branch is behind 'origin/ARD-master-sb' by 7 commits, and can be fast-forwarded. |
11-Oct-2018 16:14:02 | (use "git pull" to update your local branch) |
11-Oct-2018 16:14:02 | |
11-Oct-2018 16:14:02 | Updating ARD-master-sb |
11-Oct-2018 16:14:03 | Updating 440f83e..8159954 |
11-Oct-2018 16:14:03 | Fast-forward |
11-Oct-2018 16:14:03 | code/casaqt/QwtPlotter/QPOptions.h | 4 + |
11-Oct-2018 16:14:03 | code/casaqt/QwtPlotter/QPScatterPlot.cc | 151 +++++++++++++++++++++++--------- |
11-Oct-2018 16:14:03 | code/plotms/Plots/PlotMSPlot.cc | 10 +-- |
11-Oct-2018 16:14:03 | 3 files changed, 121 insertions(+), 44 deletions(-) |
11-Oct-2018 16:14:03 | |
11-Oct-2018 16:14:03 | Constructing a new tag based on 5.3.0-123-test-ARD-master-sb-3 |
11-Oct-2018 16:14:03 | Branch: ARD-master-sb |
11-Oct-2018 16:14:03 | ARD- detected |
11-Oct-2018 16:14:03 | Prefix: 5.3.0-123-test-ARD-master-sb |
11-Oct-2018 16:14:03 | 5.3.0-123-test-ARD-master-sb-4 |
11-Oct-2018 16:14:03 | Last tag: 5.3.0-123-test-ARD-master-sb-3 |
11-Oct-2018 16:14:03 | Branch: ARD-master-sb |
11-Oct-2018 16:14:03 | Comparing tag to branch with: git diff --exit-code 5.3.0-123-test-ARD-master-sb-3 ARD-master-sb |
11-Oct-2018 16:14:03 | diff --git a/code/casaqt/QwtPlotter/QPOptions.h b/code/casaqt/QwtPlotter/QPOptions.h |
11-Oct-2018 16:14:03 | index 6c70839..94c6cdc 100644 |
11-Oct-2018 16:14:03 | --- a/code/casaqt/QwtPlotter/QPOptions.h |
11-Oct-2018 16:14:03 | +++ b/code/casaqt/QwtPlotter/QPOptions.h |
11-Oct-2018 16:14:03 | @@ -390,6 +390,10 @@ public: |
11-Oct-2018 16:14:03 | // beforehand. |
11-Oct-2018 16:14:03 | void draw(QPainter* p, const QRect& r) const; |
11-Oct-2018 16:14:03 | |
11-Oct-2018 16:14:03 | +#if QWT_VERSION >= 0x060000 |
11-Oct-2018 16:14:03 | + inline void drawSymbols(QPainter* p, const QPointF* points, int numPoints) const |
11-Oct-2018 16:14:03 | + { QwtSymbol::drawSymbols(p, points, numPoints); }; |
11-Oct-2018 16:14:03 | +#endif |
11-Oct-2018 16:14:03 | // Overrides QwtSymbol::clone(). |
11-Oct-2018 16:14:03 | //QwtSymbol* clone() const; |
11-Oct-2018 16:14:03 | |
11-Oct-2018 16:14:03 | diff --git a/code/casaqt/QwtPlotter/QPScatterPlot.cc b/code/casaqt/QwtPlotter/QPScatterPlot.cc |
11-Oct-2018 16:14:03 | index 18b7ad2..9388eea 100644 |
11-Oct-2018 16:14:03 | --- a/code/casaqt/QwtPlotter/QPScatterPlot.cc |
11-Oct-2018 16:14:03 | +++ b/code/casaqt/QwtPlotter/QPScatterPlot.cc |
11-Oct-2018 16:14:03 | @@ -160,28 +160,31 @@ QwtDoubleRect QPScatterPlot::boundingRect() const { |
11-Oct-2018 16:14:03 | |
11-Oct-2018 16:14:03 | #if QWT_VERSION >= 0x060000 |
11-Oct-2018 16:14:03 | QwtGraphic QPScatterPlot::legendIcon(int /*index*/, const QSizeF& size) const { |
11-Oct-2018 16:14:03 | - const QPSymbol* plotsymbol; |
11-Oct-2018 16:14:03 | + const QPSymbol* plotsymbol(nullptr); |
11-Oct-2018 16:14:03 | if (symbolsShown()) { |
11-Oct-2018 16:14:03 | plotsymbol = &m_symbol; |
11-Oct-2018 16:14:03 | } else if (maskedSymbolsShown()) { |
11-Oct-2018 16:14:03 | plotsymbol = &m_maskedSymbol; |
11-Oct-2018 16:14:03 | } |
11-Oct-2018 16:14:03 | QwtSymbol* iconsymbol = new QwtSymbol(QwtSymbol::HLine); |
11-Oct-2018 16:14:03 | - iconsymbol->setPen(plotsymbol->drawPen().color()); |
11-Oct-2018 16:14:03 | QwtGraphic icon = iconsymbol->graphic(); |
11-Oct-2018 16:14:03 | - icon.setDefaultSize(QSizeF(size.width()*2.0, size.height()*2.0)); |
11-Oct-2018 16:14:03 | - QPainter painter(&icon); |
11-Oct-2018 16:14:03 | - const QRectF rect (0.0, 0.0, size.width()*2.0, size.height()*2.0); |
11-Oct-2018 16:14:03 | - iconsymbol->drawSymbol(&painter, rect); |
11-Oct-2018 16:14:03 | + if (plotsymbol != nullptr) { |
11-Oct-2018 16:14:03 | + iconsymbol->setPen(plotsymbol->drawPen().color()); |
11-Oct-2018 16:14:03 | + icon = iconsymbol->graphic(); |
11-Oct-2018 16:14:03 | + icon.setDefaultSize(QSizeF(size.width()*2.0, size.height()*2.0)); |
11-Oct-2018 16:14:03 | + QPainter painter(&icon); |
11-Oct-2018 16:14:03 | + const QRectF rect (0.0, 0.0, size.width()*2.0, size.height()*2.0); |
11-Oct-2018 16:14:03 | + iconsymbol->drawSymbol(&painter, rect); |
11-Oct-2018 16:14:03 | + } |
11-Oct-2018 16:14:03 | return icon; |
11-Oct-2018 16:14:03 | } |
11-Oct-2018 16:14:03 | #else |
11-Oct-2018 16:14:03 | QWidget* QPScatterPlot::legendItem() const { |
11-Oct-2018 16:14:03 | - QPen legendPen = m_line.asQPen(); |
11-Oct-2018 16:14:03 | - if ( !linesShown() ){ |
11-Oct-2018 16:14:03 | - QColor penColor = m_symbol.drawPen().color(); |
11-Oct-2018 16:14:03 | - legendPen = QPen(penColor ); |
11-Oct-2018 16:14:03 | - } |
11-Oct-2018 16:14:03 | + QPen legendPen = m_line.asQPen(); |
11-Oct-2018 16:14:03 | + if ( !linesShown() ){ |
11-Oct-2018 16:14:03 | + QColor penColor = m_symbol.drawPen().color(); |
11-Oct-2018 16:14:03 | + legendPen = QPen(penColor ); |
11-Oct-2018 16:14:03 | + } |
11-Oct-2018 16:14:03 | QwtLegendItem* i= new QwtLegendItem(m_symbol, legendPen, qwtTitle()); |
11-Oct-2018 16:14:03 | i->setIdentifierMode(QwtLegendItem::ShowLine | QwtLegendItem::ShowSymbol | |
11-Oct-2018 16:14:03 | QwtLegendItem::ShowText); |
11-Oct-2018 16:14:03 | @@ -513,7 +516,6 @@ void QPScatterPlot::draw_(QPainter* p, const QwtScaleMap& xMap, |
11-Oct-2018 16:14:03 | diffColor = !m_coloredData.null() && m_coloredData->isBinned(); |
11-Oct-2018 16:14:03 | if(drawSymbol || drawMaskedSymbol) { |
11-Oct-2018 16:14:03 | double tempx, tempy; |
11-Oct-2018 16:14:03 | - |
11-Oct-2018 16:14:03 | if(!m_maskedData.null()) { |
11-Oct-2018 16:14:03 | unsigned int ptsToDraw = ( m_maskedData->plotConjugates() ? 2 : 1 ); |
11-Oct-2018 16:14:03 | bool mask; |
11-Oct-2018 16:14:03 | @@ -525,31 +527,38 @@ void QPScatterPlot::draw_(QPainter* p, const QwtScaleMap& xMap, |
11-Oct-2018 16:14:03 | bool samePen = pen == mpen, sameBrush = brush == mbrush; |
11-Oct-2018 16:14:03 | |
11-Oct-2018 16:14:03 | // set the painter's pen/brush only once if possible |
11-Oct-2018 16:14:03 | - if(!drawMaskedSymbol || samePen) p->setPen(pen); |
11-Oct-2018 16:14:03 | - else if(!drawSymbol) p->setPen(mpen); |
11-Oct-2018 16:14:03 | - if(!drawMaskedSymbol || sameBrush) p->setBrush(brush); |
11-Oct-2018 16:14:03 | - else if(!drawSymbol) p->setBrush(mbrush); |
11-Oct-2018 16:14:03 | + if(!drawMaskedSymbol || samePen) // use unmasked pen |
11-Oct-2018 16:14:03 | + p->setPen(pen); |
11-Oct-2018 16:14:03 | + else if(!drawSymbol) // only masked symbols; use masked pen |
11-Oct-2018 16:14:03 | + p->setPen(mpen); |
11-Oct-2018 16:14:03 | + if(!drawMaskedSymbol || sameBrush) // use unmasked brush |
11-Oct-2018 16:14:03 | + p->setBrush(brush); |
11-Oct-2018 16:14:03 | + else if(!drawSymbol) // only masked symbols; use masked brush |
11-Oct-2018 16:14:03 | + p->setBrush(mbrush); |
11-Oct-2018 16:14:03 | |
11-Oct-2018 16:14:03 | QSize size = ((QwtSymbol&)m_symbol).size(); |
11-Oct-2018 16:14:03 | QRect rect(0, 0, size.width(), size.height()); |
11-Oct-2018 16:14:03 | size = ((QwtSymbol&)m_maskedSymbol).size(); |
11-Oct-2018 16:14:03 | QRect mRect(0, 0, size.width(), size.height()); |
11-Oct-2018 16:14:03 | |
11-Oct-2018 16:14:03 | +#if QWT_VERSION >= 0x060000 |
11-Oct-2018 16:14:03 | + bool symIsPixel(m_symbol.symbol()==PlotSymbol::PIXEL), |
11-Oct-2018 16:14:03 | + msymIsPixel(m_maskedSymbol.symbol()==PlotSymbol::PIXEL); |
11-Oct-2018 16:14:03 | + std::vector<QPointF> upoints, mpoints; |
11-Oct-2018 16:14:03 | + QPoint qpt; |
11-Oct-2018 16:14:03 | for(unsigned int i = drawIndex; i < n; i++) { |
11-Oct-2018 16:14:03 | m_maskedData->xyAndMaskAt(i, tempx, tempy, mask); |
11-Oct-2018 16:14:03 | - // don't plot nan and inf ! |
11-Oct-2018 16:14:03 | + // don't plot nan and inf ! |
11-Oct-2018 16:14:03 | if (!casacore::isNaN(tempx) && !casacore::isNaN(tempy) && |
11-Oct-2018 16:14:03 | - !casacore::isInf(tempx) && !casacore::isInf(tempy)) { |
11-Oct-2018 16:14:03 | + !casacore::isInf(tempx) && !casacore::isInf(tempy)) { |
11-Oct-2018 16:14:03 | if(drawSymbol && !mask) { |
11-Oct-2018 16:14:03 | for (unsigned int pt=0; pt<ptsToDraw; ++pt) { |
11-Oct-2018 16:14:03 | if (pt==0) { |
11-Oct-2018 16:14:03 | - rect.moveCenter(QPoint(xMap.transform(tempx), |
11-Oct-2018 16:14:03 | - yMap.transform(tempy))); |
11-Oct-2018 16:14:03 | - } else { |
11-Oct-2018 16:14:03 | - rect.moveCenter(QPoint(xMap.transform(-tempx), |
11-Oct-2018 16:14:03 | - yMap.transform(-tempy))); |
11-Oct-2018 16:14:03 | + qpt = QPoint(xMap.transform(tempx),yMap.transform(tempy)); |
11-Oct-2018 16:14:03 | + } else { // conjugate for uv plot |
11-Oct-2018 16:14:03 | + qpt = QPoint(xMap.transform(-tempx),yMap.transform(-tempy)); |
11-Oct-2018 16:14:03 | } |
11-Oct-2018 16:14:03 | - |
11-Oct-2018 16:14:03 | + rect.moveCenter(qpt); |
11-Oct-2018 16:14:03 | if(!brect.intersects(rect)) continue; |
11-Oct-2018 16:14:03 | if(drawMaskedSymbol) { |
11-Oct-2018 16:14:03 | if(!samePen) p->setPen(pen); |
11-Oct-2018 16:14:03 | @@ -560,26 +569,27 @@ void QPScatterPlot::draw_(QPainter* p, const QwtScaleMap& xMap, |
11-Oct-2018 16:14:03 | QColor brushColor = coloredBrush.color(); |
11-Oct-2018 16:14:03 | p->setBrush(coloredBrush); |
11-Oct-2018 16:14:03 | p->setPen(brushColor); |
11-Oct-2018 16:14:03 | -#if QWT_VERSION >= 0x060000 |
11-Oct-2018 16:14:03 | QPSymbol* coloredSym = coloredSymbol(brushColor); |
11-Oct-2018 16:14:03 | coloredSym->draw(p, rect); |
11-Oct-2018 16:14:03 | delete coloredSym; |
11-Oct-2018 16:14:03 | - } else |
11-Oct-2018 16:14:03 | - m_symbol.draw(p, rect); |
11-Oct-2018 16:14:03 | -#else |
11-Oct-2018 16:14:03 | + } else { |
11-Oct-2018 16:14:03 | + QPointF qptf = QPointF(qpt); |
11-Oct-2018 16:14:03 | + upoints.push_back(qptf); |
11-Oct-2018 16:14:03 | + if (upoints.size()==15000) { |
11-Oct-2018 16:14:03 | + if (symIsPixel) p->drawPoints(&upoints[0], upoints.size()); |
11-Oct-2018 16:14:03 | + else m_symbol.drawSymbols(p, &upoints[0], upoints.size()); |
11-Oct-2018 16:14:03 | + upoints.clear(); |
11-Oct-2018 16:14:03 | + } |
11-Oct-2018 16:14:03 | } |
11-Oct-2018 16:14:03 | - m_symbol.draw(p, rect); |
11-Oct-2018 16:14:03 | -#endif |
11-Oct-2018 16:14:03 | } |
11-Oct-2018 16:14:03 | } else if(drawMaskedSymbol && mask) { |
11-Oct-2018 16:14:03 | for (unsigned int pt=0; pt<ptsToDraw; ++pt) { |
11-Oct-2018 16:14:03 | if (pt==0) { |
11-Oct-2018 16:14:03 | - mRect.moveCenter(QPoint(xMap.transform(tempx), |
11-Oct-2018 16:14:03 | - yMap.transform(tempy))); |
11-Oct-2018 16:14:03 | + qpt = QPoint(xMap.transform(tempx), yMap.transform(tempy)); |
11-Oct-2018 16:14:03 | } else { |
11-Oct-2018 16:14:03 | - mRect.moveCenter(QPoint(xMap.transform(-tempx), |
11-Oct-2018 16:14:03 | - yMap.transform(-tempy))); |
11-Oct-2018 16:14:03 | + qpt = QPoint(xMap.transform(-tempx), yMap.transform(-tempy)); |
11-Oct-2018 16:14:03 | } |
11-Oct-2018 16:14:03 | + mRect.moveCenter(qpt); |
11-Oct-2018 16:14:03 | if(!brect.intersects(mRect)) continue; |
11-Oct-2018 16:14:03 | if(drawMaskedSymbol) { |
11-Oct-2018 16:14:03 | if(!samePen) p->setPen(mpen); |
11-Oct-2018 16:14:03 | @@ -590,20 +600,83 @@ void QPScatterPlot::draw_(QPainter* p, const QwtScaleMap& xMap, |
11-Oct-2018 16:14:03 | QColor brushColor = coloredBrush.color(); |
11-Oct-2018 16:14:03 | p->setBrush(coloredBrush); |
11-Oct-2018 16:14:03 | p->setPen(brushColor); |
11-Oct-2018 16:14:03 | -#if QWT_VERSION >= 0x060000 |
11-Oct-2018 16:14:03 | QPSymbol* coloredSym = coloredSymbol(brushColor); |
11-Oct-2018 16:14:03 | coloredSym->draw(p, mRect); |
11-Oct-2018 16:14:03 | - } else |
11-Oct-2018 16:14:03 | - m_maskedSymbol.draw(p, mRect); |
11-Oct-2018 16:14:03 | + } else { |
11-Oct-2018 16:14:03 | + QPointF qptf = QPointF(qpt); |
11-Oct-2018 16:14:03 | + mpoints.push_back(qptf); |
11-Oct-2018 16:14:03 | + if (mpoints.size()==15000) { |
11-Oct-2018 16:14:03 | + if (msymIsPixel) p->drawPoints(&mpoints[0], mpoints.size()); |
11-Oct-2018 16:14:03 | + else m_maskedSymbol.drawSymbols(p, &mpoints[0], mpoints.size()); |
11-Oct-2018 16:14:03 | + mpoints.clear(); |
11-Oct-2018 16:14:03 | + } |
11-Oct-2018 16:14:03 | + } |
11-Oct-2018 16:14:03 | + } |
11-Oct-2018 16:14:03 | + } |
11-Oct-2018 16:14:03 | + } |
11-Oct-2018 16:14:03 | + } |
11-Oct-2018 16:14:03 | + // draw the rest |
11-Oct-2018 16:14:03 | + if (!diffColor && drawSymbol) { |
11-Oct-2018 16:14:03 | + if (symIsPixel) p->drawPoints(&upoints[0], upoints.size()); |
11-Oct-2018 16:14:03 | + else m_symbol.drawSymbols(p, &upoints[0], upoints.size()); |
11-Oct-2018 16:14:03 | + } |
11-Oct-2018 16:14:03 | + if (!diffColor && drawMaskedSymbol) { |
11-Oct-2018 16:14:03 | + if (msymIsPixel) p->drawPoints(&mpoints[0], mpoints.size()); |
11-Oct-2018 16:14:03 | + else m_maskedSymbol.drawSymbols(p, &mpoints[0], mpoints.size()); |
11-Oct-2018 16:14:03 | + } |
11-Oct-2018 16:14:03 | #else |
11-Oct-2018 16:14:03 | + QPoint qpt; |
11-Oct-2018 16:14:03 | + for(unsigned int i = drawIndex; i < n; i++) { |
11-Oct-2018 16:14:03 | + m_maskedData->xyAndMaskAt(i, tempx, tempy, mask); |
11-Oct-2018 16:14:03 | + // don't plot nan and inf ! |
11-Oct-2018 16:14:03 | + if (!casacore::isNaN(tempx) && !casacore::isNaN(tempy) && |
11-Oct-2018 16:14:03 | + !casacore::isInf(tempx) && !casacore::isInf(tempy)) { |
11-Oct-2018 16:14:03 | + if(drawSymbol && !mask) { |
11-Oct-2018 16:14:03 | + for (unsigned int pt=0; pt<ptsToDraw; ++pt) { |
11-Oct-2018 16:14:03 | + if (pt==0) { |
11-Oct-2018 16:14:03 | + qpt = QPoint(xMap.transform(tempx),yMap.transform(tempy)); |
11-Oct-2018 16:14:03 | + } else { // conjugate for uv plot |
11-Oct-2018 16:14:03 | + qpt = QPoint(xMap.transform(-tempx),yMap.transform(-tempy)); |
11-Oct-2018 16:14:03 | + } |
11-Oct-2018 16:14:03 | + rect.moveCenter(qpt); |
11-Oct-2018 16:14:03 | + if(!brect.intersects(rect)) continue; |
11-Oct-2018 16:14:03 | + if(drawMaskedSymbol) { |
11-Oct-2018 16:14:03 | + if(!samePen) p->setPen(pen); |
11-Oct-2018 16:14:03 | + if(!sameBrush) p->setBrush(brush); |
11-Oct-2018 16:14:03 | + } |
11-Oct-2018 16:14:03 | + if(diffColor) { |
11-Oct-2018 16:14:03 | + QBrush coloredBrush = m_coloredBrushes[m_coloredData->binAt(i)]; |
11-Oct-2018 16:14:03 | + QColor brushColor = coloredBrush.color(); |
11-Oct-2018 16:14:03 | + p->setBrush(coloredBrush); |
11-Oct-2018 16:14:03 | + p->setPen(brushColor); |
11-Oct-2018 16:14:03 | + } |
11-Oct-2018 16:14:03 | + m_symbol.draw(p, rect); |
11-Oct-2018 16:14:03 | + } |
11-Oct-2018 16:14:03 | + } else if(drawMaskedSymbol && mask) { |
11-Oct-2018 16:14:03 | + for (unsigned int pt=0; pt<ptsToDraw; ++pt) { |
11-Oct-2018 16:14:03 | + if (pt==0) { |
11-Oct-2018 16:14:03 | + qpt = QPoint(xMap.transform(tempx), yMap.transform(tempy)); |
11-Oct-2018 16:14:03 | + } else { |
11-Oct-2018 16:14:03 | + qpt = QPoint(xMap.transform(-tempx), yMap.transform(-tempy)); |
11-Oct-2018 16:14:03 | + } |
11-Oct-2018 16:14:03 | + mRect.moveCenter(qpt); |
11-Oct-2018 16:14:03 | + if(!brect.intersects(mRect)) continue; |
11-Oct-2018 16:14:03 | + if(drawMaskedSymbol) { |
11-Oct-2018 16:14:03 | + if(!samePen) p->setPen(mpen); |
11-Oct-2018 16:14:03 | + if(!sameBrush) p->setBrush(mbrush); |
11-Oct-2018 16:14:03 | + } |
11-Oct-2018 16:14:03 | + if(diffColor) { |
11-Oct-2018 16:14:03 | + QBrush coloredBrush = m_coloredBrushes[m_coloredData->binAt(i)]; |
11-Oct-2018 16:14:03 | + QColor brushColor = coloredBrush.color(); |
11-Oct-2018 16:14:03 | + p->setBrush(coloredBrush); |
11-Oct-2018 16:14:03 | + p->setPen(brushColor); |
11-Oct-2018 16:14:03 | } |
11-Oct-2018 16:14:03 | m_maskedSymbol.draw(p, mRect); |
11-Oct-2018 16:14:03 | -#endif |
11-Oct-2018 16:14:03 | } |
11-Oct-2018 16:14:03 | } |
11-Oct-2018 16:14:03 | } |
11-Oct-2018 16:14:03 | } |
11-Oct-2018 16:14:03 | - |
11-Oct-2018 16:14:03 | +#endif |
11-Oct-2018 16:14:03 | } else { |
11-Oct-2018 16:14:03 | // draw all symbols normally |
11-Oct-2018 16:14:03 | const QBrush& brush = m_symbol.drawBrush(); |
11-Oct-2018 16:14:03 | diff --git a/code/plotms/Plots/PlotMSPlot.cc b/code/plotms/Plots/PlotMSPlot.cc |
11-Oct-2018 16:14:03 | index a9bffaa..e24f99a 100644 |
11-Oct-2018 16:14:03 | --- a/code/plotms/Plots/PlotMSPlot.cc |
11-Oct-2018 16:14:03 | +++ b/code/plotms/Plots/PlotMSPlot.cc |
11-Oct-2018 16:14:03 | @@ -1092,6 +1092,9 @@ void PlotMSPlot::cacheLoaded_(bool wasCanceled) { |
11-Oct-2018 16:14:03 | dataMissing(); |
11-Oct-2018 16:14:03 | return; |
11-Oct-2018 16:14:03 | } |
11-Oct-2018 16:14:03 | + // Report we are done |
11-Oct-2018 16:14:03 | + if(itsTCLParams_.endCacheLog) |
11-Oct-2018 16:14:03 | + itsParent_->getLogger()->releaseMeasurement(); |
11-Oct-2018 16:14:03 | |
11-Oct-2018 16:14:03 | // Make this more specific than canvas-triggered |
11-Oct-2018 16:14:03 | if (itsTCLParams_.updateCanvas || itsTCLParams_.updateIteration ){ |
11-Oct-2018 16:14:03 | @@ -1117,9 +1120,6 @@ void PlotMSPlot::cacheLoaded_(bool wasCanceled) { |
11-Oct-2018 16:14:03 | updateCanvas(); |
11-Oct-2018 16:14:03 | } |
11-Oct-2018 16:14:03 | |
11-Oct-2018 16:14:03 | - // Report we are done |
11-Oct-2018 16:14:03 | - if(itsTCLParams_.endCacheLog) |
11-Oct-2018 16:14:03 | - itsParent_->getLogger()->releaseMeasurement(); |
11-Oct-2018 16:14:03 | // Release drawing if needed. |
11-Oct-2018 16:14:03 | if(itsTCLParams_.releaseWhenDone && !isCacheUpdating() ) |
11-Oct-2018 16:14:03 | releaseDrawing(); |
11-Oct-2018 16:14:03 | @@ -1971,12 +1971,12 @@ void PlotMSPlot::setAxisRange(PMS::Axis axis, PlotAxis paxis, |
11-Oct-2018 16:14:03 | double diff = maxval - minval; |
11-Oct-2018 16:14:03 | if (diff>120.0) { // seconds (2 minutes) |
11-Oct-2018 16:14:03 | bounds = make_pair(minval, maxval); |
11-Oct-2018 16:14:03 | - canvas->setAxisRange(paxis, bounds); |
11-Oct-2018 16:14:03 | + canvas->setAxisRange(paxis, bounds); |
11-Oct-2018 16:14:03 | } else if (diff==0.0) { |
11-Oct-2018 16:14:03 | // override autoscale which sets crazy tick marks; |
11-Oct-2018 16:14:03 | // add 2-sec margins |
11-Oct-2018 16:14:03 | bounds = make_pair(minval-2.0, maxval+2.0); |
11-Oct-2018 16:14:03 | - canvas->setAxisRange(paxis, bounds); |
11-Oct-2018 16:14:03 | + canvas->setAxisRange(paxis, bounds); |
11-Oct-2018 16:14:03 | } |
11-Oct-2018 16:14:03 | } else if (PMS::axisIsUV(axis)) { |
11-Oct-2018 16:14:03 | // make range symmetrical for uv plot |
11-Oct-2018 16:14:03 | |
11-Oct-2018 16:14:03 | Comparison returned: 1 |
11-Oct-2018 16:14:03 | Checkout: git checkout ARD-master-sb |
11-Oct-2018 16:14:03 | Already on 'ARD-master-sb' |
11-Oct-2018 16:14:03 | |
11-Oct-2018 16:14:03 | [git, tag, -a, 5.3.0-123-test-ARD-master-sb-4, -m 'Automatic tag'] |
11-Oct-2018 16:14:03 | |
11-Oct-2018 16:14:03 | Done tagging 5.3.0-123-test-ARD-master-sb-4 |
11-Oct-2018 16:14:03 | Pushing 5.3.0-123-test-ARD-master-sb-4 to origin |
11-Oct-2018 16:14:04 | To ssh://git@open-bitbucket.nrao.edu:7999/casa/casa.git |
11-Oct-2018 16:14:04 | * [new tag] 5.3.0-123-test-ARD-master-sb-4 -> 5.3.0-123-test-ARD-master-sb-4 |
11-Oct-2018 16:14:04 | |
11-Oct-2018 16:14:04 | Pushed 5.3.0-123-test-ARD-master-sb-4 to origin |
11-Oct-2018 16:14:04 | |
11-Oct-2018 16:14:04 | BUILD SUCCESSFUL |
11-Oct-2018 16:14:04 | |
11-Oct-2018 16:14:04 | Total time: 2.767 secs |
11-Oct-2018 16:14:04 | Finished task 'Script' with result: Success |
11-Oct-2018 16:14:04 | Running post build plugin 'Docker Container Cleanup' |
11-Oct-2018 16:14:04 | Running post build plugin 'NCover Results Collector' |
11-Oct-2018 16:14:04 | Running post build plugin 'Clover Results Collector' |
11-Oct-2018 16:14:04 | Running post build plugin 'npm Cache Cleanup' |
11-Oct-2018 16:14:04 | Running post build plugin 'Artifact Copier' |
11-Oct-2018 16:14:04 | Finalising the build... |
11-Oct-2018 16:14:04 | Stopping timer. |
11-Oct-2018 16:14:04 | Build ARD-BPT6-TBFP-6 completed. |
11-Oct-2018 16:14:04 | Running on server: post build plugin 'NCover Results Collector' |
11-Oct-2018 16:14:04 | Running on server: post build plugin 'Build Hanging Detection Configuration' |
11-Oct-2018 16:14:04 | Running on server: post build plugin 'Clover Delta Calculator' |
11-Oct-2018 16:14:04 | Running on server: post build plugin 'Maven Dependencies Postprocessor' |
11-Oct-2018 16:14:04 | All post build plugins have finished |
11-Oct-2018 16:14:04 | Generating build results summary... |
11-Oct-2018 16:14:04 | Saving build results to disk... |
11-Oct-2018 16:14:04 | Logging substituted variables... |
11-Oct-2018 16:14:04 | Indexing build results... |
11-Oct-2018 16:14:04 | Finished building ARD-BPT6-TBFP-6. |