mapdata 2.13.0__tar.gz → 2.14.0__tar.gz

{mapdata-2.13.0/mapdata.egg-info → mapdata-2.14.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: mapdata
-Version: 2.13.0
+Version: 2.14.0
 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-2.13.0 → mapdata-2.14.0}/mapdata/mapdata.py

@@ -24,8 +24,8 @@
 #
 # ==================================================================
 
-version = "2.13.0"
-vdate = "2023-12-30"
+version = "2.14.0"
+vdate = "2023-12-31"
 
 copyright = "2023"
 
@@ -459,20 +459,21 @@ class CsvFile(object):
 		return self
 
 
-def sort_columns(columns):
-	# Sorts a list of one, two, or three sublists, where each sublist is a column.  Rows are sorted by the first column.
+def sort_columns(columns, sortby=0):
+	# Sorts a list of one, two, or three sublists, where each sublist is a column.
+	# Rows are sorted by the 'sortby' column, which is zero-based.
 	# The returned value is also column-wise, but sorted by rows.
 	if len(columns) == 1:
 		return sorted(columns)
 	nrows = len(columns[0])
 	if len(columns) == 2:
 		rowdata = [[columns[0][i], columns[1][i]] for i in range(nrows)]
-		rowdata.sort()
+		rowdata.sort(key = lambda c: c[sortby])
 		return [[rowdata[i][0] for i in range(nrows)], [rowdata[i][1] for i in range(nrows)]]
 	else:
 		# len(columns) should be 3, though this is not checked
 		rowdata = [[columns[0][i], columns[1][i], columns[2][i]] for i in range(nrows)]
-		rowdata.sort()
+		rowdata.sort(key = lambda c: c[sortby])
 		return [[rowdata[i][0] for i in range(nrows)], [rowdata[i][1] for i in range(nrows)], [rowdata[i][2] for i in range(nrows)]]
 
 
@@ -913,6 +914,7 @@ class MapUI(object):
 		self.basemap_var = tk.StringVar(self.win, bm_name)
 		self.map_option_menu = ttk.Combobox(ctrlframe, state="readonly", textvariable=self.basemap_var,
 				values=self.available_tile_servers(), width=18)
+		self.map_option_menu["state"] = "normal"
 		self.map_option_menu.bind('<<ComboboxSelected>>', self.change_basemap)
 		self.map_option_menu.grid(row=0, column=1, padx=(5, 30), pady=(2, 5), sticky=tk.W)
 		# Multi-select option
@@ -1416,8 +1418,9 @@ class MapUI(object):
 		# Plotting support.  Return all data for the specified columns as a list of column-oriented lists.
 		res = []
 		for c in column_list:
-			i = self.headers.index(c)
-			res.append([row[i] for row in self.rows])
+			if c in self.headers:
+				i = self.headers.index(c)
+				res.append([row[i] for row in self.rows])
 		return res
 	def get_sel_data(self, column_list):
 		# Plotting support.  Return data from selected rows for the specified columns, as a list of lists.
@@ -1469,6 +1472,9 @@ class MapUI(object):
 		clone.dlg.bind("<Alt-y>", clone.set_ylabel)
 		if clone.type_var.get() == "Histogram":
 			clone.dlg.bind("<Alt-b>", clone.set_bins)
+		clone.alpha = plot_obj.alpha
+		if clone.type_var.get() in ("Scatter plot", "Categorical stripchart", "Categorical KD plot"):
+			clone.dlg.bind("<Alt-a>", clone.set_alpha)
 		clone.dataset = copy.copy(plot_obj.dataset)
 		clone.plot_data = copy.copy(plot_obj.plot_data)
 		clone.data_labels = copy.copy(plot_obj.data_labels)
@@ -2795,10 +2801,16 @@ class PlotDialog(object):
 		self.dlg.columnconfigure(0, weight=1)
 		self.auto_update = True
 		self.plot_title = None
