source: src/UIElements/Makefile.am@ 5813ac

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
Last change on this file since 5813ac was e4afb4, checked in by Frederik Heber <heber@…>, 14 years ago

Huge refactoring: Introduction of Traits to Actions.

This change is really big but the introduction of the Trait concept (at least
in its current light form) is so fundamental that lots of pieces had to be
changed in order to get everything working.

The main point why it was necessary to add these traits in the first place was
to comfortably allow for adding extension of Actions information-wise, i.e.
with stuff that is only important for the QtUI, such as icons, or tooltips, ...
This extra information should not be stored with Action itself, as it has
nothing to do with the workings of the Action. And neither should it get
stored with some blown-out-of-proportions MapOfActions class ...

The gist of the change is as follows:

  • OptionTrait contains the token, description, shortform and type of an option, such as ("position", "position in space, none, typeid(Vector)).
  • ActionTrait is the derived form for actions where additionally MenuPosition and MenuName are stored (and probably more to come for the GUI), also we have a set of OptionTrait instances, one for each option of the Action.
  • Action then contains this ActionTrait, specialized for each Action.
  • the preprocessor macros have been enhanced to gather all this information from the .def files.
  • MapOfActions is gone. Completely. Most of its use was to store this extra information and the ValueStorage part now is just in class ValueStorage.
  • ValueStorage is no more an interface to MapOfActions but as the name says a (type-safe) ValueStorage.

Listing the (remaining) changes in alphabetical order of the class:

  • Action
    • member value ::name dropped, ::getName() uses ActionTraits::getName()
    • new define NODEFAULT which is used in paramdefaults in .def files
    • all derived actions classes such as Process, Calculations, MakroAction,... have been adapated to use the ActionTrait concept as well.
  • ActionHistory
    • extraced RedoAction and UndoAction, shifted implementation into their own object files and they use .def files as well (i.e. streamlined with method used for other actions)
  • MenuDescription
    • contain information on Menus such as name, ...
    • new unit test checks for consistency
  • molecule
    • const member functions: Copy(), Output() and OutputBonds()
  • OptionRegistry
    • new registry class for options only
    • we want the same type throughout the code for each token, e.g. "position"
    • the registry containts checks for consistency
  • OptionTrait
    • default values are specified in paramdefaults, none are given by NODEFAULT
    • introduced default for translate-atoms, point-correlation, pair-correlation
  • Registry pattern
    • new unit test, but only sceleton code so far
  • ...Query, also ...Pipe
    • atoms, molecule and elements are now all const
    • also ValueStorage's signatures all have const therein
  • ValueStorage
    • set/queryCurrentValue from MapOfActions
    • at times VectorValue has been in .def files where Vector was in the signature. This is cleared. Such stuff is only present for e.g. BoxVector being queried as a Vector. But this is a feature and intended.
  • World
    • most of the (un)selection functions now work on const atoms and molecules
    • in one case we need a const_cast to remove this, but this is intentional, as the vector of selected atoms stores non-const pointers and this is ok.

There is only one test which had to be changed slightly because a specific
option token as "position" must now have the same type everywhere, e.g. always
Vector.

  • TESTFIX: Simple_configuration/2: --position -> --domain-position (and associated to BoxVector)
  • Property mode set to 100644
File size: 6.7 KB
RevLine 
[5079a0]1# Below is all for the User Interface
2
3INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/src/UIElements
4
5AM_LDFLAGS = $(CPPUNIT_LIBS) -ldl
6AM_CXXFLAGS = $(CPPUNIT_CFLAGS)
7
8VIEWSOURCE = \
9 Views/View.cpp \
10 Views/StringView.cpp \
11 Views/MethodStringView.cpp \
12 Views/StreamStringView.cpp
13VIEWHEADER = \
14 Views/View.hpp \
15 Views/StringView.hpp \
16 Views/MethodStringView.hpp \
17 Views/StreamStringView.hpp
18
19MENUSOURCE = \
20 Menu/Menu.cpp \
[8bcf3f]21 Menu/MenuDescription.cpp \
[5079a0]22 Menu/TextMenu.cpp \
23 Menu/MenuItem.cpp \
24 Menu/SubMenuItem.cpp \
25 Menu/ActionMenuItem.cpp \
26 Menu/SeperatorItem.cpp \
27 Menu/DisplayMenuItem.cpp
28
29MENUHEADER = \
30 Menu/Menu.hpp \
[8bcf3f]31 Menu/MenuDescription.hpp \
[5079a0]32 Menu/TextMenu.hpp \
33 Menu/MenuItem.hpp \
34 Menu/SubMenuItem.hpp \
35 Menu/ActionMenuItem.hpp \
36 Menu/SeperatorItem.hpp \
37 Menu/DisplayMenuItem.hpp
38
39UISOURCE = \
40 ${ACTIONSSOURCE} \
41 ${COMMANDLINEUISOURCE} \
42 ${MENUSOURCE} \
43 ${TEXTUISOURCE} \
44 ${VIEWSOURCE} \
[8df74d]45 Query/AtomQuery.cpp \
46 Query/AtomsQuery.cpp \
47 Query/BooleanQuery.cpp \
48 Query/BoxQuery.cpp \
49 Query/DoubleQuery.cpp \
50 Query/DoublesQuery.cpp \
51 Query/ElementQuery.cpp \
52 Query/ElementsQuery.cpp \
53 Query/EmptyQuery.cpp \
54 Query/FileQuery.cpp \
55 Query/IntQuery.cpp \
56 Query/IntsQuery.cpp \
57 Query/MoleculeQuery.cpp \
58 Query/MoleculesQuery.cpp \
59 Query/Query.cpp \
60 Query/StringQuery.cpp \
61 Query/StringsQuery.cpp \
62 Query/VectorQuery.cpp \
63 Query/VectorsQuery.cpp \
[5079a0]64 Dialog.cpp \
[861874]65 MainWindow.cpp
[5079a0]66
67UIHEADER = \
68 ${ACTIONSHEADER} \
69 ${COMMANDLINEUIHEADER} \
70 ${MENUHEADER} \
71 ${TEXTUIHEADER} \
72 ${VIEWHEADER} \
73 Dialog.hpp \
[861874]74 MainWindow.hpp
[5079a0]75
76TEXTUISOURCE = \
[8df74d]77 TextUI/Query/AtomsTextQuery.cpp \
78 TextUI/Query/AtomTextQuery.cpp \
79 TextUI/Query/BooleanTextQuery.cpp \
80 TextUI/Query/BoxTextQuery.cpp \
81 TextUI/Query/DoubleTextQuery.cpp \
82 TextUI/Query/DoublesTextQuery.cpp \
83 TextUI/Query/ElementTextQuery.cpp \
84 TextUI/Query/ElementsTextQuery.cpp \
85 TextUI/Query/EmptyTextQuery.cpp \
86 TextUI/Query/FileTextQuery.cpp \
87 TextUI/Query/IntTextQuery.cpp \
88 TextUI/Query/IntsTextQuery.cpp \
89 TextUI/Query/MoleculesTextQuery.cpp \
90 TextUI/Query/MoleculeTextQuery.cpp \
91 TextUI/Query/StringTextQuery.cpp \
92 TextUI/Query/StringsTextQuery.cpp \
93 TextUI/Query/VectorTextQuery.cpp \
94 TextUI/Query/VectorsTextQuery.cpp \
[5079a0]95 TextUI/TextDialog.cpp \
96 TextUI/TextStatusIndicator.cpp \
97 TextUI/TextUIFactory.cpp \
98 TextUI/TextWindow.cpp
99TEXTUIHEADER = \
100 TextUI/TextDialog.hpp \
101 TextUI/TextStatusIndicator.hpp \
102 TextUI/TextUIFactory.hpp \
103 TextUI/TextWindow.hpp
104
105COMMANDLINEUISOURCE = \
[8df74d]106 CommandLineUI/Query/AtomCommandLineQuery.cpp \
107 CommandLineUI/Query/AtomsCommandLineQuery.cpp \
108 CommandLineUI/Query/BooleanCommandLineQuery.cpp \
109 CommandLineUI/Query/BoxCommandLineQuery.cpp \
110 CommandLineUI/Query/DoubleCommandLineQuery.cpp \
111 CommandLineUI/Query/DoublesCommandLineQuery.cpp \
112 CommandLineUI/Query/ElementCommandLineQuery.cpp \
113 CommandLineUI/Query/ElementsCommandLineQuery.cpp \
114 CommandLineUI/Query/EmptyCommandLineQuery.cpp \
115 CommandLineUI/Query/FileCommandLineQuery.cpp \
116 CommandLineUI/Query/IntCommandLineQuery.cpp \
117 CommandLineUI/Query/IntsCommandLineQuery.cpp \
118 CommandLineUI/Query/MoleculeCommandLineQuery.cpp \
119 CommandLineUI/Query/MoleculesCommandLineQuery.cpp \
120 CommandLineUI/Query/StringCommandLineQuery.cpp \
121 CommandLineUI/Query/StringsCommandLineQuery.cpp \
122 CommandLineUI/Query/VectorCommandLineQuery.cpp \
123 CommandLineUI/Query/VectorsCommandLineQuery.cpp \
[5079a0]124 CommandLineUI/CommandLineDialog.cpp \
[e4afb4]125 CommandLineUI/CommandLineParser.cpp \
[5079a0]126 CommandLineUI/CommandLineStatusIndicator.cpp \
127 CommandLineUI/CommandLineUIFactory.cpp \
[e4afb4]128 CommandLineUI/CommandLineWindow.cpp \
129 CommandLineUI/TypeEnumContainer.cpp
130
[5079a0]131COMMANDLINEUIHEADER = \
132 CommandLineUI/CommandLineDialog.hpp \
[e4afb4]133 CommandLineUI/CommandLineParser.hpp \
[5079a0]134 CommandLineUI/CommandLineStatusIndicator.hpp \
135 CommandLineUI/CommandLineUIFactory.hpp \
[e4afb4]136 CommandLineUI/CommandLineWindow.hpp \
137 CommandLineUI/TypeEnumContainer.cpp
[5079a0]138
[b37436]139lib_LTLIBRARIES = libMolecuilderUI-@MOLECUILDER_API_VERSION@.la
140libMolecuilderUI_includedir = $(includedir)/molecuilder-$(MOLECUILDER_API_VERSION)/Actions/
141libMolecuilderUI_LIBS = \
142 Actions/libMolecuilderActions-@MOLECUILDER_API_VERSION@.la
143
144nobase_libMolecuilderUI_include_HEADERS = ${UIHEADER}
145
146## Define the source file list for the "libexample-@MOLECUILDER_API_VERSION@.la"
147## target. Note that @MOLECUILDER_API_VERSION@ is not interpreted by Automake and
148## will therefore be treated as if it were literally part of the target name,
149## and the variable name derived from that.
150## The file extension .cc is recognized by Automake, and makes it produce
151## rules which invoke the C++ compiler to produce a libtool object file (.lo)
152## from each source file. Note that it is not necessary to list header files
153## which are already listed elsewhere in a _HEADERS variable assignment.
154libMolecuilderUI_@MOLECUILDER_API_VERSION@_la_SOURCES = ${UISOURCE}
155
156## Instruct libtool to include ABI version information in the generated shared
157## library file (.so). The library ABI version is defined in configure.ac, so
158## that all version information is kept in one place.
159libMolecuilderUI_@MOLECUILDER_API_VERSION@_la_LDFLAGS = -version-info $(MOLECUILDER_SO_VERSION)
160
161## The generated configuration header is installed in its own subdirectory of
162## $(libdir). The reason for this is that the configuration information put
163## into this header file describes the target platform the installed library
164## has been built for. Thus the file must not be installed into a location
165## intended for architecture-independent files, as defined by the Filesystem
166## Hierarchy Standard (FHS).
167## The nodist_ prefix instructs Automake to not generate rules for including
168## the listed files in the distribution on 'make dist'. Files that are listed
169## in _HEADERS variables are normally included in the distribution, but the
170## configuration header file is generated at configure time and should not be
171## shipped with the source tarball.
172libMolecuilderUI_libincludedir = $(libdir)/molecuilder-$(MOLECUILDER_API_VERSION)/include
173nodist_libMolecuilderUI_libinclude_HEADERS = $(top_builddir)/libmolecuilder_config.h
174
175## Install the generated pkg-config file (.pc) into the expected location for
176## architecture-dependent package configuration information. Occasionally,
177## pkg-config files are also used for architecture-independent data packages,
178## in which case the correct install location would be $(datadir)/pkgconfig.
179pkgconfigdir = $(libdir)/pkgconfig
180pkgconfig_DATA = $(top_builddir)/molecuilder-$(MOLECUILDER_API_VERSION).pc
[5079a0]181
[796aa6]182unity.cpp:
183 echo "" > unity.cpp; \
184 list='$(UISOURCE)'; for file in $$list; do \
185 echo "#include \"$(srcdir)/$$file\"" >> unity.cpp; \
186 done;
187
188MOSTLYCLEANFILES = unity.cpp
Note: See TracBrowser for help on using the repository browser.