diff --git a/README.md b/README.md index 577dd2a..5d1d82e 100644 --- a/README.md +++ b/README.md @@ -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 diff --git a/core/formimage.cpp b/core/formimage.cpp index 3267a65..4cfb8ec 100644 --- a/core/formimage.cpp +++ b/core/formimage.cpp @@ -2242,8 +2242,8 @@ void FormImage::OverlayProjection(QPainter *paint) bool first = true; - if(opts.gshhsglobe1On) - { +// if(opts.gshhsglobe1On) +// { for (int i=0; ivxp_data_overlay[0]->nFeatures; i++) { for (int j=0; jvxp_data_overlay[0]->pFeatures[i].nVerts; j++) @@ -2288,12 +2288,12 @@ void FormImage::OverlayProjection(QPainter *paint) } first = true; } - } +// } first = true; - if(opts.gshhsglobe2On) - { +// if(opts.gshhsglobe2On) +// { for (int i=0; ivxp_data_overlay[1]->nFeatures; i++) { for (int j=0; jvxp_data_overlay[1]->pFeatures[i].nVerts; j++) @@ -2338,12 +2338,12 @@ void FormImage::OverlayProjection(QPainter *paint) } first = true; } - } +// } first = true; - if(opts.gshhsglobe3On) - { +// if(opts.gshhsglobe3On) +// { for (int i=0; ivxp_data_overlay[2]->nFeatures; i++) { for (int j=0; jvxp_data_overlay[2]->pFeatures[i].nVerts; j++) @@ -2388,7 +2388,7 @@ void FormImage::OverlayProjection(QPainter *paint) } first = true; } - } +// } if (opts.currenttoolbox == 0 && formtoolbox->GridOnProjLCC()) // LLC { diff --git a/core/mainwindow.cpp b/core/mainwindow.cpp index 14c753b..08871d8 100644 --- a/core/mainwindow.cpp +++ b/core/mainwindow.cpp @@ -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)