Changeset 47d041 for src/Actions/SelectionAction

Timestamp:

Nov 3, 2011, 7:44:01 PM (13 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:

41a467

Parents:

50e4e5

git-author:

Frederik Heber <heber@…> (10/27/11 11:53:58)

git-committer:

Frederik Heber <heber@…> (11/03/11 19:44:01)

Message:

HUGE: Removed all calls to Log(), eLog(), replaced by LOG() and ELOG().

• Replaced DoLog(.) && (Log() << Verbose(.) << ... << std::endl) by Log(., ...).
• Replaced Log() << Verbose(.) << .. << by Log(., ...)
• on multiline used stringstream to generate and message which was finally used in LOG(., output.str())
• there should be no more occurence of Log(). LOG() and ELOG() must be used instead.
• Eventually, this will allow for storing all errors and re-printing them on program exit which would be very helpful to ascertain error-free runs for the user.

Location:

src/Actions/SelectionAction

Files:

• Atoms/AllAtomsAction.cpp (modified) (1 diff)
• Atoms/AllAtomsInsideCuboidAction.cpp (modified) (1 diff)
• Atoms/AllAtomsInsideSphereAction.cpp (modified) (1 diff)
• Atoms/AllAtomsOfMoleculeAction.cpp (modified) (1 diff)
• Atoms/AtomByElementAction.cpp (modified) (1 diff)
• Atoms/AtomByIdAction.cpp (modified) (1 diff)
• Atoms/ClearAllAtomsAction.cpp (modified) (1 diff)
• Atoms/NotAllAtomsAction.cpp (modified) (1 diff)
• Atoms/NotAllAtomsInsideCuboidAction.cpp (modified) (1 diff)
• Atoms/NotAllAtomsInsideSphereAction.cpp (modified) (1 diff)
• Atoms/NotAllAtomsOfMoleculeAction.cpp (modified) (1 diff)
• Atoms/NotAtomByElementAction.cpp (modified) (1 diff)
• Atoms/NotAtomByIdAction.cpp (modified) (1 diff)
• Molecules/AllMoleculesAction.cpp (modified) (1 diff)
• Molecules/ClearAllMoleculesAction.cpp (modified) (1 diff)
• Molecules/MoleculeByFormulaAction.cpp (modified) (1 diff)
• Molecules/MoleculeByIdAction.cpp (modified) (1 diff)
• Molecules/MoleculeByNameAction.cpp (modified) (1 diff)
• Molecules/MoleculeByOrderAction.cpp (modified) (1 diff)
• Molecules/MoleculeOfAtomAction.cpp (modified) (1 diff)
• Molecules/NotAllMoleculesAction.cpp (modified) (1 diff)
• Molecules/NotMoleculeByFormulaAction.cpp (modified) (1 diff)
• Molecules/NotMoleculeByIdAction.cpp (modified) (1 diff)
• Molecules/NotMoleculeByNameAction.cpp (modified) (1 diff)
• Molecules/NotMoleculeByOrderAction.cpp (modified) (1 diff)
• Molecules/NotMoleculeOfAtomAction.cpp (modified) (1 diff)

src/Actions/SelectionAction/Atoms/AllAtomsAction.cpp

@@ -43 +43 @@
 
   std::vector<atom *> selectedAtoms = World::getInstance().getSelectedAtoms();
-  DoLog(1) && (Log() << Verbose(1) << "Selecting all atoms." << endl);
+  LOG(1, "Selecting all atoms.");
   World::getInstance().selectAllAtoms(AllAtoms());
-  DoLog(0) && (Log() << Verbose(0) << World::getInstance().countSelectedAtoms() << " atoms selected." << endl);
+  LOG(0, World::getInstance().countSelectedAtoms() << " atoms selected.");
   return Action::state_ptr(new SelectionAllAtomsState(selectedAtoms,params));
 }

src/Actions/SelectionAction/Atoms/AllAtomsInsideCuboidAction.cpp

@@ -52 +52 @@
   RotationMatrix.setRotation(params.Xangle, params.Yangle, params.Zangle);
 
