You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@senssoft.apache.org by ms...@apache.org on 2016/09/20 19:45:20 UTC

[1/2] incubator-senssoft-userale-pyqt5 git commit: Trailings files missing the apache license headers.

Repository: incubator-senssoft-userale-pyqt5
Updated Branches:
  refs/heads/master deca3e9f5 -> 0d0ea60b3


Trailings files missing the apache license headers.


Project: http://git-wip-us.apache.org/repos/asf/incubator-senssoft-userale-pyqt5/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-senssoft-userale-pyqt5/commit/f3b4917c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-senssoft-userale-pyqt5/tree/f3b4917c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-senssoft-userale-pyqt5/diff/f3b4917c

Branch: refs/heads/master
Commit: f3b4917cbcd5c4610095f3950565e6b2bd605960
Parents: deca3e9
Author: mooshu1x2 <mb...@draper.com>
Authored: Tue Sep 20 08:24:49 2016 -0400
Committer: mooshu1x2 <mb...@draper.com>
Committed: Tue Sep 20 08:24:49 2016 -0400

----------------------------------------------------------------------
 .gitignore           | 15 +++++++++++++++
 .travis.yaml         | 15 +++++++++++++++
 doc_requirements.txt | 15 +++++++++++++++
 3 files changed, 45 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-senssoft-userale-pyqt5/blob/f3b4917c/.gitignore
----------------------------------------------------------------------
diff --git a/.gitignore b/.gitignore
index 04cc32d..12460cd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,18 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
 # Byte-compiled / optimized / DLL files
 __pycache__/
 *.py[cod]

http://git-wip-us.apache.org/repos/asf/incubator-senssoft-userale-pyqt5/blob/f3b4917c/.travis.yaml
----------------------------------------------------------------------
diff --git a/.travis.yaml b/.travis.yaml
index 2d06779..bf66de2 100644
--- a/.travis.yaml
+++ b/.travis.yaml
@@ -1,3 +1,18 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
 language: python
 python:
   - "3.5"

http://git-wip-us.apache.org/repos/asf/incubator-senssoft-userale-pyqt5/blob/f3b4917c/doc_requirements.txt
----------------------------------------------------------------------
diff --git a/doc_requirements.txt b/doc_requirements.txt
index 88cfb57..e1c9809 100644
--- a/doc_requirements.txt
+++ b/doc_requirements.txt
@@ -1,2 +1,17 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
 Sphinx==1.4.6
 sphinx-rtd-theme==0.1.9


[2/2] incubator-senssoft-userale-pyqt5 git commit: SENSSOFT-75 # Resolved bug in sampling due to pyqt object reference out of scope.

Posted by ms...@apache.org.
SENSSOFT-75 # Resolved bug in sampling due to pyqt object reference out of scope.


Project: http://git-wip-us.apache.org/repos/asf/incubator-senssoft-userale-pyqt5/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-senssoft-userale-pyqt5/commit/0d0ea60b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-senssoft-userale-pyqt5/tree/0d0ea60b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-senssoft-userale-pyqt5/diff/0d0ea60b

Branch: refs/heads/master
Commit: 0d0ea60b39c6be45c1d89896162981d842ce1479
Parents: f3b4917
Author: mooshu1x2 <mb...@draper.com>
Authored: Tue Sep 20 15:43:03 2016 -0400
Committer: mooshu1x2 <mb...@draper.com>
Committed: Tue Sep 20 15:43:03 2016 -0400

----------------------------------------------------------------------
 userale/ale.py | 81 ++++++++++++++++++++++++++++-------------------------
 1 file changed, 43 insertions(+), 38 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-senssoft-userale-pyqt5/blob/0d0ea60b/userale/ale.py
----------------------------------------------------------------------
diff --git a/userale/ale.py b/userale/ale.py
index 5f13e90..1dbcb3e 100644
--- a/userale/ale.py
+++ b/userale/ale.py
@@ -21,6 +21,7 @@ import datetime, time
 import logging
 import uuid
 import atexit
+import random
 
 _ = JsonFormatter
 
