Changeset 5ef341

Timestamp:

Jul 10, 2012, 1:15:51 PM (13 years ago)

Author:

Frederik Heber <heber@…>

Children:

e9a571

Parents:

bab0b1

git-author:

Frederik Heber <heber@…> (07/06/12 20:09:19)

git-committer:

Frederik Heber <heber@…> (07/10/12 13:15:51)

Message:

Extracted rendering of some objects into own function.

File:

• src/bin/mpqc/mpqc.cc (modified) (2 diffs)

src/bin/mpqc/mpqc.cc

@@ -1004 +1004 @@
 }
 
+/** Renders some objects.
+ *
+ * \param renderer renderer object
+ * \param keyval keyvalue container
+ * \param tim timing object
+ * \param grp message group
+ */
+void renderObjects(
+    Ref<Render> &renderer,
+    Ref<KeyVal> &keyval,
+    Ref<RegionTimer> &tim,
+    Ref<MessageGrp> &grp
+    )
+{
+  Ref<RenderedObject> rendered;
+  rendered << keyval->describedclassvalue("rendered");
+  Ref<AnimatedObject> animated;
+  animated << keyval->describedclassvalue("rendered");
+  if (rendered.nonnull()) {
+    if (tim.nonnull()) tim->enter("render");
+    if (grp->me() == 0) renderer->render(rendered);
+    if (tim.nonnull()) tim->exit("render");
+  }
+  else if (animated.nonnull()) {
+    if (tim.nonnull()) tim->enter("render");
+    if (grp->me() == 0) renderer->animate(animated);
+    if (tim.nonnull()) tim->exit("render");
+  }
+  else {
+    if (tim.nonnull()) tim->enter("render");
+    int n = keyval->count("rendered");
+    for (int i=0; i<n; i++) {
+      rendered << keyval->describedclassvalue("rendered",i);
+      animated << keyval->describedclassvalue("rendered",i);
+      if (rendered.nonnull()) {
+        // make sure the object has a name so we don't overwrite its file
+        if (rendered->name() == 0) {
+          char ic[64];
+          sprintf(ic,"%02d",i);
+          rendered->set_name(ic);
+        }
+        if (grp->me() == 0) renderer->render(rendered);
+      }
+      else if (animated.nonnull()) {
+        // make sure the object has a name so we don't overwrite its file
+        if (animated->name() == 0) {
+          char ic[64];
+          sprintf(ic,"%02d",i);
+          animated->set_name(ic);
+        }
+        if (grp->me() == 0) renderer->animate(animated);
+      }
+    }
+    if (tim.nonnull()) tim->exit("render");
+  }
+}
+
 int
 try_main(int argc, char *argv[])
@@ -1253 +1310 @@
 
   if (renderer.nonnull()) {
-    Ref<RenderedObject> rendered;
-    rendered << keyval->describedclassvalue("rendered");
-    Ref<AnimatedObject> animated;
-    animated << keyval->describedclassvalue("rendered");
-    if (rendered.nonnull()) {
-      if (tim.nonnull()) tim->enter("render");
-      if (grp->me() == 0) renderer->render(rendered);
-      if (tim.nonnull()) tim->exit("render");
-    }
-    else if (animated.nonnull()) {
-      if (tim.nonnull()) tim->enter("render");
-      if (grp->me() == 0) renderer->animate(animated);
-      if (tim.nonnull()) tim->exit("render");
-    }
-    else {
-      if (tim.nonnull()) tim->enter("render");
-      int n = keyval->count("rendered");
-      for (i=0; i<n; i++) {
-        rendered << keyval->describedclassvalue("rendered",i);
-        animated << keyval->describedclassvalue("rendered",i);
-        if (rendered.nonnull()) {
-          // make sure the object has a name so we don't overwrite its file
-          if (rendered->name() == 0) {
-            char ic[64];
-            sprintf(ic,"%02d",i);
-            rendered->set_name(ic);
-          }
-          if (grp->me() == 0) renderer->render(rendered);
-        }
-        else if (animated.nonnull()) {
-          // make sure the object has a name so we don't overwrite its file
-          if (animated->name() == 0) {
-            char ic[64];
-            sprintf(ic,"%02d",i);
-            animated->set_name(ic);
-          }
-          if (grp->me() == 0) renderer->animate(animated);
-        }
-      }
-      if (tim.nonnull()) tim->exit("render");
-    }
+    renderObjects(renderer, keyval, tim, grp);
+
     Ref<MolFreqAnimate> molfreqanim;
     molfreqanim << keyval->describedclassvalue("animate_modes");