-  DoLog(1) && (Log() << Verbose(1) << "Selecting all atoms inside a rotated " << RotationMatrix << " cuboid at " << params.position << " and extension of " << params.extension << "." << endl);
+  LOG(1, "Selecting all atoms inside a rotated " << RotationMatrix << " cuboid at " << params.position << " and extension of " << params.extension << ".");
   Shape s = translate(transform(stretch(Cuboid(),params.extension),RotationMatrix),params.position);
   std::vector<atom *> selectedAtoms = World::getInstance().getAllAtoms(AtomsBySelection() && AtomByShape(s));
   World::getInstance().selectAllAtoms(AtomByShape(s));
-  DoLog(0) && (Log() << Verbose(0) << World::getInstance().countSelectedAtoms() << " atoms selected." << endl);
+  LOG(0, World::getInstance().countSelectedAtoms() << " atoms selected.");
   return Action::state_ptr(new SelectionAllAtomsInsideCuboidState(selectedAtoms, s, params));
 }

src/Actions/SelectionAction/Atoms/AllAtomsInsideSphereAction.cpp

@@ -47 +47 @@
   getParametersfromValueStorage();
 
-  DoLog(1) && (Log() << Verbose(1) << "Selecting all atoms inside a sphere at " << params.position << " with radius " << params.radius << "." << endl);
+  LOG(1, "Selecting all atoms inside a sphere at " << params.position << " with radius " << params.radius << ".");
   Shape s = translate(resize(Sphere(),params.radius),params.position);
   std::vector<atom *> selectedAtoms = World::getInstance().getAllAtoms(AtomsBySelection() && AtomByShape(s));
   World::getInstance().selectAllAtoms(AtomByShape(s));
-  DoLog(0) && (Log() << Verbose(0) << World::getInstance().countSelectedAtoms() << " atoms selected." << endl);
+  LOG(0, World::getInstance().countSelectedAtoms() << " atoms selected.");
   return Action::state_ptr(new SelectionAllAtomsInsideSphereState(selectedAtoms, s, params));
 }

src/Actions/SelectionAction/Atoms/AllAtomsOfMoleculeAction.cpp

@@ -44 +44 @@
   getParametersfromValueStorage();
 
-  DoLog(1) && (Log() << Verbose(1) << "Selecting all atoms of currently selected molecule." << endl);
+  LOG(1, "Selecting all atoms of currently selected molecule.");
   std::vector<atom *> selectedAtoms = World::getInstance().getAllAtoms(AtomsBySelection());
   World::getInstance().selectAllAtoms(AtomsByMoleculeSelection());
-  DoLog(0) && (Log() << Verbose(0) << World::getInstance().countSelectedAtoms() << " atoms selected." << endl);
+  LOG(0, World::getInstance().countSelectedAtoms() << " atoms selected.");
   return Action::state_ptr(new SelectionAllAtomsOfMoleculeState(selectedAtoms, params));
 }

src/Actions/SelectionAction/Atoms/AtomByElementAction.cpp

@@ -44 +44 @@
   getParametersfromValueStorage();
 
-  DoLog(1) && (Log() << Verbose(1) << "Selecting atoms of type " << *params.elemental << endl);
+  LOG(1, "Selecting atoms of type " << *params.elemental);
   std::vector<atom *> selectedAtoms = World::getInstance().getAllAtoms(AtomsBySelection());
   World::getInstance().selectAllAtoms(AtomByType(params.elemental));
-  DoLog(0) && (Log() << Verbose(0) << World::getInstance().countSelectedAtoms() << " atoms selected." << endl);
+  LOG(0, World::getInstance().countSelectedAtoms() << " atoms selected.");
   return Action::state_ptr(new SelectionAtomByElementState(selectedAtoms,params));
 }

src/Actions/SelectionAction/Atoms/AtomByIdAction.cpp

