mapdata 3.0.0__tar.gz → 3.1.0__tar.gz

{mapdata-3.0.0/mapdata.egg-info → mapdata-3.1.0}/PKG-INFO

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

@@ -24,8 +24,8 @@
 #
 # ==================================================================
 
-version = "3.0.0"
-vdate = "2024-02-13"
+version = "3.1.0"
+vdate = "2024-02-18"
 
 copyright = "2023-2024"
 
@@ -6519,7 +6519,7 @@ class ContTableDialog(object):
 		prompt_frame = tk.Frame(self.dlg, borderwidth=5)
 		prompt_frame.grid(row=0, column=0, sticky=tk.N+tk.EW, pady=(3,3))
 		prompt_frame.columnconfigure(0, weight=1)
-		msg_lbl = ttk.Label(prompt_frame, width=70, text="Select row and column variables. For each, the range of positive responses must be specified")
+		msg_lbl = ttk.Label(prompt_frame, width=200, text="Select row and column variables. Conventionally, the row represents the explanatory or treatment variable and the column represents the response, condition, or effect variable.  For each, the range of positive responses must be specified.")
 		msg_lbl.grid(row=0, column=0, sticky=tk.W, padx=(6,6), pady=(3,3))
 		def wrap_msg(event):
 			msg_lbl.configure(wraplength=event.width - 5)
@@ -6568,15 +6568,16 @@ class ContTableDialog(object):
 		self.autoupdate_ck.grid(row=0, column=1, sticky=tk.W, padx=(6,3), pady=(3,3))
 
 		# Row and column variables
+		num_validator = self.dlg.register(self.validate_num_entry)
 		ttk.Label(rowvar_frame, text="Row variable (R)").grid(row=0, column=0, sticky=tk.W, padx=(6,3), pady=(3,1))
 		ttk.Label(colvar_frame, text="Column variable (C)").grid(row=0, column=0, sticky=tk.W, padx=(6,3), pady=(3,1))
 		self.row_var = tk.StringVar(rowvar_frame)
 		self.row_sel = ttk.Combobox(rowvar_frame, state="readonly", textvariable=self.row_var, values=self.selectable_columns, width=24)
-		self.row_sel.grid(row=1, column=0, columnspan=2, sticky=tk.N+tk.EW, padx=(3,3), pady=(3,3))
+		self.row_sel.grid(row=1, column=0, columnspan=3, sticky=tk.N+tk.EW, padx=(3,3), pady=(3,3))
 		self.row_sel.bind("<<ComboboxSelected>>", self.ck_rowvar)
 		self.col_var = tk.StringVar(colvar_frame)
 		self.col_sel = ttk.Combobox(colvar_frame, state="readonly", textvariable=self.col_var, values=self.selectable_columns, width=24)
-		self.col_sel.grid(row=1, column=0, columnspan=2, sticky=tk.N+tk.EW, padx=(3,3), pady=(3,3))
+		self.col_sel.grid(row=1, column=0, columnspan=3, sticky=tk.N+tk.EW, padx=(3,3), pady=(3,3))
 		self.col_sel.bind("<<ComboboxSelected>>", self.ck_colvar)
 
 		self.row_thresh_lbl = ttk.Label(rowvar_frame, text="Threshold for\npositive response")
@@ -6588,19 +6589,25 @@ class ContTableDialog(object):
 		# or a selected list of categorical values specified in a Listbox widget.  The Entry widget is
 		# initially displayed, but disabled.  The 'ck_rowvar' and 'ck_colvar' methods hide and re-grid
 		# these widgets as necessary.
+		gt_lt_list = ['>', '<']
 		self.row_thresh_var = tk.DoubleVar(rowvar_frame, 0.0)
 		self.row_thresh_listvar = tk.Variable(rowvar_frame)
-		#self.row_thresh_entry = ttk.Entry(rowvar_frame, width=6, textvariable=self.row_thresh_var, validate="focusout", validatecommand=self.ck_row_thresh_num)
-		self.row_thresh_entry = ttk.Entry(rowvar_frame, width=6, textvariable=self.row_thresh_var)
+		self.row_thresh_gtlt_var = tk.StringVar(rowvar_frame, '>')
+		self.row_thresh_gtlt = ttk.Combobox(rowvar_frame, width=2, state="disabled", textvariable=self.row_thresh_gtlt_var, values=gt_lt_list)
+		self.row_thresh_gtlt.bind("<<ComboboxSelected>>", self.q_recalc)
+		self.row_thresh_gtlt.grid(row=2, column=1, sticky=tk.N+tk.E, padx=(3,0), pady=(3,3))
+		self.row_thresh_entry = ttk.Entry(rowvar_frame, width=6, textvariable=self.row_thresh_var, state="disabled", validate='key', validatecommand=(num_validator, '%P'))
 		self.row_thresh_entry.bind("<KeyRelease>", self.ck_row_thresh_num)
