Merge remote-tracking branch 'origin/develop'

Author: johnroper100

cm_agent.py

@@ -170,7 +170,8 @@ def step(self):
             if preferences.show_debug_timings:
                 cm_timings.agent["brainExecute"] += time.time() - t
             if objs[self.id].select:
-                logger.debug("ID: {} Tags: {} outvars: {}".format(self.id, self.brain.tags, self.brain.outvars))
+                logger.debug("ID: {} Tags: {} outvars: {}".format(
+                    self.id, self.brain.tags, self.brain.outvars))
             # TODO show this in the UI
         if preferences.show_debug_options:
             t = time.time()

cm_generation/cm_templates.py

@@ -639,7 +639,7 @@ def build(self, buildRequest):
 
             t = time.time()
             gret = self.inputs["Objects"].build(geoBuildRequest)
-            cm_timings.placement["TemplateAGENT-Build"] += time.time() -t
+            cm_timings.placement["TemplateAGENT-Build"] += time.time() - t
             cm_timings.placementNum["TemplateAGENT-Build"] += 1
             topObj = gret.obj
 
@@ -673,7 +673,7 @@ def build(self, buildRequest):
                                            rigOverwrite,
                                            constrainBone,
                                            packModifyBones)
-            cm_timings.placement["TemplateAGENT-cm_agent_add"] += time.time() -t
+            cm_timings.placement["TemplateAGENT-cm_agent_add"] += time.time() - t
             cm_timings.placementNum["TemplateAGENT-cm_agent_add"] += 1
 
         cm_timings.placement["TemplateAGENT"] += time.time() - t

cm_nodeFunctions.py

@@ -633,7 +633,8 @@ def core(self, inps, settings):
                                 str(i) + " " + str(into[i]) + "\n"
                             output.write(message)
                     else:
-                        logger.info("{} >> {} {}".format(settings["Label"], i, into[i]))
+                        logger.info("{} >> {} {}".format(
+                            settings["Label"], i, into[i]))
         return 0
 
 

cm_simulate.py

@@ -139,7 +139,8 @@ def step(self, scene):
             newT = time.time()
             logger.debug("Frame time {}".format(newT - t))
             cm_timings.simulation["total"] += newT - t
-            logger.debug("Total time {}".format(cm_timings.simulation["total"]))
+            logger.debug("Total time {}".format(
+                cm_timings.simulation["total"]))
             cm_timings.simulation["totalFrames"] += 1
             tf = cm_timings.simulation["totalFrames"]
             tt = cm_timings.simulation["total"]

libs/ins_clustering.py

@@ -162,167 +162,3 @@ def matchGroups(sources, targets):
         group2Success, group2 = matchGroups(s1[1], t1[1])
         assert group2Success, "Something has gone wrong in matchGroups"
         return True, group1 + group2
