mapdata 2.12.0__tar.gz → 2.13.0__tar.gz

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

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

@@ -24,8 +24,8 @@
 #
 # ==================================================================
 
-version = "2.12.0"
-vdate = "2023-12-28"
+version = "2.13.0"
+vdate = "2023-12-30"
 
 copyright = "2023"
 
@@ -460,14 +460,21 @@ class CsvFile(object):
 
 
 def sort_columns(columns):
-	# Sorts a list of one or two sublists, where each sublist is a column.  Rows are sorted by the first column.
+	# Sorts a list of one, two, or three sublists, where each sublist is a column.  Rows are sorted by the first column.
 	# The returned value is also column-wise, but sorted by rows.
 	if len(columns) == 1:
 		return sorted(columns)
 	nrows = len(columns[0])
-	rowdata = [[columns[0][i], columns[1][i]] for i in range(nrows)]
-	rowdata.sort()
-	return [[rowdata[i][0] for i in range(nrows)], [rowdata[i][1] for i in range(nrows)]]
+	if len(columns) == 2:
+		rowdata = [[columns[0][i], columns[1][i]] for i in range(nrows)]
+		rowdata.sort()
+		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()
+		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)]]
+
 
 def treeview_sort_column(tv, col, reverse):
 	# Sort columns in Tkinter Treeview.  From https://stackoverflow.com/questions/1966929/tk-treeview-column-sort#1967793
@@ -1445,8 +1452,10 @@ class MapUI(object):
 		clone.ylog_var.set(plot_obj.ylog_var.get())
 		clone.x_sel["values"] = copy.copy(plot_obj.x_sel["values"])
 		clone.y_sel["values"] = copy.copy(plot_obj.y_sel["values"])
+		clone.groupby_sel["values"] = copy.copy(plot_obj.groupby_sel["values"])
 		clone.x_sel["state"] = plot_obj.x_sel["state"]
 		clone.y_sel["state"] = plot_obj.y_sel["state"]
+		clone.groupby_sel["state"] = plot_obj.groupby_sel["state"]
 		clone.xlog_ck["state"] = plot_obj.xlog_ck["state"]
 		clone.ylog_ck["state"] = plot_obj.ylog_ck["state"]
 		clone.data_btn["state"] = plot_obj.data_btn["state"]
@@ -2788,7 +2797,7 @@ class PlotDialog(object):
 		self.plot_title = None
 		# For histogram
 		self.bins = 10
-		# For groups at Jenks breaks on Q-Q plots
+		# For display of groups at Jenks breaks on Q-Q plots
 		self.qq_groups = False
 
 		def set_autoupdate():
@@ -2818,6 +2827,7 @@ class PlotDialog(object):
 		self.type_sel = ttk.Combobox(ctrl_frame, state="readonly", textvariable=self.type_var, width=20, height=15,
 				values=["Box plot", "Breaks groups", "Breaks optimum", "Category counts", "Categorical KD plot", "Categorical stripchart", "Empirical CDF", "Histogram", "Kernel density (KD) plot", "Line plot", "Min-max plot", "Normal Q-Q plot", "Scatter plot", "Violin plot", "Y range plot"])
 		self.type_sel.grid(row=0, column=1, columnspan=2, sticky=tk.W, padx=(3,6), pady=(3,3))
+		self.type_sel["state"] = "normal"
 		self.type_sel.bind("<<ComboboxSelected>>", self.set_xy)
 
 		self.sel_only_var = tk.StringVar(ctrl_frame, "0")
@@ -2833,14 +2843,14 @@ class PlotDialog(object):
 		self.x_var = tk.StringVar(ctrl_frame, "")
 		x_lbl = ttk.Label(ctrl_frame, text="X column:")
 		x_lbl.grid(row=0, column=3, sticky=tk.E, padx=(6,3), pady=(3,3))
-		self.x_sel = ttk.Combobox(ctrl_frame, state="disabled", textvariable=self.x_var, width=20)
+		self.x_sel = ttk.Combobox(ctrl_frame, state="disabled", textvariable=self.x_var, width=24)
 		self.x_sel.grid(row=0, column=4, sticky=tk.W, padx=(3,6), pady=(3,3))
 		self.x_sel.bind("<<ComboboxSelected>>", self.x_changed)
 
 		self.y_var = tk.StringVar(ctrl_frame, "")
 		y_lbl = ttk.Label(ctrl_frame, text="Y column:")
 		y_lbl.grid(row=1, column=3, sticky=tk.E, padx=(6,3), pady=(3,3))
-		self.y_sel = ttk.Combobox(ctrl_frame, state="disabled", textvariable=self.y_var, width=20)
+		self.y_sel = ttk.Combobox(ctrl_frame, state="disabled", textvariable=self.y_var, width=24)
 		self.y_sel.grid(row=1, column=4, sticky=tk.W, padx=(3,6), pady=(3,3))
 		self.y_sel.bind("<<ComboboxSelected>>", self.y_changed)
 
@@ -2854,6 +2864,13 @@ class PlotDialog(object):
 				onvalue="1", offvalue="0")
 		self.ylog_ck.grid(row=1, column=5, sticky=tk.W, padx=(6,6), pady=(3,3))
 
