Changeset 35302b for src


Ignore:
Timestamp:
Oct 14, 2013, 11:41:35 PM (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:
4b2e05
Parents:
c76b8b
git-author:
Frederik Heber <heber@…> (09/04/13 14:43:49)
git-committer:
Frederik Heber <heber@…> (10/14/13 23:41:35)
Message:

Added many files from project Seismolo.

Location:
src/UIElements
Files:
25 added
1 edited

Legend:

Unmodified
Added
Removed

  • src/UIElements/Makefile.am

    rc76b8b r35302b  
    11# Below is all for the User Interface
     2
     3include UIElements/Views/Qt4/Plotting/Makefile.am
    24
    35COMMANDLINEUISOURCE = \
    … …  
    118120  UIElements/Views/StreamStringView.hpp
    119121
    120 QWTSOURCE =
    121 
    122 QWTHEADER =
    123 
    124122UISOURCE = \
    125123  ${COMMANDLINEUISOURCE} \
    … …  
    132130  UIElements/Dialog.cpp \
    133131  UIElements/MainWindow.cpp
    134 if CONDQWT
    135 UISOURCE += $(QWTSOURCE)
    136 endif
    137132 
    138133UIHEADER = \
    … …  
    144139  UIElements/Dialog.hpp \
    145140  UIElements/MainWindow.hpp
    146 if CONDQWT
    147 UIHEADER += $(QWTHEADER)
    148 endif
    149141
    150142QTUISOURCE = \
    … …  
    349341
    350342libMolecuilderQtUI_la_includedir = $(includedir)/MoleCuilder/
    351 libMolecuilderQtUI_la_CPPFLAGS = ${QT_CFLAGS} ${GLU_CXXFLAGS} ${BOOST_CPPFLAGS} ${CodePatterns_CFLAGS}  ${JobMarket_CFLAGS}
    352 libMolecuilderQtUI_la_LDFLAGS = $(AM_LDFLAGS) $(BOOST_FILESYSTEM_LDFLAGS) $(BOOST_PROGRAM_OPTIONS_LDFLAGS) $(BOOST_RANDOM_LDFLAGS) $(BOOST_SYSTEM_LDFLAGS) $(BOOST_THREAD_LDFLAGS)
    353 
    354 libMolecuilderQtUI_la_LIBADD = \
     343libMolecuilderQtUI_la_CPPFLAGS = ${QT_CFLAGS} ${GLU_CXXFLAGS} ${BOOST_CPPFLAGS} ${CodePatterns_CFLAGS}  ${JobMarket_CFLAGS} $(mol_ac_qwt_cxxflags)
     344libMolecuilderQtUI_la_LDFLAGS = $(AM_LDFLAGS) $(BOOST_FILESYSTEM_LDFLAGS) $(BOOST_PROGRAM_OPTIONS_LDFLAGS) $(BOOST_RANDOM_LDFLAGS) $(BOOST_SYSTEM_LDFLAGS) $(BOOST_THREAD_LDFLAGS) $(mol_ac_qwt_ldflags)
     345
     346libMolecuilderQtUI_la_LIBADD =
     347if CONDQWT
     348libMolecuilderQtUI_la_LIBADD += \
     349        libMolecuilderQwtUI.la
     350endif
     351
     352libMolecuilderQtUI_la_LIBADD += \
    355353        ../data/icons/libicons.la \
    356354        ${QT_LIBS} \
    … …  
    397395allmocs.moc.cpp: ${QTUIMOC_HEADER}
    398396        echo "" > allmocs.moc.cpp;\
    399         list='$(QTUIMOC_HEADER)'; for header in $$list; do \
     397        list='${QTUIMOC_HEADER}'; for header in $$list; do \
    400398        echo "Making mocfile for $$header"; \
    401399        target=`basename $$header | sed "s/\(.*\)\..*/\1.moc.cpp/"`;\
Note: See TracChangeset for help on using the changeset viewer.