Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Copyright update #132

Closed
wants to merge 4 commits into from
Closed

Copyright update #132

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
70103b6
2006 copyright update
cadenmyers13 Jul 25, 2024
f59e8b9
2007 copyright update
cadenmyers13 Jul 25, 2024
60f9567
2008 copyright update
cadenmyers13 Jul 25, 2024
7ffcfa8
2009 update
cadenmyers13 Jul 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/diffpy/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
#
# diffpy by DANSE Diffraction group
# Simon J. L. Billinge
# (c) 2008 trustees of the Michigan State University.
# (c) 2008-2024 trustees of the Michigan State University.
# All rights reserved.
#
# File coded by: Pavol Juhas
Expand Down
2 changes: 1 addition & 1 deletion src/diffpy/pdfgui/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
#
# diffpy.pdfgui by DANSE Diffraction group
# Simon J. L. Billinge
# (c) 2006 trustees of the Michigan State University.
# (c) 2006-2024 trustees of the Michigan State University.
# All rights reserved.
#
# File coded by: Pavol Juhas
Expand Down
2 changes: 1 addition & 1 deletion src/diffpy/pdfgui/applications/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
#
# diffpy.pdfgui by DANSE Diffraction group
# Simon J. L. Billinge
# (c) 2009 Trustees of the Columbia University
# (c) 2009-2024 Trustees of the Columbia University
# in the City of New York. All rights reserved.
#
# File coded by: Pavol Juhas
Expand Down
2 changes: 1 addition & 1 deletion src/diffpy/pdfgui/applications/pdfgui.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
#
# PDFgui by DANSE Diffraction group
# Simon J. L. Billinge
# (c) 2006 trustees of the Michigan State University.
# (c) 2006-2024 trustees of the Michigan State University.
# All rights reserved.
#
# File coded by: Pavol Juhas
Expand Down
2 changes: 1 addition & 1 deletion src/diffpy/pdfgui/control/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
#
# PDFgui by DANSE Diffraction group
# Simon J. L. Billinge
# (c) 2006 trustees of the Michigan State University.
# (c) 2006-2024 trustees of the Michigan State University.
# All rights reserved.
#
# File coded by: Pavol Juhas
Expand Down
2 changes: 1 addition & 1 deletion src/diffpy/pdfgui/control/calculation.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
#
# PDFgui by DANSE Diffraction group
# Simon J. L. Billinge
# (c) 2006 trustees of the Michigan State University.
# (c) 2006-2024 trustees of the Michigan State University.
# All rights reserved.
#
# File coded by: Pavol Juhas, Jiwu Liu
Expand Down
2 changes: 1 addition & 1 deletion src/diffpy/pdfgui/control/constraint.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
#
# PDFgui by DANSE Diffraction group
# Simon J. L. Billinge
# (c) 2006 trustees of the Michigan State University.
# (c) 2006-2024 trustees of the Michigan State University.
# All rights reserved.
#
# File coded by: Pavol Juhas
Expand Down
2 changes: 1 addition & 1 deletion src/diffpy/pdfgui/control/controlerrors.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
#
# PDFgui by DANSE Diffraction group
# Simon J. L. Billinge
# (c) 2006 trustees of the Michigan State University.
# (c) 2006-2024 trustees of the Michigan State University.
# All rights reserved.
#
# File coded by: Jiwu Liu
Expand Down
2 changes: 1 addition & 1 deletion src/diffpy/pdfgui/control/fitdataset.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
#
# PDFgui by DANSE Diffraction group
# Simon J. L. Billinge
# (c) 2006 trustees of the Michigan State University.
# (c) 2006-2024 trustees of the Michigan State University.
# All rights reserved.
#
# File coded by: Pavol Juhas
Expand Down
2 changes: 1 addition & 1 deletion src/diffpy/pdfgui/control/fitting.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
#
# PDFgui by DANSE Diffraction group
# Simon J. L. Billinge
# (c) 2006 trustees of the Michigan State University.
# (c) 2006-2024 trustees of the Michigan State University.
# All rights reserved.
#
# File coded by: Jiwu Liu
Expand Down
2 changes: 1 addition & 1 deletion src/diffpy/pdfgui/control/parameter.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
#
# PDFgui by DANSE Diffraction group
# Simon J. L. Billinge
# (c) 2006 trustees of the Michigan State University.
# (c) 2006-2024 trustees of the Michigan State University.
# All rights reserved.
#
# File coded by: Pavol Juhas
Expand Down
2 changes: 1 addition & 1 deletion src/diffpy/pdfgui/control/pdfcomponent.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
#
# PDFgui by DANSE Diffraction group
# Simon J. L. Billinge
# (c) 2006 trustees of the Michigan State University.
# (c) 2006-2024 trustees of the Michigan State University.
# All rights reserved.
#
# File coded by: Jiwu Liu
Expand Down
2 changes: 1 addition & 1 deletion src/diffpy/pdfgui/control/pdfdataset.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
#
# PDFgui by DANSE Diffraction group
# Simon J. L. Billinge
# (c) 2006 trustees of the Michigan State University.
# (c) 2006-2024 trustees of the Michigan State University.
# All rights reserved.
#
# File coded by: Pavol Juhas
Expand Down
2 changes: 1 addition & 1 deletion src/diffpy/pdfgui/control/pdfguimacros.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
#
# PDFgui by DANSE Diffraction group
# Simon J. L. Billinge
# (c) 2006 trustees of the Michigan State University.
# (c) 2006-2024 trustees of the Michigan State University.
# All rights reserved.
#
# File coded by: Chris Farrow
Expand Down
2 changes: 1 addition & 1 deletion src/diffpy/pdfgui/control/pdflist.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
#
# PDFgui by DANSE Diffraction group
# Simon J. L. Billinge
# (c) 2006 trustees of the Michigan State University.
# (c) 2006-2024 trustees of the Michigan State University.
# All rights reserved.
#
# File coded by: Jiwu Liu
Expand Down
2 changes: 1 addition & 1 deletion src/diffpy/pdfgui/control/pdfstructure.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
#
# PDFgui by DANSE Diffraction group
# Simon J. L. Billinge
# (c) 2006 trustees of the Michigan State University.
# (c) 2006-2024 trustees of the Michigan State University.
# All rights reserved.
#
# File coded by: Pavol Juhas
Expand Down
2 changes: 1 addition & 1 deletion src/diffpy/pdfgui/control/structureviewer.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
#
# diffpy.pdfgui by DANSE Diffraction group
# Simon J. L. Billinge
# (c) 2009 Trustees of the Columbia University
# (c) 2009-2024 Trustees of the Columbia University
# in the City of New York. All rights reserved.
#
# File coded by: Pavol Juhas
Expand Down
2 changes: 1 addition & 1 deletion src/diffpy/pdfgui/gui/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
#
# PDFgui by DANSE Diffraction group
# Simon J. L. Billinge
# (c) 2006 trustees of the Michigan State University.
# (c) 2006-2024 trustees of the Michigan State University.
# All rights reserved.
#
# File coded by: Pavol Juhas
Expand Down
4 changes: 2 additions & 2 deletions src/diffpy/pdfgui/gui/aboutdialog.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
#
# PDFgui by DANSE Diffraction group
# Simon J. L. Billinge
# (c) 2006 trustees of the Michigan State University.
# (c) 2006-2024 trustees of the Michigan State University.
# All rights reserved.
#
# File coded by: Dmitriy Bryndin
Expand Down Expand Up @@ -233,7 +233,7 @@ def onColumbiaLogo(self, event): # wxGlade: DialogAbout.<event_handler>