+		self.groupby_var = tk.StringVar(ctrl_frame, "")
+		groupby_lbl = ttk.Label(ctrl_frame, text="Group by:")
+		groupby_lbl.grid(row=2, column=3, sticky=tk.E, padx=(6,3), pady=(3,3))
+		self.groupby_sel = ttk.Combobox(ctrl_frame, state="disabled", textvariable=self.groupby_var, width=24)
+		self.groupby_sel.grid(row=2, column=4, sticky=tk.W, padx=(3,6), pady=(3,3))
+		self.groupby_sel.bind("<<ComboboxSelected>>", self.groupby_changed)
+
 		# Plot
 		self.content_frame = tk.Frame(self.dlg, borderwidth=3, relief=tk.RIDGE)
 		self.content_frame.grid(row=2, column=0, sticky=tk.NSEW)
@@ -2956,8 +2973,12 @@ class PlotDialog(object):
 			self.ylog_ck["state"] = "normal"
 		self.q_redraw(args)
 
+	def groupby_changed(self, *args):
+		self.q_redraw(args)
+
 	def set_xy(self, *args):
 		# Enable X and Y value selection, and set Combobox values based on plot type and column types.
+		# Also sets the groupby Combobox values if applicable.
 		self.plotfig.clear()
 		self.plot_title = None
 		self.dlg.bind("<Alt-b>")
@@ -2984,17 +3005,21 @@ class PlotDialog(object):
 		date_columns.sort()
 		self.x_var.set('')
 		self.y_var.set('')
+		self.groupby_var.set('')
 		self.xlog_ck["state"] = "normal"
 		self.ylog_ck["state"] = "normal"
 		self.x_sel["state"] = "readonly"
 		self.y_sel["state"] = "readonly"
+		self.groupby_sel["state"] = "readonly"
 		plot_type = self.type_var.get()
 		if plot_type == "Category counts":
+			self.x_sel["state"] = "normal"
 			self.x_sel["values"] = categ_columns
 			self.xlog_ck["state"] = "disabled"
 			self.y_sel["state"] = "disabled"
 			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.y_sel["state"] = "disabled"
 			self.ylog_ck["state"] = "disabled"
@@ -3005,16 +3030,24 @@ class PlotDialog(object):
 		elif plot_type in ("Box plot", "Categorical KD plot", "Categorical stripchart", "Violin plot"):
 			xcols = list(set(categ_columns) | set(date_columns))
 			xcols.sort()
+			self.x_sel["state"] = "normal"
 			self.x_sel["values"] = xcols
 			self.xlog_ck["state"] = "disabled"
 			self.y_sel["values"] = numeric_columns
 		elif plot_type == "Min-max plot":
+			self.x_sel["state"] = "normal"
 			self.x_sel["values"] = quant_columns
+			self.y_sel["state"] = "normal"
 			self.y_sel["values"] = categ_columns2
 			self.ylog_ck["state"] = "disabled"
 		else:
+			self.x_sel["state"] = "normal"
 			self.x_sel["values"] = quant_columns
+			self.y_sel["state"] = "normal"
 			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
 
 	def q_redraw(self, get_data=True, *args):
 		# Conditionally (re)draw the plot.
@@ -3041,6 +3074,8 @@ class PlotDialog(object):
 		column_list = [self.x_var.get()]
 		if self.y_var.get() != '':
 			column_list.append(self.y_var.get())
+		if self.groupby_var.get() != '':
+			column_list.append(self.groupby_var.get())
 		# Get either only the selected data or all data.
 		if self.sel_only_var.get() == "1":
 			dataset = self.parent.get_sel_data(column_list)
@@ -3082,6 +3117,8 @@ 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())
 			else:
 				self.data_labels = [self.x_var.get()]
 			# Log-transform data if specified.
@@ -3158,7 +3195,7 @@ class PlotDialog(object):
 				self.plot_data_labels = [self.data_labels[0], "Cumulative frequency"]
 			elif plot_type == "Kernel density (KD) plot":
 				self.plot_data = self.dataset
-				#self.plot_data_labels = [self.x_var.get()]
+				self.plot_data_labels = [self.x_var.get()]
 			elif plot_type == "Min-max plot":
 				# Min and max X for each Y
 				y_vals = list(set(self.dataset[1]))
@@ -3209,10 +3246,16 @@ 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
-				ds = list(zip(self.dataset[0], self.dataset[1]))
+				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))
-				self.plot_data = [list(ds2[0]), list(ds2[1])]
+				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"):
 				# No special preparation
@@ -3232,11 +3275,31 @@ class PlotDialog(object):
 				self.plot_axes.set_xlabel(self.x_var.get())
 				self.plot_axes.set_ylabel("Counts")
 			elif plot_type == "Scatter plot":
-				self.plot_axes.scatter(self.plot_data[0], self.plot_data[1])
+				if self.groupby_var.get() == '':
+					self.plot_axes.scatter(self.plot_data[0], self.plot_data[1])
+				else:
+					groups = list(set(self.plot_data[2]))
+					groups.sort()
+					datarows = len(self.plot_data[0])
+					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.legend()
 				self.plot_axes.set_xlabel(self.plot_data_labels[0])
 				self.plot_axes.set_ylabel(self.plot_data_labels[1])
 			elif plot_type == "Line plot":
-				self.plot_axes.plot(self.plot_data[0], self.plot_data[1])
+				if self.groupby_var.get() == '':
+					self.plot_axes.plot(self.plot_data[0], self.plot_data[1])
+				else:
+					groups = list(set(self.plot_data[2]))
+					groups.sort()
+					datarows = len(self.plot_data[0])
+					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, 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])
 			elif plot_type == "Breaks groups":

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: mapdata
-Version: 2.12.0
+Version: 2.13.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.12.0 → mapdata-2.13.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.12.0',
+	version='2.13.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',