Ticket #6315 (closed: fixed)

Opened 8 years ago

Last modified 5 years ago

Build against ParaView 3.98

Reported by: Michael Reuter Owned by: Michael Reuter
Priority: blocker Milestone: Release 2.5
Component: VATES Keywords:
Cc: Blocked By: #6342, #6347, #6540, #6541, #6565, #6658, #6697, #6700, #6777, #6794, #6796, #6842, #6877, #6927, #6936
Blocking: Tester: Stuart Campbell

Description

As ParaView 3.98 is now out and it has the work we requested in it, we should begin the process of moving over. This ticket will handle just the process of getting things to build and run as they are right now.

Change History

comment:1 Changed 8 years ago by Michael Reuter

  • Status changed from new to accepted

comment:2 Changed 8 years ago by Michael Reuter

Refs #6315. Rename vtkTypeRevisionMacro to vtkTypeMacro.

Changeset: cf518b1445df2b0aa889d5d9221d6f1d358a19e5

comment:3 Changed 8 years ago by Michael Reuter

Refs #6315. Removing vtkCxxRevisionMacro.

Changeset: ce3673c734451e119703c924059b351a790204d7

comment:4 Changed 8 years ago by Michael Reuter

Refs #6315. Removing non-existing libraries for now.

Changeset: 3cc535b82b34b707a6b1c9845d1c0659dcb06e48

comment:5 Changed 8 years ago by Michael Reuter

Refs #6315. Fixing API changes.

  • vtkPVClipDataSet
    • SetInput to SetInputData
  • vtkPVGlyphFilter
    • SetInput to SetInputData
    • SetSource to SetSourceData
  • vtkStreamingDemandDrivenPipeline
    • UPDATE_TIME_STEPS to UPDATE_TIME_STEP
    • New function only returns a single value

Changeset: 258e7da4986b72c4f858cfb8b182e5cac1bc308b

comment:6 Changed 8 years ago by Michael Reuter

Looks like all the plugins now compile. The VSI does not, yet.

comment:7 Changed 8 years ago by Michael Reuter

Refs #6315. The VSI now compiles.

Changeset: 7b131ab82b4c6e247dfd520acb178b3283d085d8

comment:8 Changed 8 years ago by Michael Reuter

Refs #6315. Fixing all representation calls to new convention.

(cherry picked from commit 115f3253633d2835ba6849cee866ce0740c6b400)

Changeset: 36b8e0e2af04556ac87220e6c1de59ea40f798ab

comment:9 Changed 8 years ago by Michael Reuter

Refs #6315. Adding update calls.

Changeset: d49a74953e8e72a5a4af515f08fa6b34e8c64ecd

comment:10 Changed 8 years ago by Michael Reuter

Refs #6315. Adding libraries to make tests run.

Changeset: 32ea319e67f260f71aff1594251251160248d41f

comment:11 Changed 8 years ago by Michael Reuter

Good news: Everything compiles and the tests run correctly.

Bad news: The VSI is only partially functional and I can't figure out why.

comment:12 Changed 8 years ago by Michael Reuter

Refs #6315. Changing to new ParaView GUI widgets in VSI layout.

Changeset: ea398fd4d5085ee294e1af18ce2ee12db67c13e9

comment:13 Changed 8 years ago by Michael Reuter

Refs #6315. Updates to main class.

comment:14 Changed 8 years ago by Michael Reuter

Refs #6315. Adding more updatePipeline calls.

Changeset: f55e91c60623388af262e719098efa13c8012349

comment:15 Changed 8 years ago by Michael Reuter

Refs #6315. Peaks displaying works again.

Changeset: ceab00cf35f6690d4bdb5ddc9dc1312434c4aa5e

comment:16 Changed 8 years ago by Michael Reuter

Refs #6315. Fixing connections.

Changeset: e7ca17dd3e7e14006b6d784aeb554925cea520ef

comment:17 Changed 8 years ago by Michael Reuter

Refs #6315. Fixing three slice code.

Changeset: 540a35e2f4a909fd773adc31f7757279a2704ec5

comment:18 Changed 8 years ago by Michael Reuter

Refs #6315. Add null proxy trap.

Changeset: 1210caa6ecf7f84ad34cd33e21edce11ced19aa2

comment:19 Changed 8 years ago by Michael Reuter

Refs #6315. Adding null proxy trap.

Changeset: c148039a94b3dc1a716fe9358e2834a093784fd3

comment:20 Changed 8 years ago by Michael Reuter

Refs #6315. Fixing null proxy trap.

Changeset: 1e845e0d913409022af7e10415afee3b2e13f7f3

comment:21 Changed 8 years ago by Michael Reuter

Refs #6315. Better UI layout.

The pqPropertiesPanel and pqProxyInformationWidget are now contained within a

QTabWidget.

Changeset: ce3e4d18bee10c5314f1203f3336664a2566b184

comment:22 Changed 8 years ago by Owen Arnold

refs #6315 fix problems found during migration.

1) Fix the problem with warnings being emitted as a result of duplicate calls to connect. 2) Fix problem with ThresholdRange objects, particularly MedianAndBelow.

There is still an outstanding problem with the non-axis aligned binning plugin that I need to fix.

Changeset: 4fc2438dd0521c9546f78644d8af48bf3e1f94e5

comment:23 Changed 8 years ago by Owen Arnold

refs #6315 fix problems with transforming rebinning filter.

Was not working with 4 Dims.

Changeset: 572366ba39f53cd43423d85d4c6cab28f5ee8ca4

comment:24 Changed 8 years ago by Michael Reuter

  • Milestone changed from Release 2.4 to Release 2.5

comment:25 Changed 8 years ago by Owen Arnold

refs #6315 fix problems found during migration.

1) Fix the problem with warnings being emitted as a result of duplicate calls to connect. 2) Fix problem with ThresholdRange objects, particularly MedianAndBelow.

There is still an outstanding problem with the non-axis aligned binning plugin that I need to fix.

Changeset: 0d24b2f914e487869d8b2d5c9e9c6fcf0148f6bd

comment:26 Changed 8 years ago by Michael Reuter

  • Blocked By 6342 added

comment:27 Changed 8 years ago by Michael Reuter

  • Blocked By 6347 added

comment:28 Changed 8 years ago by Michael Reuter

  • Blocked By 6540 added

comment:29 Changed 8 years ago by Michael Reuter

  • Blocked By 6541 added

comment:30 Changed 8 years ago by Michael Reuter

  • Blocked By 6565 added

comment:31 Changed 8 years ago by Michael Reuter

Refs #6315. Can now handle apply like old version.

Changeset: fc1730c8ceecb0c1ba9f6fe09e131fd652f0678a

comment:32 Changed 8 years ago by Michael Reuter

Merge branch '6540_time_axis_labeling' into 6315_build_pv_398

Refs #6315. Fixing merge conflicts.

Changeset: dd127ff170522f45c95d01e06952e690882aa97f