+		# For transparency on some plots
+		self.alpha = 0.45
 		# For histogram
 		self.bins = 10
 		# For display of groups at Jenks breaks on Q-Q plots
 		self.qq_groups = False
+		# For display of lines at X and Y Jenks breaks on scatter plots
+		self.scatter_breaks = False
+		self.scatter_x_breaks = None
+		self.scatter_y_breaks = None
 
 		def set_autoupdate():
 			if self.autoupdate_var.get() == "1":
@@ -2930,7 +2942,7 @@ class PlotDialog(object):
 				for j in range(variables):
 					row.append(self.dataset[j][i])
 				rowwise_data.append(row)
-			tframe, tdata = treeview_table(dlg.content_frame, rowwise_data, self.data_labels)
+			tframe, tdata = treeview_table(dlg.content_frame, rowwise_data, self.data_labels[0:variables])
 			tframe.grid(row=0, column=0, sticky=tk.NSEW)
 			dlg.show()
 
@@ -2981,6 +2993,7 @@ class PlotDialog(object):
 		# Also sets the groupby Combobox values if applicable.
 		self.plotfig.clear()
 		self.plot_title = None
+		self.dlg.bind("<Alt-a>")
 		self.dlg.bind("<Alt-b>")
 		self.dlg.bind("<Alt-g>")
 		self.plot_axes = self.plotfig.add_subplot(111)
@@ -2999,8 +3012,8 @@ class PlotDialog(object):
 		# quant_columns includes date and timestamp columns
 		quant_columns = [c[0] for c in self.column_specs if c[1] in ("int", "float", "date", "timestamp", "timestamptz")]
 		quant_columns.sort()
-		numeric_columns = [c[0] for c in self.column_specs if c[1] in ("int", "float")]
-		numeric_columns.sort()
+		self.numeric_columns = [c[0] for c in self.column_specs if c[1] in ("int", "float")]
+		self.numeric_columns.sort()
 		date_columns = [c[0] for c in self.column_specs if c[1] in ("date", "timestamp", "timestamptz")]
 		date_columns.sort()
 		self.x_var.set('')
@@ -3020,7 +3033,7 @@ class PlotDialog(object):
 			self.ylog_ck["state"] = "disabled"
 		elif plot_type in ("Histogram", "Empirical CDF", "Kernel density (KD) plot", "Normal Q-Q plot", "Breaks groups", "Breaks optimum"):
 			self.x_sel["state"] = "normal"
-			self.x_sel["values"] = numeric_columns
+			self.x_sel["values"] = self.numeric_columns
 			self.y_sel["state"] = "disabled"
 			self.ylog_ck["state"] = "disabled"
 			if plot_type == "Histogram":
@@ -3033,7 +3046,8 @@ class PlotDialog(object):
 			self.x_sel["state"] = "normal"
 			self.x_sel["values"] = xcols
 			self.xlog_ck["state"] = "disabled"
-			self.y_sel["values"] = numeric_columns
+			self.y_sel["state"] = "normal"
+			self.y_sel["values"] = self.numeric_columns
 		elif plot_type == "Min-max plot":
 			self.x_sel["state"] = "normal"
 			self.x_sel["values"] = quant_columns
@@ -3047,7 +3061,7 @@ class PlotDialog(object):
 			self.y_sel["values"] = quant_columns
 			if plot_type in ("Scatter plot", "Line plot"):
 				self.groupby_sel["state"] = "normal"
-				self.groupby_sel["values"] = [''] + categ_columns2
+				self.groupby_sel["values"] = [''] + categ_columns2 + ['* Breaks in X', '* Breaks in Y']
 
 	def q_redraw(self, get_data=True, *args):
 		# Conditionally (re)draw the plot.
@@ -3117,8 +3131,9 @@ class PlotDialog(object):
 			# Set data labels
 			if self.y_var.get() != '':
 				self.data_labels = [self.x_var.get(), self.y_var.get()]
