source: src/UIElements/UIFactory.cpp@ ff3c40

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 ff3c40 was 694d84, checked in by Frederik Heber <heber@…>, 14 years ago

MEMFIX: static factories map of UIFactory was not clear()'ed in destructor.

  • hence, boost::shared_ptr still had a user and have not been deleted.
  • TESTFIX: ActionSequenceTest and manipulateAtomsTest segfault.
    • the problem was the static hasDescriptor boolean. It made the dummy factory
getting registered only once, despite its being removed during UIFactory
purgeInstance() in tearDown().
  • hasDescriptor is now a member variable and set to false in tearDown().
  • Property mode set to 100644
File size: 1.6 KB
Line 
1/*
2 * Project: MoleCuilder
3 * Description: creates and alters molecular systems
4 * Copyright (C) 2010 University of Bonn. All rights reserved.
5 * Please see the LICENSE file or "Copyright notice" in builder.cpp for details.
6 */
7
8/*
9 * UIFactory.cpp
10 *
11 * Created on: Jan 5, 2010
12 * Author: crueger
13 */
14
15// include config.h
16#ifdef HAVE_CONFIG_H
17#include <config.h>
18#endif
19
20#include "Helpers/MemDebug.hpp"
21
22#include <utility>
23#include "Patterns/Singleton_impl.hpp"
24#include "UIElements/UIFactory.hpp"
25#include "Helpers/Assert.hpp"
26#include "Helpers/MemDebug.hpp"
27
28using namespace std;
29
30std::map<std::string,boost::shared_ptr<UIFactory::factoryDescription> > UIFactory::factories;
31
32UIFactory::UIFactory()
33{}
34
35UIFactory::~UIFactory()
36{
37 // clear out factories map to allow boost::shared_ptr to do their work (i.e. to release mem)
38 // this is necessary as factories is a static object
39 factories.clear();
40}
41
42void UIFactory::makeUserInterface(std::string type) {
43 ASSERT(factories.count(type),"Selected factory was not registered before creation.");
44 // call the factory factory
45 setInstance(factories[type]->makeFactory());
46}
47
48void UIFactory::registerFactory(factoryDescription *factoryDesc) {
49 ASSERT(!factories.count(factoryDesc->name),"Trying to re-register an already registered factory.");
50 factories.insert(make_pair(factoryDesc->name,
51 boost::shared_ptr<factoryDescription>(factoryDesc)));
52}
53
54CONSTRUCT_SINGLETON(UIFactory)
55
56UIFactory::factoryDescription::factoryDescription(string _name) :
57 name(_name)
58{}
59
60UIFactory::factoryDescription::~factoryDescription()
61{}
Note: See TracBrowser for help on using the repository browser.