-		self.row_thresh_entry.grid(row=2, column=1, sticky=tk.N+tk.EW, padx=(3,3), pady=(3,3))
-		self.row_thresh_entry["state"] = tk.DISABLED
+		self.row_thresh_entry.grid(row=2, column=2, sticky=tk.N+tk.EW, padx=(3,3), pady=(3,3))
 		self.col_thresh_var = tk.DoubleVar(colvar_frame, 0.0)
+		self.col_thresh_gtlt_var = tk.StringVar(colvar_frame, '>')
+		self.col_thresh_gtlt = ttk.Combobox(colvar_frame, width=2, state="disabled", textvariable=self.col_thresh_gtlt_var, values=gt_lt_list)
+		self.col_thresh_gtlt.bind("<<ComboboxSelected>>", self.q_recalc)
+		self.col_thresh_gtlt.grid(row=2, column=1, sticky=tk.N+tk.E, padx=(3,0), pady=(3,3))
 		self.col_thresh_listvar = tk.Variable(colvar_frame)
-		self.col_thresh_entry = ttk.Entry(colvar_frame, width=6, textvariable=self.col_thresh_var)
+		self.col_thresh_entry = ttk.Entry(colvar_frame, width=6, textvariable=self.col_thresh_var, state="disabled", validate='key', validatecommand=(num_validator, '%P'))
 		self.col_thresh_entry.bind("<KeyRelease>", self.ck_col_thresh_num)
-		self.col_thresh_entry.grid(row=2, column=1, sticky=tk.N+tk.EW, padx=(3,3), pady=(3,3))
-		self.col_thresh_entry["state"] = tk.DISABLED
+		self.col_thresh_entry.grid(row=2, column=2, sticky=tk.N+tk.EW, padx=(3,3), pady=(3,3))
 		self.row_thresh_list = tk.Listbox(rowvar_frame, listvariable=self.row_thresh_listvar, selectmode=tk.MULTIPLE, width=24, height=24)
 		self.row_thresh_list.configure(exportselection=False)
 		self.row_thresh_list.bind("<<ListboxSelect>>", self.ck_row_thresh_list)
@@ -6619,7 +6626,7 @@ class ContTableDialog(object):
 		self.out_tbl_frm = tk.Frame(output_panes, borderwidth=3, relief=tk.RIDGE)
 		self.out_tbl_frm.grid(row=0, column=0, sticky=tk.NSEW)
 		self.out_tbl_frm.rowconfigure(0, weight=1)
-		self.out_tbl_frm.columnconfigure(0, weight=1, minsize=380)
+		self.out_tbl_frm.columnconfigure(0, weight=1, minsize=400)
 		output_panes.add(self.out_tbl_frm, weight=1)
 
 		self.out_plt_frm = tk.Frame(output_panes, borderwidth=3, relief=tk.RIDGE)
@@ -6658,6 +6665,9 @@ class ContTableDialog(object):
 	def do_help(self, *args):
 		webbrowser.open("https://mapdata.readthedocs.io/en/latest/dialogs.html#contingency-table-dialog", new=2, autoraise=True)
 
+	def validate_num_entry(self, potential_new_value):
+		return not (potential_new_value is None or len(str(potential_new_value)) == 0)
+
 	def clear_output(self):
 		for ctl in self.out_tbl_frm.winfo_children():
 			ctl.destroy()
@@ -6687,6 +6697,7 @@ class ContTableDialog(object):
 		if rowvar in self.categ_columns:
 			self.row_thresh_lbl["text"] = "Select categories for\npositive response"
 			self.row_thresh_entry.grid_forget()
+			self.row_thresh_gtlt.grid_forget()
 			self.row_thresh_list.grid(row=3, column=0, sticky=tk.N+tk.EW, padx=(3,0), pady=(3,3))
 			self.rsb.grid(row=3, column=1, sticky=tk.NS, pady=(3,3))
 			# Populate the list box
@@ -6699,7 +6710,9 @@ class ContTableDialog(object):
 			self.row_thresh_lbl["text"] = "Threshold for\npositive response"
 			self.row_thresh_list.grid_forget()
 			self.rsb.grid_forget()
