Skip to content

Commit

Permalink
Replace deprecated NavigationToolbar2TkAgg with NavigationToolbar2Tk
Browse files Browse the repository at this point in the history
This deprecated class was removed in Matplotlib version 3.0.0
  • Loading branch information
mattachu committed Apr 14, 2020
1 parent 30526d0 commit 6d7e9ce
Show file tree
Hide file tree
Showing 5 changed files with 19 additions and 19 deletions.
10 changes: 5 additions & 5 deletions GUI/src/ImpactTPlot.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
import tkinter as tk
from tkinter import ttk,filedialog
import time,os,sys
from matplotlib.backends.backend_tkagg import FigureCanvasTkAgg, NavigationToolbar2TkAgg
from matplotlib.backends.backend_tkagg import FigureCanvasTkAgg, NavigationToolbar2Tk
from matplotlib.figure import Figure
from matplotlib.ticker import MultipleLocator, FormatStrFormatter
from scipy.stats import gaussian_kde
Expand Down Expand Up @@ -344,7 +344,7 @@ def __init__(self, parent):
self.canvas.show()
self.canvas.get_tk_widget().pack(side=tk.BOTTOM, fill=tk.BOTH, expand=True)

self.toolbar = NavigationToolbar2TkAgg(self.canvas, self)
self.toolbar = NavigationToolbar2Tk(self.canvas, self)
self.toolbar.update()
self.canvas._tkcanvas.pack(side=tk.TOP, fill=tk.BOTH, expand=True)

Expand Down Expand Up @@ -400,7 +400,7 @@ def __init__(self, parent,PlotFileName,xl,yl,labelY):
canvas.show()
canvas.get_tk_widget().pack(side=tk.BOTTOM, fill=tk.BOTH, expand=True)

toolbar = NavigationToolbar2TkAgg(canvas, self)
toolbar = NavigationToolbar2Tk(canvas, self)
toolbar.update()
canvas._tkcanvas.pack(side=tk.TOP, fill=tk.BOTH, expand=True)

Expand All @@ -422,7 +422,7 @@ def __init__(self, parent):
self.canvas.show()
self.canvas.get_tk_widget().pack(side=tk.BOTTOM, fill=tk.BOTH, expand=True)

self.toolbar = NavigationToolbar2TkAgg(self.canvas, self)
self.toolbar = NavigationToolbar2Tk(self.canvas, self)
self.toolbar.update()
self.canvas._tkcanvas.pack(side=tk.TOP, fill=tk.BOTH, expand=True)

Expand Down Expand Up @@ -652,7 +652,7 @@ def __init__(self, parent, PlotFileName):
self.canvas.show()
self.canvas.get_tk_widget().pack(side=tk.BOTTOM, fill=tk.BOTH, expand=True)

self.toolbar = NavigationToolbar2TkAgg(self.canvas, self)
self.toolbar = NavigationToolbar2Tk(self.canvas, self)
self.toolbar.update()
self.canvas._tkcanvas.pack(side=tk.TOP, fill=tk.BOTH, expand=True)

Expand Down
10 changes: 5 additions & 5 deletions GUI/src/ImpactZPlot.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
import tkinter as tk
from tkinter import ttk,filedialog
import time,os,sys
from matplotlib.backends.backend_tkagg import FigureCanvasTkAgg, NavigationToolbar2TkAgg
from matplotlib.backends.backend_tkagg import FigureCanvasTkAgg, NavigationToolbar2Tk
from matplotlib.figure import Figure
from matplotlib.ticker import MultipleLocator, FormatStrFormatter

Expand Down Expand Up @@ -320,7 +320,7 @@ def __init__(self, parent):
self.canvas.show()
self.canvas.get_tk_widget().pack(side=tk.BOTTOM, fill=tk.BOTH, expand=True)

self.toolbar = NavigationToolbar2TkAgg(self.canvas, self)
self.toolbar = NavigationToolbar2Tk(self.canvas, self)
self.toolbar.update()
self.canvas._tkcanvas.pack(side=tk.TOP, fill=tk.BOTH, expand=True)

Expand Down Expand Up @@ -374,7 +374,7 @@ def __init__(self, parent,PlotFileName,xl,yl,labelY):
canvas.show()
canvas.get_tk_widget().pack(side=tk.BOTTOM, fill=tk.BOTH, expand=True)

toolbar = NavigationToolbar2TkAgg(canvas, self)
toolbar = NavigationToolbar2Tk(canvas, self)
toolbar.update()
canvas._tkcanvas.pack(side=tk.TOP, fill=tk.BOTH, expand=True)

Expand All @@ -396,7 +396,7 @@ def __init__(self, parent):
self.canvas.show()
self.canvas.get_tk_widget().pack(side=tk.BOTTOM, fill=tk.BOTH, expand=True)

self.toolbar = NavigationToolbar2TkAgg(self.canvas, self)
self.toolbar = NavigationToolbar2Tk(self.canvas, self)
self.toolbar.update()
self.canvas._tkcanvas.pack(side=tk.TOP, fill=tk.BOTH, expand=True)

