ftm-svn Mailing List for FTM (Page 2)

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Revision: 3783
          http://sourceforge.net/p/ftm/code/3783
Author:   borghesi
Date:     2022-10-05 20:34:14 +0000 (Wed, 05 Oct 2022)
Log Message:
-----------
ftmediotr: partial fix of wrong display in Wave editor with fvec class

Modified Paths:
--------------
    trunk/ftm/ftmlib/classes/ftmdatagui.c
    trunk/ftm/ftmlib/classes/fvec.c
    trunk/ftm/ftmlib/classes/fvec.h

Modified: trunk/ftm/ftmlib/classes/ftmdatagui.c
===================================================================

--- trunk/ftm/ftmlib/classes/ftmdatagui.c	2022-10-05 17:50:38 UTC (rev 3782)
+++ trunk/ftm/ftmlib/classes/ftmdatagui.c	2022-10-05 20:34:14 UTC (rev 3783)
@@ -2263,7 +2263,7 @@
 }
 
 static void
-fmat_gui_wave_get_ptr(void *obj, void *context, int onset, float **ptr, int *size, int *stride, int *ringIndex, int *ringSize, int *ringTile, double *ringOffset)
+fmat_gui_wave_get_ptr(void *obj, void *context, int onset, float **ptr, int *size, int *stride, int *ringIndex, int *ringSize, int *ringTail, double *ringOffset)
 {
   fmat_t *self = (fmat_t *)obj;
   
@@ -2272,7 +2272,7 @@
   *stride = self->n;
   *ringIndex = -1;
   *ringSize = 0;
-  *ringTile = 0;
+  *ringTail = -1;
   *ringOffset = 0;
 }
 
@@ -2572,7 +2572,7 @@
 }
 
 static void
-fmat_gui_multiwave_get_ptr(void *obj, void *context, int index, float **ptr, int *size, int *stride, int *ringIndex, int *ringSize, int *ringTale, double *ringOffset)
+fmat_gui_multiwave_get_ptr(void *obj, void *context, int index, float **ptr, int *size, int *stride, int *ringIndex, int *ringSize, int *ringTail, double *ringOffset)
 {
   fmat_t *self = (fmat_t *)obj;
   
@@ -2581,7 +2581,7 @@
   *stride = self->n;
   *ringIndex = -1;
   *ringSize = 0;
-  *ringTale = 0;
+  *ringTail = -1;
   *ringOffset = 0;
 }
 
@@ -4133,12 +4133,12 @@
 }
 
 static void
-fvec_gui_wave_get_ptr(void *obj, void *context, int onset, float ** ptr, int *size, int *stride, int *ringIndex, int *ringSize, int *ringTale, double *ringOffset)
+fvec_gui_wave_get_ptr(void *obj, void *context, int onset, float ** ptr, int *size, int *stride, int *ringIndex, int *ringSize, int *ringTail, double *ringOffset)
 {
   fvec_vector_lock((fvec_t *)obj, ptr, size, stride);
   *ringIndex = -1;
   *ringSize = 0;
-  *ringTale = 0;
+  *ringTail = -1;
   *ringOffset = 0.0;
 }
 
@@ -4154,16 +4154,16 @@
   fvec_t *self = (fvec_t *)obj;
   float *p;
   int size, stride;
-  float vmax = 0.0;
-  float vmin = 0.0;
+  float vmax = -FLT_MAX;
+  float vmin = FLT_MAX;
   float vmean = 0.0;
   
   fvec_vector_lock(self, &p, &size, &stride);  
   if(size > 0)
   {
-    vmin = fvec_vector_get_min(p, size, stride);
-    vmax = fvec_vector_get_max(p, size, stride);
-    vmean = fvec_vector_get_mean(p, size, stride);
+    vmin = fvec_vector_get_min_in_range(p, size, stride, rangeStartIndex, rangeSize);
+    vmax = fvec_vector_get_max_in_range(p, size, stride, rangeStartIndex, rangeSize);
+    vmean = fvec_vector_get_mean_in_range(p, size, stride, rangeStartIndex, rangeSize);
   }
   fvec_unlock(self);
   

Modified: trunk/ftm/ftmlib/classes/fvec.c
===================================================================
--- trunk/ftm/ftmlib/classes/fvec.c	2022-10-05 17:50:38 UTC (rev 3782)
+++ trunk/ftm/ftmlib/classes/fvec.c	2022-10-05 20:34:14 UTC (rev 3783)
@@ -541,6 +541,72 @@
   
   return ABS_MAX;
 }
