Skip to content

Commit e24e26a

Browse files
tyler-gilberttyler-gilbert
committed
Tweaks to ListDir
1 parent fdf3653 commit e24e26a

File tree

5 files changed

+45
-13
lines changed

5 files changed

+45
-13
lines changed

‎.settings/language.settings.xml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/>
66
<provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/>
77
<provider-reference id="org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider" ref="shared-provider"/>
8-
<provider class="org.eclipse.cdt.internal.build.crossgcc.CrossGCCBuiltinSpecsDetector" console="false" env-hash="-1260075713651328051" id="org.eclipse.cdt.build.crossgcc.CrossGCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT Cross GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
8+
<provider class="org.eclipse.cdt.internal.build.crossgcc.CrossGCCBuiltinSpecsDetector" console="false" env-hash="-83408358531918538" id="org.eclipse.cdt.build.crossgcc.CrossGCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT Cross GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
99
<language-scope id="org.eclipse.cdt.core.gcc"/>
1010
<language-scope id="org.eclipse.cdt.core.g++"/>
1111
</provider>
@@ -16,7 +16,7 @@
1616
<provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/>
1717
<provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/>
1818
<provider-reference id="org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider" ref="shared-provider"/>
19-
<provider class="org.eclipse.cdt.internal.build.crossgcc.CrossGCCBuiltinSpecsDetector" console="false" env-hash="-1311694414646770483" id="org.eclipse.cdt.build.crossgcc.CrossGCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT Cross GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
19+
<provider class="org.eclipse.cdt.internal.build.crossgcc.CrossGCCBuiltinSpecsDetector" console="false" env-hash="-135027059527360970" id="org.eclipse.cdt.build.crossgcc.CrossGCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT Cross GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
2020
<language-scope id="org.eclipse.cdt.core.gcc"/>
2121
<language-scope id="org.eclipse.cdt.core.g++"/>
2222
</provider>
@@ -27,7 +27,7 @@
2727
<provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/>
2828
<provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/>
2929
<provider-reference id="org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider" ref="shared-provider"/>
30-
<provider class="org.eclipse.cdt.internal.build.crossgcc.CrossGCCBuiltinSpecsDetector" console="false" env-hash="-1311694414646770483" id="org.eclipse.cdt.build.crossgcc.CrossGCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT Cross GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
30+
<provider class="org.eclipse.cdt.internal.build.crossgcc.CrossGCCBuiltinSpecsDetector" console="false" env-hash="-135027059527360970" id="org.eclipse.cdt.build.crossgcc.CrossGCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT Cross GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
3131
<language-scope id="org.eclipse.cdt.core.gcc"/>
3232
<language-scope id="org.eclipse.cdt.core.g++"/>
3333
</provider>
@@ -38,7 +38,7 @@
3838
<provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/>
3939
<provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/>
4040
<provider-reference id="org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider" ref="shared-provider"/>
41-
<provider class="org.eclipse.cdt.internal.build.crossgcc.CrossGCCBuiltinSpecsDetector" console="false" env-hash="-1311694414646770483" id="org.eclipse.cdt.build.crossgcc.CrossGCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT Cross GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
41+
<provider class="org.eclipse.cdt.internal.build.crossgcc.CrossGCCBuiltinSpecsDetector" console="false" env-hash="-135027059527360970" id="org.eclipse.cdt.build.crossgcc.CrossGCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT Cross GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
4242
<language-scope id="org.eclipse.cdt.core.gcc"/>
4343
<language-scope id="org.eclipse.cdt.core.g++"/>
4444
</provider>
@@ -49,7 +49,7 @@
4949
<provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/>
5050
<provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/>
5151
<provider-reference id="org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider" ref="shared-provider"/>
52-
<provider class="org.eclipse.cdt.internal.build.crossgcc.CrossGCCBuiltinSpecsDetector" console="false" env-hash="-1311694414646770483" id="org.eclipse.cdt.build.crossgcc.CrossGCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT Cross GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
52+
<provider class="org.eclipse.cdt.internal.build.crossgcc.CrossGCCBuiltinSpecsDetector" console="false" env-hash="-135027059527360970" id="org.eclipse.cdt.build.crossgcc.CrossGCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT Cross GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
5353
<language-scope id="org.eclipse.cdt.core.gcc"/>
5454
<language-scope id="org.eclipse.cdt.core.g++"/>
5555
</provider>