-
-# ======================================================================
-
-# ============================== TESTING ===============================
-
-# ======================================================================
-
-
-if __name__ == "__main__":
-    # For testing purposes
-    import sys
-    from PySide import QtGui, QtCore
-    import time
-
-    startMoving = False
-
-    class agent(QtGui.QGraphicsItem):
-        def __init__(self, radius, x, y):
-            QtGui.QGraphicsItem.__init__(self)
-            self.radius = radius
-            self.setPos(x, y)
-            self.inGroup1 = True
-            self.isGroupMarker = False
-            self.goingTo = None
-
-        def boundingRect(self):
-            """sets the area that is updated by drawing"""
-            adjust = 4.0
-            return QtCore.QRectF(-self.radius - adjust, -self.radius - adjust,
-                                 2 * self.radius + 2 * adjust,
-                                 2 * self.radius + 2 * adjust)
-
-        def paint(self, painter, option, widget):
-            if self.isGroupMarker:
-                painter.setPen(QtGui.QPen(QtCore.Qt.black, 10))
-            elif self.inGroup1:
-                painter.setPen(QtGui.QPen(QtCore.Qt.blue, 1))
-            else:
-                painter.setPen(QtGui.QPen(QtCore.Qt.red, 1))
-            bounding = QtCore.QRect(-self.radius, -self.radius,
-                                    2 * self.radius, 2 * self.radius)
-            painter.drawEllipse(bounding)
-            self.update()
-
-        def move(self):
-            if self.goingTo:
-                newX = (49 * self.pos().x() + self.goingTo.x()) / 50
-                newY = (49 * self.pos().y() + self.goingTo.y()) / 50
-                self.setPos(newX, newY)
-
-    class target(QtGui.QGraphicsItem):
-        def __init__(self, radius, x, y):
-            QtGui.QGraphicsItem.__init__(self)
-            self.radius = radius
-            self.setPos(x, y)
-            self.inGroup1 = True
-            self.isGroupMarker = False
-
-        def boundingRect(self):
-            """sets the area that is updated by drawing"""
-            adjust = 4.0
-            return QtCore.QRectF(-self.radius - adjust, -self.radius - adjust, 2 * self.radius + 2 * adjust, 2 * self.radius + 2 * adjust)
-
-        def paint(self, painter, option, widget):
-            if self.isGroupMarker:
-                painter.setPen(QtGui.QPen(QtCore.Qt.darkGreen, 10))
-            elif self.inGroup1:
-                painter.setPen(QtGui.QPen(QtCore.Qt.magenta, 1))
-            else:
-                painter.setPen(QtGui.QPen(QtCore.Qt.yellow, 1))
-            bounding = QtCore.QRect(-self.radius,
-                                    -self.radius, 2 * self.radius,
-                                    2 * self.radius)
-            painter.drawEllipse(bounding)
-            self.update()
-
-        def move(self):
-            self.setPos(self.pos().x() + randrange(-2, 2),
-                        self.pos().y() + randrange(-2, 2))
-            if self.pos().x() >= 600:
-                self.setPos(599, self.pos().y())
-            elif self.pos().x() <= -600:
-                self.setPos(-599, self.pos().y())
-            if self.pos().y() >= 400:
-                self.setPos(self.pos().x(), 399)
-            elif self.pos().y() <= -400:
-                self.setPos(self.pos().x(), -399)
-
-    class View(QtGui.QGraphicsView):
-        def __init__(self):
-            QtGui.QGraphicsView.__init__(self)
-
-            self.scene = QtGui.QGraphicsScene(self)
-            self.scene.setItemIndexMethod(QtGui.QGraphicsScene.NoIndex)
-            self.scene.setSceneRect(-600, -600, 1200, 1200)
-            self.setScene(self.scene)
-            self.setCacheMode(QtGui.QGraphicsView.CacheBackground)
-            self.setRenderHint(QtGui.QPainter.Antialiasing)
-            self.setTransformationAnchor(QtGui.QGraphicsView.AnchorUnderMouse)
-            self.setResizeAnchor(QtGui.QGraphicsView.AnchorViewCenter)
-
-            self.setBackgroundBrush(QtCore.Qt.lightGray)
-
-            self.scale(0.8, 0.8)
-            self.setMinimumSize(1500, 900)
-            self.setWindowTitle(self.tr("Clustering test"))
-
-            self.agents = []
-            noofagents = 40 * 8
-
-            for f in range(noofagents):
-                item = agent(5, (randrange(-800, 800)), (randrange(-600, 600)))
-                self.scene.addItem(item)
-                self.agents.append(item)
-
-            self.targets = []
-            """nooftargets = 110
-
-            for f in range(nooftargets):
-                item = target(7, (randrange(-900, 900)),
-                                 (randrange(-200, 200)))
-                self.scene.addItem(item)
-                self.targets.append(item)"""
-
-            rows = 40
-            columns = 8
-            for row in range(rows):
-                for col in range(columns):
-                    item = target(7, -500 + 1100 * row / rows,
-                                  -100 + 250 * col / columns)
-                    self.scene.addItem(item)
-                    self.targets.append(item)
-
-            def accessFunc(x): return (x.pos().x(), x.pos().y(), 0)
-
-            t = time.time()
-            success, pairings = clusterMatch(self.agents, self.targets,
-                                             accessFunc, accessFunc)
-            logger.debug(str(time.time() - t))
-            assert success, "There was a problem executing clusterMatch"
-
-            for p in pairings:
-                self.agents[p[0][0]].goingTo = p[1][1]
-
-            self.timer = QtCore.QTimer(self)
-            self.connect(self.timer, QtCore.SIGNAL("timeout()"),  self.step)
-            self.timer.start(50)
-
-        def step(self):
-            global startMoving
-            if startMoving:
-                for a in self.agents:
-                    a.move()
-
-        def mousePressEvent(self, event):
-            global startMoving
-            startMoving = True
-
-    app = QtGui.QApplication(sys.argv)
-
-    widget = View()
-    widget.show()
-
-    sys.exit(app.exec_())