@@ -44 +44 @@
   if (Walker != NULL) {
     if (!World::getInstance().isSelected(Walker)) {
-      DoLog(1) && (Log() << Verbose(1) << "Selecting atom " << *Walker << endl);
+      LOG(1, "Selecting atom " << *Walker);
       World::getInstance().selectAtom(Walker);
-      DoLog(0) && (Log() << Verbose(0) << World::getInstance().countSelectedAtoms() << " atoms selected." << endl);
+      LOG(0, World::getInstance().countSelectedAtoms() << " atoms selected.");
       return Action::state_ptr(new SelectionAtomByIdState(params));
     } else {

src/Actions/SelectionAction/Atoms/ClearAllAtomsAction.cpp

@@ -43 +43 @@
 
   std::vector<atom *> selectedAtoms = World::getInstance().getSelectedAtoms();
-  DoLog(1) && (Log() << Verbose(1) << "Clearing atoms selection." << endl);
+  LOG(1, "Clearing atoms selection.");
   World::getInstance().clearAtomSelection();
   return Action::state_ptr(new SelectionClearAllAtomsState(selectedAtoms, params));

src/Actions/SelectionAction/Atoms/NotAllAtomsAction.cpp

@@ -43 +43 @@
 
   std::vector<atom *> selectedAtoms = World::getInstance().getSelectedAtoms();
-  DoLog(1) && (Log() << Verbose(1) << "Unselecting all atoms." << endl);
+  LOG(1, "Unselecting all atoms.");
   World::getInstance().clearAtomSelection();
-  DoLog(0) && (Log() << Verbose(0) << World::getInstance().countSelectedAtoms() << " atoms remain selected." << endl);
+  LOG(0, World::getInstance().countSelectedAtoms() << " atoms remain selected.");
   return Action::state_ptr(new SelectionNotAllAtomsState(selectedAtoms, params));
 }

src/Actions/SelectionAction/Atoms/NotAllAtomsInsideCuboidAction.cpp

@@ -51 +51 @@
   RotationMatrix.setRotation(params.Xangle, params.Yangle, params.Zangle);
 
-  DoLog(1) && (Log() << Verbose(1) << "Unselecting all atoms inside a rotated " << RotationMatrix << " cuboid at " << params.position << " and extension of " << params.extension << "." << endl);
+  LOG(1, "Unselecting all atoms inside a rotated " << RotationMatrix << " cuboid at " << params.position << " and extension of " << params.extension << ".");
   Shape s = translate(transform(stretch(Cuboid(),params.extension),RotationMatrix),params.position);
   std::vector<atom *> unselectedAtoms = World::getInstance().getAllAtoms((!AtomsBySelection()) && AtomByShape(s));
   World::getInstance().unselectAllAtoms(AtomByShape(s));
-  DoLog(0) && (Log() << Verbose(0) << World::getInstance().countSelectedAtoms() << " atoms remain selected." << endl);
+  LOG(0, World::getInstance().countSelectedAtoms() << " atoms remain selected.");
   return Action::state_ptr(new SelectionNotAllAtomsInsideCuboidState(unselectedAtoms, s, params));
 }

src/Actions/SelectionAction/Atoms/NotAllAtomsInsideSphereAction.cpp

@@ -47 +47 @@
   getParametersfromValueStorage();
 
-  DoLog(1) && (Log() << Verbose(1) << "Unselecting all atoms inside a sphere at " << params.position << " with radius " << params.radius << "." << endl);
+  LOG(1, "Unselecting all atoms inside a sphere at " << params.position << " with radius " << params.radius << ".");
   Shape s = translate(resize(Sphere(),params.radius),params.position);
   std::vector<atom *> unselectedAtoms = World::getInstance().getAllAtoms((!AtomsBySelection()) && AtomByShape(s));
   World::getInstance().unselectAllAtoms(AtomByShape(s));
-  DoLog(0) && (Log() << Verbose(0) << World::getInstance().countSelectedAtoms() << " atoms remain selected." << endl);
+  LOG(0, World::getInstance().countSelectedAtoms() << " atoms remain selected.");
   return Action::state_ptr(new SelectionNotAllAtomsInsideSphereState(unselectedAtoms, s, params));
 }

src/Actions/SelectionAction/Atoms/NotAllAtomsOfMoleculeAction.cpp

@@ -44 +44 @@
   getParametersfromValueStorage();
 
-  DoLog(1) && (Log() << Verbose(1) << "Unselecting all atoms of currently selected molecules." << endl);
+  LOG(1, "Unselecting all atoms of currently selected molecules.");
   std::vector<atom *> unselectedAtoms = World::getInstance().getAllAtoms(!AtomsBySelection());
   World::getInstance().unselectAllAtoms(AtomsByMoleculeSelection());
-  DoLog(0) && (Log() << Verbose(0) << World::getInstance().countSelectedAtoms() << " atoms remain selected." << endl);
+  LOG(0, World::getInstance().countSelectedAtoms() << " atoms remain selected.");
   return Action::state_ptr(new SelectionNotAllAtomsOfMoleculeState(unselectedAtoms, params));
 }

