Skip to content

Commit

Permalink
Fix: did save bug + Portuguese (#2399)
Browse files Browse the repository at this point in the history
  • Loading branch information
@lixun910
lixun910 authored Aug 14, 2022
1 parent c625311 commit ad1d166
Show file tree
Hide file tree
Showing 19 changed files with 12,958 additions and 6,210 deletions.
6 changes: 3 additions & 3 deletions BuildTools/macosx/GNUmakefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -95,12 +95,12 @@ build-geoda-mac:
cp /usr/local/opt/gdal/share/gdal/* build/GeoDa.app/Contents/Resources/gdaldata
cp libraries/lib/libwx_osx_cocoau-3.1.4.0.0.dylib build/GeoDa.app/Contents/Frameworks/libwx_osx_cocoau-3.1.dylib
cp libraries/lib/libwx_osx_cocoau_gl-3.1.4.0.0.dylib build/GeoDa.app/Contents/Frameworks/libwx_osx_cocoau_gl-3.1.dylib
cp /usr/local/opt/gdal/lib/libgdal.30.dylib build/GeoDa.app/Contents/Frameworks
cp /usr/local/opt/gdal/lib/libgdal.31.dylib build/GeoDa.app/Contents/Frameworks
install_name_tool -id "GeoDa" build/GeoDa.app/Contents/MacOS/GeoDa
install_name_tool -change "$(GEODA_HOME)/libraries/lib/libwx_osx_cocoau_gl-3.1.dylib" "@executable_path/../Frameworks/libwx_osx_cocoau_gl-3.1.dylib" build/GeoDa.app/Contents/MacOS/GeoDa
install_name_tool -change "$(GEODA_HOME)/libraries/lib/libwx_osx_cocoau-3.1.dylib" "@executable_path/../Frameworks/libwx_osx_cocoau-3.1.dylib" build/GeoDa.app/Contents/MacOS/GeoDa
install_name_tool -change "/usr/local/opt/gdal/lib/libgdal.30.dylib" "@executable_path/../Frameworks/libgdal.30.dylib" build/GeoDa.app/Contents/MacOS/GeoDa
install_name_tool -change "/opt/homebrew/opt/gdal/lib/libgdal.30.dylib" "@executable_path/../Frameworks/libgdal.30.dylib" build/GeoDa.app/Contents/MacOS/GeoDa
install_name_tool -change "/usr/local/opt/gdal/lib/libgdal.31.dylib" "@executable_path/../Frameworks/libgdal.31.dylib" build/GeoDa.app/Contents/MacOS/GeoDa
install_name_tool -change "/opt/homebrew/opt/gdal/lib/libgdal.31.dylib" "@executable_path/../Frameworks/libgdal.31.dylib" build/GeoDa.app/Contents/MacOS/GeoDa
python3 install_name.py $(GEODA_HOME)/build/GeoDa.app/Contents/Frameworks "Developer ID Application: Geodapress LLC (26M5NG43GP)"
install_name_tool -change "@executable_path/../Frameworks/libwx_osx_cocoau-3.1.4.0.0.dylib" "@executable_path/../Frameworks/libwx_osx_cocoau-3.1.dylib" build/GeoDa.app/Contents/Frameworks/libwx_osx_cocoau_gl-3.1.dylib
codesign -f --timestamp -o runtime -s "Developer ID Application: Geodapress LLC (26M5NG43GP)" build/GeoDa.app/Contents/Frameworks/libwx_osx_cocoau_gl-3.1.dylib
Expand Down
2 changes: 1 addition & 1 deletion BuildTools/macosx/GeoDa.m1.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1897,7 +1897,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "# Type a script or drag a script file from your workspace to insert its path.\n#python3 install_name.py $TARGET_BUILD_DIR/$PRODUCT_NAME.app/Contents/Frameworks\nif [ \"${CONFIGURATION}\" = \"Debug\" ]; then\n codesign -f -s \"Apple Development: [email protected] (AN5USPSZF6)\" /opt/homebrew/opt/gdal/lib/libgdal.29.dylib\n codesign -f -s \"Apple Development: [email protected] (AN5USPSZF6)\" /Users/xun/github/geoda/BuildTools/macosx/libraries/lib/libwx_osx_cocoau-3.1.4.0.0.dylib\n codesign -f -s \"Apple Development: [email protected] (AN5USPSZF6)\" /Users/xun/github/geoda/BuildTools/macosx/libraries/lib/libwx_osx_cocoau_gl-3.1.4.0.0.dylib\n #install_name_tool -change \"@rpath/libgeos.3.10.1.dylib\" \"/opt/homebrew/opt/geos/lib/libgeos.3.10.1.dylib\" /opt/homebrew/Cellar/geos/3.10.1/lib/libgeos_c.1.16.0.dylib\n #codesign -f -s \"Apple Development: [email protected] (AN5USPSZF6)\" /opt/homebrew/Cellar/geos/3.10.1/lib/libgeos_c.1.16.0.dylib\nelse\n mkdir $TARGET_BUILD_DIR/$PRODUCT_NAME.app/Contents/Frameworks\n cp /Users/xun/github/geoda/BuildTools/macosx/libraries/lib/libwx_osx_cocoau-3.1.4.0.0.dylib $TARGET_BUILD_DIR/$PRODUCT_NAME.app/Contents/Frameworks/libwx_osx_cocoau-3.1.dylib\n cp /Users/xun/github/geoda/BuildTools/macosx/libraries/lib/libwx_osx_cocoau_gl-3.1.4.0.0.dylib $TARGET_BUILD_DIR/$PRODUCT_NAME.app/Contents/Frameworks/libwx_osx_cocoau_gl-3.1.dylib\n cp /usr/local/opt/gdal/lib/libgdal.29.dylib $TARGET_BUILD_DIR/$PRODUCT_NAME.app/Contents/Frameworks/libgdal.29.dylib\n install_name_tool -id \"GeoDa\" $TARGET_BUILD_DIR/$PRODUCT_NAME.app/Contents/MacOS/GeoDa\n install_name_tool -change \"/Users/xun/github/geoda/BuildTools/macosx/libraries/lib/libwx_osx_cocoau_gl-3.1.dylib\" \"@executable_path/../Frameworks/libwx_osx_cocoau_gl-3.1.dylib\" $TARGET_BUILD_DIR/$PRODUCT_NAME.app/Contents/MacOS/GeoDa\n install_name_tool -change \"/Users/xun/github/geoda/BuildTools/macosx/libraries/lib/libwx_osx_cocoau-3.1.dylib\" \"@executable_path/../Frameworks/libwx_osx_cocoau-3.1.dylib\" $TARGET_BUILD_DIR/$PRODUCT_NAME.app/Contents/MacOS/GeoDa\n install_name_tool -change \"/usr/local/opt/gdal/lib/libgdal.29.dylib\" \"@executable_path/../Frameworks/libgdal.29.dylib\" $TARGET_BUILD_DIR/$PRODUCT_NAME.app/Contents/MacOS/GeoDa\n install_name_tool -change \"/opt/homebrew/opt/gdal/lib/libgdal.29.dylib\" \"@executable_path/../Frameworks/libgdal.29.dylib\" $TARGET_BUILD_DIR/$PRODUCT_NAME.app/Contents/MacOS/GeoDa\n python3 install_name.py $TARGET_BUILD_DIR/$PRODUCT_NAME.app/Contents/Frameworks \"0046C0AE0D6933F7CD8A67875F820AF13CD63439\"\n codesign -f --timestamp -o runtime -s \"0046C0AE0D6933F7CD8A67875F820AF13CD63439\" $TARGET_BUILD_DIR/$PRODUCT_NAME.app/Contents/MacOS/GeoDa\n codesign -f --timestamp -o runtime -s \"0046C0AE0D6933F7CD8A67875F820AF13CD63439\" $TARGET_BUILD_DIR/$PRODUCT_NAME.app\nfi\n";
shellScript = "# Type a script or drag a script file from your workspace to insert its path.\n#python3 install_name.py $TARGET_BUILD_DIR/$PRODUCT_NAME.app/Contents/Frameworks\nif [ \"${CONFIGURATION}\" = \"Debug\" ]; then\n codesign -f -s \"Apple Development: [email protected] (AN5USPSZF6)\" /opt/homebrew/opt/gdal/lib/libgdal.31.dylib\n codesign -f -s \"Apple Development: [email protected] (AN5USPSZF6)\" /opt/homebrew/Cellar/[email protected]/1.1.1o/lib/libcrypto.1.1.dylib\n codesign -f -s \"Apple Development: [email protected] (AN5USPSZF6)\" /Users/xun/github/geoda/BuildTools/macosx/libraries/lib/libwx_osx_cocoau-3.1.4.0.0.dylib\n codesign -f -s \"Apple Development: [email protected] (AN5USPSZF6)\" /Users/xun/github/geoda/BuildTools/macosx/libraries/lib/libwx_osx_cocoau_gl-3.1.4.0.0.dylib\n #install_name_tool -change \"@rpath/libgeos.3.10.1.dylib\" \"/opt/homebrew/opt/geos/lib/libgeos.3.10.1.dylib\" /opt/homebrew/Cellar/geos/3.10.1/lib/libgeos_c.1.16.0.dylib\n #codesign -f -s \"Apple Development: [email protected] (AN5USPSZF6)\" /opt/homebrew/Cellar/geos/3.10.1/lib/libgeos_c.1.16.0.dylib\nelse\n mkdir $TARGET_BUILD_DIR/$PRODUCT_NAME.app/Contents/Frameworks\n cp /Users/xun/github/geoda/BuildTools/macosx/libraries/lib/libwx_osx_cocoau-3.1.4.0.0.dylib $TARGET_BUILD_DIR/$PRODUCT_NAME.app/Contents/Frameworks/libwx_osx_cocoau-3.1.dylib\n cp /Users/xun/github/geoda/BuildTools/macosx/libraries/lib/libwx_osx_cocoau_gl-3.1.4.0.0.dylib $TARGET_BUILD_DIR/$PRODUCT_NAME.app/Contents/Frameworks/libwx_osx_cocoau_gl-3.1.dylib\n cp /usr/local/opt/gdal/lib/libgdal.29.dylib $TARGET_BUILD_DIR/$PRODUCT_NAME.app/Contents/Frameworks/libgdal.29.dylib\n install_name_tool -id \"GeoDa\" $TARGET_BUILD_DIR/$PRODUCT_NAME.app/Contents/MacOS/GeoDa\n install_name_tool -change \"/Users/xun/github/geoda/BuildTools/macosx/libraries/lib/libwx_osx_cocoau_gl-3.1.dylib\" \"@executable_path/../Frameworks/libwx_osx_cocoau_gl-3.1.dylib\" $TARGET_BUILD_DIR/$PRODUCT_NAME.app/Contents/MacOS/GeoDa\n install_name_tool -change \"/Users/xun/github/geoda/BuildTools/macosx/libraries/lib/libwx_osx_cocoau-3.1.dylib\" \"@executable_path/../Frameworks/libwx_osx_cocoau-3.1.dylib\" $TARGET_BUILD_DIR/$PRODUCT_NAME.app/Contents/MacOS/GeoDa\n install_name_tool -change \"/usr/local/opt/gdal/lib/libgdal.29.dylib\" \"@executable_path/../Frameworks/libgdal.29.dylib\" $TARGET_BUILD_DIR/$PRODUCT_NAME.app/Contents/MacOS/GeoDa\n install_name_tool -change \"/opt/homebrew/opt/gdal/lib/libgdal.29.dylib\" \"@executable_path/../Frameworks/libgdal.29.dylib\" $TARGET_BUILD_DIR/$PRODUCT_NAME.app/Contents/MacOS/GeoDa\n python3 install_name.py $TARGET_BUILD_DIR/$PRODUCT_NAME.app/Contents/Frameworks \"0046C0AE0D6933F7CD8A67875F820AF13CD63439\"\n codesign -f --timestamp -o runtime -s \"0046C0AE0D6933F7CD8A67875F820AF13CD63439\" $TARGET_BUILD_DIR/$PRODUCT_NAME.app/Contents/MacOS/GeoDa\n codesign -f --timestamp -o runtime -s \"0046C0AE0D6933F7CD8A67875F820AF13CD63439\" $TARGET_BUILD_DIR/$PRODUCT_NAME.app\nfi\n";
};
/* End PBXShellScriptBuildPhase section */

Expand Down
3 changes: 3 additions & 0 deletions BuildTools/macosx/code_sign.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,9 @@ def ProcessDependency(dylib_path, cid):
else:
processed_items[dylib_path] = True

if dylib_path == '@rpath/libgeos.3.11.0.dylib':
dylib_path = '/opt/homebrew/opt/geos/lib/libgeos.3.11.0.dylib'

print("Process:", dylib_path)
#cmd = "codesign -f -s - "
cmd = '/usr/bin/codesign --force --sign "{}" '.format(cid)
Expand Down
8 changes: 6 additions & 2 deletions BuildTools/macosx/install_name.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,12 @@ def ProcessDependency(dir_path, dylib_name):

# workaround for gdal 3.3.3 that @rpath/libgeos.3.10.2.dylib was used instead of dir path
copyitem = item
if item == '@rpath/libgeos.3.10.2.dylib':
if item == '@rpath/libgeos.3.11.0.dylib':
copyitem = '/usr/local/opt/geos/lib/libgeos.dylib'
if item == '@loader_path/libicuuc.70.dylib':
copyitem = '/usr/local/opt/icu4c/lib/libicuuc.70.dylib'
if item == '@loader_path/libicudata.70.dylib':
copyitem = '/usr/local/opt/icu4c/lib/libicudata.70.dylib'

if item.startswith('/usr/lib') == False and item.startswith('/System') == False and (codesign_only or item.startswith('@executable_path/')==False):
print("Process:", item)
Expand All @@ -41,4 +45,4 @@ def ProcessDependency(dir_path, dylib_name):

ProcessDependency(framework_path, "libwx_osx_cocoau_gl-3.1.dylib")
ProcessDependency(framework_path, "libwx_osx_cocoau-3.1.dylib")
ProcessDependency(framework_path, "libgdal.30.dylib")
ProcessDependency(framework_path, "libgdal.31.dylib")
8 changes: 8 additions & 0 deletions BuildTools/windows/installer/32bit/GeoDa-win7+.iss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,9 @@ ShowLanguageDialog=yes

[Languages]
Name: "en"; MessagesFile: "compiler:Default.isl"
Name: "spanish"; MessagesFile: "compiler:Languages\Spanish.isl"
Name: "russian"; MessagesFile: "compiler:Languages\Russian.isl"
Name: "portuguese"; MessagesFile: "compiler:Languages\Portuguese.isl"

[dirs]
Name: "{app}"; Check: InitializeSetup
Expand Down Expand Up @@ -195,6 +198,10 @@ begin
begin
langCode := '159'; // russian
end;
4:
begin
langCode := '153'; // Portuguese
end;
end;
end;
Expand All @@ -220,6 +227,7 @@ begin
ComboBox.Items.Add('Chinese (Simplified)');
ComboBox.Items.Add('Spanish');
ComboBox.Items.Add('Russian');
ComboBox.Items.Add('Portuguese');
ComboBox.ItemIndex := 0;
ComboBox.OnChange := @ComboBoxChange;
langCode := '58';
Expand Down
8 changes: 8 additions & 0 deletions BuildTools/windows/installer/32bit/GeoDa.iss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,9 @@ ShowLanguageDialog=yes

[Languages]
Name: "en"; MessagesFile: "compiler:Default.isl"
Name: "spanish"; MessagesFile: "compiler:Languages\Spanish.isl"
Name: "russian"; MessagesFile: "compiler:Languages\Russian.isl"
Name: "portuguese"; MessagesFile: "compiler:Languages\Portuguese.isl"

[dirs]
Name: "{app}"; Permissions: everyone-full; Check: InitializeSetup
Expand Down Expand Up @@ -194,6 +197,10 @@ begin
begin
langCode := '159'; // russian
end;
4:
begin
langCode := '153'; // Portuguese
end;
end;
end;
Expand All @@ -219,6 +226,7 @@ begin
ComboBox.Items.Add('Chinese (Simplified)');
ComboBox.Items.Add('Spanish');
ComboBox.Items.Add('Russian');
ComboBox.Items.Add('Portuguese');
ComboBox.ItemIndex := 0;
ComboBox.OnChange := @ComboBoxChange;
langCode := '58';
Expand Down
6 changes: 6 additions & 0 deletions BuildTools/windows/installer/64bit/GeoDa-win7+.iss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ ShowLanguageDialog=yes
Name: "english"; MessagesFile: "compiler:Default.isl"
Name: "spanish"; MessagesFile: "compiler:Languages\Spanish.isl"
Name: "russian"; MessagesFile: "compiler:Languages\Russian.isl"
Name: "portuguese"; MessagesFile: "compiler:Languages\Portuguese.isl"

[dirs]
Name: "{app}"; Check: InitializeSetup
Expand Down Expand Up @@ -210,6 +211,10 @@ begin
begin
langCode := '159'; // russian
end;
4:
begin
langCode := '153'; // Portuguese
end;
end;
end;
Expand All @@ -235,6 +240,7 @@ begin
ComboBox.Items.Add('Chinese (Simplified)');
ComboBox.Items.Add('Spanish');
ComboBox.Items.Add('Russian');
ComboBox.Items.Add('Portuguese');
ComboBox.ItemIndex := 0;
ComboBox.OnChange := @ComboBoxChange;
langCode := '58';
Expand Down
6 changes: 6 additions & 0 deletions BuildTools/windows/installer/64bit/GeoDa.iss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ ShowLanguageDialog=yes
Name: "english"; MessagesFile: "compiler:Default.isl"
Name: "spanish"; MessagesFile: "compiler:Languages\Spanish.isl"
Name: "russian"; MessagesFile: "compiler:Languages\Russian.isl"
Name: "portuguese"; MessagesFile: "compiler:Languages\Portuguese.isl"

[dirs]
Name: "{app}"; Permissions: everyone-full; Check: InitializeSetup
Expand Down Expand Up @@ -209,6 +210,10 @@ begin
begin
langCode := '159'; // russian
end;
4:
begin
langCode := '153'; // Portuguese
end;
end;
end;
Expand All @@ -234,6 +239,7 @@ begin
ComboBox.Items.Add('Chinese (Simplified)');
ComboBox.Items.Add('Spanish');
ComboBox.Items.Add('Russian');
ComboBox.Items.Add('Portuguese');
ComboBox.ItemIndex := 0;
ComboBox.OnChange := @ComboBoxChange;
langCode := '58';
Expand Down
8 changes: 7 additions & 1 deletion DialogTools/ExportDataDlg.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -162,8 +162,14 @@ void ExportDataDlg::Init(wxWindow* parent, const wxPoint& pos)
is_create_project = project_file_name.empty() ? false : true;
ds_file_path = wxFileName("");

if (is_table_only)
if (is_table_only) {
ds_names.Remove("ESRI Shapefile (*.shp)|*.shp");
ds_names.Remove("GeoJSON (*.geojson;*.json)|*.geojson;*.json");
ds_names.Remove("GeoPackage (*.gpkg)|*.gpkg");
ds_names.Remove("Geography Markup Language (*.gml)|*.gml");
ds_names.Remove("Keyhole Markup Language (*.kml)|*.kml");
ds_names.Remove("MapInfo (*.tab;*.mif;*.mid)|*.tab;*.mif;*.mid");
}

//ds_names.Remove("dBase database file (*.dbf)|*.dbf");
ds_names.Remove("MS Excel (*.xls)|*.xls");
Expand Down
4 changes: 3 additions & 1 deletion DialogTools/PreferenceDlg.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -263,7 +263,7 @@ void PreferenceDlg::Init()
cmb113->Append("Chinese (Simplified)");
cmb113->Append("Spanish");
cmb113->Append("Russian");
//cmb113->Append("German");
cmb113->Append("Portuguese");
cmb113->Bind(wxEVT_COMBOBOX, &PreferenceDlg::OnChooseLanguage, this);
//cmb113->Disable();

Expand Down Expand Up @@ -937,6 +937,8 @@ void PreferenceDlg::OnChooseLanguage(wxCommandEvent& ev)
language = 179;//wxLANGUAGE_SPANISH;
} else if (lan_sel == 4) {
language = wxLANGUAGE_RUSSIAN;
} else if (lan_sel == 5) {
language = wxLANGUAGE_PORTUGUESE;
}
config->DeleteEntry("Translation");
config->SetPath("Translation");
Expand Down
7 changes: 6 additions & 1 deletion DialogTools/VarGroupingEditorDlg.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -354,7 +354,7 @@ void VarGroupingEditorDlg::OnSaveSpaceTimeTableClick( wxCommandEvent& event )

