Skip to content

Commit

Permalink
fix OpenCL binary issue; update chinese version for all maps
Browse files Browse the repository at this point in the history
  • Loading branch information
@lixun910
lixun910 committed May 21, 2018
1 parent 19902b9 commit 797aa59
Show file tree
Hide file tree
Showing 25 changed files with 124 additions and 121 deletions.
2 changes: 2 additions & 0 deletions BuildTools/macosx/GNUmakefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,8 @@ build-geoda-mac:
mkdir -p build/GeoDa.app/Contents/Resources/plugins
cp $(GeoDa_ROOT)/BuildTools/CommonDistFiles/web_plugins/*.* build/GeoDa.app/Contents/Resources/
cp $(GeoDa_ROOT)/BuildTools/CommonDistFiles/cache.sqlite build/GeoDa.app/Contents/MacOS
cp $(GeoDa_ROOT)/Algorithms/lisa_kernel.cl build/GeoDa.app/Contents/MacOS
cp -rf $(GeoDa_ROOT)/internationalization/lang build/GeoDa.app/Contents/MacOS
$(LD) $(LDFLAGS) $(GeoDa_OBJ) $(LIBS) -o build/GeoDa.app/Contents/MacOS/GeoDa
cp run.sh build/GeoDa.app/Contents/MacOS/run.sh
cp GeoDa-GDAL-Info.plist build/GeoDa.app/Contents/Info.plist
Expand Down
4 changes: 2 additions & 2 deletions DataViewer/TableBase.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -128,9 +128,9 @@ void TableBase::UpdateStatusBar()
wxStatusBar* sb = template_frame->GetStatusBar();
if (!sb) return;
wxString s;
s << "#row=" << project->GetNumRecords() << " ";
s << _("#row=") << project->GetNumRecords() << " ";
if (highlight_state->GetTotalHighlighted()> 0) {
s << "#selected=" << highlight_state->GetTotalHighlighted() << " ";
s << _("#selected=") << highlight_state->GetTotalHighlighted() << " ";
}

sb->SetStatusText(s);
Expand Down
3 changes: 2 additions & 1 deletion DialogTools/CatClassifDlg.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -594,7 +594,8 @@ void CatClassifHistCanvas::UpdateStatusBar()
}
s << a << (*breaks)[ival-1] << ", " << (*breaks)[ival] << b;
}
s << ", #obs: " << ival_obs_cnt[ival];
s << ", ";
s << _("#obs") << ": " << ival_obs_cnt[ival];
double p = 100.0*((double) ival_obs_cnt[ival])/((double) num_obs);
s << ", %tot: ";
s << wxString::Format("%.1f", p);
Expand Down
10 changes: 5 additions & 5 deletions Explore/AbstractClusterMap.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -390,23 +390,23 @@ void AbstractMapCanvas::UpdateStatusBar()
if (!sb)
return;
wxString s;
s << "#obs=" << project->GetNumRecords() <<" ";
s << _("#obs=") << project->GetNumRecords() <<" ";

if ( highlight_state->GetTotalHighlighted() > 0) {
// for highlight from other windows
s << "#selected=" << highlight_state->GetTotalHighlighted()<< " ";
s << _("#selected=") << highlight_state->GetTotalHighlighted()<< " ";
}
if (mousemode == select && selectstate == start) {
if (total_hover_obs >= 1) {
s << "hover obs " << hover_obs[0]+1;
s << _("#hover obs ") << hover_obs[0]+1;
}
if (total_hover_obs >= 2) {
s << ", ";
s << "obs " << hover_obs[1]+1;
s << _("obs ") << hover_obs[1]+1;
}
if (total_hover_obs >= 3) {
s << ", ";
s << "obs " << hover_obs[2]+1;
s << _("obs ") << hover_obs[2]+1;
}
if (total_hover_obs >= 4) {
s << ", ...";
Expand Down
12 changes: 6 additions & 6 deletions Explore/BoxNewPlotView.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -894,7 +894,7 @@ void BoxPlotCanvas::UpdateStatusBar()
wxString s;
if (highlight_state->GetTotalHighlighted()> 0) {
int n_total_hl = highlight_state->GetTotalHighlighted();
s << "#selected=" << n_total_hl << " ";
s << _("#selected=") << n_total_hl << " ";

if (num_time_vals == 1) {
int t = 0;
Expand All @@ -905,7 +905,7 @@ void BoxPlotCanvas::UpdateStatusBar()
}
}
if (n_undefs> 0) {
s << "(undefined:" << n_undefs << ") ";
s << _("undefined: ") << n_undefs << ") ";
}
} else {
wxString str;
Expand All @@ -921,22 +921,22 @@ void BoxPlotCanvas::UpdateStatusBar()
}
}
if (!str.IsEmpty()) {
s << "(undefined:" << str << ")";
s << _("undefined: ") << str << ")";
}
}
}

if (mousemode == select && selectstate == start) {
if (total_hover_obs >= 1) {
s << "hover obs " << hover_obs[0]+1;
s << _("#hover obs ") << hover_obs[0]+1;
}
if (total_hover_obs >= 2) {
s << ", ";
s << "obs " << hover_obs[1]+1;
s << _("obs ") << hover_obs[1]+1;
}
if (total_hover_obs >= 3) {
s << ", ";
s << "obs " << hover_obs[2]+1;
s << _("obs ") << hover_obs[2]+1;
}
if (total_hover_obs >= 4) {
s << ", ...";
Expand Down
8 changes: 4 additions & 4 deletions Explore/CartogramNewView.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -715,23 +715,23 @@ void CartogramNewCanvas::UpdateStatusBar()
if (!sb) return;
wxString s;
if (highlight_state->GetTotalHighlighted()> 0) {
s << "#selected=" << highlight_state->GetTotalHighlighted()<<" ";
s << _("#selected=") << highlight_state->GetTotalHighlighted()<<" ";
}
if (mousemode == select && selectstate == start) {
if (total_hover_obs >= 1) {
s << "hover obs " << hover_obs[0]+1 << " = (";
s << _("#hover obs ") << hover_obs[0]+1 << " = (";
s << data[RAD_VAR][var_info[RAD_VAR].time][hover_obs[0]] << ", ";
s << data[THM_VAR][var_info[THM_VAR].time][hover_obs[0]] << ")";
}
if (total_hover_obs >= 2) {
s << ", ";
s << "obs " << hover_obs[1]+1 << " = (";
s << _("obs ") << hover_obs[1]+1 << " = (";
s << data[RAD_VAR][var_info[RAD_VAR].time][hover_obs[1]] << ", ";
s << data[THM_VAR][var_info[THM_VAR].time][hover_obs[1]] << ")";
}
if (total_hover_obs >= 3) {
s << ", ";
s << "obs " << hover_obs[2]+1 << " = (";
s << _("obs ") << hover_obs[2]+1 << " = (";
s << data[RAD_VAR][var_info[RAD_VAR].time][hover_obs[2]] << ", ";
s << data[THM_VAR][var_info[THM_VAR].time][hover_obs[2]] << ")";
}
Expand Down
10 changes: 5 additions & 5 deletions Explore/ColocationMapView.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -635,23 +635,23 @@ void ColocationMapCanvas::UpdateStatusBar()
if (!sb)
return;
wxString s;
s << "#obs=" << project->GetNumRecords() <<" ";
s << _("#obs=") << project->GetNumRecords() <<" ";

if ( highlight_state->GetTotalHighlighted() > 0) {
// for highlight from other windows
s << "#selected=" << highlight_state->GetTotalHighlighted()<< " ";
s << _("#selected=") << highlight_state->GetTotalHighlighted()<< " ";
}
if (mousemode == select && selectstate == start) {
if (total_hover_obs >= 1) {
s << "hover obs " << hover_obs[0]+1;
s << _("#hover obs ") << hover_obs[0]+1;
}
if (total_hover_obs >= 2) {
s << ", ";
s << "obs " << hover_obs[1]+1;
s << _("obs ") << hover_obs[1]+1;
}
if (total_hover_obs >= 3) {
s << ", ";
s << "obs " << hover_obs[2]+1;
s << _("obs ") << hover_obs[2]+1;
}
if (total_hover_obs >= 4) {
s << ", ...";
Expand Down
Loading

0 comments on commit 797aa59

Please sign in to comment.