src/Actions/SelectionAction/Atoms/NotAtomByElementAction.cpp

@@ -44 +44 @@
   getParametersfromValueStorage();
 
-  DoLog(1) && (Log() << Verbose(1) << "Unselecting atoms of type " << *params.elemental << endl);
+  LOG(1, "Unselecting atoms of type " << *params.elemental);
   std::vector<atom *> unselectedAtoms = World::getInstance().getAllAtoms(!AtomsBySelection());
   World::getInstance().unselectAllAtoms(AtomByType(params.elemental));
-  DoLog(0) && (Log() << Verbose(0) << World::getInstance().countSelectedAtoms() << " atoms remain selected." << endl);
+  LOG(0, World::getInstance().countSelectedAtoms() << " atoms remain selected.");
   return Action::state_ptr(new SelectionNotAtomByElementState(unselectedAtoms,params));
 }

src/Actions/SelectionAction/Atoms/NotAtomByIdAction.cpp

@@ -44 +44 @@
   if (Walker != NULL) {
     if (World::getInstance().isSelected(Walker)) {
-      DoLog(1) && (Log() << Verbose(1) << "Unselecting atom " << *Walker << endl);
+      LOG(1, "Unselecting atom " << *Walker);
       World::getInstance().unselectAtom(Walker);
-      DoLog(0) && (Log() << Verbose(0) << World::getInstance().countSelectedAtoms() << " atoms remain selected." << endl);
+      LOG(0, World::getInstance().countSelectedAtoms() << " atoms remain selected.");
       return Action::state_ptr(new SelectionNotAtomByIdState(params));
     } else {

src/Actions/SelectionAction/Molecules/AllMoleculesAction.cpp

@@ -44 +44 @@
 
   std::vector<molecule *> selectedMolecules = World::getInstance().getSelectedMolecules();
-  DoLog(1) && (Log() << Verbose(1) << "Selecting all molecules." << endl);
+  LOG(1, "Selecting all molecules.");
   World::getInstance().selectAllMolecules(AllMolecules());
-  DoLog(0) && (Log() << Verbose(0) << World::getInstance().countSelectedMolecules() << " molecules selected." << endl);
+  LOG(0, World::getInstance().countSelectedMolecules() << " molecules selected.");
   return Action::state_ptr(new SelectionAllMoleculesState(selectedMolecules,params));
 }

src/Actions/SelectionAction/Molecules/ClearAllMoleculesAction.cpp

@@ -43 +43 @@
 
   std::vector<molecule *> selectedMolecules = World::getInstance().getSelectedMolecules();
-  DoLog(1) && (Log() << Verbose(1) << "Clearing molecule selection." << endl);
+  LOG(1, "Clearing molecule selection.");
   World::getInstance().clearMoleculeSelection();
-  DoLog(0) && (Log() << Verbose(0) << World::getInstance().countSelectedMolecules() << " molecules remain selected." << endl);
+  LOG(0, World::getInstance().countSelectedMolecules() << " molecules remain selected.");
   return Action::state_ptr(new SelectionClearAllMoleculesState(selectedMolecules,params));
 }

src/Actions/SelectionAction/Molecules/MoleculeByFormulaAction.cpp

@@ -43 +43 @@
   getParametersfromValueStorage();
 
-  DoLog(1) && (Log() << Verbose(1) << "Selecting molecules with chemical formula " << params.formula << ":" << endl);
+  LOG(1, "Selecting molecules with chemical formula " << params.formula << ":");
 //  std::vector<molecule *> matchingMolecules = World::getInstance().getAllMolecules(MoleculeByFormula(params.formula));
   std::vector<molecule *> selectedMolecules =
       World::getInstance().getAllMolecules(MoleculesBySelection() && MoleculeByFormula(params.formula));
 //  BOOST_FOREACH(molecule *mol, matchingMolecules)
-//    DoLog(1) && (Log() << Verbose(1) << "\t" << mol->getId() << ", " << mol->getName() << "." << endl);
+//    LOG(1, "\t" << mol->getId() << ", " << mol->getName() << ".");
   World::getInstance().selectAllMolecules(MoleculeByFormula(params.formula));
