[commit] r1794 - in trunk/Doc/Tutorial: . L3/BON1 L3/BON2

[GMESRC Repository Notifications]

Author: ksmyth
Date: Tue Jan 10 16:41:56 2012
New Revision: 1794

Log:
Fix compile

Modified:
   trunk/Doc/Tutorial/L3/BON1/BONComponent.cpp
   trunk/Doc/Tutorial/L3/BON2/BON2Component.cpp
   trunk/Doc/Tutorial/Lesson3.xml

Modified: trunk/Doc/Tutorial/L3/BON1/BONComponent.cpp
==============================================================================
--- trunk/Doc/Tutorial/L3/BON1/BONComponent.cpp	Mon Jan  9 17:37:57 2012	(r1793)
+++ trunk/Doc/Tutorial/L3/BON1/BONComponent.cpp	Tue Jan 10 16:41:56 2012	(r1794)
@@ -4,6 +4,7 @@
 #include <Formatter.h>
 #include "BONComponent.h"
 
+#include "Formatter.h"
 
 /* 
 // This method is usually no longer in use and does not need to be implemented,
@@ -19,6 +20,7 @@
 
 void CComponent::InvokeEx(CBuilder &builder,CBuilderObject *focus, CBuilderObjectList &selected, long param) 
 {
+	using namespace GMEConsole;
 	Console::Out::WriteLine("Interpreter started...");
 
 	Console::Out::WriteLine(CString("Router list for network") + builder.GetRootFolder()->GetName()); 
@@ -45,6 +47,7 @@
 
 void CComponent::ProcessRouter(CBuilderModel *r) 
 { 
+	using namespace GMEConsole;
 	ASSERT(r->GetKindName() == "Router"); 
 	CString fam; 
 	r->GetAttribute("Family", fam); 

Modified: trunk/Doc/Tutorial/L3/BON2/BON2Component.cpp
==============================================================================
--- trunk/Doc/Tutorial/L3/BON2/BON2Component.cpp	Mon Jan  9 17:37:57 2012	(r1793)
+++ trunk/Doc/Tutorial/L3/BON2/BON2Component.cpp	Tue Jan 10 16:41:56 2012	(r1794)
@@ -91,7 +91,7 @@
 		}
 	}
 	
-	childModels = diagram->getChildFCOs("GenNet");
+//	childModels = diagram->getChildFCOs("GenNet");
 //	for (std::set<BON::FCO>::iterator it = childModels.begin(); it != childModels.end(); it++) {
 //		ProcessDiagram(BON::Model(*it));
 //	}
@@ -201,7 +201,7 @@
 	std::set<BON::Model> rootModels = project->getRootFolder()->getChildModels();
 	for (std::set<BON::Model>::iterator it = rootModels.begin(); it != rootModels.end(); it++) {
 		if ((*it)->getObjectMeta().name()== "NetDiagram") {
-			ProcessDiagram(*it);
+			ProcessDiagram(BON::Model(*it));
 		}
 	}
 	std::set<BON::Folder> folders = project->getRootFolder()->getChildFolders();
@@ -209,7 +209,7 @@
 		std::set<BON::Model> models = (*it)->getChildModels();
 		for (std::set<BON::Model>::iterator it2 = models.begin(); it2 != models.end(); it2++) {
 			if ((*it2)->getObjectMeta().name()== "NetDiagram") {
-				ProcessDiagram(*it2);
+				ProcessDiagram(BON::Model(*it2));
 			}
 		}
 	}

Modified: trunk/Doc/Tutorial/Lesson3.xml
==============================================================================
--- trunk/Doc/Tutorial/Lesson3.xml	Mon Jan  9 17:37:57 2012	(r1793)
+++ trunk/Doc/Tutorial/Lesson3.xml	Tue Jan 10 16:41:56 2012	(r1794)
@@ -376,6 +376,7 @@
 
       <para>In <filename>BONComponent.cpp</filename>, insert:<programlisting>void CComponent::InvokeEx(CBuilder &amp;builder,CBuilderObject *focus, CBuilderObjectList &amp;selected, long param) 
 {
+  using namespace GMEConsole;
   Console::Out::WriteLine("Interpreter started...");
 
   Console::Out::WriteLine(CString("Router list for network") + builder.GetRootFolder()-&gt;GetName()); 
@@ -396,6 +397,7 @@
 
       <programlisting>void CComponent::ProcessDiagram(CBuilderModel *d) 
 { 
+  using namespace GMEConsole;
   ASSERT(d-&gt;GetKindName() == "NetDiagram"); 
   const CBuilderModelList *diags = d-&gt;GetModels("NetDiagram"); 
   POSITION pos = diags-&gt;GetHeadPosition(); 
@@ -439,7 +441,7 @@
 
       <para>Do not forget to add <code>ProcessDiagram</code> and
       <code>ProcessRouter</code> to the <code>CComponent</code> declaration in
-      <filename>BONComponent.h</filename>.</para>
+      <filename>BONComponent.h</filename>. Add #include "Formatter.h" to BONComponent.cpp</para>
 
       <para>The compilation should run smoothly unless there are typos in your
       code. If you encounter assertions when running the interpreter for the