mapdata 2.11.0__tar.gz → 2.12.0__tar.gz

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

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

@@ -24,8 +24,8 @@
 #
 # ==================================================================
 
-version = "2.11.0"
-vdate = "2023-09-16"
+version = "2.12.0"
+vdate = "2023-12-28"
 
 copyright = "2023"
 
@@ -459,6 +459,16 @@ class CsvFile(object):
 		return self
 
 
+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.
+	# 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)]]
+
 def treeview_sort_column(tv, col, reverse):
 	# Sort columns in Tkinter Treeview.  From https://stackoverflow.com/questions/1966929/tk-treeview-column-sort#1967793
     colvals = [(tv.set(k, col), k) for k in tv.get_children()]
@@ -2805,8 +2815,8 @@ class PlotDialog(object):
 		self.type_var = tk.StringVar(ctrl_frame, "")
 		type_lbl = ttk.Label(ctrl_frame, text="Plot type:")
 		type_lbl.grid(row=0, column=0, sticky=tk.E, padx=(6,3), pady=(3,3))
-		self.type_sel = ttk.Combobox(ctrl_frame, state="readonly", textvariable=self.type_var, width=20,
-				values=["Box plot", "Breaks groups", "Breaks optimum", "Category counts", "Categorical KD plot", "Categorical stripchart", "Empirical CDF", "Histogram", "Kernel density (KD) plot", "Line plot", "Normal Q-Q plot", "Scatter plot", "Violin plot", "Y range plot"])
+		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.bind("<<ComboboxSelected>>", self.set_xy)
 
@@ -2940,7 +2950,7 @@ class PlotDialog(object):
 
 	def y_changed(self, *args):
 		plot_type = self.type_var.get()
-		if plot_type in ("Category counts", "Histogram", "Empirical CDF"):
+		if plot_type in ("Category counts", "Histogram", "Empirical CDF", "Min-max plot"):
 			self.ylog_ck["state"] = "disabled"
 		else:
 			self.ylog_ck["state"] = "normal"
@@ -2960,8 +2970,11 @@ class PlotDialog(object):
 		self.plot_data_labels = None
 		self.data_btn["state"] = "disabled"
 		self.plot_data_btn["state"] = "disabled"
+		# Category columns.  Does not include date columns for most uses, but may include dates for some.
 		categ_columns = [c[0] for c in self.column_specs if c[1] in ("string", "boolean")]
 		categ_columns.sort()
+		categ_columns2 = [c[0] for c in self.column_specs if c[1] in ("string", "boolean", "date")]
+		categ_columns2.sort()
 		# 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()
@@ -2990,9 +3003,15 @@ class PlotDialog(object):
 			if plot_type == "Normal Q-Q plot":
 				self.dlg.bind("<Alt-g>", self.show_groups)
 		elif plot_type in ("Box plot", "Categorical KD plot", "Categorical stripchart", "Violin plot"):
-			self.x_sel["values"] = list(set(categ_columns) | set(date_columns))
+			xcols = list(set(categ_columns) | set(date_columns))
+			xcols.sort()
+			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["values"] = quant_columns
+			self.y_sel["values"] = categ_columns2
+			self.ylog_ck["state"] = "disabled"
 		else:
 			self.x_sel["values"] = quant_columns
 			self.y_sel["values"] = quant_columns
@@ -3004,7 +3023,7 @@ class PlotDialog(object):
 				"Normal Q-Q plot", "Breaks groups", "Breaks optimum", "Histogram") \
 				and self.x_var.get() != '') \
 				or (plot_type in ("Scatter plot", "Line plot", "Box plot", "Categorical KD plot", "Categorical stripchart", \
-				"Violin plot", "Y range plot") and self.x_var.get() != '' and self.y_var.get() != '')
+				"Min-max plot", "Violin plot", "Y range plot") and self.x_var.get() != '' and self.y_var.get() != '')
 		if can_redraw:
 			self.plotfig.clear()
 			self.plot_axes = self.plotfig.add_subplot(111)
@@ -3022,6 +3041,7 @@ class PlotDialog(object):
 		column_list = [self.x_var.get()]
 		if self.y_var.get() != '':
 			column_list.append(self.y_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)
 		else:
@@ -3057,6 +3077,8 @@ class PlotDialog(object):
 				cast_fn = data_type_cast_fn(y_data_type)
 				for i in range(len(clean_data[1])):
 					clean_data[1][i] = cast_fn(clean_data[1][i])
+			# Sort the dataset by X values
+			clean_data = sort_columns(clean_data)
 			# Set data labels
 			if self.y_var.get() != '':
 				self.data_labels = [self.x_var.get(), self.y_var.get()]