-  DoLog(0) && (Log() << Verbose(0) << World::getInstance().countSelectedMolecules() << " molecules selected." << endl);
+  LOG(0, World::getInstance().countSelectedMolecules() << " molecules selected.");
   return Action::state_ptr(new SelectionMoleculeByFormulaState(selectedMolecules,params));
 }

src/Actions/SelectionAction/Molecules/MoleculeByIdAction.cpp

@@ -44 +44 @@
   if (mol != NULL) {
     if (!World::getInstance().isSelected(mol)) {
-      DoLog(1) && (Log() << Verbose(1) << "Selecting molecule " << mol->name << endl);
+      LOG(1, "Selecting molecule " << mol->name);
       World::getInstance().selectAllMolecules(MoleculeById(params.molindex));
-      DoLog(0) && (Log() << Verbose(0) << World::getInstance().countSelectedMolecules() << " molecules selected." << endl);
+      LOG(0, World::getInstance().countSelectedMolecules() << " molecules selected.");
       return Action::state_ptr(new SelectionMoleculeByIdState(params));
     } else {

src/Actions/SelectionAction/Molecules/MoleculeByNameAction.cpp

@@ -43 +43 @@
   getParametersfromValueStorage();
 
-  DoLog(1) && (Log() << Verbose(1) << "Selecting all molecules called " << params.molname << endl);
+  LOG(1, "Selecting all molecules called " << params.molname);
   std::vector<molecule *> selectedMolecules =
       World::getInstance().getAllMolecules(MoleculesBySelection() && MoleculeByName(params.molname));
   World::getInstance().selectAllMolecules(MoleculeByName(params.molname));
-  DoLog(0) && (Log() << Verbose(0) << World::getInstance().countSelectedMolecules() << " molecules selected." << endl);
+  LOG(0, World::getInstance().countSelectedMolecules() << " molecules selected.");
 
   return Action::state_ptr(new SelectionMoleculeByNameState(selectedMolecules,params));

src/Actions/SelectionAction/Molecules/MoleculeByOrderAction.cpp

@@ -46 +46 @@
   if (mol != NULL) {
     if (!World::getInstance().isSelected(mol)) {
-      DoLog(1) && (Log() << Verbose(1) << "Selecting molecule " << mol->name << endl);
+      LOG(1, "Selecting molecule " << mol->name);
       World::getInstance().selectMolecule(mol);
-      DoLog(0) && (Log() << Verbose(0) << World::getInstance().countSelectedMolecules() << " molecules selected." << endl);
+      LOG(0, World::getInstance().countSelectedMolecules() << " molecules selected.");
       return Action::state_ptr(new SelectionMoleculeByOrderState(mol, params));
     } else {

src/Actions/SelectionAction/Molecules/MoleculeOfAtomAction.cpp

@@ -43 +43 @@
 
   std::vector<molecule *> selectedMolecules = World::getInstance().getSelectedMolecules();
-  DoLog(1) && (Log() << Verbose(1) << "Selecting molecule to currently selected atoms." << endl);
+  LOG(1, "Selecting molecule to currently selected atoms.");
   World::getInstance().selectAllMolecules(MoleculesByAtomSelection());
-  DoLog(0) && (Log() << Verbose(0) << World::getInstance().countSelectedMolecules() << " molecules selected." << endl);
+  LOG(0, World::getInstance().countSelectedMolecules() << " molecules selected.");
   return Action::state_ptr(new SelectionMoleculeOfAtomState(selectedMolecules, params));
 }

src/Actions/SelectionAction/Molecules/NotAllMoleculesAction.cpp

@@ -43 +43 @@
 
   std::vector<molecule *> selectedMolecules = World::getInstance().getSelectedMolecules();
-  DoLog(1) && (Log() << Verbose(1) << "Unselecting all molecules." << endl);
+  LOG(1, "Unselecting all molecules.");
   World::getInstance().clearMoleculeSelection();
-  DoLog(0) && (Log() << Verbose(0) << World::getInstance().countSelectedMolecules() << " molecules remain selected." << endl);
+  LOG(0, World::getInstance().countSelectedMolecules() << " molecules remain selected.");
   return Action::state_ptr(new SelectionNotAllMoleculesState(selectedMolecules,params));
 }

src/Actions/SelectionAction/Molecules/NotMoleculeByFormulaAction.cpp

@@ -43 +43 @@
   getParametersfromValueStorage();
 
-  DoLog(1) && (Log() << Verbose(1) << "Unselecting molecules with chemical formula " << params.formula << ":" << endl);
+  LOG(1, "Unselecting molecules with chemical formula " << params.formula << ":");
   std::vector<molecule *> matchingMolecules = World::getInstance().getAllMolecules(MoleculeByFormula(params.formula));
   std::vector<molecule *> unselectedMolecules = World::getInstance().getAllMolecules(!MoleculesBySelection());
   World::getInstance().unselectAllMolecules(MoleculeByFormula(params.formula));
-  DoLog(0) && (Log() << Verbose(0) << World::getInstance().countSelectedMolecules() << " molecules remain selected." << endl);
+  LOG(0, World::getInstance().countSelectedMolecules() << " molecules remain selected.");
   return Action::state_ptr(new SelectionNotMoleculeByFormulaState(unselectedMolecules,params));
 }

src/Actions/SelectionAction/Molecules/NotMoleculeByIdAction.cpp

@@ -44 +44 @@
   if (mol != NULL) {
     if (World::getInstance().isSelected(mol)) {
-      DoLog(1) && (Log() << Verbose(1) << "Unselecting molecule " << mol->name << endl);
+      LOG(1, "Unselecting molecule " << mol->name);
       World::getInstance().unselectAllMolecules(MoleculeById(params.molindex));
-      DoLog(0) && (Log() << Verbose(0) << World::getInstance().countSelectedMolecules() << " molecules remain selected." << endl);
+      LOG(0, World::getInstance().countSelectedMolecules() << " molecules remain selected.");
       return Action::state_ptr(new SelectionNotMoleculeByIdState(params));
     } else {

src/Actions/SelectionAction/Molecules/NotMoleculeByNameAction.cpp

@@ -43 +43 @@
   getParametersfromValueStorage();
 
-  DoLog(1) && (Log() << Verbose(1) << "Unselecting all molecule called " << params.molname << endl);
+  LOG(1, "Unselecting all molecule called " << params.molname);
   std::vector<molecule *> unselectedMolecules =
       World::getInstance().getAllMolecules((!MoleculesBySelection()) && MoleculeByName(params.molname));
   World::getInstance().unselectAllMolecules(MoleculeByName(params.molname));
-  DoLog(0) && (Log() << Verbose(0) << World::getInstance().countSelectedMolecules() << " molecules remain selected." << endl);
+  LOG(0, World::getInstance().countSelectedMolecules() << " molecules remain selected.");
 
   return Action::state_ptr(new SelectionNotMoleculeByNameState(unselectedMolecules,params));

src/Actions/SelectionAction/Molecules/NotMoleculeByOrderAction.cpp

@@ -46 +46 @@
   if (mol != NULL) {
     if (World::getInstance().isSelected(mol)) {
-      DoLog(1) && (Log() << Verbose(1) << "Unselecting molecule " << mol->name << endl);
+      LOG(1, "Unselecting molecule " << mol->name);
       World::getInstance().unselectMolecule(mol);
-      DoLog(0) && (Log() << Verbose(0) << World::getInstance().countSelectedMolecules() << " molecules remain selected." << endl);
+      LOG(0, World::getInstance().countSelectedMolecules() << " molecules remain selected.");
       return Action::state_ptr(new SelectionNotMoleculeByOrderState(mol, params));
     } else {

src/Actions/SelectionAction/Molecules/NotMoleculeOfAtomAction.cpp

@@ -43 +43 @@
 
   std::vector<molecule *> unselectedMolecules = World::getInstance().getSelectedMolecules();
-  DoLog(1) && (Log() << Verbose(1) << "Unselecting molecule to currently selected atoms." << endl);
+  LOG(1, "Unselecting molecule to currently selected atoms.");
   World::getInstance().unselectAllMolecules(MoleculesByAtomSelection());
-  DoLog(0) && (Log() << Verbose(0) << World::getInstance().countSelectedMolecules() << " molecules remain selected." << endl);
+  LOG(0, World::getInstance().countSelectedMolecules() << " molecules remain selected.");
   return Action::state_ptr(new SelectionNotMoleculeOfAtomState(unselectedMolecules, params));
 }