Rework interaction energy infodocuments (WIP), remove build cache for…

… gh actions

.github/workflows/build_and_test.yml

@@ -43,7 +43,6 @@ jobs:
       with:
         path: |
           ${{env.CPM_SOURCE_CACHE}}
-          ${{github.workspace}}/build
         key: crystalexplorer-cache-${{ matrix.name }}
 
     - name: Install Qt

src/core/CMakeLists.txt

@@ -11,6 +11,7 @@ add_library(cx_core
     "${CMAKE_CURRENT_SOURCE_DIR}/generic_atom_index.cpp"
     "${CMAKE_CURRENT_SOURCE_DIR}/globalconfiguration.cpp"
     "${CMAKE_CURRENT_SOURCE_DIR}/hbond_criteria.cpp"
+    "${CMAKE_CURRENT_SOURCE_DIR}/infotable.cpp"
     "${CMAKE_CURRENT_SOURCE_DIR}/isosurface.cpp"
     "${CMAKE_CURRENT_SOURCE_DIR}/isosurface_parameters.cpp"
     "${CMAKE_CURRENT_SOURCE_DIR}/mesh.cpp"

src/core/infotable.cpp

@@ -0,0 +1,68 @@
+#include "infotable.h"
+#include <QTextTableFormat>
+#include <QTextCharFormat>
+#include <QTextBlockFormat>
+
+InfoTable::InfoTable(QTextCursor& cursor, int rows, int cols)
+{
+    QTextTableFormat format;
+    format.setCellPadding(5.0);
+    format.setBorderStyle(QTextFrameFormat::BorderStyle_None);
+    format.setCellSpacing(-1.0);
+    format.setBorder(1.0);
+
+    m_table = cursor.insertTable(rows, cols, format);
+}
+
+InfoTable::~InfoTable()
+{
+    // The QTextTable object is owned by the QTextDocument,
+    // so we don't need to delete it here.
+}
+
+void InfoTable::insertTableHeader(const QStringList& tableHeader)
+{
+    const int row = 0;
+    QTextCharFormat format;
+    format.setFontWeight(QFont::Bold);
+
+    for (int column = 0; column < tableHeader.size() && column < m_table->columns(); ++column) {
+        QTextCursor cursor = getCellCursor(row, column);
+        cursor.setCharFormat(format);
+        cursor.insertText(tableHeader[column]);
+    }
+}
+
+void InfoTable::insertColorBlock(int row, int column, const QColor& color)
+{
+    if (!color.isValid()) {
+        return;
+    }
+
+    QTextTableCell cell = m_table->cellAt(row, column);
+    QTextCharFormat format = cell.format();
+    format.setBackground(color);
+    cell.setFormat(format);
+
+    QTextCursor cursor = getCellCursor(row, column);
+    cursor.insertText("     ");
+}
+
+void InfoTable::insertCellValue(int row, int column, const QString& valueString, Qt::Alignment alignment)
+{
+    QTextCursor cursor = getCellCursor(row, column);
+    QTextBlockFormat blockFormat = cursor.blockFormat();
+
+    // Preserve vertical alignment
+    Qt::Alignment vertAlign = blockFormat.alignment() & Qt::AlignVertical_Mask;
+    Qt::Alignment combAlign = alignment | vertAlign;
+
+    blockFormat.setAlignment(combAlign);
+    cursor.setBlockFormat(blockFormat);
+    cursor.insertText(valueString);
+}
+
+QTextCursor InfoTable::getCellCursor(int row, int column) const
+{
+    return m_table->cellAt(row, column).firstCursorPosition();
+}

src/core/infotable.h

@@ -0,0 +1,21 @@
+#pragma once
+#include <QTextTable>
+#include <QTextCursor>
+#include <QStringList>
+#include <QColor>
+
+class InfoTable {
+public:
+    InfoTable(QTextCursor& cursor, int rows, int cols);
+    ~InfoTable();
+
+    void insertTableHeader(const QStringList& tableHeader);
+    void insertColorBlock(int row, int column, const QColor& color);
+    void insertCellValue(int row, int column, const QString& valueString, Qt::Alignment alignment = Qt::AlignLeft);
+
+    QTextTable* table() const { return m_table; }
+
+private:
+    QTextCursor getCellCursor(int row, int column) const;
+    QTextTable* m_table;
+};

src/crystalx.cpp

@@ -12,13 +12,11 @@
 #include <QUrl>
 #include <QtDebug>
 
-#include "atominfodocument.h"
 #include "confirmationbox.h"
 #include "crystalx.h"
 #include "dialoghtml.h"
 #include "elementdata.h"
 #include "exportdialog.h"
-#include "infodocuments.h"
 #include "isosurface_calculator.h"
 #include "mathconstants.h"
 #include "pair_energy_calculator.h"
@@ -196,8 +194,6 @@ void Crystalx::initFingerprintWindow() {
 void Crystalx::initInfoViewer() {
   infoViewer = new InfoViewer(this);
   connect(infoViewer, &InfoViewer::tabChangedTo, this, &Crystalx::updateInfo);
-  connect(infoViewer, &InfoViewer::tabChangedTo, this,
-          &Crystalx::setInfoTabSpecificViewOptions);
   connect(infoViewer, &InfoViewer::infoViewerClosed, this,
           &Crystalx::tidyUpAfterInfoViewerClosed);
 }
@@ -1904,31 +1900,22 @@ void Crystalx::handleStructureChange() {
 // Info Documents
 //
 ////////////////////////////////////////////////////////////////////////////////////
-void Crystalx::showInfoViewer() { infoViewer->show(); }
+void Crystalx::showInfoViewer() {
+  updateInfo(infoViewer->currentTab());
+  infoViewer->show();
+}
 
 void Crystalx::showInfo(InfoType infoType) {
-  updateInfo(infoType);
   infoViewer->setTab(infoType);
   showInfoViewer();
 }
 
 void Crystalx::updateInfo(InfoType infoType) {
   Scene *scene = project->currentScene();
-  Q_ASSERT(scene);
-
-  switch (infoType) {
-  default: {
-    infoViewer->setScene(scene);
-    break;
-  }
-  case InfoType::InteractionEnergy: {
-    QTextDocument *document = infoViewer->document(infoType);
-    document->clear();
-    InfoDocuments::insertInteractionEnergiesIntoTextDocument(document, scene);
-    infoViewer->setDocument(document, infoType);
-    break;
-  }
-  }
+  if (!scene)
+    return;
+  setInfoTabSpecificViewOptions(infoType);
+  infoViewer->setScene(scene);
 }
 
 void Crystalx::setInfoTabSpecificViewOptions(InfoType infoType) {

src/dialogs/CMakeLists.txt

@@ -25,7 +25,6 @@ qt_add_library(cx_dialogs STATIC
     "${CMAKE_CURRENT_SOURCE_DIR}/celllimitsdialog.cpp"
     "${CMAKE_CURRENT_SOURCE_DIR}/closecontactcriteriawidget.cpp"
     "${CMAKE_CURRENT_SOURCE_DIR}/closecontactsdialog.cpp"
-    "${CMAKE_CURRENT_SOURCE_DIR}/collapsibledocument.cpp"
     "${CMAKE_CURRENT_SOURCE_DIR}/colordelegate.cpp"
     "${CMAKE_CURRENT_SOURCE_DIR}/crystalinfodocument.cpp"
     "${CMAKE_CURRENT_SOURCE_DIR}/depthfadingandclippingdialog.cpp"
@@ -37,8 +36,8 @@ qt_add_library(cx_dialogs STATIC
     "${CMAKE_CURRENT_SOURCE_DIR}/fingerprintwindow.cpp"
     "${CMAKE_CURRENT_SOURCE_DIR}/fileeditor.cpp"
     "${CMAKE_CURRENT_SOURCE_DIR}/fragmentstatedialog.cpp"
-    "${CMAKE_CURRENT_SOURCE_DIR}/infodocuments.cpp"
     "${CMAKE_CURRENT_SOURCE_DIR}/infoviewer.cpp"
+    "${CMAKE_CURRENT_SOURCE_DIR}/interactioninfodocument.cpp"
     "${CMAKE_CURRENT_SOURCE_DIR}/packingdialog.cpp"
     "${CMAKE_CURRENT_SOURCE_DIR}/periodictabledialog.cpp"
     "${CMAKE_CURRENT_SOURCE_DIR}/planegenerationdialog.cpp"