Changeset 372 for cpp/frams/_demos/shapeconvert.cpp

Timestamp:

04/22/15 04:14:59 (8 years ago)

Author:

sz

Message:

Renamed some classes and functions to make their purpose more obvious:

• FramMessage?, FMprintf, etc. become Hmessage, Hprintf, etc... (H for handled message).
• ErrorManager? (and its family) becomes MessageHandler?. Handler names reflect their function better, e.g. MessageHandlerToStdout?.

All MessageHandlers? must now be given the explicit "Enable" argument if you want them to automatically become active. This makes side effects clearly visible.

File:

• cpp/frams/_demos/shapeconvert.cpp (modified) (5 diffs)

cpp/frams/_demos/shapeconvert.cpp

@@ -9 +9 @@
 
 #include <frams/model/model.h>
-#include <frams/errmgr/stdouterr.h>
+#include <frams/mhandlers/stdouthandler.h>
 #include <frams/genetics/preconfigured.h>
 
@@ -34 +34 @@
 {
         StdioFILE::setStdio();//setup VirtFILE::Vstdin/out/err
-        StdoutErrorHandler err(ErrorHandlerBase::DontBlock, VirtFILE::Vstderr); //errors -> stderr, don't interfere with stdout
+        MessageHandlerToStdout messages_to_stderr(MessageHandlerBase::Enable | MessageHandlerBase::DontBlock, VirtFILE::Vstderr); //errors -> stderr, don't interfere with stdout
 
         PreconfiguredGenetics genetics;
@@ -50 +50 @@
                                 if ((shape != Part::SHAPE_ELLIPSOID) && (shape != Part::SHAPE_CUBOID) && (shape != Part::SHAPE_CYLINDER))
                                 {
-                                        FMprintf("", "shapeconvert", FMLV_ERROR, "Invalid shape");
+                                        Hprintf("", "shapeconvert", HMLV_ERROR, "Invalid shape");
                                         return 4;
                                 }
@@ -71 +71 @@
         if (!m.isValid())
         {
-                FMprintf("", "shapeconvert", FMLV_ERROR, "Cannot build Model from the supplied genotype");
+                Hprintf("", "shapeconvert", HMLV_ERROR, "Cannot build Model from the supplied genotype");
                 return 2;
         }
@@ -77 +77 @@
         if (m.getShape() != Model::SHAPE_OLD)
         {
-                FMprintf("", "shapeconvert", FMLV_ERROR, "Only old style shapes can be converted");
+                Hprintf("", "shapeconvert", HMLV_ERROR, "Only old style shapes can be converted");
                 return 3;
         }