comment:33 Changed 8 years ago by Michael Reuter

  • Blocked By 6658 added

comment:34 Changed 8 years ago by Michael Reuter

  • Blocked By 6673 added

comment:35 Changed 8 years ago by Michael Reuter

  • Blocked By 6697 added

comment:36 Changed 8 years ago by Michael Reuter

  • Blocked By 6700 added

comment:37 Changed 8 years ago by Michael Reuter

Refs #6315. Merging current work onto more recent master.

Changeset: 22dd38c5b2f416f88c3c52d363273d0c4eb02690

comment:38 Changed 8 years ago by Michael Reuter

  • Blocked By 6777 added

comment:39 Changed 8 years ago by Michael Reuter

  • Blocked By 6794 added

comment:40 Changed 8 years ago by Michael Reuter

  • Blocked By 6796 added

comment:41 Changed 8 years ago by Michael Reuter

Refs #6315. Changing version numbers and executable name.

Changeset: 1d2ed704ca38137447754364573bb4f3ea7afe55

comment:42 Changed 8 years ago by Michael Reuter

Refs #6315. Moving to a central setup file.

Changeset: 0ea60a4d6a5cdc901297ed224f4d60901f274272

comment:43 Changed 8 years ago by Michael Reuter

  • Blocked By 6842 added

comment:44 Changed 8 years ago by Michael Reuter

Refs #6315. Merging color scaling fix.

Merge branch 'bugfix/6777_auto_color_scaling' into feature/6315_build_pv_398

Conflicts:

Code/Mantid/Vates/VatesSimpleGui/ViewWidgets/src/MdViewerWidget.cpp

Changeset: 6796b1d0ddf25e57f7739828b418bae9f6598f68

comment:45 Changed 8 years ago by Michael Reuter

Refs #6315. Missed a version change.

Changeset: c210638eb642504b142348398094f1fd009098be

comment:46 Changed 8 years ago by Michael Reuter

Refs #6315. Fixing version regex for new PV.

Changeset: 893169eb5861c633206e6b4c0ea15a500b5f4034

comment:47 Changed 7 years ago by Michael Reuter

Refs #6315. Return menu to correct location.

Changeset: d0c4685684ee6d3f2a4f86973e5c448ad6ad39d4

comment:48 Changed 7 years ago by Michael Reuter

Refs #6315. Fixing a shutdown issue.

Changeset: 5593c3139bc77d6057be1d66aaa40ed3d8d63239

comment:49 Changed 7 years ago by Michael Reuter

Refs #6315. Removing unneeded headers.

Changeset: c8da4fcf58cb03e2aaa8b877db840d350fd2a648

comment:50 Changed 7 years ago by Michael Reuter

Refs #6315. CMake tweaking.

Changeset: 9d772149992b5705abe8ba7e79ea44b50881eb5e

comment:51 Changed 7 years ago by Michael Reuter

Refs #6315. Put pack CMake call.

Changeset: 4e88ab49d740be538dadad5038fa8512571599df

comment:52 Changed 7 years ago by Michael Reuter

  • Priority changed from critical to blocker

comment:53 Changed 7 years ago by Michael Reuter

  • Blocked By 6927 added

comment:54 Changed 7 years ago by Michael Reuter

Refs #6315. Changing version numbers and executable name.

Changeset: 1d2ed704ca38137447754364573bb4f3ea7afe55

comment:55 Changed 7 years ago by Michael Reuter

Refs #6315. Moving to a central setup file.

Changeset: 0ea60a4d6a5cdc901297ed224f4d60901f274272

comment:56 Changed 7 years ago by Michael Reuter

Refs #6315. Merging color scaling fix.

Merge branch 'bugfix/6777_auto_color_scaling' into feature/6315_build_pv_398

Conflicts:

Code/Mantid/Vates/VatesSimpleGui/ViewWidgets/src/MdViewerWidget.cpp

Changeset: 6796b1d0ddf25e57f7739828b418bae9f6598f68

comment:57 Changed 7 years ago by Michael Reuter

Refs #6315. Missed a version change.

Changeset: c210638eb642504b142348398094f1fd009098be

comment:58 Changed 7 years ago by Michael Reuter

Refs #6315. Fixing version regex for new PV.

Changeset: 893169eb5861c633206e6b4c0ea15a500b5f4034

comment:59 Changed 7 years ago by Michael Reuter

Refs #6315. Return menu to correct location.

Changeset: d0c4685684ee6d3f2a4f86973e5c448ad6ad39d4

comment:60 Changed 7 years ago by Michael Reuter

Refs #6315. Fixing a shutdown issue.

Changeset: 5593c3139bc77d6057be1d66aaa40ed3d8d63239

comment:61 Changed 7 years ago by Michael Reuter

Refs #6315. Removing unneeded headers.

Changeset: c8da4fcf58cb03e2aaa8b877db840d350fd2a648

comment:62 Changed 7 years ago by Michael Reuter

Refs #6315. CMake tweaking.

Changeset: 9d772149992b5705abe8ba7e79ea44b50881eb5e

comment:63 Changed 7 years ago by Michael Reuter

Refs #6315. Put pack CMake call.

Changeset: 4e88ab49d740be538dadad5038fa8512571599df

comment:64 Changed 7 years ago by Michael Reuter

Refs #6315. Changing some logging/output levels.

Changeset: 0276ad78244e980a2acb28135b12c58dddf46806

comment:65 Changed 7 years ago by Michael Reuter

  • Blocked By 6673 removed

comment:66 Changed 7 years ago by Michael Reuter

Refs #6315. Change wiki help to new page.

Changeset: 29716f8dafa829e93c6920e7b2f0929cbedc1934

comment:67 Changed 7 years ago by Stuart Campbell

Adding changes to run mantidplot using a script wrapper.

refs #6315 & #6913

Changeset: 00ad8594c273601448687c65a0cb41a18fe73a07

comment:68 Changed 7 years ago by Michael Reuter

Refs #6315. Fixing a compiler issue.

Changeset: 7cdc6441c543048f4ff6f50e6c6787019b75fcf3

comment:69 Changed 7 years ago by Michael Reuter

Refs #6315. More compiler issues.

Changeset: 1da6a8381426d8ee0d041a1308446be96cdaa961

comment:70 Changed 7 years ago by Stuart Campbell

Add scl enable to launcher script.

refs #6315

Changeset: 20677defd7fabcd794707eae9891594721e15d3a

comment:71 Changed 7 years ago by Stuart Campbell

Add various dependencies to RPM. refs #6315

Changeset: bf4e3fa7a89f4842e2319ab0295ebc708bcb8312

comment:72 Changed 7 years ago by Michael Reuter

Refs #6315. Handling W matrix the right way in test.

Changeset: 51dfeaf42e8c3fe5265a9a864b9f211d36fb7fe3

comment:73 Changed 7 years ago by Michael Reuter

Refs #6315. Fix to make unit tests happy.

Changeset: 9e24c063d737a20a1d26e54964a91ef2f1a9c2d6

