[cig-commits] r11368 - in cs/benchmark/cigma/trunk: . scratch/cg src

[luis at geodynamics.org]

Author: luis
Date: 2008-03-07 08:40:52 -0800 (Fri, 07 Mar 2008)
New Revision: 11368

Modified:
   cs/benchmark/cigma/trunk/TODO
   cs/benchmark/cigma/trunk/scratch/cg/TODO
   cs/benchmark/cigma/trunk/src/CommandSet.cpp
   cs/benchmark/cigma/trunk/src/CompareCmd.cpp
   cs/benchmark/cigma/trunk/src/HelpCmd.cpp
Log:
Miscellaneous changes
  * Fixes to CommandSet headers
  * Disabled std::cout stack traces in HelpCmd and CompareCmd


Modified: cs/benchmark/cigma/trunk/TODO
===================================================================
--- cs/benchmark/cigma/trunk/TODO	2008-03-07 16:40:50 UTC (rev 11367)
+++ cs/benchmark/cigma/trunk/TODO	2008-03-07 16:40:52 UTC (rev 11368)
@@ -1,16 +1,21 @@
 ---high-----------------------------------------------------------------------
+Re-enable the cigma buildbot -- done
 Write test case for Quad::jacobian() function (interpolation works fine in TestQuad.cpp...)
 Debug the crash in ~QuadraturePoints() destructor  -- (who is managing the data?)
 Switch to boost's smart_ptr, shared_ptr, weak_ptr for managing most array allocs/refs
 Add extent[6] member variable to MeshPart class (bounding box)
 Add configure flag --with-boost
 Add configure flag --with-cppunit
+Write corresponding man page for each the 'cigma foo' command (see git man pages)
 
+
+
 ---normal---------------------------------------------------------------------
 Write TestVtkXmlReader.cpp test case to make sure it works fine
 Write TestPointField.cpp test case
 Write TestAnnLocatorSearch.cpp to test efficiency of searches in 2d (proportion of cells not found?)
 
+
 ---medium---------------------------------------------------------------------
 Figure out how to define HAVE_VTK in config.h
 Run strike-slip & reverse-slip benchmarks on the 250m resolution datasets (done)

Modified: cs/benchmark/cigma/trunk/scratch/cg/TODO
===================================================================
--- cs/benchmark/cigma/trunk/scratch/cg/TODO	2008-03-07 16:40:50 UTC (rev 11367)
+++ cs/benchmark/cigma/trunk/scratch/cg/TODO	2008-03-07 16:40:52 UTC (rev 11368)
@@ -9,7 +9,12 @@
 Workspace -- collection of datasets
 VtkPipeline -- virtual class with 'void render(vtkRenderer*)' method
 
+---qt4-actions----------------------------------------------------------------
 
+Typical actions to implement (correspond to slots associated with MainWindow class)
+    OpenFile -- dispatches standard filesystem dialog
+    CloseFile -- closes FileNode in corresponding treeview
+
 ---qt4-editors----------------------------------------------------------------
 
 Arrays should be represented by a table view widget
@@ -48,6 +53,8 @@
         ycoords -- array of y-coordinates
         zcoords -- array of z-coordinates
 
+Camera/Viewport Editor
+    See documentation for OpenGL & VTK
 
 FeFieldEditor
     (dof_nno, dof_dim) -- shape for dofhandler dataset

Modified: cs/benchmark/cigma/trunk/src/CommandSet.cpp
===================================================================
--- cs/benchmark/cigma/trunk/src/CommandSet.cpp	2008-03-07 16:40:50 UTC (rev 11367)
+++ cs/benchmark/cigma/trunk/src/CommandSet.cpp	2008-03-07 16:40:52 UTC (rev 11368)
@@ -4,11 +4,11 @@
 #include "CommandSet.h"
 #include "SkelCmd.h"
 #include "HelpCmd.h"
-#include "ExtractCmd.h"
-#include "EvalCmd.h"
 #include "CompareCmd.h"
-#include "CubeCmd.h"
 #include "ListCmd.h"
+//#include "ExtractCmd.h"
+//#include "EvalCmd.h"
+//#include "CubeCmd.h"
 
 cigma::CommandSet::CommandSet()
 {

Modified: cs/benchmark/cigma/trunk/src/CompareCmd.cpp
===================================================================
--- cs/benchmark/cigma/trunk/src/CompareCmd.cpp	2008-03-07 16:40:50 UTC (rev 11367)
+++ cs/benchmark/cigma/trunk/src/CompareCmd.cpp	2008-03-07 16:40:52 UTC (rev 11368)
@@ -61,7 +61,7 @@
 
 void cigma::CompareCmd::setupOptions(AnyOption *opt)
 {
-    std::cout << "Calling cigma::CompareCmd::setupOptions()" << std::endl;
+    //std::cout << "Calling cigma::CompareCmd::setupOptions()" << std::endl;
 
     assert(opt != 0);
 
@@ -111,7 +111,7 @@
 
 void cigma::CompareCmd::configure(AnyOption *opt)
 {
-    std::cout << "Calling cigma::CompareCmd::configure()" << std::endl;
+    //std::cout << "Calling cigma::CompareCmd::configure()" << std::endl;
 
     string field_prefix;
     std::string inputstr;
@@ -427,7 +427,7 @@
 //* XXX: new run() method
 int cigma::CompareCmd::run()
 {
-    std::cout << "Calling cigma::CompareCmd::run()" << std::endl;
+    //std::cout << "Calling cigma::CompareCmd::run()" << std::endl;
 
     // 
     // XXX: need to fail gracefully at this point, instead of throwing

Modified: cs/benchmark/cigma/trunk/src/HelpCmd.cpp
===================================================================
--- cs/benchmark/cigma/trunk/src/HelpCmd.cpp	2008-03-07 16:40:50 UTC (rev 11367)
+++ cs/benchmark/cigma/trunk/src/HelpCmd.cpp	2008-03-07 16:40:52 UTC (rev 11368)
@@ -38,7 +38,7 @@
 
 void cigma::HelpCmd::setupOptions(AnyOption *opt)
 {
-    std::cout << "Calling cigma::HelpCmd::setupOptions()" << std::endl;
+    //std::cout << "Calling cigma::HelpCmd::setupOptions()" << std::endl;
 
     assert(opt != 0);
 
@@ -62,7 +62,7 @@
 
 void cigma::HelpCmd::configure(AnyOption *opt)
 {
-    std::cout << "Calling cigma::HelpCmd::configure()" << std::endl;
+    //std::cout << "Calling cigma::HelpCmd::configure()" << std::endl;
 
     assert(opt != 0);
 
@@ -90,7 +90,7 @@
 
 int cigma::HelpCmd::run()
 {
-    std::cout << "Calling cigma::HelpCmd::run()" << std::endl;
+    //std::cout << "Calling cigma::HelpCmd::run()" << std::endl;
 
     CommandSet::CmdMap::iterator it = commands->find(subcommand);