conditional plots - allow a single dimension of conditioning #1775

update version
GeoDaCenter · Dec 7, 2018 · 000e7ec · 000e7ec
1 parent 092f6fe
commit 000e7ec
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 3 deletions.
diff --git a/Explore/ConditionalMapView.cpp b/Explore/ConditionalMapView.cpp
@@ -118,7 +118,18 @@ void ConditionalMapCanvas::DisplayRightClickMenu(const wxPoint& pos)
 	AddTimeVariantOptionsToMenu(optMenu);
 	AppendCustomCategories(optMenu, project->GetCatClassifManager());
 	SetCheckMarks(optMenu);
-
+
+    if (var_info[VERT_VAR].is_hide) {
+        wxMenuItem* m = optMenu->FindItem(XRCID("ID_CAT_CLASSIF_B_MENU"));
+        wxMenu* smi = m->GetSubMenu();
+        GeneralWxUtils::EnableMenuRecursive(smi, false);
+    }
+    if (var_info[HOR_VAR].is_hide) {
+        wxMenuItem* m = optMenu->FindItem(XRCID("ID_CAT_CLASSIF_C_MENU"));
+        wxMenu* smi = m->GetSubMenu();
+        GeneralWxUtils::EnableMenuRecursive(smi, false);
+    }
+
 	template_frame->UpdateContextMenuItems(optMenu);
 	template_frame->PopupMenu(optMenu, pos + GetPosition());
 	template_frame->UpdateOptionMenuItems();

diff --git a/version.h b/version.h
@@ -2,10 +2,10 @@ namespace Gda {
 	const int version_major = 1;
 	const int version_minor = 12;
 	const int version_build = 1;
-	const int version_subbuild = 179;
+	const int version_subbuild = 181;
 	const int version_year = 2018;
 	const int version_month = 12;
-    const int version_day = 4;
+    const int version_day = 6;
 	const int version_night = 0;
 	const int version_type = 2; // 0: alpha, 1: beta, 2: release
 }