@@ -3106,6 +3128,7 @@ class PlotDialog(object):
 			elif plot_type in ("Box plot", "Categorical KD plot", "Categorical stripchart", "Violin plot"):
 				# A list of Y values for each X value
 				x_vals = list(set(self.dataset[0]))
+				x_vals.sort()
 				ds = list(zip(self.dataset[0], self.dataset[1]))
 				plot_data = []
 				for x in x_vals:
@@ -3135,7 +3158,24 @@ 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]))
+				y_vals.sort()
+				plotdata = dict(zip(y_vals, [[None, None] for _ in y_vals]))
+				for i in range(len(self.dataset[1])):
+					x = self.dataset[0][i]
+					y = self.dataset[1][i]
+					x_vals = plotdata[y]
+					if x_vals[0] is None or x < x_vals[0]:
+						plotdata[y][0] = x
+					if x_vals[1] is None or x > x_vals[1]:
+						plotdata[y][1] = x
+				x1 = [plotdata[y][0] for y in y_vals]
+				x2 = [plotdata[y][1] for y in y_vals]
+				self.plot_data = [y_vals, x1, x2]
+				self.plot_data_labels = [self.data_labels[1], self.data_labels[0] + " min", self.data_labels[0] + " max"]
 			elif plot_type == "Normal Q-Q plot":
 				x_vals = copy.copy(self.dataset[0])
 				x_vals.sort()
@@ -3154,8 +3194,7 @@ class PlotDialog(object):
 				# Min and max Y for each X
 				x_vals = list(set(self.dataset[0]))
 				x_vals.sort()
-				y_vals = [[None, None]] * len(x_vals)
-				plotdata = dict(zip(x_vals, y_vals))
+				plotdata = dict(zip(x_vals, [[None, None] for i in x_vals]))
 				for i in range(len(self.dataset[0])):
 					x = self.dataset[0][i]
 					y = self.dataset[1][i]
@@ -3208,7 +3247,7 @@ class PlotDialog(object):
 				ticks.insert(0,0)
 				ticks.append(ticks[-1]+1)
 				self.plot_axes.set_xticks(ticks)
-				lbls = self.plot_data_labels
+				lbls = copy.copy(self.plot_data_labels)
 				lbls.insert(0, "")
 				lbls.append("")
 				self.plot_axes.set_xticklabels(lbls)
@@ -3227,6 +3266,13 @@ class PlotDialog(object):
 				sns.kdeplot({self.x_var.get(): self.dataset[0]}, x=self.x_var.get(), fill=True, ax=self.plot_axes)
 				self.plot_axes.set_xlabel(self.x_var.get())
 				self.plot_axes.set_ylabel("Density")
+			elif plot_type == "Min-max plot":
+				self.plot_axes.hlines(self.plot_data[0], self.plot_data[1], self.plot_data[2], linewidths=5.0)
+				if self.xlog_ck["state"] != "disabled" and self.xlog_var.get() == "1":
+					self.plot_axes.set_xlabel("Log10 of " + self.x_var.get())
+				else:
+					self.plot_axes.set_xlabel(self.x_var.get())
+				self.plot_axes.set_ylabel(self.plot_data_labels[0])
 			elif plot_type == "Normal Q-Q plot":
 				if self.qq_groups:
 					self.plot_axes.scatter(self.plot_data[2], self.plot_data[1], c=self.plot_data[3], cmap="tab10")
@@ -3240,14 +3286,22 @@ class PlotDialog(object):
 			elif plot_type == "Y range plot":
 				self.plot_axes.fill_between(self.plot_data[0], self.plot_data[1], self.plot_data[2])
 				self.plot_axes.set_xlabel(self.x_var.get())
-				self.plot_axes.set_ylabel(self.y_var.get())
+				if self.xlog_ck["state"] != "disabled" and self.xlog_var.get() == "1":
+					self.plot_axes.set_xlabel("Log10 of " + self.x_var.get())
+				else:
+					self.plot_axes.set_xlabel(self.x_var.get())
+				if self.ylog_ck["state"] != "disabled" and self.ylog_var.get() == "1":
+					self.plot_axes.set_ylabel("Log10 of " + self.y_var.get())
+				else:
+					self.plot_axes.set_ylabel(self.y_var.get())
 			elif plot_type == "Box plot":
 				self.plot_axes.boxplot(self.plot_data, labels=self.plot_data_labels)
 				self.plot_axes.set_xlabel(self.x_var.get())
 				self.plot_axes.set_ylabel(self.data_labels[1])
 			elif plot_type == "Categorical KD plot":
 				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=0.35, 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":

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

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