Fix UI

ctlab · Dec 26, 2023 · 313dd86 · 313dd86
1 parent eb48309
commit 313dd86
Show file tree

Hide file tree

Showing 7 changed files with 402 additions and 609 deletions.
diff --git a/CMakeLists.txt.orig b/CMakeLists.txt.orig
diff --git a/features_forest/graphicsitemfeaturenode.cpp b/features_forest/graphicsitemfeaturenode.cpp
@@ -150,7 +150,7 @@ void GraphicsItemFeatureNode::drawNodeText(QPainter* painter, QStringList nodeTe
     QPainterPath textPath;
 
     QFont font = g_settings->labelFont;
-    font.setPixelSize(g_settings->textSize);
+
     QFontMetrics metrics(font);
     double fontHeight = metrics.ascent();
 

diff --git a/graph/graphicsitemnode.cpp b/graph/graphicsitemnode.cpp
@@ -187,7 +187,6 @@ void GraphicsItemNode::paint(QPainter * painter, const QStyleOptionGraphicsItem
           QPainterPath textPath;
 
           QFont font = g_settings->labelFont;
-          font.setPixelSize(g_settings->textSize);
 
           QFontMetrics metrics(font);
           double fontHeight = metrics.ascent();

diff --git a/painting/textgraphicsitemnode.cpp b/painting/textgraphicsitemnode.cpp
@@ -30,7 +30,7 @@ QPainterPath TextGraphicsItemNode::shape() const
     QPainterPath textPath;
 
     QFont font = g_settings->labelFont;
-    font.setPixelSize(g_settings->textSize);
+    font.setBold(true);
 
     QFontMetrics metrics(font);
     double fontHeight = metrics.ascent();

diff --git a/program/settings.cpp b/program/settings.cpp
@@ -72,6 +72,7 @@ Settings::Settings()
     displayNodeCsvData = false;
     displayNodeCsvDataCol = 0;
     labelFont = QFont();
+    labelFont.setPixelSize(12);
     textOutline = false;
     antialiasing = true;
     positionTextNodeCentre = false;

diff --git a/ui/mainwindow.cpp b/ui/mainwindow.cpp
@@ -1998,6 +1998,8 @@ void MainWindow::setUiState(UiState uiState)
         ui->actionLoad_paths->setEnabled(false);
         ui->actionExport_layout->setEnabled(false);
         ui->actionLoad_HiC_data->setEnabled(false);
+        ui->HiCSettingsWidget->setEnabled(false);
+        ui->HiC_label->setEnabled(false);
         break;
     case GRAPH_LOADED:
         ui->graphDetailsWidget->setEnabled(true);
@@ -2012,6 +2014,11 @@ void MainWindow::setUiState(UiState uiState)
         ui->actionLoad_paths->setEnabled(true);
         ui->actionExport_layout->setEnabled(false);
         ui->actionLoad_HiC_data->setEnabled(true);
+        if (g_settings->multyGraphMode) {
+            ui->moreInfoButton->setEnabled(false);
+        } else {
+            ui->moreInfoButton->setEnabled(true);
+        }
         break;
     case GRAPH_DRAWN:
         ui->graphDetailsWidget->setEnabled(true);
@@ -2028,6 +2035,11 @@ void MainWindow::setUiState(UiState uiState)
         ui->actionLoad_paths->setEnabled(true);
         ui->actionExport_layout->setEnabled(true);
         ui->actionLoad_HiC_data->setEnabled(true);
+        if (g_settings->multyGraphMode) {
+            ui->moreInfoButton->setEnabled(false);
+        } else {
+            ui->moreInfoButton->setEnabled(true);
+        }
         break;
     }
 }
@@ -3183,10 +3195,8 @@ void MainWindow::loadHiC(QString fullFileName) {
 
 void MainWindow::setHiCWidgetVisibility(bool visible)
 {
-    //ui->hicSeqLenInfoText->setVisible(visible);
-    ui->hicSeqLenSpinBox->setVisible(visible);
-    //ui->hicWeightInfoText->setVisible(visible);
-    ui->hicWeightSpinBox->setVisible(visible);
+    ui->HiCSettingsWidget->setEnabled(visible);
+    ui->HiC_label->setEnabled(visible);
 }
 
 void MainWindow::hicInclusionFilterChanged() {