std::vector<wxString> id_vec;
int c_id = table_int->FindColId(gw->id_field);
if (c_id > 0) {
if (c_id >= 0) {
table_int->GetColData(c_id, 1, id_vec);

std::vector<wxString> new_id_vec;
Expand All @@ -366,6 +366,11 @@ void VarGroupingEditorDlg::OnSaveSpaceTimeTableClick( wxCommandEvent& event )
mem_table_int->AddOGRColumn(id_col);
using_default_id = false;
}
} else {
// save (sequential index as) id, if no default weights been selected
OGRColumn* id_col = new OGRColumnString("ID", 50, 0, n);
id_col->UpdateData(id_stack, undefs);
mem_table_int->AddOGRColumn(id_col);
}
}
}
Expand Down
41 changes: 33 additions & 8 deletions Explore/CartogramNewView.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
#include <set>
#include <sstream>
#include <limits>
#include <math.h>
#include <boost/foreach.hpp>
#include <wx/wx.h>
#include <wx/msgdlg.h>
Expand All @@ -36,6 +37,7 @@
#include "../FramesManager.h"
#include "../GeoDa.h"
#include "../Project.h"
#include "../GenUtils.h"
#include "../ShapeOperations/GalWeight.h"
#include "../ShapeOperations/VoronoiUtils.h"
#include "CartogramNewView.h"
Expand Down Expand Up @@ -137,7 +139,6 @@ improve_table(6), realtime_updates(false), all_init(false)