comment:74 Changed 7 years ago by Michael Reuter

Refs #6315. Adding in Windows setup fix from Owen.

Merge branch 'feature/6936_pv_mantidplot_dialog' into feature/6315_build_pv_398

Conflicts:

Code/Mantid/MantidPlot/src/Mantid/SetUpParaview.cpp Code/Mantid/MantidPlot/src/Mantid/SetUpParaview.ui

Changeset: e25a844f4277130b796f622fec18a4d5466ea4ae

comment:75 Changed 7 years ago by Michael Reuter

Refs #6315. Missed a line during merge.

Changeset: a3de13d42e1f6b9edcf76147a0637fcdbd0e7646

comment:76 Changed 7 years ago by Michael Reuter

Refs #6315. Dealing with Unix warnings.

Changeset: bf3558dfe986bcb888b335335e1d9149034b3f72

comment:77 Changed 7 years ago by Michael Reuter

Refs #6315. Putting back removed ParaView setup include.

Changeset: 258c753cc52534eacad7bf169a8d49bdc0ca1c03

comment:78 Changed 7 years ago by Michael Reuter

Refs #6315 and #6936. Fixing version number assembly.

Changeset: 3be48cc9875b0759ecc7f3ebc25c3eceef24765e

comment:79 Changed 7 years ago by Michael Reuter

Refs #6315. Fixing Windows warnings.

Changeset: bb9c88f23d67af2fe6e42e8a7f1b30820cd62670

comment:80 Changed 7 years ago by Michael Reuter

Refs #6315. Fixing Intel warnings.

Changeset: 44f1b9045ce4a26cd20f88fa3fcf1d135cb6acee

comment:81 Changed 7 years ago by Michael Reuter

Refs #6315. Trying to fix Intel warnings.

Changeset: 9d7e352b2ac97770eedb418f7edde9d05b98e5ad

comment:82 Changed 7 years ago by Michael Reuter

Refs #6315. Merging Windows fix.

Merge branch 'feature/6936_pv_mantidplot_dialog' into feature/6315_build_pv_398

Conflicts:

Code/Mantid/Build/CMake/DarwinSetup.cmake

Changeset: 4093c4d7931e0e47e5a7725b254b18b0055b3ebc

comment:83 Changed 7 years ago by Michael Reuter

Refs #6315. Bigger hammer on Intel warnings.

Changeset: d6200600c6ea5656ec688a30ab47b4803f5dd2eb

comment:84 Changed 7 years ago by Michael Reuter

Refs #6315. Adding comment on warnings removal.

Changeset: 54f49474ff6db9af61b0e3238f47fd81eb6f0aca

comment:85 Changed 7 years ago by Michael Reuter

Refs #6315. More Intel warnings.

Changeset: 5b69d80fac49cc0f4cc6c828421a3c2612be09c0

comment:86 Changed 7 years ago by Michael Reuter

Refs #6315. Fix a Unix warning.

Changeset: 03cda3cf6ed831149eb7ffea64cf010cdd75ac68

comment:87 Changed 7 years ago by Michael Reuter

Refs #6315. Fixing crashes due to missing B and W matricies.

Changeset: ce215860681f2b9cb5f9faccb62ed40429e27db0

comment:88 Changed 7 years ago by Michael Reuter

Refs #6315. Correct name of test.

Changeset: fd6c349e50e36f0934f9c7a2936f514256eb44b3

comment:89 Changed 7 years ago by Michael Reuter

Refs #6315. Trying to make failure messages more helpful.

Changeset: e02eeb345ad2bc45a83e3e68c375ed69b2445cb3

comment:90 Changed 7 years ago by Michael Reuter

  • Blocked By 6877 added

comment:91 Changed 7 years ago by Michael Reuter

Refs #6315. Merging Mac fix.

Merge branch 'feature/6936_pv_mantidplot_dialog' into feature/6315_build_pv_398

Conflicts:

Code/Mantid/Build/CMake/DarwinSetup.cmake

Changeset: 74647628df542f530da82322df8fc075bc0eca00

comment:92 Changed 7 years ago by Michael Reuter

Refs #6315. Trying to get plugins path in.

Changeset: f84b49dedfab941c7b9407fde090ee346d776bee

comment:93 Changed 7 years ago by Michael Reuter

  • Milestone changed from Release 2.5 to PV 3.98

comment:94 Changed 7 years ago by Michael Reuter

Refs #6315. Append path the correct way.

Changeset: 7c56eb084cb31ce0654d6f65b1eb0f9aa80ea824

comment:95 Changed 7 years ago by Michael Reuter

  • Blocked By 6936 added

comment:96 Changed 7 years ago by Michael Reuter

  • Status changed from accepted to verify
  • Resolution set to fixed

This ticket can only be closed after all blocking ones have been closed. The branch smoke tests have verified the basic functionality of the new work. The rest is in the tickets.

comment:97 Changed 7 years ago by Michael Reuter

Refs #6315. Rename vtkTypeRevisionMacro to vtkTypeMacro.

Changeset: cf518b1445df2b0aa889d5d9221d6f1d358a19e5

comment:98 Changed 7 years ago by Michael Reuter

Refs #6315. Removing vtkCxxRevisionMacro.

Changeset: ce3673c734451e119703c924059b351a790204d7

comment:99 Changed 7 years ago by Michael Reuter

Refs #6315. Removing non-existing libraries for now.

Changeset: 3cc535b82b34b707a6b1c9845d1c0659dcb06e48

comment:100 Changed 7 years ago by Michael Reuter

Refs #6315. Fixing API changes.

  • vtkPVClipDataSet
    • SetInput to SetInputData
  • vtkPVGlyphFilter
    • SetInput to SetInputData
    • SetSource to SetSourceData
  • vtkStreamingDemandDrivenPipeline
    • UPDATE_TIME_STEPS to UPDATE_TIME_STEP
    • New function only returns a single value

Changeset: 258e7da4986b72c4f858cfb8b182e5cac1bc308b

comment:101 Changed 7 years ago by Michael Reuter

Refs #6315. The VSI now compiles.

Changeset: 7b131ab82b4c6e247dfd520acb178b3283d085d8

comment:102 Changed 7 years ago by Michael Reuter

Refs #6315. Fixing all representation calls to new convention.

(cherry picked from commit 115f3253633d2835ba6849cee866ce0740c6b400)

Changeset: 36b8e0e2af04556ac87220e6c1de59ea40f798ab

comment:103 Changed 7 years ago by Michael Reuter

Refs #6315. Adding update calls.

Changeset: d49a74953e8e72a5a4af515f08fa6b34e8c64ecd

comment:104 Changed 7 years ago by Michael Reuter

Refs #6315. Adding libraries to make tests run.

Changeset: 32ea319e67f260f71aff1594251251160248d41f

comment:105 Changed 7 years ago by Michael Reuter

Refs #6315. Changing to new ParaView GUI widgets in VSI layout.

