Skip to content

Commit

Permalink
Merge branch 'dev' of github.com:freesurfer/freesurfer into dev
Browse files Browse the repository at this point in the history
  • Loading branch information
@brf2
brf2 committed Mar 22, 2021
2 parents 69ff6f8 + d4357dd commit 1248623
Show file tree
Hide file tree
Showing 2,404 changed files with 5,548 additions and 4,731 deletions.
4 changes: 4 additions & 0 deletions .travis.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,10 @@ cache:
- apt
- ccache

branches:
except:
- /^dev_nightly_.*/

matrix:
include:
- os: linux
Expand Down
1 change: 1 addition & 0 deletions CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -364,6 +364,7 @@ add_subdirectories(
AntsDenoiseImageFs
AntsN4BiasFieldCorrectionFs
lta_convert
io
mri_and
mri_add_xform_to_header
mri_annotation2label
Expand Down
2 changes: 1 addition & 1 deletion cnn_sphere_register/warp_pad.c
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
*
* Copyright © 2011 The General Hospital Corporation (Boston, MA) "MGH"
* Copyright © 2021 The General Hospital Corporation (Boston, MA) "MGH"
*
* Terms and conditions for use, reproduction, distribution and contribution
* are found in the 'FreeSurfer Software License Agreement' contained
Expand Down
2 changes: 1 addition & 1 deletion distribution/docs/license.freesurfer_SLA.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -162,4 +162,4 @@ PART C. MISCELLANEOUS
This Agreement shall be governed by and construed in accordance with the
laws of The Commonwealth of Massachusetts without regard to principles of
conflicts of law. This Agreement shall supercede and replace any license
terms that you may have agreed to previously with respect to FreeSurfer.
terms that you may have agreed to previously with respect to FreeSurfer.
2 changes: 1 addition & 1 deletion dmri_poistats/dmri_poistats.cxx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
* $Date $
* $Revision $
*
* Copyright © 2011 The General Hospital Corporation (Boston, MA) "MGH"
* Copyright © 2021 The General Hospital Corporation (Boston, MA) "MGH"
*
* Terms and conditions for use, reproduction, distribution and contribution
* are found in the 'FreeSurfer Software License Agreement' contained
Expand Down
2 changes: 1 addition & 1 deletion dngtester/dngtester.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
/*
* Original Author: Doug Greve
*
* Copyright © 2011 The General Hospital Corporation (Boston, MA) "MGH"
* Copyright © 2021 The General Hospital Corporation (Boston, MA) "MGH"
*
* Terms and conditions for use, reproduction, distribution and contribution
* are found in the 'FreeSurfer Software License Agreement' contained
Expand Down
2 changes: 1 addition & 1 deletion freeview/Annotation2D.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
/*
* Original Author: Ruopeng Wang
*
* Copyright © 2011 The General Hospital Corporation (Boston, MA) "MGH"
* Copyright © 2021 The General Hospital Corporation (Boston, MA) "MGH"
*
* Terms and conditions for use, reproduction, distribution and contribution
* are found in the 'FreeSurfer Software License Agreement' contained
Expand Down
2 changes: 1 addition & 1 deletion freeview/Annotation2D.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
/*
* Original Author: Ruopeng Wang
*
* Copyright © 2011 The General Hospital Corporation (Boston, MA) "MGH"
* Copyright © 2021 The General Hospital Corporation (Boston, MA) "MGH"
*
* Terms and conditions for use, reproduction, distribution and contribution
* are found in the 'FreeSurfer Software License Agreement' contained
Expand Down
2 changes: 1 addition & 1 deletion freeview/BrushProperty.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
/*
* Original Author: Ruopeng Wang
*
* Copyright © 2011 The General Hospital Corporation (Boston, MA) "MGH"
* Copyright © 2021 The General Hospital Corporation (Boston, MA) "MGH"
*
* Terms and conditions for use, reproduction, distribution and contribution
* are found in the 'FreeSurfer Software License Agreement' contained
Expand Down
2 changes: 1 addition & 1 deletion freeview/BrushProperty.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
/*
* Original Author: Ruopeng Wang
*
* Copyright © 2011 The General Hospital Corporation (Boston, MA) "MGH"
* Copyright © 2021 The General Hospital Corporation (Boston, MA) "MGH"
*
* Terms and conditions for use, reproduction, distribution and contribution
* are found in the 'FreeSurfer Software License Agreement' contained
Expand Down
2 changes: 1 addition & 1 deletion freeview/CommandEdit.cpp
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
* Original Author: Ruopeng Wang
*
* Copyright © 2011 The General Hospital Corporation (Boston, MA) "MGH"
* Copyright © 2021 The General Hospital Corporation (Boston, MA) "MGH"
*
* Terms and conditions for use, reproduction, distribution and contribution
* are found in the 'FreeSurfer Software License Agreement' contained
Expand Down
2 changes: 1 addition & 1 deletion freeview/CommandEdit.h
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
* Original Author: Ruopeng Wang
*
* Copyright © 2011 The General Hospital Corporation (Boston, MA) "MGH"
* Copyright © 2021 The General Hospital Corporation (Boston, MA) "MGH"
*
* Terms and conditions for use, reproduction, distribution and contribution
* are found in the 'FreeSurfer Software License Agreement' contained
Expand Down
2 changes: 1 addition & 1 deletion freeview/CommonDataStruct.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
/*
* Original Author: Ruopeng Wang
*
* Copyright © 2011 The General Hospital Corporation (Boston, MA) "MGH"
* Copyright © 2021 The General Hospital Corporation (Boston, MA) "MGH"
*
* Terms and conditions for use, reproduction, distribution and contribution
* are found in the 'FreeSurfer Software License Agreement' contained
Expand Down
2 changes: 1 addition & 1 deletion freeview/Contour2D.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
/*
* Original Author: Ruopeng Wang
*
* Copyright © 2011 The General Hospital Corporation (Boston, MA) "MGH"
* Copyright © 2021 The General Hospital Corporation (Boston, MA) "MGH"
*
* Terms and conditions for use, reproduction, distribution and contribution
* are found in the 'FreeSurfer Software License Agreement' contained
Expand Down
2 changes: 1 addition & 1 deletion freeview/Contour2D.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
/*
* Original Author: Ruopeng Wang
*
* Copyright © 2011 The General Hospital Corporation (Boston, MA) "MGH"
* Copyright © 2021 The General Hospital Corporation (Boston, MA) "MGH"
*
* Terms and conditions for use, reproduction, distribution and contribution
* are found in the 'FreeSurfer Software License Agreement' contained
Expand Down
2 changes: 1 addition & 1 deletion freeview/Cursor2D.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
/*
* Original Author: Ruopeng Wang
*
* Copyright © 2011 The General Hospital Corporation (Boston, MA) "MGH"
* Copyright © 2021 The General Hospital Corporation (Boston, MA) "MGH"
*
* Terms and conditions for use, reproduction, distribution and contribution
* are found in the 'FreeSurfer Software License Agreement' contained
Expand Down
2 changes: 1 addition & 1 deletion freeview/Cursor2D.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
/*
* Original Author: Ruopeng Wang
*
* Copyright © 2011 The General Hospital Corporation (Boston, MA) "MGH"
* Copyright © 2021 The General Hospital Corporation (Boston, MA) "MGH"
*
* Terms and conditions for use, reproduction, distribution and contribution
* are found in the 'FreeSurfer Software License Agreement' contained
Expand Down
2 changes: 1 addition & 1 deletion freeview/Cursor3D.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
/*
* Original Author: Ruopeng Wang
*
* Copyright © 2011 The General Hospital Corporation (Boston, MA) "MGH"
* Copyright © 2021 The General Hospital Corporation (Boston, MA) "MGH"
*
* Terms and conditions for use, reproduction, distribution and contribution
* are found in the 'FreeSurfer Software License Agreement' contained
Expand Down
2 changes: 1 addition & 1 deletion freeview/Cursor3D.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
/*
* Original Author: Ruopeng Wang
*
* Copyright © 2011 The General Hospital Corporation (Boston, MA) "MGH"
* Copyright © 2021 The General Hospital Corporation (Boston, MA) "MGH"
*
* Terms and conditions for use, reproduction, distribution and contribution
* are found in the 'FreeSurfer Software License Agreement' contained
Expand Down
2 changes: 1 addition & 1 deletion freeview/CursorFactory.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
/*
* Original Author: Ruopeng Wang
*
* Copyright © 2011 The General Hospital Corporation (Boston, MA) "MGH"
* Copyright © 2021 The General Hospital Corporation (Boston, MA) "MGH"
*
* Terms and conditions for use, reproduction, distribution and contribution
* are found in the 'FreeSurfer Software License Agreement' contained
Expand Down
2 changes: 1 addition & 1 deletion freeview/CursorFactory.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
/*
* Original Author: Ruopeng Wang
*
* Copyright © 2011 The General Hospital Corporation (Boston, MA) "MGH"
* Copyright © 2021 The General Hospital Corporation (Boston, MA) "MGH"
*
* Terms and conditions for use, reproduction, distribution and contribution
* are found in the 'FreeSurfer Software License Agreement' contained
Expand Down
2 changes: 1 addition & 1 deletion freeview/DialogAbout.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
/*
* Original Author: Ruopeng Wang
*
* Copyright © 2011 The General Hospital Corporation (Boston, MA) "MGH"
* Copyright © 2021 The General Hospital Corporation (Boston, MA) "MGH"
*
* Terms and conditions for use, reproduction, distribution and contribution
* are found in the 'FreeSurfer Software License Agreement' contained
Expand Down
2 changes: 1 addition & 1 deletion freeview/DialogAbout.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
/*
* Original Author: Ruopeng Wang
*
* Copyright © 2011 The General Hospital Corporation (Boston, MA) "MGH"
* Copyright © 2021 The General Hospital Corporation (Boston, MA) "MGH"
*
* Terms and conditions for use, reproduction, distribution and contribution
* are found in the 'FreeSurfer Software License Agreement' contained
Expand Down
2 changes: 1 addition & 1 deletion freeview/DialogCropVolume.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
/*
* Original Author: Ruopeng Wang
*
* Copyright © 2011 The General Hospital Corporation (Boston, MA) "MGH"
* Copyright © 2021 The General Hospital Corporation (Boston, MA) "MGH"
*
* Terms and conditions for use, reproduction, distribution and contribution
* are found in the 'FreeSurfer Software License Agreement' contained
Expand Down
2 changes: 1 addition & 1 deletion freeview/DialogCropVolume.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
/*
* Original Author: Ruopeng Wang
*
* Copyright © 2011 The General Hospital Corporation (Boston, MA) "MGH"
* Copyright © 2021 The General Hospital Corporation (Boston, MA) "MGH"
*
* Terms and conditions for use, reproduction, distribution and contribution
* are found in the 'FreeSurfer Software License Agreement' contained
Expand Down
2 changes: 1 addition & 1 deletion freeview/DialogGradientFilter.cpp
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
* Original Author: Ruopeng Wang
*
* Copyright © 2011 The General Hospital Corporation (Boston, MA) "MGH"
* Copyright © 2021 The General Hospital Corporation (Boston, MA) "MGH"
*
* Terms and conditions for use, reproduction, distribution and contribution
* are found in the 'FreeSurfer Software License Agreement' contained
Expand Down
2 changes: 1 addition & 1 deletion freeview/DialogGradientFilter.h
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
* Original Author: Ruopeng Wang
*
* Copyright © 2011 The General Hospital Corporation (Boston, MA) "MGH"
* Copyright © 2021 The General Hospital Corporation (Boston, MA) "MGH"
*
* Terms and conditions for use, reproduction, distribution and contribution
* are found in the 'FreeSurfer Software License Agreement' contained
Expand Down
2 changes: 1 addition & 1 deletion freeview/DialogLoadDTI.cpp
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
* Original Author: Ruopeng Wang
*
* Copyright © 2011 The General Hospital Corporation (Boston, MA) "MGH"
* Copyright © 2021 The General Hospital Corporation (Boston, MA) "MGH"
*
* Terms and conditions for use, reproduction, distribution and contribution
* are found in the 'FreeSurfer Software License Agreement' contained
Expand Down
2 changes: 1 addition & 1 deletion freeview/DialogLoadDTI.h
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
* Original Author: Ruopeng Wang
*
* Copyright © 2011 The General Hospital Corporation (Boston, MA) "MGH"
* Copyright © 2021 The General Hospital Corporation (Boston, MA) "MGH"
*
* Terms and conditions for use, reproduction, distribution and contribution
* are found in the 'FreeSurfer Software License Agreement' contained
Expand Down
2 changes: 1 addition & 1 deletion freeview/DialogLoadPointSet.cpp
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
* Original Author: Ruopeng Wang
*
* Copyright © 2011 The General Hospital Corporation (Boston, MA) "MGH"
* Copyright © 2021 The General Hospital Corporation (Boston, MA) "MGH"
*
* Terms and conditions for use, reproduction, distribution and contribution
* are found in the 'FreeSurfer Software License Agreement' contained
Expand Down
2 changes: 1 addition & 1 deletion freeview/DialogLoadPointSet.h
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
* Original Author: Ruopeng Wang
*
* Copyright © 2011 The General Hospital Corporation (Boston, MA) "MGH"
* Copyright © 2021 The General Hospital Corporation (Boston, MA) "MGH"
*
* Terms and conditions for use, reproduction, distribution and contribution
* are found in the 'FreeSurfer Software License Agreement' contained
Expand Down
12 changes: 9 additions & 3 deletions freeview/DialogLoadVolume.cpp
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
* Original Author: Ruopeng Wang
*
* Copyright © 2011 The General Hospital Corporation (Boston, MA) "MGH"
* Copyright © 2021 The General Hospital Corporation (Boston, MA) "MGH"
*
* Terms and conditions for use, reproduction, distribution and contribution
* are found in the 'FreeSurfer Software License Agreement' contained
Expand Down Expand Up @@ -61,8 +61,13 @@ void DialogLoadVolume::UpdateLUT()

void DialogLoadVolume::OnOpen()
{
QString fn = ui->comboBoxFilenames->currentText().trimmed();
if (fn == "current folder")
fn = QDir::currentPath();
else
fn = QFileInfo(fn).absolutePath();
QStringList filenames = QFileDialog::getOpenFileNames( this, "Select volume files",
MainWindow::AutoSelectLastDir( m_strLastDir, "mri" ),
fn, // MainWindow::AutoSelectLastDir( m_strLastDir, "mri" ),
"Volume files (*.mgz *.mgh *.nii *.nii.gz *.img *.mnc);;All files (*)");
if ( !filenames.isEmpty() )
{
Expand Down Expand Up @@ -96,6 +101,7 @@ void DialogLoadVolume::SetRecentFiles( const QStringList& filenames )
{
fns[i] = MyUtils::Win32PathProof(fns[i]);
}
fns.insert(0, "current folder");
ui->comboBoxFilenames->clear();
ui->comboBoxFilenames->addItems( fns );
if ( !filenames.isEmpty() )
Expand Down Expand Up @@ -184,7 +190,7 @@ QString DialogLoadVolume::GetLUT()

void DialogLoadVolume::OnOK()
{
if ( GetVolumeFileNames().isEmpty() )
if ( GetVolumeFileNames().isEmpty() || ui->comboBoxFilenames->currentText().trimmed() == "current folder")
{
QMessageBox::warning( this, "Error", "Please specify volume file to load.");
return;
Expand Down
2 changes: 1 addition & 1 deletion freeview/DialogLoadVolume.h
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
* Original Author: Ruopeng Wang
*
* Copyright © 2011 The General Hospital Corporation (Boston, MA) "MGH"
* Copyright © 2021 The General Hospital Corporation (Boston, MA) "MGH"
*
* Terms and conditions for use, reproduction, distribution and contribution
* are found in the 'FreeSurfer Software License Agreement' contained
Expand Down
2 changes: 1 addition & 1 deletion freeview/DialogNewPointSet.cpp
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
* Original Author: Ruopeng Wang
*
* Copyright © 2011 The General Hospital Corporation (Boston, MA) "MGH"
* Copyright © 2021 The General Hospital Corporation (Boston, MA) "MGH"
*
* Terms and conditions for use, reproduction, distribution and contribution
* are found in the 'FreeSurfer Software License Agreement' contained
Expand Down
2 changes: 1 addition & 1 deletion freeview/DialogNewPointSet.h
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
* Original Author: Ruopeng Wang
*
* Copyright © 2011 The General Hospital Corporation (Boston, MA) "MGH"
* Copyright © 2021 The General Hospital Corporation (Boston, MA) "MGH"
*
* Terms and conditions for use, reproduction, distribution and contribution
* are found in the 'FreeSurfer Software License Agreement' contained
Expand Down
2 changes: 1 addition & 1 deletion freeview/DialogNewROI.cpp
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
* Original Author: Ruopeng Wang
*
* Copyright © 2011 The General Hospital Corporation (Boston, MA) "MGH"
* Copyright © 2021 The General Hospital Corporation (Boston, MA) "MGH"
*
* Terms and conditions for use, reproduction, distribution and contribution
* are found in the 'FreeSurfer Software License Agreement' contained
Expand Down
2 changes: 1 addition & 1 deletion freeview/DialogNewROI.h
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
* Original Author: Ruopeng Wang
*
* Copyright © 2011 The General Hospital Corporation (Boston, MA) "MGH"
* Copyright © 2021 The General Hospital Corporation (Boston, MA) "MGH"
*
* Terms and conditions for use, reproduction, distribution and contribution
* are found in the 'FreeSurfer Software License Agreement' contained
Expand Down
2 changes: 1 addition & 1 deletion freeview/DialogNewVolume.cpp
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
* Original Author: Ruopeng Wang
*
* Copyright © 2011 The General Hospital Corporation (Boston, MA) "MGH"
* Copyright © 2021 The General Hospital Corporation (Boston, MA) "MGH"
*
* Terms and conditions for use, reproduction, distribution and contribution
* are found in the 'FreeSurfer Software License Agreement' contained
Expand Down
2 changes: 1 addition & 1 deletion freeview/DialogNewVolume.h
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
* Original Author: Ruopeng Wang
*
* Copyright © 2011 The General Hospital Corporation (Boston, MA) "MGH"
* Copyright © 2021 The General Hospital Corporation (Boston, MA) "MGH"
*
* Terms and conditions for use, reproduction, distribution and contribution
* are found in the 'FreeSurfer Software License Agreement' contained
Expand Down
2 changes: 1 addition & 1 deletion freeview/DialogPreferences.cpp
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
* Original Author: Ruopeng Wang
*
* Copyright © 2011 The General Hospital Corporation (Boston, MA) "MGH"
* Copyright © 2021 The General Hospital Corporation (Boston, MA) "MGH"
*
* Terms and conditions for use, reproduction, distribution and contribution
* are found in the 'FreeSurfer Software License Agreement' contained
Expand Down
2 changes: 1 addition & 1 deletion freeview/DialogPreferences.h
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
* Original Author: Ruopeng Wang
*
* Copyright © 2011 The General Hospital Corporation (Boston, MA) "MGH"
* Copyright © 2021 The General Hospital Corporation (Boston, MA) "MGH"
*
* Terms and conditions for use, reproduction, distribution and contribution
* are found in the 'FreeSurfer Software License Agreement' contained
Expand Down
Loading

0 comments on commit 1248623

Please sign in to comment.