Expand Down Expand Up @@ -621,7 +621,7 @@ def __init__(self, parent, PlotFileName):
self.canvas.show()
self.canvas.get_tk_widget().pack(side=tk.BOTTOM, fill=tk.BOTH, expand=True)

self.toolbar = NavigationToolbar2TkAgg(self.canvas, self)
self.toolbar = NavigationToolbar2Tk(self.canvas, self)
self.toolbar.update()
self.canvas._tkcanvas.pack(side=tk.TOP, fill=tk.BOTH, expand=True)

Expand Down
10 changes: 5 additions & 5 deletions GUI/src/ImpactZPlotold.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
import tkinter as tk
from tkinter import ttk,filedialog
import time,os,sys
from matplotlib.backends.backend_tkagg import FigureCanvasTkAgg, NavigationToolbar2TkAgg
from matplotlib.backends.backend_tkagg import FigureCanvasTkAgg, NavigationToolbar2Tk
from matplotlib.figure import Figure
from matplotlib.ticker import MultipleLocator, FormatStrFormatter

Expand Down Expand Up @@ -321,7 +321,7 @@ def __init__(self, parent):
self.canvas.show()
self.canvas.get_tk_widget().pack(side=tk.BOTTOM, fill=tk.BOTH, expand=True)

self.toolbar = NavigationToolbar2TkAgg(self.canvas, self)
self.toolbar = NavigationToolbar2Tk(self.canvas, self)
self.toolbar.update()
self.canvas._tkcanvas.pack(side=tk.TOP, fill=tk.BOTH, expand=True)

Expand Down Expand Up @@ -375,7 +375,7 @@ def __init__(self, parent,PlotFileName,xl,yl,labelY):
canvas.show()
canvas.get_tk_widget().pack(side=tk.BOTTOM, fill=tk.BOTH, expand=True)

toolbar = NavigationToolbar2TkAgg(canvas, self)
toolbar = NavigationToolbar2Tk(canvas, self)
toolbar.update()
canvas._tkcanvas.pack(side=tk.TOP, fill=tk.BOTH, expand=True)

Expand All @@ -397,7 +397,7 @@ def __init__(self, parent):
self.canvas.show()
self.canvas.get_tk_widget().pack(side=tk.BOTTOM, fill=tk.BOTH, expand=True)

self.toolbar = NavigationToolbar2TkAgg(self.canvas, self)
self.toolbar = NavigationToolbar2Tk(self.canvas, self)
self.toolbar.update()
self.canvas._tkcanvas.pack(side=tk.TOP, fill=tk.BOTH, expand=True)

Expand Down Expand Up @@ -622,7 +622,7 @@ def __init__(self, parent, PlotFileName):
self.canvas.show()
self.canvas.get_tk_widget().pack(side=tk.BOTTOM, fill=tk.BOTH, expand=True)

self.toolbar = NavigationToolbar2TkAgg(self.canvas, self)
self.toolbar = NavigationToolbar2Tk(self.canvas, self)
self.toolbar.update()
self.canvas._tkcanvas.pack(side=tk.TOP, fill=tk.BOTH, expand=True)

Expand Down
4 changes: 2 additions & 2 deletions GUI/src/ParticlePlot.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
matplotlib.use('TkAgg')
import matplotlib.pyplot as plt

from matplotlib.backends.backend_tkagg import FigureCanvasTkAgg, NavigationToolbar2TkAgg
from matplotlib.backends.backend_tkagg import FigureCanvasTkAgg, NavigationToolbar2Tk
from matplotlib.figure import Figure
from matplotlib.ticker import MultipleLocator, FormatStrFormatter
from scipy.stats import gaussian_kde
Expand Down Expand Up @@ -150,7 +150,7 @@ def __init__(self, parent, PlotFileName,scaling,TorZ):
self.canvas.show()
self.canvas.get_tk_widget().pack(side=tk.BOTTOM, fill=tk.BOTH, expand=True)

self.toolbar = NavigationToolbar2TkAgg(self.canvas, self)
self.toolbar = NavigationToolbar2Tk(self.canvas, self)
self.toolbar.update()
self.canvas._tkcanvas.pack(side=tk.TOP, fill=tk.BOTH, expand=True)

Expand Down
4 changes: 2 additions & 2 deletions GUI/src/SlicePlot.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
import matplotlib.pyplot as plt

import time,os,sys
from matplotlib.backends.backend_tkagg import FigureCanvasTkAgg, NavigationToolbar2TkAgg
from matplotlib.backends.backend_tkagg import FigureCanvasTkAgg, NavigationToolbar2Tk
from matplotlib.figure import Figure
from matplotlib.ticker import MultipleLocator, FormatStrFormatter

Expand Down Expand Up @@ -80,7 +80,7 @@ def __init__(self, parent, PlotFileName):
self.canvas.show()
self.canvas.get_tk_widget().pack(side=tk.BOTTOM, fill=tk.BOTH, expand=True)

self.toolbar = NavigationToolbar2TkAgg(self.canvas, self)
self.toolbar = NavigationToolbar2Tk(self.canvas, self)
self.toolbar.update()
self.canvas._tkcanvas.pack(side=tk.TOP, fill=tk.BOTH, expand=True)

Expand Down

0 comments on commit 6d7e9ce

Please sign in to comment.