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

[fix] 3D plot and windows installer #2360 #2361

Merged
merged 9 commits into from
Nov 8, 2021
Merged

[fix] 3D plot and windows installer #2360 #2361

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
2cdb20f
fix issue that 3D plot doesn't work on Mac OS with version > 1.18.0.6
lixun910 Oct 15, 2021
ea842b5
fix issue of 3D scatterplot on Mac OS
lixun910 Oct 15, 2021
e5f57d5
Update version.h
lixun910 Oct 15, 2021
4564bc7
Update GeoDa-win7+.iss
lixun910 Oct 30, 2021
a767abe
Update GeoDa.iss
lixun910 Oct 30, 2021
356ffb0
Update GeoDa-win7+.iss
lixun910 Nov 8, 2021
56ca463
Update GeoDa.iss
lixun910 Nov 8, 2021
ac292cd
Update GeoDa-win7+.iss
lixun910 Nov 8, 2021
eec6a35
Update GeoDa.iss
lixun910 Nov 8, 2021
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
2 changes: 1 addition & 1 deletion BuildTools/windows/installer/64bit/GeoDa-win7+.iss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ end;

function VCRedistNeedsInstall: Boolean;
begin
Result := not RegKeyExists(HKLM,'SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{855e31d2-9031-46e1-b06d-c9d7777deefb}');
Result := not RegKeyExists(HKLM,'SOFTWARE\WOW6432Node\Microsoft\VisualStudio\14.0\VC\Runtimes\X64');
end;

function GetUninstallString: string;
Expand Down
2 changes: 1 addition & 1 deletion BuildTools/windows/installer/64bit/GeoDa.iss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ end;

function VCRedistNeedsInstall: Boolean;
begin
Result := not RegKeyExists(HKLM,'SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{855e31d2-9031-46e1-b06d-c9d7777deefb}');
Result := not RegKeyExists(HKLM,'SOFTWARE\WOW6432Node\Microsoft\VisualStudio\14.0\VC\Runtimes\X64');
end;

function GetUninstallString: string;
Expand Down
12 changes: 9 additions & 3 deletions Explore/3DPlotView.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -242,7 +242,7 @@ void C3DPlotCanvas::OnPaint( wxPaintEvent& event )
pixel12[1] = large_y;
pixel22[1] = large_y;

unproject_pixel(pixel11, world11, 0.0);
unproject_pixel(pixel11, world11, 0.0);
unproject_pixel(pixel12, world12, 0.0);
unproject_pixel(pixel22, world22, 0.0);
unproject_pixel(pixel21, world21, 0.0);
Expand Down Expand Up @@ -323,6 +323,9 @@ void C3DPlotCanvas::OnMouse( wxMouseEvent& event )
last[0] = point.x;
last[1] = point.y;
} else {
#ifdef __WXMAC__
wxGLCanvas::SetCurrent(*m_context);
#endif
m_bLButton = true;
int where[2];
where[0] = point.x;
Expand Down Expand Up @@ -352,6 +355,9 @@ void C3DPlotCanvas::OnMouse( wxMouseEvent& event )
int where[2];
where[0] = point.x;
where[1] = point.y;
#ifdef __WXMAC__
wxGLCanvas::SetCurrent(*m_context);
#endif
if (m_brush) {
float vp[4];
glGetFloatv(GL_VIEWPORT, vp);
Expand Down Expand Up @@ -500,12 +506,12 @@ void C3DPlotCanvas::SelectByRect()

ball->apply_transform();

unproject_pixel(pixel11, world11, 0.0);
unproject_pixel(pixel11, world11, 0.0);
unproject_pixel(pixel12, world12, 0.0);
unproject_pixel(pixel22, world22, 0.0);
unproject_pixel(pixel21, world21, 0.0);

unproject_pixel(pixel11, world113, 1.0);
unproject_pixel(pixel11, world113, 1.0);
unproject_pixel(pixel12, world123, 1.0);
unproject_pixel(pixel22, world223, 1.0);
unproject_pixel(pixel21, world213, 1.0);
Expand Down
4 changes: 2 additions & 2 deletions version.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@ namespace Gda {
const int version_major = 1;
const int version_minor = 20;
const int version_build = 0;
const int version_subbuild = 6;
const int version_subbuild = 8;
const int version_year = 2021;
const int version_month = 10;
const int version_day = 9;
const int version_day = 14;
const int version_night = 0;
const int version_type = 2; // 0: alpha, 1: beta, 2: release
}