mapdata 3.20.0__tar.gz → 3.21.0__tar.gz

{mapdata-3.20.0/mapdata.egg-info → mapdata-3.21.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: mapdata
-Version: 3.20.0
+Version: 3.21.0
 Summary: An interactive map and table explorer for geographic coordinates in a spreadsheet, CSV file, or database that includes data plotting and statistical summaries
 Home-page: https:/hg.sr.ht/~rdnielsen/mapdata
 Author: Dreas Nielsen
@@ -24,21 +24,6 @@ Classifier: Topic :: Scientific/Engineering
 Requires-Python: >=3.8
 Description-Content-Type: text/markdown
 License-File: LICENSE.txt
-Requires-Dist: tkintermapview
-Requires-Dist: pyproj
-Requires-Dist: jenkspy
-Requires-Dist: odfpy
-Requires-Dist: openpyxl
-Requires-Dist: xlrd
-Requires-Dist: matplotlib
-Requires-Dist: seaborn
-Requires-Dist: loess
-Requires-Dist: statsmodels
-Requires-Dist: scipy
-Requires-Dist: scikit-learn
-Requires-Dist: pymannkendall
-Requires-Dist: umap-learn
-Requires-Dist: pynndescent
 
 
 *mapdata.py* is a data explorer for data sets containing geographic coordinates.  Data can be read from a CSV file, spreadsheet, or database.  Both a map and a data

{mapdata-3.20.0 → mapdata-3.21.0}/mapdata/mapdata.py

@@ -24,8 +24,8 @@
 #
 # ==================================================================
 
-version = "3.20.0"
-vdate = "2026-03-09"
+version = "3.21.0"
+vdate = "2026-03-17"
 
 copyright = "2023-2026"
 
@@ -6745,6 +6745,15 @@ class UniqueValuesDialog(Dialog):
 		self.data_labels = None
 		self.dlg.bind("<Control-s>")
 
+		# Top controls
+		self.sel_only_var, self.sel_only_ck = add_sel_only(self.ctrl_frame, 0, 0, self.q_recalc)
+		self.indiv_var = tk.StringVar(self.ctrl_frame, "0")
+		indiv_ck = ttk.Checkbutton(self.ctrl_frame, text="Individually", command=self.q_recalc, variable=self.indiv_var,
+				onvalue="1", offvalue="0")
+		indiv_ck.grid(row=0, column=1, sticky=tk.W, padx=(6,3), pady=(3,3), columnspan=None)
+		self.ctrl_frame.columnconfigure(0, weight=0)
+		self.ctrl_frame.columnconfigure(1, weight=1)
+
 		# The content_frame encompasses the two panes of the variable frame and the content frame
 		frame_panes = ttk.PanedWindow(self.content_frame, orient=tk.HORIZONTAL, width=600)
 		frame_panes.grid(row=0, column=0, sticky=tk.NSEW)
@@ -6753,7 +6762,7 @@ class UniqueValuesDialog(Dialog):
 		var_frame = tk.Frame(frame_panes, width=250, borderwidth=2, relief=tk.RIDGE)
 		var_frame.grid(row=0, column=0, sticky=tk.NSEW)
 		var_frame.rowconfigure(0, weight=1)
-		var_frame.columnconfigure(0, weight=1)
+		var_frame.columnconfigure(0, weight=1, minsize=200)
 		frame_panes.add(var_frame, weight=1)
 		# Add multi-select list of variables to the leftmost pane
 		varvals = [[v] for v in self.variables]
@@ -6787,20 +6796,48 @@ class UniqueValuesDialog(Dialog):
 
 	def q_recalc(self, *event, get_data=True):
 		self.clear_output()
-		if len(self.column_table.selection()) > 0 and get_data:
-			self.recalc()
+		if len(self.column_table.selection()) > 0:
+			self.get_data()
+			if self.rawdataset is not None and len(self.rawdataset[0]) > 0:
+				self.recalc()
 
-	def recalc(self):
-		column_list = []
+	def get_data(self):
+		# Get the selected data into 'dataset'
+		self.rawdataset = None
+		self.colnames = []
 		for sel_row in self.column_table.selection():
 			datarow = self.column_table.item(sel_row)["values"]
-			column_list.append(datarow[0])
-		dbcols = db_colnames(column_list)
-		colstr = ",".join(dbcols)
-		sqlcmd = f"select distinct {colstr}, count(*) as nrows from mapdata group by {colstr} order by {colstr};"
-		cur = data_db.cursor()
-		self.dataset = cur.execute(sqlcmd).fetchall()
-		self.data_labels = column_list + ["Count"]
+			self.colnames.append(datarow[0])
+		if len(self.colnames) > 0:
+			# Get either only the selected data or all data.
+			dataset = chosen_dataset(self.parent, self.colnames, self.sel_only_var.get()=='1')
+			if dataset is None or len(dataset[0]) == 0:
+				self.rawdataset = None
+				self.colnames = None
+			else:
+				self.rawdataset = dataset
+
+	def recalc(self):
+		if self.indiv_var.get()=='1':
+			counts = dict(zip(self.colnames, [0 for _ in range(len(self.colnames))]))
+			for i,col in enumerate(self.colnames):
+				counts[col] = len(set([x for x in self.rawdataset[i] if x is not None and str(x) != '']))
+			self.dataset = list(counts.items())
+			self.data_labels = ["Variable", "Count"]
+		else:
+			counts = {}
+			ds = columns_to_rows(self.rawdataset)
+			for row in ds:
+				trow = tuple(row)
+				if trow not in counts.keys():
+					counts[trow] = 1
+				else:
+					counts[trow] += 1
+			self.dataset = [list(k) for k in counts.keys()]
+			vals = list(counts.values())
+			for i in range(len(counts)):
+				self.dataset[i].append(vals[i])
+			self.data_labels = self.colnames + ["Count"]
 		tframe, tdata = treeview_table(self.values_frame, self.dataset, self.data_labels)
 		tframe.grid(row=0, column=0, sticky=tk.NSEW)
 		self.dlg.bind("<Control-s>", self.save_data)
@@ -13656,7 +13693,7 @@ class NMFUnmixingDialog(Dialog):
 		frame_panes.grid(row=0, column=0, sticky=tk.NSEW)
 
 		# Variable frame for list of quantitative columns/variables
-		var_frame = tk.Frame(frame_panes, borderwidth=2, relief=tk.RIDGE)
+		var_frame = tk.Frame(frame_panes, width=250, borderwidth=2, relief=tk.RIDGE)
 		var_frame.grid(row=0, column=0, sticky=tk.NSEW)
 		var_frame.rowconfigure(0, weight=1)
 		var_frame.columnconfigure(0, weight=1, minsize=200)

{mapdata-3.20.0 → mapdata-3.21.0/mapdata.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: mapdata
-Version: 3.20.0
+Version: 3.21.0
 Summary: An interactive map and table explorer for geographic coordinates in a spreadsheet, CSV file, or database that includes data plotting and statistical summaries
 Home-page: https:/hg.sr.ht/~rdnielsen/mapdata
 Author: Dreas Nielsen
@@ -24,21 +24,6 @@ Classifier: Topic :: Scientific/Engineering
 Requires-Python: >=3.8
 Description-Content-Type: text/markdown
 License-File: LICENSE.txt
-Requires-Dist: tkintermapview
-Requires-Dist: pyproj
-Requires-Dist: jenkspy
-Requires-Dist: odfpy
-Requires-Dist: openpyxl
-Requires-Dist: xlrd
-Requires-Dist: matplotlib
-Requires-Dist: seaborn
-Requires-Dist: loess
-Requires-Dist: statsmodels
-Requires-Dist: scipy
-Requires-Dist: scikit-learn
-Requires-Dist: pymannkendall
-Requires-Dist: umap-learn
-Requires-Dist: pynndescent
 
 
 *mapdata.py* is a data explorer for data sets containing geographic coordinates.  Data can be read from a CSV file, spreadsheet, or database.  Both a map and a data

{mapdata-3.20.0 → mapdata-3.21.0}/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.20.0',
+	version='3.21.0',
 	description="An interactive map and table explorer for geographic coordinates in a spreadsheet, CSV file, or database that includes data plotting and statistical summaries",
 	author='Dreas Nielsen',
 	author_email='cortice@tutanota.com',

{mapdata-3.20.0 → mapdata-3.21.0}/mapdata.egg-info/requires.txt

@@ -1,15 +1,15 @@
-tkintermapview
-pyproj
 jenkspy
+loess
+matplotlib
 odfpy
 openpyxl
-xlrd
-matplotlib
+pymannkendall
+pynndescent
+pyproj
+scikit-learn
+scipy
 seaborn
-loess
 statsmodels
-scipy
-scikit-learn
-pymannkendall
+tkintermapview
 umap-learn
-pynndescent
+xlrd