-				if self.groupby_var.get() != '':
-					self.data_labels.append(self.groupby_var.get())
+				grpvar = self.groupby_var.get()
+				if grpvar not in ('', '* Breaks in X', '* Breaks in Y') :
+					self.data_labels.append(grpvar)
 			else:
 				self.data_labels = [self.x_var.get()]
 			# Log-transform data if specified.
@@ -3246,18 +3261,49 @@ class PlotDialog(object):
 				self.plot_data_labels = [self.data_labels[0], self.data_labels[1] + " min", self.data_labels[1] + " max"]
 			elif plot_type == "Line plot":
 				# Sort by X
-				if self.groupby_var.get() == '':
-					ds = list(zip(self.dataset[0], self.dataset[1]))
-				else:
-					ds = list(zip(self.dataset[0], self.dataset[1], self.dataset[2]))
-				ds.sort()
-				ds2 = list(zip(*ds))
+				#if self.groupby_var.get() == '':
+				#	ds = list(zip(self.dataset[0], self.dataset[1]))
+				#else:
+				#	ds = list(zip(self.dataset[0], self.dataset[1], self.dataset[2]))
+				#ds.sort()
+				#ds2 = list(zip(*ds))
+				ds2 = sort_columns(self.dataset)
 				if self.groupby_var.get() == '':
 					self.plot_data = [list(ds2[0]), list(ds2[1])]
 				else:
 					self.plot_data = [list(ds2[0]), list(ds2[1]), list(ds2[2])]
 				self.plot_data_labels = self.data_labels
-			elif plot_type in ("Histogram", "Scatter plot", "Y range plot"):
+			elif plot_type == "Scatter plot":
+				if self.groupby_var.get() == "* Breaks in X":
+					if self.x_var.get() in self.numeric_columns:
+						ds = sort_columns(self.dataset)
+						oj = optimum_jenks(ds[0], 8)
+						jnb = jenkspy.JenksNaturalBreaks(oj)
+						jnb.fit(ds[0])
+						self.plot_data = [ds[0], ds[1], ["Group "+str(lbl+1) for lbl in jnb.labels_]]
+						self.plot_data_labels = self.data_labels + ['Breaks in X']
+					else:
+						# Can't compute breaks for X
+						self.groupby_var.set('')
+						self.plot_data = self.dataset
+						self.plot_data_labels = self.data_labels
+				elif self.groupby_var.get() == "* Breaks in Y":
+					if self.y_var.get() in self.numeric_columns:
+						ds = sort_columns(self.dataset, sortby=1)
+						oj = optimum_jenks(ds[1], 8)
+						jnb = jenkspy.JenksNaturalBreaks(oj)
+						jnb.fit(ds[1])
+						self.plot_data = [ds[0], ds[1], ["Group "+str(lbl+1) for lbl in jnb.labels_]]
+						self.plot_data_labels = self.data_labels + ['Breaks in Y']
+					else:
+						# Can't compute breaks for Y
+						self.groupby_var.set('')
+						self.plot_data = self.dataset
+						self.plot_data_labels = self.data_labels
+				else:
+					self.plot_data = self.dataset
+					self.plot_data_labels = self.data_labels
+			elif plot_type in ("Histogram", "Y range plot"):
 				# No special preparation
 				self.plot_data = self.dataset
 				self.plot_data_labels = self.data_labels
@@ -3275,8 +3321,29 @@ class PlotDialog(object):
 				self.plot_axes.set_xlabel(self.x_var.get())
 				self.plot_axes.set_ylabel("Counts")
 			elif plot_type == "Scatter plot":
