Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

patch for 1.8.2 #405

Merged
merged 5 commits into from
Apr 27, 2016
Merged

patch for 1.8.2 #405

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
2bb947c
fix issue #404
lixun910 Apr 26, 2016
c4a2633
fix issue #403
lixun910 Apr 26, 2016
7010e17
fix issue #401
lixun910 Apr 26, 2016
ab3c1aa
update 32-bit ubuntu script
lixun910 Apr 26, 2016
27b3137
Merge pull request #1 from lixun910/dev1.9
lixun910 Apr 27, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions BuildTools/ubuntu/GNUmakefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,11 +72,11 @@ build-geoda-mac:
cp $(GEODA_HOME)/libraries/lib/libproj.so.0.7.0 build/plugins/libproj.so.0
cp $(GEODA_HOME)/libraries/lib/libgeos_c.so.1.7.8 build/plugins/libgeos_c.so.1
cp $(GEODA_HOME)/libraries/lib/libsqlite3.so.0.8.6 build/plugins/libsqlite3.so.0
cp $(GEODA_HOME)/libraries/lib/libiconv.so.2.5.0 build/plugins/libiconv.so.2
cp $(GEODA_HOME)/libraries/lib/libiconv.so.2.5.1 build/plugins/libiconv.so.2
chmod +x build/plugins/libiconv.so.2
cp $(GEODA_HOME)/libraries/lib/libminizip.so.0.0.0 build/plugins/libminizip.so.0
cp $(GEODA_HOME)/libraries/lib/liburiparser.so.1.0.5 build/plugins/liburiparser.so.1
cp $(GEODA_HOME)/libraries/lib/libgeos-3.3.8.so build/plugins/
cp $(GEODA_HOME)/libraries/lib/libgeos-3.3.8.so build/plugins/libgeos-3.3.8.so
cp libraries/share/gdal/* build/gdaldata

clean:
Expand Down
18 changes: 15 additions & 3 deletions BuildTools/ubuntu/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,9 +131,21 @@ echo "%%%%%%%%%%%%%%%%%%%%%%"
fi
}


#########################################################################
# install c-ares -- for cURL, prevent crash on Mac oSx with threads
#########################################################################
install_library c-ares-1.10.0 http://c-ares.haxx.se/download/c-ares-1.10.0.tar.gz libcares.a



#########################################################################
# install cURL
#########################################################################
echo ""
echo "%%%%%%%%%%%%%%%%%%%%%%"
echo "% Building: cURL%"
echo "%%%%%%%%%%%%%%%%%%%%%%"

LIB_NAME=curl-7.46.0
LIB_CHECKER=libcurl.a
Expand Down Expand Up @@ -311,7 +323,7 @@ echo "%%%%%%%%%%%%%%%%%%%%%%%%"
{
LIB_NAME=libspatialite-4.0.0
LIB_URL=https://dl.dropboxusercontent.com/u/145979/geoda_libraries/libspatialite-4.0.0.tar.gz
LIB_FILENAME=$(basename "$LIB_URL" ".tar.gz")
LIB_FILENAME=$LIB_NAME.tar.gz
LIB_CHECKER=libspatialite.a
echo $LIB_FILENAME

Expand Down Expand Up @@ -437,7 +449,7 @@ echo $LIB_FILENAME
cd $DOWNLOAD_HOME

if ! [ -d "$LIB_NAME" ]; then
curl -o https://dl.dropboxusercontent.com/u/145979/geoda_libraries/json_spirit_v4.08.zip
curl -O https://dl.dropboxusercontent.com/u/145979/geoda_libraries/json_spirit_v4.08.zip
unzip $LIB_FILENAME
fi

Expand Down Expand Up @@ -569,7 +581,7 @@ echo "%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%"
./configure
cp -rf $GEODA_HOME/dep/gdal-1.9.2/* .
cp GDALmake.opt GDALmake.opt
#make clean
make clean
$MAKER
make install
#cd ogr/ogrsf_frmts/oci
Expand Down
2 changes: 1 addition & 1 deletion Explore/LineChartView.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Expand Down
15 changes: 9 additions & 6 deletions TemplateCanvas.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -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);
Expand Down Expand Up @@ -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;
Expand Down
Loading