-			self.row_thresh_entry.grid(row=2, column=1, sticky=tk.N+tk.EW, padx=(3,3), pady=(3,3))
+			self.row_thresh_gtlt.grid(row=2, column=1, sticky=tk.N+tk.E, padx=(3,0), pady=(3,3))
+			self.row_thresh_entry.grid(row=2, column=2, sticky=tk.N+tk.EW, padx=(3,3), pady=(3,3))
+			self.row_thresh_gtlt["state"] = "readonly"
 			self.row_thresh_entry["state"] = tk.NORMAL
 		self.q_recalc()
 
@@ -6709,6 +6722,7 @@ class ContTableDialog(object):
 		if colvar in self.categ_columns:
 			self.col_thresh_lbl["text"] = "Select categories for\npositive response"
 			self.col_thresh_entry.grid_forget()
+			self.col_thresh_gtlt.grid_forget()
 			self.col_thresh_list.grid(row=3, column=0, sticky=tk.N+tk.EW, padx=(3,0), pady=(3,3))
 			self.csb.grid(row=3, column=1, sticky=tk.NS, pady=(3,3))
 			# Populate the list box
@@ -6721,7 +6735,9 @@ class ContTableDialog(object):
 			self.col_thresh_lbl["text"] = "Threshold for\npositive response"
 			self.col_thresh_list.grid_forget()
 			self.csb.grid_forget()
-			self.col_thresh_entry.grid(row=2, column=1, sticky=tk.N+tk.EW, padx=(3,3), pady=(3,3))
+			self.row_thresh_gtlt.grid(row=2, column=1, sticky=tk.N+tk.E, padx=(3,0), pady=(3,3))
+			self.col_thresh_entry.grid(row=2, column=2, sticky=tk.N+tk.EW, padx=(3,3), pady=(3,3))
+			self.col_thresh_gtlt["state"] = "readonly"
 			self.col_thresh_entry["state"] = tk.NORMAL
 		self.q_recalc()
 
@@ -6737,7 +6753,7 @@ class ContTableDialog(object):
 	def ck_row_thresh_list(self, event=None):
 		self.q_recalc()
 
-	def q_recalc(self):
+	def q_recalc(self, event=None):
 		# Recalculation can be done if both row and column variables are specifiied and have
 		# thresholds selected.
 		can_recalc = 0
@@ -6778,7 +6794,13 @@ class ContTableDialog(object):
 			rowvals = ",".join(squotelist(rowthreshvals))
 			row_sql = f"{rv} in ({rowvals})"
 		else:
-			row_sql = f"{rv} > {self.row_thresh_var.get()}"
+			rtv = self.row_thresh_var.get()
+			if type(rtv) not in (int, float):
+				rtv = 0
+			if self.row_thresh_gtlt_var.get() == '>':
+				row_sql = f"{rv} > {rtv}"
+			else:
+				row_sql = f"{rv} < {rtv}"
 		if cv in self.categ_columns:
 			list_items = self.col_thresh_listvar.get()
 			curr_selections = self.col_thresh_list.curselection()
@@ -6786,7 +6808,13 @@ class ContTableDialog(object):
 			colvals = ",".join(squotelist(colthreshvals))
 			col_sql = f"{cv} in ({colvals})"
 		else:
-			col_sql = f"{cv} > {self.col_thresh_var.get()}"
+			ctv = self.col_thresh_var.get()
+			if type(ctv) not in (int, float):
+				ctv = 0
+			if self.col_thresh_gtlt_var.get() == '>':
+				col_sql = f"{cv} > {ctv}"
+			else:
+				col_sql = f"{cv} < {ctv}"
 		if self.sel_only_var.get() == '1':
 			tv_ids = ",".join(self.parent.tbl.selection())
 			sel_sql = f"and treeviewid in ({tv_ids})"
@@ -6851,6 +6879,25 @@ class ContTableDialog(object):
 				be = spstats.boschloo_exact(dt)
 				self.statdata.append(["Boschloo exact test statistic", fp_display(be.statistic)])
 				self.statdata.append(["Boschloo exact test p value", fp_display(be.pvalue)])