Changeset: ea398fd4d5085ee294e1af18ce2ee12db67c13e9

comment:106 Changed 7 years ago by Michael Reuter

Refs #6315. Updates to main class.

comment:107 Changed 7 years ago by Michael Reuter

Refs #6315. Adding more updatePipeline calls.

Changeset: f55e91c60623388af262e719098efa13c8012349

comment:108 Changed 7 years ago by Michael Reuter

Refs #6315. Peaks displaying works again.

Changeset: ceab00cf35f6690d4bdb5ddc9dc1312434c4aa5e

comment:109 Changed 7 years ago by Michael Reuter

Refs #6315. Fixing connections.

Changeset: e7ca17dd3e7e14006b6d784aeb554925cea520ef

comment:110 Changed 7 years ago by Michael Reuter

Refs #6315. Fixing three slice code.

Changeset: 540a35e2f4a909fd773adc31f7757279a2704ec5

comment:111 Changed 7 years ago by Michael Reuter

Refs #6315. Add null proxy trap.

Changeset: 1210caa6ecf7f84ad34cd33e21edce11ced19aa2

comment:112 Changed 7 years ago by Michael Reuter

Refs #6315. Adding null proxy trap.

Changeset: c148039a94b3dc1a716fe9358e2834a093784fd3

comment:113 Changed 7 years ago by Michael Reuter

Refs #6315. Fixing null proxy trap.

Changeset: 1e845e0d913409022af7e10415afee3b2e13f7f3

comment:114 Changed 7 years ago by Michael Reuter

Refs #6315. Better UI layout.

The pqPropertiesPanel and pqProxyInformationWidget are now contained within a

QTabWidget.

Changeset: ce3e4d18bee10c5314f1203f3336664a2566b184

comment:115 Changed 7 years ago by Owen Arnold

refs #6315 fix problems found during migration.

1) Fix the problem with warnings being emitted as a result of duplicate calls to connect. 2) Fix problem with ThresholdRange objects, particularly MedianAndBelow.

There is still an outstanding problem with the non-axis aligned binning plugin that I need to fix.

Changeset: 4fc2438dd0521c9546f78644d8af48bf3e1f94e5

comment:116 Changed 7 years ago by Owen Arnold

refs #6315 fix problems with transforming rebinning filter.

Was not working with 4 Dims.

Changeset: 572366ba39f53cd43423d85d4c6cab28f5ee8ca4

comment:117 Changed 7 years ago by Michael Reuter

Refs #6315. Removing a warning.

Changeset: e1988615683fa88fde7e73ad2e8c68ff64d2fb99

comment:118 Changed 7 years ago by Michael Reuter

Refs #6315. Header file cleanup.

Changeset: 8bdba79169174dca0b6690c676b4d8c398cd4be5

comment:119 Changed 7 years ago by Michael Reuter

Refs #6315. Can now handle apply like old version.

Changeset: fc1730c8ceecb0c1ba9f6fe09e131fd652f0678a

comment:120 Changed 7 years ago by Michael Reuter

Merge branch '6540_time_axis_labeling' into 6315_build_pv_398

Refs #6315. Fixing merge conflicts.

Changeset: dd127ff170522f45c95d01e06952e690882aa97f

comment:121 Changed 7 years ago by Michael Reuter

Refs #6315. Merging current work onto more recent master.

Changeset: 22dd38c5b2f416f88c3c52d363273d0c4eb02690

comment:122 Changed 7 years ago by Michael Reuter

Refs #6315. Changing version numbers and executable name.

Changeset: 1d2ed704ca38137447754364573bb4f3ea7afe55

comment:123 Changed 7 years ago by Michael Reuter

Refs #6315. Moving to a central setup file.

Changeset: 0ea60a4d6a5cdc901297ed224f4d60901f274272

comment:124 Changed 7 years ago by Michael Reuter

Refs #6315. Merging color scaling fix.

Merge branch 'bugfix/6777_auto_color_scaling' into feature/6315_build_pv_398

Conflicts:

Code/Mantid/Vates/VatesSimpleGui/ViewWidgets/src/MdViewerWidget.cpp

Changeset: 6796b1d0ddf25e57f7739828b418bae9f6598f68

comment:125 Changed 7 years ago by Michael Reuter

Refs #6315. Missed a version change.

Changeset: c210638eb642504b142348398094f1fd009098be

comment:126 Changed 7 years ago by Michael Reuter

Refs #6315. Fixing version regex for new PV.

Changeset: 893169eb5861c633206e6b4c0ea15a500b5f4034

comment:127 Changed 7 years ago by Michael Reuter

Refs #6315. Return menu to correct location.

Changeset: d0c4685684ee6d3f2a4f86973e5c448ad6ad39d4

comment:128 Changed 7 years ago by Michael Reuter

Refs #6315. Fixing a shutdown issue.

Changeset: 5593c3139bc77d6057be1d66aaa40ed3d8d63239

comment:129 Changed 7 years ago by Michael Reuter

Refs #6315. Removing unneeded headers.

Changeset: c8da4fcf58cb03e2aaa8b877db840d350fd2a648

comment:130 Changed 7 years ago by Michael Reuter

Refs #6315. CMake tweaking.

Changeset: 9d772149992b5705abe8ba7e79ea44b50881eb5e

comment:131 Changed 7 years ago by Michael Reuter

Refs #6315. Put pack CMake call.

Changeset: 4e88ab49d740be538dadad5038fa8512571599df

comment:132 Changed 7 years ago by Michael Reuter

Refs #6315. Changing some logging/output levels.

Changeset: 0276ad78244e980a2acb28135b12c58dddf46806

comment:133 Changed 7 years ago by Michael Reuter

Refs #6315. Change wiki help to new page.

Changeset: 29716f8dafa829e93c6920e7b2f0929cbedc1934

comment:134 Changed 7 years ago by Stuart Campbell

Adding changes to run mantidplot using a script wrapper.

refs #6315 & #6913

Changeset: 00ad8594c273601448687c65a0cb41a18fe73a07

comment:135 Changed 7 years ago by Michael Reuter

Refs #6315. Fixing a compiler issue.

Changeset: 7cdc6441c543048f4ff6f50e6c6787019b75fcf3

comment:136 Changed 7 years ago by Michael Reuter

Refs #6315. More compiler issues.

Changeset: 1da6a8381426d8ee0d041a1308446be96cdaa961

comment:137 Changed 7 years ago by Stuart Campbell

Add scl enable to launcher script.

refs #6315

Changeset: 20677defd7fabcd794707eae9891594721e15d3a

comment:138 Changed 7 years ago by Stuart Campbell

Add various dependencies to RPM. refs #6315

Changeset: bf4e3fa7a89f4842e2319ab0295ebc708bcb8312

comment:139 Changed 7 years ago by Michael Reuter

Refs #6315. Handling W matrix the right way in test.

Changeset: 51dfeaf42e8c3fe5265a9a864b9f211d36fb7fe3

