change Cmake file

hvanruys · Aug 27, 2023 · 166185f · 166185f
1 parent bb2a46f
commit 166185f
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 30 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -7,11 +7,11 @@ set(CMAKE_INCLUDE_CURRENT_DIR ON)
 set(CMAKE_CXX_STANDARD 20)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
-if(UNIX)
-    set(CMAKE_PREFIX_PATH /home/hugo/Qt5.12.12/5.12.12/gcc_64)
-elseif(WIN32)
-    set(CMAKE_PREFIX_PATH /home/hugo/Data-Linux/Qt/5.15.2/gcc_64)
-endif()
+#if(UNIX)
+#    set(CMAKE_PREFIX_PATH /home/hugo/Qt5.12.12/5.12.12/gcc_64)
+#elseif(WIN32)
+#    set(CMAKE_PREFIX_PATH /home/hugo/Data-Linux/Qt/5.15.2/gcc_64)
+#endif()
 
 add_library(my_compiler_flags_1 INTERFACE)
 target_compile_features(my_compiler_flags_1 INTERFACE cxx_std_11)

diff --git a/core/formimage.cpp b/core/formimage.cpp
@@ -1435,13 +1435,9 @@ void FormImage::setupGeoOverlay(int geoindex)
     for(int i = 0; i < 3; i++)
         this->geooverlay[i].clear();
 
-
-    if(opts.gshhsglobe1On)
-        setupGshhs(geoindex, 0);
-    if(opts.gshhsglobe2On)
-        setupGshhs(geoindex, 1);
-    if(opts.gshhsglobe3On)
-        setupGshhs(geoindex, 2);
+      setupGshhs(geoindex, 0);
+      setupGshhs(geoindex, 1);
+      setupGshhs(geoindex, 2);
 
 }
 

diff --git a/core/formmapcyl.ui b/core/formmapcyl.ui
@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>1961</width>
-    <height>1607</height>
+    <width>1389</width>
+    <height>924</height>
    </rect>
   </property>
   <property name="windowTitle">

diff --git a/core/formtoolbox.ui b/core/formtoolbox.ui
@@ -9,7 +9,7 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>680</width>
+    <width>574</width>
     <height>1201</height>
    </rect>
   </property>
@@ -7438,8 +7438,8 @@
                 <rect>
                  <x>0</x>
                  <y>0</y>
-                 <width>557</width>
-                 <height>592</height>
+                 <width>472</width>
+                 <height>514</height>
                 </rect>
                </property>
                <attribute name="label">
@@ -8245,8 +8245,8 @@
                 <rect>
                  <x>0</x>
                  <y>0</y>
-                 <width>486</width>
-                 <height>336</height>
+                 <width>384</width>
+                 <height>290</height>
                 </rect>
                </property>
                <attribute name="label">
@@ -8652,8 +8652,8 @@
                 <rect>
                  <x>0</x>
                  <y>0</y>
-                 <width>367</width>
-                 <height>316</height>
+                 <width>311</width>
+                 <height>275</height>
                 </rect>
                </property>
                <attribute name="label">
@@ -9038,8 +9038,8 @@
                 <rect>
                  <x>0</x>
                  <y>0</y>
-                 <width>467</width>
-                 <height>229</height>
+                 <width>377</width>
+                 <height>197</height>
                 </rect>
                </property>
                <attribute name="label">

diff --git a/core/mainwindow.cpp b/core/mainwindow.cpp
@@ -48,7 +48,7 @@ MainWindow::MainWindow(QWidget *parent) :
     formgeostationary->SetFormImage(formimage);
 
     for(int i = 0; i < opts.geosatellites.count(); i++)
-        connect(seglist->seglgeo[i], SIGNAL(signalcomposefinished(QString, int)), formimage, SLOT(slotcomposefinished(QString, int)));
+        connect(seglist->seglgeo[i], SIGNAL(signalcomposefinished(QString,int)), formimage, SLOT(slotcomposefinished(QString,int)));
 
     imageptrs->gvp = new GeneralVerticalPerspective(this, seglist);
     imageptrs->lcc = new LambertConformalConic(this, seglist);