+			if ct_data[0][1] != 0 and not (ct_data[0][0] == 0 and ct_data[1][0] == 0):
+				self.statdata.append(["Risk ratio", fp_display((ct_data[0][0] * (ct_data[0][1] + ct_data[1][1])) / \
+						(ct_data[0][1] * (ct_data[0][0] + ct_data[1][0])))])
+			if ct_data[0][1] != 0 and ct_data[1][0] != 0:
+				oddsr = ((ct_data[0][0] * ct_data[1][1]) / (ct_data[0][1]) * ct_data[1][0])
+				self.statdata.append(["Odds ratio", fp_display(oddsr)])
+				if oddsr != 0.0:
+					log_or = math.log(oddsr)
+					self.statdata.append(["Log odds ratio", fp_display(log_or)])
+					se_logor = math.sqrt(1/ct_data[0][0] + 1/ct_data[0][1] + 1/ct_data[1][0] + 1/ct_data[1][1])
+					self.statdata.append(["SE of log odds ratio", fp_display(se_logor)])
+					halfint = 1.96 * se_logor
+					self.statdata.append(["95% CI for log odds ratio", fp_display(log_or - halfint) + " - " + fp_display(log_or + halfint)])
+				self.statdata.append(["Yule's association (Q)", fp_display((oddsr - 1)/(oddsr + 1))])
+				self.statdata.append(["Yule's colligation (Y)", fp_display((math.sqrt(oddsr) - 1)/(math.sqrt(oddsr) + 1))])
+				n = ct_data[2][2]
+				phi = (((ct_data[0][0]/n) * (ct_data[1][1]/n)) - ((ct_data[0][1]/n) * (ct_data[1][0]/n))) / \
+						math.sqrt((ct_data[0][2]/n) * (ct_data[1][2]/n) * (ct_data[2][0]/n) * (ct_data[2][1]/n))
+				self.statdata.append(["Yule's phi", fp_display(phi)])
 			if ct_data[2][2] != 0:
 				self.statdata.append(["P(R)", fp_display(ct_data[0][2]/ct_data[2][2])])
 				if ct_data[2][0] != 0:
@@ -6954,7 +7001,7 @@ class ROCCurveDialog(object):
 		ttk.Label(condition_frame, text="Condition variable").grid(row=0, column=0, sticky=tk.W, padx=(6,3), pady=(3,1))
 		self.cond_var = tk.StringVar(condition_frame)
 		self.cond_sel = ttk.Combobox(condition_frame, state="readonly", textvariable=self.cond_var, values=self.condition_columns, width=24)
-		self.cond_sel.grid(row=1, column=0, columnspan=2, sticky=tk.N+tk.EW, padx=(3,3), pady=(3,3))
+		self.cond_sel.grid(row=1, column=0, columnspan=3, sticky=tk.N+tk.EW, padx=(3,3), pady=(3,3))
 		self.cond_sel.bind("<<ComboboxSelected>>", self.ck_condvar)
 
 		self.cond_thresh_lbl = ttk.Label(condition_frame, text="Threshold for\npositive response")
@@ -6964,11 +7011,17 @@ class ROCCurveDialog(object):
 		# or a selected list of categorical values specified in a Listbox widget.  The Entry widget is
 		# initially displayed, but disabled.  The 'ck_rowvar' and 'ck_colvar' methods hide and re-grid
 		# these widgets as necessary.
+		gt_lt_list = ['>', '<']
+		num_validator = self.dlg.register(self.validate_num_entry)
 		self.cond_thresh_var = tk.DoubleVar(condition_frame, 0.0)
 		self.cond_thresh_listvar = tk.Variable(condition_frame)
-		self.cond_thresh_entry = ttk.Entry(condition_frame, width=6, textvariable=self.cond_thresh_var)
+		self.cond_thresh_gtlt_var = tk.StringVar(condition_frame, '>')
+		self.cond_thresh_gtlt = ttk.Combobox(condition_frame, width=2, state="disabled", textvariable=self.cond_thresh_gtlt_var, values=gt_lt_list)
+		self.cond_thresh_gtlt.bind("<<ComboboxSelected>>", self.q_recalc)
+		self.cond_thresh_gtlt.grid(row=2, column=1, sticky=tk.N+tk.E, padx=(3,0), pady=(3,3))
+		self.cond_thresh_entry = ttk.Entry(condition_frame, width=6, textvariable=self.cond_thresh_var, validate='key', validatecommand=(num_validator, '%P'))
 		self.cond_thresh_entry.bind("<KeyRelease>", self.ck_cond_thresh_num)
-		self.cond_thresh_entry.grid(row=2, column=1, sticky=tk.N+tk.EW, padx=(3,3), pady=(3,3))
+		self.cond_thresh_entry.grid(row=2, column=2, sticky=tk.N+tk.EW, padx=(3,3), pady=(3,3))
 		self.cond_thresh_entry["state"] = tk.DISABLED
 		self.cond_thresh_list = tk.Listbox(condition_frame, listvariable=self.cond_thresh_listvar, selectmode=tk.MULTIPLE, width=24, height=15)
 		self.cond_thresh_list.configure(exportselection=False)