vector<double> orig_x(num_obs);
vector<double> orig_y(num_obs);
vector<double> orig_data(num_obs);
project->GetCentroids(orig_x, orig_y);

cart_nbr_info = new CartNbrInfo(project->GetVoronoiRookNeighborGal(),
Expand All @@ -147,12 +148,35 @@ improve_table(6), realtime_updates(false), all_init(false)
carts.resize(num_cart_times);
num_improvement_iters.resize(num_cart_times);

vector<vector<double>> orig_data(num_cart_times);
for (int t=0; t<num_cart_times; t++) {
orig_data[t].resize(num_obs);
}

double min_over_time = DBL_MAX;
double max_over_time = -DBL_MAX;
for (int t=0; t<num_cart_times; t++) {
table_int->GetColData(col_ids[RAD_VAR], t, orig_data[t]);
GenUtils::StandardizeData(orig_data[t]);
// use exponential instead of linear to exaggerate the differences
for (size_t j = 0; j < orig_data[t].size(); ++j) {
orig_data[t][j] = exp(orig_data[t][j]);
}
for (size_t j = 0; j < orig_data[t].size(); ++j) {
if (orig_data[t][j] < min_over_time) {
min_over_time = orig_data[t][j];
}
if (orig_data[t][j] > max_over_time) {
max_over_time = orig_data[t][j];
}
}
}

for (int t=0; t<num_cart_times; t++) {
table_int->GetColData(col_ids[RAD_VAR], t, orig_data);
carts[t] = new DorlingCartogram(cart_nbr_info, orig_x,
orig_y, orig_data,
var_info[RAD_VAR].min_over_time,
var_info[RAD_VAR].max_over_time);
orig_y, orig_data[t],
min_over_time,
max_over_time);
num_improvement_iters[t] = 0;
}