comment:140 Changed 7 years ago by Michael Reuter

Refs #6315. Fix to make unit tests happy.

Changeset: 9e24c063d737a20a1d26e54964a91ef2f1a9c2d6

comment:141 Changed 7 years ago by Michael Reuter

Refs #6315. Adding in Windows setup fix from Owen.

Merge branch 'feature/6936_pv_mantidplot_dialog' into feature/6315_build_pv_398

Conflicts:

Code/Mantid/MantidPlot/src/Mantid/SetUpParaview.cpp Code/Mantid/MantidPlot/src/Mantid/SetUpParaview.ui

Changeset: e25a844f4277130b796f622fec18a4d5466ea4ae

comment:142 Changed 7 years ago by Michael Reuter

Refs #6315. Missed a line during merge.

Changeset: a3de13d42e1f6b9edcf76147a0637fcdbd0e7646

comment:143 Changed 7 years ago by Michael Reuter

Refs #6315. Dealing with Unix warnings.

Changeset: bf3558dfe986bcb888b335335e1d9149034b3f72

comment:144 Changed 7 years ago by Michael Reuter

Refs #6315. Putting back removed ParaView setup include.

Changeset: 258c753cc52534eacad7bf169a8d49bdc0ca1c03

comment:145 Changed 7 years ago by Michael Reuter

Refs #6315 and #6936. Fixing version number assembly.

Changeset: 3be48cc9875b0759ecc7f3ebc25c3eceef24765e

comment:146 Changed 7 years ago by Michael Reuter

Refs #6315. Fixing Windows warnings.

Changeset: bb9c88f23d67af2fe6e42e8a7f1b30820cd62670

comment:147 Changed 7 years ago by Michael Reuter

Refs #6315. Fixing Intel warnings.

Changeset: 44f1b9045ce4a26cd20f88fa3fcf1d135cb6acee

comment:148 Changed 7 years ago by Michael Reuter

Refs #6315. Trying to fix Intel warnings.

Changeset: 9d7e352b2ac97770eedb418f7edde9d05b98e5ad

comment:149 Changed 7 years ago by Michael Reuter

Refs #6315. Merging Windows fix.

Merge branch 'feature/6936_pv_mantidplot_dialog' into feature/6315_build_pv_398

Conflicts:

Code/Mantid/Build/CMake/DarwinSetup.cmake

Changeset: 4093c4d7931e0e47e5a7725b254b18b0055b3ebc

comment:150 Changed 7 years ago by Michael Reuter

Refs #6315. Bigger hammer on Intel warnings.

Changeset: d6200600c6ea5656ec688a30ab47b4803f5dd2eb

comment:151 Changed 7 years ago by Michael Reuter

Refs #6315. Adding comment on warnings removal.

Changeset: 54f49474ff6db9af61b0e3238f47fd81eb6f0aca

comment:152 Changed 7 years ago by Michael Reuter

Refs #6315. More Intel warnings.

Changeset: 5b69d80fac49cc0f4cc6c828421a3c2612be09c0

comment:153 Changed 7 years ago by Michael Reuter

Refs #6315. Fix a Unix warning.

Changeset: 03cda3cf6ed831149eb7ffea64cf010cdd75ac68

comment:154 Changed 7 years ago by Michael Reuter

Refs #6315. Fixing crashes due to missing B and W matricies.

Changeset: ce215860681f2b9cb5f9faccb62ed40429e27db0

comment:155 Changed 7 years ago by Michael Reuter

Refs #6315. Correct name of test.

Changeset: fd6c349e50e36f0934f9c7a2936f514256eb44b3

comment:156 Changed 7 years ago by Michael Reuter

Refs #6315. Trying to make failure messages more helpful.

Changeset: e02eeb345ad2bc45a83e3e68c375ed69b2445cb3

comment:157 Changed 7 years ago by Michael Reuter

Refs #6315. Merging Mac fix.

Merge branch 'feature/6936_pv_mantidplot_dialog' into feature/6315_build_pv_398

Conflicts:

Code/Mantid/Build/CMake/DarwinSetup.cmake

Changeset: 74647628df542f530da82322df8fc075bc0eca00

comment:158 Changed 7 years ago by Michael Reuter

Refs #6315. Trying to get plugins path in.

Changeset: f84b49dedfab941c7b9407fde090ee346d776bee

comment:159 Changed 7 years ago by Michael Reuter

Refs #6315. Append path the correct way.

Changeset: 7c56eb084cb31ce0654d6f65b1eb0f9aa80ea824

comment:160 Changed 7 years ago by Michael Reuter

Refs #6315. Merging the Paraview work.

Merge branch 'feature/6315_build_pv_398'

Conflicts:

Code/Mantid/CMakeLists.txt

Changeset: f07a924c05c6fdfd2980c8ba5bab80eab5720ed2

comment:161 Changed 7 years ago by Michael Reuter

This ticket can only be closed after all blocking ones have been closed. The branch smoke tests have verified the basic functionality of the new work. The rest is in the tickets.

comment:162 Changed 7 years ago by Michael Reuter

Refs #6315. Rename vtkTypeRevisionMacro to vtkTypeMacro.

Changeset: cf518b1445df2b0aa889d5d9221d6f1d358a19e5

comment:163 Changed 7 years ago by Michael Reuter

Refs #6315. Removing vtkCxxRevisionMacro.

Changeset: ce3673c734451e119703c924059b351a790204d7

comment:164 Changed 7 years ago by Michael Reuter

Refs #6315. Removing non-existing libraries for now.

Changeset: 3cc535b82b34b707a6b1c9845d1c0659dcb06e48

comment:165 Changed 7 years ago by Michael Reuter

Refs #6315. Fixing API changes.

  • vtkPVClipDataSet
    • SetInput to SetInputData
  • vtkPVGlyphFilter
    • SetInput to SetInputData
    • SetSource to SetSourceData
  • vtkStreamingDemandDrivenPipeline
    • UPDATE_TIME_STEPS to UPDATE_TIME_STEP
    • New function only returns a single value

Changeset: 258e7da4986b72c4f858cfb8b182e5cac1bc308b

comment:166 Changed 7 years ago by Michael Reuter

Refs #6315. The VSI now compiles.

Changeset: 7b131ab82b4c6e247dfd520acb178b3283d085d8

comment:167 Changed 7 years ago by Michael Reuter

Refs #6315. Fixing all representation calls to new convention.

(cherry picked from commit 115f3253633d2835ba6849cee866ce0740c6b400)

Changeset: 36b8e0e2af04556ac87220e6c1de59ea40f798ab

comment:168 Changed 7 years ago by Michael Reuter

Refs #6315. Adding update calls.

Changeset: d49a74953e8e72a5a4af515f08fa6b34e8c64ecd

comment:169 Changed 7 years ago by Michael Reuter

Refs #6315. Adding libraries to make tests run.

Changeset: 32ea319e67f260f71aff1594251251160248d41f

comment:170 Changed 7 years ago by Michael Reuter