‎include/calc/Ema.hpp

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -95,45 +95,53 @@ template<typename intsmall, typename intmedium, typename intlarge>class Ema {
9595
/*! \details See \ref Ema for details */
9696
class Ema_s32 : public Ema<u16, s32, i64> {
9797
public:
98+
/*! \details Construct a EMA object for a signed 32 bit calculations */
9899
Ema_s32(s32 start, u16 alpha) : Ema(start, alpha){}
99100
};
100101

101102
/*! \brief Exponential Moving Average class (i16) */
102103
/*! \details See \ref Ema for details */
103-
class Ema_i16 : public Ema<u8, i16, s32> {
104+
class Ema_s16 : public Ema<u8, s16, s32> {
104105
public:
105-
Ema_i16(i16 start, u8 alpha) : Ema(start, alpha){}
106+
/*! \details Construct a EMA object for a signed 16 bit calculations */
107+
Ema_s16(i16 start, u8 alpha) : Ema(start, alpha){}
106108
};
107109

108110
/*! \brief Exponential Moving Average class (u32) */
109111
/*! \details See \ref Ema for details */
110112
class Ema_u32 : public Ema<u16, u32, u64> {
111113
public:
114+
/*! \details Construct a EMA object for a unsigned 32 bit calculations */
112115
Ema_u32(u32 start, u16 alpha) : Ema(start, alpha){}
113116
};
114117

115118
/*! \brief Exponential Moving Average class (u16) */
116119
/*! \details See \ref Ema for details */
117120
class Ema_u16 : public Ema<u8, u16, u32> {
118121
public:
122+
/*! \details Construct a EMA object for a unsigned 16 bit calculations */
119123
Ema_u16(u16 start, u8 alpha) : Ema(start, alpha){}
120124
};
121125

122126
/*! \brief Exponential Moving Average class (float) */
123127
/*! \details See \ref Ema for details */
124128
class Ema_float {
125129
public:
130+
/*! \details Construct a EMA object for floating point calculations */
126131
Ema_float(float start, float alpha){ m_alpha = alpha; m_average = start; }
127132
static float small_max(){ return 1.0; }
133+
/*! \details Calculate the next value based on the given input */
128134
float calc(float in){
129135
float tmp;
130136
m_average = in * (m_alpha) + m_average * (1.0 - m_alpha);
131137
return m_average;
132138
}
139+
/*! \details Access the current average value */
133140
float average() const { return m_average; }
141+
/*! \details Set the average value */
134142
void set_average(float v){ m_average = v; }
135143

136-
//depreacted methods
144+
//deprecated methods
137145
void set(float v){ m_average = v; }
138146
float avg() const { return m_average; }
139147

‎include/calc/Lookup.hpp

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,30 @@ namespace calc {
88
/*! \brief Lookup Table Template Class
99
* \details This class is for implementing lookup tables
1010
* using linear extrapolation.
11+
*
12+
* \code
13+
*
14+
* #include <stfy/calc.hpp>
15+
*
16+
* #define ENTRIES 4
17+
*
18+
* const float lookup_table[ENTRIES*2] = { //for each entry there are 2 float values
19+
* 0.0, 2.0, //this is an x,y pair where x is 0.0 and y is 2.0, list must have x values in ascending order
20+
* 1.0, 4.0,
21+
* 2.0, 16.0,
22+
* 3.0, 25.0
23+
* };
24+
*
25+
* float lookup_value(float x){
26+
* Lookup<float> lookup(lookup_table, ENTRIES);
27+
* return lookup.calc_value(x);
28+
* }
29+
*
30+
*
31+
* \endcode
32+
*
33+
*
34+
*
1135
*/
1236
template<typename data_type>class Lookup {
1337
public:

‎include/ui/ListItem.hpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,7 @@ class ListDir : public List {
169169
virtual ElementLinked & at(list_attr_size_t i);
170170

171171
/*! \details Return the total entries in the list */
172-
inline list_attr_size_t size() const { return m_total; }
172+
inline list_attr_size_t size() const { return m_size; }
173173

174174
/*! \details This method changes the visibility of the file suffix in the list */
175175
inline void set_suffix_visible(bool v = true){
@@ -196,12 +196,12 @@ class ListDir : public List {
196196
FLAG_SUFFIX_VISIBLE = Element::FLAG_ELEMENT_TOTAL
197197
};
198198

199-
inline void set_total(size_t total){ m_total = total; }
199+
inline void set_size(size_t total){ m_size = total; }
200200

201201
private:
202202
sys::Dir m_dir;
203203
/*! \todo List inherits ListAttr so the total entries should already be stored somewhere */
204-
size_t m_total;
204+
size_t m_size;
205205
ListItem m_item;
206206
void recount(void);
207207
list_dir_callback_t m_callback;

‎src/ui/ListItem.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -214,9 +214,9 @@ void ListDir::recount(void){
214214
int ret;
215215
ret = m_dir.count();
216216
if( ret > 0 ){
217-
m_total = ret;
217+
m_size = ret;
218218
} else {
219-
m_total = 1;
219+
m_size = 1;
220220
m_item.text_attr().assign("Empty");
221221
}
222222
}

0 commit comments

Comments
 (0)