Skip to content

Commit

Permalink
Merge pull request #185 from serk12/layer_system
Browse files Browse the repository at this point in the history 
Layer system
  • Loading branch information
@ghutchis
ghutchis authored Aug 11, 2021
2 parents f26de75 + 8ca8cab commit 19f5cea
Show file tree
Hide file tree
Showing 2 changed files with 152 additions and 22 deletions.
159 changes: 139 additions & 20 deletions avogadro/mainwindow.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
******************************************************************************/

#include "mainwindow.h"

#include "aboutdialog.h"
#include "avogadroappconfig.h"
#include "backgroundfileformat.h"
Expand All @@ -30,6 +31,7 @@
#include <avogadro/qtgui/customelementdialog.h>
#include <avogadro/qtgui/extensionplugin.h>
#include <avogadro/qtgui/fileformatdialog.h>
#include <avogadro/qtgui/layermodel.h>
#include <avogadro/qtgui/molecule.h>
#include <avogadro/qtgui/moleculemodel.h>
#include <avogadro/qtgui/multiviewwidget.h>
Expand Down Expand Up @@ -205,6 +207,7 @@ using QtGui::ExtensionPlugin;
using QtGui::ExtensionPluginFactory;
using QtGui::FileFormatDialog;
using QtGui::Molecule;
using QtGui::MultiViewWidget;
using QtGui::RWMolecule;
using QtGui::ScenePlugin;
using QtGui::ScenePluginFactory;
Expand All @@ -224,6 +227,8 @@ MainWindow::MainWindow(const QStringList& fileNames, bool disableSettings)
: m_molecule(nullptr)
, m_rwMolecule(nullptr)
, m_moleculeModel(nullptr)
, m_layerModel(nullptr)
, m_activeScenePlugin(nullptr)
, m_queuedFilesStarted(false)
, m_menuBuilder(new MenuBuilder)
, m_fileReadThread(nullptr)
Expand Down Expand Up @@ -347,19 +352,21 @@ void MainWindow::setupInterface()
addDockWidget(Qt::LeftDockWidgetArea, m_toolDock);

// Our scene/view dock.
QDockWidget* sceneDock = new QDockWidget(tr("Display Types"), this);
m_sceneTreeView = new QTreeView(sceneDock);
m_sceneDock = new QDockWidget(tr("Display Types"), this);
m_sceneDock->setFeatures(m_sceneDock->features() &
~QDockWidget::AllDockWidgetFeatures);

m_sceneTreeView = new QTreeView(m_sceneDock);
m_sceneTreeView->setIndentation(0);
m_sceneTreeView->setSelectionBehavior(QAbstractItemView::SelectRows);
m_sceneTreeView->setSelectionMode(QAbstractItemView::SingleSelection);
sceneDock->setWidget(m_sceneTreeView);
addDockWidget(Qt::LeftDockWidgetArea, sceneDock);

m_sceneDock->setWidget(m_sceneTreeView);
addDockWidget(Qt::LeftDockWidgetArea, m_sceneDock);
// Our view dock.
m_viewDock = new QDockWidget(tr("View Configuration"), this);
addDockWidget(Qt::LeftDockWidgetArea, m_viewDock);
// put display types on top of view config
tabifyDockWidget(m_viewDock, sceneDock);
m_viewDock->setFeatures(m_viewDock->features() &
~QDockWidget::AllDockWidgetFeatures);

// Our molecule dock.
QDockWidget* moleculeDock = new QDockWidget(tr("Molecules"), this);
Expand All @@ -370,6 +377,17 @@ void MainWindow::setupInterface()
moleculeDock->setWidget(m_moleculeTreeView);
addDockWidget(Qt::LeftDockWidgetArea, moleculeDock);

// Our molecule dock.
QDockWidget* layerDock = new QDockWidget(tr("Layers"), this);
m_layerTreeView = new QTreeView(layerDock);
m_layerTreeView->setIndentation(0);
m_layerTreeView->setSelectionBehavior(QAbstractItemView::SelectRows);
m_layerTreeView->setSelectionMode(QAbstractItemView::SingleSelection);
layerDock->setWidget(m_layerTreeView);
addDockWidget(Qt::LeftDockWidgetArea, layerDock);