# end of class DialogAbout

##### testing code ###########################################################
# testing code ###########################################################

if __name__ == "__main__":
app = wx.App()
Expand Down
2 changes: 1 addition & 1 deletion src/diffpy/pdfgui/gui/adddatapanel.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#
# PDFgui by DANSE Diffraction group
# Simon J. L. Billinge
# (c) 2006 trustees of the Michigan State University.
# (c) 2006-2024 trustees of the Michigan State University.
# All rights reserved.
#
# File coded by: Chris Farrow
Expand Down
2 changes: 1 addition & 1 deletion src/diffpy/pdfgui/gui/addphasepanel.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#
# PDFgui by DANSE Diffraction group
# Simon J. L. Billinge
# (c) 2006 trustees of the Michigan State University.
# (c) 2006-2024 trustees of the Michigan State University.
# All rights reserved.
#
# File coded by: Chris Farrow
Expand Down
2 changes: 1 addition & 1 deletion src/diffpy/pdfgui/gui/blankpanel.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
#
# PDFgui by DANSE Diffraction group
# Simon J. L. Billinge
# (c) 2006 trustees of the Michigan State University.
# (c) 2006-2024 trustees of the Michigan State University.
# All rights reserved.
#
# File coded by: Chris Farrow
Expand Down
2 changes: 1 addition & 1 deletion src/diffpy/pdfgui/gui/calculationpanel.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#
# PDFgui by DANSE Diffraction group
# Simon J. L. Billinge
# (c) 2006 trustees of the Michigan State University.
# (c) 2006-2024 trustees of the Michigan State University.
# All rights reserved.
#
# File coded by: Chris Farrow
Expand Down
2 changes: 1 addition & 1 deletion src/diffpy/pdfgui/gui/datasetconfigurepanel.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#
# PDFgui by DANSE Diffraction group
# Simon J. L. Billinge
# (c) 2006 trustees of the Michigan State University.
# (c) 2006-2024 trustees of the Michigan State University.
# All rights reserved.
#
# File coded by: Chris Farrow
Expand Down
2 changes: 1 addition & 1 deletion src/diffpy/pdfgui/gui/datasetconstraintpanel.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#
# PDFgui by DANSE Diffraction group
# Simon J. L. Billinge
# (c) 2006 trustees of the Michigan State University.
# (c) 2006-2024 trustees of the Michigan State University.
# All rights reserved.
#
# File coded by: Chris Farrow
Expand Down
2 changes: 1 addition & 1 deletion src/diffpy/pdfgui/gui/datasetpanel.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#
# PDFgui by DANSE Diffraction group
# Simon J. L. Billinge
# (c) 2006 trustees of the Michigan State University.
# (c) 2006-2024 trustees of the Michigan State University.
# All rights reserved.
#
# File coded by: Chris Farrow
Expand Down
2 changes: 1 addition & 1 deletion src/diffpy/pdfgui/gui/datasetresultspanel.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#
# PDFgui by DANSE Diffraction group
# Simon J. L. Billinge
# (c) 2006 trustees of the Michigan State University.
# (c) 2006-2024 trustees of the Michigan State University.
# All rights reserved.
#
# File coded by: Chris Farrow
Expand Down
2 changes: 1 addition & 1 deletion src/diffpy/pdfgui/gui/debugoptions.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
#
# PDFgui by DANSE Diffraction group
# Simon J. L. Billinge
# (c) 2006 trustees of the Michigan State University.
# (c) 2006-2024 trustees of the Michigan State University.
# All rights reserved.
#
# File coded by: Pavol Juhas
Expand Down
2 changes: 1 addition & 1 deletion src/diffpy/pdfgui/gui/fitnotebookpanel.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#
# PDFgui by DANSE Diffraction group
# Simon J. L. Billinge
# (c) 2006 trustees of the Michigan State University.
# (c) 2006-2024 trustees of the Michigan State University.
# All rights reserved.
#
# File coded by: Chris Farrow
Expand Down
2 changes: 1 addition & 1 deletion src/diffpy/pdfgui/gui/insertrowsdialog.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#
# PDFgui by DANSE Diffraction group
# Simon J. L. Billinge
# (c) 2006 trustees of the Michigan State University.
# (c) 2006-2024 trustees of the Michigan State University.
# All rights reserved.
#
# File coded by: Dmitriy Bryndin
Expand Down
2 changes: 1 addition & 1 deletion src/diffpy/pdfgui/gui/journalpanel.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#
# PDFgui by DANSE Diffraction group
# Simon J. L. Billinge
# (c) 2006 trustees of the Michigan State University.
# (c) 2006-2024 trustees of the Michigan State University.
# All rights reserved.
#
# File coded by: Chris Farrow
Expand Down
2 changes: 1 addition & 1 deletion src/diffpy/pdfgui/gui/main.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#
# PDFgui by DANSE Diffraction group
# Simon J. L. Billinge
# (c) 2006 trustees of the Michigan State University.
# (c) 2006-2024 trustees of the Michigan State University.
# All rights reserved.
#
# File coded by: Chris Farrow
Expand Down
2 changes: 1 addition & 1 deletion src/diffpy/pdfgui/gui/outputpanel.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#
# PDFgui by DANSE Diffraction group
# Simon J. L. Billinge
# (c) 2007 trustees of the Michigan State University.
# (c) 2007-2024 trustees of the Michigan State University.
# All rights reserved.
#
# File coded by: Jiwu Liu, Chris Farrow
Expand Down
2 changes: 1 addition & 1 deletion src/diffpy/pdfgui/gui/paneltest.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#
# PDFgui by DANSE Diffraction group
# Simon J. L. Billinge
# (c) 2006 trustees of the Michigan State University.
# (c) 2006-2024 trustees of the Michigan State University.
# All rights reserved.
#
# File coded by: Chris Farrow
Expand Down
2 changes: 1 addition & 1 deletion src/diffpy/pdfgui/gui/pdfpanel.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
#
# PDFgui by DANSE Diffraction group
# Simon J. L. Billinge
# (c) 2006 trustees of the Michigan State University.
# (c) 2006-2024 trustees of the Michigan State University.
# All rights reserved.
#
# File coded by: Chris Farrow, Dmitriy Bryndin
Expand Down
13 changes: 7 additions & 6 deletions src/diffpy/pdfgui/gui/phaseconstraintspanel.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@
#
# PDFgui by DANSE Diffraction group
# Simon J. L. Billinge
# (c) 2006 trustees of the Michigan State University.
# (c) 2006-2024 trustees of the Michigan State University.

