Skip to content

Commit

Permalink
Overlay projection should be always visible
Browse files Browse the repository at this point in the history
(Formimage::OverlayProjection)
  • Loading branch information
hvanruys committed Aug 22, 2023
1 parent 1bd1ac8 commit bb2a46f
Show file tree
Hide file tree
Showing 3 changed files with 30 additions and 9 deletions.
18 changes: 18 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,3 +26,21 @@ Compile in Windows :
- cd build
- cmake -G "MSYS Makefiles" ..
- cmake --build .

or

Compile in QtCreator (Windows):

- pacman --needed -S mingw-w64-ucrt-x86_64-toolchain mingw-w64-ucrt-x86_64-qwt-qt5
- pacman --needed -S mingw-w64-ucrt-x86_64-hdf5 mingw-w64-ucrt-x86_64-netcdf
- pacman --needed -S mingw-w64-ucrt-x86_64-freeimage

Setting up QtCreator

1. Open the "Build & Run" panel in QtCreator options
2. In the "Qt Versions" tab, add a new one pointing to `(MSYS2_PATH)/ucrt64/bin/qmake.exe`
3. In the "Compilers" tab, add a new one for MinGW C and C++, respectively pointing to `(MSYS2_PATH)/ucrt64/bin/gcc.exe` and `.../g++.exe`
4. In the "Debuggers" tab, add a new one pointing to `(MSYS2_PATH)/ucrt64/bin/gdb.exe`
5. In the "CMake" tab, add a new one pointing to `(MSYS2_PATH)/ucrt64/bin/cmake.exe`
6. In the "Kits" tab, add a new one where you use the compilers, debugger, qt and cmake defined above
7. Select "CodeBlocks - Ninja" as CMake Generator
18 changes: 9 additions & 9 deletions core/formimage.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2242,8 +2242,8 @@ void FormImage::OverlayProjection(QPainter *paint)

bool first = true;

if(opts.gshhsglobe1On)
{
// if(opts.gshhsglobe1On)
// {
for (int i=0; i<gshhsdata->vxp_data_overlay[0]->nFeatures; i++)
{
for (int j=0; j<gshhsdata->vxp_data_overlay[0]->pFeatures[i].nVerts; j++)
Expand Down Expand Up @@ -2288,12 +2288,12 @@ void FormImage::OverlayProjection(QPainter *paint)
}
first = true;
}
}
// }

first = true;

if(opts.gshhsglobe2On)
{
// if(opts.gshhsglobe2On)
// {
for (int i=0; i<gshhsdata->vxp_data_overlay[1]->nFeatures; i++)
{
for (int j=0; j<gshhsdata->vxp_data_overlay[1]->pFeatures[i].nVerts; j++)
Expand Down Expand Up @@ -2338,12 +2338,12 @@ void FormImage::OverlayProjection(QPainter *paint)
}
first = true;
}
}
// }

first = true;

if(opts.gshhsglobe3On)
{
// if(opts.gshhsglobe3On)
// {
for (int i=0; i<gshhsdata->vxp_data_overlay[2]->nFeatures; i++)
{
for (int j=0; j<gshhsdata->vxp_data_overlay[2]->pFeatures[i].nVerts; j++)
Expand Down Expand Up @@ -2388,7 +2388,7 @@ void FormImage::OverlayProjection(QPainter *paint)
}
first = true;
}
}
// }

if (opts.currenttoolbox == 0 && formtoolbox->GridOnProjLCC()) // LLC
{
Expand Down
3 changes: 3 additions & 0 deletions core/mainwindow.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -456,6 +456,9 @@ void MainWindow::on_actionPreferences_triggered()
pref->show();
//connect(pref,SIGNAL(finished(int)), formimage, SLOT(slotRefreshOverlay()));
connect(pref,SIGNAL(finished(int)), this, SLOT(slotPreferencesFinished(int)));

// DialogPreferences pref(this);
// pref.exec();
}

void MainWindow::slotPreferencesFinished(int result)
Expand Down

0 comments on commit bb2a46f

Please sign in to comment.