Ensure chart is only compiled with USE_VTK

Signed-off-by: Geoff Hutchison <[email protected]>
OpenChemistry · Oct 30, 2023 · 773ff08 · 773ff08
1 parent 59d2c13
commit 773ff08
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 3 deletions.
diff --git a/avogadro/qtplugins/spectra/CMakeLists.txt b/avogadro/qtplugins/spectra/CMakeLists.txt
@@ -13,4 +13,7 @@ avogadro_plugin(Spectra
   "vibrationdialog.ui"
 )
 
-target_link_libraries(Spectra PRIVATE Avogadro::Vtk)
+if (USE_VTK)
+  add_definitions(-DUSE_VTK)
+  target_link_libraries(Spectra PRIVATE Avogadro::Vtk)
+endif()
diff --git a/avogadro/qtplugins/spectra/spectra.cpp b/avogadro/qtplugins/spectra/spectra.cpp
@@ -238,6 +238,7 @@ void Spectra::openDialog()
   m_dialog->show();
 }
 
+#ifdef USE_VTK
 void Spectra::showSpectraChart()
 {
   if (m_molecule == nullptr || m_molecule->vibrationFrequencies().empty())
@@ -294,6 +295,7 @@ chart->setXAxisLimits(4000.0, 0.0);
 chart->setYAxisLimits(maxIntensity, 0.0);
 m_chartDialog->show();
 }
+#endif
 
 void Spectra::advanceFrame()
 {

diff --git a/avogadro/qtplugins/spectra/spectra.h b/avogadro/qtplugins/spectra/spectra.h
@@ -69,7 +69,9 @@ private slots:
   QtGui::Molecule* m_molecule;
 
   VibrationDialog* m_dialog;
+#ifdef USE_VTK
   QScopedPointer<VTK::ChartDialog> m_chartDialog;
+#endif
 
   QTimer* m_timer;
 

diff --git a/avogadro/vtk/chartwidget.cpp b/avogadro/vtk/chartwidget.cpp
@@ -123,8 +123,6 @@ void ChartWidget::setXAxisTitle(const std::string title)
   axis->GetTitleProperties()->SetFontSize(18);
   axis->GetTitleProperties()->SetBold(true);
 
-  qDebug() << " chart font " << axis->GetTitleProperties()->GetFontFamilyAsString();
-
   axis->GetLabelProperties()->SetFontSize(14);
 }