Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Revert the deferred start for forcefields #1873

Merged
merged 2 commits into from
Dec 19, 2024
Merged

Revert the deferred start for forcefields #1873

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ab89fb0
Revert the deferred start for forcefields
ghutchis Dec 19, 2024
d66a526
Make sure Avogadro VTK requires OpenGL for target
ghutchis Dec 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 8 additions & 13 deletions avogadro/qtplugins/forcefield/forcefield.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,19 +117,7 @@ Forcefield::Forcefield(QObject* parent_)
connect(action, SIGNAL(triggered()), SLOT(unfreezeSelected()));
m_actions.push_back(action);

// single-shot timer to allow the GUI to start up
QTimer::singleShot(500, this, SLOT(deferredStart()));
}

Forcefield::~Forcefield() {}

QList<QAction*> Forcefield::actions() const
{
return m_actions;
}

void Forcefield::deferredStart()
{
// initialize the calculators

// prefer to use Python interface scripts if available
refreshScripts();
Expand All @@ -150,6 +138,13 @@ void Forcefield::deferredStart()
#endif
}

Forcefield::~Forcefield() {}

QList<QAction*> Forcefield::actions() const
{
return m_actions;
}

QStringList Forcefield::menuPath(QAction* action) const
{
QStringList path;
Expand Down
2 changes: 0 additions & 2 deletions avogadro/qtplugins/forcefield/forcefield.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,8 +76,6 @@ private slots:
void freezeSelected();
void unfreezeSelected();

void deferredStart();

private:
QList<QAction*> m_actions;
QtGui::Molecule* m_molecule = nullptr;
Expand Down
1 change: 1 addition & 0 deletions avogadro/vtk/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
find_package(OpenGL REQUIRED)
find_package(GLEW REQUIRED)

if(WIN32 AND NOT BUILD_SHARED_LIBS)
Expand Down
Loading