Expand Down Expand Up @@ -215,7 +239,7 @@ improve_table(6), realtime_updates(false), all_init(false)
max_out_x += max_rad;
max_out_y += max_rad;

selectable_fill_color = GdaConst::map_default_fill_colour;
selectable_fill_color = wxColour(255, 255, 255); // GdaConst::map_default_fill_colour;

// Note: the shps_orig min/max will depend on the bubble sizes
last_scale_trans.SetView(size.GetWidth(), size.GetHeight());
Expand Down Expand Up @@ -436,7 +460,7 @@ void CartogramNewCanvas::NewCustomCatClassif()
cat_classif_def.num_cats);
int time = cat_data.GetCurrentCanvasTmStep();
for (int i=0; i<cat_classif_def.num_cats; i++) {
cat_classif_def.colors[i] = cat_data.GetCategoryColor(time, i);
cat_classif_def.colors[i] = cat_data.GetCategoryPenColor(time, i);
cat_classif_def.names[i] = cat_data.GetCategoryLabel(time, i);
}
int col = table_int->FindColId(var_info[THM_VAR].name);
Expand Down Expand Up @@ -655,7 +679,8 @@ void CartogramNewCanvas::CreateAndUpdateCategories()
cat_classif_def.colors[0] = GdaConst::map_default_fill_colour;
cat_data.CreateCategoriesAllCanvasTms(1, num_time_vals, num_obs);
for (int t=0; t<num_time_vals; t++) {
cat_data.SetCategoryColor(t, 0,GdaConst::map_default_fill_colour);
cat_data.SetCategoryPenColor(t, 0, GdaConst::map_default_fill_colour);
cat_data.SetCategoryBrushColor(t, 0, GdaConst::map_default_fill_colour);
cat_data.SetCategoryLabel(t, 0, "");
cat_data.SetCategoryCount(t, 0, num_obs);
for (int i=0; i<num_obs; i++) cat_data.AppendIdToCategory(t, 0, i);
Expand Down
2 changes: 1 addition & 1 deletion Explore/LineChartView.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1071,7 +1071,7 @@ void LineChartFrame::SaveDataAndResults(bool save_weights, bool save_did,
}

for (int j=0; j<n_obs; j++) {
if (undefs[j] || hs[j] != filter_flag )
if (undefs[j])
continue;
var_stack_array[idx_var].push_back(Y[t][j]);
dummy_select_stack.push_back(hs[j] == true ? 1 : 0);
Expand Down
Loading

0 comments on commit ad1d166

Please sign in to comment.