Skip to content

ParaView
ParaView
Source
Select Git revision
...
Target
Select Git revision
 
Commits (7)
Hide whitespace changes
Inline Side-by-side
Showing with 52 additions and 17 deletions
.gitlab/issue_templates/new-release.md
View file @ 74fd1a6d
......@@ -12,16 +12,16 @@ Please remove this comment.
# Preparatory steps
- Update ParaView guides
- [ ] User manual
- User manual
- [ ] Rename to ParaViewGuide-VERSION.pdf
- [ ] Upload to www.paraview.org/files/vMAJOR.MINOR
- [ ] Catalyst Guide
- Catalyst Guide
- [ ] Rename to ParaViewCatalystGuide-VERSION.pdf
- [ ] Upload to www.paraview.org/files/vMAJOR.MINOR
- [ ] Getting Started Guide
- Getting Started Guide
- [ ] Rename to ParaViewGettingStarted-VERSION.pdf
- [ ] Upload to www.paraview.org/files/vMAJOR.MINOR
- [ ] Assemble release notes into `Documentation/release/ParaView-VERSION`.
- Assemble release notes into `Documentation/release/ParaView-VERSION`.
- [ ] Get positive review and merge.
# Update ParaView
......@@ -106,6 +106,7 @@ git merge --ff-only origin/master
```
- Update `CMakeLists.txt`
- [ ] `git checkout -b update-to-vVERSION`
- [ ] Update PARAVIEW_VERSION_DEFAULT to the release version (without RC*)
- [ ] Set ParaView source selections in `CMakeLists.txt` and force explicit
version in `CMakeLists.txt`:
```
......@@ -118,7 +119,7 @@ set(paraview_FROM_SOURCE_DIR OFF CACHE BOOL "Force source dir off" FORCE)
- [ ] `git add versions.cmake CMakeLists.txt`
- [ ] `git commit -m "Update the default version to VERSION"`
- Integrate changes to `master` branch
- [ ] Create a merge request targeting `master`, title beginning with WIP
- [ ] Create a merge request targeting `master`, title beginning with WIP (do *not* add `Backport: release` to description)
- [ ] Build binaries (`Do: test`)
- [ ] Download the binaries that have been generated in the dashboard results. They will be deleted within 24 hours.
- [ ] Remove explicit version forcing added in CMakeLists.txt and force push
......@@ -157,10 +158,10 @@ set(paraview_FROM_SOURCE_DIR OFF CACHE BOOL "Force source dir off" FORCE)
- [ ] `git add versions.cmake CMakeLists.txt`
- [ ] `git commit -m "Update the default version to VERSION"`
- Integrate changes to `master` branch
- [ ] Create a merge request targeting `master`, title beginning with WIP
- [ ] Create a merge request targeting `master`, title beginning with WIP (do *not* add `Backport: release` to description)
- [ ] Build binaries (`Do: test`)
- [ ] Download the binaries that have been generated in the dashboard results. They will be deleted within 24 hours.
- [ ] Remove explicit version forcing added in CMakeLists.txt and force push
- [ ] Remove explicit version forcing added in CMakeLists.txt, amend the commit, and force push
```
git add CMakeLists.txt
git commit --amend
......@@ -198,15 +199,16 @@ git gitlab-push -f
# Upload binaries
- Upload binaries to `paraview.org`
- [ ] `rsync -rptv $binaries paraview.release:ParaView_Release/vMAJOR.MINOR/`
- Upload binaries to `paraview.org` (`rsync -rptv $binaries paraview.release:ParaView_Release/vMAJOR.MINOR/`)
- [ ] Ask @chuck.atkins to sign macOS binary
- [ ] Ask @utkarsh.ayachit to regenerate `https://www.paraview.org/files/listing.txt` and `md5sum.txt`
- [ ] Regenerate `https://www.paraview.org/files/listing.txt` and `md5sum.txt`
```
buildListing.sh
updateMD5sum.sh vMAJOR.MINOR
```
- [ ] Test download links
- [ ] Test download links on https://www.paraview.org/download
<!--
If making a non-RC release:
......@@ -218,14 +220,15 @@ If making a non-RC release:
# Post-release
- [ ] Write and publish blog post with release notes.
- [ ] Write and publish blog post with release notes.
- [ ] Post an announcement in the Announcements category on
[discourse.paraview.org](https://discourse.paraview.org/).
<!--
These items only apply to non-RC releases.
If making a non-RC release:
- [ ] Update release notes
(https://www.paraview.org/Wiki/ParaView_Release_Notes)
- [ ] Move unclosed issues to next release milestone in GitLab
-->
/cc @ben.boeckel
......
Applications/ParaView/Testing/XML/CMakeLists.txt
View file @ 74fd1a6d
......@@ -104,6 +104,7 @@ SET (TESTS_WITHOUT_BASELINES
${CMAKE_CURRENT_SOURCE_DIR}/Preview.xml
${CMAKE_CURRENT_SOURCE_DIR}/SearchBox.xml
${CMAKE_CURRENT_SOURCE_DIR}/ServerConnectDialog.xml
${CMAKE_CURRENT_SOURCE_DIR}/SpreadSheetSelectedCellConnectivity.xml
${CMAKE_CURRENT_SOURCE_DIR}/StringInLineChartView.xml
${CMAKE_CURRENT_SOURCE_DIR}/TableHistogram.xml
${CMAKE_CURRENT_SOURCE_DIR}/TestCompositePropertyWidgetDecorator.xml
......@@ -836,7 +837,7 @@ if(PARAVIEW_SSH_SERVERS_TESTING)
set(${tname}_DISABLE_CS TRUE)
set(${tname}_DISABLE_CRS TRUE)
# The SSH tests should not be run in parallel to avoid port collision
set(${tname}_FORCE_SERIAL TRUE)
set(${tname}_FORCE_SERIAL TRUE)
endforeach()
endif(PARAVIEW_SSH_SERVERS_TESTING)
......
Applications/ParaView/Testing/XML/SpreadSheetSelectedCellConnectivity.xml 0 → 100644
View file @ 74fd1a6d
<?xml version="1.0" ?>
<pqevents>
<pqevent object="pqClientMainWindow/menubar" command="activate" arguments="menuSources" />
<pqevent object="pqClientMainWindow/menubar/menuSources/Alphabetical" command="activate" arguments="SphereSource" />
<pqevent object="pqClientMainWindow/propertiesDock/propertiesPanel/Accept" command="activate" arguments="" />
<pqevent object="pqClientMainWindow/centralwidget/MultiViewWidget/CoreWidget/qt_tabwidget_stackedwidget/MultiViewWidget1/Frame.0/SplitHorizontal" command="activate" arguments="" />
<pqevent object="pqClientMainWindow/centralwidget/MultiViewWidget/CoreWidget/qt_tabwidget_stackedwidget/MultiViewWidget1/Splitter.0/Frame.2/CentralWidgetFrame/EmptyView/scrollArea/qt_scrollarea_viewport/widgetFoo/ConvertActionsFrame/SpreadSheetView" command="activate" arguments="" />
<pqevent object="pqClientMainWindow/centralwidget/MultiViewWidget/CoreWidget/qt_tabwidget_stackedwidget/MultiViewWidget1/Splitter.0/Frame.2/CentralWidgetFrame/Viewport/pqSpreadSheetViewDecorator/Attribute" command="activated" arguments="Cell Data" />
<pqevent object="pqClientMainWindow/centralwidget/MultiViewWidget/CoreWidget/qt_tabwidget_stackedwidget/MultiViewWidget1/Splitter.0/Frame.2/CentralWidgetFrame/Viewport/pqSpreadSheetViewDecorator/ToggleCellConnectivity" command="set_boolean" arguments="true" />
<pqevent object="pqClientMainWindow/centralwidget/MultiViewWidget/CoreWidget/qt_tabwidget_stackedwidget/MultiViewWidget1/Splitter.0/Frame.2/CentralWidgetFrame/Viewport/1pqSpreadSheetViewWidget0" command="setCurrent" arguments="8.0" />
<pqevent object="pqClientMainWindow/centralwidget/MultiViewWidget/CoreWidget/qt_tabwidget_stackedwidget/MultiViewWidget1/Splitter.0/Frame.1/CentralWidgetFrame/Viewport" command="mousePress" arguments="(0.599483,0.121646,1,1,0)" />
<pqevent object="pqClientMainWindow/centralwidget/MultiViewWidget/CoreWidget/qt_tabwidget_stackedwidget/MultiViewWidget1/Splitter.0/Frame.1/CentralWidgetFrame/Viewport" command="mouseMove" arguments="(0.627907,0.60644,1,0,0)" />
<pqevent object="pqClientMainWindow/centralwidget/MultiViewWidget/CoreWidget/qt_tabwidget_stackedwidget/MultiViewWidget1/Splitter.0/Frame.1/CentralWidgetFrame/Viewport" command="mouseRelease" arguments="(0.627907,0.60644,1,0,0)" />
<pqevent object="pqClientMainWindow/centralwidget/MultiViewWidget/CoreWidget/qt_tabwidget_stackedwidget/MultiViewWidget1/Splitter.0/Frame.2/CentralWidgetFrame/Viewport/pqSpreadSheetViewDecorator/SelectionOnly" command="set_boolean" arguments="true" />
<pqcheck object="pqClientMainWindow/centralwidget/MultiViewWidget/CoreWidget/qt_tabwidget_stackedwidget/MultiViewWidget1/Splitter.0/Frame.2/CentralWidgetFrame/Viewport/1pqSpreadSheetViewWidget0" property="modelItemData" arguments="0.0,8" />
<pqevent object="pqClientMainWindow/centralwidget/MultiViewWidget/CoreWidget/qt_tabwidget_stackedwidget/MultiViewWidget1/Splitter.0/Frame.2/CentralWidgetFrame/Viewport/1pqSpreadSheetViewWidget0" command="setCurrent" arguments="0.0" />
<pqevent object="pqClientMainWindow/centralwidget/MultiViewWidget/CoreWidget/qt_tabwidget_stackedwidget/MultiViewWidget1/Splitter.0/Frame.2/CentralWidgetFrame/Viewport/1pqSpreadSheetViewWidget0" command="setCurrent" arguments="0.1" />
<pqcheck object="pqClientMainWindow/centralwidget/MultiViewWidget/CoreWidget/qt_tabwidget_stackedwidget/MultiViewWidget1/Splitter.0/Frame.2/CentralWidgetFrame/Viewport/1pqSpreadSheetViewWidget0" property="modelItemData" arguments="0.1,Triangle" />
<pqcheck object="pqClientMainWindow/centralwidget/MultiViewWidget/CoreWidget/qt_tabwidget_stackedwidget/MultiViewWidget1/Splitter.0/Frame.2/CentralWidgetFrame/Viewport/1pqSpreadSheetViewWidget0" property="modelItemData" arguments="0.2,7" />
<pqcheck object="pqClientMainWindow/centralwidget/MultiViewWidget/CoreWidget/qt_tabwidget_stackedwidget/MultiViewWidget1/Splitter.0/Frame.2/CentralWidgetFrame/Viewport/1pqSpreadSheetViewWidget0" property="modelItemData" arguments="0.3,1" />
<pqcheck object="pqClientMainWindow/centralwidget/MultiViewWidget/CoreWidget/qt_tabwidget_stackedwidget/MultiViewWidget1/Splitter.0/Frame.2/CentralWidgetFrame/Viewport/1pqSpreadSheetViewWidget0" property="modelItemData" arguments="0.4,13" />
<pqevent object="pqClientMainWindow/centralwidget/MultiViewWidget/CoreWidget/qt_tabwidget_stackedwidget/MultiViewWidget1/Splitter.0/Frame.2/Close" command="activate" arguments="" />
</pqevents>
ParaViewCore/VTKExtensions/Rendering/vtkAttributeDataToTableFilter.cxx
View file @ 74fd1a6d
......@@ -130,7 +130,7 @@ void vtkAttributeDataToTableFilter::AddCellTypeAndConnectivity(vtkTable* output,
if (this->GenerateCellConnectivity)
{
std::vector<vtkSmartPointer<vtkIdTypeArray> > indices;
std::vector<vtkSmartPointer<vtkIdTypeArray> > indices(maxpoints);
int w = 1 + log10(maxpoints);
for (vtkIdType i = 0; i < maxpoints; i++)
{
......
Plugins/AnalyzeNIfTIReaderWriter/vtkNIfTIReader.cxx
View file @ 74fd1a6d
......@@ -229,16 +229,22 @@ void vtkNIfTIReader::ExecuteInformation()
{
case 7:
numElts *= m_NiftiImage->nw;
VTK_FALLTHROUGH;
case 6:
numElts *= m_NiftiImage->nv;
VTK_FALLTHROUGH;
case 5:
numElts *= m_NiftiImage->nu;
VTK_FALLTHROUGH;
case 4:
numElts *= m_NiftiImage->nt;
VTK_FALLTHROUGH;
case 3:
numElts *= m_NiftiImage->nz;
VTK_FALLTHROUGH;
case 2:
numElts *= m_NiftiImage->ny;
VTK_FALLTHROUGH;
case 1:
numElts *= m_NiftiImage->nx;
break;
......
Qt/Components/pqSILWidget.cxx
View file @ 74fd1a6d
......@@ -167,10 +167,12 @@ void pqSILWidget::onModelReset()
tree->setModel(sortModel);
tree->expandAll();
auto helper = new pqTreeViewSelectionHelper(tree);
#if (QT_VERSION < QT_VERSION_CHECK(5, 10, 0))
#if (QT_VERSION >= QT_VERSION_CHECK(5, 10, 0))
new pqTreeViewSelectionHelper(tree);
#else
// disable filtering for older Qt version where recursive filtering
// on a tree is not supported.
auto helper = new pqTreeViewSelectionHelper(tree);
helper->setFilterable(false);
#endif
......