Changeset c76b8b

Timestamp:

Oct 6, 2013, 8:45:10 AM (11 years ago)

Author:

Frederik Heber <heber@…>

Branches:

Action_Thermostats, Add_AtomRandomPerturbation, Add_FitFragmentPartialChargesAction, Add_RotateAroundBondAction, Add_SelectAtomByNameAction, Added_ParseSaveFragmentResults, AddingActions_SaveParseParticleParameters, Adding_Graph_to_ChangeBondActions, Adding_MD_integration_tests, Adding_ParticleName_to_Atom, Adding_StructOpt_integration_tests, AtomFragments, Automaking_mpqc_open, AutomationFragmentation_failures, Candidate_v1.5.4, Candidate_v1.6.0, Candidate_v1.6.1, ChangeBugEmailaddress, ChangingTestPorts, ChemicalSpaceEvaluator, CombiningParticlePotentialParsing, Combining_Subpackages, Debian_Package_split, Debian_package_split_molecuildergui_only, Disabling_MemDebug, Docu_Python_wait, EmpiricalPotential_contain_HomologyGraph, EmpiricalPotential_contain_HomologyGraph_documentation, Enable_parallel_make_install, Enhance_userguide, Enhanced_StructuralOptimization, Enhanced_StructuralOptimization_continued, Example_ManyWaysToTranslateAtom, Exclude_Hydrogens_annealWithBondGraph, FitPartialCharges_GlobalError, Fix_BoundInBox_CenterInBox_MoleculeActions, Fix_ChargeSampling_PBC, Fix_ChronosMutex, Fix_FitPartialCharges, Fix_FitPotential_needs_atomicnumbers, Fix_ForceAnnealing, Fix_IndependentFragmentGrids, Fix_ParseParticles, Fix_ParseParticles_split_forward_backward_Actions, Fix_PopActions, Fix_QtFragmentList_sorted_selection, Fix_Restrictedkeyset_FragmentMolecule, Fix_StatusMsg, Fix_StepWorldTime_single_argument, Fix_Verbose_Codepatterns, Fix_fitting_potentials, Fixes, ForceAnnealing_goodresults, ForceAnnealing_oldresults, ForceAnnealing_tocheck, ForceAnnealing_with_BondGraph, ForceAnnealing_with_BondGraph_continued, ForceAnnealing_with_BondGraph_continued_betteresults, ForceAnnealing_with_BondGraph_contraction-expansion, FragmentAction_writes_AtomFragments, FragmentMolecule_checks_bonddegrees, GeometryObjects, Gui_Fixes, Gui_displays_atomic_force_velocity, ImplicitCharges, IndependentFragmentGrids, IndependentFragmentGrids_IndividualZeroInstances, IndependentFragmentGrids_IntegrationTest, IndependentFragmentGrids_Sole_NN_Calculation, JobMarket_RobustOnKillsSegFaults, JobMarket_StableWorkerPool, JobMarket_unresolvable_hostname_fix, MoreRobust_FragmentAutomation, ODR_violation_mpqc_open, PartialCharges_OrthogonalSummation, PdbParser_setsAtomName, PythonUI_with_named_parameters, QtGui_reactivate_TimeChanged_changes, Recreated_GuiChecks, Rewrite_FitPartialCharges, RotateToPrincipalAxisSystem_UndoRedo, SaturateAtoms_findBestMatching, SaturateAtoms_singleDegree, StoppableMakroAction, Subpackage_CodePatterns, Subpackage_JobMarket, Subpackage_LinearAlgebra, Subpackage_levmar, Subpackage_mpqc_open, Subpackage_vmg, Switchable_LogView, ThirdParty_MPQC_rebuilt_buildsystem, TrajectoryDependenant_MaxOrder, TremoloParser_IncreasedPrecision, TremoloParser_MultipleTimesteps, TremoloParser_setsAtomName, Ubuntu_1604_changes, stable

Children:

35302b

Parents:

94453f1

git-author:

Frederik Heber <heber@…> (09/04/13 14:35:59)

git-committer:

Frederik Heber <heber@…> (10/06/13 08:45:10)

Message:

Added check for qwt.

• this is taken from the SIM project, i.e. bitbucket.org/Coin3D/simacros.
• added am_conditional CONDQWT used in UIElements/Makefile.am.
• added disable/enable for qwt.

Files:

• configure.ac (modified) (1 diff)
• m4/qwt.m4 (added)
• src/UIElements/Makefile.am (modified) (3 diffs)

configure.ac

@@ -80 +80 @@
 AC_SUBST(HAVE_QTGUI)
 
+# check additionally for QWT to enable plotting of potentials
+AC_MSG_CHECKING(whether to enable Qwt-based plotting)
+#enable_qwt=yes
+AC_ARG_ENABLE(
+        [qwt], 
+        AS_HELP_STRING([--enable-qwt],[turn on Qwt compilation [default=yes]]),
+        enable_qwt=$enableval,
+        enable_qwt="yes")
+AC_MSG_RESULT($enable_qwt)
+AS_IF([test x"$enable_qwt" != x"no"],[
+        MOL_AC_HAVE_QWT_IFELSE(
+                [
+                        enable_qwt=yes
+                        AC_DEFINE(HAVE_QWT,1, ["Build Qwt-based plotting"])
+                ],
+                [
+                        enable_qwt=no
+                        AC_MSG_WARN([Qwt not found, disabling plotting in QtUI.])
+                ]
+        )
+])
+AM_CONDITIONAL([CONDQWT], [test x"$enable_qwt" != x"no"])
+AC_SUBST(HAVE_QWT)
+
 # use doxygen
 DX_HTML_FEATURE(ON)

src/UIElements/Makefile.am

@@ -118 +118 @@
   UIElements/Views/StreamStringView.hpp
 
+QWTSOURCE =
+
+QWTHEADER =
+
 UISOURCE = \
   ${COMMANDLINEUISOURCE} \
@@ -128 +132 @@
   UIElements/Dialog.cpp \
   UIElements/MainWindow.cpp
+if CONDQWT
+UISOURCE += $(QWTSOURCE)
+endif
   
 UIHEADER = \
@@ -137 +144 @@
   UIElements/Dialog.hpp \
   UIElements/MainWindow.hpp
+if CONDQWT
+UIHEADER += $(QWTHEADER)
+endif
 
 QTUISOURCE = \