Changeset 30913

Timestamp:

Mar 16, 2011, 9:03:53 AM (15 years ago)

Author:

rhenders

Message:

Quick fix for jumps in time-series plots when new lable is added. Not elegant.

File:

• trunk/tools/czartool/CzarDb.pm (modified) (4 diffs)

trunk/tools/czartool/CzarDb.pm

@@ -629 +629 @@
     my ($derivProcessed, $derivPending, $derivFaults);
     my $timestamp = undef;
-    
+    my $positiveJump = 0;
+
     $linearProcessed = 0;
     my $someData = 0;
@@ -635 +636 @@
         my ($thisTimestamp, $thisPending, $thisFaults, $thisProcessed) = @row;
 
-        # get linear values
-        if ($showCleanup) {
-        
-            $linearProcessed = $thisProcessed - $minProcessed;
-        }
-        elsif($lastProcessed != -1 && $thisProcessed > $lastProcessed) {
-            
-            $linearProcessed = $linearProcessed + ($thisProcessed - $lastProcessed);
-        }
-        $linearPending = $thisPending;
-        $linearFaults = $thisFaults;
 
         # get first derivative values
@@ -660 +650 @@
         #    $derivPending = abs($thisPending - $lastPending)/$timeDiff;    
         #    $derivFaults = abs($thisFaults - $lastFaults)/$timeDiff;    
+
+            # look for large positive jumps in processed, most likely a label added, and store value to subtract from linear value below
+            if ($derivProcessed > 0.3) {
+
+                $positiveJump = $thisProcessed - $lastProcessed;
+                #print "$derivProcessed at $thisTimestamp   $positiveJump\n";
+        }
+            else {
+            $positiveJump = 0;
+            }
         }
         else {
@@ -667 +667 @@
             $derivFaults = 0;
         }
+
+        # get linear values
+        if ($showCleanup) {
+        
+            $linearProcessed = $thisProcessed - $minProcessed;
+        }
+        elsif($lastProcessed != -1 && $thisProcessed > $lastProcessed) {
+            
+            $linearProcessed = $linearProcessed + ($thisProcessed - $lastProcessed) - $positiveJump;
+        }
+        $linearPending = $thisPending;
+        $linearFaults = $thisFaults;
 
         # get log values