tabifyDockWidget(moleculeDock, layerDock);

// Switch to our fallback icons if there are no platform-specific icons.
if (!QIcon::hasThemeIcon("document-new"))
QIcon::setThemeName("fallback");
Expand Down Expand Up @@ -409,6 +427,24 @@ void MainWindow::setupInterface()
connect(m_moleculeTreeView, &QAbstractItemView::clicked, this,
&MainWindow::moleculeActivated);

m_layerModel = new QtGui::LayerModel(this);
m_layerTreeView->setModel(m_layerModel);
m_layerTreeView->setSelectionBehavior(QAbstractItemView::SelectRows);
m_layerTreeView->setAlternatingRowColors(true);
m_layerTreeView->header()->setStretchLastSection(false);
m_layerTreeView->header()->setVisible(false);
m_layerTreeView->header()->setSectionResizeMode(0, QHeaderView::Stretch);
for (int i = 1; i < m_layerModel->columnCount(QModelIndex()); ++i) {
m_layerTreeView->header()->setSectionResizeMode(i, QHeaderView::Fixed);
m_layerTreeView->header()->resizeSection(i, 25);
}
connect(m_layerTreeView, &QAbstractItemView::activated, this,
&MainWindow::layerActivated);
connect(m_layerTreeView, &QAbstractItemView::clicked, this,
&MainWindow::layerActivated);
connect(m_sceneTreeView, &QAbstractItemView::clicked, m_layerModel,
&QtGui::LayerModel::updateRows);

viewActivated(glWidget);
buildTools();
// Connect to the invalid context signal, check whether GL is initialized.
Expand Down Expand Up @@ -479,16 +515,33 @@ void setWidgetMolecule(T* glWidget, M* mol)
glWidget->resetCamera();
}

void setDefaultViews(MultiViewWidget* viewWidget)
{
QSettings settings;
// save the enabled scene / render plugins
if (GLWidget* glWidget =
qobject_cast<GLWidget*>(viewWidget->activeWidget())) {

const ScenePluginModel* sceneModel = &glWidget->sceneModel();
for (auto plugin : sceneModel->scenePlugins()) {
QString settingsKey("MainWindow/" + plugin->objectName());
bool enabled = settings.value(settingsKey, plugin->isEnabled()).toBool();
plugin->setEnabled(enabled);
}
}
}
void MainWindow::setMolecule(Molecule* mol)
{
if (!mol)
return;

// Set the new molecule, ensure both molecules are in the model.
if (m_molecule && !m_moleculeModel->molecules().contains(m_molecule))
if (m_molecule && !m_moleculeModel->molecules().contains(m_molecule)) {
m_moleculeModel->addItem(m_molecule);
if (!m_moleculeModel->molecules().contains(mol))
}
if (!m_moleculeModel->molecules().contains(mol)) {
m_moleculeModel->addItem(mol);
}

Molecule* oldMolecule(m_molecule);
m_molecule = mol;
Expand All @@ -507,6 +560,14 @@ void MainWindow::setMolecule(Molecule* mol)
markMoleculeClean();
updateWindowTitle();
m_moleculeModel->setActiveMolecule(m_molecule);
m_layerModel->addMolecule(m_molecule);
// only set the default values if there is nothing setup
// 1 layer (layerCount) and 1º layer + add items
if (m_layerModel->layerCount() == 1 && m_layerModel->items() == 2) {
setDefaultViews(m_multiViewWidget);
refreshDisplayTypes();
}

ActiveObjects::instance().setActiveMolecule(m_molecule);

if (oldMolecule)
Expand All @@ -533,6 +594,18 @@ void MainWindow::markMoleculeDirty()
}
}

void MainWindow::refreshDisplayTypes()
{
m_layerModel->updateRows();
// force m_sceneTreeView update (update doesn't update the checkbox)
m_sceneTreeView->setFocus();
if (m_activeScenePlugin != nullptr) {
m_viewDock->setWidget(m_activeScenePlugin->setupWidget());
}
// reset focus to m_layerTreeView
m_layerTreeView->setFocus();
}