Refs #6315. Changing to new ParaView GUI widgets in VSI layout.

Changeset: ea398fd4d5085ee294e1af18ce2ee12db67c13e9

comment:171 Changed 7 years ago by Michael Reuter

Refs #6315. Updates to main class.

comment:172 Changed 7 years ago by Michael Reuter

Refs #6315. Adding more updatePipeline calls.

Changeset: f55e91c60623388af262e719098efa13c8012349

comment:173 Changed 7 years ago by Michael Reuter

Refs #6315. Peaks displaying works again.

Changeset: ceab00cf35f6690d4bdb5ddc9dc1312434c4aa5e

comment:174 Changed 7 years ago by Michael Reuter

Refs #6315. Fixing connections.

Changeset: e7ca17dd3e7e14006b6d784aeb554925cea520ef

comment:175 Changed 7 years ago by Michael Reuter

Refs #6315. Fixing three slice code.

Changeset: 540a35e2f4a909fd773adc31f7757279a2704ec5

comment:176 Changed 7 years ago by Michael Reuter

Refs #6315. Add null proxy trap.

Changeset: 1210caa6ecf7f84ad34cd33e21edce11ced19aa2

comment:177 Changed 7 years ago by Michael Reuter

Refs #6315. Adding null proxy trap.

Changeset: c148039a94b3dc1a716fe9358e2834a093784fd3

comment:178 Changed 7 years ago by Michael Reuter

Refs #6315. Fixing null proxy trap.

Changeset: 1e845e0d913409022af7e10415afee3b2e13f7f3

comment:179 Changed 7 years ago by Michael Reuter

Refs #6315. Better UI layout.

The pqPropertiesPanel and pqProxyInformationWidget are now contained within a

QTabWidget.

Changeset: ce3e4d18bee10c5314f1203f3336664a2566b184

comment:180 Changed 7 years ago by Owen Arnold

refs #6315 fix problems found during migration.

1) Fix the problem with warnings being emitted as a result of duplicate calls to connect. 2) Fix problem with ThresholdRange objects, particularly MedianAndBelow.

There is still an outstanding problem with the non-axis aligned binning plugin that I need to fix.

Changeset: 4fc2438dd0521c9546f78644d8af48bf3e1f94e5

comment:181 Changed 7 years ago by Owen Arnold

refs #6315 fix problems with transforming rebinning filter.

Was not working with 4 Dims.

Changeset: 572366ba39f53cd43423d85d4c6cab28f5ee8ca4

comment:182 Changed 7 years ago by Michael Reuter

Refs #6315. Removing a warning.

Changeset: e1988615683fa88fde7e73ad2e8c68ff64d2fb99

comment:183 Changed 7 years ago by Michael Reuter

Refs #6315. Header file cleanup.

Changeset: 8bdba79169174dca0b6690c676b4d8c398cd4be5

comment:184 Changed 7 years ago by Michael Reuter

Refs #6315. Can now handle apply like old version.

Changeset: fc1730c8ceecb0c1ba9f6fe09e131fd652f0678a

comment:185 Changed 7 years ago by Michael Reuter

Merge branch '6540_time_axis_labeling' into 6315_build_pv_398

Refs #6315. Fixing merge conflicts.

Changeset: dd127ff170522f45c95d01e06952e690882aa97f

comment:186 Changed 7 years ago by Michael Reuter

Refs #6315. Merging current work onto more recent master.

Changeset: 22dd38c5b2f416f88c3c52d363273d0c4eb02690

comment:187 Changed 7 years ago by Michael Reuter

Refs #6315. Changing version numbers and executable name.

Changeset: 1d2ed704ca38137447754364573bb4f3ea7afe55

comment:188 Changed 7 years ago by Michael Reuter

Refs #6315. Moving to a central setup file.

Changeset: 0ea60a4d6a5cdc901297ed224f4d60901f274272

comment:189 Changed 7 years ago by Michael Reuter

Refs #6315. Merging color scaling fix.

Merge branch 'bugfix/6777_auto_color_scaling' into feature/6315_build_pv_398

Conflicts:

Code/Mantid/Vates/VatesSimpleGui/ViewWidgets/src/MdViewerWidget.cpp

Changeset: 6796b1d0ddf25e57f7739828b418bae9f6598f68

comment:190 Changed 7 years ago by Michael Reuter

Refs #6315. Missed a version change.

Changeset: c210638eb642504b142348398094f1fd009098be

comment:191 Changed 7 years ago by Michael Reuter

Refs #6315. Fixing version regex for new PV.

Changeset: 893169eb5861c633206e6b4c0ea15a500b5f4034

comment:192 Changed 7 years ago by Michael Reuter

Refs #6315. Return menu to correct location.

Changeset: d0c4685684ee6d3f2a4f86973e5c448ad6ad39d4

comment:193 Changed 7 years ago by Michael Reuter

Refs #6315. Fixing a shutdown issue.

Changeset: 5593c3139bc77d6057be1d66aaa40ed3d8d63239

comment:194 Changed 7 years ago by Michael Reuter

Refs #6315. Removing unneeded headers.

Changeset: c8da4fcf58cb03e2aaa8b877db840d350fd2a648

comment:195 Changed 7 years ago by Michael Reuter

Refs #6315. CMake tweaking.

Changeset: 9d772149992b5705abe8ba7e79ea44b50881eb5e

comment:196 Changed 7 years ago by Michael Reuter

Refs #6315. Put pack CMake call.

Changeset: 4e88ab49d740be538dadad5038fa8512571599df

comment:197 Changed 7 years ago by Michael Reuter

Refs #6315. Changing some logging/output levels.

Changeset: 0276ad78244e980a2acb28135b12c58dddf46806

comment:198 Changed 7 years ago by Michael Reuter

Refs #6315. Change wiki help to new page.

Changeset: 29716f8dafa829e93c6920e7b2f0929cbedc1934

comment:199 Changed 7 years ago by Stuart Campbell

Adding changes to run mantidplot using a script wrapper.

refs #6315 & #6913

Changeset: 00ad8594c273601448687c65a0cb41a18fe73a07

comment:200 Changed 7 years ago by Michael Reuter

Refs #6315. Fixing a compiler issue.

Changeset: 7cdc6441c543048f4ff6f50e6c6787019b75fcf3

comment:201 Changed 7 years ago by Michael Reuter

Refs #6315. More compiler issues.

Changeset: 1da6a8381426d8ee0d041a1308446be96cdaa961

comment:202 Changed 7 years ago by Stuart Campbell

Add scl enable to launcher script.

refs #6315

Changeset: 20677defd7fabcd794707eae9891594721e15d3a

comment:203 Changed 7 years ago by Stuart Campbell

Add various dependencies to RPM. refs #6315

Changeset: bf4e3fa7a89f4842e2319ab0295ebc708bcb8312

comment:204 Changed 7 years ago by Michael Reuter

Refs #6315. Handling W matrix the right way in test.