+				self.dlg.bind("<Alt-a>", self.set_alpha)
+				self.dlg.bind("<Alt-b>", self.set_scatter_breaks)
+				if self.scatter_breaks:
+					if self.x_var.get() in self.numeric_columns:
+						x_vals = copy.copy(self.plot_data[0])
+						x_vals.sort()
+						oj = optimum_jenks(x_vals, 8)
+						jnb = jenkspy.JenksNaturalBreaks(oj)
+						jnb.fit(x_vals)
+						self.scatter_x_breaks = jnb.inner_breaks_
+						for b in self.scatter_x_breaks:
+							self.plot_axes.axvline(b, color='0.8', alpha=0.5)
+					if self.y_var.get() in self.numeric_columns:
+						y_vals = copy.copy(self.plot_data[1])
+						y_vals.sort()
+						oj = optimum_jenks(y_vals, 8)
+						jnb = jenkspy.JenksNaturalBreaks(oj)
+						jnb.fit(y_vals)
+						self.scatter_y_breaks = jnb.inner_breaks_
+						for b in self.scatter_y_breaks:
+							self.plot_axes.axhline(b, color='0.8', alpha=0.5)
 				if self.groupby_var.get() == '':
-					self.plot_axes.scatter(self.plot_data[0], self.plot_data[1])
+					self.plot_axes.scatter(self.plot_data[0], self.plot_data[1], alpha=self.alpha)
 				else:
 					groups = list(set(self.plot_data[2]))
 					groups.sort()
@@ -3284,7 +3351,7 @@ class PlotDialog(object):
 					for g in groups:
 						pdx = [self.plot_data[0][i] for i in range(datarows) if self.plot_data[2][i] == g]
 						pdy = [self.plot_data[1][i] for i in range(datarows) if self.plot_data[2][i] == g]
-						self.plot_axes.plot(pdx, pdy, marker='o', linestyle='', label=g)
+						self.plot_axes.plot(pdx, pdy, marker='o', alpha=self.alpha, linestyle='', label=g)
 					self.plot_axes.legend()
 				self.plot_axes.set_xlabel(self.plot_data_labels[0])
 				self.plot_axes.set_ylabel(self.plot_data_labels[1])
@@ -3362,14 +3429,16 @@ class PlotDialog(object):
 				self.plot_axes.set_xlabel(self.x_var.get())
 				self.plot_axes.set_ylabel(self.data_labels[1])
 			elif plot_type == "Categorical KD plot":
+				self.dlg.bind("<Alt-a>", self.set_alpha)
 				sns.kdeplot({self.x_var.get(): self.dataset[0], self.y_var.get(): self.dataset[1]},
-						x=self.y_var.get(), hue=self.x_var.get(), multiple="layer", fill=True, alpha=0.35, ax=self.plot_axes,
+						x=self.y_var.get(), hue=self.x_var.get(), multiple="layer", fill=True, alpha=self.alpha, ax=self.plot_axes,
 						warn_singular=False)
 				self.plot_axes.set_xlabel(self.y_var.get())
 				self.plot_axes.set_ylabel("Density")
 			elif plot_type == "Categorical stripchart":
+				self.dlg.bind("<Alt-a>", self.set_alpha)
 				sns.stripplot({self.x_var.get(): self.dataset[0], self.y_var.get(): self.dataset[1]},
-						x=self.x_var.get(), y=self.y_var.get(), alpha=0.4, ax=self.plot_axes)
+						x=self.x_var.get(), y=self.y_var.get(), alpha=self.alpha, ax=self.plot_axes)
 				self.plot_axes.set_xlabel(self.x_var.get())
 				self.plot_axes.set_ylabel(self.data_labels[1])
 			elif plot_type == "Violin plot":
@@ -3408,6 +3477,20 @@ class PlotDialog(object):
 			self.bins = num_bins
 			if self.type_var.get() == "Histogram":
 				self.q_redraw()
+	def set_alpha(self, *args):
+		dlg = OneFloatDialog(self.dlg, "Transparency", "Enter the transparency (alpha) value", min_value=0.0, max_value=1.0, initial=self.alpha)
+		new_alpha = dlg.show()
+		if new_alpha is not None:
+			self.alpha = new_alpha
+			if self.type_var.get() in ("Scatter plot", "Categorical stripchart", "Categorical KD plot"):
+				self.q_redraw()
+	def set_scatter_breaks(self, *args):
+		# Toggle display of vertical and horizontal lines at natural breaks values on a scatter plot.
+		# plot_data[0] and plot_data[1] must be x and y, respectively.
+		self.scatter_breaks = not self.scatter_breaks
+		if self.type_var.get() == "Scatter plot":
+			self.q_redraw()
+
 	def show_groups(self, *args):
 		if self.type_var.get() == "Normal Q-Q plot":
 			self.qq_groups = not self.qq_groups