@@ -7015,7 +7068,7 @@ class ROCCurveDialog(object):
 		# Populate stat_frame
 		ttk.Label(stat_frame, text="Prediction threshold").grid(row=0, column=0, sticky=tk.W, padx=(3,3), pady=(3,3))
 		self.pred_thresh_var = tk.DoubleVar(stat_frame, 0.0)
-		self.pred_thresh_entry = ttk.Entry(stat_frame, width=6, textvariable=self.pred_thresh_var)
+		self.pred_thresh_entry = ttk.Entry(stat_frame, width=6, textvariable=self.pred_thresh_var, validate='key', validatecommand=(num_validator, '%P'))
 		self.pred_thresh_entry.bind("<KeyRelease>", self.ck_pred_thresh_num)
 		self.pred_thresh_entry.grid(row=1, column=0, sticky=tk.N+tk.W, padx=(3,3), pady=(3,3))
 
@@ -7050,6 +7103,9 @@ class ROCCurveDialog(object):
 	def do_help(self, *args):
 		webbrowser.open("https://mapdata.readthedocs.io/en/latest/dialogs.html#receiver-operating-characteristics-dialog", new=2, autoraise=True)
 
+	def validate_num_entry(self, potential_new_value):
+		return not (potential_new_value is None or len(str(potential_new_value)) == 0)
+
 	def clear_output(self):
 		for ctl in self.out_tbl_frm.winfo_children():
 			ctl.destroy()
@@ -7070,6 +7126,7 @@ class ROCCurveDialog(object):
 		if condvar in self.categ_columns:
 			self.cond_thresh_lbl["text"] = "Select categories for\npositive response"
 			self.cond_thresh_entry.grid_forget()
+			self.cond_thresh_gtlt.grid_forget()
 			self.cond_thresh_list.grid(row=3, column=0, sticky=tk.N+tk.EW, padx=(3,0), pady=(3,3))
 			self.condsb.grid(row=3, column=1, sticky=tk.NS, pady=(3,3))
 			# Populate the list box
@@ -7082,7 +7139,9 @@ class ROCCurveDialog(object):
 			self.cond_thresh_lbl["text"] = "Threshold for\npositive response"
 			self.cond_thresh_list.grid_forget()
 			self.condsb.grid_forget()
-			self.cond_thresh_entry.grid(row=2, column=1, sticky=tk.N+tk.EW, padx=(3,3), pady=(3,3))
+			self.cond_thresh_gtlt.grid(row=2, column=1, sticky=tk.NE, padx=(3,0), pady=(3,3))
+			self.cond_thresh_entry.grid(row=2, column=2, sticky=tk.N+tk.EW, padx=(3,3), pady=(3,3))
+			self.cond_thresh_gtlt["state"] = "readonly"
 			self.cond_thresh_entry["state"] = tk.NORMAL
 		self.q_recalc()
 
@@ -7099,7 +7158,7 @@ class ROCCurveDialog(object):
 	def ck_cond_thresh_list(self, event=None):
 		self.q_recalc()
 
-	def q_recalc(self):
+	def q_recalc(self, event=None):
 		# Recalculation can be done if the condition variable and positive values have been
 		# specified, and a prediction variable specified.  The prediction threshold is always
 		# specified, defaulting to zero, so does not affect whether recalculation can be done.
@@ -7153,7 +7212,10 @@ class ROCCurveDialog(object):
 				positives = [clean_data[0][i] in condthreshvals for i in range(len(clean_data[0]))]
 			else:
 				threshval = self.cond_thresh_var.get()
-				positives = [clean_data[0][i] > threshval for i in range(len(clean_data[0]))]
+				if self.cond_thresh_gtlt_var.get() == '>':
+					positives = [clean_data[0][i] > threshval for i in range(len(clean_data[0]))]
+				else:
+					positives = [clean_data[0][i] < threshval for i in range(len(clean_data[0]))]
 			clean_data.append(positives)
 			self.dataset = sort_columns(clean_data)
 			self.data_labels = [self.cond_var.get(), self.pred_var.get(), "Positive"]

{mapdata-3.0.0 → mapdata-3.1.0/mapdata.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: mapdata
-Version: 3.0.0
+Version: 3.1.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-3.0.0 → mapdata-3.1.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.0.0',
+	version='3.1.0',
 	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',