# All rights reserved.
#
# File coded by: Chris Farrow, Dmitriy Bryndin
Expand Down Expand Up @@ -314,7 +315,7 @@ def refresh(self):

self.refreshTextCtrls()

### update the grid ###
# update the grid ##########
natoms = len(self.structure)
nrows = self.gridAtoms.GetNumberRows()
self.gridAtoms.BeginBatch()
Expand All @@ -339,7 +340,7 @@ def refresh(self):
if not m:
continue
barevar = m.group(1)
if not barevar in bareAtomVarColumn:
if barevar not in bareAtomVarColumn:
continue
column = bareAtomVarColumn[barevar]
row = int(m.group(2)) - 1
Expand All @@ -348,7 +349,7 @@ def refresh(self):
raise ControlValueError(emsg)
self.gridAtoms.SetCellValue(row, column, con.formula)
barevar = re.sub(r"\(\d+\)$", "", var)
if not barevar in bareAtomVarColumn:
if barevar not in bareAtomVarColumn:
continue

self.gridAtoms.AutosizeLabels()
Expand Down Expand Up @@ -554,12 +555,12 @@ def onKey(self, event):
self.mainFrame.needsSave()

# Can't get these to work. Maybe later.
## Copy - Ctrl+C / Ctrl+Insert
# Copy - Ctrl+C / Ctrl+Insert
# if event.ControlDown() and (key == 67 or key == wx.WXK_INSERT):
# if phasepanelutils.canCopySelectedCells(self):
# phasepanelutils.copySelectedCells(self)

## Paste - Ctrl+V / Shift+Insert
# Paste - Ctrl+V / Shift+Insert
# if (event.ControlDown() and key == 86) or\
# (event.ShiftDown() and key == wx.WXK_INSERT):
# if phasepanelutils.canPasteIntoCells(self):
Expand Down
2 changes: 1 addition & 1 deletion src/diffpy/pdfgui/gui/phasenotebookpanel.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
#
# PDFgui by DANSE Diffraction group
# Simon J. L. Billinge
# (c) 2006 trustees of the Michigan State University.
# (c) 2006-2024 trustees of the Michigan State University.
# All rights reserved.
#
# File coded by: Dmitriy Bryndin
Expand Down
2 changes: 1 addition & 1 deletion src/diffpy/pdfgui/gui/phaseresultspanel.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#
# PDFgui by DANSE Diffraction group
# Simon J. L. Billinge
# (c) 2006 trustees of the Michigan State University.
# (c) 2006-2024 trustees of the Michigan State University.
# All rights reserved.
#
# File coded by: Chris Farrow, Dmitriy Bryndin
Expand Down
Loading
Loading