void MainWindow::markMoleculeClean()
{
if (m_moleculeDirty) {
Expand Down Expand Up @@ -867,6 +940,52 @@ void MainWindow::rendererInvalid()
QTimer::singleShot(500, this, &QWidget::close);
}

void MainWindow::layerActivated(const QModelIndex& idx)
{
m_layerModel->updateRows();
if (idx.row() == m_layerModel->items() - 1) {
m_layerModel->addLayer(m_molecule->undoMolecule());
} else {
bool updateGL = false;
if (idx.column() == QtGui::LayerModel::ColumnType::Name) {
m_layerModel->setActiveLayer(idx.row(), m_molecule->undoMolecule());
} else if (idx.column() == QtGui::LayerModel::ColumnType::Remove) {
if (m_layerModel->layerCount() > 1) {
m_layerModel->removeItem(idx.row(), m_molecule->undoMolecule());
updateGL = true;
}
} else if (idx.column() == QtGui::LayerModel::ColumnType::Lock) {
m_layerModel->flipLocked(idx.row());
} else if (idx.column() == QtGui::LayerModel::ColumnType::Visible) {
m_layerModel->flipVisible(idx.row());
updateGL = true;
} else if (idx.column() == QtGui::LayerModel::ColumnType::Menu) {
m_layerModel->setActiveLayer(idx.row(), m_molecule->undoMolecule());
if (m_sceneDock->isHidden()) {
m_sceneDock->show();
m_viewDock->show();
resizeDocks({ m_sceneDock, m_viewDock }, { 250, 50 }, Qt::Vertical);
} else {
m_sceneDock->hide();
m_viewDock->hide();
}
}

if (updateGL) {
QWidget* w = m_multiViewWidget->activeWidget();
if (GLWidget* glWidget = qobject_cast<QtOpenGL::GLWidget*>(w)) {
glWidget->updateScene();
}
#ifdef AVO_USE_VTK
else if (vtkGLWidget* vtkWidget = qobject_cast<vtkGLWidget*>(w)) {
vtkWidget->updateScene();
}
#endif
}
}
refreshDisplayTypes();
}

void MainWindow::moleculeActivated(const QModelIndex& idx)
{
QObject* obj = static_cast<QObject*>(idx.internalPointer());
Expand Down Expand Up @@ -897,8 +1016,10 @@ void MainWindow::sceneItemActivated(const QModelIndex& idx)
if (!idx.isValid())
return;
QObject* obj = static_cast<QObject*>(idx.internalPointer());
if (ScenePlugin* scene = qobject_cast<ScenePlugin*>(obj))
if (ScenePlugin* scene = qobject_cast<ScenePlugin*>(obj)) {
m_viewDock->setWidget(scene->setupWidget());
m_activeScenePlugin = scene;
}
}

bool populatePluginModel(ScenePluginModel& model, bool editOnly = false)
Expand All @@ -913,19 +1034,14 @@ bool populatePluginModel(ScenePluginModel& model, bool editOnly = false)
foreach (ScenePluginFactory* factory, scenePluginFactories) {
ScenePlugin* scenePlugin = factory->createInstance();
if (editOnly && scenePlugin) {
if (scenePlugin->objectName() == "BallStick" ||
scenePlugin->objectName() == "OverlayAxes") {
if (scenePlugin->objectName() == "BallStick") {
model.addItem(scenePlugin);
} else {
delete scenePlugin;
}
} else if (scenePlugin) {
model.addItem(scenePlugin);
}

QString settingsKey("MainWindow/" + scenePlugin->objectName());
bool enabled = settings.value(settingsKey, scenePlugin->isEnabled()).toBool();
scenePlugin->setEnabled(enabled);
}
return true;
}
Expand Down Expand Up @@ -967,15 +1083,13 @@ void MainWindow::viewActivated(QWidget* widget)
glWidget->updateScene();
} else {
m_moleculeModel->setActiveMolecule(glWidget->molecule());
m_layerModel->addMolecule(m_molecule);
// Figure out the active tool - reflect this in the toolbar.
ToolPlugin* tool = glWidget->activeTool();
if (tool) {
QString name = tool->objectName();
foreach (QAction* action, m_toolToolBar->actions()) {
if (action->data().toString() == name)
action->setChecked(true);
else
action->setChecked(false);
action->setChecked(action->data().toString() == name);
}
}
}
Expand All @@ -984,6 +1098,7 @@ void MainWindow::viewActivated(QWidget* widget)
m_molecule = glWidget->molecule();
emit moleculeChanged(m_molecule);
m_moleculeModel->setActiveMolecule(m_molecule);
m_layerModel->addMolecule(m_molecule);
}
ActiveObjects::instance().setActiveGLWidget(glWidget);
}
Expand All @@ -997,12 +1112,14 @@ void MainWindow::viewActivated(QWidget* widget)
vtkWidget->updateScene();
} else {
m_moleculeModel->setActiveMolecule(vtkWidget->molecule());
m_layerModel->addMolecule(m_molecule);
}
if (m_molecule != vtkWidget->molecule() && vtkWidget->molecule()) {
m_rwMolecule = nullptr;
m_molecule = vtkWidget->molecule();
emit moleculeChanged(m_molecule);
m_moleculeModel->setActiveMolecule(m_molecule);
m_layerModel->addMolecule(m_molecule);
}
}
#endif
Expand Down Expand Up @@ -1369,6 +1486,7 @@ void MainWindow::undoEdit()
if (m_molecule) {
m_molecule->undoMolecule()->undoStack().undo();
m_molecule->emitChanged(Molecule::Atoms | Molecule::Added);
m_layerModel->updateRows();
activeMoleculeEdited();
}
}
Expand All @@ -1378,6 +1496,7 @@ void MainWindow::redoEdit()
if (m_molecule) {
m_molecule->undoMolecule()->undoStack().redo();
m_molecule->emitChanged(Molecule::Atoms | Molecule::Added);
m_layerModel->updateRows();
activeMoleculeEdited();
}
}
Expand Down
15 changes: 13 additions & 2 deletions avogadro/mainwindow.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@ class Molecule;
class MoleculeModel;
class MultiViewWidget;
class RWMolecule;
class LayerModel;
}

