Reconciled all changes by Rainy and the branch with MattKing's LocalFont function. The trunk now contains all current code changes.

Added changes to RANDOM function based on Rainy's input.  If there were multiple RANDOM statements in multiple CALC measure, they would all get the same random number.  Fixed.

Added new RANDOM function and LocalFont to the help files and History.htm
This commit is contained in:
jsmorley
2009-09-03 00:33:46 +00:00
parent 9b949a12e0
commit dc365cfb6e
5 changed files with 181 additions and 31 deletions

View File

@ -34,18 +34,18 @@ public:
static void UpdateVariableMap(CMeterWindow& meterWindow);
private:
void RandomFormulaReplace();
std::wstring m_Formula;
std::wstring m_FormulaHolder;
hqMathParser* m_Parser;
static hqStrMap* c_VarMap;
static int m_Loop;
//======================================
//MattKing Code Edit :: Start
static double m_Random;
static double m_LowBound;
static double m_HighBound;
//MattKing Code Edit :: End
int m_UpdateRandom;
int m_LowBound;
int m_HighBound;
};
#endif