@@ -95,6 +95,7 @@ MainWindow::MainWindow(QWidget *parent) :
     connect(seglist, SIGNAL(signalShowSegmentCount()), formglobecyl, SLOT(slotShowSegmentCount()));
 
     createDockWidget();
+    resizeDocks({dockwidget}, {500}, Qt::Horizontal);
 
 
     ui->stackedWidget->addWidget(formglobecyl);  // index 2
@@ -176,10 +177,10 @@ MainWindow::MainWindow(QWidget *parent) :
     //connect( formimage, SIGNAL(coordinateChanged(QString)), this, SLOT(updateStatusBarCoordinate(QString)));
 
 
-    connect( formgeostationary, SIGNAL(geostationarysegmentschosen(int, QStringList)), formtoolbox, SLOT(geostationarysegmentsChosen(int, QStringList)));
-    connect( formgeostationary, SIGNAL(setbuttonlabels(int, bool)), formtoolbox, SLOT(setButtons(int, bool)));
+    connect( formgeostationary, SIGNAL(geostationarysegmentschosen(int,QStringList)), formtoolbox, SLOT(geostationarysegmentsChosen(int,QStringList)));
+    connect( formgeostationary, SIGNAL(setbuttonlabels(int,bool)), formtoolbox, SLOT(setButtons(int,bool)));
 
-    connect( formtoolbox, SIGNAL(getgeosatchannel(QString, QVector<QString>, QVector<bool>, int, bool)), formgeostationary, SLOT(slotCreateGeoImage(QString, QVector<QString>, QVector<bool>, int, bool)));
+    connect( formtoolbox, SIGNAL(getgeosatchannel(QString,QVector<QString>,QVector<bool>,int,bool)), formgeostationary, SLOT(slotCreateGeoImage(QString,QVector<QString>,QVector<bool>,int,bool)));
     connect( formtoolbox, SIGNAL(switchstackedwidget(int)), this, SLOT(slotSwitchStackedWindow(int)));
     connect( formtoolbox, SIGNAL(creatergbrecipe(int)), formgeostationary, SLOT(slotCreateRGBrecipe(int)));
 
@@ -274,13 +275,14 @@ MainWindow::MainWindow(QWidget *parent) :
 
     restoreGeometry(opts.mainwindowgeometry);
     restoreState(opts.mainwindowstate);
+    restoreDockWidget(dockwidget);
 
     ui->toolBar->setVisible(true);
     ui->mainToolBar->setVisible(true);
     //    dockwidget->setVisible(true);
 
 
-    QMainWindow::resizeDocks({dockwidget}, {1000}, Qt::Horizontal);
+    //QMainWindow::resizeDocks({dockwidget}, {1000}, Qt::Horizontal);
     //bool restored = QMainWindow::restoreDockWidget(dockwidget);
     //qDebug() << "restoredockwidget = " << restored << " width of toolbox = " << formtoolbox->width();
 
@@ -321,9 +323,9 @@ void MainWindow::createDockWidget()
     QScrollArea * scrollArea = new QScrollArea;
     scrollArea->setWidget(formtoolbox);
     scrollArea->setWidgetResizable(true);
-    scrollArea->resize(700, MainWindow::height());
+    //scrollArea->resize(700, MainWindow::height());
     dockwidget->setWidget(scrollArea);
-    dockwidget->resize(700, MainWindow::height());
+    //dockwidget->resize(700, MainWindow::height());
     addDockWidget(Qt::LeftDockWidgetArea,dockwidget);
 //    QMainWindow::resizeDocks({dockwidget}, {opts.toolboxwidth}, Qt::Horizontal);
     //QMainWindow::resizeDocks({dockwidget}, {1000}, Qt::Horizontal);