commit cc94eb0a140a2bc5da135a98b329db63a292311c
parent 0546e8b72946b41e07db5efeb1faf57ff44280b3
Author: paulnasca <paulnasca>
Date: Fri, 2 Jul 2004 18:55:13 +0000
*** empty log message ***
Diffstat:
2 files changed, 14 insertions(+), 3 deletions(-)
diff --git a/src/Effects/DynamicFilter.C b/src/Effects/DynamicFilter.C
@@ -50,7 +50,6 @@ DynamicFilter::~DynamicFilter(){
*/
void DynamicFilter::out(REALTYPE *smpsl,REALTYPE *smpsr){
int i;
-
if (filterpars->changed){
filterpars->changed=false;
cleanup();
@@ -128,7 +127,7 @@ void DynamicFilter::cleanup(){
ms1=0.0;
ms2=0.0;
ms3=0.0;
- ms3=0.0;
+ ms4=0.0;
};
@@ -187,7 +186,7 @@ void DynamicFilter::setpreset(unsigned char npreset){
if (npreset>=NUM_PRESETS) npreset=NUM_PRESETS-1;
for (int n=0;n<PRESET_SIZE;n++) changepar(n,presets[npreset][n]);
-// filterpars->defaults();
+ filterpars->defaults();
switch(npreset){
case 0:
filterpars->Pcategory=0;
diff --git a/src/Effects/EffectMgr.C b/src/Effects/EffectMgr.C
@@ -262,6 +262,11 @@ void EffectMgr::add2XML(XMLwrapper *xml){
xml->addpar("par",par);
xml->endbranch();
};
+ if (filterpars!=NULL){
+ xml->beginbranch("FILTER");
+ filterpars->add2XML(xml);
+ xml->endbranch();
+ };
xml->endbranch();
};
@@ -281,8 +286,15 @@ void EffectMgr::getfromXML(XMLwrapper *xml){
seteffectpar_nolock(n,xml->getpar127("par",par));
xml->exitbranch();
};
+ if (filterpars!=NULL){
+ if (xml->enterbranch("FILTER")){
+ filterpars->getfromXML(xml);
+ xml->exitbranch();
+ };
+ };
xml->exitbranch();
};
+ cleanup();
};