/**
Expand Down Expand Up @@ -130,8 +131,8 @@ public slots:
void closeEvent(QCloseEvent* event);

// Handle drag and drop -- accept files dragged on the window
void dragEnterEvent(QDragEnterEvent *event);
void dropEvent(QDropEvent *event);
void dragEnterEvent(QDragEnterEvent* event);
void dropEvent(QDropEvent* event);

protected slots:
/**
Expand Down Expand Up @@ -226,6 +227,7 @@ protected slots:
void undoEdit();
void redoEdit();
void activeMoleculeEdited();
void refreshDisplayTypes();

#ifdef QTTESTING
protected slots:
Expand Down Expand Up @@ -299,6 +301,11 @@ private slots:
*/
void moleculeActivated(const QModelIndex& index);

/**
* @brief Change the active layer
*/
void layerActivated(const QModelIndex& index);

/**
* @brief Change the configuration dialog to reflect active scene item.
*/
Expand All @@ -321,6 +328,8 @@ private slots:
QtGui::Molecule* m_molecule;
QtGui::RWMolecule* m_rwMolecule;
QtGui::MoleculeModel* m_moleculeModel;
QtGui::LayerModel* m_layerModel;
QtGui::ScenePlugin* m_activeScenePlugin;
bool m_queuedFilesStarted;
QStringList m_queuedFiles;

Expand All @@ -344,9 +353,11 @@ private slots:

QtGui::MultiViewWidget* m_multiViewWidget;
QTreeView* m_sceneTreeView;
QTreeView* m_layerTreeView;
QTreeView* m_moleculeTreeView;
QDockWidget* m_toolDock;
QDockWidget* m_viewDock;
QDockWidget* m_sceneDock;
QList<QtGui::ToolPlugin*> m_tools;
QList<QtGui::ExtensionPlugin*> m_extensions;

Expand Down

0 comments on commit 19f5cea

Please sign in to comment.