@@ -3625,6 +3708,53 @@ class OneIntDialog(object):
 			return self.entry_var.get()
 
 
+class OneFloatDialog(object):
+	def __init__(self, parent, title, prompt, min_value, max_value, initial):
+		self.dlg = tk.Toplevel(parent)
+		self.dlg.title(title)
+		prompt_frame = tk.Frame(self.dlg)
+		prompt_frame.grid(row=0, column=0, sticky=tk.NSEW, pady=(3,3))
+		prompt_frame.columnconfigure(0, weight=1)
+		msg_lbl = ttk.Label(prompt_frame, text=prompt)
+		msg_lbl.grid(row=0, column=0, sticky=tk.W, padx=(6,6), pady=(6,6))
+		self.entry_var = tk.DoubleVar(self.dlg, initial)
+		self.val_entry = ttk.Spinbox(prompt_frame, textvariable=self.entry_var, from_=min_value, to=max_value)
+		self.val_entry.grid(row=1, column=0, sticky=tk.EW, padx=(6,6), pady=(3,3))
+		btn_frame = tk.Frame(self.dlg, borderwidth=3, relief=tk.RIDGE)
+		btn_frame.columnconfigure(0, weight=1)
+		btn_frame.grid(row=2, column=0, sticky=tk.EW, pady=(3,3))
+		btn_frame.columnconfigure(0, weight=1)
+		self.val_entry.focus()
+		# Buttons
+		self.canceled = False
+		self.ok_btn = ttk.Button(btn_frame, text="OK", command=self.do_select, underline=0)
+		self.ok_btn.grid(row=0, column=0, sticky=tk.E, padx=(6,3))
+		self.dlg.bind('<Alt-o>', self.do_select)
+		cancel_btn = ttk.Button(btn_frame, text="Cancel", command=self.do_cancel, underline=0)
+		cancel_btn.grid(row=0, column=1, sticky=tk.E, padx=(3,6))
+		self.dlg.bind("<Escape>", self.do_cancel)
+		self.dlg.bind("<Alt-c>", self.do_cancel)
+		self.dlg.bind("<Return>", self.do_select)
+		self.dlg.bind("<Alt-o>", self.do_select)
+	def do_cancel(self, *args):
+		self.canceled = True
+		self.dlg.destroy()
+	def do_select(self, *args):
+		self.canceled = False
+		self.dlg.destroy()
+	def show(self):
+		self.dlg.grab_set()
+		center_window(self.dlg)
+		raise_window(self.dlg)
+		self.dlg.resizable(True, False)
+		self.dlg.attributes('-topmost', 'true')
+		self.dlg.wait_window(self.dlg)
+		if self.canceled:
+			return None
+		else:
+			return self.entry_var.get()
+
+
 class GetEditorDialog(object):
 	def __init__(self, parent, current_editor):
 		self.dlg = tk.Toplevel(parent)

{mapdata-2.13.0 → mapdata-2.14.0/mapdata.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: mapdata
-Version: 2.13.0
+Version: 2.14.0
 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-2.13.0 → mapdata-2.14.0}/setup.py

@@ -5,7 +5,7 @@ with io.open('README.md', encoding='utf-8') as f:
 	long_description = f.read()
 
 setuptools.setup(name='mapdata',
-	version='2.13.0',
+	version='2.14.0',
 	description="An interactive map and table explorer for geographic coordinates in a spreadsheet, CSV file, or database",
 	author='Dreas Nielsen',
 	author_email='dreas.nielsen@gmail.com',