X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fshoppinglist%2Fmain.cpp;h=276a4c7877d0f68ec68bc1302291c11995456216;hb=d06a1e1ab34e5ecb4bb7011d44298a0b5e6162be;hp=eac7e447010ef109490d93282367b82f14aec571;hpb=3e9c210ddc036cd015228504cc0803c909e27f84;p=r2c2.git

diff --git a/source/shoppinglist/main.cpp b/source/shoppinglist/main.cpp
index eac7e44..276a4c7 100644
--- a/source/shoppinglist/main.cpp
+++ b/source/shoppinglist/main.cpp
@@ -1,24 +1,15 @@
-/* $Id$
-
-This file is part of the MSP Märklin suite
-Copyright © 2006-2008 Mikkosoft Productions, Mikko Rasa
-Distributed under the GPL
-*/
-
-#include <iostream>
 #include <map>
+#include <msp/core/application.h>
 #include <msp/core/getopt.h>
 #include <msp/datafile/loader.h>
 #include <msp/datafile/parser.h>
+#include <msp/io/print.h>
 
 using namespace std;
 using namespace Msp;
 
-class ShoppingList
+class ShoppingList: public RegisteredApplication<ShoppingList>
 {
-public:
-	ShoppingList(int, char **);
-	void print(ostream &);
 private:
 	class InventoryLoader: public DataFile::Loader
 	{
@@ -27,7 +18,7 @@ private:
 	private:
 		ShoppingList &sl;
 
-		void track(unsigned, unsigned);
+		void track(const string &, int);
 	};
 
 	class LayoutLoader: public DataFile::Loader
@@ -37,106 +28,113 @@ private:
 	private:
 		ShoppingList &sl;
 
-		void track(unsigned);
+		void track(const string &);
 	};
 
-	map<unsigned, unsigned> inventory;
-	map<unsigned, unsigned> layout;
+	map<string, unsigned> inventory;
+	map<string, unsigned> layout;
 
+public:
+	ShoppingList(int, char **);
+	int main();
+private:
 	void load_inventory(const string &);
 	void load_layout(const string &);
 };
 
-int main(int argc, char **argv)
-{
-	ShoppingList sl(argc, argv);
-	sl.print(cout);
-	return 0;
-}
 
 ShoppingList::ShoppingList(int argc, char **argv)
 {
-	string inv_fn="inventory";
+	string inv_fn = "inventory";
 	GetOpt getopt;
 	getopt.add_option('i', "inventory", inv_fn, GetOpt::REQUIRED_ARG);
-	getopt(argc,argv);
+	getopt(argc, argv);
 
 	load_inventory(inv_fn);
 	load_layout(getopt.get_args().front());
 }
 
-void ShoppingList::load_inventory(const string &fn)
-{
-	IO::File in(fn);
-	DataFile::Parser parser(in, fn);
-	InventoryLoader il(*this);
-	il.load(parser);
-}
-
-void ShoppingList::load_layout(const string &fn)
-{
-	IO::File in(fn);
-	DataFile::Parser parser(in, fn);
-	LayoutLoader ll(*this);
-	ll.load(parser);
-}
-
-void ShoppingList::print(ostream &out)
+int ShoppingList::main()
 {
-	out<<"// Need to get:\n";
-	for(map<unsigned, unsigned>::iterator i=layout.begin(); i!=layout.end(); ++i)
+	IO::print("// Need to get:\n");
+	for(map<string, unsigned>::iterator i=layout.begin(); i!=layout.end(); ++i)
 	{
-		map<unsigned, unsigned>::iterator j=inventory.find(i->first);
+		map<string, unsigned>::iterator j=inventory.find(i->first);
 		if(j!=inventory.end())
 		{
 			if(j->second<i->second)
-				out<<"track "<<i->first<<' '<<i->second-j->second<<";\n";
+				IO::print("track \"%s\" %d;\n", i->first, i->second-j->second);
 		}
 		else
-			out<<"track "<<i->first<<' '<<i->second<<";\n";
+			IO::print("track \"%s\" %d;\n", i->first, i->second);
 	}
 
-	out<<"// Pre-existing:\n";
-	for(map<unsigned, unsigned>::iterator i=layout.begin(); i!=layout.end(); ++i)
+	IO::print("// Pre-existing:\n");
+	for(map<string, unsigned>::iterator i=layout.begin(); i!=layout.end(); ++i)
 	{
-		map<unsigned, unsigned>::iterator j=inventory.find(i->first);
+		map<string, unsigned>::iterator j=inventory.find(i->first);
 		if(j!=inventory.end())
-			out<<"track "<<i->first<<' '<<min(i->second,j->second)<<";\n";
+			IO::print("track \"%s\" %d;\n", i->first, min(i->second, j->second));
 	}
 
-	out<<"// Unused:\n";
-	for(map<unsigned, unsigned>::iterator i=inventory.begin(); i!=inventory.end(); ++i)
+	IO::print("// Unused:\n");
+	for(map<string, unsigned>::iterator i=inventory.begin(); i!=inventory.end(); ++i)
 	{
-		map<unsigned, unsigned>::iterator j=layout.find(i->first);
+		map<string, unsigned>::iterator j=layout.find(i->first);
 		if(j!=layout.end())
 		{
 			if(j->second<i->second)
-				out<<"track "<<i->first<<' '<<i->second-j->second<<";\n";
+				IO::print("track \"%s\" %d;\n", i->first, i->second-j->second);
 		}
 		else
-			out<<"track "<<i->first<<' '<<i->second<<";\n";
+			IO::print("track \"%s\" %d;\n", i->first, i->second);
 	}
+
+	return 0;
 }
 
+void ShoppingList::load_inventory(const string &fn)
+{
+	IO::File in(fn);
+	DataFile::Parser parser(in, fn);
+	InventoryLoader il(*this);
+	il.load(parser);
+}
+
+void ShoppingList::load_layout(const string &fn)
+{
+	IO::File in(fn);
+	DataFile::Parser parser(in, fn);
+	LayoutLoader ll(*this);
+	ll.load(parser);
+}
+
+
 ShoppingList::InventoryLoader::InventoryLoader(ShoppingList &s):
 	sl(s)
 {
 	add("track", &InventoryLoader::track);
 }
 
-void ShoppingList::InventoryLoader::track(unsigned part, unsigned count)
+void ShoppingList::InventoryLoader::track(const string &n, int count)
 {
-	sl.inventory[part]+=count;
+	sl.inventory[n] += count;
 }
 
+
 ShoppingList::LayoutLoader::LayoutLoader(ShoppingList &s):
 	sl(s)
 {
 	add("track", &LayoutLoader::track);
 	add("base");
+	add("beamgate");
+	add("route");
+	add("signal");
+	add("terrain");
+	add("zone");
 }
 
-void ShoppingList::LayoutLoader::track(unsigned part)
+void ShoppingList::LayoutLoader::track(const string &n)
 {
-	++sl.layout[part];
+	++sl.layout[n];
 }