mapdata 3.9.0__tar.gz → 3.9.3__tar.gz

{mapdata-3.9.0/mapdata.egg-info → mapdata-3.9.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: mapdata
-Version: 3.9.0
+Version: 3.9.3
 Summary: An interactive map and table explorer for geographic coordinates in a spreadsheet, CSV file, or database
 Home-page: https://osdn.net/project/mapdata/
 Author: Dreas Nielsen

{mapdata-3.9.0 → mapdata-3.9.3}/mapdata/mapdata.py

@@ -24,8 +24,8 @@
 #
 # ==================================================================
 
-version = "3.9.0"
-vdate = "2024-06-13"
+version = "3.9.3"
+vdate = "2024-06-15"
 
 copyright = "2023-2024"
 
@@ -2238,11 +2238,11 @@ class MapUI(object):
 		# Check that the specified column names are valid.
 		if not (lat_col in headers and lon_col in headers):
 			fatal_error("The specified coordinate columns are not in the data table.", kwargs={"parent": self.win})
-		if label_col is not None and not (label_col in headers):
+		if label_col is not None and label_col != '' and not (label_col in headers):
 			fatal_error("The label column is not in the data table.", kwargs={"parent": self.win})
-		if symbol_col is not None and not (symbol_col in headers):
+		if symbol_col is not None and symbol_col != '' and not (symbol_col in headers):
 			fatal_error("The symbol type column is not in the data table.", kwargs={"parent": self.win})
-		if color_col is not None and not (color_col in headers):
+		if color_col is not None and color_col != '' and not (color_col in headers):
 			fatal_error("The symbol color column is not in the data table.", kwargs={"parent": self.win})
 
 		# Populate the table frame
@@ -7602,7 +7602,6 @@ class UnivarStatsDialog(object):
 							self.logstatdata.append([grp, self.data_labels[var]] + logdd)
 				dnames = ["Group"] + self.dnames
 				logdnames = ["Group"] + self.logdnames
-		breakpoint()
 		tframe, tdata = treeview_table(self.data_page, self.statdata, dnames)
 		tframe.grid(row=0, column=0, sticky=tk.NSEW)
 		ltframe, ltdata = treeview_table(self.log_page, self.logstatdata, logdnames)
@@ -7749,7 +7748,7 @@ class BivarStatsDialog(object):
 		self.plotfig.set_figheight(2)
 		self.plotfig.set_figwidth(2)
 		self.plotfig_canvas = FigureCanvasTkAgg(self.plotfig, plot_frame)
-		self.plot_nav = NavigationToolbar2Tk(self.plotfig_canvas, self.out_plt_frm)
+		self.plot_nav = NavigationToolbar2Tk(self.plotfig_canvas, plot_frame)
 		self.plotfig_canvas.get_tk_widget().pack(side=tk.TOP, fill=tk.BOTH, expand=1)
 		self.plot_nav.update()
 		plot_pages.add(plot_frame, text="Data")
@@ -7762,9 +7761,9 @@ class BivarStatsDialog(object):
 		self.residfig.set_figheight(2)
 		self.residfig.set_figwidth(2)
 		self.residfig_canvas = FigureCanvasTkAgg(self.residfig, resid_frame)
-		#self.resid_nav = NavigationToolbar2Tk(self.residfig_canvas, self.out_plt_frm)
+		self.resid_nav = NavigationToolbar2Tk(self.residfig_canvas, resid_frame)
 		self.residfig_canvas.get_tk_widget().pack(side=tk.TOP, fill=tk.BOTH, expand=1)
-		#self.resid_nav.update()
+		self.resid_nav.update()
 		plot_pages.add(resid_frame, text="Residuals")
 		# Şen 2012 trend plot
 		sen_frame = tk.Frame(plot_pages)
@@ -7775,7 +7774,9 @@ class BivarStatsDialog(object):
 		self.senfig.set_figheight(2)
 		self.senfig.set_figwidth(2)
 		self.senfig_canvas = FigureCanvasTkAgg(self.senfig, sen_frame)
+		self.sen_nav = NavigationToolbar2Tk(self.senfig_canvas, sen_frame)
 		self.senfig_canvas.get_tk_widget().pack(side=tk.TOP, fill=tk.BOTH, expand=1)
+		self.sen_nav.update()
 		plot_pages.add(sen_frame, text="Şen trend")
 
 		# Initialize output frames
@@ -8058,15 +8059,21 @@ class BivarStatsDialog(object):
 				ylen = len(self.dataset[1])
 				if ylen > 3:
 					if ylen % 2:
-						ysplit = int((ylen - 1)/2)
-						firsthalf = self.dataset[1][1:][:ysplit]
-						secondhalf = self.dataset[1][1:][ysplit:]
+						ydata = self.dataset[1][1:]
+						ylen = ylen - 1
 					else:
-						ysplit = int(ylen/2)
-						firsthalf = self.dataset[1][:ysplit]
-						secondhalf = self.dataset[1][ysplit:]
+						ydata = self.dataset[1]
+					ymin = min(ydata)
+					ymax = max(ydata)
+					yofs = 0.05 * (ymax - ymin)
+					ylims = (ymin - yofs, ymax + yofs)
+					ysplit = int(ylen/2)
+					firsthalf = ydata[:ysplit]
+					secondhalf = ydata[ysplit:]
 					self.sen_axes.scatter(firsthalf, secondhalf)
-					mid = statistics.median(self.dataset[1])
+					self.sen_axes.set_xlim(ylims)
+					self.sen_axes.set_ylim(ylims)
+					mid = statistics.median(ydata)
 					self.sen_axes.axline((mid,mid), slope=1, color="grey", alpha=0.65)
 					self.sen_axes.set_xlabel("First half of "+self.data_labels[1])
 					self.sen_axes.set_ylabel("Second half of "+self.data_labels[1])

{mapdata-3.9.0 → mapdata-3.9.3/mapdata.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: mapdata
-Version: 3.9.0
+Version: 3.9.3
 Summary: An interactive map and table explorer for geographic coordinates in a spreadsheet, CSV file, or database
 Home-page: https://osdn.net/project/mapdata/
 Author: Dreas Nielsen

{mapdata-3.9.0 → mapdata-3.9.3}/setup.py

@@ -9,7 +9,7 @@ symbol_files = glob.glob("mapdata/symbols/16x16/*.xbm") + glob.glob("mapdata/sym
 			glob.glob("mapdata/symbols/24x24/*.xbm") + glob.glob("mapdata/symbols/28x28/*.xbm")
 
 setuptools.setup(name='mapdata',
-	version='3.9.0',
+	version='3.9.3',
 	description="An interactive map and table explorer for geographic coordinates in a spreadsheet, CSV file, or database",
 	author='Dreas Nielsen',
 	author_email='cortice@tutanota.com',