Changeset df55a0 for molecuilder/src

Timestamp:

Dec 16, 2009, 12:30:16 PM (16 years ago)

Author:

Frederik Heber <heber@…>

Children:

057b77

Parents:

7cb300

git-author:

Tillmann Crueger <crueger@…> (12/14/09 14:24:49)

git-committer:

Frederik Heber <heber@…> (12/16/09 12:30:16)

Message:

Added basic View functionality. - Added DisplayMenuItem to show certain types of Views - Added Views to make StringViews from methods producing strings and from methods taking streams Signed-off-by: Tillmann Crueger <crueger@…>

Location:

molecuilder/src

Files:

• Makefile.am (modified) (1 diff)
• Menu/DisplayMenuItem.cpp (added)
• Menu/DisplayMenuItem.hpp (added)
• Views/MethodStringView.cpp (added)
• Views/MethodStringView.hpp (added)
• Views/StreamStringView.cpp (added)
• Views/StreamStringView.hpp (added)
• Views/StringView.cpp (added)
• Views/StringView.hpp (added)
• Views/View.cpp (added)
• Views/View.hpp (added)
• menu.cpp (modified) (2 diffs)

molecuilder/src/Makefile.am

@@ -8 +8 @@
 ACTIONSHEADER = Actions/Action.hpp Actions/MethodAction.hpp
 
-MENUSOURCE = ${ACTIONSSOURCE} Menu/Menu.cpp Menu/TextMenu.cpp Menu/MenuItem.cpp Menu/SubMenuItem.cpp Menu/ActionMenuItem.cpp Menu/SeperatorItem.cpp
-MENUHEADER = ${ACTIONSHEADER} Menu/Menu.hpp Menu/TextMenu.hpp Menu/MenuItem.hpp Menu/SubMenuItem.hpp Menu/ActionMenuItem.hpp Menu/SeperatorItem.hpp
+VIEWSOURCE = Views/View.cpp Views/StringView.cpp Views/MethodStringView.cpp Views/StreamStringView.cpp
+VIEWHEADER = Views/View.hpp Views/StringView.hpp Views/MethodStringView.hpp Views/StreamStringView.hpp
+
+MENUSOURCE = ${ACTIONSSOURCE} ${VIEWSOURCE} Menu/Menu.cpp Menu/TextMenu.cpp Menu/MenuItem.cpp Menu/SubMenuItem.cpp Menu/ActionMenuItem.cpp Menu/SeperatorItem.cpp Menu/DisplayMenuItem.cpp
+MENUHEADER = ${ACTIONSHEADER} ${VIEWHEADER} Menu/Menu.hpp Menu/TextMenu.hpp Menu/MenuItem.hpp Menu/SubMenuItem.hpp Menu/ActionMenuItem.hpp Menu/SeperatorItem.hpp Menu/DisplayMenuItem.hpp
 
 SOURCE = ${ANALYSISSOURCE} ${ATOMSOURCE} ${MENUSOURCE} bond.cpp bondgraph.cpp boundary.cpp config.cpp element.cpp ellipsoid.cpp errorlogger.cpp graph.cpp helpers.cpp leastsquaremin.cpp linkedcell.cpp log.cpp logger.cpp memoryusageobserver.cpp moleculelist.cpp molecule.cpp molecule_dynamics.cpp molecule_fragmentation.cpp molecule_geometry.cpp molecule_graph.cpp molecule_pointcloud.cpp parser.cpp periodentafel.cpp tesselation.cpp tesselationhelpers.cpp vector.cpp verbose.cpp menu.cpp

molecuilder/src/menu.cpp

@@ -28 +28 @@
 #include "Menu/ActionMenuItem.hpp"
 #include "Menu/SeperatorItem.hpp"
+#include "Menu/DisplayMenuItem.hpp"
 #include "Actions/MethodAction.hpp"
+#include "Views/StreamStringView.hpp"
+#include "Views/MethodStringView.hpp"
 
 
@@ -1225 +1228 @@
   TextMenu *main_menu = new TextMenu(Log() << Verbose(0), "Main Menu");
 
+  StringView *moleculeView = new StreamStringView(boost::bind(&MoleculeListClass::Enumerate,molecules,_1));
+  new DisplayMenuItem(main_menu,moleculeView);
+
+  new SeperatorItem(main_menu);
+
   MethodAction *setMoleculeAction = new MethodAction(boost::bind(&oldmenu::notImplementedYet,this));
   new ActionMenuItem('a',"set molecule (in)active",main_menu,setMoleculeAction);