|
|
|
@ -23,6 +23,7 @@ |
|
|
|
#include <algorithm>
|
|
|
|
|
|
|
|
#include <calculator_panels/panel_eserie.h>
|
|
|
|
#include <wx/msgdlg.h>
|
|
|
|
|
|
|
|
/* If BENCHMARK is defined, any 4R E12 calculations will print its execution time to console
|
|
|
|
* My Hasswell Enthusiast reports 225 mSec what are reproducible within plusminus 2 percent |
|
|
|
@ -30,7 +31,7 @@ |
|
|
|
//#define BENCHMARK
|
|
|
|
|
|
|
|
#ifdef BENCHMARK
|
|
|
|
#include <sys/time.h>
|
|
|
|
#include <profile.h>
|
|
|
|
#endif
|
|
|
|
|
|
|
|
#include "eserie.h"
|
|
|
|
@ -39,14 +40,120 @@ extern double DoubleFromString( const wxString& TextValue ); |
|
|
|
|
|
|
|
E_SERIE r; |
|
|
|
|
|
|
|
// Return a string from aValue (aValue is expected in ohms)
|
|
|
|
// If aValue < 1000 the returned string is aValue with unit = R
|
|
|
|
// If aValue >= 1000 the returned string is aValue/1000 with unit = K
|
|
|
|
// with notation similar to 2K2
|
|
|
|
// If aValue >= 1e6 the returned string is aValue/1e6 with unit = M
|
|
|
|
// with notation = 1M
|
|
|
|
static std::string strValue( double aValue ) |
|
|
|
{ |
|
|
|
std::string result; |
|
|
|
|
|
|
|
if( aValue < 1000.0 ) |
|
|
|
{ |
|
|
|
result = std::to_string( static_cast<int>( aValue ) ); |
|
|
|
result += 'R'; |
|
|
|
} |
|
|
|
else |
|
|
|
{ |
|
|
|
double div = 1e3; |
|
|
|
int unit = 'K'; |
|
|
|
|
|
|
|
if( aValue >= 1e6 ) |
|
|
|
{ |
|
|
|
div = 1e6; |
|
|
|
unit = 'M'; |
|
|
|
} |
|
|
|
|
|
|
|
aValue /= div; |
|
|
|
|
|
|
|
int integer = static_cast<int>( aValue ); |
|
|
|
result = std::to_string(integer); |
|
|
|
result += unit; |
|
|
|
|
|
|
|
// Add mantissa: 1 digit, suitable for series up to E24
|
|
|
|
double mantissa = aValue - integer; |
|
|
|
|
|
|
|
if( mantissa > 0 ) |
|
|
|
result += std::to_string( static_cast<int>( (mantissa*10)+0.5 ) ); |
|
|
|
} |
|
|
|
|
|
|
|
return result; |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
E_SERIE::E_SERIE() |
|
|
|
{ |
|
|
|
// Build the list of available resistor values in each En serie
|
|
|
|
double listValuesE1[] = { E1_VALUES }; |
|
|
|
double listValuesE3[] = { E3_VALUES }; |
|
|
|
double listValuesE6[] = { E6_VALUES }; |
|
|
|
double listValuesE12[] = { E12_VALUES }; |
|
|
|
double listValuesE24[] = { E24_VALUES }; |
|
|
|
// buildSerieData must be called in the order of En series, because
|
|
|
|
// the list of series is expected indexed by En for the serie En
|
|
|
|
buildSerieData( E1, listValuesE1 ); |
|
|
|
buildSerieData( E3, listValuesE3 ); |
|
|
|
buildSerieData( E6, listValuesE6 ); |
|
|
|
buildSerieData( E12, listValuesE12 ); |
|
|
|
int count = buildSerieData( E24, listValuesE24 ); |
|
|
|
|
|
|
|
// Reserve a buffer for intermediate calculations:
|
|
|
|
// the buffer size is 2*count*count to store all combinaisons of 2 values
|
|
|
|
// there are 2*count*count = 29282 combinations for E24
|
|
|
|
int bufsize = 2*count*count; |
|
|
|
m_cmb_lut.reserve( bufsize ); |
|
|
|
|
|
|
|
// Store predefined R_DATA items.
|
|
|
|
for( int ii = 0; ii < bufsize; ii++ ) |
|
|
|
m_cmb_lut.emplace_back( "", 0.0 ); |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
int E_SERIE::buildSerieData( int aEserie, double aList[] ) |
|
|
|
{ |
|
|
|
double curr_coeff = FIRST_VALUE; |
|
|
|
int count = 0; |
|
|
|
|
|
|
|
std::vector<R_DATA> curr_list; |
|
|
|
|
|
|
|
for( ; ; ) |
|
|
|
{ |
|
|
|
double curr_r = curr_coeff; |
|
|
|
|
|
|
|
for( int ii = 0; ; ii++ ) |
|
|
|
{ |
|
|
|
if( aList[ii] == 0.0 ) // End of list
|
|
|
|
break; |
|
|
|
|
|
|
|
double curr_r = curr_coeff * aList[ii]; |
|
|
|
curr_list.emplace_back( strValue( curr_r ), curr_r ); |
|
|
|
count++; |
|
|
|
|
|
|
|
if( curr_r >= LAST_VALUE ) |
|
|
|
break; |
|
|
|
} |
|
|
|
|
|
|
|
if( curr_r >= LAST_VALUE ) |
|
|
|
break; |
|
|
|
|
|
|
|
curr_coeff *= 10; |
|
|
|
} |
|
|
|
|
|
|
|
m_luts.push_back( std::move( curr_list ) ); |
|
|
|
|
|
|
|
return count; |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
void E_SERIE::Exclude( double aValue ) |
|
|
|
{ |
|
|
|
if( aValue ) // if there is a value to exclude other than a wire jumper
|
|
|
|
if( aValue ) // if there is a value to exclude other than a wire jumper
|
|
|
|
{ |
|
|
|
for( R_DATA& i : m_luts[m_series] ) // then search it in the selected E-Serie lookup table
|
|
|
|
{ |
|
|
|
if( i.e_value == aValue ) // if value to exclude found
|
|
|
|
if( i.e_value == aValue ) // if the value to exclude is found
|
|
|
|
i.e_use = false; // disable its use
|
|
|
|
} |
|
|
|
} |
|
|
|
@ -57,15 +164,15 @@ void E_SERIE::simple_solution( uint32_t aSize ) |
|
|
|
{ |
|
|
|
uint32_t i; |
|
|
|
|
|
|
|
m_results[S2R].e_value = std::numeric_limits<double>::max(); // assume no 2R solution or max deviation
|
|
|
|
m_results.at( S2R ).e_value = std::numeric_limits<double>::max(); // assume no 2R solution or max deviation
|
|
|
|
|
|
|
|
for( i = 0; i < aSize; i++ ) |
|
|
|
{ |
|
|
|
if( abs( m_cmb_lut[i].e_value - m_required_value ) < abs( m_results[S2R].e_value ) ) |
|
|
|
if( abs( m_cmb_lut.at( i ).e_value - m_required_value ) < abs( m_results.at( S2R ).e_value ) ) |
|
|
|
{ |
|
|
|
m_results[S2R].e_value = m_cmb_lut[i].e_value - m_required_value; // save signed deviation in Ohms
|
|
|
|
m_results[S2R].e_name = m_cmb_lut[i].e_name; // save combination text
|
|
|
|
m_results[S2R].e_use = true; // this is a possible solution
|
|
|
|
m_results.at( S2R ).e_value = m_cmb_lut.at( i ).e_value - m_required_value; // save signed deviation in Ohms
|
|
|
|
m_results.at( S2R ).e_name = m_cmb_lut.at( i ).e_name; // save combination text
|
|
|
|
m_results.at( S2R ).e_use = true; // this is a possible solution
|
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
@ -77,53 +184,53 @@ void E_SERIE::combine4( uint32_t aSize ) |
|
|
|
double tmp; |
|
|
|
std::string s; |
|
|
|
|
|
|
|
m_results[S4R].e_use = false; // disable 4R solution, until
|
|
|
|
m_results[S4R].e_value = m_results[S3R].e_value; // 4R becomes better than 3R solution
|
|
|
|
m_results.at( S4R ).e_use = false; // disable 4R solution, until
|
|
|
|
m_results.at( S4R ).e_value = m_results.at( S3R ).e_value; // 4R becomes better than 3R solution
|
|
|
|
|
|
|
|
#ifdef BENCHMARK
|
|
|
|
PROF_COUNTER combine4_timer; // start timer to count execution time
|
|
|
|
PROF_COUNTER timer; // start timer to count execution time
|
|
|
|
#endif
|
|
|
|
|
|
|
|
for( i = 0; i < aSize; i++ ) // 4R search outer loop
|
|
|
|
{ // scan valid intermediate 2R solutions
|
|
|
|
for( j = 0; j < aSize; j++ ) // inner loop combines all with itself
|
|
|
|
{ |
|
|
|
tmp = m_cmb_lut[i].e_value + m_cmb_lut[j].e_value; // calculate 2R+2R serial
|
|
|
|
tmp -= m_required_value; // calculate 4R deviation
|
|
|
|
tmp = m_cmb_lut.at( i ).e_value + m_cmb_lut.at( j ).e_value; // calculate 2R+2R serial
|
|
|
|
tmp -= m_required_value; // calculate 4R deviation
|
|
|
|
|
|
|
|
if( abs( tmp ) < abs( m_results[S4R].e_value ) ) // if new 4R is better
|
|
|
|
if( abs( tmp ) < abs( m_results.at(S4R).e_value ) ) // if new 4R is better
|
|
|
|
{ |
|
|
|
m_results[S4R].e_value = tmp; // save amount of benefit
|
|
|
|
m_results.at( S4R ).e_value = tmp; // save amount of benefit
|
|
|
|
std::string s = "( "; |
|
|
|
s.append( m_cmb_lut[i].e_name ); // mention 1st 2 component
|
|
|
|
s.append( " ) + ( " ); // in series
|
|
|
|
s.append( m_cmb_lut[j].e_name ); // with 2nd 2 components
|
|
|
|
s.append( m_cmb_lut.at( i ).e_name ); // mention 1st 2 component
|
|
|
|
s.append( " ) + ( " ); // in series
|
|
|
|
s.append( m_cmb_lut.at( j ).e_name ); // with 2nd 2 components
|
|
|
|
s.append( " )" ); |
|
|
|
m_results[S4R].e_name = s; // save the result and
|
|
|
|
m_results[S4R].e_use = true; // enable for later use
|
|
|
|
m_results.at( S4R ).e_name = s; // save the result and
|
|
|
|
m_results.at( S4R ).e_use = true; // enable for later use
|
|
|
|
} |
|
|
|
|
|
|
|
tmp = ( m_cmb_lut[i].e_value * m_cmb_lut[j].e_value ) / |
|
|
|
( m_cmb_lut[i].e_value + m_cmb_lut[j].e_value ); // calculate 2R|2R parallel
|
|
|
|
tmp = ( m_cmb_lut[i].e_value * m_cmb_lut.at( j ).e_value ) / |
|
|
|
( m_cmb_lut[i].e_value + m_cmb_lut.at( j ).e_value ); // calculate 2R|2R parallel
|
|
|
|
tmp -= m_required_value; // calculate 4R deviation
|
|
|
|
|
|
|
|
if( abs( tmp ) < abs( m_results[S4R].e_value ) ) // if new 4R is better
|
|
|
|
if( abs( tmp ) < abs( m_results.at( S4R ).e_value ) ) // if new 4R is better
|
|
|
|
{ |
|
|
|
m_results[S4R].e_value = tmp; // save amount of benefit
|
|
|
|
m_results.at( S4R ).e_value = tmp; // save amount of benefit
|
|
|
|
std::string s = "( "; |
|
|
|
s.append( m_cmb_lut[i].e_name ); // mention 1st 2 component
|
|
|
|
s.append( m_cmb_lut.at( i ).e_name ); // mention 1st 2 component
|
|
|
|
s.append( " ) | ( " ); // in parallel
|
|
|
|
s.append( m_cmb_lut[j].e_name ); // with 2nd 2 components
|
|
|
|
s.append( m_cmb_lut.at( j ).e_name ); // with 2nd 2 components
|
|
|
|
s.append( " )" ); |
|
|
|
m_results[S4R].e_name = s; // save the result
|
|
|
|
m_results[S4R].e_use = true; // enable later use
|
|
|
|
m_results.at( S4R ).e_name = s; // save the result
|
|
|
|
m_results.at( S4R ).e_use = true; // enable later use
|
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
#ifdef BENCHMARK
|
|
|
|
if( m_series == E12 ) |
|
|
|
std::cout<<"4R Time = "<<combine4_timer.msecs()<<" mSec"<<std::endl; |
|
|
|
printf( "Calculation time = %d mS", timer.msecs() ); |
|
|
|
fflush( 0 ); |
|
|
|
#endif
|
|
|
|
} |
|
|
|
|
|
|
|
@ -154,18 +261,17 @@ uint32_t E_SERIE::combine2() |
|
|
|
{ |
|
|
|
if( j.e_use ) |
|
|
|
{ |
|
|
|
m_cmb_lut[combi2R].e_use = true; |
|
|
|
m_cmb_lut[combi2R].e_value = i.e_value + j.e_value; // calculate 2R serial
|
|
|
|
m_cmb_lut.at( combi2R ).e_use = true; |
|
|
|
m_cmb_lut.at( combi2R ).e_value = i.e_value + j.e_value; // calculate 2R serial
|
|
|
|
s = i.e_name; |
|
|
|
s.append( " + " ); |
|
|
|
m_cmb_lut[combi2R].e_name = s.append( j.e_name); |
|
|
|
combi2R++; // next destination
|
|
|
|
m_cmb_lut[combi2R].e_use = true; // calculate 2R parallel
|
|
|
|
m_cmb_lut[combi2R].e_value = i.e_value * j.e_value / |
|
|
|
( i.e_value + j.e_value ); |
|
|
|
m_cmb_lut.at( combi2R ).e_name = s.append( j.e_name); |
|
|
|
combi2R++; // next destination
|
|
|
|
m_cmb_lut.at( combi2R ).e_use = true; // calculate 2R parallel
|
|
|
|
m_cmb_lut.at( combi2R ).e_value = i.e_value * j.e_value / ( i.e_value + j.e_value ); |
|
|
|
s = i.e_name; |
|
|
|
s.append( " | " ); |
|
|
|
m_cmb_lut[combi2R].e_name = s.append( j.e_name ); |
|
|
|
m_cmb_lut.at( combi2R ).e_name = s.append( j.e_name ); |
|
|
|
combi2R++; // next destination
|
|
|
|
} |
|
|
|
} |
|
|
|
@ -181,8 +287,8 @@ void E_SERIE::combine3( uint32_t aSize ) |
|
|
|
double tmp = 0; // avoid warning for being uninitialized
|
|
|
|
std::string s; |
|
|
|
|
|
|
|
m_results[S3R].e_use = false; // disable 3R solution, until
|
|
|
|
m_results[S3R].e_value = m_results[S2R].e_value; // 3R becomes better than 2R solution
|
|
|
|
m_results.at( S3R ).e_use = false; // disable 3R solution, until
|
|
|
|
m_results.at( S3R ).e_value = m_results.at( S2R ).e_value; // 3R becomes better than 2R solution
|
|
|
|
|
|
|
|
for( const R_DATA& i : m_luts[m_series] ) // 3R Outer loop to selected primary E serie LUT
|
|
|
|
{ |
|
|
|
@ -190,33 +296,33 @@ void E_SERIE::combine3( uint32_t aSize ) |
|
|
|
{ |
|
|
|
for( j = 0; j < aSize; j++ ) // inner loop combines with all 2R intermediate results
|
|
|
|
{ // R+2R serial combi
|
|
|
|
tmp = m_cmb_lut[j].e_value + i.e_value; |
|
|
|
tmp = m_cmb_lut.at( j ).e_value + i.e_value; |
|
|
|
tmp -= m_required_value; // calculate deviation
|
|
|
|
|
|
|
|
if( abs( tmp ) < abs( m_results[S3R].e_value ) ) // compare if better
|
|
|
|
if( abs( tmp ) < abs( m_results.at( S3R ).e_value ) ) // compare if better
|
|
|
|
{ // then take it
|
|
|
|
s = i.e_name; // mention 3rd component
|
|
|
|
s.append( " + ( " ); // in series
|
|
|
|
s.append( m_cmb_lut[j].e_name ); // with 2R combination
|
|
|
|
s.append( m_cmb_lut.at( j ).e_name ); // with 2R combination
|
|
|
|
s.append( " )" ); |
|
|
|
m_results[S3R].e_name = s; // save S3R result
|
|
|
|
m_results[S3R].e_value = tmp; // save amount of benefit
|
|
|
|
m_results[S3R].e_use = true; // enable later use
|
|
|
|
m_results.at( S3R ).e_name = s; // save S3R result
|
|
|
|
m_results.at( S3R ).e_value = tmp; // save amount of benefit
|
|
|
|
m_results.at( S3R ).e_use = true; // enable later use
|
|
|
|
} |
|
|
|
|
|
|
|
tmp = i.e_value * m_cmb_lut[j].e_value / |
|
|
|
( i.e_value + m_cmb_lut[j].e_value ); // calculate R + 2R parallel
|
|
|
|
tmp = i.e_value * m_cmb_lut.at( j ).e_value / |
|
|
|
( i.e_value + m_cmb_lut.at( j ).e_value ); // calculate R + 2R parallel
|
|
|
|
tmp -= m_required_value; // calculate deviation
|
|
|
|
|
|
|
|
if( abs( tmp ) < abs( m_results[S3R].e_value ) ) // compare if better
|
|
|
|
if( abs( tmp ) < abs( m_results.at( S3R ).e_value ) ) // compare if better
|
|
|
|
{ // then take it
|
|
|
|
s = i.e_name; // mention 3rd component
|
|
|
|
s.append( " | ( " ); // in parallel
|
|
|
|
s.append( m_cmb_lut[j].e_name ); // with 2R combination
|
|
|
|
s.append( m_cmb_lut.at( j ).e_name ); // with 2R combination
|
|
|
|
s.append( " )" ); |
|
|
|
m_results[S3R].e_name = s; |
|
|
|
m_results[S3R].e_value = tmp; // save amount of benefit
|
|
|
|
m_results[S3R].e_use = true; // enable later use
|
|
|
|
m_results.at( S3R ).e_name = s; |
|
|
|
m_results.at( S3R ).e_value = tmp; // save amount of benefit
|
|
|
|
m_results.at( S3R ).e_use = true; // enable later use
|
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
@ -224,7 +330,7 @@ void E_SERIE::combine3( uint32_t aSize ) |
|
|
|
|
|
|
|
// If there is a 3R result with remaining deviation consider to search a possibly better 4R solution
|
|
|
|
// calculate 4R for small series always
|
|
|
|
if(( m_results[S3R].e_use == true ) && tmp ) |
|
|
|
if(( m_results.at( S3R ).e_use == true ) && tmp ) |
|
|
|
combine4( aSize ); |
|
|
|
} |
|
|
|
|
|
|
|
@ -236,7 +342,7 @@ void E_SERIE::Calculate() |
|
|
|
no_of_2Rcombi = combine2(); // combine all 2R combinations for selected E serie
|
|
|
|
simple_solution( no_of_2Rcombi ); // search for simple 2 component solution
|
|
|
|
|
|
|
|
if( m_results[S2R].e_value ) // if simple 2R result is not exact
|
|
|
|
if( m_results.at( S2R ).e_value ) // if simple 2R result is not exact
|
|
|
|
combine3( no_of_2Rcombi ); // continiue searching for a possibly better solution
|
|
|
|
|
|
|
|
strip3(); |
|
|
|
@ -248,16 +354,16 @@ void E_SERIE::strip3() |
|
|
|
{ |
|
|
|
std::string s; |
|
|
|
|
|
|
|
if( m_results[S3R].e_use ) // if there is a 3 term result available
|
|
|
|
if( m_results.at( S3R ).e_use ) // if there is a 3 term result available
|
|
|
|
{ // what is connected either by two "|" or by 3 plus
|
|
|
|
s = m_results[S3R].e_name; |
|
|
|
s = m_results.at( S3R ).e_name; |
|
|
|
|
|
|
|
if( ( std::count( s.begin(), s.end(), '+' ) == 2 ) |
|
|
|
|| ( std::count( s.begin(), s.end(), '|' ) == 2 ) ) |
|
|
|
{ // then strip one pair of braces
|
|
|
|
s.erase( s.find( "(" ), 1 ); // it is known sure, this is available
|
|
|
|
s.erase( s.find( ")" ), 1 ); // in any unstripped 3R result term
|
|
|
|
m_results[S3R].e_name = s; // use stripped result
|
|
|
|
m_results.at( S3R ).e_name = s; // use stripped result
|
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
@ -267,18 +373,18 @@ void E_SERIE::strip4() |
|
|
|
{ |
|
|
|
std::string s; |
|
|
|
|
|
|
|
if( m_results[S4R].e_use ) // if there is a 4 term result available
|
|
|
|
{ // what are connected either by 3 "+" or by 3 "|"
|
|
|
|
s = m_results[S4R].e_name; |
|
|
|
if( m_results.at( S4R ).e_use ) // if there is a 4 term result available
|
|
|
|
{ // what are connected either by 3 "+" or by 3 "|"
|
|
|
|
s = m_results.at( S4R ).e_name; |
|
|
|
|
|
|
|
if( ( std::count( s.begin(), s.end(), '+' ) == 3 ) |
|
|
|
|| ( std::count( s.begin(), s.end(), '|' ) == 3 ) ) |
|
|
|
{ // then strip two pair of braces
|
|
|
|
s.erase( s.find( "(" ), 1 ); // it is known sure, they are available
|
|
|
|
s.erase( s.find( ")" ), 1 ); // in any unstripped 4R result term
|
|
|
|
{ // then strip two pair of braces
|
|
|
|
s.erase( s.find( "(" ), 1 ); // it is known sure, they are available
|
|
|
|
s.erase( s.find( ")" ), 1 ); // in any unstripped 4R result term
|
|
|
|
s.erase( s.find( "(" ), 1 ); |
|
|
|
s.erase( s.find( ")" ), 1 ); |
|
|
|
m_results[S4R].e_name = s; // use stripped result
|
|
|
|
m_results.at( S4R ).e_name = s; // use stripped result
|
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
@ -290,6 +396,8 @@ void PANEL_E_SERIE::OnCalculateESeries( wxCommandEvent& event ) |
|
|
|
double error, err3 = 0; |
|
|
|
wxString es, fs; // error and formula strings
|
|
|
|
|
|
|
|
wxBusyCursor dummy; |
|
|
|
|
|
|
|
reqr = ( 1000 * DoubleFromString( m_ResRequired->GetValue() ) ); |
|
|
|
r.SetRequiredValue( reqr ); // keep a local copy of required resistor value
|
|
|
|
r.NewCalc(); // assume all values available
|
|
|
|
@ -302,7 +410,19 @@ void PANEL_E_SERIE::OnCalculateESeries( wxCommandEvent& event ) |
|
|
|
r.Exclude( 1000 * DoubleFromString( m_ResRequired->GetValue())); |
|
|
|
r.Exclude( 1000 * DoubleFromString( m_ResExclude1->GetValue())); |
|
|
|
r.Exclude( 1000 * DoubleFromString( m_ResExclude2->GetValue())); |
|
|
|
r.Calculate(); |
|
|
|
|
|
|
|
try |
|
|
|
{ |
|
|
|
r.Calculate(); |
|
|
|
} |
|
|
|
catch (std::out_of_range const& exc) |
|
|
|
{ |
|
|
|
wxString msg; |
|
|
|
msg << "Internal error: " << exc.what(); |
|
|
|
|
|
|
|
wxMessageBox( msg ); |
|
|
|
return; |
|
|
|
} |
|
|
|
|
|
|
|
fs = r.GetResults()[S2R].e_name; // show 2R solution formula string
|
|
|
|
m_ESeries_Sol2R->SetValue( fs ); |
|
|
|
@ -386,6 +506,8 @@ void PANEL_E_SERIE::OnESeriesSelection( wxCommandEvent& event ) |
|
|
|
r.SetSeries( E3 ); |
|
|
|
else if( event.GetEventObject() == m_e12 ) |
|
|
|
r.SetSeries( E12 ); |
|
|
|
else if( event.GetEventObject() == m_e24 ) |
|
|
|
r.SetSeries( E24 ); |
|
|
|
else |
|
|
|
r.SetSeries( E6 ); |
|
|
|
} |
jean-pierre charras
4 years ago