+
+float
+fvec_vector_get_min_in_range(float *ptr, int size, int stride, int start, int range)
+{
+  if(size > 0 && start < size && start >= 0)
+  {
+    float min = ptr[start];
+    int i;
+    
+    int num = (start+range >= size) ? size-start : range;
+    
+    for (i=stride*start; i<(start+num)*stride; i+=stride)
+    {
+      if (ptr[i] < min)
+        min = ptr[i];
+    }
+    
+    return min;
+  }
+  
+  return ABS_MIN;
+}
+
+float
+fvec_vector_get_max_in_range(float *ptr, int size, int stride, int start, int range)
+{
+  if(size > 0 && start < size && start >= 0)
+  {
+    float max = ptr[start];
+    int i;
+    int num = (start+range >= size) ? size-start : range;
+    
+    for (i=stride*start; i<(start+num)*stride; i+=stride)
+    {
+      if (ptr[i] > max)
+        max = ptr[i];
+    }
+    
+    return max;
+  }
+  
+  return ABS_MAX;
+}
+
+float
+fvec_vector_get_mean_in_range(float *ptr, int size, int stride, int start, int range)
+{
+  if(size > 0 && start < size && start >= 0)
+  {
+    float mean = 0;
+    float val;
+    int i;
+    int num = (start+range >= size) ? size-start : range;
+    
+    for (i=stride*start; i<(start+num)*stride; i+=stride)
+    {
+      val = ptr[i];
+      mean += val*val;
+    }
+    mean = sqrt(mean/size);
+    
+    return mean;
+  }
+  
+  return ABS_MAX;
+}
 /********************************************************************
  *
  * (thread-safe) class functions

Modified: trunk/ftm/ftmlib/classes/fvec.h
===================================================================
--- trunk/ftm/ftmlib/classes/fvec.h	2022-10-05 17:50:38 UTC (rev 3782)
+++ trunk/ftm/ftmlib/classes/fvec.h	2022-10-05 20:34:14 UTC (rev 3783)
@@ -307,6 +307,9 @@
 FTS_API float fvec_vector_get_min(float *ptr, int size, int stride);
 FTS_API float fvec_vector_get_max(float *ptr, int size, int stride);
 FTS_API float fvec_vector_get_mean(float *ptr, int size, int stride);
+FTS_API float fvec_vector_get_min_in_range(float *ptr, int size, int stride, int start, int range);
+FTS_API float fvec_vector_get_max_in_range(float *ptr, int size, int stride, int start, int range);
+FTS_API float fvec_vector_get_mean_in_range(float *ptr, int size, int stride, int start, int range);
 
 /**
  * @brief

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.





2008	Jan	Feb	Mar	Apr	May	Jun (5)	Jul (42)	Aug (91)	Sep (97)	Oct (69)	Nov (16)	Dec (32)
2009	Jan (74)	Feb (109)	Mar (117)	Apr (86)	May (84)	Jun (47)	Jul (30)	Aug (25)	Sep (39)	Oct (59)	Nov (42)	Dec (38)
2010	Jan (30)	Feb (43)	Mar (59)	Apr (67)	May (29)	Jun (47)	Jul (48)	Aug (22)	Sep (22)	Oct (36)	Nov (40)	Dec (3)
2011	Jan (39)	Feb (21)	Mar (36)	Apr (35)	May (8)	Jun	Jul (14)	Aug (4)	Sep (10)	Oct (27)	Nov (1)	Dec
2012	Jan (2)	Feb (2)	Mar	Apr (9)	May (1)	Jun (1)	Jul (7)	Aug	Sep (15)	Oct (1)	Nov (3)	Dec (6)
2013	Jan	Feb	Mar	Apr (5)	May	Jun (2)	Jul	Aug (5)	Sep (15)	Oct	Nov	Dec (1)
2014	Jan (5)	Feb	Mar	Apr	May (3)	Jun	Jul (1)	Aug	Sep	Oct (2)	Nov	Dec
2015	Jan	Feb (5)	Mar	Apr (4)	May (1)	Jun	Jul	Aug (1)	Sep (19)	Oct	Nov	Dec (1)
2016	Jan	Feb (1)	Mar	Apr	May (3)	Jun	Jul	Aug	Sep (6)	Oct	Nov	Dec (2)
2017	Jan (16)	Feb (8)	Mar	Apr	May	Jun	Jul	Aug	Sep	Oct	Nov	Dec
2018	Jan	Feb	Mar (7)	Apr	May (3)	Jun	Jul	Aug	Sep	Oct	Nov (1)	Dec (5)
2019	Jan	Feb	Mar	Apr	May (3)	Jun	Jul	Aug	Sep	Oct	Nov	Dec
2020	Jan	Feb	Mar	Apr	May	Jun	Jul (14)	Aug (2)	Sep	Oct	Nov	Dec
2021	Jan	Feb	Mar (7)	Apr (14)	May	Jun	Jul	Aug	Sep	Oct	Nov	Dec
2022	Jan	Feb	Mar	Apr	May	Jun	Jul	Aug	Sep	Oct (8)	Nov (3)	Dec
2023	Jan (1)	Feb	Mar (12)	Apr	May	Jun	Jul	Aug	Sep	Oct	Nov	Dec
2025	Jan	Feb	Mar	Apr	May	Jun (4)	Jul	Aug	Sep	Oct	Nov	Dec

ftm-svn Mailing List for FTM (Page 2)

ftm-svn — FTM SVN logs