@@ -40,15 +41,15 @@ class Ale (QObject):
                  resolution=100,   
                  shutoff=[]):
         """
-        :param output: [str] The file or url path to which logs will be sent
-        :param user: [str] Identifier for the user of the application
-        :param session: [str] Session tag to track same user with multiple sessions. If a session is not provided, one will be created
-        :param toolname: [str] The application name
-        :param toolversion: [str] The application version
-        :param keylog: [bool] Should detailed key logs be recorded. Default is False
+        :param output: [str] The file or url path to which logs will be sent.
+        :param user: [str] Identifier for the user of the application.
+        :param session: [str] Session tag to track same user with multiple sessions. If a session is not provided, one will be created.
+        :param toolname: [str] The application name.
+        :param toolversion: [str] The application version.
+        :param keylog: [bool] Should detailed key logs be recorded. Default is False.
         :param interval: [int] The minimum time interval in ms between batch transmission of logs. Default is 5000ms.
-        :param resolution: [int] Delay in ms between instances of high frequency logs like mousemoves, scrolls, etc. Default is 100ms (10Hz).
-        :param shutoff: [list] Turn off logging for specific events
+        :param resolution: [int] Delay in ms between instances of high frequency logs like mousemoves, scrolls, etc. Default is 100ms (10Hz). Entering 0 disables it.
+        :param shutoff: [list] Turn off logging for specific events.
     
         An example log will appear like this:
 
@@ -117,15 +118,11 @@ class Ale (QObject):
         self.hfreq = [QEvent.MouseMove, QEvent.DragMove, QEvent.Scroll]
 
         # Sample Timer
-        self.timer = QTimer ()
-        self.timer.timeout.connect (self.aggregate)
-        self.timer.start (self.resolution)
-
-        # Cleanup Timer
-        # self.timer2 = QTimer ()
-        # self.timer2.timeout.connect (self.sample2)
-        # self.timer2.start (0)
-        #self.destroyed.connect (Ale._on_destroyed)
+        if self.resolution > 0:
+            self.timer = QTimer ()
+            self.timer.timeout.connect (self.aggregate)
+            self.timer.start (self.resolution)
+
         # Batch transmission of logs
         self.intervalID = self.startTimer (self.interval)
 
@@ -164,9 +161,8 @@ class Ale (QObject):
 
         # Filter data to higher or lower priority list
         if data is not None:
-            if t in self.hfreq and t in self.map:   # data is in watched list and is a high frequency log
-                temp = (name, event, object)
-                self.hlogs.append (temp)
+            if self.resolution > 0 and t in self.hfreq and t in self.map:   # data is in watched list and is a high frequency log
+                self.hlogs.append (data)
             else:
                 self.logs.append (data)
 
@@ -176,8 +172,8 @@ class Ale (QObject):
         '''
         Clean up any dangling logs in self.logs or self.hlogs
         '''
-
-        self.aggregate ()
+        if self.resolution > 0:
+            self.aggregate ()
         self.dump ()
 
     def timerEvent (self, event):
@@ -195,7 +191,7 @@ class Ale (QObject):
         Write log data to file
         '''
 
-        if len(self.logs) > 0:
+        if len (self.logs) > 0:
             # print ("dumping {} logs".format (len (self.logs)))
             self.logger.info (_(self.logs))
             self.logs = [] # Reset logs
@@ -208,13 +204,17 @@ class Ale (QObject):
         
         if len (self.hlogs) > 0:
             # print ("agging {} logs".format (len (self.hlogs)))
-            agg_events = Counter (self.hlogs)
-            # Iterate over collapsed collection to generate a single log per event
-            # Location information is lost due to consolidation. 
-            # @todo develop hashing funciton or new counter to generate avg x and avg y location
-            for event, counter in agg_events.items ():
-                aggdata = self.__create_msg (event[0], event[1], event[2], details={"count" : counter})  
-                self.logs.append (aggdata)
+            # Given target, path, location [median], return aggregate
+            # agg_events = Counter (self.hlogs)
+            # # Iterate over collapsed collection to generate a single log per event
+            # # Location information is lost due to consolidation. 
+            # # @todo develop hashing funciton or new counter to generate avg x and avg y location
+            # for event, counter in agg_events.items ():
+            #     # aggdata = self.__create_msg (event[0], event[1], event[2], details={"count" : counter}) 
+            #     aggdata = {"target": event[0], "type" : event[1], "details": {"count": counter}}
+            #     print (aggdata)
+            #     self.logs.append (aggdata)
+            self.logs.append (random.choice (self.hlogs))
             self.hlogs = []
         
     def getSender (self, object):
@@ -237,10 +237,12 @@ class Ale (QObject):
         :param object: [QObject] The base class for all Qt objects.
         :return: [str] The Qt object's name
 
-        Get target object's name (object defined by user or object's meta class name).
+        Get target object's name (object defined by user or object's meta class name). If object is null, return "Undefined".
         """
-        
-        return object.objectName () if object.objectName () else object.staticMetaObject.className ()
+        try:
+            return object.objectName () if object.objectName () else object.staticMetaObject.className ()
+        except:
+            return "Undefined"
 
     def getLocation (self, event):
         """
@@ -263,11 +265,14 @@ class Ale (QObject):
         Generate the entire object hierachy from root to leaf node. 
         """
 
-        if object.parent() is not None:
-            return self.getPath (object.parent()) + [self.getSelector (object)]
-        else:
-            return [self.getSelector (object)]
-
+        try:
+            if object.parent() is not None:
+                return self.getPath (object.parent()) + [self.getSelector (object)]
+            else:
+                return [self.getSelector (object)]
+        except:
+            return "Undefined"
+        
     def getClientTime (self):
         """
         :return: [str] String representation of the time the event was captured.