Changeset: 51dfeaf42e8c3fe5265a9a864b9f211d36fb7fe3

comment:205 Changed 7 years ago by Michael Reuter

Refs #6315. Fix to make unit tests happy.

Changeset: 9e24c063d737a20a1d26e54964a91ef2f1a9c2d6

comment:206 Changed 7 years ago by Michael Reuter

Refs #6315. Adding in Windows setup fix from Owen.

Merge branch 'feature/6936_pv_mantidplot_dialog' into feature/6315_build_pv_398

Conflicts:

Code/Mantid/MantidPlot/src/Mantid/SetUpParaview.cpp Code/Mantid/MantidPlot/src/Mantid/SetUpParaview.ui

Changeset: e25a844f4277130b796f622fec18a4d5466ea4ae

comment:207 Changed 7 years ago by Michael Reuter

Refs #6315. Missed a line during merge.

Changeset: a3de13d42e1f6b9edcf76147a0637fcdbd0e7646

comment:208 Changed 7 years ago by Michael Reuter

Refs #6315. Dealing with Unix warnings.

Changeset: bf3558dfe986bcb888b335335e1d9149034b3f72

comment:209 Changed 7 years ago by Michael Reuter

Refs #6315. Putting back removed ParaView setup include.

Changeset: 258c753cc52534eacad7bf169a8d49bdc0ca1c03

comment:210 Changed 7 years ago by Michael Reuter

Refs #6315 and #6936. Fixing version number assembly.

Changeset: 3be48cc9875b0759ecc7f3ebc25c3eceef24765e

comment:211 Changed 7 years ago by Michael Reuter

Refs #6315. Fixing Windows warnings.

Changeset: bb9c88f23d67af2fe6e42e8a7f1b30820cd62670

comment:212 Changed 7 years ago by Michael Reuter

Refs #6315. Fixing Intel warnings.

Changeset: 44f1b9045ce4a26cd20f88fa3fcf1d135cb6acee

comment:213 Changed 7 years ago by Michael Reuter

Refs #6315. Trying to fix Intel warnings.

Changeset: 9d7e352b2ac97770eedb418f7edde9d05b98e5ad

comment:214 Changed 7 years ago by Michael Reuter

Refs #6315. Merging Windows fix.

Merge branch 'feature/6936_pv_mantidplot_dialog' into feature/6315_build_pv_398

Conflicts:

Code/Mantid/Build/CMake/DarwinSetup.cmake

Changeset: 4093c4d7931e0e47e5a7725b254b18b0055b3ebc

comment:215 Changed 7 years ago by Michael Reuter

Refs #6315. Bigger hammer on Intel warnings.

Changeset: d6200600c6ea5656ec688a30ab47b4803f5dd2eb

comment:216 Changed 7 years ago by Michael Reuter

Refs #6315. Adding comment on warnings removal.

Changeset: 54f49474ff6db9af61b0e3238f47fd81eb6f0aca

comment:217 Changed 7 years ago by Michael Reuter

Refs #6315. More Intel warnings.

Changeset: 5b69d80fac49cc0f4cc6c828421a3c2612be09c0

comment:218 Changed 7 years ago by Michael Reuter

Refs #6315. Fix a Unix warning.

Changeset: 03cda3cf6ed831149eb7ffea64cf010cdd75ac68

comment:219 Changed 7 years ago by Michael Reuter

Refs #6315. Fixing crashes due to missing B and W matricies.

Changeset: ce215860681f2b9cb5f9faccb62ed40429e27db0

comment:220 Changed 7 years ago by Michael Reuter

Refs #6315. Correct name of test.

Changeset: fd6c349e50e36f0934f9c7a2936f514256eb44b3

comment:221 Changed 7 years ago by Michael Reuter

Refs #6315. Trying to make failure messages more helpful.

Changeset: e02eeb345ad2bc45a83e3e68c375ed69b2445cb3

comment:222 Changed 7 years ago by Michael Reuter

Refs #6315. Merging Mac fix.

Merge branch 'feature/6936_pv_mantidplot_dialog' into feature/6315_build_pv_398

Conflicts:

Code/Mantid/Build/CMake/DarwinSetup.cmake

Changeset: 74647628df542f530da82322df8fc075bc0eca00

comment:223 Changed 7 years ago by Michael Reuter

Refs #6315. Trying to get plugins path in.

Changeset: f84b49dedfab941c7b9407fde090ee346d776bee

comment:224 Changed 7 years ago by Michael Reuter

Refs #6315. Append path the correct way.

Changeset: 7c56eb084cb31ce0654d6f65b1eb0f9aa80ea824

comment:225 Changed 7 years ago by Michael Reuter

Refs #6315. Merging the Paraview work.

Merge branch 'feature/6315_build_pv_398'

Conflicts:

Code/Mantid/CMakeLists.txt

Changeset: f07a924c05c6fdfd2980c8ba5bab80eab5720ed2

comment:226 Changed 7 years ago by Peter Peterson

Moving tickets back to the release for later accounting.

comment:227 Changed 7 years ago by Peter Peterson

  • Milestone changed from PV 3.98 to Release 2.5

comment:228 Changed 7 years ago by Stuart Campbell

Moving Paraview tickets back to main mantid milestone

comment:229 Changed 7 years ago by Stuart Campbell

  • Status changed from verify to verifying
  • Tester set to Stuart Campbell

comment:230 Changed 7 years ago by Stuart Campbell

  • Status changed from verifying to closed

comment:231 Changed 7 years ago by Michael Reuter

Refs #6315. Changing version numbers and executable name.

Changeset: 1d2ed704ca38137447754364573bb4f3ea7afe55

comment:232 Changed 7 years ago by Michael Reuter

Refs #6315. Moving to a central setup file.

Changeset: 0ea60a4d6a5cdc901297ed224f4d60901f274272

comment:233 Changed 7 years ago by Michael Reuter

Refs #6315. Merging color scaling fix.

Merge branch 'bugfix/6777_auto_color_scaling' into feature/6315_build_pv_398

Conflicts:

Code/Mantid/Vates/VatesSimpleGui/ViewWidgets/src/MdViewerWidget.cpp

Changeset: 6796b1d0ddf25e57f7739828b418bae9f6598f68

comment:234 Changed 7 years ago by Michael Reuter

Refs #6315. Missed a version change.

Changeset: c210638eb642504b142348398094f1fd009098be

comment:235 Changed 7 years ago by Michael Reuter

Refs #6315. Fixing version regex for new PV.

Changeset: 893169eb5861c633206e6b4c0ea15a500b5f4034

comment:236 Changed 7 years ago by Michael Reuter

Refs #6315. Return menu to correct location.

Changeset: d0c4685684ee6d3f2a4f86973e5c448ad6ad39d4

comment:237 Changed 7 years ago by Michael Reuter

Refs #6315. Fixing a shutdown issue.

Changeset: 5593c3139bc77d6057be1d66aaa40ed3d8d63239

comment:238 Changed 7 years ago by Michael Reuter

