Merge pull request #1 from lixun910/dev1.9

patch 1.8.2

Explore/LineChartView.cpp

@@ -1056,7 +1056,7 @@ void LineChartFrame::OnSaveDummyTable(wxCommandEvent& event)
             wxString col_name(var_man.GetName(i));
             int n = var_stack_array[i].size();
             if (mem_table_int == NULL) mem_table_int = new OGRTable(n);
-            OGRColumn* var_col = new OGRColumnDouble(col_name, 18, -1, n);
+            OGRColumn* var_col = new OGRColumnDouble(col_name, 18, 9, n);
             var_col->UpdateData(var_stack_array[i]);
             mem_table_int->AddOGRColumn(var_col);
         }

TemplateCanvas.cpp

@@ -495,8 +495,8 @@ void TemplateCanvas::ResizeSelectableShps(int virtual_scrn_w,
 		int offset_vs_x = (int)(whole_vs_w * (map_topleft.x-ext_shps_orig_xmin) / shp_w);
 		int offset_vs_y = (int)(whole_vs_h * (ext_shps_orig_ymax-map_topleft.y) / shp_h);
 
-		SetVirtualSize(whole_vs_w, whole_vs_h);
-		SetScrollRate(1,1);
+		//SetVirtualSize(whole_vs_w, whole_vs_h);
+		//SetScrollRate(1,1);
 		prev_scroll_pos_x =  offset_vs_x > 0 ? offset_vs_x:0;
 		prev_scroll_pos_y =  offset_vs_y > 0 ? offset_vs_y:0;
 		//SetScrollPos(wxHORIZONTAL, prev_scroll_pos_x);
@@ -522,7 +522,7 @@ void TemplateCanvas::ResetShapes()
 
 	int vs_w=0, vs_h=0;
 	GetClientSize(&vs_w, &vs_h);
-	SetVirtualSize(vs_w, vs_h);
+	//SetVirtualSize(vs_w, vs_h);
 	//SetScrollbars(1, 1, vs_w, vs_h, 0, 0, true);
 
 	SetMouseMode(select);
@@ -1146,15 +1146,18 @@ void TemplateCanvas::DrawSelectableShapes_gc(wxMemoryDC &dc)
             }
 			//gc->SetBrush(cat_data.GetCategoryBrush(cc_ts, cat));
 			std::vector<int>& ids = cat_data.GetIdsRef(cc_ts, cat);
+
+            wxGraphicsPath path = gc->CreatePath();
 
 			for (int i=0, iend=ids.size(); i<iend; i++) {
 				p = (GdaPoint*) selectable_shps[ids[i]];
 				if (p->isNull()) continue;
-				wxGraphicsPath path = gc->CreatePath();
+
 				path.AddCircle(p->center.x, p->center.y, r);
-				gc->StrokePath(path);
 
-			}			
+
+			}
+            gc->StrokePath(path);
 		}
 	} else if (selectable_shps_type == polygons) {
 		int dirty_cnt = 0;