Refs #6315. Removing unneeded headers.

Changeset: c8da4fcf58cb03e2aaa8b877db840d350fd2a648

comment:239 Changed 7 years ago by Michael Reuter

Refs #6315. CMake tweaking.

Changeset: 9d772149992b5705abe8ba7e79ea44b50881eb5e

comment:240 Changed 7 years ago by Michael Reuter

Refs #6315. Put pack CMake call.

Changeset: 4e88ab49d740be538dadad5038fa8512571599df

comment:241 Changed 7 years ago by Michael Reuter

Refs #6315. Changing some logging/output levels.

Changeset: 0276ad78244e980a2acb28135b12c58dddf46806

comment:242 Changed 7 years ago by Michael Reuter

Refs #6315. Change wiki help to new page.

Changeset: 29716f8dafa829e93c6920e7b2f0929cbedc1934

comment:243 Changed 7 years ago by Stuart Campbell

Adding changes to run mantidplot using a script wrapper.

refs #6315 & #6913

Changeset: 00ad8594c273601448687c65a0cb41a18fe73a07

comment:244 Changed 7 years ago by Michael Reuter

Refs #6315. Fixing a compiler issue.

Changeset: 7cdc6441c543048f4ff6f50e6c6787019b75fcf3

comment:245 Changed 7 years ago by Michael Reuter

Refs #6315. More compiler issues.

Changeset: 1da6a8381426d8ee0d041a1308446be96cdaa961

comment:246 Changed 7 years ago by Stuart Campbell

Add scl enable to launcher script.

refs #6315

Changeset: 20677defd7fabcd794707eae9891594721e15d3a

comment:247 Changed 7 years ago by Stuart Campbell

Add various dependencies to RPM. refs #6315

Changeset: bf4e3fa7a89f4842e2319ab0295ebc708bcb8312

comment:248 Changed 7 years ago by Michael Reuter

Refs #6315. Handling W matrix the right way in test.

Changeset: 51dfeaf42e8c3fe5265a9a864b9f211d36fb7fe3

comment:249 Changed 7 years ago by Michael Reuter

Refs #6315. Fix to make unit tests happy.

Changeset: 9e24c063d737a20a1d26e54964a91ef2f1a9c2d6

comment:250 Changed 7 years ago by Michael Reuter

Refs #6315. Adding in Windows setup fix from Owen.

Merge branch 'feature/6936_pv_mantidplot_dialog' into feature/6315_build_pv_398

Conflicts:

Code/Mantid/MantidPlot/src/Mantid/SetUpParaview.cpp Code/Mantid/MantidPlot/src/Mantid/SetUpParaview.ui

Changeset: e25a844f4277130b796f622fec18a4d5466ea4ae

comment:251 Changed 7 years ago by Michael Reuter

Refs #6315. Missed a line during merge.

Changeset: a3de13d42e1f6b9edcf76147a0637fcdbd0e7646

comment:252 Changed 7 years ago by Michael Reuter

Refs #6315. Dealing with Unix warnings.

Changeset: bf3558dfe986bcb888b335335e1d9149034b3f72

comment:253 Changed 7 years ago by Michael Reuter

Refs #6315. Putting back removed ParaView setup include.

Changeset: 258c753cc52534eacad7bf169a8d49bdc0ca1c03

comment:254 Changed 7 years ago by Michael Reuter

Refs #6315 and #6936. Fixing version number assembly.

Changeset: 3be48cc9875b0759ecc7f3ebc25c3eceef24765e

comment:255 Changed 7 years ago by Michael Reuter

Refs #6315. Fixing Windows warnings.

Changeset: bb9c88f23d67af2fe6e42e8a7f1b30820cd62670

comment:256 Changed 7 years ago by Michael Reuter

Refs #6315. Fixing Intel warnings.

Changeset: 44f1b9045ce4a26cd20f88fa3fcf1d135cb6acee

comment:257 Changed 7 years ago by Michael Reuter

Refs #6315. Trying to fix Intel warnings.

Changeset: 9d7e352b2ac97770eedb418f7edde9d05b98e5ad

comment:258 Changed 7 years ago by Michael Reuter

Refs #6315. Merging Windows fix.

Merge branch 'feature/6936_pv_mantidplot_dialog' into feature/6315_build_pv_398

Conflicts:

Code/Mantid/Build/CMake/DarwinSetup.cmake

Changeset: 4093c4d7931e0e47e5a7725b254b18b0055b3ebc

comment:259 Changed 7 years ago by Michael Reuter

Refs #6315. Bigger hammer on Intel warnings.

Changeset: d6200600c6ea5656ec688a30ab47b4803f5dd2eb

comment:260 Changed 7 years ago by Michael Reuter

Refs #6315. Adding comment on warnings removal.

Changeset: 54f49474ff6db9af61b0e3238f47fd81eb6f0aca

comment:261 Changed 7 years ago by Michael Reuter

Refs #6315. More Intel warnings.

Changeset: 5b69d80fac49cc0f4cc6c828421a3c2612be09c0

comment:262 Changed 7 years ago by Michael Reuter

Refs #6315. Fix a Unix warning.

Changeset: 03cda3cf6ed831149eb7ffea64cf010cdd75ac68

comment:263 Changed 7 years ago by Michael Reuter

Refs #6315. Fixing crashes due to missing B and W matricies.

Changeset: ce215860681f2b9cb5f9faccb62ed40429e27db0

comment:264 Changed 7 years ago by Michael Reuter

Refs #6315. Correct name of test.

Changeset: fd6c349e50e36f0934f9c7a2936f514256eb44b3

comment:265 Changed 7 years ago by Michael Reuter

Refs #6315. Trying to make failure messages more helpful.

Changeset: e02eeb345ad2bc45a83e3e68c375ed69b2445cb3

comment:266 Changed 7 years ago by Michael Reuter

Refs #6315. Merging Mac fix.

Merge branch 'feature/6936_pv_mantidplot_dialog' into feature/6315_build_pv_398

Conflicts:

Code/Mantid/Build/CMake/DarwinSetup.cmake

Changeset: 74647628df542f530da82322df8fc075bc0eca00

comment:267 Changed 7 years ago by Michael Reuter

Refs #6315. Trying to get plugins path in.

Changeset: f84b49dedfab941c7b9407fde090ee346d776bee

comment:268 Changed 7 years ago by Michael Reuter

Refs #6315. Append path the correct way.

Changeset: 7c56eb084cb31ce0654d6f65b1eb0f9aa80ea824

comment:269 Changed 7 years ago by Michael Reuter

Refs #6315. Merging the Paraview work.

Merge branch 'feature/6315_build_pv_398'

Conflicts:

Code/Mantid/CMakeLists.txt

Changeset: f07a924c05c6fdfd2980c8ba5bab80eab5720ed2

comment:270 Changed 5 years ago by Stuart Campbell

This ticket has been transferred to github issue ​7161

Note: See TracTickets for help on using tickets.