################## mseed
# Already increased version number:
# Tag = version-2.17.0
# Version = 2.5.1
################## slink
# Already increased version number:
# Tag = version-2.5.4
# Version = 1.6.0
################## QGpCoreTools
[detail]               src/AbstractParameters.cpp:  version-2.5.0	modified out of comments
[detail] --- src/AbstractParameters.cpp-version-2.5.0-stripped	2025-09-28 04:00:46.203412149 +0200
[detail] +++ src/AbstractParameters.cpp-HEAD-stripped	2025-09-28 04:00:46.207412167 +0200
[detail] @@ -4,12 +4,17 @@
[detail]  #include "Message.h"
[detail]  #include "Trace.h"
[detail]  #include "File.h"
[detail] +#include "StringFootprint.h"
[detail]  #include "CoreApplication.h"
[detail] +#include "EnumAsString.h"
[detail]  
[detail]  namespace QGpCoreTools {
[detail]  
[detail]    void AbstractParameters::KeywordMap::add(const QString& key, AbstractParameters * param, int index)
[detail]    {
[detail] +    if(App::verbosity()>5 && contains(key)) {
[detail] +      App::log(tr("key '%1' overwritten\n").arg(key));
[detail] +    }
[detail]      Keyword k;
[detail]      k.param=param;
[detail]      k.index=index;
[detail] @@ -26,7 +31,7 @@
[detail]      QMap<QString, Keyword>::const_iterator it;
[detail]      it=QMap<QString, Keyword>::find(cleanKey);
[detail]      if(it!=end()) {
[detail] -      if(it.value().param->setValue(it.value().index, value, unit, *this)) {
[detail] +      if(it->param->setValue(it->index, value, unit, *this)) {
[detail]          return true;
[detail]        } else {
[detail]          App::log(tr("Error setting value '%1' to keyword '%2'\n").arg(value).arg(cleanKey));
[detail] @@ -34,6 +39,7 @@
[detail]        }
[detail]      } else {
[detail]        App::log(tr("Unknown keyword '%1'\n").arg(cleanKey));
[detail] +      showSimilarKeys(key);
[detail]        return false;
[detail]      }
[detail]    }
[detail] @@ -41,13 +47,38 @@
[detail]    QString  AbstractParameters::KeywordMap::key(const AbstractParameters * param, int index) const
[detail]    {
[detail]      for(const_iterator it=begin(); it!=end(); it++) {
[detail] -      if(it->param==param && it->index==index) {
[detail] +      if((!param || it->param==param) && it->index==index) {
[detail]          return it.key();
[detail]        }
[detail]      }
[detail]      return QString();
[detail]    }
[detail]  
[detail] +  void AbstractParameters::KeywordMap::showSimilarKeys(const QString& key) const
[detail] +  {
[detail] +    double threshold=0.6;
[detail] +    QMap<double, QString> bestCandidates;
[detail] +    StringFootprint ref(key);
[detail] +    for(const_iterator it=begin(); it!=end(); it++) {
[detail] +      StringFootprint item(it.key());
[detail] +      double m=ref.misfit(item);
[detail] +      if(m>threshold) {
[detail] +        bestCandidates.insert(m, it.key());
[detail] +      }
[detail] +    }
[detail] +    EnumAsString::showSimilarKeys(bestCandidates);
[detail] +  }
[detail] +
[detail] +  void AbstractParameters::KeywordMap::dumpKeys() const
[detail] +  {
[detail] +    int i=0;
[detail] +    for(const_iterator it=begin(); it!=end(); it++) {
[detail] +      printf("%4i %60s %p %i\n", i++, it.key().toLatin1().data(),
[detail] +             it.value().param,
[detail] +             it.value().index);
[detail] +    }
[detail] +  }
[detail] +
[detail]    inline AbstractParameters::ParameterValue::ParameterValue(const QString& key, const QString& value, const QString& unit)
[detail]    {
[detail]      _key=key;
[detail] @@ -149,13 +180,18 @@
[detail]        QFile f(fileName);
[detail]        if(f.open(QIODevice::ReadOnly)) {
[detail]          QTextStream s(&f);
[detail] -        return load(s, beginPatterns, endPatterns);
[detail] +        if(!load(s, beginPatterns, endPatterns)) {
[detail] +          Message::warning(MSG_ID, tr("Loading parameters"),
[detail] +                           tr("Error reading parameter file, see general log for details."), Message::cancel());
[detail] +          return false;
[detail] +        }
[detail]        } else {
[detail]          Message::warning(MSG_ID, tr("Loading parameters"),
[detail]                           tr("Unable to open file '%1' for reading").arg(fileName), Message::cancel());
[detail]          return false;
[detail]        }
[detail]      }
[detail] +    return true;
[detail]    }
[detail]  
[detail]    
[detail] @@ -165,6 +201,7 @@
[detail]      ASSERT(beginPatterns.count()==endPatterns.count());
[detail]      _version=0; 
[detail]      KeywordMap * keywords=createKeywordMap();
[detail] +    GarbageCollector coll(keywords);
[detail]      int patternIndex=File::readUntilPatterns(s, beginPatterns);
[detail]      QString endPattern;
[detail]      if(patternIndex>=0) {
[detail] @@ -175,7 +212,6 @@
[detail]        line=s.readLine();
[detail]        if(line.trimmed().left(1)=="#") {
[detail]          if(!endPattern.isEmpty() && line.contains(endPattern)) {
[detail] -          delete keywords;
[detail]            return true;
[detail]          }
[detail]        } else {
[detail] @@ -186,7 +222,6 @@
[detail]              if(subLine.left(1)=="#") {
[detail]                if(!endPattern.isEmpty() && line.contains(endPattern)) {
[detail]                  App::log(tr("Truncated multi-line value\n"));
[detail] -                delete keywords;
[detail]                  return false;
[detail]                }
[detail]              } else {
[detail] @@ -198,17 +233,14 @@
[detail]            }
[detail]            if(line.endsWith("\\")) {
[detail]              App::log(tr("Truncated multi-line value (end of file)\n"));
[detail] -            delete keywords;
[detail]              return false;
[detail]            }
[detail]          }
[detail]          if(!parse(line, keywords)) {
[detail] -          delete keywords;
[detail]            return false;
[detail]          }
[detail]        }
[detail]      }
[detail] -    delete keywords;
[detail]      return true;
[detail]    }
[detail]  
[detail] @@ -220,8 +252,10 @@
[detail]      const QChar * ptrEnd=ptrBegin+line.size();
[detail]      const QChar * ptr=ptrBegin;
[detail]      KeywordMap * myOwnKeywords;
[detail] +    GarbageCollector coll;
[detail]      if(!keywords) {
[detail]        myOwnKeywords=createKeywordMap();
[detail] +      coll.add(myOwnKeywords);
[detail]        keywords=myOwnKeywords;
[detail]      } else {
[detail]        myOwnKeywords=nullptr;
[detail] @@ -240,10 +274,8 @@
[detail]          _values->append(ParameterValue(keyword,value, unit));
[detail]          
[detail]          if(keywords->setValue(keyword,value, unit)) {
[detail] -          delete myOwnKeywords;
[detail]            return true;
[detail]          } else {
[detail] -          delete myOwnKeywords;
[detail]            return false;
[detail]          }
[detail]        case '(': 
[detail] @@ -263,7 +295,6 @@
[detail]      }
[detail]      Message::warning(MSG_ID,tr("Loading parameters"),
[detail]                       tr("No keyword found in line '%1'").arg(line), Message::cancel(), true);
[detail] -    delete myOwnKeywords;
[detail]      return false;
[detail]    }
[detail]  
[detail] @@ -314,7 +345,10 @@
[detail]      if(keywords->count()!=total) {
[detail]        qWarning() << tr("Fix keywordCount: %1 instead of %2")
[detail]                         .arg(keywords->count())
[detail] -                       .arg(total) << Qt::endl;
[detail] +                       .arg(total);
[detail] +      if(App::verbosity()>=1) {
[detail] +        keywords->dumpKeys();
[detail] +      }
[detail]      }
[detail]      return keywords;
[detail]    }
[detail] @@ -325,15 +359,14 @@
[detail]      TRACE;
[detail]      if(o._values) {
[detail]        KeywordMap * keywords=createKeywordMap();
[detail] +      GarbageCollector coll(keywords);
[detail]        int n=o._values->count();
[detail]        for(int i=0; i<n; i++) {
[detail]          const ParameterValue& v=o._values->at(i);
[detail]          if(!v.set(*keywords)) {
[detail] -          delete keywords;
[detail]            return false;
[detail]          }
[detail]        }
[detail] -      delete keywords;
[detail]      } else {
[detail]        *this=o;
[detail]      }
[detail]                 src/AbstractProgress.cpp:  version-2.5.0	modified out of comments
[detail] --- src/AbstractProgress.cpp-version-2.5.0-stripped	2025-09-28 04:00:46.223412245 +0200
[detail] +++ src/AbstractProgress.cpp-HEAD-stripped	2025-09-28 04:00:46.227412264 +0200
[detail] @@ -8,6 +8,8 @@
[detail]  
[detail]  
[detail]  
[detail] +const QString AbstractProgress::defaultCaption=QT_TR_NOOP("Progress");
[detail] +
[detail]  
[detail]  AbstractProgress::AbstractProgress()
[detail]  {
[detail] @@ -16,6 +18,7 @@
[detail]    _deltaValue=0;
[detail]    _maximum=-1;
[detail]    _lastTime=time(nullptr);
[detail] +  _caption=defaultCaption;
[detail]  }
[detail]  
[detail]  const QString& AbstractProgress::caption() const
[detail]                   src/AbstractStream.cpp:  version-2.5.0	not modified
[detail]                 src/ApplicationClock.cpp:  version-2.5.0	not modified
[detail]                  src/ApplicationHelp.cpp:  version-2.5.0	modified out of comments
[detail] --- src/ApplicationHelp.cpp-version-2.5.0-stripped	2025-09-28 04:00:46.275412497 +0200
[detail] +++ src/ApplicationHelp.cpp-HEAD-stripped	2025-09-28 04:00:46.279412515 +0200
[detail] @@ -70,7 +70,7 @@
[detail]      for(QList<Option>::const_iterator it=g.options.begin(); it!=g.options.end(); it++ ) {
[detail]        const Option& o=*it;
[detail]        QString cmt=o.comments;
[detail] -      QString cmtLine=getLine(cmt, CoreApplication::instance()->terminalCols()-28);
[detail] +      QString cmtLine=getLine(cmt, CoreApplication::instance()->terminalColumns()-28);
[detail]        if(o.option.length()<25) {
[detail]          App::log("  "+o.option.leftJustified(25)+" "+cmtLine+"\n");
[detail]        } else {
[detail] @@ -342,7 +342,7 @@
[detail]    mainIndentStr.fill(' ',indent);
[detail]    while(!p.isEmpty()) {
[detail]      bool lastNewLine=newLine;
[detail] -    line=getLine(p, CoreApplication::instance()->terminalCols()-indent-linePrefix.size()-customIndentStr.size(),
[detail] +    line=getLine(p, CoreApplication::instance()->terminalColumns()-indent-linePrefix.size()-customIndentStr.size(),
[detail]                     &newLine);
[detail]      App::log(linePrefix+mainIndentStr+customIndentStr+line+"\n");
[detail]      if(lastNewLine && !newLine) {
[detail]              src/ArgumentStdinReader.cpp:  version-2.5.0	not modified
[detail]                  src/AsciiLineParser.cpp:  version-2.5.0	not modified
[detail]                    src/AtomicBoolean.cpp:  version-2.5.0	not modified
[detail]                            src/Cache.cpp:  version-2.5.0	modified out of comments
[detail] --- src/Cache.cpp-version-2.5.0-stripped	2025-09-28 04:00:46.351412864 +0200
[detail] +++ src/Cache.cpp-HEAD-stripped	2025-09-28 04:00:46.355412882 +0200
[detail] @@ -20,11 +20,16 @@
[detail]  }
[detail]  
[detail]  
[detail] +Cache::~Cache()
[detail] +{
[detail] +  
[detail] +  _swapDir.removeRecursively();
[detail] +}
[detail]  
[detail]  
[detail]  void Cache::setSize(double nMegaBytes)
[detail]  {
[detail] -  _maxLoadedBytes=qRound64(nMegaBytes*MEGABYTES);
[detail] +  _maxLoadedBytes=qRound64(nMegaBytes*1024*1024);
[detail]  }
[detail]  
[detail]  
[detail] @@ -36,15 +41,14 @@
[detail]    
[detail]    if(!_swapDir.exists()) {
[detail]      if(!_swapDir.mkpath(_swapDir.absolutePath())) {
[detail] -      Message::critical(MSG_ID, tr("Initialize swap directory"),
[detail] -                        tr("Cannot create directory %1.")
[detail] -                        .arg(_swapDir.absolutePath()));
[detail] +      QString msg=tr("Cannot create directory '%1'.").arg(_swapDir.absolutePath());
[detail] +      Message::critical(MSG_ID, tr("Initialize swap directory"), msg);
[detail]        exit(2);
[detail]      }
[detail]    }
[detail]  
[detail]    
[detail] -  QDateTime deadLine=QDateTime::currentDateTime().addDays(-10);
[detail] +  QDateTime deadline=QDateTime::currentDateTime().addDays(-10);
[detail]    QStringList filters;
[detail]    QStringList cacheFiles;
[detail]    filters << "pid_*";
[detail] @@ -58,7 +62,10 @@
[detail]      QStringList cacheFiles=d.entryList(filters);
[detail]      for(QStringList::iterator it=cacheFiles.begin();it!=cacheFiles.end();it++) {
[detail]        QFileInfo fi(d.absoluteFilePath(*it));
[detail] -      if(fi.lastModified()<deadLine) {
[detail] +      if(fi.lastModified()<deadline) {
[detail] +        APP_LOG(5, tr("Remove cache file '%1' last modified on %2\n")
[detail] +                       .arg(fi.absoluteFilePath())
[detail] +                       .arg(fi.lastModified().toString()));
[detail]          d.remove(*it);
[detail]        } else {
[detail]          keepIt=true;
[detail] @@ -66,14 +73,23 @@
[detail]        }
[detail]      }
[detail]      if(!keepIt) {
[detail] -      _swapDir.rmdir(*itpid);
[detail] +      QFileInfo fi(_swapDir.absoluteFilePath(*itpid));
[detail] +      if(fi.lastModified()<deadline) {
[detail] +        APP_LOG(5, tr("Remove cache directory '%1' last modified on %2\n")
[detail] +                       .arg(fi.absoluteFilePath())
[detail] +                       .arg(fi.lastModified().toString()));
[detail] +        _swapDir.rmdir(fi.absoluteFilePath());
[detail] +      }
[detail]      }
[detail]    }
[detail]    
[detail]    cacheFiles=_swapDir.entryList(filters);
[detail]    for(QStringList::iterator it=cacheFiles.begin();it!=cacheFiles.end();it++) {
[detail]      QFileInfo fi(d.absoluteFilePath(*it));
[detail] -    if(fi.lastModified()<deadLine) {
[detail] +    if(fi.lastModified()<deadline) {
[detail] +      APP_LOG(5, tr("Remove cache file '%1' (old release) last modified on %2\n")
[detail] +                     .arg(fi.absoluteFilePath())
[detail] +                     .arg(fi.lastModified().toString()));
[detail]        _swapDir.remove(*it);
[detail]      }
[detail]    }
[detail] @@ -87,11 +103,11 @@
[detail]      index++;
[detail]    }
[detail]    if(!_swapDir.mkdir(subDir)) {
[detail] -    Message::critical(MSG_ID, tr("Initialize swap directory"),
[detail] -                      tr("Cannot create directory %1.")
[detail] -                      .arg(_swapDir.absoluteFilePath(subDir)));
[detail] +    QString msg=tr("Cannot create directory '%1'.").arg(_swapDir.absoluteFilePath(subDir));
[detail] +    Message::critical(MSG_ID, tr("Initialize swap directory"), msg);
[detail]      exit(2);
[detail]    }
[detail] +  APP_LOG(5, tr("Cache directory '%1' created\n").arg(_swapDir.absoluteFilePath(subDir)));
[detail]    _swapDir.cd(subDir);
[detail]  }
[detail]  
[detail] @@ -121,13 +137,32 @@
[detail]      _loadedBytes-=dataSize;
[detail]      _allocatedList.removeOne(item);
[detail]      item->_dataLock.unlock();
[detail] -    APP_LOG(6, tr("Freeing %1 Kb from item %2\t\tFree space=%3 Kb\n")
[detail] -            .arg(dataSize/1024.0)
[detail] +    APP_LOG(6, tr("Freeing %1 from item %2\t\tFree space=%3\n")
[detail] +            .arg(Number::bytesToString(dataSize))
[detail]              .arg(item->debugName())
[detail] -            .arg(freeBytes()/1024.0));
[detail] +            .arg(Number::bytesToString(freeBytes())));
[detail]    }
[detail]  }
[detail]  
[detail] +bool Cache::freeFailed(qint64 nBytes) const
[detail] +{
[detail] +  QString msg=tr( "Impossible to allocate new data\n"
[detail] +                   "   current used space: %1 Kb\n"
[detail] +                   "   current free space: %2 Kb\n"
[detail] +                   "   current buffer size: %3 Kb\n"
[detail] +                   "   required space: %4 Kb\n"
[detail] +                   "Increase buffer size, a good compromize is 80% of you physical memory\n"
[detail] +                   "This buffer is allocated dynamically upon requests, so it will not overload\n"
[detail] +                   "your memory usage.\n\n")
[detail] +                    .arg(Number::bytesToString(_loadedBytes))
[detail] +                    .arg(Number::bytesToString(freeBytes()))
[detail] +                    .arg(Number::bytesToString(_maxLoadedBytes))
[detail] +                    .arg(Number::bytesToString(nBytes))+humanInfo();
[detail] +  App::log(msg);
[detail] +  
[detail] +  return false;
[detail] +}
[detail] +
[detail]  
[detail]  bool Cache::free(qint64 nBytes)
[detail]  {
[detail] @@ -136,9 +171,11 @@
[detail]    do {
[detail]      const CacheItem * item=bestToFree();
[detail]      if(item) {
[detail] +      APP_LOG(6, tr("Saving item '%1' to '%2'...\n")
[detail] +                     .arg(item->debugName())
[detail] +                     .arg(item->swapFileName()));
[detail]        if(!item->save(_swapDir)) {
[detail] -        humanInfo();
[detail] -        return false;
[detail] +        return freeFailed(nBytes);
[detail]        }
[detail]        item->_saved=true;
[detail]        item->free();
[detail] @@ -147,15 +184,12 @@
[detail]        _loadedBytes-=dataSize;
[detail]        _allocatedList.removeOne(item);
[detail]        item->_dataLock.unlock();
[detail] -      APP_LOG(6, tr("Saving item %1\n"
[detail] -                    "Freeing %2 Kb from item %3\t\tFree space=%4 Kb\n")
[detail] -              .arg(item->debugName())
[detail] -              .arg(dataSize/1024.0)
[detail] +      APP_LOG(6, tr("Freed %1 from item %2\t\tFree space=%3\n")
[detail] +              .arg(Number::bytesToString(dataSize))
[detail]                .arg(item->debugName())
[detail] -              .arg(freeBytes()/1024.0));
[detail] +              .arg(Number::bytesToString(freeBytes())));
[detail]      } else {
[detail] -      humanInfo();
[detail] -      return false;
[detail] +      return freeFailed(nBytes);
[detail]      }
[detail]    } while(obtainedBytes<nBytes);
[detail]    return true;
[detail] @@ -171,7 +205,9 @@
[detail]    }
[detail]    if(item->isAllocated()) {
[detail]      if(saveTemp) {
[detail] -      APP_LOG(6, tr("Saving item %1\n").arg(item->debugName()))
[detail] +      APP_LOG(6, tr("Saving item %1 to '%2'...\n")
[detail] +                     .arg(item->debugName())
[detail] +                     .arg(item->swapFileName()));
[detail]        item->save(_swapDir);
[detail]        item->_saved=true;
[detail]      }
[detail] @@ -180,11 +216,11 @@
[detail]      _loadedBytes-=item->dataSize();
[detail]      _allocatedList.removeOne(item);
[detail]      _mutex.unlock();
[detail] -    APP_LOG(6, tr("Freeing %1 Kb from item %2. %3 still allocated\t\tfree space=%4 Kb\n")
[detail] -            .arg(item->dataSize()/1024.0)
[detail] +    APP_LOG(6, tr("Freeing %1 from item %2. %3 still allocated\t\tfree space=%4\n")
[detail] +            .arg(Number::bytesToString(item->dataSize()))
[detail]              .arg(item->debugName())
[detail]              .arg(_allocatedList.count())
[detail] -            .arg(freeBytes()/1024.0))
[detail] +            .arg(Number::bytesToString(freeBytes())))
[detail]    }
[detail]  }
[detail]  
[detail] @@ -198,19 +234,6 @@
[detail]    if(neededSize>freeBytes()) {
[detail]      
[detail]      if(!free(neededSize)) {
[detail] -      QString msg=tr("Impossible to allocate new data\n"
[detail] -                     "   current used space: %1 Kb\n"
[detail] -                     "   current free space: %2 Kb\n"
[detail] -                     "   current buffer size: %3 Kb\n"
[detail] -                     "   required space: %4 Kb\n"
[detail] -                     "Increase buffer size, a good compromize is 80% of you physical memory\n"
[detail] -                     "This buffer is allocated dynamically upon requests, so it will not overload\n"
[detail] -                     "your memory usage.\n\n")
[detail] -                        .arg(_loadedBytes/1024.0).arg(freeBytes()/1024.0)
[detail] -                        .arg(_maxLoadedBytes/1024.0).arg(neededSize/1024.0)+humanInfo();
[detail] -      App::log(msg);
[detail] -      
[detail] -      humanInfo();
[detail]        return false; 
[detail]      }
[detail]      
[detail] @@ -222,22 +245,22 @@
[detail]      if(item->_saved) {
[detail]        APP_LOG(6, tr("Loading item %1\n").arg(item->debugName()))
[detail]        if(!item->load(_swapDir)) {
[detail] -        humanInfo();
[detail] +        App::log(humanInfo());
[detail]          return false;
[detail]        }
[detail]        _swapDir.remove(item->swapFileName());
[detail]        item->_saved=false;
[detail]      }
[detail] -    APP_LOG(6, tr("Allocating %1 Kbytes for item %2\t\tfree space=%3 Kb\n")
[detail] -            .arg(neededSize/1024.0)
[detail] +    APP_LOG(6, tr("Allocating %1 for item %2\t\tfree space=%3\n")
[detail] +            .arg(Number::bytesToString(neededSize))
[detail]              .arg(item->debugName())
[detail] -            .arg(freeBytes()/1024.0))
[detail] +            .arg(Number::bytesToString(freeBytes())))
[detail]      return true;
[detail]    }
[detail]    
[detail] -  QString msg=tr("Impossible to allocate new data of size %1: current used space: %2 Kb.\n\n")
[detail] -                   .arg(neededSize)
[detail] -                   .arg(_loadedBytes/1024.0)+humanInfo();
[detail] +  QString msg=tr("Impossible to allocate new data of size %1: current used space: %2.\n\n")
[detail] +                    .arg(Number::bytesToString(neededSize))
[detail] +                    .arg(Number::bytesToString(_loadedBytes))+humanInfo();
[detail]    App::log(msg);
[detail]    CoreApplication::instance()->reportBug(Message::Warning, msg.toLatin1().data());
[detail]    return false;
[detail] @@ -253,18 +276,6 @@
[detail]    if(neededSize>freeBytes()) {
[detail]      
[detail]      if(!free(neededSize)) {
[detail] -      QString msg=tr( "Impossible to allocate new data\n"
[detail] -                        "   current used space: %1 Kb\n"
[detail] -                        "   current free space: %2 Kb\n"
[detail] -                        "   current buffer size: %3 Kb\n"
[detail] -                        "   required space: %4 Kb\n"
[detail] -                        "Increase buffer size, a good compromize is 80% of you physical memory\n"
[detail] -                        "This buffer is allocated dynamically upon requests, so it will not overload\n"
[detail] -                        "your memory usage.\n\n")
[detail] -                        .arg(_loadedBytes/1024.0).arg(freeBytes()/1024.0)
[detail] -                        .arg(_maxLoadedBytes/1024.0).arg(neededSize/1024.0)+humanInfo();
[detail] -      App::log(msg);
[detail] -      CoreApplication::instance()->reportBug(Message::Warning, msg.toLatin1().data());
[detail]        return false; 
[detail]      }
[detail]      
[detail] @@ -283,7 +294,7 @@
[detail]    quint64 t;
[detail]    for(QList<const CacheItem *>::iterator it=_allocatedList.begin();it!=_allocatedList.end();++it) {
[detail]      const CacheItem * item=*it;
[detail] -    item->_adminLock.MUTEX_LOCK;
[detail] +    if(item->_adminLock.tryLock()) {
[detail]      if(item->_dataLock.tryLockForWrite()) {
[detail]        if(item->_lockCount<2) {  
[detail]          t=item->nextPredictedTime();
[detail] @@ -314,6 +325,7 @@
[detail]      }
[detail]      item->_adminLock.unlock();
[detail]    }
[detail] +  }
[detail]    return bestItem;
[detail]  }
[detail]  
[detail] @@ -321,12 +333,12 @@
[detail]  QString Cache::humanInfo() const
[detail]  {
[detail]    TRACE;
[detail] -  int sizeBlocks=0, sizeLockedBlocks=0, countLockedBlocks=0;
[detail] +  qint64 sizeBlocks=0, sizeLockedBlocks=0, countLockedBlocks=0, countAdminLockedBlocks=0;
[detail]    QMutexLocker ml(&_mutex);
[detail]    for(QList<const CacheItem *>::const_iterator it=_allocatedList.begin();it!=_allocatedList.end();++it) {
[detail]      const CacheItem& item=**it;
[detail]      sizeBlocks+=item.dataSize();
[detail] -    item._adminLock.MUTEX_LOCK;
[detail] +    if(item._adminLock.tryLock()) {
[detail]      if(item._dataLock.tryLockForWrite()) {
[detail]        if(item._lockCount>1) { 
[detail]          sizeLockedBlocks+=item.dataSize();
[detail] @@ -335,9 +347,16 @@
[detail]        item._dataLock.unlock();
[detail]      }
[detail]      item._adminLock.unlock();
[detail] +    } else {
[detail] +      countAdminLockedBlocks++;
[detail]    }
[detail] -  return tr("%1 allocated blocks (%2 Mb), %3 locked blocks (%4 Mb)\n")
[detail] -         .arg(_allocatedList.count()).arg(sizeBlocks >> 20).arg(countLockedBlocks).arg(sizeLockedBlocks >> 20);
[detail] +  }
[detail] +  return tr("%1 allocated blocks (%2), %3 locked blocks (%4), %5 admin locked blocks\n")
[detail] +      .arg(_allocatedList.count())
[detail] +      .arg(Number::bytesToString(sizeBlocks))
[detail] +      .arg(countLockedBlocks)
[detail] +      .arg(Number::bytesToString(sizeLockedBlocks))
[detail] +      .arg(countAdminLockedBlocks);
[detail]  }
[detail]  
[detail]  
[detail] @@ -348,33 +367,34 @@
[detail]    App::log(tr("#### Cache debug status %1\n").arg(tag));
[detail]    for(QList<const CacheItem *>::const_iterator it=_allocatedList.begin();it!=_allocatedList.end();++it) {
[detail]      const CacheItem& item=**it;
[detail] -    item._adminLock.MUTEX_LOCK;
[detail] +    if(item._adminLock.tryLock()) {
[detail]      if(item._dataLock.tryLockForWrite()) {
[detail]        if(item._lockCount>1) { 
[detail] -        App::log(tr("#### %1 %2 kb locked %3 times (trylock success)\n")
[detail] +          App::log(tr("#### %1 %2 locked %3 times (trylock success)\n")
[detail]                                .arg(item.debugName())
[detail] -                              .arg(item.dataSize() >> 10)
[detail] +                       .arg(Number::bytesToString(item.dataSize()))
[detail]                                .arg(item._lockCount-1));
[detail]        } else {
[detail] -        App::log(tr("#### %1 %2 kb unlocked\n")
[detail] +          App::log(tr("#### %1 %2 unlocked\n")
[detail]                                .arg(item.debugName())
[detail] -                              .arg(item.dataSize() >> 10));
[detail] +                       .arg(Number::bytesToString(item.dataSize())));
[detail]        }
[detail]        item._dataLock.unlock();
[detail]      } else {
[detail]        if(item._lockCount>0) {
[detail] -        App::log(tr("#### %1 %2 kb locked %3 times (trylock failed)\n")
[detail] +          App::log(tr("#### %1 %2 locked %3 times (trylock failed)\n")
[detail]                                .arg(item.debugName())
[detail] -                              .arg(item.dataSize() >> 10)
[detail] +                       .arg(Number::bytesToString(item.dataSize()))
[detail]                                .arg(item._lockCount));
[detail]        } else {
[detail] -        App::log(tr("#### %1 %2 kb unlocked\n")
[detail] +          App::log(tr("#### %1 %2 unlocked\n")
[detail]                                .arg(item.debugName())
[detail] -                              .arg(item.dataSize() >> 10));
[detail] +                       .arg(Number::bytesToString(item.dataSize())));
[detail]        }
[detail]      }
[detail]      item._adminLock.unlock();
[detail]    }
[detail] +  }
[detail]    App::log(tr("#### ---------------\n"));
[detail]  }
[detail]  
[detail]                        src/CacheItem.cpp:  version-2.5.0	not modified
[detail]                     src/CacheProcess.cpp:  version-2.5.0	not modified
[detail]                     src/CodeCoverage.cpp:  version-2.5.0	no last version available
[detail]                            src/Color.cpp:  version-2.5.0	not modified
[detail]            src/ColumnTextDescription.cpp:  version-2.5.0	not modified
[detail]                   src/ColumnTextFile.cpp:  version-2.5.0	modified out of comments
[detail] --- src/ColumnTextFile.cpp-version-2.5.0-stripped	2025-09-28 04:00:46.443413308 +0200
[detail] +++ src/ColumnTextFile.cpp-HEAD-stripped	2025-09-28 04:00:46.443413308 +0200
[detail] @@ -1,8 +1,8 @@
[detail]  
[detail]  
[detail]  #include "Trace.h"
[detail] +#include "Global.h"
[detail]  #include "ColumnTextFile.h"
[detail] -#include "ColumnTextParser.h"
[detail]  #include "CoreApplication.h"
[detail]  #include "XMLHeader.h"
[detail]  
[detail]               src/ColumnTextIterator.cpp:  version-2.5.0	not modified
[detail]                 src/ColumnTextParser.cpp:  version-2.5.0	not modified
[detail]                          src/Complex.cpp:  version-2.5.0	modified out of comments
[detail] --- src/Complex.cpp-version-2.5.0-stripped	2025-09-28 04:00:46.491413540 +0200
[detail] +++ src/Complex.cpp-HEAD-stripped	2025-09-28 04:00:46.495413559 +0200
[detail] @@ -3,6 +3,7 @@
[detail]  #include "Complex.h"
[detail]  #include "StringSection.h"
[detail]  #include "MemoryChecker.h"
[detail] +#include "CoreApplicationPrivate.h"
[detail]  
[detail]  namespace QGpCoreTools {
[detail]  
[detail] @@ -33,27 +38,145 @@
[detail]    return str;
[detail]  }
[detail]  
[detail] -bool Complex::fromString(const StringSection& str)
[detail] +  bool Complex::fromStringError(const QString& message, const QChar * ptr, const StringSection& str)
[detail] +  {
[detail] +    QString errorPos(static_cast<int>(ptr-str.begin())+message.size(), ' ');
[detail] +    App::log(tr("complex number: %1 in '%2'\n"
[detail] +                "                     %3^\n").arg(message).arg(str.toStringView()).arg(errorPos));
[detail] +    return false;
[detail] +  }
[detail] +
[detail] +  
[detail] +  bool Complex::fromString(const StringSection& str, bool compatibility)
[detail]  {
[detail]    TRACE;
[detail] +    const QChar * ptr=str.begin();
[detail] +    const QChar * ptrE=str.end();
[detail] +    StringSection n1(ptr, 0);
[detail] +    StringSection n2(ptr, 0);
[detail] +    StringSection * cur=&n1;
[detail] +    bool decimalPoint=false;
[detail] +    bool plusMinusSign=false;
[detail] +    bool exponent=false;
[detail] +    bool digit=false;
[detail] +    while(ptr<ptrE) {
[detail] +      switch(ptr->unicode()) {
[detail] +      case '\r':
[detail] +      case '\n':
[detail] +      case 0:
[detail] +        cur->setEnd(ptr);
[detail] +        ptr=ptrE;
[detail] +        break;
[detail] +      case ' ':
[detail] +        if(compatibility) {
[detail] +          if(digit) {
[detail] +            cur->setEnd(ptr);
[detail] +            if(cur==&n2) {
[detail] +              ptr=ptrE;
[detail] +            } else {
[detail] +              cur=&n2;
[detail] +              exponent=false;
[detail] +              digit=false;
[detail] +              decimalPoint=false;
[detail] +              cur->set(ptr, 0);
[detail] +            }
[detail] +          }
[detail] +          plusMinusSign=false;
[detail] +        } 
[detail] +        break;
[detail] +      case '0':
[detail] +      case '1':
[detail] +      case '2':
[detail] +      case '3':
[detail] +      case '4':
[detail] +      case '5':
[detail] +      case '6':
[detail] +      case '7':
[detail] +      case '8':
[detail] +      case '9':
[detail] +        digit=true;
[detail] +        break;
[detail] +      case 'e':
[detail] +      case 'E':
[detail] +        if(exponent) {
[detail] +          return fromStringError(tr("misplaced exponent"), ptr, str);
[detail] +        }
[detail] +        exponent=true;
[detail] +        plusMinusSign=false;
[detail] +        digit=false;
[detail] +        decimalPoint=false;
[detail] +        break;
[detail] +      case 'i':
[detail] +        ptr++;
[detail] +        if(digit) {
[detail] +          cur->setEnd(ptr);
[detail] +          if(cur==&n2) {
[detail] +            ptr=ptrE;
[detail] +          } else {
[detail] +            cur=&n2;
[detail] +            exponent=false;
[detail] +            digit=false;
[detail] +            decimalPoint=false;
[detail] +            cur->set(ptr, 0);
[detail] +          }
[detail] +        }
[detail] +        break;
[detail] +      case '.':
[detail] +        if(decimalPoint || exponent) {
[detail] +          return fromStringError(tr("misplaced decimal point"), ptr, str);
[detail] +        }
[detail] +        decimalPoint=true;
[detail] +        break;
[detail] +      case '+':
[detail] +      case '-':
[detail] +        if(digit) {
[detail] +          cur->setEnd(ptr);
[detail] +          if(cur==&n2) {
[detail] +            ptr=ptrE;
[detail] +          } else {
[detail] +            cur=&n2;
[detail] +            exponent=false;
[detail] +            digit=false;
[detail] +            decimalPoint=false;
[detail] +            cur->set(ptr, 0);
[detail] +          }
[detail] +        } else if(plusMinusSign) {
[detail] +          return fromStringError(tr("misplaced plus/minus sign"), ptr, str);
[detail] +        }
[detail] +        plusMinusSign=true;
[detail] +        break;
[detail] +      default:
[detail] +        return fromStringError(tr("unrecognised character"), ptr, str);
[detail] +      }
[detail] +      ptr++;
[detail] +    }
[detail] +    if(cur->isEmpty()) {
[detail] +      cur->setEnd(ptrE);
[detail] +    }
[detail]    bool ok=true;
[detail] -  const QChar * ptr=nullptr;
[detail] -  StringSection f;
[detail] -  f=str.nextField(ptr," +");
[detail] -  if(f.isValid()) {
[detail] -    _data.values.re=f.toDouble(ok);
[detail] +    if(!n1.isEmpty()) {
[detail] +      if(*(n1.end()-1)=='i') {
[detail] +        n1.shrink(1);
[detail] +        _data.values.im=n1.toDouble(ok);
[detail]    } else {
[detail] -    return false;
[detail] +        _data.values.re=n1.toDouble(ok);
[detail]    }
[detail] -  if(ok) {
[detail] -    f=str.nextField(ptr, " i");
[detail] -    if(f.isValid()) {
[detail] -      _data.values.im=f.toDouble(ok);
[detail] +      if(!ok) {
[detail] +        return fromStringError(tr("error for first number"), ptr, str);
[detail] +      }
[detail] +    }
[detail] +    if(!n2.isEmpty()) {
[detail] +      if(*(n2.end()-1)=='i') {
[detail] +        n2.shrink(1);
[detail] +        _data.values.im=n2.toDouble(ok);
[detail]      } else {
[detail] -      return false;
[detail] +        _data.values.re=n2.toDouble(ok);
[detail]      }
[detail] +      if(!ok) {
[detail] +        return fromStringError(tr("error for second number"), ptr, str);
[detail]    }
[detail] -  return ok;
[detail] +    }
[detail] +    return true;
[detail]  }
[detail]  
[detail]  QTextStream& operator<< (QTextStream& s, const Complex& c)
[detail] @@ -90,4 +213,76 @@
[detail]    return s;
[detail]  }
[detail]  
[detail] +  
[detail] +  size_t qHash(const Complex& c)
[detail] +  {
[detail] +    size_t h1=::qHash(quint64(c.re()));
[detail] +    size_t h2=::qHash(quint64(c.im()));
[detail] +    return ((h1 << 16) | (h1 >> 16)) ^ h2;
[detail] +  }
[detail] +
[detail] +  
[detail] +  bool Complex::operator<(const Complex& c) const
[detail] +  {
[detail] +    double a2=abs2();
[detail] +    double ca2=c.abs2();
[detail] +    if(a2<ca2) {
[detail] +      return true;
[detail] +    } else if(a2>ca2) {
[detail] +      return false;
[detail] +    } else {
[detail] +      
[detail] +      double d=phase()-c.phase();
[detail] +      if(d<-M_PI) {
[detail] +        d+=2.0*M_PI;
[detail] +      } else if(d>M_PI) {
[detail] +        d-=2.0*M_PI;
[detail] +      }
[detail] +      return d<0.0;
[detail] +    }
[detail] +  }
[detail] +
[detail] +  
[detail] +  bool Complex::operator>(const Complex& c) const
[detail] +  {
[detail] +    double a2=abs2();
[detail] +    double ca2=c.abs2();
[detail] +    if(a2<ca2) {
[detail] +      return false;
[detail] +    } else if(a2>ca2) {
[detail] +      return true;
[detail] +    } else {
[detail] +      
[detail] +      double d=phase()-c.phase();
[detail] +      if(d<-M_PI) {
[detail] +        d+=2.0*M_PI;
[detail] +      } else if(d>M_PI) {
[detail] +        d-=2.0*M_PI;
[detail] +      }
[detail] +      return d>0.0;
[detail] +    }
[detail] +  }
[detail] +
[detail] +  
[detail] +  int compare(const Complex& c1, const Complex& c2)
[detail] +  {
[detail] +    double a1=c1.abs2();
[detail] +    double a2=c2.abs2();
[detail] +    if(a1<a2) {
[detail] +      return -1;
[detail] +    } else if(a1>a2) {
[detail] +      return 1;
[detail] +    } else {
[detail] +      
[detail] +      double d=c1.phase()-c2.phase();
[detail] +      if(d<-M_PI) {
[detail] +        d+=2.0*M_PI;
[detail] +      } else if(d>M_PI) {
[detail] +        d-=2.0*M_PI;
[detail] +      }
[detail] +      return d>0.0 ? 1 :
[detail] +             d<0.0 ? -1 : 0;
[detail] +    }
[detail] +  }
[detail] +
[detail]  } 
[detail]                        src/ComplexMP.cpp:  version-2.5.0	not modified
[detail]                  src/ConsoleProgress.cpp:  version-2.5.0	modified out of comments
[detail] --- src/ConsoleProgress.cpp-version-2.5.0-stripped	2025-09-28 04:00:46.527413714 +0200
[detail] +++ src/ConsoleProgress.cpp-HEAD-stripped	2025-09-28 04:00:46.531413734 +0200
[detail] @@ -1,43 +1,56 @@
[detail]  
[detail]  
[detail] -#include <time.h>
[detail] -
[detail]  #include "ConsoleProgress.h"
[detail] -#include "Global.h"
[detail]  #include "ApplicationHelp.h"
[detail]  #include "CoreApplication.h"
[detail] +#ifdef MEMORY_CHECKER
[detail]  #include "MemoryChecker.h"
[detail] +#endif
[detail] +#include "Trace.h"
[detail]  
[detail]  namespace QGpCoreTools {
[detail]  
[detail] +  ConsoleProgress::ConsoleProgress()
[detail] +  {
[detail] +    TRACE;
[detail] +    _terminal=CoreApplication::hasStderrTerminal();
[detail] +  }
[detail] +
[detail]  
[detail]  
[detail]  void ConsoleProgress::setCaption(QString c)
[detail]  {
[detail]    TRACE;
[detail]    QString line;
[detail] -  line=ApplicationHelp::getLine(c, CoreApplication::instance()->terminalCols());
[detail] +    line=ApplicationHelp::getLine(c, CoreApplication::instance()->terminalColumns());
[detail]    while(c.length()>0) {
[detail]      fprintf(stderr,"%s\n", line.toLatin1().data());
[detail] -    line=ApplicationHelp::getLine(c, CoreApplication::instance()->terminalCols());
[detail] +      line=ApplicationHelp::getLine(c, CoreApplication::instance()->terminalColumns());
[detail] +    }
[detail] +    if(line.isEmpty()) {
[detail] +      line=defaultCaption;
[detail]    }
[detail]    QMutexLocker ml(&_mutex);
[detail]    _caption=line;
[detail] +    if(_terminal) {
[detail]    static const QString fmt("%1: --");
[detail]    QString msg=fmt.arg(_caption);
[detail]    fprintf(stderr,"%s\n", msg.toLatin1().data());
[detail]  }
[detail] +  }
[detail]  
[detail]  void ConsoleProgress::paint(QString caption, qint64 value, qint64 maximum)
[detail]  {
[detail]    static const QString fmt("%1: %2");
[detail] +    if(_terminal && !caption.isEmpty()) {
[detail]    QString msg=fmt.arg(caption).arg(valueString(value, maximum));
[detail] -  msg=msg.leftJustified(CoreApplication::instance()->terminalCols()-1);
[detail] +      msg=msg.leftJustified(CoreApplication::instance()->terminalColumns()-1);
[detail]    fprintf(stderr,"%c[1A%s\n", 0x1B, msg.toLatin1().data());
[detail]  #ifdef Q_OS_WIN
[detail]    fflush(stderr);
[detail]  #endif
[detail]  }
[detail] +  }
[detail]  
[detail]  void ConsoleProgress::end(qint64 val)
[detail]  {
[detail] @@ -49,8 +62,15 @@
[detail]    } else {
[detail]      msg=QString("%1: 100 %").arg(_caption);
[detail]    }
[detail] -  msg=msg.leftJustified(CoreApplication::instance()->terminalCols()-1);
[detail] +    msg=msg.leftJustified(CoreApplication::instance()->terminalColumns()-1);
[detail] +    if(!_caption.isEmpty()) {
[detail] +      if(_terminal) {
[detail]    fprintf(stderr,"%c[1A%s\n", 0x1B, msg.toLatin1().data());
[detail] +      } else {
[detail] +        fprintf(stderr,"%s\n", msg.toLatin1().data());
[detail] +      }
[detail] +      _caption=QString();
[detail] +    }
[detail]  }
[detail]  
[detail]  } 
[detail]                  src/CoreApplication.cpp:  version-2.5.0	modified out of comments
[detail] --- src/CoreApplication.cpp-version-2.5.0-stripped	2025-09-28 04:00:46.551413830 +0200
[detail] +++ src/CoreApplication.cpp-HEAD-stripped	2025-09-28 04:00:46.555413849 +0200
[detail] @@ -36,10 +36,8 @@
[detail]      } else if(help && (arg=="--help" || arg=="-help" || arg=="-h")) {
[detail]        showHelp(i, argc, argv, help);
[detail]        ::exit(0);
[detail] -    } else if(arg=="-batch") {
[detail] -      setBatch(true);
[detail]      } else if(arg=="-args") {
[detail] -      int max=50;
[detail] +      int max=10;
[detail]        if(checkOptionArg(i, argc, argv, false)) {
[detail]          max=CoreApplication::toInt(i, i-1, argv);
[detail]        }
[detail]           src/CoreApplicationPrivate.cpp:  version-2.5.0	modified out of comments
[detail] --- src/CoreApplicationPrivate.cpp-version-2.5.0-stripped	2025-09-28 04:00:46.571413927 +0200
[detail] +++ src/CoreApplicationPrivate.cpp-HEAD-stripped	2025-09-28 04:00:46.575413945 +0200
[detail] @@ -90,13 +90,9 @@
[detail]      
[detail]      _pathTranslator=nullptr;
[detail]      
[detail] -    _terminalCols=0;
[detail] -    _terminalRows=0;
[detail] -    
[detail]      _bugReportOptions=NoBugReport;
[detail] -    _batch=true;    
[detail] -                    
[detail] -                    
[detail] +    setTerminalInfo();
[detail] +    _pythonInterpreter=false;
[detail]  
[detail]      
[detail]      if(_argumentList.isEmpty()) {
[detail] @@ -576,7 +572,11 @@
[detail]        instance()->reportBug(Message::Critical, msg.toLatin1().data());
[detail]        break;
[detail]      case QtFatalMsg:
[detail] +      if(instance()->_bugReportOptions & ReportBugs) {
[detail]        instance()->reportBugNow(Message::Fatal, msg.toLatin1().data());
[detail] +      } else {
[detail] +        fprintf(stderr, "%s\n", msg.toLatin1().data());
[detail] +      }
[detail]        ::exit(2);
[detail]      }
[detail]      qInstallMessageHandler(messageOutput);
[detail] @@ -667,6 +667,9 @@
[detail]    
[detail]    void CoreApplicationPrivate::osSignal(int sig)
[detail]    {
[detail] +    
[detail] +    signal(SIGINT, nullptr);
[detail] +    signal(SIGTERM, nullptr);
[detail]      static QAtomicInt lock=false;
[detail]      if(lock.fetchAndStoreOrdered(true)) {
[detail]        sleep(10000);
[detail] @@ -799,8 +802,8 @@
[detail]        }
[detail]        p.write(str.toLatin1().data());
[detail]        p.write("END\n");
[detail] -      if(p.waitForStarted(10000)) {
[detail] -        while(!p.waitForFinished(10000)) {}
[detail] +      if(p.waitForStarted(1000)) {
[detail] +        while(!p.waitForFinished(1000)) {}
[detail]        } else {
[detail]          reportBugDirectly(str);
[detail]        }
[detail] @@ -974,8 +977,6 @@
[detail]                                           "computations (default=%1).").arg(QThread::idealThreadCount()));
[detail]      h->addOption(tr("-verbosity <V>"), tr("Set level of verbosity (default=0)"));
[detail]      h->addOption(tr("-locale <L>"), tr("Set current locale"));
[detail] -    h->addOption(tr("-batch"), tr("Prevent the storage of user history (e.g. -args or recent file menus). "
[detail] -                                  "Use it when running inside a script, to prevent pollution of user history."));
[detail]      h->addOption(tr("-qt-plugin-paths"), tr("Print the list of paths where Qt plugins are search."));
[detail]      h->addGroup(tr("Debug"), "debug", 5);
[detail]      h->addOption(tr("-nobugreport"),
[detail] @@ -1185,39 +1186,13 @@
[detail]      return _pathTranslator->translate(originalFile, options);
[detail]    }
[detail]  
[detail] -  int CoreApplicationPrivate::terminalRows() const
[detail] -  {
[detail] -    if(_terminalRows==0) {
[detail] -      terminalSize();
[detail] -    }
[detail] -    return _terminalRows;
[detail] -  }
[detail] -
[detail] -  int CoreApplicationPrivate::terminalCols() const
[detail] -  {
[detail] -    if(_terminalCols==0) {
[detail] -      terminalSize();
[detail] -    }
[detail] -    return _terminalCols;
[detail] -  }
[detail] -
[detail]    
[detail] -  void CoreApplicationPrivate::terminalSize() const
[detail] +  void CoreApplicationPrivate::setTerminalInfo()
[detail]    {
[detail] +    _terminalColumns=80;
[detail]    
[detail] -
[detail] -  
[detail] -  
[detail] -#define ESC_STRETCH 1
[detail] -#define OUTBUF_SIZE (2 * 64*1024 * ESC_STRETCH)
[detail] -#ifdef Q_OS_WIN
[detail] -    _terminalCols=80;
[detail] -    _terminalRows=1000;
[detail] -#else
[detail] +#ifndef Q_OS_WIN
[detail]      struct winsize ws;
[detail] -    char *columns; 
[detail] -    char *lines;   
[detail] -
[detail]      do {
[detail]        int fd;
[detail]        if(ioctl(STDOUT_FILENO, TIOCGWINSZ, &ws)!=-1 && ws.ws_col>0 && ws.ws_row>0) break;
[detail] @@ -1229,37 +1204,51 @@
[detail]          close(fd);
[detail]          if(ret!=-1 && ws.ws_col>0 && ws.ws_row>0) break;
[detail]        }
[detail] -      
[detail]        ws.ws_col=80;
[detail]        ws.ws_row=24;
[detail] -    } while(0);
[detail] -    _terminalCols=ws.ws_col;  
[detail] -    _terminalRows=ws.ws_row;
[detail] -    
[detail] -
[detail] -    
[detail] -    
[detail] +    } while(false); 
[detail] +    _terminalColumns=ws.ws_col;
[detail] +#endif
[detail]  
[detail] -    columns=getenv("COLUMNS");
[detail] +    const char * columns=getenv("COLUMNS");
[detail]      if(columns && *columns){
[detail]        long t;
[detail]        char *endptr;
[detail]        t=strtol(columns, &endptr, 0);
[detail] -      if(!*endptr && (t>0) && (t<(long)OUTBUF_SIZE)) _terminalCols=(int)t;
[detail] +      if(!*endptr && t>0 && t<1024) {
[detail] +        _terminalColumns=(int)t;
[detail] +      }
[detail]      }
[detail]  
[detail] -    lines  =getenv("LINES");
[detail] -    if(lines && *lines){
[detail] -      long t;
[detail] -      char *endptr;
[detail] -      t=strtol(lines, &endptr, 0);
[detail] -      if(!*endptr && (t>0) && (t<(long)OUTBUF_SIZE)) _terminalRows=(int)t;
[detail] +    if(_terminalColumns<9) {
[detail] +      fprintf(stderr,"Your %d column terminal is bogus. Expect trouble.\n", _terminalColumns);
[detail] +    }
[detail]      }
[detail]  
[detail] -    if((_terminalCols<9) || (_terminalRows<2))
[detail] -      fprintf(stderr,"Your %dx%d screen size is bogus. Expect trouble.\n",
[detail] -        _terminalCols, _terminalRows
[detail] -      );
[detail] +  bool CoreApplicationPrivate::hasStdoutTerminal()
[detail] +  {
[detail] +#ifdef Q_OS_WIN
[detail] +    return true;
[detail] +#else
[detail] +    return isatty(STDOUT_FILENO);
[detail] +#endif
[detail] +  }
[detail] +
[detail] +  bool CoreApplicationPrivate::hasStderrTerminal()
[detail] +  {
[detail] +#ifdef Q_OS_WIN
[detail] +    return true;
[detail] +#else
[detail] +    return isatty(STDERR_FILENO);
[detail] +#endif
[detail] +  }
[detail] +
[detail] +  bool CoreApplicationPrivate::hasInputTerminal()
[detail] +  {
[detail] +#ifdef Q_OS_WIN
[detail] +    return true;
[detail] +#else
[detail] +    return isatty(STDIN_FILENO);
[detail]  #endif
[detail]    }
[detail]  
[detail]                         src/DateTime.cpp:  version-2.5.0	modified out of comments
[detail] --- src/DateTime.cpp-version-2.5.0-stripped	2025-09-28 04:00:46.595414043 +0200
[detail] +++ src/DateTime.cpp-HEAD-stripped	2025-09-28 04:00:46.599414062 +0200
[detail] @@ -256,32 +256,32 @@
[detail]  
[detail]    DateTimeData value(bool& ok) const;
[detail]  protected:
[detail] -  virtual bool d_parsed();
[detail] -  virtual bool dd_parsed();
[detail] -  virtual bool ddd_parsed();
[detail] -  virtual bool dddd_parsed();
[detail] -  virtual bool M_parsed();
[detail] -  virtual bool MM_parsed();
[detail] -  virtual bool MMM_parsed();
[detail] -  virtual bool MMMM_parsed();
[detail] -  virtual bool yy_parsed();
[detail] -  virtual bool yyyy_parsed();
[detail] -  virtual bool h_parsed();
[detail] -  virtual bool hh_parsed();
[detail] -  virtual bool H_parsed();
[detail] -  virtual bool HH_parsed();
[detail] -  virtual bool m_parsed();
[detail] -  virtual bool mm_parsed();
[detail] -  virtual bool s_parsed();
[detail] -  virtual bool ss_parsed();
[detail] -  virtual bool sz_parsed();
[detail] -  virtual bool ssz_parsed();
[detail] -  virtual bool z_parsed();
[detail] -  virtual bool zzz_parsed();
[detail] -  virtual bool ap_parsed();
[detail] -  virtual bool AP_parsed();
[detail] -  virtual bool quote_parsed(const StringSection& text);
[detail] -  virtual bool other_parsed(const QChar& c);
[detail] +  bool d_parsed();
[detail] +  bool dd_parsed();
[detail] +  bool ddd_parsed();
[detail] +  bool dddd_parsed();
[detail] +  bool M_parsed();
[detail] +  bool MM_parsed();
[detail] +  bool MMM_parsed();
[detail] +  bool MMMM_parsed();
[detail] +  bool yy_parsed();
[detail] +  bool yyyy_parsed();
[detail] +  bool h_parsed();
[detail] +  bool hh_parsed();
[detail] +  bool H_parsed();
[detail] +  bool HH_parsed();
[detail] +  bool m_parsed();
[detail] +  bool mm_parsed();
[detail] +  bool s_parsed();
[detail] +  bool ss_parsed();
[detail] +  bool sz_parsed();
[detail] +  bool ssz_parsed();
[detail] +  bool z_parsed();
[detail] +  bool zzz_parsed();
[detail] +  bool ap_parsed();
[detail] +  bool AP_parsed();
[detail] +  bool quote_parsed(const StringSection& text);
[detail] +  bool other_parsed(const QChar& c);
[detail]  private:
[detail]    bool truncatedError() const;
[detail]  
[detail] @@ -502,7 +502,16 @@
[detail]    if(_current.size()>0) {
[detail]      for(int i=1;i<=12; i++) {
[detail]        QString n=_locale.monthName(i, QLocale::ShortFormat);
[detail] -      if(_current.beginWith(n)) {
[detail] +      if(_current.beginWith(n, Qt::CaseInsensitive)) {
[detail] +        _month=i;
[detail] +        _current+=n.size();
[detail] +        return true;
[detail] +      }
[detail] +    }
[detail] +    QLocale l=QLocale::c();
[detail] +    for(int i=1;i<=12; i++) {
[detail] +      QString n=l.monthName(i, QLocale::ShortFormat);
[detail] +      if(_current.beginWith(n, Qt::CaseInsensitive)) {
[detail]          _month=i;
[detail]          _current+=n.size();
[detail]          return true;
[detail] @@ -520,7 +529,16 @@
[detail]    if(_current.size()>0) {
[detail]      for(int i=1;i<=12; i++) {
[detail]        QString n=_locale.monthName(i, QLocale::LongFormat);
[detail] -      if(_current.beginWith(n)) {
[detail] +      if(_current.beginWith(n, Qt::CaseInsensitive)) {
[detail] +        _month=i;
[detail] +        _current+=n.size();
[detail] +        return true;
[detail] +      }
[detail] +    }
[detail] +    QLocale l=QLocale::c();
[detail] +    for(int i=1;i<=12; i++) {
[detail] +      QString n=l.monthName(i, QLocale::LongFormat);
[detail] +      if(_current.beginWith(n, Qt::CaseInsensitive)) {
[detail]          _month=i;
[detail]          _current+=n.size();
[detail]          return true;
[detail] @@ -571,8 +589,27 @@
[detail]        _year=_locale.toInt(_current.left(l).toStringView());
[detail]        _current+=l;
[detail]        return true;
[detail] +    } else if(_current[0]=='-') {
[detail] +      if(_current.size()>=2 && _current[1].isDigit()) {
[detail] +        if(_current.size()>=3 && _current[2].isDigit()) {
[detail] +          if(_current.size()>=4 && _current[3].isDigit()) {
[detail] +            if(_current.size()>=5 && _current[4].isDigit()) {
[detail] +              l=5;
[detail] +            } else {
[detail] +              l=4;
[detail] +            }
[detail] +          } else {
[detail] +            l=3;
[detail] +          }
[detail] +        } else {
[detail] +          l=2;
[detail] +        }
[detail] +        _year=_locale.toInt(_current.left(l).toStringView());
[detail] +        _current+=l;
[detail] +        return true;
[detail]      }
[detail] -    App::log(tr("expected a number between 0 and 9999: '%1'\n").arg(_current.left(l).toStringView()));
[detail] +    }
[detail] +    App::log(tr("expected a number between -9999 and 9999: '%1'\n").arg(_current.left(l).toStringView()));
[detail]      return false;
[detail]    } else {
[detail]      return truncatedError();
[detail] @@ -926,33 +963,33 @@
[detail]  
[detail]    int precision() const {return _precision;}
[detail]  protected:
[detail] -  virtual bool C_parsed() {return true;}
[detail] -  virtual bool d_parsed() {return true;}
[detail] -  virtual bool dd_parsed() {return true;}
[detail] -  virtual bool ddd_parsed() {return true;}
[detail] -  virtual bool dddd_parsed() {return true;}
[detail] -  virtual bool M_parsed() {return true;}
[detail] -  virtual bool MM_parsed() {return true;}
[detail] -  virtual bool MMM_parsed() {return true;}
[detail] -  virtual bool MMMM_parsed() {return true;}
[detail] -  virtual bool yy_parsed() {return true;}
[detail] -  virtual bool yyyy_parsed() {return true;}
[detail] -  virtual bool h_parsed() {return true;}
[detail] -  virtual bool hh_parsed() {return true;}
[detail] -  virtual bool H_parsed() {return true;}
[detail] -  virtual bool HH_parsed() {return true;}
[detail] -  virtual bool m_parsed() {return true;}
[detail] -  virtual bool mm_parsed() {return true;}
[detail] -  virtual bool s_parsed() {return true;}
[detail] -  virtual bool ss_parsed() {return true;}
[detail] -  virtual bool sz_parsed() {return true;}
[detail] -  virtual bool ssz_parsed() {return true;}
[detail] -  virtual bool z_parsed() {return setPrecision(3);}
[detail] -  virtual bool zzz_parsed() {return setPrecision(3);}
[detail] -  virtual bool ap_parsed() {return true;}
[detail] -  virtual bool AP_parsed() {return true;}
[detail] -  virtual bool quote_parsed(const StringSection&) {return true;}
[detail] -  virtual bool other_parsed(const QChar&) {return true;}
[detail] +  bool C_parsed() {return true;}
[detail] +  bool d_parsed() {return true;}
[detail] +  bool dd_parsed() {return true;}
[detail] +  bool ddd_parsed() {return true;}
[detail] +  bool dddd_parsed() {return true;}
[detail] +  bool M_parsed() {return true;}
[detail] +  bool MM_parsed() {return true;}
[detail] +  bool MMM_parsed() {return true;}
[detail] +  bool MMMM_parsed() {return true;}
[detail] +  bool yy_parsed() {return true;}
[detail] +  bool yyyy_parsed() {return true;}
[detail] +  bool h_parsed() {return true;}
[detail] +  bool hh_parsed() {return true;}
[detail] +  bool H_parsed() {return true;}
[detail] +  bool HH_parsed() {return true;}
[detail] +  bool m_parsed() {return true;}
[detail] +  bool mm_parsed() {return true;}
[detail] +  bool s_parsed() {return true;}
[detail] +  bool ss_parsed() {return true;}
[detail] +  bool sz_parsed() {return true;}
[detail] +  bool ssz_parsed() {return true;}
[detail] +  bool z_parsed() {return setPrecision(3);}
[detail] +  bool zzz_parsed() {return setPrecision(3);}
[detail] +  bool ap_parsed() {return true;}
[detail] +  bool AP_parsed() {return true;}
[detail] +  bool quote_parsed(const StringSection&) {return true;}
[detail] +  bool other_parsed(const QChar&) {return true;}
[detail]  private:
[detail]    inline bool setPrecision(int p);
[detail]    int _precision;
[detail] @@ -981,33 +1018,33 @@
[detail]    bool parse(const QString& format);
[detail]    const QString& value() const {return _text;}
[detail]  protected:
[detail] -  virtual bool C_parsed() {_numberFormat="%1"; return DateTimeParser::C_parsed();}
[detail] -  virtual bool d_parsed();
[detail] -  virtual bool dd_parsed();
[detail] -  virtual bool ddd_parsed();
[detail] -  virtual bool dddd_parsed();
[detail] -  virtual bool M_parsed();
[detail] -  virtual bool MM_parsed();
[detail] -  virtual bool MMM_parsed();
[detail] -  virtual bool MMMM_parsed();
[detail] -  virtual bool yy_parsed();
[detail] -  virtual bool yyyy_parsed();
[detail] -  virtual bool h_parsed();
[detail] -  virtual bool hh_parsed();
[detail] -  virtual bool H_parsed();
[detail] -  virtual bool HH_parsed();
[detail] -  virtual bool m_parsed();
[detail] -  virtual bool mm_parsed();
[detail] -  virtual bool s_parsed();
[detail] -  virtual bool ss_parsed();
[detail] -  virtual bool sz_parsed();
[detail] -  virtual bool ssz_parsed();
[detail] -  virtual bool z_parsed();
[detail] -  virtual bool zzz_parsed();
[detail] -  virtual bool ap_parsed();
[detail] -  virtual bool AP_parsed();
[detail] -  virtual bool quote_parsed(const StringSection& text);
[detail] -  virtual bool other_parsed(const QChar& c);
[detail] +  bool C_parsed() {_numberFormat="%1"; return DateTimeParser::C_parsed();}
[detail] +  bool d_parsed();
[detail] +  bool dd_parsed();
[detail] +  bool ddd_parsed();
[detail] +  bool dddd_parsed();
[detail] +  bool M_parsed();
[detail] +  bool MM_parsed();
[detail] +  bool MMM_parsed();
[detail] +  bool MMMM_parsed();
[detail] +  bool yy_parsed();
[detail] +  bool yyyy_parsed();
[detail] +  bool h_parsed();
[detail] +  bool hh_parsed();
[detail] +  bool H_parsed();
[detail] +  bool HH_parsed();
[detail] +  bool m_parsed();
[detail] +  bool mm_parsed();
[detail] +  bool s_parsed();
[detail] +  bool ss_parsed();
[detail] +  bool sz_parsed();
[detail] +  bool ssz_parsed();
[detail] +  bool z_parsed();
[detail] +  bool zzz_parsed();
[detail] +  bool ap_parsed();
[detail] +  bool AP_parsed();
[detail] +  bool quote_parsed(const StringSection& text);
[detail] +  bool other_parsed(const QChar& c);
[detail]  private:
[detail]    QString _text;
[detail]    DateTimeData _t;
[detail] @@ -1022,7 +1059,7 @@
[detail]    _t=t;
[detail]    _precision=precision;
[detail]    _numberFormat="%L1";
[detail] -  _t.roundSeconds(::pow(10.0, -_precision));
[detail] +  _t.roundSeconds(Number::exp10(-_precision));
[detail]  }
[detail]  
[detail]  bool DateTimeToString::parse(const QString& format)
[detail] @@ -1031,7 +1068,7 @@
[detail]    
[detail]    DateTimePrecision p(_precision);
[detail]    p.parse(format);
[detail] -  _t.roundSeconds(::pow(10.0, -p.precision()));
[detail] +  _t.roundSeconds(Number::exp10(-p.precision()));
[detail]    return DateTimeParser::parse(format);
[detail]  }
[detail]  
[detail] @@ -1414,7 +1451,7 @@
[detail]  void DateTimeData::fromTime_t(time_t t)
[detail]  {
[detail]    QDateTime dt;
[detail] -  dt.setTimeSpec(Qt::UTC);
[detail] +  dt.setTimeZone(QTimeZone::utc());
[detail]    dt.setSecsSinceEpoch(t);
[detail]    _date=dt.date();
[detail]    _seconds=dt.time().hour()*3600+dt.time().minute()*60+dt.time().second();
[detail] @@ -1450,7 +1487,7 @@
[detail]    int h=_seconds/3600;
[detail]    int m=_seconds/60-h*60;
[detail]    int s=_seconds-m*60-h*3600;
[detail] -  dt.setTimeSpec(Qt::UTC);
[detail] +  dt.setTimeZone(QTimeZone::utc());
[detail]    dt.setTime(QTime(h, m, s));
[detail]    return dt.toSecsSinceEpoch();
[detail]  }
[detail] @@ -1556,10 +1593,13 @@
[detail]        _seconds++;
[detail]      }
[detail]    } else {
[detail] -    _seconds=static_cast<int>(s*round((_seconds+_fractions)/s));
[detail] +    _seconds=qRound(s*round((_seconds+_fractions)/s));
[detail]      _fractions=0.0;
[detail]    }
[detail] -
[detail] +  if(_seconds>=86400) {
[detail] +    _date=_date.addDays(1);
[detail] +    _seconds-=86400;
[detail] +  }
[detail]  }
[detail]  
[detail]  
[detail] @@ -1704,4 +1744,12 @@
[detail]    }
[detail]  }
[detail]  
[detail] +size_t qHash(const DateTime& t)
[detail] +{
[detail] +  size_t h=::qHash(t.date());
[detail] +  h+=::qHash(t.seconds());
[detail] +  h+=::qHash(t.fractions());
[detail] +  return h;
[detail] +}
[detail] +
[detail]  } 
[detail]                    src/DynamicBuffer.cpp:  version-2.5.0	not modified
[detail]                     src/EnumAsString.cpp:  version-2.5.0	modified out of comments
[detail] --- src/EnumAsString.cpp-version-2.5.0-stripped	2025-09-28 04:00:46.631414216 +0200
[detail] +++ src/EnumAsString.cpp-HEAD-stripped	2025-09-28 04:00:46.635414236 +0200
[detail] @@ -2,6 +2,7 @@
[detail]  
[detail]  #include "EnumAsString.h"
[detail]  #include "CoreApplicationPrivate.h"
[detail] +#include "StringFootprint.h"
[detail]  
[detail]  namespace QGpCoreTools {
[detail]  
[detail] @@ -131,9 +132,61 @@
[detail]      } else {
[detail]        ok=false;
[detail]        App::log(tr("Bad keyword '%1' for %2\n").arg(key).arg(_name));
[detail] +      showSimilarKeys(key);
[detail]        return _defaultValue;
[detail]      }
[detail]    }
[detail]  
[detail] +  void EnumAsString::showSimilarKeys(const StringView& key) const
[detail] +  {
[detail] +    double threshold=0.6;
[detail] +    QMap<double, QString> bestCandidates;
[detail] +    StringFootprint ref(key);
[detail] +    for(int i=0; i<_size; i++) {
[detail] +      StringFootprint item(_keys[i]);
[detail] +      double m=ref.misfit(item);
[detail] +      if(m>threshold) {
[detail] +        bestCandidates.insert(m, _keys[i]);
[detail] +      }
[detail] +    }
[detail] +#if(QT_VERSION>=QT_VERSION_CHECK(6, 0, 0))
[detail] +    for(QMap<QLatin1StringView, int>::const_iterator it=_synonyms.begin(); it!=_synonyms.end(); it++) {
[detail] +#else
[detail] +    for(QMap<QLatin1String, int>::const_iterator it=_synonyms.begin(); it!=_synonyms.end(); it++) {
[detail] +#endif
[detail] +      StringFootprint item(it.key());
[detail] +      double m=ref.misfit(item);
[detail] +      if(m>threshold) {
[detail] +        bestCandidates.insert(m, it.key());
[detail] +      }
[detail] +    }
[detail] +    EnumAsString::showSimilarKeys(bestCandidates);
[detail] +  }
[detail] +
[detail] +  void EnumAsString::showSimilarKeys(const QMap<double, QString>& bestCandidates)
[detail] +  {
[detail] +    if(!bestCandidates.isEmpty()) {
[detail] +      QStringList candidates;
[detail] +      for(QMap<double, QString>::const_iterator it=bestCandidates.begin(); it!=bestCandidates.end(); it++) {
[detail] +        candidates.prepend(it.value());
[detail] +        APP_LOG(10, tr("%1 : %2\n").arg(it.value(), 20, QChar(' ')).arg(it.key()));
[detail] +      }
[detail] +      App::log(tr("Did you mean '"));
[detail] +      int n=candidates.size();
[detail] +      if(n>2) {
[detail] +        if(n>5) {
[detail] +          n=5;
[detail] +        }
[detail] +        for(int i=0; i<n-2; i++) {
[detail] +          App::log(candidates.at(i)+"', '");
[detail] +        }
[detail] +        App::log(candidates.at(n-2)+"' or '"+candidates.at(n-1));
[detail] +        App::log(tr("'?\n"));
[detail] +      } else{
[detail] +        App::log(candidates.at(n-1)+"'?\n");
[detail] +      }
[detail] +    }
[detail] +  }
[detail] +
[detail]  } 
[detail]  
[detail]                  src/EventRestrictor.cpp:  version-2.5.0	not modified
[detail]                 src/ExpressionAction.cpp:  version-2.5.0	not modified
[detail]                src/ExpressionActions.cpp:  version-2.5.0	not modified
[detail]                src/ExpressionContext.cpp:  version-2.5.0	not modified
[detail]                 src/ExpressionParser.cpp:  version-2.5.0	not modified
[detail]                src/ExpressionStorage.cpp:  version-2.5.0	not modified
[detail]                 src/ExpressionString.cpp:  version-2.5.0	not modified
[detail]                             src/File.cpp:  version-2.5.0	modified out of comments
[detail] --- src/File.cpp-version-2.5.0-stripped	2025-09-28 04:00:46.767414873 +0200
[detail] +++ src/File.cpp-HEAD-stripped	2025-09-28 04:00:46.775414913 +0200
[detail] @@ -9,6 +9,25 @@
[detail]  
[detail]  namespace QGpCoreTools {
[detail]  
[detail] +  QString File::elidePath(const QString& path, int maximumLenght)
[detail] +  {
[detail] +    TRACE;
[detail] +    int fullLength=path.length();
[detail] +    if(fullLength<=maximumLenght) {
[detail] +      return path;
[detail] +    }
[detail] +    QChar sep=QDir::separator();
[detail] +    int posEnd=fullLength-1;
[detail] +    while(posEnd && path[posEnd]!=sep) {
[detail] +      posEnd--;
[detail] +    }
[detail] +    if(fullLength-posEnd+3>=maximumLenght) {
[detail] +      return "..."+path.right(maximumLenght-3);
[detail] +    }
[detail] +    int half=(maximumLenght-(fullLength-posEnd)-3)/2;
[detail] +    return path.left(half)+"..."+path.right(fullLength-posEnd+half);
[detail] +  }
[detail] +
[detail]    
[detail]    quint32 File::crc32(const QString& fileName, qint64 maxSize, bool *ok)
[detail]    {
[detail] @@ -33,7 +52,7 @@
[detail]    }
[detail]  
[detail]  
[detail] -QStringList File::expand(const QStringList& fileNames)
[detail] +QStringList File::expand(const QStringList& fileNames, AtomicBoolean * terminated)
[detail]  {
[detail]    
[detail]    bool hasWildCards[fileNames.count()];
[detail] @@ -49,8 +68,11 @@
[detail]    QStringList expandedFileNames;
[detail]    int n=fileNames.count();
[detail]    for (int i=0; i<n; i++) {
[detail] +    if(terminated && terminated->value()) {
[detail] +      break;
[detail] +    }
[detail]      if(hasWildCards[i]) {
[detail] -      expandedFileNames+=expand(fileNames.at(i));
[detail] +      expandedFileNames+=expand(fileNames.at(i), terminated);
[detail]      } else {
[detail]        expandedFileNames.append(fileNames.at(i));
[detail]      }
[detail] @@ -59,7 +81,7 @@
[detail]  }
[detail]  
[detail]  
[detail] -QStringList File::expand(const QString& fileName)
[detail] +QStringList File::expand(const QString& fileName, AtomicBoolean * terminated)
[detail]  {
[detail]    
[detail]    QFileInfo fi(fileName);
[detail] @@ -71,12 +93,17 @@
[detail]      if(path=="." || path=="/") break;
[detail]      fi.setFile(path);
[detail]    }
[detail] -  return expand(path, filters, QString(), filters.count()-1);
[detail] +  return expand(path, filters, QString(), filters.count()-1, terminated);
[detail]  }
[detail]  
[detail]  
[detail] -QStringList File::expand(QDir d, QStringList filters, QString levelName, int level)
[detail] +QStringList File::expand(QDir d, QStringList filters, QString levelName, int level, AtomicBoolean * terminated)
[detail]  {
[detail] +  if(terminated && terminated->value()) {
[detail] +    App::log(tr("File expand interrupted.\n"));
[detail] +    return QStringList();
[detail] +  }
[detail] +  APP_LOG(1, tr("Entering directory '%1'\n").arg(d.absolutePath()));
[detail]    if(!levelName.isEmpty()) {
[detail]      d.cd(levelName); 
[detail]      level--;
[detail] @@ -94,7 +121,7 @@
[detail]      } else {
[detail]        if(level>0) {
[detail]          for(QStringList::iterator it=files.begin(); it!=files.end(); it++) {
[detail] -          allFiles+=expand(d,filters,*it,level);
[detail] +          allFiles+=expand(d, filters, *it, level, terminated);
[detail]          }
[detail]        } else {
[detail]          for(QStringList::iterator it=files.begin(); it!=files.end(); it++) {
[detail] @@ -106,7 +133,7 @@
[detail]    } else {
[detail]      if(level>0) {
[detail]        if(d.exists(name)) {
[detail] -        return expand(d,filters, name, level);
[detail] +        return expand(d, filters, name, level, terminated);
[detail]        } else {
[detail]          App::log(tr("cannot access %1\n").arg(d.absoluteFilePath(name)) );
[detail]          return allFiles;
[detail]               src/FilePatternBuilder.cpp:  version-2.5.0	no last version available
[detail]                       src/FileStream.cpp:  version-2.5.0	not modified
[detail]                 src/FletcherChecksum.cpp:  version-2.5.0	not modified
[detail]                 src/GarbageCollector.cpp:  version-2.5.0	no last version available
[detail]                           src/Global.cpp:  version-2.5.0	not modified
[detail]                  src/IncreaseStorage.cpp:  version-2.5.0	not modified
[detail]                            src/Index.cpp:  version-2.5.0	no last version available
[detail]                             src/Leds.cpp:  version-2.5.0	not modified
[detail]                       src/LineParser.cpp:  version-2.5.0	not modified
[detail]                     src/LocalPointer.cpp:  version-2.5.0	not modified
[detail]                      src/LongComplex.cpp:  version-2.5.0	no last version available
[detail]                    src/MemoryChecker.cpp:  version-2.5.0	modified out of comments
[detail] --- src/MemoryChecker.cpp-version-2.5.0-stripped	2025-09-28 04:00:46.919415608 +0200
[detail] +++ src/MemoryChecker.cpp-HEAD-stripped	2025-09-28 04:00:46.923415628 +0200
[detail] @@ -2,7 +2,6 @@
[detail]  
[detail]  #include "CoreApplication.h"
[detail]  #include "MemoryChecker.h"
[detail] -#include "MemoryCheckerPrivate.h"
[detail]  
[detail]  namespace QGpCoreTools {
[detail]  
[detail]             src/MemoryCheckerPrivate.cpp:  version-2.5.0	not modified
[detail]                          src/Message.cpp:  version-2.5.0	modified out of comments
[detail] --- src/Message.cpp-version-2.5.0-stripped	2025-09-28 04:00:46.955415783 +0200
[detail] +++ src/Message.cpp-HEAD-stripped	2025-09-28 04:00:46.959415801 +0200
[detail] @@ -48,22 +48,27 @@
[detail]                                        QString answer1,
[detail]                                        QString answer2)
[detail]    {
[detail] -    App::log(severityString(sev)+QTime::currentTime().toString("hh:mm:ss")+" -- "+caption+"----\n");
[detail] -    App::log(text+"\n ==> ");
[detail] +    QString msg(severityString(sev)+QTime::currentTime().toString("hh:mm:ss")+" -- "+caption+"----\n");
[detail]      _contextMutex.MUTEX_LOCK;
[detail]      Answer a=_contexts.top().answers[msgId];
[detail]      _contextMutex.unlock();
[detail] +    msg+=text+"\n";
[detail] +    if(!answer0.isEmpty()) { 
[detail] +      msg+=" ==> ";
[detail]      switch (a) {
[detail]      case Answer0:
[detail] -      App::log(answer0+"\n");
[detail] +        msg+=answer0;
[detail]        break;
[detail]      case Answer1:
[detail] -      App::log(answer1+"\n");
[detail] +        msg+=answer1;
[detail]        break;
[detail]      case Answer2:
[detail] -      App::log(answer2+"\n");
[detail] +        msg+=answer2;
[detail]        break;
[detail]      }
[detail] +      msg+="\n";
[detail] +    }
[detail] +    App::log(msg);
[detail]      return a;
[detail]    }
[detail]  
[detail]                   src/MessageContext.cpp:  version-2.5.0	not modified
[detail]                            src/Mutex.cpp:  version-2.5.0	not modified
[detail]                           src/Number.cpp:  version-2.5.0	modified out of comments
[detail] --- src/Number.cpp-version-2.5.0-stripped	2025-09-28 04:00:47.007416034 +0200
[detail] +++ src/Number.cpp-HEAD-stripped	2025-09-28 04:00:47.011416052 +0200
[detail] @@ -5,38 +5,139 @@
[detail]  #include <qglobal.h>
[detail]  
[detail]  #include "Number.h"
[detail] +#include "StringSection.h"
[detail]  #include "CoreApplication.h"
[detail]  
[detail]  namespace QGpCoreTools {
[detail]  
[detail]    QLocale Number::_locale;
[detail] +  int Number::_pow10Max=64;  
[detail] +  double * Number::_pow10=nullptr;
[detail]  
[detail]    Number::Number()
[detail]    {
[detail]      _locale=QLocale();
[detail]      _locale.setNumberOptions(QLocale::OmitGroupSeparator);
[detail] +    _pow10=new double[_pow10Max*2+1]+_pow10Max;
[detail] +    _pow10[0]=1.0;
[detail] +    for(int i=1; i<=_pow10Max; i++) {
[detail] +      _pow10[i]=_pow10[i-1]*10.0;
[detail] +      _pow10[-i]=_pow10[1-i]*0.1;
[detail]    }
[detail] +  }
[detail] +
[detail] +  Number::~Number()
[detail] +  {
[detail] +    delete [] (_pow10-_pow10Max);
[detail] +  }
[detail] +
[detail] +  inline int Number::pow10IndexBefore(double x, double * ref)
[detail] +  {
[detail] +    int i=_pow10Max >> 1;
[detail] +    int step2=i >> 1;
[detail] +    while(step2>0) {
[detail] +      if(x<ref[i]) {
[detail] +        i-=step2;
[detail] +      } else if(x>ref[i]) {
[detail] +        i+=step2;
[detail] +      } else {
[detail] +        return i;
[detail] +      }
[detail] +      step2=step2 >> 1;
[detail] +    }
[detail] +    if(x>=ref[i]) {
[detail] +      return i;
[detail] +    } else {
[detail] +      return i-1;
[detail] +    }
[detail] +  }
[detail] +
[detail] +  int Number::floorLog10(double x)
[detail] +  {
[detail] +    if(x>1.0) {
[detail] +      return pow10IndexBefore(x, _pow10);
[detail] +    } else if(x<1.0) {
[detail] +      return pow10IndexBefore(x, _pow10-_pow10Max)-_pow10Max;
[detail] +    } else {
[detail] +      return 0;
[detail] +    }
[detail] +  }
[detail] +
[detail]  
[detail]    
[detail]  
[detail] +  int Number::minimumPrecision(double val, int maxPrecision)
[detail] +  {
[detail] +    val=fabs(val);
[detail] +    double rnd=::round(val);
[detail] +    double t=exp10(-maxPrecision);
[detail] +    int i=0;
[detail] +    for(; i<maxPrecision && fabs(rnd-val)>t*val; i++) {
[detail] +      val*=10.0;
[detail] +      rnd=::round(val);
[detail] +    }
[detail] +    return i;
[detail] +  }
[detail] +
[detail]    
[detail]    QString Number::toUserString(double val, char format, int precision, QLocale *locale)
[detail]    {
[detail]      TRACE;
[detail] -    
[detail] +    if(val==0.0) {
[detail] +      if(format=='f') {
[detail]      if(precision<0) {
[detail] -      precision=-precision;
[detail] -      double vr=floor(val);
[detail] -      double vf=val;
[detail] -      int i=0;
[detail] -      for(; i<precision && vr!=vf; i++) {
[detail] -        vf*=10.0;
[detail] -        vr=floor(vf);
[detail] +          precision=minimumPrecision(val, -precision);
[detail]        }
[detail] -      precision=i;
[detail] +        return locale->toString(val, format, precision);
[detail] +      } else {
[detail] +        return "0";
[detail] +      }
[detail] +    } else {
[detail] +      if(format=='e') {
[detail] +        int exponent=floorLog10(fabs(val));
[detail] +        double m=val*exp10(-exponent);
[detail] +        if(round(fabs(m)*1e12)==1e12) {
[detail] +          switch(exponent) {
[detail] +          case 0:
[detail] +          case 1:
[detail] +          case -1:
[detail] +            if(precision<0) {
[detail] +              precision=minimumPrecision(val, -precision);
[detail] +            }
[detail] +            return locale->toString(val, 'f', precision);
[detail] +          default:
[detail] +            if(val>0.0) {
[detail] +              return "10<sup>"+QString::number(exponent)+"</sup>";
[detail] +            } else {
[detail] +              return "-10<sup>"+QString::number(exponent)+"</sup>";
[detail] +            }
[detail] +          }
[detail] +        } else {
[detail] +          switch(exponent) {
[detail] +          case 0:
[detail] +          case 1:
[detail] +          case -1:
[detail] +          case 2:
[detail] +          case -2:
[detail] +            if(precision<0) {
[detail] +              precision=minimumPrecision(val, -precision);
[detail] +            }
[detail] +            return locale->toString(val, 'f', precision);
[detail] +          default:
[detail] +            if(precision<0) {
[detail] +              precision=minimumPrecision(m, -precision);
[detail] +            }
[detail] +            return locale->toString(m, 'f', precision)+"×10<sup>"+QString::number(exponent)+"</sup>";
[detail] +          }
[detail] +        }
[detail] +      } else {
[detail] +        if(precision<0) {
[detail] +          precision=minimumPrecision(val, -precision);
[detail]      }
[detail]      return locale->toString(val, format, precision);
[detail]    }
[detail] +    }
[detail] +  }
[detail]  
[detail]    void Number::toOctaveFile(double val, const QString& fileName, const QString& variableName)
[detail]    {
[detail] @@ -89,6 +190,31 @@
[detail]      }
[detail]    }
[detail]  
[detail] +  void Number::fromString(int& v, const StringSection& str, bool& ok)
[detail] +  {
[detail] +    v=str.toInt(ok);
[detail] +  }
[detail] +
[detail] +  void Number::fromString(double& v, const StringSection& str, bool& ok)
[detail] +  {
[detail] +    v=str.toDouble(ok);
[detail] +  }
[detail] +
[detail] +  void Number::fromString(Complex& v, const StringSection& str, bool& ok)
[detail] +  {
[detail] +    v=str.toComplex(ok);
[detail] +  }
[detail] +
[detail] +  void Number::fromString(DateTime& v, const StringSection& str, bool& ok)
[detail] +  {
[detail] +    v=str.toTime(DateTime::defaultFormat, ok);
[detail] +  }
[detail] +
[detail] +  void Number::fromString(bool& v, const StringSection& str, bool& ok)
[detail] +  {
[detail] +    v=str.toBool(ok);
[detail] +  }
[detail] +
[detail]    
[detail]  
[detail]    
[detail] @@ -107,7 +233,7 @@
[detail]      
[detail]      
[detail]      
[detail] -    double fac=::pow(10.0,floor(0.301029995663981198*(22-exp)));
[detail] +    double fac=exp10(qFloor(0.301029995663981198*(22-exp)));
[detail]      return ::round(fac*f)/fac;
[detail]    }
[detail]  
[detail] @@ -124,6 +250,27 @@
[detail]      return val;
[detail]    }
[detail]  
[detail] +  int Number::floorLog2(unsigned int val)
[detail] +  {
[detail] +    int l=0;
[detail] +    while(val!=1) {
[detail] +      val=val >> 1;
[detail] +      l++;
[detail] +    }
[detail] +    return l;
[detail] +  }
[detail] +
[detail] +  int Number::ceilLog2(unsigned int val)
[detail] +  {
[detail] +    int l=0;
[detail] +    val--; 
[detail] +    while(val!=0) {
[detail] +      val=val >> 1;
[detail] +      l++;
[detail] +    }
[detail] +    return l;
[detail] +  }
[detail] +
[detail]    unsigned char Number::fromBinaryCodedDecimal(unsigned char bcd)
[detail]    {
[detail]      return ((bcd & 0xF0u) >> 3)*5u+
[detail] @@ -252,7 +399,7 @@
[detail]      if(maximum==1.0) {
[detail]        return ::round(val);
[detail]      } else {
[detail] -      double factor=::pow(10.0, floor(log10(maximum)));
[detail] +      double factor=exp10(floorLog10(maximum));
[detail]        return ::round(val/factor)*factor;
[detail]      }
[detail]    }
[detail] @@ -496,4 +643,84 @@
[detail]      return neg ? -sec : sec;
[detail]    }
[detail]  
[detail] +  QString Number::bytesToString(qint64 bytes)
[detail] +  {
[detail] +    qint64 t=1;
[detail] +    if(bytes<t*1024) {
[detail] +      return tr("%1 B").arg(bytes);
[detail] +    }
[detail] +    t*=1024;
[detail] +    if(bytes<t*1024) {
[detail] +      return tr("%1 KiB").arg(round(10.0*bytes/t)*0.1);
[detail] +    }
[detail] +    t*=1024;
[detail] +    if(bytes<t*1024) {
[detail] +      return tr("%1 MiB").arg(round(10.0*bytes/t)*0.1);
[detail] +    }
[detail] +    t*=1024;
[detail] +    if(bytes<t*1024) {
[detail] +      return tr("%1 GiB").arg(round(10.0*bytes/t)*0.1);
[detail] +    }
[detail] +    t*=1024;
[detail] +    return tr("%1 TiB").arg(round(10.0*bytes/t)*0.1);
[detail] +  }
[detail] +
[detail] +  bool Number::toBoolean(const QString& val, bool& ok)
[detail] +  {
[detail] +    if(val.isEmpty()) {
[detail] +      ok=false;
[detail] +      App::log(tr("an empty string cannot be converted to boolean.\n"));
[detail] +      return false;
[detail] +    } else {
[detail] +      QString lval=val.toLower().trimmed();
[detail] +      QChar c=lval[0];
[detail] +      switch(c.unicode()) {
[detail] +      case 'y':
[detail] +        if(lval=="y" || lval=="yes") {
[detail] +          return true;
[detail] +        }
[detail] +        break;
[detail] +      case 't':
[detail] +        if(lval=="true") {
[detail] +          return true;
[detail] +        }
[detail] +        break;
[detail] +      case 'n':
[detail] +        if(lval=="n" || lval=="no") {
[detail] +          return false;
[detail] +        }
[detail] +        break;
[detail] +      case 'f':
[detail] +        if(lval=="false") {
[detail] +          return false;
[detail] +        }
[detail] +        break;
[detail] +      default:
[detail] +        break;
[detail] +      }
[detail] +      ok=false;
[detail] +      App::log(tr("cannot convert '%1' to boolean.\n").arg(val));
[detail] +      return false;
[detail] +    }
[detail] +  }
[detail] +
[detail] +  
[detail] +  double Number::greatestCommonFactor(double val1, double val2)
[detail] +  {
[detail] +    int n;
[detail] +    if(val1>val2) {
[detail] +      if(val2==0.0) {
[detail] +        return val1;
[detail] +      }
[detail] +      n=floor(val1/val2);
[detail] +      return greatestCommonFactor(val2, val1-n*val2);
[detail] +    } else {
[detail] +      if(val1==0.0) {
[detail] +        return val2;
[detail] +      }
[detail] +      n=floor(val2/val1);
[detail] +      return greatestCommonFactor(val1, val2-n*val1);
[detail] +    }
[detail] +  }
[detail] +
[detail]  } 
[detail]                           src/Option.cpp:  version-2.5.0	not modified
[detail]                      src/PackageInfo.cpp:  version-2.5.0	not modified
[detail]                     src/ParallelLoop.cpp:  version-2.5.0	not modified
[detail]                     src/ParallelTask.cpp:  version-2.5.0	modified out of comments
[detail] --- src/ParallelTask.cpp-version-2.5.0-stripped	2025-09-28 04:00:47.071416343 +0200
[detail] +++ src/ParallelTask.cpp-HEAD-stripped	2025-09-28 04:00:47.075416362 +0200
[detail] @@ -58,8 +58,8 @@
[detail]    {
[detail]      _maxStep=_stepCount;
[detail]  #ifdef TASK_TIMING
[detail] -    App::log(tr("  task index %1: processed during %2 s\n")
[detail] -             .arg(_taskIndex)
[detail] +    App::log(tr("  task index %1: processed during %3 s\n")
[detail] +             .arg(_taskIndex+1)
[detail]               .arg(0.001*_chrono.elapsed()));
[detail]  #endif
[detail]      emit progressChanged(_taskIndex, _maxStep);
[detail]              src/ParallelTaskManager.cpp:  version-2.5.0	modified out of comments
[detail] --- src/ParallelTaskManager.cpp-version-2.5.0-stripped	2025-09-28 04:00:47.091416440 +0200
[detail] +++ src/ParallelTaskManager.cpp-HEAD-stripped	2025-09-28 04:00:47.095416458 +0200
[detail] @@ -46,6 +46,7 @@
[detail]    void ParallelTaskManager::start(bool forceParallel)
[detail]    {
[detail]      TRACE;
[detail] +    App::log(tr("%1 tasks to process\n").arg(_tasks.count()));
[detail]      ParallelLoop::start(0, threadCount(), forceParallel);
[detail]    }
[detail]  
[detail] @@ -71,7 +72,6 @@
[detail]    
[detail]    void ParallelTaskManager::purgeTasks()
[detail]    {
[detail] -    QList<ParallelTask *> finishedTasks;
[detail]      _taskLock.lockForWrite();
[detail]      for(int i=0; i<_tasks.count(); i++) {
[detail]        ParallelTask * t=_tasks.at(i);
[detail]               src/ParallelTaskWorker.cpp:  version-2.5.0	not modified
[detail]                   src/PathTranslator.cpp:  version-2.5.0	not modified
[detail]            src/PathTranslatorOptions.cpp:  version-2.5.0	not modified
[detail]            src/PluginCoreApplication.cpp:  version-2.5.0	not modified
[detail]                   src/PluginSettings.cpp:  version-2.5.0	not modified
[detail]                     src/QGpCoreTools.cpp:  version-2.5.0	not modified
[detail]                    src/ReadWriteLock.cpp:  version-2.5.0	not modified
[detail]                           src/RealMP.cpp:  version-2.5.0	not modified
[detail]                    src/ScriptContext.cpp:  version-2.5.0	modified out of comments
[detail] --- src/ScriptContext.cpp-version-2.5.0-stripped	2025-09-28 04:00:47.235417135 +0200
[detail] +++ src/ScriptContext.cpp-HEAD-stripped	2025-09-28 04:00:47.239417155 +0200
[detail] @@ -22,7 +22,9 @@
[detail]      engine->globalObject().setProperty("rightJustified", extension.property("rightJustified"));
[detail]      engine->globalObject().setProperty("leftJustified", extension.property("leftJustified"));
[detail]      engine->globalObject().setProperty("system", extension.property("system"));
[detail] +    engine->globalObject().setProperty("dateFrom", extension.property("dateFrom"));
[detail]      engine->globalObject().setProperty("addSeconds", extension.property("addSeconds"));
[detail] +    engine->globalObject().setProperty("addDays", extension.property("addDays"));
[detail]      engine->globalObject().setProperty("addMonths", extension.property("addMonths"));
[detail]      engine->globalObject().setProperty("addYears", extension.property("addYears"));
[detail]      engine->globalObject().setProperty("elapsedSeconds", extension.property("elapsedSeconds"));
[detail] @@ -73,6 +75,17 @@
[detail]      return text.leftJustified(nChars, fillChar[0]);
[detail]    }
[detail]  
[detail] +  QString ScriptContext::dateFrom(QString dateTime, QString format)
[detail] +  {
[detail] +    TRACE;
[detail] +    DateTime t;
[detail] +    if(!t.fromString(dateTime, format)) {
[detail] +      App::log(tr("dateFrom cannot convert time string '%1' with format '%2'.\n")
[detail] +                   .arg(dateTime).arg(format));
[detail] +    }
[detail] +    return t.toString(timeFormat);
[detail] +  }
[detail] +
[detail]    QString ScriptContext::addSeconds(QString dateTime, double seconds)
[detail]    {
[detail]      TRACE;
[detail] @@ -84,6 +97,18 @@
[detail]      }
[detail]      return t.toString(timeFormat);
[detail]    }
[detail] +
[detail] +  QString ScriptContext::addDays(QString dateTime, int days)
[detail] +  {
[detail] +    TRACE;
[detail] +    DateTime t;
[detail] +    if(t.fromString(dateTime, timeFormat)) {
[detail] +      t.addDays(days);
[detail] +    } else {
[detail] +      App::log(tr("addDays cannot convert time string.\n"));
[detail] +    }
[detail] +    return t.toString(timeFormat);
[detail] +  }
[detail]  
[detail]    QString ScriptContext::addMonths(QString dateTime, int months)
[detail]    {
[detail]                     src/SharedObject.cpp:  version-2.5.0	not modified
[detail]                 src/SortedStringList.cpp:  version-2.5.0	not modified
[detail]                     src/SortedVector.cpp:  version-2.5.0	not modified
[detail]                   src/StandardStream.cpp:  version-2.5.0	not modified
[detail]                src/StreamRedirection.cpp:  version-2.5.0	not modified
[detail]                       src/StringDiff.cpp:  version-2.5.0	not modified
[detail]                  src/StringFootprint.cpp:  version-2.5.0	no last version available
[detail]                    src/StringSection.cpp:  version-2.5.0	modified out of comments
[detail] --- src/StringSection.cpp-version-2.5.0-stripped	2025-09-28 04:00:47.351417696 +0200
[detail] +++ src/StringSection.cpp-HEAD-stripped	2025-09-28 04:00:47.355417716 +0200
[detail] @@ -61,6 +61,31 @@
[detail]      return 0;
[detail]    }
[detail]  
[detail] +  int StringSection::compare(const QChar * str1, const QChar * str2, int n, Qt::CaseSensitivity cs)
[detail] +  {
[detail] +    TRACE;
[detail] +    if(cs==Qt::CaseSensitive) {
[detail] +      return compare(str1, str2, n);
[detail] +    }
[detail] +    if(!str1) { 
[detail] +      if(!str2) {
[detail] +        return 0;
[detail] +      } else {
[detail] +        return 1;
[detail] +      }
[detail] +    } else if(!str2) {
[detail] +      return -1;
[detail] +    }
[detail] +    QChar c1, c2;
[detail] +    for(int i=0; i<n; i++) {
[detail] +      c1=str1[i].toLower();
[detail] +      c2=str2[i].toLower();
[detail] +      if(c1<c2) return -1;
[detail] +      else if(c1>c2) return 1;
[detail] +    }
[detail] +    return 0;
[detail] +  }
[detail] +
[detail]    int StringSection::compare(const StringSection &o) const
[detail]    {
[detail]      TRACE;
[detail] @@ -74,6 +99,19 @@
[detail]      } else return compare(_str, o._str, _size);
[detail]    }
[detail]  
[detail] +  int StringSection::compare(const StringSection &o, Qt::CaseSensitivity cs) const
[detail] +  {
[detail] +    TRACE;
[detail] +    int r;
[detail] +    if(_size<o._size) {
[detail] +      r=compare(_str, o._str, _size, cs);
[detail] +      if(r==0) return -1; else return r;
[detail] +    } else if(_size>o._size) {
[detail] +      r=compare(_str, o._str, o._size, cs);
[detail] +      if(r==0) return 1; else return r;
[detail] +    } else return compare(_str, o._str, _size, cs);
[detail] +  }
[detail] +
[detail]    const QChar * StringSection::find(QChar c) const
[detail]    {
[detail]      const QChar * ptr=_str;
[detail] @@ -317,13 +355,7 @@
[detail]      s=nextField(ptr, sep, skipEmpty);
[detail]      bool ok=true;
[detail]      if(s.isValid()) {
[detail] -      n.setRe(s.toDouble(ok));
[detail] -    } else {
[detail] -      return false;
[detail] -    }
[detail] -    s=nextField(ptr, sep, skipEmpty);
[detail] -    if(s.isValid()) {
[detail] -      n.setIm(s.toDouble(ok));
[detail] +      n=s.toComplex(ok);
[detail]        return ok;
[detail]      } else {
[detail]        return false;
[detail] @@ -345,6 +377,10 @@
[detail]            return false;
[detail]          }
[detail]          break;
[detail] +      case 'y':
[detail] +        return true;
[detail] +      case 'n':
[detail] +        return false;
[detail]        default:
[detail]          break;
[detail]        }
[detail] @@ -393,11 +429,25 @@
[detail]      }
[detail]    }
[detail]  
[detail] -  Complex StringSection::toComplex(bool& ok) const
[detail] +  
[detail] +  long double StringSection::toLongDouble(bool& ok) const
[detail] +  {
[detail] +    if(ok) {
[detail] +      long double val;
[detail] +      if(sscanf(toStringView().toLatin1().data(), "%Lg", &val)!=1) {
[detail] +        ok=false;
[detail] +      }
[detail] +      return val;
[detail] +    } else {
[detail] +      return 0.0;
[detail] +    }
[detail] +  }
[detail] +
[detail] +  Complex StringSection::toComplex(bool& ok, bool compatibility) const
[detail]    {
[detail]      Complex c;
[detail]      if(ok) {
[detail] -      ok=c.fromString(*this);
[detail] +      ok=c.fromString(*this, compatibility);
[detail]      }
[detail]      return c;
[detail]    }
[detail]                     src/StringStream.cpp:  version-2.5.0	not modified
[detail]                              src/Tar.cpp:  version-2.5.0	not modified
[detail]                           src/Thread.cpp:  version-2.5.0	not modified
[detail]                      src/ThreadTimer.cpp:  version-2.5.0	not modified
[detail]                            src/Trace.cpp:  version-2.5.0	not modified
[detail]                         src/TraceBug.cpp:  version-2.5.0	not modified
[detail]                        src/TraceInfo.cpp:  version-2.5.0	not modified
[detail]                         src/TraceLog.cpp:  version-2.5.0	not modified
[detail]                       src/TraceStamp.cpp:  version-2.5.0	not modified
[detail]                     src/Translations.cpp:  version-2.5.0	not modified
[detail]                    src/TreeContainer.cpp:  version-2.5.0	not modified
[detail]                         src/TreeItem.cpp:  version-2.5.0	not modified
[detail]                         src/UniqueID.cpp:  version-2.5.0	modified out of comments
[detail] --- src/UniqueID.cpp-version-2.5.0-stripped	2025-09-28 04:00:47.575418778 +0200
[detail] +++ src/UniqueID.cpp-HEAD-stripped	2025-09-28 04:00:47.579418798 +0200
[detail] @@ -1,46 +1,15 @@
[detail]  
[detail]  
[detail]  #include "UniqueID.h"
[detail] -#include "Trace.h"
[detail] -#include "Message.h"
[detail] -#include "CoreApplication.h"
[detail]  
[detail]  namespace QGpCoreTools {
[detail]  
[detail]    
[detail]  
[detail] -  
[detail] -  UniqueID::UniqueID()
[detail] -  {
[detail] -    TRACE;
[detail] -    _newId=0;
[detail] -  }
[detail] -
[detail] -  
[detail] -  UniqueID::~UniqueID()
[detail] +  void UniqueID::addRange(const UniqueID& begin, const UniqueID& end, int step, QList<UniqueID>& list)
[detail]    {
[detail] -    TRACE;
[detail] -  }
[detail] -
[detail] -  
[detail] -  int UniqueID::uniqueId(int resquestedId)
[detail] -  {
[detail] -    TRACE;
[detail] -    if(resquestedId==-1) {
[detail] -      return ++_newId;
[detail] -    } else {
[detail] -      _newId=0;
[detail] -      if(countId(resquestedId, _newId)>0) {
[detail] -        _newId++;
[detail] -        App::log(Message::severityString(Message::Warning)
[detail] -                 +tr(" ID %1 changed to %2\n").arg(resquestedId).arg(_newId));
[detail] -        return _newId;
[detail] -      } else {
[detail] -        if(resquestedId>_newId) {
[detail] -          _newId=resquestedId;
[detail] -        }
[detail] -        return resquestedId;
[detail] -      }
[detail] +    for(UniqueID i=begin; i._id<=end._id; i._id+=step) {
[detail] +      list.append(i);
[detail]      }
[detail]    }
[detail]  
[detail]                          src/Version.cpp:  version-2.5.0	not modified
[detail]               src/XMLByteArrayStream.cpp:  version-2.5.0	not modified
[detail]                         src/XMLClass.cpp:  version-2.5.0	modified out of comments
[detail] --- src/XMLClass.cpp-version-2.5.0-stripped	2025-09-28 04:00:47.627419029 +0200
[detail] +++ src/XMLClass.cpp-HEAD-stripped	2025-09-28 04:00:47.631419049 +0200
[detail] @@ -371,4 +371,9 @@
[detail]    }
[detail]  }
[detail]  
[detail] +  XMLRestoreAttributes XMLClass::attributes(const QString& tagAtt, QString& tag, XMLClass::Error& exitCode)
[detail] +  {
[detail] +    return XMLParser::attributes(tagAtt, tag, exitCode);
[detail] +  }
[detail] +
[detail]  } 
[detail]                  src/XMLClassFactory.cpp:  version-2.5.0	not modified
[detail]                       src/XMLContext.cpp:  version-2.5.0	not modified
[detail]                   src/XMLErrorReport.cpp:  version-2.5.0	not modified
[detail]                   src/XMLGenericItem.cpp:  version-2.5.0	not modified
[detail]                        src/XMLHeader.cpp:  version-2.5.0	not modified
[detail]                           src/XMLMap.cpp:  version-2.5.0	not modified
[detail]                        src/XMLMember.cpp:  version-2.5.0	not modified
[detail]                        src/XMLParser.cpp:  version-2.5.0	modified out of comments
[detail] --- src/XMLParser.cpp-version-2.5.0-stripped	2025-09-28 04:00:47.759419668 +0200
[detail] +++ src/XMLParser.cpp-HEAD-stripped	2025-09-28 04:00:47.763419686 +0200
[detail] @@ -19,6 +19,9 @@
[detail]      _stream(s)
[detail]  {
[detail]    _line=1;
[detail] +  _ptr=nullptr;
[detail] +  _specChar=nullptr;
[detail] +  _error=XMLClass::NoError;
[detail]  }
[detail]  
[detail]  
[detail] @@ -52,7 +55,7 @@
[detail]    _error=XMLClass::NoError;
[detail]    
[detail]    
[detail] -  _content.set(_ptr, 0);
[detail] +  _contents.set(_ptr, 0);
[detail]    _specChar=nullptr;
[detail]    
[detail]    while(true) {
[detail] @@ -66,14 +69,14 @@
[detail]        }
[detail]        break;
[detail]      case 0x003C: {    
[detail] -        _content.setEnd(_ptr);
[detail] -        setTag();
[detail] +        _contents.setEnd(_ptr);
[detail] +        setTag(false);
[detail]          switch(_tagType) {
[detail]          case Attributes:
[detail]            qDeleteAll(_tmpStrings);
[detail]            _tmpStrings.clear();
[detail]            _attributes.clear();
[detail] -          setAttributes();
[detail] +          setAttributes(false);
[detail]            switch(_tagType) {
[detail]            case OpenTagAttributes:
[detail]  #ifdef XML_DEBUG
[detail] @@ -102,7 +105,7 @@
[detail]            break;
[detail]          case CloseTag:
[detail]  #ifdef XML_DEBUG
[detail] -          printf("%5i=%5i === %s</%s>\n", __LINE__, _line, _content.toStringBuffer().toLatin1().data(),
[detail] +          printf("%5i=%5i === %s</%s>\n", __LINE__, _line, _contents.toStringBuffer().toLatin1().data(),
[detail]                                                _tag.toStringBuffer().toLatin1().data());
[detail]  #endif
[detail]            closeContext();
[detail] @@ -173,7 +176,7 @@
[detail]        return;
[detail]      }
[detail]    }
[detail] -  _content.set(_ptr+1, 0);
[detail] +  _contents.set(_ptr+1, 0);
[detail]    _specChar=nullptr;
[detail]    _tagStack.push(Tag(_tag,_member));
[detail]  }
[detail] @@ -196,18 +199,18 @@
[detail]      return;
[detail]    }
[detail]    
[detail] -  if(_content.isValid()) {
[detail] +  if(_contents.isValid()) {
[detail]      if(_member.isValidMember()) {
[detail]        if(_specChar) {
[detail]          restoreSpecChar();
[detail]          if(_error!=XMLClass::NoError) return;
[detail]        }
[detail] -      if(!_current.object()->xml_setProperty(_member.memberID(), _tag, _attributes, _content, _current.context())) {
[detail] +      if(!_current.object()->xml_setProperty(_member.memberID(), _tag, _attributes, _contents, _current.context())) {
[detail]          finish(XMLClass::ErrorParsingContent);
[detail]          return;
[detail]        }
[detail]        _member.reset();
[detail] -      _content.setInvalid();
[detail] +      _contents.setInvalid();
[detail]      } else if(_tag==XMLClass::binDataTag && _stream->isMultiFile()) {
[detail]        restoreBinaryData();
[detail]      } else if(_tag==XMLClass::binData200510Tag) {  
[detail] @@ -225,7 +228,7 @@
[detail]        
[detail]        
[detail]        
[detail] -      _current.object()->xml_setProperty(_member.memberID(), _tag, _attributes, _content, _current.context());
[detail] +      _current.object()->xml_setProperty(_member.memberID(), _tag, _attributes, _contents, _current.context());
[detail]        if(!_current.object()->xml_polish(_current.context())) {
[detail]          finish(XMLClass::ErrorPolish);
[detail]          return;
[detail] @@ -234,7 +237,7 @@
[detail]        parent.object()->xml_polishChild(_current.object(), _current.context());
[detail]        _member.release();
[detail]        _current=parent;
[detail] -      _content.setInvalid();
[detail] +      _contents.setInvalid();
[detail]      }
[detail]    } else if(_member.child()) {
[detail]      
[detail] @@ -249,7 +252,7 @@
[detail]      parent.object()->xml_polishChild(_current.object(), _current.context());
[detail]      _member.release();
[detail]      _current=parent;
[detail] -    _content.setInvalid();
[detail] +    _contents.setInvalid();
[detail]    } else if(_tagStack.size()==0) {
[detail]  #ifdef XML_DEBUG
[detail]      printf("%5i === Exiting context %s (Success, context stack empty)\n", __LINE__, _current.object()->xml_tagName().toLatin1().data());
[detail] @@ -264,11 +267,11 @@
[detail]    printf("%5i === Member <%s/>\n", __LINE__, _tag.toStringBuffer().toLatin1().data());
[detail]  #endif
[detail]    
[detail] -  _content.setInvalid();
[detail] +  _contents.setInvalid();
[detail]    _member=_current.object()->xml_member(_tag, _attributes, _current.context());
[detail]    XMLContext * newContext=_member.context(_current.context());
[detail]    if(_member.isValidMember()) {
[detail] -    if(!_current.object()->xml_setProperty(_member.memberID(), _tag, _attributes, _content, newContext)) {
[detail] +    if(!_current.object()->xml_setProperty(_member.memberID(), _tag, _attributes, _contents, newContext)) {
[detail]        finish(XMLClass::ErrorParsingContent);
[detail]      }
[detail]    } else if(_member.child()) {
[detail] @@ -293,7 +296,7 @@
[detail]      if(_error!=XMLClass::NoError) return;
[detail]    }
[detail]    QByteArray binData;
[detail] -  if(_stream->file(_content.toStringBuffer(), binData)) {
[detail] +  if(_stream->file(_contents.toStringBuffer(), binData)) {
[detail]      QDataStream binStream(&binData, QIODevice::ReadOnly);
[detail]      QString binTag;
[detail]      binStream >> binTag;
[detail] @@ -318,7 +321,7 @@
[detail]    }
[detail]    
[detail]    bool ok=true;
[detail] -  qint64 offset=_content.toLongLong(ok);
[detail] +  qint64 offset=_contents.toLongLong(ok);
[detail]    if(!ok) {
[detail]      finish(XMLClass::ErrorSettingBinaryData);
[detail]      return;
[detail] @@ -498,11 +501,11 @@
[detail]  void XMLParser::restoreSpecChar()
[detail]  {
[detail]    
[detail] -  StringSection cur(_content.data(), 0);
[detail] +  StringSection cur(_contents.data(), 0);
[detail]    StringSection code;
[detail]    QString& tmp=*new QString;
[detail]    const QChar * ptr=_specChar;
[detail] -  const QChar * endPtr=_content.data() + _content.size();
[detail] +  const QChar * endPtr=_contents.data() + _contents.size();
[detail]    bool ok=true;
[detail]    while(ptr < endPtr) {
[detail]      switch (ptr->unicode()) {
[detail] @@ -532,19 +535,28 @@
[detail]    cur.setEnd(ptr);
[detail]    cur.appendTo(tmp);
[detail]    _tmpStrings.append(&tmp);
[detail] -  _content.set(tmp.data(), tmp.size());
[detail] +  _contents.set(tmp.data(), tmp.size());
[detail]    
[detail]  }
[detail]  
[detail]  
[detail] -void XMLParser::setTag()
[detail] +void XMLParser::setTag(bool oneTag)
[detail]  {
[detail]    _ptr++;
[detail]    _tag.set(_ptr, 0);
[detail]    while(true) {
[detail]      switch (_ptr->unicode()) {
[detail]      case '\0':
[detail] +      if(oneTag) {
[detail] +        _tag.setEnd(_ptr);
[detail] +        if(_tag.isEmpty()) {
[detail] +          finish(XMLClass::ErrorEmptyTag);
[detail] +        } else {
[detail] +          _tagType=OpenTagNoAttributes;
[detail] +        }
[detail] +      } else {
[detail]        finish(XMLClass::ErrorEndTruncatedTag);
[detail] +      }
[detail]        return;
[detail]      case '\n':
[detail]        _tag.setEnd(_ptr);
[detail] @@ -566,15 +578,15 @@
[detail]             _ptr[5].unicode()=='T' &&
[detail]             _ptr[6].unicode()=='A' &&
[detail]             _ptr[7].unicode()=='[') {
[detail] -          if(_content.end()!=_ptr-1) { 
[detail] -            _content.set(_ptr-1, 0);
[detail] +          if(_contents.end()!=_ptr-1) { 
[detail] +            _contents.set(_ptr-1, 0);
[detail]            }
[detail]            _ptr+=8;
[detail]            skipCData();
[detail] -          _content.setEnd(_ptr);
[detail] +          _contents.setEnd(_ptr);
[detail]            _tagType=CData;
[detail]          } else {
[detail] -          setTag();
[detail] +          setTag(oneTag);
[detail]            if(_ptr->unicode()=='>') {
[detail]              _tagType=QuestionTagNoAttributes;
[detail]            } else {
[detail] @@ -589,7 +601,7 @@
[detail]        return;
[detail]      case '?':
[detail]        if(_ptr[-1].unicode()=='<') {
[detail] -        setTag();
[detail] +        setTag(oneTag);
[detail]          if(_ptr->unicode()=='>') {
[detail]            _tagType=QuestionTagNoAttributes;
[detail]          } else {
[detail] @@ -603,7 +615,7 @@
[detail]        return;
[detail]      case '/':
[detail]        if(_ptr[-1].unicode()=='<') {
[detail] -        setTag();
[detail] +        setTag(oneTag);
[detail]          _tagType=CloseTag;
[detail]          return;
[detail]        }
[detail] @@ -619,7 +631,9 @@
[detail]        return;
[detail]      case '>':
[detail]        _tag.setEnd(_ptr);
[detail] -      if(_tag.isEmpty()) finish(XMLClass::ErrorEmptyTag);
[detail] +      if(_tag.isEmpty()) {
[detail] +        finish(XMLClass::ErrorEmptyTag);
[detail] +      }
[detail]        _tagType=OpenTagNoAttributes;
[detail]        return;
[detail]      case '<':
[detail] @@ -633,19 +647,30 @@
[detail]    }
[detail]  }
[detail]  
[detail] -void XMLParser::setAttributes()
[detail] +void XMLParser::setAttributes(bool oneTag)
[detail]  {
[detail]    StringSection attributeName;
[detail]    attributeName.set(_ptr, 0);
[detail]    while(true) {
[detail]      switch (_ptr->unicode()) {
[detail]      case '\0':
[detail] +      if(oneTag) {
[detail] +        attributeName.setEnd(_ptr);
[detail] +        attributeName.trimmed();
[detail] +        if(attributeName.isEmpty()) {
[detail] +          _tagType=OpenTagAttributes;
[detail] +        } else {
[detail] +          finish(XMLClass::ErrorParsingAttributes);
[detail] +          _tagType=Unknown;
[detail] +        }
[detail] +      } else {
[detail]        _tagType=Unknown;
[detail]        if(_error!=XMLClass::NoError) {
[detail]          _ptr--; 
[detail]          return;
[detail]        }
[detail]        finish(XMLClass::ErrorEndTruncatedTag);
[detail] +      }
[detail]        return;
[detail]      case '\n':
[detail]        _line++;
[detail] @@ -658,22 +683,22 @@
[detail]        }
[detail]        attributeName.setEnd(_ptr);
[detail]        attributeName.trimmed();
[detail] -      if(!attributeName.isEmpty()) {
[detail] +      if(attributeName.isEmpty()) {
[detail] +        _tagType=SingleTagAttributes;
[detail] +      } else {
[detail]          finish(XMLClass::ErrorParsingAttributes);
[detail]          _tagType=Unknown;
[detail] -        return;
[detail]        }
[detail] -      _tagType=SingleTagAttributes;
[detail]        return;
[detail]      case '>':
[detail]        attributeName.setEnd(_ptr);
[detail]        attributeName.trimmed();
[detail] -      if(!attributeName.isEmpty()) {
[detail] +      if(attributeName.isEmpty()) {
[detail] +        _tagType=OpenTagAttributes;
[detail] +      } else {
[detail]          finish(XMLClass::ErrorParsingAttributes);
[detail]          _tagType=Unknown;
[detail] -        return;
[detail]        }
[detail] -      _tagType=OpenTagAttributes;
[detail]        return;
[detail]      case '=':
[detail]        attributeName.setEnd(_ptr);
[detail] @@ -683,13 +708,13 @@
[detail]        switch(_ptr->unicode()) {
[detail]        case '"':
[detail]          _ptr++;
[detail] -        _content.set(_ptr, 0);
[detail] +        _contents.set(_ptr, 0);
[detail]          _specChar=0;
[detail]          skipDoubleQuoteString();
[detail]          break;
[detail]        case '\'':
[detail]          _ptr++;
[detail] -        _content.set(_ptr, 0);
[detail] +        _contents.set(_ptr, 0);
[detail]          _specChar=0;
[detail]          skipSimpleQuoteString();
[detail]          break;
[detail] @@ -699,11 +724,11 @@
[detail]          _tagType=Unknown;
[detail]          return;
[detail]        }
[detail] -      _content.setEnd(_ptr);
[detail] +      _contents.setEnd(_ptr);
[detail]        if(_specChar) {
[detail]          restoreSpecChar();
[detail]        }
[detail] -      _attributes.insert(attributeName, _content);
[detail] +      _attributes.insert(attributeName, _contents);
[detail]        attributeName.set(_ptr + 1, 0);
[detail]        break;
[detail]      default:
[detail] @@ -714,6 +739,20 @@
[detail]  }
[detail]  
[detail]  
[detail] +XMLRestoreAttributes XMLParser::attributes(const QString& tagAtt, QString& tag, XMLClass::Error& exitCode)
[detail] +{
[detail] +  XMLParser p(nullptr, nullptr);
[detail] +  p.setPointer(tagAtt.data()-1);
[detail] +  p.setTag(true);
[detail] +  if(p._error==XMLClass::NoError) {
[detail] +    tag=p._tag.toStringBuffer();
[detail] +    p.setAttributes(true);
[detail] +  }
[detail] +  exitCode=p._error;
[detail] +  return p._attributes;
[detail] +}
[detail] +
[detail] +
[detail]  QChar XMLParser::specialCharacter(const StringSection& code, bool& ok)
[detail]  {
[detail]    TRACE;
[detail] @@ -786,14 +825,14 @@
[detail]        skipSpecChar();
[detail]        break;
[detail]      case 0x003C: {    
[detail] -        _content.setEnd(_ptr);
[detail] -        setTag();
[detail] +        _contents.setEnd(_ptr);
[detail] +        setTag(false);
[detail]          switch(_tagType) {
[detail]          case Attributes:
[detail]            _attributes.clear();
[detail]            qDeleteAll(_tmpStrings);
[detail]            _tmpStrings.clear();
[detail] -          setAttributes();
[detail] +          setAttributes(false);
[detail]            switch(_tagType) {
[detail]            case OpenTagAttributes:
[detail]              _tagStack.push(_tag);
[detail]                src/XMLSaveAttributes.cpp:  version-2.5.0	modified out of comments
[detail] --- src/XMLSaveAttributes.cpp-version-2.5.0-stripped	2025-09-28 04:00:47.783419783 +0200
[detail] +++ src/XMLSaveAttributes.cpp-HEAD-stripped	2025-09-28 04:00:47.787419803 +0200
[detail] @@ -11,7 +11,7 @@
[detail]    
[detail]  
[detail]    
[detail] -  QString XMLSaveAttributes::value(const QString& key)
[detail] +  QString XMLSaveAttributes::value(const QString& key) const
[detail]    {
[detail]      for(const_iterator it=begin(); it!=end();it++) {
[detail]        if(it->key()==key) return it->value();
[detail]                        src/XMLStream.cpp:  version-2.5.0	not modified
[detail]                  src/XMLStringStream.cpp:  version-2.5.0	not modified
[detail]                     src/XMLTarStream.cpp:  version-2.5.0	not modified
[detail]                 src/AbstractParameters.h:  version-2.5.0	modified out of comments
[detail] --- src/AbstractParameters.h-version-2.5.0-stripped	2025-09-28 04:00:47.847420092 +0200
[detail] +++ src/AbstractParameters.h-HEAD-stripped	2025-09-28 04:00:47.851420112 +0200
[detail] @@ -6,6 +6,7 @@
[detail]  #include <QtCore>
[detail]  
[detail]  #include "QGpCoreToolsDLLExport.h"
[detail] +#include "GarbageCollector.h"
[detail]  #include "Global.h"
[detail]  
[detail]  #define PARAMETERS_VERSION 1
[detail] @@ -37,13 +38,15 @@
[detail]        int index;
[detail]      };
[detail]  
[detail] -    class QGPCORETOOLS_EXPORT KeywordMap: private QMap<QString, Keyword>
[detail] +    class QGPCORETOOLS_EXPORT KeywordMap: private QMap<QString, Keyword>, public Garbage
[detail]      {
[detail]      public:
[detail]        void add(const QString& key, AbstractParameters * param, int index);
[detail]        bool setValue(const QString& key, const QString& value, const QString& unit) const;
[detail]        QString key(const AbstractParameters * param, int index) const;
[detail]        int count() const {return QMap<QString, Keyword>::count();}
[detail] +      void showSimilarKeys(const QString& key) const;
[detail] +      void dumpKeys() const;
[detail]      };
[detail]  
[detail]      bool load(QString fileName, const QStringList& beginPatterns=QStringList(),
[detail] @@ -56,6 +59,7 @@
[detail]      virtual void setVersion(PARAMETERS_SETVERSION_ARGS) {_version=version;}
[detail]      virtual void collectKeywords(PARAMETERS_COLLECTKEYWORDS_ARGS);
[detail]      virtual int totalKeywordCount(PARAMETERS_TOTALKEYWORDCOUNT_ARGS) const;
[detail] +    KeywordMap * createKeywordMap();
[detail]      bool parse(const QString& line, const KeywordMap * keywords=nullptr);
[detail]      bool setValues(const AbstractParameters& o);
[detail]      void addValues(const AbstractParameters& o);
[detail] @@ -64,8 +68,6 @@
[detail]      virtual bool setValue(PARAMETERS_SETVALUE_ARGS);
[detail]      void obsoleteKeyword(const KeywordMap& keywords, int index) const;
[detail]    private:
[detail] -    KeywordMap * createKeywordMap();
[detail] -
[detail]      class ParameterValue
[detail]      {
[detail]      public:
[detail]                   src/AbstractProgress.h:  version-2.5.0	modified out of comments
[detail] --- src/AbstractProgress.h-version-2.5.0-stripped	2025-09-28 04:00:47.867420189 +0200
[detail] +++ src/AbstractProgress.h-HEAD-stripped	2025-09-28 04:00:47.871420209 +0200
[detail] @@ -35,6 +35,7 @@
[detail]    QString _caption;
[detail]    qint64 _value;
[detail]    qint64 _maximum;
[detail] +  static const QString defaultCaption;
[detail]  private:
[detail]    void setValueInternal(qint64 val);
[detail]    void increaseValueInternal();
[detail]                     src/AbstractStream.h:  version-2.5.0	not modified
[detail]                   src/ApplicationClock.h:  version-2.5.0	not modified
[detail]                    src/ApplicationHelp.h:  version-2.5.0	not modified
[detail]                src/ArgumentStdinReader.h:  version-2.5.0	not modified
[detail]                    src/AsciiLineParser.h:  version-2.5.0	not modified
[detail]                      src/AtomicBoolean.h:  version-2.5.0	not modified
[detail]                              src/Cache.h:  version-2.5.0	modified out of comments
[detail] --- src/Cache.h-version-2.5.0-stripped	2025-09-28 04:00:47.995420808 +0200
[detail] +++ src/Cache.h-HEAD-stripped	2025-09-28 04:00:47.999420828 +0200
[detail] @@ -9,9 +9,6 @@
[detail]  
[detail]  namespace QGpCoreTools {
[detail]  
[detail] -#define INV_MEGABYTES 9.5367431640625e-07
[detail] -#define MEGABYTES 1048576
[detail] -
[detail]  class CacheItem;
[detail]  
[detail]  class QGPCORETOOLS_EXPORT Cache
[detail] @@ -19,12 +16,11 @@
[detail]    TRANSLATIONS("Cache")
[detail]  public:
[detail]    Cache();
[detail] -  ~Cache() {}
[detail] +  ~Cache();
[detail]  
[detail]    
[detail]    void setSize(double nMegaBytes);
[detail]    qint64 sizeBytes() const {return _maxLoadedBytes;}
[detail] -  double sizeMegaBytes() const {return _maxLoadedBytes*INV_MEGABYTES;}
[detail]  
[detail]    void setSwapDir(const QDir& d);
[detail]  
[detail] @@ -35,12 +31,12 @@
[detail]    void free();
[detail]  
[detail]    qint64 freeBytes() const {return _maxLoadedBytes-_loadedBytes;}
[detail] -  double freeMegaBytes() const {return freeBytes()*INV_MEGABYTES;}
[detail]  
[detail]    void debugStatus(const QString& tag) const;
[detail]  private:
[detail]    friend class CacheItem;
[detail] -  bool free(qint64 byteSize);
[detail] +  bool free(qint64 nBytes);
[detail] +  bool freeFailed(qint64 nBytes) const;
[detail]    const CacheItem * bestToFree();
[detail]    QString humanInfo() const;
[detail]  
[detail]                          src/CacheItem.h:  version-2.5.0	modified out of comments
[detail] --- src/CacheItem.h-version-2.5.0-stripped	2025-09-28 04:00:48.015420904 +0200
[detail] +++ src/CacheItem.h-HEAD-stripped	2025-09-28 04:00:48.019420924 +0200
[detail] @@ -34,6 +34,7 @@
[detail]      inline void constLockData() const;
[detail]      inline void unlockData() const;
[detail]  
[detail] +    bool tryLockAdmin() const {return _adminLock.try_lock();}
[detail]      void lockAdmin() const {_adminLock.MUTEX_LOCK;}
[detail]      void unlockAdmin() const {_adminLock.unlock();}
[detail]  
[detail]                       src/CacheProcess.h:  version-2.5.0	not modified
[detail]                       src/CodeCoverage.h:  version-2.5.0	no last version available
[detail]                              src/Color.h:  version-2.5.0	not modified
[detail]              src/ColumnTextDescription.h:  version-2.5.0	not modified
[detail]                     src/ColumnTextFile.h:  version-2.5.0	not modified
[detail]                 src/ColumnTextIterator.h:  version-2.5.0	not modified
[detail]                   src/ColumnTextParser.h:  version-2.5.0	not modified
[detail]                            src/Complex.h:  version-2.5.0	modified out of comments
[detail] --- src/Complex.h-version-2.5.0-stripped	2025-09-28 04:00:48.131421465 +0200
[detail] +++ src/Complex.h-HEAD-stripped	2025-09-28 04:00:48.135421484 +0200
[detail] @@ -17,10 +17,12 @@
[detail]  class QGPCORETOOLS_EXPORT Complex
[detail]  {
[detail]  public:
[detail] -  inline Complex(double re=0, double im=0);
[detail] +    inline Complex(double re=0.0, double im=0.0);
[detail]  
[detail]    inline bool operator==(const Complex& c) const;
[detail]    inline bool operator!=(const Complex& c) const;
[detail] +    bool operator<(const Complex& c) const;
[detail] +    bool operator>(const Complex& c) const;
[detail]  
[detail]    inline Complex& operator+=(const Complex& c);
[detail]    inline Complex& operator-=(const Complex& c);
[detail] @@ -33,8 +35,13 @@
[detail]    inline Complex& operator*=(const double& d);
[detail]    inline Complex& operator/=(const double& d);
[detail]  
[detail] +    inline Complex& imaginaryMultiply();
[detail] +    inline Complex& negativeImaginaryMultiply();
[detail]    inline Complex& imaginaryMultiply(const double& im);
[detail]  
[detail] +    Complex& addImaginary(const double& im) {_data.values.im+=im; return *this;}
[detail] +    Complex& subtractImaginary(const double& im) {_data.values.im-=im; return *this;}
[detail] +
[detail]    inline Complex operator+(const Complex& c) const;
[detail]    inline Complex operator-(const Complex& c) const;
[detail]    inline Complex operator*(const Complex& c) const;
[detail] @@ -45,39 +52,46 @@
[detail]    inline Complex operator*(const double& d) const;
[detail]    inline Complex operator/(const double& d) const;
[detail]  
[detail] +    void setNull() {_data.values.re=0.0; _data.values.im=0.0;}
[detail]    bool isNull() const {return _data.values.re==0.0 && _data.values.im==0.0;}
[detail]    double re() const {return _data.values.re;}
[detail]    double im() const {return _data.values.im;}
[detail]    void set(double re, double im) {_data.values.re=re; _data.values.im=im;}
[detail]    void setRe(double re) {_data.values.re=re;}
[detail]    void setIm(double im) {_data.values.im=im;}
[detail] -  void setExp(double fac, double arg)
[detail] -  {
[detail] -    _data.values.re=fac*::cos(arg);
[detail] -    _data.values.im=fac*::sin(arg);
[detail] -  }
[detail] -  void setUnitExp(double arg)
[detail] -  {
[detail] -    _data.values.re=::cos(arg);
[detail] -    _data.values.im=::sin(arg);
[detail] -  }
[detail] +    inline void setExp(double fac, double arg);
[detail] +    inline void setUnitExp(double arg);
[detail] +    inline void setHankelSecondKindFirstOrder(double arg);
[detail] +    inline void setHankelSecondKindSecondOrder(double arg);
[detail] +    inline void setHankelSecondKind(int order, double arg);
[detail] +
[detail] +    void changeSign() {_data.values.re=-_data.values.re; _data.values.im=-_data.values.im;}
[detail]    void conjugate() {_data.values.im=-_data.values.im;}
[detail]    inline void conjugate(const Complex& o);
[detail]    double abs() const {return ::sqrt(abs2());}
[detail] -  double abs2() const {return _data.values.re*_data.values.re+_data.values.im*_data.values.im;}
[detail] +    inline double abs2() const;
[detail]    double phase() const {return atan2(_data.values.im, _data.values.re);}
[detail]    void setAbs(double fac) {setExp(fac, phase());}
[detail]    void setPhase(double arg) {setExp(abs(), arg);}
[detail]  
[detail] -  bool fromString(const StringSection& str);
[detail] +    inline double realPartOfProduct(const Complex& c) const;
[detail] +    inline double realPartOfConjugateProduct(const Complex& c) const;
[detail] +    inline double imaginaryPartOfProduct(const Complex& c) const;
[detail] +    inline void conjugateProduct(const Complex& c1, const Complex& c2);
[detail] +    inline void addConjugateProduct(const Complex& c1, const Complex& c2);
[detail] +
[detail] +    bool fromString(const StringSection& str, bool compatibility=false);
[detail]    QString toString(char format='g', int precision=6) const;
[detail]  private:
[detail] -  union {
[detail] +    bool fromStringError(const QString& message, const QChar * ptr, const StringSection& str);
[detail] +
[detail] +    union ComplexValues {
[detail]      v2df vector;
[detail]      struct {
[detail]        double re, im;
[detail]      } values;
[detail] -  } _data;
[detail] +    };
[detail] +    ComplexValues _data;
[detail]  };
[detail]  
[detail]  inline Complex operator+(const double& d, const Complex& c);
[detail] @@ -103,6 +117,8 @@
[detail]  QGPCORETOOLS_EXPORT QTextStream& operator>> (QTextStream& s, Complex& c);
[detail]  QGPCORETOOLS_EXPORT QDataStream& operator<< (QDataStream& s, const Complex& c);
[detail]  QGPCORETOOLS_EXPORT QDataStream& operator>> (QDataStream& s, Complex& c);
[detail] +  QGPCORETOOLS_EXPORT int compare(const Complex& c1, const Complex& c2);
[detail] +  QGPCORETOOLS_EXPORT size_t qHash(const Complex& c);
[detail]  
[detail]  inline Complex::Complex(double re, double im)
[detail]  {
[detail] @@ -136,7 +152,7 @@
[detail]  inline Complex& Complex::operator+=(const Complex& c)
[detail]  {
[detail]  #ifdef __SSE__
[detail] -  _data.vector+=c._data.vector;
[detail] +    _data.vector=__builtin_ia32_addpd(_data.vector, c._data.vector);
[detail]  #else
[detail]    _data.values.re+=c._data.values.re;
[detail]    _data.values.im+=c._data.values.im;
[detail] @@ -153,7 +169,7 @@
[detail]  inline Complex& Complex::operator-=(const Complex& c)
[detail]  {
[detail]  #ifdef __SSE__
[detail] -  _data.vector-=c._data.vector;
[detail] +    _data.vector=__builtin_ia32_subpd(_data.vector, c._data.vector);
[detail]  #else
[detail]    _data.values.re-=c._data.values.re;
[detail]    _data.values.im-=c._data.values.im;
[detail] @@ -163,16 +179,57 @@
[detail]  
[detail]  inline Complex& Complex::operator*=(const double& d)
[detail]  {
[detail] +#if defined(__SSE3__) && !defined(Q_OS_DARWIN)
[detail] +    ComplexValues p;
[detail] +    p.values.re=d;
[detail] +    p.values.im=d;
[detail] +    _data.vector=__builtin_ia32_mulpd(p.vector, _data.vector);
[detail] +#else
[detail]    _data.values.re*=d;
[detail]    _data.values.im*=d;
[detail] +#endif
[detail] +    return *this;
[detail] +  }
[detail] +
[detail] +  inline Complex& Complex::imaginaryMultiply()
[detail] +  {
[detail] +#if defined(__SSE3__) && !defined(Q_OS_DARWIN)
[detail] +    _data.vector=__builtin_ia32_shufpd(_data.vector, _data.vector, 1);  
[detail] +    _data.values.re=-_data.values.re;
[detail] +#else
[detail] +    double re=_data.values.re;
[detail] +    _data.values.re=-_data.values.im;
[detail] +    _data.values.im=re;
[detail] +#endif
[detail] +    return *this;
[detail] +  }
[detail] +
[detail] +  inline Complex& Complex::negativeImaginaryMultiply()
[detail] +  {
[detail] +#if defined(__SSE3__) && !defined(Q_OS_DARWIN)
[detail] +    _data.vector=__builtin_ia32_shufpd(_data.vector, _data.vector, 1);  
[detail] +    _data.values.im=-_data.values.im;
[detail] +#else
[detail] +    double re=_data.values.re;
[detail] +    _data.values.re=_data.values.im;
[detail] +    _data.values.im=-re;
[detail] +#endif
[detail]    return *this;
[detail]  }
[detail]  
[detail]  inline Complex& Complex::imaginaryMultiply(const double& im)
[detail]  {
[detail] +#if defined(__SSE3__) && !defined(Q_OS_DARWIN)
[detail] +    v2df flipped=__builtin_ia32_shufpd(_data.vector, _data.vector, 1);  
[detail] +    ComplexValues p;
[detail] +    p.values.re=-im;
[detail] +    p.values.im=im;
[detail] +    _data.vector=__builtin_ia32_mulpd(p.vector, flipped);
[detail] +#else
[detail]    double re=_data.values.re;
[detail]    _data.values.re=-_data.values.im*im;
[detail]    _data.values.im=re*im;
[detail] +#endif
[detail]    return *this;
[detail]  }
[detail]  
[detail] @@ -205,6 +262,82 @@
[detail]    return *this;
[detail]  }
[detail]  
[detail] +  inline void Complex::conjugateProduct(const Complex& c1, const Complex& c2)
[detail] +  {
[detail] +#if defined(__SSE3__) && !defined(Q_OS_DARWIN)
[detail] +    v2df im1=__builtin_ia32_shufpd(c1._data.vector, c1._data.vector, 3);       
[detail] +    v2df re1=__builtin_ia32_shufpd(c1._data.vector, c1._data.vector, 0);       
[detail] +    v2df c2_flipped=__builtin_ia32_shufpd(c2._data.vector, c2._data.vector, 1);  
[detail] +    v2df flipped=__builtin_ia32_addsubpd(__builtin_ia32_mulpd(im1, c2._data.vector),
[detail] +                                         __builtin_ia32_mulpd(re1, c2_flipped));
[detail] +    _data.vector=__builtin_ia32_shufpd(flipped, flipped, 1);  
[detail] +#else
[detail] +    _data.values.re=c1._data.values.re*c2._data.values.re+c1._data.values.im*c2._data.values.im;
[detail] +    _data.values.im=c1._data.values.im*c2._data.values.re-c1._data.values.re*c2._data.values.im;
[detail] +#endif
[detail] +  }
[detail] +
[detail] +  inline void Complex::addConjugateProduct(const Complex& c1, const Complex& c2)
[detail] +  {
[detail] +#if defined(__SSE3__) && !defined(Q_OS_DARWIN)
[detail] +    v2df im1=__builtin_ia32_shufpd(c1._data.vector, c1._data.vector, 3);       
[detail] +    v2df re1=__builtin_ia32_shufpd(c1._data.vector, c1._data.vector, 0);       
[detail] +    v2df c2_flipped=__builtin_ia32_shufpd(c2._data.vector, c2._data.vector, 1);  
[detail] +    v2df flipped=__builtin_ia32_addsubpd(__builtin_ia32_mulpd(im1, c2._data.vector),
[detail] +                                           __builtin_ia32_mulpd(re1, c2_flipped));
[detail] +    flipped=__builtin_ia32_shufpd(flipped, flipped, 1);  
[detail] +    _data.vector=__builtin_ia32_addpd(_data.vector, flipped);
[detail] +#else
[detail] +    _data.values.re+=c1._data.values.re*c2._data.values.re+c1._data.values.im*c2._data.values.im;
[detail] +    _data.values.im+=c1._data.values.im*c2._data.values.re-c1._data.values.re*c2._data.values.im;
[detail] +#endif
[detail] +  }
[detail] +
[detail] +  inline double Complex::abs2() const
[detail] +  {
[detail] +#if defined(__SSE3__) && !defined(Q_OS_DARWIN)
[detail] +    ComplexValues z;
[detail] +    z.vector=__builtin_ia32_mulpd(_data.vector, _data.vector);
[detail] +    return z.values.re+z.values.im;
[detail] +#else
[detail] +    return _data.values.re*_data.values.re+_data.values.im*_data.values.im;
[detail] +#endif
[detail] +  }
[detail] +
[detail] +  inline double Complex::realPartOfProduct(const Complex& c) const
[detail] +  {
[detail] +#if defined(__SSE3__) && !defined(Q_OS_DARWIN)
[detail] +    ComplexValues im;
[detail] +    im.vector=__builtin_ia32_mulpd(_data.vector, c._data.vector);
[detail] +    return im.values.re-im.values.im;
[detail] +#else
[detail] +    return _data.values.re*c._data.values.re-_data.values.im*c._data.values.im;
[detail] +#endif
[detail] +  }
[detail] +
[detail] +  inline double Complex::realPartOfConjugateProduct(const Complex& c) const
[detail] +  {
[detail] +#if defined(__SSE3__) && !defined(Q_OS_DARWIN)
[detail] +    ComplexValues im;
[detail] +    im.vector=__builtin_ia32_mulpd(_data.vector, c._data.vector);
[detail] +    return im.values.re+im.values.im;
[detail] +#else
[detail] +    return _data.values.re*c._data.values.re+_data.values.im*c._data.values.im;
[detail] +#endif
[detail] +  }
[detail] +
[detail] +  inline double Complex::imaginaryPartOfProduct(const Complex& c) const
[detail] +  {
[detail] +#if defined(__SSE3__) && !defined(Q_OS_DARWIN)
[detail] +    v2df c_flipped=__builtin_ia32_shufpd(c._data.vector, c._data.vector, 1);  
[detail] +    ComplexValues p;
[detail] +    p.vector=__builtin_ia32_mulpd(_data.vector, c_flipped);
[detail] +    return p.values.re+p.values.im;
[detail] +#else
[detail] +    return _data.values.re*c._data.values.im+_data.values.im*c._data.values.re;
[detail] +#endif
[detail] +  }
[detail] +
[detail]  inline Complex& Complex::operator/=(const double& d)
[detail]  {
[detail]    return operator*=(1.0/d);
[detail] @@ -312,6 +445,36 @@
[detail]    _data.values.im=-o._data.values.im;
[detail]  }
[detail]  
[detail] +  inline void Complex::setExp(double fac, double arg)
[detail] +  {
[detail] +    _data.values.re=fac*::cos(arg);
[detail] +    _data.values.im=fac*::sin(arg);
[detail] +  }
[detail] +
[detail] +  inline void Complex::setUnitExp(double arg)
[detail] +  {
[detail] +    _data.values.re=::cos(arg);
[detail] +    _data.values.im=::sin(arg);
[detail] +  }
[detail] +
[detail] +  inline void Complex::setHankelSecondKindFirstOrder(double arg)
[detail] +  {
[detail] +    _data.values.re=j0(arg);
[detail] +    _data.values.im=-y0(arg);
[detail] +  }
[detail] +
[detail] +  inline void Complex::setHankelSecondKindSecondOrder(double arg)
[detail] +  {
[detail] +    _data.values.re=j1(arg);
[detail] +    _data.values.im=-y1(arg);
[detail] +  }
[detail] +
[detail] +  inline void Complex::setHankelSecondKind(int order, double arg)
[detail] +  {
[detail] +    _data.values.re=jn(order, arg);
[detail] +    _data.values.im=-yn(order, arg);
[detail] +  }
[detail] +
[detail]  inline Complex sqrt(const Complex& c)
[detail]  {
[detail]    double r2=::sqrt(c.abs());
[detail] @@ -374,12 +537,12 @@
[detail]    return r;
[detail]  }
[detail]  
[detail] -double abs(const Complex& c)
[detail] +  inline double abs(const Complex& c)
[detail]  {
[detail]    return c.abs();
[detail]  }
[detail]  
[detail] -double abs2(const Complex& c)
[detail] +  inline double abs2(const Complex& c)
[detail]  {
[detail]    return c.abs2();
[detail]  }
[detail]                          src/ComplexMP.h:  version-2.5.0	not modified
[detail]                    src/ConsoleProgress.h:  version-2.5.0	modified out of comments
[detail] --- src/ConsoleProgress.h-version-2.5.0-stripped	2025-09-28 04:00:48.175421677 +0200
[detail] +++ src/ConsoleProgress.h-HEAD-stripped	2025-09-28 04:00:48.175421677 +0200
[detail] @@ -4,17 +4,20 @@
[detail]  #define CONSOLEPROGRESS_H
[detail]  
[detail]  #include "AbstractProgress.h"
[detail] -#include "Trace.h"
[detail]  
[detail]  namespace QGpCoreTools {
[detail]  
[detail]  class QGPCORETOOLS_EXPORT ConsoleProgress: public AbstractProgress
[detail]  {
[detail]  public:
[detail] -  virtual void setCaption(QString c);
[detail] +    ConsoleProgress();
[detail] +
[detail] +    void setCaption(QString c);
[detail]    void end(qint64 val=0);
[detail]  protected:
[detail]    virtual void paint(QString caption, qint64 value, qint64 maximum);
[detail] +  private:
[detail] +    bool _terminal;
[detail]  };
[detail]  
[detail]  } 
[detail]                    src/CoreApplication.h:  version-2.5.0	not modified
[detail]             src/CoreApplicationPrivate.h:  version-2.5.0	modified out of comments
[detail] --- src/CoreApplicationPrivate.h-version-2.5.0-stripped	2025-09-28 04:00:48.207421832 +0200
[detail] +++ src/CoreApplicationPrivate.h-HEAD-stripped	2025-09-28 04:00:48.211421852 +0200
[detail] @@ -40,6 +40,9 @@
[detail]      static void signature(QTextStream& s);
[detail]      static QString authors();
[detail]      virtual bool hasGui() const=0;
[detail] +    static bool hasStdoutTerminal();
[detail] +    static bool hasStderrTerminal();
[detail] +    static bool hasInputTerminal();
[detail]  
[detail]      enum BugReportOption {NoBugReport=0, ReportBugs=1, ReportDirectly=2,
[detail]                            WarningAsError=4, NoUserInterruptReport=8};
[detail] @@ -98,13 +101,9 @@
[detail]      static QString getStdin();
[detail]      static QStringList getFileList(int& argc, char ** argv);
[detail]      static int userId();
[detail] -    int terminalRows() const;
[detail] -    int terminalCols() const;    
[detail] +    int terminalColumns() const {return _terminalColumns;}
[detail]      static size_t getMemorySize();
[detail]  
[detail] -    void setBatch(bool b) {_batch=b;}
[detail] -    bool isBatch() const {return _batch;}
[detail] -
[detail]      void addPlugin(QObject * p);
[detail]      void deletePlugin(QObject * p);
[detail]  
[detail] @@ -119,6 +118,9 @@
[detail]  
[detail]      static void setArgumentList(int argc, char ** argv);
[detail]      static const QStringList& argumentList() {return _argumentList;}
[detail] +
[detail] +    bool hasPythonInterpreter() const {return _pythonInterpreter;}
[detail] +    void setPythonInterpreter() {_pythonInterpreter=true;}
[detail]    protected:
[detail]      void setCPUAffinityList(int maxCoreCount);
[detail]      void setTerminalSize();
[detail] @@ -138,7 +140,7 @@
[detail]    private:
[detail]      void setLibraryPath();
[detail]      static QList<QStringList> argumentLists();
[detail] -    void terminalSize() const;
[detail] +    void setTerminalInfo();
[detail]      void init (int & argc, char ** argv, bool setPath);
[detail]  
[detail]      static CoreApplicationPrivate * _self;
[detail] @@ -156,10 +158,9 @@
[detail]      VectorList<int> _cpuAffinities;
[detail]      int _maximumThreadCount;
[detail]      BugReportOptions _bugReportOptions;
[detail] -    bool _batch;
[detail]      QSettings * _settings, * _globalSettings;
[detail] -
[detail] -    mutable int _terminalCols, _terminalRows;
[detail] +    bool _pythonInterpreter;
[detail] +    int _terminalColumns;
[detail]    };
[detail]  
[detail]    
[detail]                           src/DateTime.h:  version-2.5.0	modified out of comments
[detail] --- src/DateTime.h-version-2.5.0-stripped	2025-09-28 04:00:48.227421929 +0200
[detail] +++ src/DateTime.h-HEAD-stripped	2025-09-28 04:00:48.231421948 +0200
[detail] @@ -41,6 +41,7 @@
[detail]    inline bool operator<=(const DateTimeData& o) const;
[detail]    inline bool operator>(const DateTimeData& o) const;
[detail]    inline bool operator>=(const DateTimeData& o) const;
[detail] +  inline int compare(const DateTimeData& o, double precision) const;
[detail]  
[detail]    inline void operator=(const DateTimeData& o);
[detail]  
[detail] @@ -84,6 +85,7 @@
[detail]    int hour() const {return _seconds/3600;}
[detail]    int minute() const {return _seconds/60-hour()*60;}
[detail]    int second() const {return _seconds-(_seconds/60)*60;}
[detail] +  int seconds() const {return _seconds;}
[detail]    QTime time() const {return QTime(hour(), minute(), second());}
[detail]    double fractions() const {return _fractions;}
[detail]    bool setTime(int hour=0, int minute=0, int second=0, double fractions=0.0);
[detail] @@ -174,7 +176,7 @@
[detail]        return _seconds<=o._seconds;
[detail]      }
[detail]    } else {
[detail] -    return _date<=o._date;
[detail] +    return _date<o._date;
[detail]    }
[detail]  }
[detail]  
[detail] @@ -200,7 +202,28 @@
[detail]        return _seconds>=o._seconds;
[detail]      }
[detail]    } else {
[detail] -    return _date>=o._date;
[detail] +    return _date>o._date;
[detail] +  }
[detail] +}
[detail] +
[detail] +inline int DateTimeData::compare(const DateTimeData& o, double precision) const
[detail] +{
[detail] +  DateTimeData d1(*this);
[detail] +  d1.roundSeconds(precision);
[detail] +  DateTimeData d2(o);
[detail] +  d2.roundSeconds(precision);
[detail] +  if(d1._date==d2._date) {
[detail] +    if(d1._seconds==d2._seconds) {
[detail] +      if(d1._fractions==d2._fractions) {
[detail] +        return 0;
[detail] +      } else {
[detail] +        return d1._fractions<d2._fractions ? -1 : 1;
[detail] +      }
[detail] +    } else {
[detail] +      return d1._seconds<d2._seconds ? -1 : 1;
[detail] +    }
[detail] +  } else {
[detail] +    return d1._date<d2._date ? -1 : 1;
[detail]    }
[detail]  }
[detail]  
[detail] @@ -270,6 +293,7 @@
[detail]    bool operator<=(const DateTime& o) const {return *_d<=*o._d;}
[detail]    bool operator>(const DateTime& o) const {return *_d>*o._d;}
[detail]    bool operator>=(const DateTime& o) const {return *_d>=*o._d;}
[detail] +  int compare(const DateTime& o, double precision) const {return _d->compare(*o._d, precision);}
[detail]  
[detail]    void operator=(const DateTime& o) {return *_d=*o._d;}
[detail]  
[detail] @@ -318,6 +342,7 @@
[detail]    int hour() const {return _d->hour();}
[detail]    int minute() const {return _d->minute();}
[detail]    int second() const {return _d->second();}
[detail] +  int seconds() const {return _d->seconds();}
[detail]    QTime time() const {return _d->time();}
[detail]    double fractions() const {return _d->fractions();}
[detail]    bool setTime(int hour=0, int minute=0, int second=0, double fractions=0.0) {
[detail] @@ -340,6 +365,8 @@
[detail]    QSharedDataPointer<DateTimeData> _d;
[detail]  };
[detail]  
[detail] +QGPCORETOOLS_EXPORT size_t qHash(const DateTime& t);
[detail] +
[detail]  inline DateTime DateTime::operator+(double s) const
[detail]  {
[detail]    DateTime d=*this;
[detail]                      src/DynamicBuffer.h:  version-2.5.0	not modified
[detail]                       src/EnumAsString.h:  version-2.5.0	modified out of comments
[detail] --- src/EnumAsString.h-version-2.5.0-stripped	2025-09-28 04:00:48.263422103 +0200
[detail] +++ src/EnumAsString.h-HEAD-stripped	2025-09-28 04:00:48.267422123 +0200
[detail] @@ -23,6 +23,9 @@
[detail]  
[detail]      static EnumAsString * allocate(const char * name, const char** keys, const int * values);
[detail]      static void deleteAllEnums();
[detail] +
[detail] +    void showSimilarKeys(const StringView& key) const;
[detail] +    static void showSimilarKeys(const QMap<double, QString>& bestCandidates);
[detail]    private:
[detail]      const char * _name;
[detail]      int _defaultValue;
[detail] @@ -248,6 +251,97 @@
[detail]                                 v21, v22, v23}; \
[detail]      e=EnumAsString::allocate(name, keys, values)
[detail]  
[detail] +#define ENUM_AS_STRING_DATA_24(v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, \
[detail] +                               v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, \
[detail] +                               v21, v22, v23, v24) \
[detail] +    static const char* keys[]={#v1, #v2, #v3, #v4, #v5, #v6, #v7, #v8, #v9, #v10, \
[detail] +                               #v11, #v12, #v13, #v14, #v15, #v16, #v17, #v18, #v19, #v20, \
[detail] +                               #v21, #v22, #v23, #v24, nullptr}; \
[detail] +    static const int values[]={v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, \
[detail] +                               v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, \
[detail] +                               v21, v22, v23, v24}; \
[detail] +    e=EnumAsString::allocate(name, keys, values)
[detail] +
[detail] +#define ENUM_AS_STRING_DATA_25(v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, \
[detail] +                               v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, \
[detail] +                               v21, v22, v23, v24, v25) \
[detail] +    static const char* keys[]={#v1, #v2, #v3, #v4, #v5, #v6, #v7, #v8, #v9, #v10, \
[detail] +                               #v11, #v12, #v13, #v14, #v15, #v16, #v17, #v18, #v19, #v20, \
[detail] +                               #v21, #v22, #v23, #v24, #v25, nullptr}; \
[detail] +    static const int values[]={v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, \
[detail] +                               v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, \
[detail] +                               v21, v22, v23, v24, v25}; \
[detail] +    e=EnumAsString::allocate(name, keys, values)
[detail] +
[detail] +#define ENUM_AS_STRING_DATA_26(v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, \
[detail] +                               v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, \
[detail] +                               v21, v22, v23, v24, v25, v26) \
[detail] +    static const char* keys[]={#v1, #v2, #v3, #v4, #v5, #v6, #v7, #v8, #v9, #v10, \
[detail] +                               #v11, #v12, #v13, #v14, #v15, #v16, #v17, #v18, #v19, #v20, \
[detail] +                               #v21, #v22, #v23, #v24, #v25, #v26, nullptr}; \
[detail] +    static const int values[]={v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, \
[detail] +                               v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, \
[detail] +                               v21, v22, v23, v24, v25, v26}; \
[detail] +    e=EnumAsString::allocate(name, keys, values)
[detail] +
[detail] +#define ENUM_AS_STRING_DATA_27(v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, \
[detail] +                               v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, \
[detail] +                               v21, v22, v23, v24, v25, v26, v27) \
[detail] +    static const char* keys[]={#v1, #v2, #v3, #v4, #v5, #v6, #v7, #v8, #v9, #v10, \
[detail] +                               #v11, #v12, #v13, #v14, #v15, #v16, #v17, #v18, #v19, #v20, \
[detail] +                               #v21, #v22, #v23, #v24, #v25, #v26, #v27, nullptr}; \
[detail] +    static const int values[]={v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, \
[detail] +                               v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, \
[detail] +                               v21, v22, v23, v24, v25, v26, v27}; \
[detail] +    e=EnumAsString::allocate(name, keys, values)
[detail] +
[detail] +#define ENUM_AS_STRING_DATA_28(v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, \
[detail] +                               v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, \
[detail] +                               v21, v22, v23, v24, v25, v26, v27, v28) \
[detail] +    static const char* keys[]={#v1, #v2, #v3, #v4, #v5, #v6, #v7, #v8, #v9, #v10, \
[detail] +                               #v11, #v12, #v13, #v14, #v15, #v16, #v17, #v18, #v19, #v20, \
[detail] +                               #v21, #v22, #v23, #v24, #v25, #v26, #v27, #v28, nullptr}; \
[detail] +    static const int values[]={v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, \
[detail] +                               v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, \
[detail] +                               v21, v22, v23, v24, v25, v26, v27, v28}; \
[detail] +    e=EnumAsString::allocate(name, keys, values)
[detail] +
[detail] +#define ENUM_AS_STRING_DATA_29(v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, \
[detail] +                               v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, \
[detail] +                               v21, v22, v23, v24, v25, v26, v27, v28, v29) \
[detail] +    static const char* keys[]={#v1, #v2, #v3, #v4, #v5, #v6, #v7, #v8, #v9, #v10, \
[detail] +                               #v11, #v12, #v13, #v14, #v15, #v16, #v17, #v18, #v19, #v20, \
[detail] +                               #v21, #v22, #v23, #v24, #v25, #v26, #v27, #v28, #v29, nullptr}; \
[detail] +    static const int values[]={v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, \
[detail] +                               v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, \
[detail] +                               v21, v22, v23, v24, v25, v26, v27, v28, v29}; \
[detail] +    e=EnumAsString::allocate(name, keys, values)
[detail] +
[detail] +#define ENUM_AS_STRING_DATA_30(v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, \
[detail] +                               v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, \
[detail] +                               v21, v22, v23, v24, v25, v26, v27, v28, v29, v30) \
[detail] +    static const char* keys[]={#v1, #v2, #v3, #v4, #v5, #v6, #v7, #v8, #v9, #v10, \
[detail] +                               #v11, #v12, #v13, #v14, #v15, #v16, #v17, #v18, #v19, #v20, \
[detail] +                               #v21, #v22, #v23, #v24, #v25, #v26, #v27, #v28, #v29, #v30, nullptr}; \
[detail] +    static const int values[]={v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, \
[detail] +                               v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, \
[detail] +                               v21, v22, v23, v24, v25, v26, v27, v28, v29, v30}; \
[detail] +    e=EnumAsString::allocate(name, keys, values)
[detail] +
[detail] +#define ENUM_AS_STRING_DATA_36(v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, \
[detail] +                               v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, \
[detail] +                               v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, \
[detail] +                               v31, v32, v33, v34, v35, v36) \
[detail] +    static const char* keys[]={#v1, #v2, #v3, #v4, #v5, #v6, #v7, #v8, #v9, #v10, \
[detail] +                               #v11, #v12, #v13, #v14, #v15, #v16, #v17, #v18, #v19, #v20, \
[detail] +                               #v21, #v22, #v23, #v24, #v25, #v26, #v27, #v28, #v29, #v30, \
[detail] +                               #v31, #v32, #v33, #v34, #v35, #v36, nullptr}; \
[detail] +    static const int values[]={v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, \
[detail] +                               v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, \
[detail] +                               v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, \
[detail] +                               v31, v32, v33, v34, v35, v36}; \
[detail] +    e=EnumAsString::allocate(name, keys, values)
[detail] +
[detail]  #define ENUM_AS_STRING_DATA_NAMESPACE_2(NameSpace, v1, v2) \
[detail]      static const char* keys[]={#v1, #v2, nullptr}; \
[detail]      static const int values[]={NameSpace::v1, NameSpace::v2}; \
[detail]                    src/EventRestrictor.h:  version-2.5.0	not modified
[detail]                   src/ExpressionAction.h:  version-2.5.0	not modified
[detail]                  src/ExpressionActions.h:  version-2.5.0	not modified
[detail]                  src/ExpressionContext.h:  version-2.5.0	not modified
[detail]                   src/ExpressionParser.h:  version-2.5.0	not modified
[detail]                  src/ExpressionStorage.h:  version-2.5.0	not modified
[detail]                   src/ExpressionString.h:  version-2.5.0	not modified
[detail]                               src/File.h:  version-2.5.0	modified out of comments
[detail] --- src/File.h-version-2.5.0-stripped	2025-09-28 04:00:48.391422722 +0200
[detail] +++ src/File.h-HEAD-stripped	2025-09-28 04:00:48.395422740 +0200
[detail] @@ -7,6 +7,7 @@
[detail]  #include <QtCore>
[detail]  
[detail]  #include "Global.h"
[detail] +#include "AtomicBoolean.h"
[detail]  #include "QGpCoreToolsDLLExport.h"
[detail]  
[detail]  namespace QGpCoreTools {
[detail] @@ -16,12 +17,13 @@
[detail]    public:
[detail]      static quint32 crc32(const QString& fileName, qint64 maxSize, bool *ok=0);
[detail]  
[detail] -    static QStringList expand(const QStringList& fileNames);
[detail] -    static QStringList expand(const QString& fileName);
[detail] +    static QStringList expand(const QStringList& fileNames, AtomicBoolean * terminated=nullptr);
[detail] +    static QStringList expand(const QString& fileName, AtomicBoolean * terminated=nullptr);
[detail]      static QString uniqueName(QString fileName, const QDir& d);
[detail]      static QMultiMap<QString, QString> fileMap(const QDir &d);
[detail]      static void fileMap(const QDir& d, QMultiMap<QString, QString>& map);
[detail]      static QString fileName(QString filePath, QChar sep);
[detail] +    static QString elidePath(const QString& path, int maximumLenght);
[detail]  
[detail]      static char * readAll(const char * fileName);
[detail]      static bool readLine(char *& buf, int& bufLen, gzFile f, bool delEOL=false);
[detail] @@ -50,7 +52,7 @@
[detail]      static qint16 fromBigEndian(qint16 v);
[detail]      static qint16 fromLittleEndian(qint16 v);
[detail]    private:
[detail] -    static QStringList expand(QDir d, QStringList filters, QString levelName, int level);
[detail] +    static QStringList expand(QDir d, QStringList filters, QString levelName, int level, AtomicBoolean * terminated);
[detail]      static void readUntilPattern(QTextStream& s, const QString& pattern);
[detail]    };
[detail]  
[detail]                 src/FilePatternBuilder.h:  version-2.5.0	no last version available
[detail]                         src/FileStream.h:  version-2.5.0	not modified
[detail]                   src/FletcherChecksum.h:  version-2.5.0	not modified
[detail]                   src/GarbageCollector.h:  version-2.5.0	no last version available
[detail]                             src/Global.h:  version-2.5.0	modified out of comments
[detail] --- src/Global.h-version-2.5.0-stripped	2025-09-28 04:00:48.455423031 +0200
[detail] +++ src/Global.h-HEAD-stripped	2025-09-28 04:00:48.459423050 +0200
[detail] @@ -184,6 +184,31 @@
[detail]      }
[detail]    }
[detail]  
[detail] +  
[detail] +  template<typename T>
[detail] +  int compare(const T& v1, const T& v2)
[detail] +  {
[detail] +    return v1<v2 ? -1 :
[detail] +           v1>v2 ? 1 : 0;
[detail] +  }
[detail] +
[detail] +  template<typename T>
[detail] +  int compare(const QList<T>& l1, const QList<T>& l2)
[detail] +  {
[detail] +    int n, n1, n2;
[detail] +    n1=l1.size();
[detail] +    n2=l2.size();
[detail] +    n=n1<n2 ? n1 : n2;
[detail] +    for(int i=0; i<n; i++) {
[detail] +      int c=compare(l1.at(i), l2.at(i));
[detail] +      if(c!=0) {
[detail] +        return c;
[detail] +      }
[detail] +    }
[detail] +    return n1<n2 ? -1 :
[detail] +           n1>n2 ? 1 : 0;
[detail] +  }
[detail] +
[detail]  #if(QT_VERSION<QT_VERSION_CHECK(6, 0, 0))
[detail]    template<typename T>
[detail]    void unique(QVector<T>& vector)
[detail]                    src/IncreaseStorage.h:  version-2.5.0	not modified
[detail]                              src/Index.h:  version-2.5.0	no last version available
[detail]                               src/Leds.h:  version-2.5.0	not modified
[detail]                         src/LineParser.h:  version-2.5.0	not modified
[detail]                       src/LocalPointer.h:  version-2.5.0	not modified
[detail]                        src/LongComplex.h:  version-2.5.0	no last version available
[detail]                      src/MemoryChecker.h:  version-2.5.0	not modified
[detail]               src/MemoryCheckerPrivate.h:  version-2.5.0	not modified
[detail]                            src/Message.h:  version-2.5.0	not modified
[detail]                     src/MessageContext.h:  version-2.5.0	not modified
[detail]                              src/Mutex.h:  version-2.5.0	not modified
[detail]                             src/Number.h:  version-2.5.0	modified out of comments
[detail] --- src/Number.h-version-2.5.0-stripped	2025-09-28 04:00:48.631423881 +0200
[detail] +++ src/Number.h-HEAD-stripped	2025-09-28 04:00:48.635423901 +0200
[detail] @@ -9,19 +9,30 @@
[detail]  #include "RealMP.h"
[detail]  #include "ComplexMP.h"
[detail]  #include "Translations.h"
[detail] +#include "Global.h"
[detail]  
[detail]  namespace QGpCoreTools {
[detail]  
[detail] +  class StringSection;
[detail] +  class DateTime;
[detail] +
[detail]  class QGPCORETOOLS_EXPORT Number
[detail]  {
[detail]    TRANSLATIONS("Number")
[detail]  public:
[detail]    Number();
[detail] +    ~Number();
[detail]  
[detail]    static unsigned int nextPowerOfTwo(unsigned int val);
[detail]    static double round(double val, double maximum=1.0);
[detail]    static inline double sign(double val);
[detail]    static inline int sign(int val);
[detail] +    static inline double exp10(int x);
[detail] +    static int floorLog10(double x);
[detail] +    static int floorLog2(unsigned int val);
[detail] +    static int ceilLog2(unsigned int val);
[detail] +    static int minimumPrecision(double val, int maxPrecision);
[detail] +    static double greatestCommonFactor(double val1, double val2);
[detail]  
[detail]    static QString toUserString(double val, char format, int precision, QLocale * locale=&_locale);
[detail]    static inline QString toString(double val, char format, int precision);
[detail] @@ -40,6 +51,12 @@
[detail]    static double toDouble(const Complex & c) {return c.abs();}
[detail]    static double toDouble(double a) {return a;}
[detail]  
[detail] +    static void fromString(int& v, const StringSection& str, bool& ok);
[detail] +    static void fromString(double& v, const StringSection& str, bool& ok);
[detail] +    static void fromString(Complex& v, const StringSection& str, bool& ok);
[detail] +    static void fromString(DateTime& v, const StringSection& str, bool& ok);
[detail] +    static void fromString(bool& v, const StringSection& str, bool& ok);
[detail] +
[detail]    static unsigned char fromBinaryCodedDecimal(unsigned char bcd);
[detail]    static unsigned short fromBinaryCodedDecimal(unsigned short bcd);
[detail]    static unsigned int fromBinaryCodedDecimal(unsigned int bcd);
[detail] @@ -47,17 +64,31 @@
[detail]    static unsigned short toBinaryCodedDecimal(unsigned short val);
[detail]    static unsigned int toBinaryCodedDecimal(unsigned int val);
[detail]  
[detail] +    static bool toBoolean(const QString& value, bool& ok);
[detail] +
[detail]    static QString secondsToDuration(double sec, int numberPrecision=-1, QLocale * locale=&_locale);
[detail]    static double durationToSeconds(const QString& str, bool &ok, QLocale * locale=&_locale);
[detail]    static double durationToSeconds(const QVariant& val, bool &ok, QLocale * locale=&_locale);
[detail] +
[detail] +    static QString bytesToString(qint64 bytes);
[detail]  private:
[detail]    inline static bool durationToSecondsSign(const QChar * p, int& i, int n);
[detail]    static double durationToSecondsError(const QString& str, int pos, bool &ok);
[detail]  private:
[detail] +    static inline int pow10IndexBefore(double x, double * ref);
[detail]  
[detail]    static QLocale _locale;
[detail] +    static int _pow10Max;
[detail] +    static double * _pow10;
[detail] +
[detail]  };
[detail]  
[detail] +  inline double Number::exp10(int x)
[detail] +  {
[detail] +    ASSERT(x<=_pow10Max && x>=-_pow10Max);
[detail] +    return _pow10[x];
[detail] +  }
[detail] +
[detail]  inline double abs(double val)
[detail]  {
[detail]    return ::fabs(val);
[detail]                             src/Option.h:  version-2.5.0	not modified
[detail]                        src/PackageInfo.h:  version-2.5.0	not modified
[detail]                       src/ParallelLoop.h:  version-2.5.0	not modified
[detail]                       src/ParallelTask.h:  version-2.5.0	not modified
[detail]                src/ParallelTaskManager.h:  version-2.5.0	not modified
[detail]                 src/ParallelTaskWorker.h:  version-2.5.0	not modified
[detail]                     src/PathTranslator.h:  version-2.5.0	not modified
[detail]              src/PathTranslatorOptions.h:  version-2.5.0	not modified
[detail]              src/PluginCoreApplication.h:  version-2.5.0	not modified
[detail]                     src/PluginSettings.h:  version-2.5.0	not modified
[detail]                      src/ReadWriteLock.h:  version-2.5.0	not modified
[detail]                             src/RealMP.h:  version-2.5.0	not modified
[detail]                      src/ScriptContext.h:  version-2.5.0	modified out of comments
[detail] --- src/ScriptContext.h-version-2.5.0-stripped	2025-09-28 04:00:48.839424886 +0200
[detail] +++ src/ScriptContext.h-HEAD-stripped	2025-09-28 04:00:48.843424906 +0200
[detail] @@ -23,7 +23,9 @@
[detail]      Q_INVOKABLE void print(QString text);
[detail]      Q_INVOKABLE QString rightJustified(QString text, int nChars, QString fillChar);
[detail]      Q_INVOKABLE QString leftJustified(QString text, int nChars, QString fillChar);
[detail] +    Q_INVOKABLE QString dateFrom(QString dateTime, QString format);
[detail]      Q_INVOKABLE QString addSeconds(QString dateTime, double seconds);
[detail] +    Q_INVOKABLE QString addDays(QString dateTime, int days);
[detail]      Q_INVOKABLE QString addMonths(QString dateTime, int months);
[detail]      Q_INVOKABLE QString addYears(QString dateTime, int years);
[detail]      Q_INVOKABLE double elapsedSeconds(QString dateTime1, QString dateTime2);
[detail]                       src/SharedObject.h:  version-2.5.0	modified out of comments
[detail] --- src/SharedObject.h-version-2.5.0-stripped	2025-09-28 04:00:48.855424964 +0200
[detail] +++ src/SharedObject.h-HEAD-stripped	2025-09-28 04:00:48.863425002 +0200
[detail] @@ -20,7 +20,7 @@
[detail]    void operator=(const SharedObject&) {}
[detail]  
[detail]    void addReference() {_referenceCount.fetchAndAddOrdered(1);}
[detail] -  bool removeReference() {return _referenceCount.fetchAndAddOrdered(-1)<=1;}
[detail] +  bool removeReference() {return _referenceCount.fetchAndSubOrdered(1)<=1;}
[detail]    int referenceCount() const {return _referenceCount.fetchAndAddOrdered(0);}
[detail]  
[detail]    static inline void removeReference(SharedObject * object);
[detail]                   src/SortedStringList.h:  version-2.5.0	not modified
[detail]                       src/SortedVector.h:  version-2.5.0	modified out of comments
[detail] --- src/SortedVector.h-version-2.5.0-stripped	2025-09-28 04:00:48.895425157 +0200
[detail] +++ src/SortedVector.h-HEAD-stripped	2025-09-28 04:00:48.899425177 +0200
[detail] @@ -17,7 +17,7 @@
[detail]    SortedVector() {_n2=1;}
[detail]  
[detail]    bool isEmpty() const {return VectorList<T *>::isEmpty();}
[detail] -  int count() const {return VectorList<T *>::count();}
[detail] +  int size() const {return VectorList<T *>::size();}
[detail]    T * at(int index) const {return VectorList<T *>::at(index);}
[detail]  
[detail]    void insert(T * o);
[detail] @@ -33,7 +33,7 @@
[detail]    int firstIndexAfter(const Key& k) const;
[detail]    const VectorList<T *>& vector() const {return *this;}
[detail]  private:
[detail] -  void updateN2() {while(_n2<count()) _n2=_n2 << 1;}
[detail] +  void updateN2() {while(_n2<size()) _n2=_n2 << 1;}
[detail]    static bool lessThan(const T * o1, const T * o2) {return o1->key()<o2->key();}
[detail]  
[detail]    int _n2;
[detail] @@ -48,7 +48,7 @@
[detail]  int SortedVector<Key, T>::firstIndexOf(const Key& k) const
[detail]  {
[detail]    
[detail] -  int n=count();
[detail] +  int n=size();
[detail]    int i=_n2-1;
[detail]    int step2=_n2 >> 1;
[detail]    while(step2>0) {
[detail] @@ -85,7 +85,7 @@
[detail]  template<class Key, class T>
[detail]  int SortedVector<Key, T>::firstIndexAfter(const Key& k) const
[detail]  {
[detail] -  int n=count();
[detail] +  int n=size();
[detail]    int i=_n2-1;
[detail]    int step2=_n2 >> 1;
[detail]    while(step2>0) {
[detail] @@ -127,7 +127,7 @@
[detail]  {
[detail]    VectorList<T *>::remove(index);
[detail]    int n2=_n2 >> 1;
[detail] -  if(n2>0 && n2>=count()) {
[detail] +  if(n2>0 && n2>=size()) {
[detail]      _n2=n2;
[detail]    }
[detail]  }
[detail]                     src/StandardStream.h:  version-2.5.0	not modified
[detail]                  src/StreamRedirection.h:  version-2.5.0	not modified
[detail]                         src/StringDiff.h:  version-2.5.0	not modified
[detail]                    src/StringFootprint.h:  version-2.5.0	no last version available
[detail]                      src/StringSection.h:  version-2.5.0	modified out of comments
[detail] --- src/StringSection.h-version-2.5.0-stripped	2025-09-28 04:00:48.971425524 +0200
[detail] +++ src/StringSection.h-HEAD-stripped	2025-09-28 04:00:48.975425544 +0200
[detail] @@ -32,6 +32,7 @@
[detail]    bool operator>(const QChar * o) const {return compare(o)>0;}
[detail]    bool operator>=(const QChar * o) const {return compare(o)>=0;}
[detail]    inline int compare(const QChar * o) const;
[detail] +  inline int compare(const QChar * o, Qt::CaseSensitivity cs) const;
[detail]  
[detail]    inline bool operator==(const StringSection& o) const;
[detail]    inline bool operator!=(const StringSection& o) const;
[detail] @@ -40,6 +41,7 @@
[detail]    bool operator>(const StringSection& o) const {return compare(o)>0;}
[detail]    bool operator>=(const StringSection& o) const {return compare(o)>=0;}
[detail]    int compare(const StringSection &o) const;
[detail] +  int compare(const StringSection &o, Qt::CaseSensitivity cs) const;
[detail]  
[detail]    inline bool operator==(const QString& o) const;
[detail]    inline bool operator!=(const QString& o) const;
[detail] @@ -48,6 +50,7 @@
[detail]    bool operator>(const QString& o) const {return compare(o)>0;}
[detail]    bool operator>=(const QString& o) const {return compare(o)>=0;}
[detail]    inline int compare(const QString& o) const;
[detail] +  inline int compare(const QString& o, Qt::CaseSensitivity cs) const;
[detail]  
[detail]    QChar operator[] (int i) const {return _str[i];}
[detail]    void operator++() {_str++; if(_size>0) _size--;}
[detail] @@ -74,7 +77,8 @@
[detail]    uint toUInt(bool& ok, int base=10) const;
[detail]    qlonglong toLongLong(bool& ok, int base=10) const;
[detail]    double toDouble(bool& ok) const;
[detail] -  Complex toComplex(bool& ok) const;
[detail] +  long double toLongDouble(bool& ok) const;
[detail] +  Complex toComplex(bool& ok, bool compatibility=false) const;
[detail]    DateTime toTime(const QString& format, bool& ok) const;
[detail]  
[detail]  #if(QT_VERSION>=QT_VERSION_CHECK(5, 15, 2))
[detail] @@ -108,9 +112,13 @@
[detail]    bool contains(const StringSection target) const {return find(target, false)>-1;}
[detail]    bool contains(QChar target) const {return find(StringSection(&target, 1), false)>-1;}
[detail]    inline bool beginWith(const QString& o) const;
[detail] -  inline bool endWith(const QString& o) const;
[detail] +  inline bool beginWith(const QString& o, Qt::CaseSensitivity cs) const;
[detail]    bool beginWith(const StringSection& o) const;
[detail] +  bool beginWith(const StringSection& o, Qt::CaseSensitivity cs) const;
[detail] +  inline bool endWith(const QString& o) const;
[detail] +  inline bool endWith(const QString& o, Qt::CaseSensitivity cs) const;
[detail]    bool endWith(const StringSection& o) const;
[detail] +  bool endWith(const StringSection& o, Qt::CaseSensitivity cs) const;
[detail]  
[detail]    StringSection readLine(const QChar *& ptr) const;
[detail]    bool nextLine(const QChar *& ptr, const QString& sep=defaultSeparators) const;
[detail] @@ -121,6 +129,7 @@
[detail]  
[detail]    static int size(const QChar * str);
[detail]    static int compare(const QChar * str1, const QChar * str2, int n);
[detail] +  static int compare(const QChar * str1, const QChar * str2, int n, Qt::CaseSensitivity cs);
[detail]    static const QString defaultSeparators;
[detail]    static const StringSection null;
[detail]  private:
[detail] @@ -189,12 +198,24 @@
[detail]    return compare(os);
[detail]  }
[detail]  
[detail] +inline int StringSection::compare(const QChar * o, Qt::CaseSensitivity cs) const
[detail] +{
[detail] +  StringSection os(o);
[detail] +  return compare(os, cs);
[detail] +}
[detail] +
[detail]  inline int StringSection::compare(const QString& o) const
[detail]  {
[detail]    StringSection os(o);
[detail]    return compare(os);
[detail]  }
[detail]  
[detail] +inline int StringSection::compare(const QString& o, Qt::CaseSensitivity cs) const
[detail] +{
[detail] +  StringSection os(o);
[detail] +  return compare(os, cs);
[detail] +}
[detail] +
[detail]  inline bool StringSection::operator==(const QChar * o) const
[detail]  {
[detail]    if(_size!=size(o)) return false;
[detail] @@ -237,10 +258,10 @@
[detail]    return compare(o._str, _str, o.size())==0;
[detail]  }
[detail]  
[detail] -inline bool StringSection::endWith(const StringSection& o) const
[detail] +inline bool StringSection::beginWith(const StringSection& o, Qt::CaseSensitivity cs) const
[detail]  {
[detail]    if(_size < o._size) return false;
[detail] -  return compare(o._str, _str+_size-o._size, o._size)==0;
[detail] +  return compare(o._str, _str, o.size(), cs)==0;
[detail]  }
[detail]  
[detail]  inline bool StringSection::beginWith(const QString& o) const
[detail] @@ -249,12 +270,36 @@
[detail]    return compare(o.data(), _str, o.size())==0;
[detail]  }
[detail]  
[detail] +inline bool StringSection::beginWith(const QString& o, Qt::CaseSensitivity cs) const
[detail] +{
[detail] +  if(_size<o.size()) return false;
[detail] +  return compare(o.data(), _str, o.size(), cs)==0;
[detail] +}
[detail] +
[detail] +inline bool StringSection::endWith(const StringSection& o) const
[detail] +{
[detail] +  if(_size<o._size) return false;
[detail] +  return compare(o._str, _str+_size-o._size, o._size)==0;
[detail] +}
[detail] +
[detail] +inline bool StringSection::endWith(const StringSection& o, Qt::CaseSensitivity cs) const
[detail] +{
[detail] +  if(_size<o._size) return false;
[detail] +  return compare(o._str, _str+_size-o._size, o._size, cs)==0;
[detail] +}
[detail] +
[detail]  inline bool StringSection::endWith(const QString& o) const
[detail]  {
[detail]    if(_size < o.size()) return false;
[detail]    return compare(o.data(), _str+_size-o.size(), o.size())==0;
[detail]  }
[detail]  
[detail] +inline bool StringSection::endWith(const QString& o, Qt::CaseSensitivity cs) const
[detail] +{
[detail] +  if(_size<o.size()) return false;
[detail] +  return compare(o.data(), _str+_size-o.size(), o.size(), cs)==0;
[detail] +}
[detail] +
[detail]  inline StringSection StringSection::left(int n) const
[detail]  {
[detail]    if(n>_size) n=_size;
[detail]                       src/StringStream.h:  version-2.5.0	not modified
[detail]                                src/Tar.h:  version-2.5.0	not modified
[detail]                             src/Thread.h:  version-2.5.0	not modified
[detail]                        src/ThreadTimer.h:  version-2.5.0	not modified
[detail]                              src/Trace.h:  version-2.5.0	not modified
[detail]                           src/TraceBug.h:  version-2.5.0	not modified
[detail]                          src/TraceInfo.h:  version-2.5.0	not modified
[detail]                           src/TraceLog.h:  version-2.5.0	not modified
[detail]                         src/TraceStamp.h:  version-2.5.0	not modified
[detail]                       src/Translations.h:  version-2.5.0	not modified
[detail]                      src/TreeContainer.h:  version-2.5.0	not modified
[detail]                           src/TreeItem.h:  version-2.5.0	not modified
[detail]                           src/UniqueID.h:  version-2.5.0	modified out of comments
[detail] --- src/UniqueID.h-version-2.5.0-stripped	2025-09-28 04:00:49.183426549 +0200
[detail] +++ src/UniqueID.h-HEAD-stripped	2025-09-28 04:00:49.187426569 +0200
[detail] @@ -4,22 +4,89 @@
[detail]  #define UNIQUEID_H
[detail]  
[detail]  #include "QGpCoreToolsDLLExport.h"
[detail] +#include "StringSection.h"
[detail]  
[detail]  namespace QGpCoreTools {
[detail]  
[detail] +  class UniqueIDGenerator;
[detail] +
[detail]    class QGPCORETOOLS_EXPORT UniqueID
[detail]    {
[detail]    public:
[detail] -    UniqueID();
[detail] -    virtual ~UniqueID();
[detail] +    UniqueID() {_id=-1;}
[detail] +
[detail] +    bool operator==(const UniqueID& o) const {return _id==o._id;}
[detail] +    bool operator!=(const UniqueID& o) const {return _id!=o._id;}
[detail] +    bool operator<(const UniqueID& o) const {return _id<o._id;}
[detail] +    bool operator>(const UniqueID& o) const {return _id>o._id;}
[detail] +    qint64 stepTo(const UniqueID& o) const {return o._id-_id;}
[detail] +    bool isNotAfter(const UniqueID& o, int step) const {return _id!=o._id+step;}
[detail] +    bool isValid() const {return _id>=0;}
[detail] +
[detail] +    inline bool fromString(const StringSection& s, UniqueIDGenerator * generator);
[detail] +    inline bool fromString(const StringSection& s);
[detail] +    inline bool fromStream32(QDataStream& s);
[detail] +    inline QString toString() const;
[detail] +
[detail] +    static void addRange(const UniqueID& begin, const UniqueID& end, int step, QList<UniqueID>& list);
[detail] +
[detail] +    size_t hash() const {return ::qHash(_id);}
[detail] +  private:
[detail] +    friend class UniqueIDGenerator;
[detail] +    void reset() {_id=-1;}
[detail] +    const UniqueID& operator++() {_id++; return *this;}
[detail] +
[detail] +    qint64 _id;
[detail] +  };
[detail] +
[detail] +  inline size_t qHash(const UniqueID& id)
[detail] +  {
[detail] +    return id.hash();
[detail] +  }
[detail] +
[detail] +  class QGPCORETOOLS_EXPORT UniqueIDGenerator
[detail] +  {
[detail] +  public:
[detail] +    UniqueIDGenerator() {reset();}
[detail]  
[detail] -    int uniqueId(int requestedId);
[detail] -  protected:
[detail] -    virtual int countId(int id, int& newId) const=0;
[detail] +    void reset() {_lastId.reset();}
[detail] +    const UniqueID& generate() {return ++_lastId;}
[detail]    private:
[detail] -    int _newId;
[detail] +    friend class UniqueID;
[detail] +
[detail] +    UniqueID _lastId;
[detail]    };
[detail]  
[detail] +  inline bool UniqueID::fromString(const StringSection& s, UniqueIDGenerator * generator)
[detail] +  {
[detail] +    bool ok=true;
[detail] +    _id=s.toLongLong(ok);
[detail] +    if(_id>generator->_lastId._id) {
[detail] +      generator->_lastId._id=_id;
[detail] +    }
[detail] +    return ok && _id>=0;
[detail] +  }
[detail] +
[detail] +  inline bool UniqueID::fromString(const StringSection& s)
[detail] +  {
[detail] +    bool ok=true;
[detail] +    _id=s.toLongLong(ok);
[detail] +    return ok && _id>=0;
[detail] +  }
[detail] +
[detail] +  inline bool UniqueID::fromStream32(QDataStream& s)
[detail] +  {
[detail] +    qint32 id;
[detail] +    s >> id;
[detail] +    _id=id;
[detail] +    return _id>=0;
[detail] +  }
[detail] +
[detail] +  inline QString UniqueID::toString() const
[detail] +  {
[detail] +    return QString::number(_id);
[detail] +  }
[detail] +
[detail]  } 
[detail]  
[detail]  #endif 
[detail]                            src/Version.h:  version-2.5.0	not modified
[detail]                 src/XMLByteArrayStream.h:  version-2.5.0	not modified
[detail]                           src/XMLClass.h:  version-2.5.0	modified out of comments
[detail] --- src/XMLClass.h-version-2.5.0-stripped	2025-09-28 04:00:49.239426820 +0200
[detail] +++ src/XMLClass.h-HEAD-stripped	2025-09-28 04:00:49.243426838 +0200
[detail] @@ -60,6 +60,7 @@
[detail]  #define XML_SETBINARYDATA_ARGS QDataStream& s, XMLContext * context
[detail]  #define XML_ATTRIBUTES_ARGS XMLSaveAttributes& attributes, XMLContext * context
[detail]  #define XML_SETATTRIBUTES_ARGS const XMLRestoreAttributes& attributes, XMLContext * context
[detail] +#define XML_SETATTRIBUTE_ARGS const XMLRestoreAttributeIterator& it, XMLContext * context
[detail]  
[detail]  typedef QHash<StringSection, StringSection> XMLRestoreAttributes;
[detail]  typedef QHash<StringSection, StringSection>::const_iterator XMLRestoreAttributeIterator;
[detail] @@ -106,8 +107,10 @@
[detail]    void xml_save(XMLStream& s, XMLContext * context, const XMLSaveAttributes& attributes=nullSaveAttributes) const;
[detail]    XMLClass::Error restore(const QChar *& ptr, int& line, XMLStream * s, XMLContext * context);
[detail]  
[detail] +    static XMLRestoreAttributes attributes(const QString& tagAtt, QString& tag, XMLClass::Error& exitCode);
[detail]    inline virtual void xml_attributes(XML_ATTRIBUTES_ARGS) const;
[detail]    inline virtual bool xml_setAttributes(XML_SETATTRIBUTES_ARGS);
[detail] +    inline virtual bool xml_setAttribute(XML_SETATTRIBUTE_ARGS);
[detail]    inline virtual XMLMember xml_member(XML_MEMBER_ARGS);
[detail]    inline virtual void xml_polishChild(XML_POLISHCHILD_ARGS);
[detail]  
[detail] @@ -253,7 +256,17 @@
[detail]  
[detail]  inline bool XMLClass::xml_setAttributes(XML_SETATTRIBUTES_ARGS)
[detail]  {
[detail] -  Q_UNUSED(attributes)
[detail] +    for(XMLRestoreAttributeIterator it=attributes.begin(); it!= attributes.end(); it++ ) {
[detail] +      if(!xml_setAttribute(it, context)) {
[detail] +        return false;
[detail] +      }
[detail] +    }
[detail] +    return true;
[detail] +  }
[detail] +
[detail] +  inline bool XMLClass::xml_setAttribute(XML_SETATTRIBUTE_ARGS)
[detail] +  {
[detail] +    Q_UNUSED(it)
[detail]    Q_UNUSED(context)
[detail]    return true;
[detail]  }
[detail]                    src/XMLClassFactory.h:  version-2.5.0	not modified
[detail]                         src/XMLContext.h:  version-2.5.0	modified out of comments
[detail] --- src/XMLContext.h-version-2.5.0-stripped	2025-09-28 04:00:49.279427013 +0200
[detail] +++ src/XMLContext.h-HEAD-stripped	2025-09-28 04:00:49.283427031 +0200
[detail] @@ -10,12 +10,10 @@
[detail]  class QGPCORETOOLS_EXPORT XMLContext
[detail]  {
[detail]  public:
[detail] -  XMLContext(bool deletable) {_deletable=deletable;}
[detail] -  ~XMLContext() {}
[detail] +  XMLContext() {}
[detail] +  virtual ~XMLContext() {}
[detail]  
[detail] -  bool isDeletable() const {return _deletable;}
[detail] -private:
[detail] -  bool _deletable;
[detail] +  virtual bool isDeletable() const {return false;}
[detail]  };
[detail]  
[detail]  } 
[detail]                     src/XMLErrorReport.h:  version-2.5.0	not modified
[detail]                     src/XMLGenericItem.h:  version-2.5.0	not modified
[detail]                          src/XMLHeader.h:  version-2.5.0	not modified
[detail]                             src/XMLMap.h:  version-2.5.0	not modified
[detail]                          src/XMLMember.h:  version-2.5.0	not modified
[detail]                          src/XMLParser.h:  version-2.5.0	modified out of comments
[detail] --- src/XMLParser.h-version-2.5.0-stripped	2025-09-28 04:00:49.379427495 +0200
[detail] +++ src/XMLParser.h-HEAD-stripped	2025-09-28 04:00:49.383427515 +0200
[detail] @@ -18,6 +18,8 @@
[detail]    void setLine(int l) {_line=l;}
[detail]    void setPointer(const QChar * ptr) {_ptr=ptr;}
[detail]    XMLClass::Error parse(XMLClass * object);
[detail] +
[detail] +  static XMLRestoreAttributes attributes(const QString& tagAtt, QString& tag, XMLClass::Error& exitCode);
[detail]  private:
[detail]    void openContext();
[detail]    void closeContext();
[detail] @@ -31,8 +33,8 @@
[detail]    void skipCData();
[detail]    void skip();
[detail]    void restoreSpecChar();
[detail] -  void setTag();
[detail] -  void setAttributes();
[detail] +  void setTag(bool oneTag);
[detail] +  void setAttributes(bool oneTag);
[detail]    void finish(XMLClass::Error err);
[detail]    static QChar specialCharacter(const StringSection& code, bool& ok);
[detail]  
[detail] @@ -70,7 +72,7 @@
[detail]    Object _current;
[detail]    StringSection _tag;
[detail]    XMLMember _member;
[detail] -  StringSection _content;
[detail] +  StringSection _contents;
[detail]    XMLRestoreAttributes _attributes;
[detail]  
[detail]    XMLStream * _stream;
[detail]                  src/XMLSaveAttributes.h:  version-2.5.0	modified out of comments
[detail] --- src/XMLSaveAttributes.h-version-2.5.0-stripped	2025-09-28 04:00:49.399427593 +0200
[detail] +++ src/XMLSaveAttributes.h-HEAD-stripped	2025-09-28 04:00:49.403427612 +0200
[detail] @@ -35,7 +35,7 @@
[detail]    const QString& value(int index) const {return (*this)[index].value();}
[detail]    QString& key(int index) {return (*this)[index].key();}
[detail]    QString& value(int index) {return (*this)[index].value();}
[detail] -  QString value(const QString& key);
[detail] +  QString value(const QString& key) const;
[detail]  
[detail]    QString toString() const;
[detail]    inline QString toEncodedString() const;
[detail]                          src/XMLStream.h:  version-2.5.0	not modified
[detail]                    src/XMLStringStream.h:  version-2.5.0	not modified
[detail]                       src/XMLTarStream.h:  version-2.5.0	not modified
[summary] Total differences: 3825 lines
[summary] Modification level is B
OLD_DIR=$(pwd)
echo "QGpCoreTools"
cd $(find . -name "QGpCoreTools" | tail -n 1) || exit 2
pwd
dpversion B  || exit 2
cd $OLD_DIR || exit 2
################## QGpGuiTools
[detail]                      src/Application.cpp:  version-2.5.0	modified out of comments
[detail] --- src/Application.cpp-version-2.5.0-stripped	2025-09-28 04:00:49.499428076 +0200
[detail] +++ src/Application.cpp-HEAD-stripped	2025-09-28 04:00:49.499428076 +0200
[detail] @@ -22,9 +22,12 @@
[detail]  #endif
[detail]  {
[detail]    
[detail] -  setApplicationName(CoreApplicationPrivate::constructorApplicationName());
[detail] +  QString appName=CoreApplicationPrivate::constructorApplicationName();
[detail] +  setApplicationName(appName);
[detail]    setOrganizationDomain("geopsy.org");
[detail]    setOrganizationName("geopsy");
[detail] +  setApplicationDisplayName(appName);
[detail] +  setDesktopFileName("org.geopsy."+appName);
[detail]    
[detail]    setMessageHandler(new GuiMessage);
[detail]    setQuitOnLastWindowClosed(true);
[detail] @@ -32,7 +35,6 @@
[detail]    initInstallDirs();
[detail]    
[detail]    initTranslations();
[detail] -  setBatch(false);    
[detail]  
[detail]    
[detail]    int i, j=1;
[detail] @@ -47,10 +49,8 @@
[detail]      } else if(help && (arg=="--help" || arg=="-help" || arg=="-h")) {
[detail]        showHelp(i, argc, argv, help);
[detail]        ::exit(0);
[detail] -    } else if(arg=="-batch") {
[detail] -      setBatch(true);
[detail]      } else if(arg=="-args") {
[detail] -      int max=50;
[detail] +      int max=10;
[detail]        if(checkOptionArg(i, argc, argv, false)) {
[detail]          max=CoreApplication::toInt(i, i-1, argv);
[detail]        }
[detail]                      src/Attachments.cpp:  version-2.5.0	not modified
[detail]                        src/BugReport.cpp:  version-2.5.0	not modified
[detail]                             src/Cast.cpp:  version-2.5.0	not modified
[detail]                    src/CheckComboBox.cpp:  version-2.5.0	not modified
[detail]               src/CheckComboBoxModel.cpp:  version-2.5.0	not modified
[detail]                      src/ColorButton.cpp:  version-2.5.0	not modified
[detail]                   src/ColorHistogram.cpp:  version-2.5.0	not modified
[detail]      src/ColumnTextColumnsProperties.cpp:  version-2.5.0	not modified
[detail]               src/ColumnTextDelegate.cpp:  version-2.5.0	not modified
[detail]                   src/ColumnTextItem.cpp:  version-2.5.0	not modified
[detail]        src/ColumnTextLinesProperties.cpp:  version-2.5.0	not modified
[detail]     src/ColumnTextSectionsProperties.cpp:  version-2.5.0	not modified
[detail]                 src/ColumnTextWidget.cpp:  version-2.5.0	not modified
[detail]                           src/Dialog.cpp:  version-2.5.0	modified out of comments
[detail] --- src/Dialog.cpp-version-2.5.0-stripped	2025-09-28 04:00:49.723429158 +0200
[detail] +++ src/Dialog.cpp-HEAD-stripped	2025-09-28 04:00:49.727429178 +0200
[detail] @@ -47,7 +47,9 @@
[detail]        _vboxLayout=new QVBoxLayout(this);
[detail]        _vboxLayout->setObjectName(QString::fromUtf8("vboxLayout"));
[detail]      }
[detail] +    if(w->layout()) {
[detail]      w->layout()->setContentsMargins(0, 0, 0, 0);
[detail] +    }
[detail]      _vboxLayout->addWidget(w);
[detail]  
[detail]      if(windowTitle().isEmpty()) setWindowTitle(w->windowTitle());
[detail]                       src/DockWidget.cpp:  version-2.5.0	not modified
[detail]                    src/DoubleSpinBox.cpp:  version-2.5.0	modified out of comments
[detail] --- src/DoubleSpinBox.cpp-version-2.5.0-stripped	2025-09-28 04:00:49.759429332 +0200
[detail] +++ src/DoubleSpinBox.cpp-HEAD-stripped	2025-09-28 04:00:49.763429351 +0200
[detail] @@ -35,7 +35,7 @@
[detail]  
[detail]  bool DoubleSpinBox::touched() const
[detail]  {
[detail] -  return fabs((QDoubleSpinBox::value()-_originalValue)*pow(10.0, decimals()))>=1.0;
[detail] +  return fabs((QDoubleSpinBox::value()-_originalValue)*Number::exp10(decimals()))>=1.0;
[detail]  }
[detail]  
[detail]  
[detail] @@ -56,7 +56,7 @@
[detail]      if(event->angleDelta().x()>0) {  
[detail]        setSingleStep(singleStep()*10.0);
[detail]      } else {
[detail] -      if(singleStep()>=pow(0.1,decimals()-1)) {
[detail] +      if(singleStep()>=Number::exp10(1-decimals())) {
[detail]          setSingleStep(singleStep()*0.1);
[detail]        }
[detail]      }
[detail] @@ -65,7 +65,7 @@
[detail]    } else if(event->modifiers() & Qt::ShiftModifier) {
[detail]      if(event->angleDelta().y()>0) {
[detail]        int n=decimals();
[detail] -      double f=pow(10.0, n);
[detail] +      double f=Number::exp10(n);
[detail]        double d=QDoubleSpinBox::value()-round(_originalValue*f)/f;
[detail]        setDecimals(n+1);
[detail]        QDoubleSpinBox::setValue(_originalValue+d);
[detail]                   src/ExpandTabTitle.cpp:  version-2.5.0	not modified
[detail]                  src/ExpandTabWidget.cpp:  version-2.5.0	not modified
[detail]                 src/ExpressionEditor.cpp:  version-2.5.0	not modified
[detail]                src/FindReplaceWidget.cpp:  version-2.5.0	not modified
[detail]                     src/FrozenWidget.cpp:  version-2.5.0	not modified
[detail]                        src/GuiGlobal.cpp:  version-2.5.0	not modified
[detail]                       src/GuiMessage.cpp:  version-2.5.0	not modified
[detail]                       src/HttpAccess.cpp:  version-2.5.0	modified out of comments
[detail] --- src/HttpAccess.cpp-version-2.5.0-stripped	2025-09-28 04:00:49.883429932 +0200
[detail] +++ src/HttpAccess.cpp-HEAD-stripped	2025-09-28 04:00:49.887429950 +0200
[detail] @@ -9,52 +9,85 @@
[detail]  namespace QGpGuiTools {
[detail]  
[detail]    
[detail] -  static const char * geopsyCertificate20220830=
[detail] +
[detail] +     
[detail] +     
[detail] +     static const char * certificateUSERTrustRSA=
[detail] +      "-----BEGIN CERTIFICATE-----\n"
[detail] +      "MIIF3jCCA8agAwIBAgIQAf1tMPyjylGoG7xkDjUDLTANBgkqhkiG9w0BAQwFADCB\n"
[detail] +      "iDELMAkGA1UEBhMCVVMxEzARBgNVBAgTCk5ldyBKZXJzZXkxFDASBgNVBAcTC0pl\n"
[detail] +      "cnNleSBDaXR5MR4wHAYDVQQKExVUaGUgVVNFUlRSVVNUIE5ldHdvcmsxLjAsBgNV\n"
[detail] +      "BAMTJVVTRVJUcnVzdCBSU0EgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkwHhcNMTAw\n"
[detail] +      "MjAxMDAwMDAwWhcNMzgwMTE4MjM1OTU5WjCBiDELMAkGA1UEBhMCVVMxEzARBgNV\n"
[detail] +      "BAgTCk5ldyBKZXJzZXkxFDASBgNVBAcTC0plcnNleSBDaXR5MR4wHAYDVQQKExVU\n"
[detail] +      "aGUgVVNFUlRSVVNUIE5ldHdvcmsxLjAsBgNVBAMTJVVTRVJUcnVzdCBSU0EgQ2Vy\n"
[detail] +      "dGlmaWNhdGlvbiBBdXRob3JpdHkwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIK\n"
[detail] +      "AoICAQCAEmUXNg7D2wiz0KxXDXbtzSfTTK1Qg2HiqiBNCS1kCdzOiZ/MPans9s/B\n"
[detail] +      "3PHTsdZ7NygRK0faOca8Ohm0X6a9fZ2jY0K2dvKpOyuR+OJv0OwWIJAJPuLodMkY\n"
[detail] +      "tJHUYmTbf6MG8YgYapAiPLz+E/CHFHv25B+O1ORRxhFnRghRy4YUVD+8M/5+bJz/\n"
[detail] +      "Fp0YvVGONaanZshyZ9shZrHUm3gDwFA66Mzw3LyeTP6vBZY1H1dat
[detail] +      "VN3I5xI6Ta5MirdcmrS3ID3KfyI0rn47aGYBROcBTkZTmzNg95S+UzeQc0PzMsNT\n"
[detail] +      "79uq/nROacdrjGCT3sTHDN/hMq7MkztReJVni+49Vv4M0GkPGw/zJSZrM233bkf6\n"
[detail] +      "c0Plfg6lZrEpfDKEY1WJxA3Bk1QwGROs0303p+tdOmw1XNtB1xLaqUkL39iAigmT\n"
[detail] +      "Yo61Zs8liM2EuLE/pDkP2QKe6xJMlXzzawWpXhaDzLhn4ugTncxbgtNMs+1b/97l\n"
[detail] +      "c6wjOy0AvzVVdAlJ2ElYGn+SNuZRkg7zJn0cTRe8yexDJtC/QV9AqURE9JnnV4ee\n"
[detail] +      "UB9XVKg+/XRjL7FQZQnmWEIuQxpMtPAlR1n6BB6T1CZGSlCBst6+eLf8ZxXhyVeE\n"
[detail] +      "Hg9j1uliutZfVS7qXMYoCAQlObgOK6nyTJccBz8NUvXt7y+CDwIDAQABo0IwQDAd\n"
[detail] +      "BgNVHQ4EFgQUU3m/WqorSs9UgOHYm8Cd8rIDZsswDgYDVR0PAQH/BAQDAgEGMA8G\n"
[detail] +      "A1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcNAQEMBQADggIBAFzUfA3P9wF9QZllDHPF\n"
[detail] +      "Up/L+M+ZBn8b2kMVn54CVVeWFPFSPCeHlCjtHzoBN6J2/FNQwISbxmtOuowhT6KO\n"
[detail] +      "VWKR82kV2LyI48SqC/3vqOlLVSoGIG1VeCkZ7l8wXEskEVX/JJpuXior7gtNn3/3\n"
[detail] +      "ATiUFJVDBwn7YKnuHKsSjKCaXqeYalltiz8I+8jRRa8YFWSQEg9zKC7F4iRO/Fjs\n"
[detail] +      "8PRF/iKz6y+O0tlFYQXBl2+odnKPi4w2r78NBc5xjeambx9spnFixdjQg3IM8WcR\n"
[detail] +      "iQycE0xyNN+81XHfqnHd4blsjDwSXWXavVcStkNr/+XeTWYRUc+ZruwXtuhxkYze\n"
[detail] +      "Sf7dNXGiFSeUHM9h4ya7b6NnJSFd5t0dCy5oGzuCr+yDZ4XUmFF0sbmZgIn/f3gZ\n"
[detail] +      "XHlKYC6SQK5MNyosycdiyA5d9zZbyuAlJQG03RoHnHcAP9Dc1ew91Pq7P8yF1m9/\n"
[detail] +      "qS3fuQL39ZeatTXaw2ewh0qpKJ4jjv9cJ2vhsE/zB+4ALtRZh8tSQZXq9EfX7mRB\n"
[detail] +      "VXyNWQKV3WKdwrnuWih0hKWbt5DHDAff9Yk2dDLWKMGwsAvgnEzDHNb842m1R0aB\n"
[detail] +      "L6KCq9NjRHDEjf8tM7qtj3u1cIiuPhnPQCjY/MiQu12ZIvVS5ljFH4gxQ+6IHdfG\n"
[detail] +      "jjxDah2nGN59PRbxYvnKkKj9\n"
[detail] +      "-----END CERTIFICATE-----\n";
[detail] +
[detail] +    
[detail] +    static const char * certificateGEANTVereniging=
[detail]        "-----BEGIN CERTIFICATE-----\n"
[detail] -      "MIIIJTCCBg2gAwIBAgIQJ/bQoqNzq+CKmnkqt7xZNjANBgkqhkiG9w0BAQwFADBE\n"
[detail] -      "MQswCQYDVQQGEwJOTDEZMBcGA1UEChMQR0VBTlQgVmVyZW5pZ2luZzEaMBgGA1UE\n"
[detail] -      "AxMRR0VBTlQgT1YgUlNBIENBIDQwHhcNMjIwODMwMDAwMDAwWhcNMjMwODMwMjM1\n"
[detail] -      "OTU5WjB+MQswCQYDVQQGEwJGUjEeMBwGA1UECAwVQXV2ZXJnbmUtUmjDtG5lLUFs\n"
[detail] -      "cGVzMSMwIQYDVQQKDBpVbml2ZXJzaXTDqSBHcmVub2JsZSBBbHBlczEqMCgGA1UE\n"
[detail] -      "AxMhaXN0LWdlb3BzeS51bml2LWdyZW5vYmxlLWFscGVzLmZyMIIBIjANBgkqhkiG\n"
[detail] -      "9w0BAQEFAAOCAQ8AMIIBCgKCAQEArwEd2ivKQv/x/m4b8wVPd0IiVM4Hg1r3odHE\n"
[detail] -      "mZemkcTVTR0Vrwrg6jaMmanlF4V7SAaFhBjH6sRiJE0nurg/yH16X01qX3q0LS94\n"
[detail] -      "bx6KArQV0Wt6PUvqPND+FFpgrvXyKPQIKpO8V00HE6Qe5v22WOG2rup+bmxbSZ12\n"
[detail] -      "HpgbrBN5Z76XCJLqBoQhZxXw00X4YedOmdG5Ge7TREbZOeImGugCxAZr7njUrwLl\n"
[detail] -      "om+K/AaiYfgy5ZJ++ILtGSjsZNLk79KJgjeyiuh/0Pwv8S+eUxoRZdQj8RcgfJo9\n"
[detail] -      "a02kn5J5/TtG1wZSNhmpD8Q6rFGzjG5dj0RVU1A7sbNe3HXvHwIDAQABo4ID1zCC\n"
[detail] -      "A9MwHwYDVR0jBBgwFoAUbx01SRBsMvpZoJ68iugflb5xegwwHQYDVR0OBBYEFJoI\n"
[detail] -      "p2nqD2LJtnjxfrlwZV1zjlEBMA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAA\n"
[detail] -      "MB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjBJBgNVHSAEQjBAMDQGCysG\n"
[detail] -      "AQQBsjEBAgJPMCUwIwYIKwYBBQUHAgEWF2h0dHBzOi8vc2VjdGlnby5jb20vQ1BT\n"
[detail] -      "MAgGBmeBDAECAjA/BgNVHR8EODA2MDSgMqAwhi5odHRwOi8vR0VBTlQuY3JsLnNl\n"
[detail] -      "Y3RpZ28uY29tL0dFQU5UT1ZSU0FDQTQuY3JsMHUGCCsGAQUFBwEBBGkwZzA6Bggr\n"
[detail] -      "BgEFBQcwAoYuaHR0cDovL0dFQU5ULmNydC5zZWN0aWdvLmNvbS9HRUFOVE9WUlNB\n"
[detail] -      "Q0E0LmNydDApBggrBgEFBQcwAYYdaHR0cDovL0dFQU5ULm9jc3Auc2VjdGlnby5j\n"
[detail] -      "b20wggF/BgorBgEEAdZ5AgQCBIIBbwSCAWsBaQB2AK33vvp8/xDIi509nB4+GGq0\n"
[detail] -      "Zyldz7EMJMqFhjTr3IKKAAABgu27JYgAAAQDAEcwRQIhAMsc0qJ6SJNi64PwWbEM\n"
[detail] -      "s/f6wwuhosbWKAMW3UuN/jBmAiBHvNEHQ0XC7xjgFBsRSSrYLmNpIg/WtT+FsWCs\n"
[detail] -      "HyFuLgB2AHoyjFTYty22IOo44FIe6YQWcDIThU070ivBOlejUutSAAABgu27JVIA\n"
[detail] -      "AAQDAEcwRQIgOkmOSIEITfA2uOa+SWX+3bBcvB+LqdzmLK/1oR9ZSMoCIQDZuXqp\n"
[detail] -      "R6i2FPYklktAbWmw9xC7gBgR08VQxYW7e5tZ+AB3AOg+0No+9QY1MudXKLyJa8kD\n"
[detail] -      "08vREWvs62nhd31tBr1uAAABgu27JScAAAQDAEgwRgIhAOCrSknNsRkyfvCw3FSj\n"
[detail] -      "G40LGpy8+jmltcO1TV6QwKWzAiEA3iP4/lMxJaWsdH/6vPZ3i2hSiaqQ+tbwxYJm\n"
[detail] -      "WO3Yt2Ywgc0GA1UdEQSBxTCBwoIhaXN0LWdlb3BzeS51bml2LWdyZW5vYmxlLWFs\n"
[detail] -      "cGVzLmZygg5nZW9wc3kub3N1Zy5mcoIOZ2VvcHN5LnUtZ2EuZnKCFmdlb3BzeS51\n"
[detail] -      "amYtZ3Jlbm9ibGUuZnKCF2ludGVycGFjaWZpYy5nZW9wc3kub3JnghJpc3QtZ2Vv\n"
[detail] -      "cHN5LnUtZ2EuZnKCFW5lcmllcy1qcjQuZ2VvcHN5Lm9yZ4IRc2VzYW1lLmdlb3Bz\n"
[detail] -      "eS5vcmeCDnd3dy5nZW9wc3kub3JnMA0GCSqGSIb3DQEBDAUAA4ICAQBaOJxjzKnB\n"
[detail] -      "46nFgGw1PKcD6uMNvf2427oeTXN3OS+su5xpNI8O7uSFd3AhSa27saWp5aXiJWWY\n"
[detail] -      "MH3KLPaU8nyXX1oVRbTn3CAuR1Zjz5t6jdOe+Bhn8uLgS4ZXRIMhLIrV5LkvwZB5\n"
[detail] -      "BXf02vukdq6E6DPZZClWcaG94mLmN8HglBAyi6HDgoOOMaWB4ZBKtTcveVCpRfh8\n"
[detail] -      "RUx1ezw97IzzGO0+VzctasmVgocgR2sQBt6uupRzkstJDjRcHkh1TQ5xRZr/JFDx\n"
[detail] -      "jaXsIFBC5G51jeIaRPbVhq1zU0dvkYewXCdyxTeaDqk0RtKVRRnyeGFx26QopKEZ\n"
[detail] -      "gJYtGfBn7J9pESihLf8jh6sV5hcpK/vhhbpdjceRiagDU4CLQOC4laIGd3sewDZF\n"
[detail] -      "MroqXSsfZwQv7uHURNj25ViWJH1SNbyAguEU2DLI8ynQ8CagFMoKGvVfwpDqIM2/\n"
[detail] -      "47O62gmOoOR/XLK8iJ0PTyo6oRcmm7mR1Rj6KM0aynJF60iKnVWriwIG2kXC7DkF\n"
[detail] -      "klmyQDf+d+gGkGkzD6WtgXcevpyoMFK0EvMVh28v3NAEq86SEpPrNZf/Y1IbKfeW\n"
[detail] -      "cKlsE+9EcxhvpFgJovhYAPRBLiISO7YqD4FsbBPTACpFciFaiijmU6ndABmila5O\n"
[detail] -      "G/aDpPk4hSH+hxq9WGJECzA1laxdpolCAg==\n"
[detail] +      "MIIG5TCCBM2gAwIBAgIRANpDvROb0li7TdYcrMTz2+AwDQYJKoZIhvcNAQEMBQAw\n"
[detail] +      "gYgxCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpOZXcgSmVyc2V5MRQwEgYDVQQHEwtK\n"
[detail] +      "ZXJzZXkgQ2l0eTEeMBwGA1UEChMVVGhlIFVTRVJUUlVTVCBOZXR3b3JrMS4wLAYD\n"
[detail] +      "VQQDEyVVU0VSVHJ1c3QgUlNBIENlcnRpZmljYXRpb24gQXV0aG9yaXR5MB4XDTIw\n"
[detail] +      "MDIxODAwMDAwMFoXDTMzMDUwMTIzNTk1OVowRDELMAkGA1UEBhMCTkwxGTAXBgNV\n"
[detail] +      "BAoTEEdFQU5UIFZlcmVuaWdpbmcxGjAYBgNVBAMTEUdFQU5UIE9WIFJTQSBDQSA0\n"
[detail] +      "MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEApYhi1aEiPsg9ZKRMAw9Q\n"
[detail] +      "r8Mthsr6R20VSfFeh7TgwtLQi6RSRLOh4or4EMG/1th8lijv7xnBMVZkTysFiPmT\n"
[detail] +      "PiLOfvz+QwO1NwjvgY+Jrs7fSoVA/TQkXzcxu4Tl3WHi+qJmKLJVu/JOuHud6mOp\n"
[detail] +      "LWkIbhODSzOxANJ24IGPx9h4OXDyy6/342eE6UPXCtJ8AzeumTG6Dfv5KVx24lCF\n"
[detail] +      "TGUzHUB+j+g0lSKg/Sf1OzgCajJV9enmZ/84ydh48wPp6vbWf1H0O3Rd3LhpMSVn\n"
[detail] +      "TqFTLKZSbQeLcx/l9DOKZfBCC9ghWxsgTqW9gQ7v3T3aIfSaVC9rnwVxO0VjmDdP\n"
[detail] +      "FNbdoxnh0zYwf45nV1QQgpRwZJ93yWedhp4ch1a6Ajwqs+wv4mZzmBSjovtV0mKw\n"
[detail] +      "d+CQbSToalEUP4QeJq4Udz5WNmNMI4OYP6cgrnlJ50aa0DZPlJqrKQPGL69KQQz1\n"
[detail] +      "2WgxvhCuVU70y6ZWAPopBa1ykbsttpLxADZre5cH573lIuLHdjx7NjpYIXRx2+QJ\n"
[detail] +      "URnX2qx37eZIxYXz8ggM+wXH6RDbU3V2o5DP67hXPHSAbA+p0orjAocpk2osxHKo\n"
[detail] +      "NSE3LCjNx8WVdxnXvuQ28tKdaK69knfm3bB7xpdfsNNTPH9ElcjscWZxpeZ5Iij8\n"
[detail] +      "lyrCG1z0vSWtSBsgSnUyG/sCAwEAAaOCAYswggGHMB8GA1UdIwQYMBaAFFN5v1qq\n"
[detail] +      "K0rPVIDh2JvAnfKyA2bLMB0GA1UdDgQWBBRvHTVJEGwy+lmgnryK6B+VvnF6DDAO\n"
[detail] +      "BgNVHQ8BAf8EBAMCAYYwEgYDVR0TAQH/BAgwBgEB/wIBADAdBgNVHSUEFjAUBggr\n"
[detail] +      "BgEFBQcDAQYIKwYBBQUHAwIwOAYDVR0gBDEwLzAtBgRVHSAAMCUwIwYIKwYBBQUH\n"
[detail] +      "AgEWF2h0dHBzOi8vc2VjdGlnby5jb20vQ1BTMFAGA1UdHwRJMEcwRaBDoEGGP2h0\n"
[detail] +      "dHA6Ly9jcmwudXNlcnRydXN0LmNvbS9VU0VSVHJ1c3RSU0FDZXJ0aWZpY2F0aW9u\n"
[detail] +      "QXV0aG9yaXR5LmNybDB2BggrBgEFBQcBAQRqMGgwPwYIKwYBBQUHMAKGM2h0dHA6\n"
[detail] +      "Ly9jcnQudXNlcnRydXN0LmNvbS9VU0VSVHJ1c3RSU0FBZGRUcnVzdENBLmNydDAl\n"
[detail] +      "BggrBgEFBQcwAYYZaHR0cDovL29jc3AudXNlcnRydXN0LmNvbTANBgkqhkiG9w0B\n"
[detail] +      "AQwFAAOCAgEAUtlC3e0xj/1BMfPhdQhUXeLjb0xp8UE28kzWE5xDzGKbfGgnrT2R\n"
[detail] +      "lw5gLIx+/cNVrad
[detail] +      "hIg6dfIX5N4esLkrQeN8HiyHKH6khm4966IkVVtnxz5CgUPqEYn4eQ+4eeESrWBh\n"
[detail] +      "AqXaiv7HRvpsdwLYekAhnrlGpioZ/CJIT2PTTxf+GHM6cuUnNqdUzfvrQgA8kt1/\n"
[detail] +      "ASXx2od/M+c8nlJqrGz29lrJveJOSEMX0c/ts02WhsfMhkYa6XujUZLmvR1Eq08r\n"
[detail] +      "48/EZ4l+t5L4wt0DV8VaPbsEBF1EOFpz/YS2H6mSwcFaNJbnYqqJHIvm3PLJHkFm\n"
[detail] +      "EoLXRVrQXdCT+3wgBfgU6heCV5CYBz/YkrdWES7tiiT8sVUDqXmVlTsbiRNiyLs2\n"
[detail] +      "bmEWWFUl76jViIJog5fongEqN3jLIGTG/mXrJT1UyymIcobnIGrbwwRVz/mpFQo0\n"
[detail] +      "vBYIi1k2ThVh0Dx88BbF9YiP84dd8Fkn5wbE6FxXYJ287qfRTgmhePecPc73Yrzt\n"
[detail] +      "apdRcsKVGkOpaTIJP/l+lAHRLZxk/dUtyN95G++bOSQqnOCpVPabUGl2E/OEyFrp\n"
[detail] +      "Ipwgu2L/WJclvd6g+ZA/iWkLSMcpnFb+uX6QBqvD6+RNxul1FaB5iHY=\n"
[detail]        "-----END CERTIFICATE-----\n";
[detail]  
[detail]    
[detail] @@ -82,12 +115,6 @@
[detail]  
[detail]    void HttpAccess::configureReply(QNetworkReply * reply)
[detail]    {
[detail] -    
[detail] -    QSslCertificate cert(QByteArray(geopsyCertificate20220830), QSsl::Pem);
[detail] -    QSslError error(QSslError::CertificateExpired, cert);
[detail] -    QList<QSslError> expectedSslErrors;
[detail] -    expectedSslErrors.append(error);
[detail] -    reply->ignoreSslErrors(expectedSslErrors);
[detail]      connect(reply, SIGNAL(sslErrors(const QList<QSslError>&)),
[detail]              this, SLOT(sslErrors(const QList<QSslError>&)));
[detail]      connect(reply, SIGNAL(finished()), this, SLOT(requestFinished()));
[detail] @@ -99,6 +126,15 @@
[detail]      APP_LOG(100, tr("Sending network request...\n  %1\n").arg(url.toString()));
[detail]      QNetworkAccessManager * manager=new QNetworkAccessManager(this);
[detail]      QNetworkRequest req(url);
[detail] +    if(url.scheme()=="https") {
[detail] +      
[detail] +      QSslCertificate caCert1(QByteArray(certificateUSERTrustRSA), QSsl::Pem);
[detail] +      QSslCertificate caCert2(QByteArray(certificateGEANTVereniging), QSsl::Pem);
[detail] +      QSslConfiguration config(req.sslConfiguration());
[detail] +      config.addCaCertificate(caCert1);
[detail] +      config.addCaCertificate(caCert2);
[detail] +      req.setSslConfiguration(config);
[detail] +    }
[detail]      QNetworkReply * reply=manager->get(req);
[detail]      configureReply(reply);
[detail]    }
[detail] @@ -119,20 +155,22 @@
[detail]      APP_LOG(100, tr("Request finished\n"));
[detail]      QNetworkReply * reply=static_cast<QNetworkReply *>(sender());
[detail]      if(reply->error()==QNetworkReply::NoError) {
[detail] +      APP_LOG(100, tr("  no error\n"));
[detail]        _receivedData=reply->readAll();
[detail]        APP_LOG(100, _receivedData);
[detail]        reply->manager()->deleteLater();
[detail]        emit finished(true);
[detail]      } else {
[detail] -      APP_LOG(100, reply->errorString());
[detail] +      App::log(tr("  error %1: %2\n").arg(reply->error()).arg(reply->errorString()));
[detail]        emit finished(false);
[detail]      }
[detail]    }
[detail]  
[detail]    void HttpAccess::sslErrors(const QList<QSslError>& errs)
[detail]    {
[detail] +    App::log(tr("  SSL error\n"));
[detail]      for(QList<QSslError>::const_iterator it=errs.begin(); it!=errs.end(); it++) {
[detail] -      APP_LOG(100, tr("SSL error: %1\n").arg(it->errorString()));
[detail] +      App::log(tr("SSL error %1: %2\n").arg(it->error()).arg(it->errorString()));
[detail]      }
[detail]    }
[detail]  
[detail]                     src/ItemDelegate.cpp:  version-2.5.0	not modified
[detail]                          src/LogView.cpp:  version-2.5.0	not modified
[detail]                        src/LogWidget.cpp:  version-2.5.0	not modified
[detail]               src/LoopProgressWidget.cpp:  version-2.5.0	not modified
[detail]                       src/MessageBox.cpp:  version-2.5.0	not modified
[detail]         src/MultiDocumentEnvironment.cpp:  version-2.5.0	modified out of comments
[detail] --- src/MultiDocumentEnvironment.cpp-version-2.5.0-stripped	2025-09-28 04:00:49.979430396 +0200
[detail] +++ src/MultiDocumentEnvironment.cpp-HEAD-stripped	2025-09-28 04:00:49.987430434 +0200
[detail] @@ -41,6 +41,7 @@
[detail]    _helpAboutQtAction=nullptr;
[detail]  
[detail]    _recentDocumentMenu=nullptr;
[detail] +  _showMissingDocuments=false;
[detail]  }
[detail]  
[detail]  
[detail] @@ -470,18 +471,69 @@
[detail]    }
[detail]    m->clear();
[detail]    QAction * a;
[detail] +  bool hasDeleteDocuments=false;
[detail]    for(QStringList::iterator it=docs.begin(); it!=docs.end(); ++it) {
[detail]      QFileInfo fi(*it);
[detail]      if(fi.exists()) {
[detail]        a=new QAction(fi.completeBaseName(), this);
[detail]        a->setStatusTip(fi.absoluteFilePath());
[detail]        connect(a, SIGNAL(triggered()), this, SLOT(openRecentDocument()));
[detail] +      a->setEnabled(true);
[detail]        m->addAction(a);
[detail]      } else {
[detail] +      if(_showMissingDocuments){
[detail] +        a=new QAction(fi.completeBaseName(), this);
[detail] +        a->setStatusTip(fi.absoluteFilePath());
[detail] +        a->setEnabled(false);
[detail] +        m->addAction(a);
[detail] +      }
[detail] +      hasDeleteDocuments=true;
[detail] +    }
[detail] +  }
[detail] +  if(hasDeleteDocuments) {
[detail] +    m->addSeparator();
[detail] +    if(_showMissingDocuments) {
[detail] +      a=new QAction(tr("Hide deleted documents"), this);
[detail] +      connect(a, SIGNAL(triggered()), this, SLOT(hideDeletedDocuments()));
[detail] +      m->addAction(a);
[detail] +      a=new QAction(tr("Remove deleted documents"), this);
[detail] +      connect(a, SIGNAL(triggered()), this, SLOT(removeDeletedDocuments()));
[detail] +      m->addAction(a);
[detail] +    } else {
[detail] +      a=new QAction(tr("Show deleted documents"), this);
[detail] +      connect(a, SIGNAL(triggered()), this, SLOT(showDeletedDocuments()));
[detail] +      m->addAction(a);
[detail] +    }
[detail] +  }
[detail] +}
[detail] +
[detail] +void MultiDocumentEnvironment::hideDeletedDocuments()
[detail] +{
[detail] +  TRACE;
[detail] +  _showMissingDocuments=false;
[detail] +}
[detail] +
[detail] +void MultiDocumentEnvironment::showDeletedDocuments()
[detail] +{
[detail] +  TRACE;
[detail] +  _showMissingDocuments=true;
[detail] +}
[detail] +
[detail] +void MultiDocumentEnvironment::removeDeletedDocuments()
[detail] +{
[detail] +  TRACE;
[detail] +  if(Message::question(MSG_ID, tr("Removing all deleted documents from history"),
[detail] +                       tr("Do you want to permanently remove all deleted documents from history?"),
[detail] +                       Message::no(), Message::yes())==Message::Answer1) {
[detail] +    QStringList docs=Settings::getHistory("RecentDocuments");
[detail] +    for(QStringList::iterator it=docs.begin(); it!=docs.end(); ++it) {
[detail] +      QFileInfo fi(*it);
[detail] +      if(!fi.exists()) {
[detail]        Settings::removeHistory("RecentDocuments", *it);
[detail]      }
[detail]    }
[detail]  }
[detail] +}
[detail]  
[detail]  void MultiDocumentEnvironment::openRecentDocument()
[detail]  {
[detail]           src/MultiDocumentSubWindow.cpp:  version-2.5.0	not modified
[detail]                 src/MultiDocumentTab.cpp:  version-2.5.0	not modified
[detail]              src/MultiDocumentTabBar.cpp:  version-2.5.0	not modified
[detail]           src/MultiDocumentTabWidget.cpp:  version-2.5.0	not modified
[detail]              src/MultiDocumentWindow.cpp:  version-2.5.0	not modified
[detail]                src/PluginApplication.cpp:  version-2.5.0	not modified
[detail]               src/PrintDialogWrapper.cpp:  version-2.5.0	not modified
[detail]                      src/ProgressBar.cpp:  version-2.5.0	not modified
[detail]                     src/PropertyArea.cpp:  version-2.5.0	not modified
[detail]                 src/PropertyCategory.cpp:  version-2.5.0	not modified
[detail]         src/PropertyCategorySettings.cpp:  version-2.5.0	not modified
[detail]                  src/PropertyContext.cpp:  version-2.5.0	not modified
[detail]                   src/PropertyEditor.cpp:  version-2.5.0	modified out of comments
[detail] --- src/PropertyEditor.cpp-version-2.5.0-stripped	2025-09-28 04:00:50.191431420 +0200
[detail] +++ src/PropertyEditor.cpp-HEAD-stripped	2025-09-28 04:00:50.195431439 +0200
[detail] @@ -21,7 +21,6 @@
[detail]    ASSERT(!_instance);
[detail]    resize(400, 600);
[detail]    _instance=this;
[detail] -  Application::addGlobalObject(this);
[detail]    _proxy=nullptr;
[detail]    setWhatsThis(tr("<p>When you select more than one object at a time, "
[detail]                    "there may be some properties marked in red, meaning that properties differ between "
[detail]                     src/PropertyItem.cpp:  version-2.5.0	not modified
[detail]                    src/PropertyProxy.cpp:  version-2.5.0	modified out of comments
[detail] --- src/PropertyProxy.cpp-version-2.5.0-stripped	2025-09-28 04:00:50.223431575 +0200
[detail] +++ src/PropertyProxy.cpp-HEAD-stripped	2025-09-28 04:00:50.227431593 +0200
[detail] @@ -93,7 +93,7 @@
[detail]    {
[detail]      PropertyEditor * editor=PropertyEditor::instance();
[detail]      if(!editor) {
[detail] -      editor=new PropertyEditor;
[detail] +      editor=new PropertyEditor(QApplication::activeWindow());
[detail]        editor->setObjectName("propertyEditor");
[detail]      }
[detail]      editor->setUpdatesEnabled(false);
[detail]                      src/PropertyTab.cpp:  version-2.5.0	not modified
[detail]              src/PropertyTabSettings.cpp:  version-2.5.0	not modified
[detail]                    src/PropertyValue.cpp:  version-2.5.0	not modified
[detail]                   src/PropertyWidget.cpp:  version-2.5.0	not modified
[detail]                      src/QGpGuiTools.cpp:  version-2.5.0	not modified
[detail]                src/RegExpRowSelector.cpp:  version-2.5.0	not modified
[detail]                         src/SendMail.cpp:  version-2.5.0	not modified
[detail]                         src/Settings.cpp:  version-2.5.0	modified out of comments
[detail] --- src/Settings.cpp-version-2.5.0-stripped	2025-09-28 04:00:50.355432212 +0200
[detail] +++ src/Settings.cpp-HEAD-stripped	2025-09-28 04:00:50.359432232 +0200
[detail] @@ -5,7 +5,7 @@
[detail]  #include "Dialog.h"
[detail]  #include "TableView.h"
[detail]  
[detail] -#if(QT_VERSION > QT_VERSION_CHECK(5, 0, 0))
[detail] +#ifdef QT_PRINTSUPPORT_LIB
[detail]  #include <QtPrintSupport>
[detail]  #endif
[detail]  
[detail] @@ -34,6 +34,12 @@
[detail]        if(!ok) allOk=false;
[detail]        if(allOk) {
[detail]          QScreen * screen=QGuiApplication::screenAt(QPoint(x, y));
[detail] +        if(!screen) {
[detail] +          QList<QScreen *> screens=QGuiApplication::screens();
[detail] +          if(!screens.isEmpty()) {
[detail] +            screen=screens.first();
[detail] +          }
[detail] +        }
[detail]          if(screen) {
[detail]            QRect r=screen->geometry();
[detail]    #if defined(Q_OS_WIN)
[detail] @@ -647,6 +653,7 @@
[detail]    bool Settings::printSetup(QPrinter * p)
[detail]    {
[detail]      TRACE;
[detail] +#ifdef QT_PRINTSUPPORT_LIB
[detail]      QSettings& reg=CoreApplication::instance()->settings();
[detail]      reg.beginGroup("PrintOptions");
[detail]      if(reg.contains("printerName")) {
[detail] @@ -709,6 +716,10 @@
[detail]      } else {
[detail]        return false;
[detail]      }
[detail] +#else
[detail] +    Q_UNUSED(p)
[detail] +    return false;
[detail] +#endif
[detail]    }
[detail]  
[detail]    
[detail]                         src/SizeGrip.cpp:  version-2.5.0	not modified
[detail]                        src/TableView.cpp:  version-2.5.0	modified out of comments
[detail] --- src/TableView.cpp-version-2.5.0-stripped	2025-09-28 04:00:50.391432387 +0200
[detail] +++ src/TableView.cpp-HEAD-stripped	2025-09-28 04:00:50.395432405 +0200
[detail] @@ -14,6 +14,7 @@
[detail]      setSelectionBehavior(QAbstractItemView::SelectRows);
[detail]      setSelectionMode(QAbstractItemView::ExtendedSelection);
[detail]      setEditTriggers(QAbstractItemView::AllEditTriggers);
[detail] +    verticalHeader()->setDefaultSectionSize(1); 
[detail]    }
[detail]  
[detail]    
[detail]                     src/TitledWidget.cpp:  version-2.5.0	not modified
[detail]                       src/UpdateIcon.cpp:  version-2.5.0	modified out of comments
[detail] --- src/UpdateIcon.cpp-version-2.5.0-stripped	2025-09-28 04:00:50.427432560 +0200
[detail] +++ src/UpdateIcon.cpp-HEAD-stripped	2025-09-28 04:00:50.431432579 +0200
[detail] @@ -97,7 +97,7 @@
[detail]        if(!_plugins.isEmpty()) {
[detail]          app+=","+_plugins.join(",");
[detail]        }
[detail] -      QString url=QString("https:
[detail] +      QString url=QString("http:
[detail]            .arg(platform())
[detail]            .arg(_versionType)
[detail]            .arg(app)
[detail]                       src/WidgetRect.cpp:  version-2.5.0	not modified
[detail]                        src/XMLEditor.cpp:  version-2.5.0	not modified
[detail]                          src/XMLItem.cpp:  version-2.5.0	not modified
[detail]                        src/Application.h:  version-2.5.0	not modified
[detail]                        src/Attachments.h:  version-2.5.0	not modified
[detail]                          src/BugReport.h:  version-2.5.0	not modified
[detail]                               src/Cast.h:  version-2.5.0	not modified
[detail]                      src/CheckComboBox.h:  version-2.5.0	not modified
[detail]                 src/CheckComboBoxModel.h:  version-2.5.0	not modified
[detail]                        src/ColorButton.h:  version-2.5.0	not modified
[detail]                     src/ColorHistogram.h:  version-2.5.0	not modified
[detail]        src/ColumnTextColumnsProperties.h:  version-2.5.0	not modified
[detail]                 src/ColumnTextDelegate.h:  version-2.5.0	not modified
[detail]                     src/ColumnTextItem.h:  version-2.5.0	not modified
[detail]          src/ColumnTextLinesProperties.h:  version-2.5.0	not modified
[detail]       src/ColumnTextSectionsProperties.h:  version-2.5.0	not modified
[detail]                   src/ColumnTextWidget.h:  version-2.5.0	not modified
[detail]                    src/CoreApplication.h:  version-2.5.0	not modified
[detail]                             src/Dialog.h:  version-2.5.0	not modified
[detail]                         src/DockWidget.h:  version-2.5.0	not modified
[detail]                      src/DoubleSpinBox.h:  version-2.5.0	not modified
[detail]                     src/ExpandTabTitle.h:  version-2.5.0	not modified
[detail]                    src/ExpandTabWidget.h:  version-2.5.0	not modified
[detail]                   src/ExpressionEditor.h:  version-2.5.0	not modified
[detail]                  src/FindReplaceWidget.h:  version-2.5.0	not modified
[detail]                       src/FrozenWidget.h:  version-2.5.0	not modified
[detail]                          src/GuiGlobal.h:  version-2.5.0	not modified
[detail]                         src/GuiMessage.h:  version-2.5.0	not modified
[detail]                         src/HttpAccess.h:  version-2.5.0	not modified
[detail]                       src/ItemDelegate.h:  version-2.5.0	not modified
[detail]                            src/LogView.h:  version-2.5.0	not modified
[detail]                          src/LogWidget.h:  version-2.5.0	not modified
[detail]                 src/LoopProgressWidget.h:  version-2.5.0	not modified
[detail]                         src/MessageBox.h:  version-2.5.0	not modified
[detail]           src/MultiDocumentEnvironment.h:  version-2.5.0	modified out of comments
[detail] --- src/MultiDocumentEnvironment.h-version-2.5.0-stripped	2025-09-28 04:00:50.963435151 +0200
[detail] +++ src/MultiDocumentEnvironment.h-HEAD-stripped	2025-09-28 04:00:50.963435151 +0200
[detail] @@ -98,11 +98,15 @@
[detail]    private slots:
[detail]      void removeWindow(QObject * windowObject);
[detail]      void showOpenRecentMenu();
[detail] +    void hideDeletedDocuments();
[detail] +    void showDeletedDocuments();
[detail] +    void removeDeletedDocuments();
[detail]    private:
[detail]      static const QWidget * parentWidget(const QObject * o);
[detail]  
[detail]      static MultiDocumentEnvironment * _instance;
[detail]      QList<MultiDocumentWindow *> _windows;
[detail] +    bool _showMissingDocuments;
[detail]    };
[detail]  
[detail]  } 
[detail]             src/MultiDocumentSubWindow.h:  version-2.5.0	not modified
[detail]                   src/MultiDocumentTab.h:  version-2.5.0	not modified
[detail]                src/MultiDocumentTabBar.h:  version-2.5.0	not modified
[detail]             src/MultiDocumentTabWidget.h:  version-2.5.0	not modified
[detail]                src/MultiDocumentWindow.h:  version-2.5.0	not modified
[detail]                  src/PluginApplication.h:  version-2.5.0	not modified
[detail]                 src/PrintDialogWrapper.h:  version-2.5.0	not modified
[detail]                        src/ProgressBar.h:  version-2.5.0	not modified
[detail]                       src/PropertyArea.h:  version-2.5.0	not modified
[detail]                   src/PropertyCategory.h:  version-2.5.0	not modified
[detail]           src/PropertyCategorySettings.h:  version-2.5.0	not modified
[detail]                    src/PropertyContext.h:  version-2.5.0	not modified
[detail]                     src/PropertyEditor.h:  version-2.5.0	not modified
[detail]                       src/PropertyItem.h:  version-2.5.0	not modified
[detail]                      src/PropertyProxy.h:  version-2.5.0	not modified
[detail]                        src/PropertyTab.h:  version-2.5.0	not modified
[detail]                src/PropertyTabSettings.h:  version-2.5.0	not modified
[detail]                      src/PropertyValue.h:  version-2.5.0	not modified
[detail]                     src/PropertyWidget.h:  version-2.5.0	not modified
[detail]                  src/RegExpRowSelector.h:  version-2.5.0	not modified
[detail]                           src/SendMail.h:  version-2.5.0	not modified
[detail]                           src/Settings.h:  version-2.5.0	not modified
[detail]                           src/SizeGrip.h:  version-2.5.0	not modified
[detail]                          src/TableView.h:  version-2.5.0	not modified
[detail]                       src/TitledWidget.h:  version-2.5.0	not modified
[detail]                         src/UpdateIcon.h:  version-2.5.0	not modified
[detail]                         src/WidgetRect.h:  version-2.5.0	not modified
[detail]                          src/XMLEditor.h:  version-2.5.0	not modified
[detail]                            src/XMLItem.h:  version-2.5.0	not modified
[detail]                       src/Attachments.ui:  version-2.5.0	not modified
[detail]                         src/BugReport.ui:  version-2.5.0	not modified
[detail]       src/ColumnTextColumnsProperties.ui:  version-2.5.0	not modified
[detail]         src/ColumnTextLinesProperties.ui:  version-2.5.0	not modified
[detail]      src/ColumnTextSectionsProperties.ui:  version-2.5.0	not modified
[detail]                  src/ColumnTextWidget.ui:  version-2.5.0	not modified
[detail]                  src/ExpressionEditor.ui:  version-2.5.0	not modified
[detail]                 src/FindReplaceWidget.ui:  version-2.5.0	not modified
[detail]                        src/MessageBox.ui:  version-2.5.0	not modified
[summary] Total differences: 447 lines
[summary] Modification level is B
OLD_DIR=$(pwd)
echo "QGpGuiTools"
cd $(find . -name "QGpGuiTools" | tail -n 1) || exit 2
pwd
dpversion B  || exit 2
cd $OLD_DIR || exit 2
################## QGpCoreMath
[detail]             src/AbstractColorPalette.cpp:  version-1.5.2	not modified
[detail]      src/AbstractComplexPointOptions.cpp:  version-1.5.2	not modified
[detail]                 src/AbstractFunction.cpp:  version-1.5.2	modified out of comments
[detail] --- src/AbstractFunction.cpp-version-1.5.2-stripped	2025-09-28 04:00:51.627438359 +0200
[detail] +++ src/AbstractFunction.cpp-HEAD-stripped	2025-09-28 04:00:51.627438359 +0200
[detail] @@ -12,6 +12,27 @@
[detail]    
[detail]  
[detail]    
[detail] +  double AbstractFunction::value(double x) const
[detail] +  {
[detail] +    Q_UNUSED(x);
[detail] +    return 0.0;
[detail] +  }
[detail] +
[detail] +  
[detail] +  double AbstractFunction::gradient(double x) const
[detail] +  {
[detail] +    Q_UNUSED(x);
[detail] +    return 0.0;
[detail] +  }
[detail] +
[detail] +  
[detail] +  double AbstractFunction::hessian(double x) const
[detail] +  {
[detail] +    Q_UNUSED(x);
[detail] +    return 0.0;
[detail] +  }
[detail] +
[detail] +  
[detail]    double AbstractFunction::value(const Vector<int>& index) const
[detail]    {
[detail]      Q_UNUSED(index);
[detail] @@ -39,6 +60,25 @@
[detail]      grad.setValue(0.0);
[detail]    }
[detail]  
[detail] +  void AbstractFunction::hessian(const Vector<double>& x, SymmetricMatrix& hessian) const
[detail] +  {
[detail] +    DiagonalIterator<double> it;
[detail] +    it.begin(hessian);
[detail] +    for(int i=0; it.hasNext(); i++) {
[detail] +      it.next()=hessianDiagonalElement(x, i);
[detail] +    }
[detail] +    hessianOffDiagonalElements(x, hessian);
[detail] +  }
[detail] +
[detail] +  double AbstractFunction::hessianDiagonalElement(const Vector<double>&, int) const
[detail] +  {
[detail] +    return 0.0;
[detail] +  }
[detail] +
[detail] +  void AbstractFunction::hessianOffDiagonalElements(const Vector<double>&, SymmetricMatrix&) const
[detail] +  {
[detail] +  }
[detail] +
[detail]    double AbstractFunction::admissibleStep(const Vector<double>& x,
[detail]                                            const Vector<double>& step) const
[detail]    {
[detail] @@ -54,4 +94,83 @@
[detail]      dir.setValue(0.0);
[detail]    }
[detail]  
[detail] +  void AbstractFunction::numerical(const Vector<double>& x, const Vector<double>& dx,
[detail] +                                   Vector<double>& grad, SymmetricMatrix& hessian) const
[detail] +  {
[detail] +    int n=x.size();
[detail] +    PrivateVector<double> xdx(n);
[detail] +    PrivateVector<double> inv2dx(n);
[detail] +    for(int i=0; i<n; i++) {
[detail] +      inv2dx[i]=0.5/dx[i];
[detail] +    }
[detail] +    xdx.copyValues(x);
[detail] +    hessian.zero();
[detail] +    grad.setValue(0.0);
[detail] +    
[detail] +    double * v=new double[5]+2;
[detail] +    for(int i=0; i<n; i++) {
[detail] +      xdx[i]=x[i]-2.0*dx[i];
[detail] +      v[-2]=value(xdx);
[detail] +      xdx[i]=x[i]-dx[i];
[detail] +      v[-1]=value(xdx);
[detail] +      xdx[i]=x[i];
[detail] +      v[0]=value(xdx);
[detail] +      xdx[i]=x[i]+dx[i];
[detail] +      v[1]=value(xdx);
[detail] +      xdx[i]=x[i]+2.0*dx[i];
[detail] +      v[2]=value(xdx);
[detail] +      xdx[i]=x[i];
[detail] +      grad[i]=(v[1]-v[-1])*inv2dx[i];
[detail] +      hessian.at(i, i)=(v[2]-2.0*v[0]+v[-2])*inv2dx[i]*inv2dx[i];
[detail] +    }
[detail] +    for(int i=0; i<n; i++) {
[detail] +      for(int j=i+1; j<n; j++) {
[detail] +        xdx[i]=x[i]-dx[i];
[detail] +
[detail] +        xdx[j]=x[j]-dx[j];
[detail] +        v[-1]=value(xdx);
[detail] +        xdx[j]=x[j]+dx[j];
[detail] +        v[-1]=(value(xdx)-v[-1])*inv2dx[j];
[detail] +
[detail] +        xdx[i]=x[i]+dx[i];
[detail] +        v[1]=value(xdx);
[detail] +        xdx[j]=x[j]-dx[j];
[detail] +        v[1]=(v[1]-value(xdx))*inv2dx[j];
[detail] +
[detail] +        hessian.at(i, j)=(v[1]-v[-1])*inv2dx[i];
[detail] +        xdx[j]=x[j];
[detail] +        xdx[i]=x[i];
[detail] +      }
[detail] +    }
[detail] +    delete [] (v-2);
[detail] +  }
[detail] +
[detail] +  void AbstractFunction::timeReport(Vector<double>& x) const
[detail] +  {
[detail] +    PrivateVector<double> grad(x.size());
[detail] +    SymmetricMatrix hess(x.size());
[detail] +    grad.setValue(0.0);
[detail] +    hess.zero();
[detail] +
[detail] +    QElapsedTimer chrono;
[detail] +    qint64 t;
[detail] +    chrono.start();
[detail] +    value(x);
[detail] +    t=chrono.nsecsElapsed();
[detail] +    App::log(tr("value:           %1 ms\n").arg(t*1e-6));
[detail] +    chrono.start();
[detail] +    gradient(x, grad);
[detail] +    t=chrono.nsecsElapsed();
[detail] +    App::log(tr("gradient:        %1 ms\n").arg(t*1e-6));
[detail] +    chrono.start();
[detail] +    hessian(x, hess);
[detail] +    t=chrono.nsecsElapsed();
[detail] +    App::log(tr("Hessian:         %1 ms\n").arg(t*1e-6));
[detail] +    PrivateVector<double> dx(x.size(), 1e-6);
[detail] +    chrono.start();
[detail] +    numerical(x, dx, grad, hess);
[detail] +    t=chrono.nsecsElapsed();
[detail] +    App::log(tr("Numerical(g+H):  %1 ms\n").arg(t*1e-6));
[detail] +  }
[detail] +
[detail]  } 
[detail]           src/AbstractNumericalCache.cpp:  version-1.5.2	not modified
[detail]             src/AbstractNumericalKey.cpp:  version-1.5.2	not modified
[detail]                            src/Angle.cpp:  version-1.5.2	not modified
[detail]                      src/AngleSearch.cpp:  version-1.5.2	not modified
[detail]                     src/AverageAngle.cpp:  version-1.5.2	not modified
[detail]                          src/BSpline.cpp:  version-1.5.2	not modified
[detail]                  src/BasicCurveProxy.cpp:  version-1.5.2	not modified
[detail]                src/BoundedParameters.cpp:  version-1.5.2	no last version available
[detail]                 src/ChangeOfVariable.cpp:  version-1.5.2	no last version available
[detail]                    src/ChiSquareTest.cpp:  version-1.5.2	not modified
[detail]                           src/Circle.cpp:  version-1.5.2	not modified
[detail]                          src/Cluster.cpp:  version-1.5.2	not modified
[detail]                         src/ColorMap.cpp:  version-1.5.2	modified out of comments
[detail] --- src/ColorMap.cpp-version-1.5.2-stripped	2025-09-28 04:00:51.815439267 +0200
[detail] +++ src/ColorMap.cpp-HEAD-stripped	2025-09-28 04:00:51.819439287 +0200
[detail] @@ -23,10 +23,10 @@
[detail]      _d->setPalette(pal);
[detail]    }
[detail]  
[detail] -  void ColorMap::generate(int imin, int imax, const QString& model,
[detail] +  void ColorMap::generate(int imin, int imax, int step, const QString& model,
[detail]                            ColorPalette::Options options, quint16 transparency)
[detail]    {
[detail] -    _d->generate(imin, imax, model, options, transparency);
[detail] +    _d->generate(imin, imax, step, model, options, transparency);
[detail]    }
[detail]  
[detail]    void ColorMap::toGray()
[detail]                     src/ColorMapData.cpp:  version-1.5.2	not modified
[detail]                     src/ColorPalette.cpp:  version-1.5.2	modified out of comments
[detail] --- src/ColorPalette.cpp-version-1.5.2-stripped	2025-09-28 04:00:51.851439442 +0200
[detail] +++ src/ColorPalette.cpp-HEAD-stripped	2025-09-28 04:00:51.855439460 +0200
[detail] @@ -93,7 +93,7 @@
[detail]      return c;
[detail]    }
[detail]  
[detail] -  void ColorPalette::generate(int imin, int imax, const QString& model,
[detail] +  void ColorPalette::generate(int imin, int imax, int step, const QString& model,
[detail]                                Options options, quint16 transparency)
[detail]    {
[detail]      TRACE;
[detail] @@ -109,16 +109,16 @@
[detail]        int index;
[detail]        if(options & Reversed) {
[detail]          for(int i=imin; i<=imax; i++) {
[detail] -          index=lastIndex-(i-imin);
[detail] -          while(index>=0) {
[detail] +          index=lastIndex-(i-imin)/step;
[detail] +          while(index<0) {
[detail]              index+=ref->count();
[detail]            }
[detail] -          _colors[i]=ref->color(lastIndex-(i-imin));
[detail] +          _colors[i]=ref->color(index);
[detail]            _colors[i].setAlpha64(transparency);
[detail]          }
[detail]        } else {
[detail]          for(int i=imin; i<=imax; i++) {
[detail] -          index=i-imin;
[detail] +          index=(i-imin)/step;
[detail]            while(index>lastIndex) {
[detail]              index-=ref->count();
[detail]            }
[detail] @@ -129,18 +129,18 @@
[detail]      } else {
[detail]        double fac=lastIndex;
[detail]        if(imax-imin>1) {
[detail] -        fac/=static_cast<double>(imax-imin);
[detail] +        fac*=step/static_cast<double>(imax-imin);
[detail]        } else {
[detail]          fac=0.0;
[detail]        }
[detail]        if(options & Reversed) {
[detail]          for(int i=imin; i<=imax; i++) {
[detail] -          _colors[i]=ref->color(lastIndex-qRound((i-imin)*fac));
[detail] +          _colors[i]=ref->color(lastIndex-qRound(((i-imin)/step)*fac));
[detail]            _colors[i].setAlpha64(transparency);
[detail]          }
[detail]        } else {
[detail]          for(int i=imin; i<=imax; i++) {
[detail] -          _colors[i]=ref->color(qRound((i-imin)*fac));
[detail] +          _colors[i]=ref->color(qRound(((i-imin)/step)*fac));
[detail]            _colors[i].setAlpha64(transparency);
[detail]          }
[detail]        }
[detail] @@ -316,7 +316,7 @@
[detail]      reg.beginGroup("ColorPalettes");
[detail]      ColorPalette pal;
[detail]      if(!reg.contains(name) || !pal.fromString(reg.value(name).toString())) {
[detail] -      pal.generate(0, n-1, model, options, transparency);
[detail] +      pal.generate(0, n-1, 1, model, options, transparency);
[detail]      }
[detail]      return pal;
[detail]    }
[detail]               src/ColorPaletteModels.cpp:  version-1.5.2	not modified
[detail]           src/CompactSymmetricMatrix.cpp:  version-1.5.2	no last version available
[detail]               src/ComplexExponential.cpp:  version-1.5.2	not modified
[detail]                  src/ComplexMPMatrix.cpp:  version-1.5.2	not modified
[detail]                    src/ComplexMatrix.cpp:  version-1.5.2	modified out of comments
[detail] --- src/ComplexMatrix.cpp-version-1.5.2-stripped	2025-09-28 04:00:51.927439809 +0200
[detail] +++ src/ComplexMatrix.cpp-HEAD-stripped	2025-09-28 04:00:51.931439828 +0200
[detail] @@ -2,6 +2,7 @@
[detail]  
[detail]  #include "ComplexMatrix.h"
[detail]  #include "DoubleMatrix.h"
[detail] +#include "MatrixConstIterator.h"
[detail]  #include "Random.h"
[detail]  
[detail]  namespace QGpCoreMath {
[detail] @@ -27,18 +28,17 @@
[detail]  
[detail]    ComplexMatrix ComplexMatrix::conjugate() const
[detail]    {
[detail] -    ComplexMatrix r(rowCount(),columnCount());
[detail] -    MatrixIterator<Complex> itThis(*this);
[detail] -    MutableMatrixIterator<Complex> itR(r);
[detail] -    while(itThis.hasNext()) {
[detail] -      itThis.next();
[detail] -      itR.next();
[detail] -      *itR=QGpCoreTools::conjugate(*itThis);
[detail] +    ComplexMatrix m(rowCount(), columnCount());
[detail] +    int n=rowCount()*columnCount();
[detail] +    const Complex * v1=ComplexMatrix::values();
[detail] +    Complex * v2=m.ComplexMatrix::values();
[detail] +    for(int i=0; i<n; i++) {
[detail] +      v2[i]=QGpCoreTools::conjugate(v1[i]);
[detail]      }
[detail] -    return r;
[detail] +    return m;
[detail]    }
[detail]  
[detail] -  ComplexMatrix ComplexMatrix::conjugateTransposedVector()
[detail] +  ComplexMatrix ComplexMatrix::conjugateTransposedVector() const
[detail]    {
[detail]      ComplexMatrix m=transposedVector();
[detail]      Complex * values=m.ComplexMatrix::values();
[detail] @@ -59,18 +59,14 @@
[detail]      }
[detail]    }
[detail]  
[detail] -  ComplexMatrix ComplexMatrix::dotMultiply(const DoubleMatrix& m) const
[detail] +  void ComplexMatrix::dotMultiply(const DoubleMatrix& m)
[detail]    {
[detail]      ASSERT(columnCount()==m.columnCount());
[detail]      ASSERT(rowCount()==m.rowCount());
[detail] -    ComplexMatrix r(rowCount(), columnCount());
[detail] -    Complex * rValues=r.values();
[detail] -    const Complex * thisValues=values();
[detail]      const double * mValues=m.values();
[detail]      for(int i=rowCount()*columnCount()-1; i>=0; i--) {
[detail] -      rValues[i]+=thisValues[i]*mValues[i];
[detail] +      _values[i]*=mValues[i];
[detail]      }
[detail] -    return r;
[detail]    }
[detail]  
[detail]    
[detail] @@ -82,15 +78,19 @@
[detail]                           Complex *a, int *lda, double *s, Complex *u,
[detail]                           int *ldu, Complex *vt, int *ldvt, Complex *work,
[detail]                           int *lwork, double *rwork, int *info);
[detail] +  extern "C" int zgesdd_(char *jobz, int *m, int *n,
[detail] +                         Complex *a, int *lda, double *s, Complex *u,
[detail] +                         int *ldu, Complex *vt, int *ldvt, Complex *work,
[detail] +                         int *lwork, double *rwork, int * iwork, int *info);
[detail]  
[detail]    
[detail]    bool ComplexMatrix::invert()
[detail]    {
[detail]      ASSERT(rowCount()==columnCount());
[detail] -    Complex * values=_d->values();
[detail] +    Complex * v=values();
[detail]      int m=rowCount();
[detail]      if(m==1) {  
[detail] -      values[0]=inverse(values[0]);
[detail] +      v[0]=inverse(v[0]);
[detail]        return true;
[detail]      }
[detail]      int n=columnCount();                
[detail] @@ -99,13 +99,13 @@
[detail]      int lwork=5*n;                      
[detail]      Complex * work=new Complex[lwork];  
[detail]      int info;                           
[detail] -    zgetrf_(&m, &n, values, &lda, ipiv, &info);
[detail] +    zgetrf_(&m, &n, v, &lda, ipiv, &info);
[detail]      if(info!=0 || hasNullOnDiagonal(1e-10)) { 
[detail]        delete [] ipiv;
[detail]        delete [] work;
[detail]        return false;
[detail]      }
[detail] -    zgetri_(&n, values, &lda, ipiv, work, &lwork, &info);
[detail] +    zgetri_(&n, v, &lda, ipiv, work, &lwork, &info);
[detail]      if(info!=0) {
[detail]        delete [] ipiv;
[detail]        delete [] work;
[detail] @@ -113,7 +113,7 @@
[detail]      }
[detail]      delete [] ipiv;
[detail]      delete [] work;
[detail] -    _d->swapRowColumn();
[detail] +    swapRowColumn();
[detail]      return true;
[detail]    }
[detail]  
[detail] @@ -121,20 +121,20 @@
[detail]    bool ComplexMatrix::choleskyInvert()
[detail]    {
[detail]      ASSERT(rowCount()==columnCount());
[detail] -    Complex * values=_d->values();
[detail] +    Complex * v=values();
[detail]      int n=rowCount();                   
[detail]      if(n==1) {                          
[detail] -      values[0]=inverse(values[0]);
[detail] +      v[0]=inverse(v[0]);
[detail]        return true;
[detail]      }
[detail]      char uplo='U';
[detail]      int lda=n;                          
[detail]      int info;                           
[detail] -    zpotrf_(&uplo, &n, values, &lda, &info);
[detail] +    zpotrf_(&uplo, &n, v, &lda, &info);
[detail]      if(info!=0 || hasNullOnDiagonal(1e-10)) { 
[detail]        return false;
[detail]      }
[detail] -    zpotri_(&uplo, &n, values, &lda, &info);
[detail] +    zpotri_(&uplo, &n, v, &lda, &info);
[detail]      if(info!=0) {
[detail]        return false;
[detail]      }
[detail] @@ -154,18 +154,24 @@
[detail]    }
[detail]  
[detail]    
[detail] -  bool ComplexMatrix::singularValue(VectorList<double>& sigma,
[detail] +  bool ComplexMatrix::singularValue(PrivateVector<double>& sigma,
[detail]                                      ComplexMatrix& u,
[detail]                                      ComplexMatrix& vt) const
[detail]    {
[detail] -    char jobu='A';       
[detail] +    
[detail] +#define QR_ITERATION
[detail] +
[detail] +
[detail] +    char jobz='A';       
[detail] +#ifdef QR_ITERATION
[detail]      char jobvt='A';      
[detail] +#endif
[detail]      int m=rowCount();    
[detail]      int n=columnCount(); 
[detail] -    int mn=m*n;
[detail] -    Complex * a=new Complex[mn];
[detail] +    int t=m*n;
[detail] +    Complex * a=new Complex[t];
[detail]                           
[detail] -    memcpy(a, _d->values(), mn*sizeof(Complex));
[detail] +    memcpy(a, values(), t*sizeof(Complex));
[detail]      int lda=m;           
[detail]      sigma.resize(m<n ? m : n);
[detail]                           
[detail] @@ -173,24 +179,56 @@
[detail]      int ldu=m;           
[detail]      vt.resize(n, n);     
[detail]      int ldvt=n;          
[detail] -    int lwork=20*(2*(m<n ? m : n)+(m<n ? n : m));
[detail] -                         
[detail] -                         
[detail] -                         
[detail] -                         
[detail] -    Complex * work=new Complex[lwork];
[detail] -    double * rwork=new double[5*(m<n ? n : m)];
[detail] +    int mx, mn;
[detail] +    if(m>n) {
[detail] +      mx=m;
[detail] +      mn=n;
[detail] +    } else {
[detail] +      mx=n;
[detail] +      mn=m;
[detail] +    }
[detail] +    int lwork=-1;
[detail] +    Complex * work=new Complex[1];
[detail] +#ifdef QR_ITERATION
[detail] +    Q_UNUSED(mx)
[detail] +    double * rwork=new double[5*mn];
[detail] +#endif
[detail] +#ifdef DIVIDE_CONQUER
[detail] +    double * rwork=new double[std::max(5*mn*(mn+1), 2*mn*(mx+mn)+mn)];
[detail] +    int * iwork=new int[8*mn];
[detail] +#endif
[detail]      int info=0;          
[detail] +#ifdef QR_ITERATION
[detail] +    zgesvd_(&jobz, &jobvt, &m, &n, a, &lda, sigma.values(), u.values(), &ldu, vt.values(), &ldvt,
[detail] +            work, &lwork, rwork, &info);
[detail] +#endif
[detail] +#ifdef DIVIDE_CONQUER
[detail] +    zgesdd_(&jobz, &m, &n, a, &lda, sigma.values(), u.values(), &ldu, vt.values(), &ldvt,
[detail] +            work, &lwork, rwork, iwork, &info);
[detail] +#endif
[detail] +    lwork=qRound(work[0].re());
[detail] +    delete [] work;
[detail] +    work=new Complex[lwork];
[detail]  
[detail] -     zgesvd_(&jobu, &jobvt, &m, &n, a, &lda, sigma.data(), u.values(), &ldu, vt.values(), &ldvt, work, &lwork, rwork, &info);
[detail] +#ifdef QR_ITERATION
[detail] +    zgesvd_(&jobz, &jobvt, &m, &n, a, &lda, sigma.values(), u.values(), &ldu, vt.values(), &ldvt,
[detail] +            work, &lwork, rwork, &info);
[detail] +#endif
[detail] +#ifdef DIVIDE_CONQUER
[detail] +    zgesdd_(&jobz, &m, &n, a, &lda, sigma.values(), u.values(), &ldu, vt.values(), &ldvt,
[detail] +            work, &lwork, rwork, iwork, &info);
[detail] +#endif
[detail]       delete [] work;
[detail]       delete [] rwork;
[detail] +#ifdef DIVIDE_CONQUER
[detail] +    delete [] iwork;
[detail] +#endif
[detail]       delete [] a;
[detail]       return (info==0);
[detail]    }
[detail]  
[detail]    
[detail] -  bool ComplexMatrix::invert(const ComplexMatrix& u, const VectorList<double>& sigma, const ComplexMatrix& vt)
[detail] +  bool ComplexMatrix::invert(const ComplexMatrix& u, const Vector<double>& sigma, const ComplexMatrix& vt)
[detail]    {
[detail]      ASSERT(u.rowCount()==vt.rowCount());
[detail]      *this=vt.conjugate();
[detail] @@ -210,7 +248,7 @@
[detail]    }
[detail]  
[detail]    
[detail] -  bool ComplexMatrix::pseudoInvert(const ComplexMatrix& u, const VectorList<double>& sigma, const ComplexMatrix& vt)
[detail] +  bool ComplexMatrix::pseudoInvert(const ComplexMatrix& u, const Vector<double>& sigma, const ComplexMatrix& vt)
[detail]    {
[detail]      *this=vt.conjugate();
[detail]      transpose();
[detail] @@ -246,7 +284,7 @@
[detail]    }
[detail]  
[detail]    
[detail] -  VectorList<double> ComplexMatrix::hermitianEigenValues(ComplexMatrix& u, bool& ok) const
[detail] +  VectorList<double> ComplexMatrix::hermitianEigenvalues(ComplexMatrix& u, bool& ok) const
[detail]    {
[detail]      int n=columnCount();
[detail]      ASSERT(rowCount()==n && u.rowCount()==n && u.columnCount()==n);
[detail] @@ -277,6 +315,27 @@
[detail]      return values;
[detail]    }
[detail]  
[detail] +  
[detail] +  double ComplexMatrix::identityMisfit() const
[detail] +  {
[detail] +    int n=rowCount();
[detail] +    int n2=n*n;
[detail] +    ASSERT(n==columnCount());
[detail] +    double sum=0.0, d;
[detail] +    const Complex * v=values();
[detail] +    int i=0;
[detail] +    while(i<n2) {
[detail] +      d=v[i++].abs()-1.0;
[detail] +      sum+=d*d;
[detail] +      int j=i;
[detail] +      i+=n;
[detail] +      while(j<i) {
[detail] +        sum+=v[j++].abs2();
[detail] +      }
[detail] +    }
[detail] +    return sqrt(sum/n2);
[detail] +  }
[detail] +
[detail]    QString ComplexMatrix::toUserString(char format, int precision) const
[detail]    {
[detail]      QString str("    | ");
[detail] @@ -312,11 +371,12 @@
[detail]      for(int j=0;j < m.columnCount();j++ ) s << j << "\t";
[detail]      s << "\n";
[detail]      for(int i=0;i < m.rowCount();i++ ) {
[detail] -      MatrixRowIterator<Complex> it(m, i);
[detail] +      RowConstIterator<Complex> it;
[detail]        s << i << ":\t";
[detail] +      it.begin(m, i);
[detail]        while(it.hasNext()) {
[detail] -        it.next();
[detail] -        s << (*it).re() << "+i*" << (*it).im() << "\t";
[detail] +        const Complex& z=it.next();
[detail] +        s << z.re() << "+i*" << z.im() << "\t";
[detail]        }
[detail]        s << "\n";
[detail]      }
[detail]              src/ComplexPointOptions.cpp:  version-1.5.2	not modified
[detail]          src/ComplexStatisticalProxy.cpp:  version-1.5.2	not modified
[detail]                 src/ConcentricSearch.cpp:  version-1.5.2	not modified
[detail]                   src/CoordinateFile.cpp:  version-1.5.2	modified out of comments
[detail] --- src/CoordinateFile.cpp-version-1.5.2-stripped	2025-09-28 04:00:51.995440137 +0200
[detail] +++ src/CoordinateFile.cpp-HEAD-stripped	2025-09-28 04:00:51.999440157 +0200
[detail] @@ -3,6 +3,7 @@
[detail]  #include "UtmZone.h"
[detail]  #include "CoordinateFile.h"
[detail]  #include "GoogleEarthKML.h"
[detail] +#include "StationXML.h"
[detail]  
[detail]  namespace QGpCoreMath {
[detail]  
[detail] @@ -92,6 +93,26 @@
[detail]        QString str;
[detail]        for(QList<NamedPoint>::iterator it=list.begin(); it!=list.end(); it++) {
[detail]          str+=it->toString('g', 20)+"\n";
[detail] +      }
[detail] +      VectorList<int> defaultTypes;
[detail] +      defaultTypes << 10 << 14 << 6 << 1;
[detail] +      setTypes(defaultTypes);
[detail] +      setMaximumColumnCount(4);
[detail] +      setBuffer(str);
[detail] +      startUpdates();
[detail] +    } else if(fileName.endsWith(".xml")) {
[detail] +      StationXML xml;
[detail] +      XMLHeader hdr(&xml);
[detail] +      if(hdr.xml_restoreFile(fileName, 0, XMLClass::XmlFile)!=XMLClass::NoError) {
[detail] +        Message::warning(MSG_ID, tr("Loading Station XML ..."),
[detail] +                         tr("Error while reading file %1").arg(fileName), Message::cancel());
[detail] +        return false;
[detail] +      }
[detail] +      QList<NamedPoint> list;
[detail] +      xml.collectPoints(list);
[detail] +      QString str;
[detail] +      for(QList<NamedPoint>::iterator it=list.begin(); it!=list.end(); it++) {
[detail] +        str+=it->toString('g', 20)+"\n";
[detail]        }
[detail]        VectorList<int> defaultTypes;
[detail]        defaultTypes << 10 << 14 << 6 << 1;
[detail]                       src/Covariance.cpp:  version-1.5.2	modified out of comments
[detail] --- src/Covariance.cpp-version-1.5.2-stripped	2025-09-28 04:00:52.011440215 +0200
[detail] +++ src/Covariance.cpp-HEAD-stripped	2025-09-28 04:00:52.019440253 +0200
[detail] @@ -1,6 +1,7 @@
[detail]  
[detail]  
[detail]  #include "Covariance.h"
[detail] +#include "MatrixConstIterator.h"
[detail]  
[detail]  namespace QGpCoreMath {
[detail]  
[detail]                    src/CubicEquation.cpp:  version-1.5.2	not modified
[detail]                      src/CubicSpline.cpp:  version-1.5.2	not modified
[detail]                            src/Curve.cpp:  version-1.5.2	not modified
[detail]                src/CurvePointOptions.cpp:  version-1.5.2	not modified
[detail]                  src/CurveProperties.cpp:  version-1.5.2	not modified
[detail]                       src/CurveProxy.cpp:  version-1.5.2	not modified
[detail]                    src/CurveSplitter.cpp:  version-1.5.2	not modified
[detail]            src/DelaunayTriangulation.cpp:  version-1.5.2	not modified
[detail]                src/DirectionalSearch.cpp:  version-1.5.2	not modified
[detail]                     src/DoubleMatrix.cpp:  version-1.5.2	modified out of comments
[detail] --- src/DoubleMatrix.cpp-version-1.5.2-stripped	2025-09-28 04:00:52.175441007 +0200
[detail] +++ src/DoubleMatrix.cpp-HEAD-stripped	2025-09-28 04:00:52.183441045 +0200
[detail] @@ -2,6 +2,7 @@
[detail]  
[detail]  #include "DoubleMatrix.h"
[detail]  #include "Random.h"
[detail] +#include "Vector.h"
[detail]  
[detail]  namespace QGpCoreMath {
[detail]  
[detail] @@ -85,10 +86,10 @@
[detail]    bool DoubleMatrix::invert()
[detail]    {
[detail]      ASSERT(rowCount()==columnCount());
[detail] -    double * values=_d->values();
[detail] +    double * v=values();
[detail]      int m=rowCount();
[detail]      if(m==1) {  
[detail] -      values[0]=1.0/values[0];
[detail] +      v[0]=1.0/v[0];
[detail]        return true;
[detail]      }
[detail]      int n=columnCount();                
[detail] @@ -97,13 +98,13 @@
[detail]      int lwork=5*n;                      
[detail]      double * work=new double[lwork];    
[detail]      int info;                           
[detail] -    dgetrf_(&m, &n, values, &lda, ipiv, &info);
[detail] +    dgetrf_(&m, &n, v, &lda, ipiv, &info);
[detail]      if(info!=0) { 
[detail]        delete [] ipiv;
[detail]        delete [] work;
[detail]        return false;
[detail]      }
[detail] -    dgetri_(&n, values, &lda, ipiv, work, &lwork, &info);
[detail] +    dgetri_(&n, v, &lda, ipiv, work, &lwork, &info);
[detail]      if(info!=0) {
[detail]        delete [] ipiv;
[detail]        delete [] work;
[detail] @@ -111,7 +112,6 @@
[detail]      }
[detail]      delete [] ipiv;
[detail]      delete [] work;
[detail] -    _d->swapRowColumn();
[detail]      return true;
[detail]    }
[detail]  
[detail] @@ -120,11 +120,11 @@
[detail]    {
[detail]      ASSERT(rowCount()==columnCount());
[detail]      int n=rowCount()*columnCount();
[detail] -    double * values=new double[n];
[detail] -    memcpy(values, _d->values(), sizeof(double)*n);
[detail] +    double * v=new double[n];
[detail] +    memcpy(v, values(), sizeof(double)*n);
[detail]      int m=rowCount();
[detail]      if(m==1) {  
[detail] -      return values[0];
[detail] +      return v[0];
[detail]      }
[detail]      n=columnCount();                    
[detail]      int lda=m;                          
[detail] @@ -132,12 +132,12 @@
[detail]      int lwork=5*n;                      
[detail]      double * work=new double[lwork];    
[detail]      int info;                           
[detail] -    dgetrf_(&m, &n, values, &lda, ipiv, &info);
[detail] +    dgetrf_(&m, &n, v, &lda, ipiv, &info);
[detail]      double det;
[detail]      if(info==0) { 
[detail]        det=1.0;
[detail]        for(int i=0; i<n; i++) {
[detail] -        det*=values[i*(n+1)];
[detail] +        det*=v[i*(n+1)];
[detail]        }
[detail]        
[detail]        for(int i=0; i<n; i++) {
[detail] @@ -148,7 +148,7 @@
[detail]      } else {
[detail]        det=0.0;
[detail]      }
[detail] -    delete [] values;
[detail] +    delete [] v;
[detail]      delete [] ipiv;
[detail]      delete [] work;
[detail]      return det;
[detail] @@ -158,9 +158,9 @@
[detail]    void DoubleMatrix::random(double min, double max)
[detail]    {
[detail]      Random r;
[detail] -    double * values=_d->values();
[detail] +    double * v=values();
[detail]      for(int i=columnCount()*rowCount()-1; i>=0;i--) {
[detail] -      values[i]=r.uniform(min, max);
[detail] +      v[i]=r.uniform(min, max);
[detail]      }
[detail]    }
[detail]  
[detail] @@ -227,58 +227,6 @@
[detail]  
[detail]    extern "C" {
[detail]      
[detail] -    void dsytrd_(char * uplo, int * n, double * a, int * lda, double * d,
[detail] -                double * e, double * tau, double * work, int * lwork, int *info);
[detail] -    
[detail] -    void dsteqr_(char * compz, int * n, double * d, double * e, double * z,
[detail] -                 int * ldz, double * work, int * info);
[detail] -  }
[detail] -
[detail] -  
[detail] -  VectorList<double> DoubleMatrix::symetricEigenValues(bool& ok) const
[detail] -  {
[detail] -    int m=rowCount();
[detail] -    int n=columnCount();
[detail] -    int minDim=m;
[detail] -    if(n<minDim) {
[detail] -      minDim=n;
[detail] -    }
[detail] -
[detail] -    double * a=new double[m*n];           
[detail] -    const double * aValues=values();
[detail] -    for(int i=m*n-1; i>=0; i--) {
[detail] -      a[i]=aValues[i];
[detail] -    }
[detail] -
[detail] -    VectorList<double> values(minDim);
[detail] -    double * d=values.data();
[detail] -    double * e=new double[minDim-1];
[detail] -    double * tau=new double[minDim-1];
[detail] -    char uplo='U';            
[detail] -    int lda=m;
[detail] -    int info=0;
[detail] -    int lwork=32*minDim; 
[detail] -                         
[detail] -    double * work=new double[lwork];
[detail] -    dsytrd_(&uplo, &minDim, a, &lda, d, e, tau, work, &lwork, &info);
[detail] -    delete [] work;
[detail] -    delete [] a;
[detail] -    delete [] tau;
[detail] -    if(info==0) {
[detail] -      char compz='N';
[detail] -      dsteqr_(&compz, &minDim, d, e, nullptr, &lda, nullptr, &info);
[detail] -      if(info!=0) {
[detail] -        ok=false;
[detail] -      }
[detail] -    } else {
[detail] -      ok=false;
[detail] -    }
[detail] -    delete [] e;
[detail] -    return values;
[detail] -  }
[detail] -
[detail] -  extern "C" {
[detail] -    
[detail]      void dgeqrf_(int * m, int * n,
[detail]                   double * a, int * lda, double * tau,
[detail]                   double * work, int * lwork, int * info);
[detail] @@ -353,7 +301,7 @@
[detail]    }
[detail]  
[detail]    
[detail] -  VectorList<Complex> DoubleMatrix::eigenValues() const
[detail] +  VectorList<Complex> DoubleMatrix::eigenvalues() const
[detail]    {
[detail]      int n=rowCount();
[detail]      ASSERT(n==columnCount());
[detail] @@ -377,13 +325,13 @@
[detail]      dgeev_(&jobvl, &jobvr, &n, a, &lda, wr, wi, nullptr, &ldvl, nullptr, &ldvl, work, &lwork, &info);
[detail]      delete [] work;
[detail]      delete [] a;
[detail] -    VectorList<Complex> eigenValues(n);
[detail] +    VectorList<Complex> eigenvalues(n);
[detail]      for(int i=0; i<n; i++) {
[detail] -      eigenValues[i]=Complex(wr[i], wi[i]);
[detail] +      eigenvalues[i]=Complex(wr[i], wi[i]);
[detail]      }
[detail]      delete [] wr;
[detail]      delete [] wi;
[detail] -    return eigenValues;
[detail] +    return eigenvalues;
[detail]    }
[detail]  
[detail]    double Matrix2x2::determinant() const
[detail]                          src/Ellipse.cpp:  version-1.5.2	not modified
[detail]                    src/FrequencyBand.cpp:  version-1.5.2	not modified
[detail]              src/FrequencyCurveProxy.cpp:  version-1.5.2	not modified
[detail]                     src/FunctionPlot.cpp:  version-1.5.2	not modified
[detail]                  src/FunctionProduct.cpp:  version-1.5.2	no last version available
[detail]                   src/FunctionSearch.cpp:  version-1.5.2	modified out of comments
[detail] --- src/FunctionSearch.cpp-version-1.5.2-stripped	2025-09-28 04:00:52.275441491 +0200
[detail] +++ src/FunctionSearch.cpp-HEAD-stripped	2025-09-28 04:00:52.279441509 +0200
[detail] @@ -8,15 +8,16 @@
[detail]    
[detail]  
[detail]    
[detail] -  FunctionSearch::FunctionSearch(int dimensionCount)
[detail] -    : _currentPosition(dimensionCount, new double[dimensionCount]),
[detail] -      _testPosition(dimensionCount, 0.0),
[detail] -      _relative(dimensionCount, true),
[detail] -      _precision(dimensionCount, 0.001)
[detail] +  FunctionSearch::FunctionSearch(int size)
[detail] +    : _currentPosition(size, new double[size]),
[detail] +      _testPosition(size, new double[size]),
[detail] +      _relative(size, true),
[detail] +      _precision(size, 0.001)
[detail]    {
[detail]      TRACE;
[detail] -    ASSERT(dimensionCount>0);
[detail] +    ASSERT(size>0);
[detail]      _currentPosition.setValue(0.0);
[detail] +    _testPosition.setValue(0.0);
[detail]      _function=nullptr;
[detail]    }
[detail]  
[detail] @@ -26,7 +27,15 @@
[detail]      TRACE;
[detail]      delete _function;
[detail]      delete [] _currentPosition.values();
[detail] -    qDeleteAll(_maxima);
[detail] +    delete [] _testPosition.values();
[detail] +    qDeleteAll(_extrema);
[detail] +  }
[detail] +
[detail] +  void FunctionSearch::resize(int size)
[detail] +  {
[detail] +    ASSERT(size>0 && size<=capacity());
[detail] +    _currentPosition.resize(size);
[detail] +    _testPosition.resize(size);
[detail]    }
[detail]  
[detail]    
[detail] @@ -49,15 +58,15 @@
[detail]    void FunctionSearch::globalMax(double absThres)
[detail]    {
[detail]      TRACE;
[detail] -    ASSERT(_maxima.count()==1);
[detail] -    FunctionSearchMaximum * m=_maxima.first();
[detail] +    ASSERT(_extrema.size()==1);
[detail] +    FunctionSearchExtremum * m=_extrema.first();
[detail]      double * curPos=_currentPosition.values(); 
[detail] -    _currentPosition.setValues(m->_position);  
[detail] -    double val=refineMax(m->_value);
[detail] +    _currentPosition.setValues(m->position());  
[detail] +    double val=refineMax(m->value());
[detail]      if(val<absThres) {
[detail] -      delete _maxima.takeLast();
[detail] +      delete _extrema.takeLast();
[detail]      } else {
[detail] -      m->_value=val;
[detail] +      m->setValue(val);
[detail]      }
[detail]      _currentPosition.setValues(curPos);
[detail]    }
[detail] @@ -67,11 +76,16 @@
[detail]      TRACE;
[detail]      
[detail]      double * curPos=_currentPosition.values(); 
[detail] -    for(int i=_maxima.count()-1; i>=0; i--) {
[detail] -      FunctionSearchMaximum * m=_maxima.at(i);
[detail] -      _currentPosition.setValues(m->_position);  
[detail] -      double val=refineMax(m->_value);
[detail] -      m->_value=val;
[detail] +    for(int i=_extrema.size()-1; i>=0; i--) {
[detail] +      FunctionSearchExtremum * m=_extrema.at(i);
[detail] +      _currentPosition.setValues(m->position());  
[detail] +      double val=refineMax(m->value());
[detail] +      if(val>0.0) {
[detail] +        m->setValue(val);
[detail] +      } else {
[detail] +        delete _extrema.at(i);
[detail] +        _extrema.removeAt(i);
[detail] +      }
[detail]      }
[detail]      _currentPosition.setValues(curPos);
[detail]       
[detail] @@ -79,28 +93,29 @@
[detail]        return;
[detail]      }
[detail]      
[detail] -    std::sort(_maxima.begin(), _maxima.end(), FunctionSearchMaximum::greaterThanValue);
[detail] +    unique();
[detail] +    std::sort(_extrema.begin(), _extrema.end(), FunctionSearchExtremum::greaterThanValue);
[detail]      
[detail]      
[detail]      if(absThres>0.0) {
[detail] -      int i=_maxima.count()-1;
[detail] -      while(i>=0 && _maxima.at(i)->value()<absThres) {
[detail] -        delete _maxima.takeLast();
[detail] +      int i=_extrema.size()-1;
[detail] +      while(i>=0 && _extrema.at(i)->value()<absThres) {
[detail] +        delete _extrema.takeLast();
[detail]          i--;
[detail]        }
[detail]      }
[detail]      
[detail] -    if(relThres>0.0 && _maxima.count()>0) {
[detail] -      absThres=_maxima.at(0)->value()*relThres;
[detail] -      int i=_maxima.count()-1;
[detail] -      while(i>=0 && _maxima.at(i)->value()<absThres) {
[detail] -        delete _maxima.takeLast();
[detail] +    if(relThres>0.0 && _extrema.size()>0) {
[detail] +      absThres=_extrema.at(0)->value()*relThres;
[detail] +      int i=_extrema.size()-1;
[detail] +      while(i>=0 && _extrema.at(i)->value()<absThres) {
[detail] +        delete _extrema.takeLast();
[detail]          i--;
[detail]        }
[detail]      }
[detail]      
[detail] -    while(_maxima.count()>nMax) {
[detail] -      delete _maxima.takeLast();
[detail] +    while(_extrema.size()>nMax) {
[detail] +      delete _extrema.takeLast();
[detail]      }
[detail]    }
[detail]  
[detail] @@ -108,22 +123,22 @@
[detail]    void FunctionSearch::unique()
[detail]    {
[detail]      TRACE;
[detail] -    std::sort(_maxima.begin(), _maxima.end(), FunctionSearchMaximum::lessThanPos);
[detail] -    QGpCoreTools::unique(_maxima, FunctionSearchMaximum::equalPos);
[detail] +    std::sort(_extrema.begin(), _extrema.end(), FunctionSearchExtremum::lessThanPos);
[detail] +    QGpCoreTools::uniqueDeleteAll(_extrema, FunctionSearchExtremum::equalPos);
[detail]    }
[detail]  
[detail]    void FunctionSearch::clearMaxima()
[detail]    {
[detail]      TRACE;
[detail] -    qDeleteAll(_maxima);
[detail] -    _maxima.clear();
[detail] +    qDeleteAll(_extrema);
[detail] +    _extrema.clear();
[detail]    }
[detail]  
[detail]    
[detail]    void FunctionSearch::addMaximum(double val)
[detail]    {
[detail]      TRACE;
[detail] -    _maxima.append(new FunctionSearchMaximum(_currentPosition, val));
[detail] +    _extrema.append(new FunctionSearchExtremum(_currentPosition, val, this));
[detail]    }
[detail]  
[detail]    
[detail] @@ -134,17 +149,18 @@
[detail]  
[detail]    void FunctionSearch::debugScan(const Vector<double>& min, const Vector<double>& max, int n)
[detail]    {
[detail] +    printf("x y val\n");
[detail]      PrivateVector<double> d(max);
[detail]      d-=min;
[detail]      d/=n;
[detail]      for(int ix=0; ix<=n; ix++) {
[detail]        _currentPosition[0]=min[0]+d[0]*ix;
[detail] -      if(d.count()==1) {
[detail] +      if(d.size()==1) {
[detail]          printf("%10.5lf %lg\n", _currentPosition[0], value(_currentPosition));
[detail]        } else {
[detail]          for(int iy=0; iy<=n; iy++) {
[detail]            _currentPosition[1]=min[1]+d[1]*iy;
[detail] -          if(d.count()==2) {
[detail] +          if(d.size()==2) {
[detail]              printf("%10.5lf %10.5lf %lg\n",
[detail]                     _currentPosition[0],
[detail]                     _currentPosition[1],
[detail]           src/FunctionSearchExtremum.cpp:  version-1.5.2	no last version available
[detail]            src/GaussianFrequencyBand.cpp:  version-1.5.2	not modified
[detail]                     src/GlobalRandom.cpp:  version-1.5.2	not modified
[detail]                   src/GoogleEarthKML.cpp:  version-1.5.2	not modified
[detail]                           src/Grid2D.cpp:  version-1.5.2	not modified
[detail]                           src/Grid3D.cpp:  version-1.5.2	not modified
[detail]               src/GridParallelWriter.cpp:  version-1.5.2	not modified
[detail]                     src/GridSearch1D.cpp:  version-1.5.2	modified out of comments
[detail] --- src/GridSearch1D.cpp-version-1.5.2-stripped	2025-09-28 04:00:52.391442051 +0200
[detail] +++ src/GridSearch1D.cpp-HEAD-stripped	2025-09-28 04:00:52.395442070 +0200
[detail] @@ -40,14 +40,20 @@
[detail]  #endif
[detail]    }
[detail]  
[detail] -  void GridSearch1D::setGrid(double min, double max, double step)
[detail] +  bool GridSearch1D::setGrid(double min, double max, double step)
[detail]    {
[detail]      TRACE;
[detail]      _step=step;
[detail]      double invStep=1.0/_step;
[detail]      _min=qCeil(min*invStep);
[detail]      _max=_min+qFloor((max-_min*_step)*invStep);
[detail] -    ASSERT(_max-_min>=2);  
[detail] +    if(_max-_min<2) {
[detail] +      App::log(tr("Grid, the difference between max (%1) and min (%2) is too small compared to step (%3).\n")
[detail] +                   .arg(max).arg(min).arg(step));
[detail] +      return false;
[detail] +    } else {
[detail] +      return true;
[detail] +    }
[detail]    }
[detail]  
[detail]    inline void GridSearch1D::setCurrentPosition(int i)
[detail]                     src/GridSearch2D.cpp:  version-1.5.2	modified out of comments
[detail] --- src/GridSearch2D.cpp-version-1.5.2-stripped	2025-09-28 04:00:52.415442168 +0200
[detail] +++ src/GridSearch2D.cpp-HEAD-stripped	2025-09-28 04:00:52.419442186 +0200
[detail] @@ -15,14 +15,14 @@
[detail]    
[detail]  
[detail]    
[detail] -  GridSearch2D::GridSearch2D(size_t dimensionCount)
[detail] -    : FunctionSearch(dimensionCount),
[detail] +  GridSearch2D::GridSearch2D(int size)
[detail] +    : FunctionSearch(size),
[detail]        _min(2, 0),
[detail]        _max(2, 0),
[detail]        _step(2, 0.0)
[detail]    {
[detail]      TRACE;
[detail] -    ASSERT(dimensionCount>=2);
[detail] +    ASSERT(size>=2);
[detail]    }
[detail]  
[detail]    
[detail] @@ -42,13 +42,13 @@
[detail]    }
[detail]  
[detail]    
[detail] -  void GridSearch2D::setGrid(double step, double size)
[detail] +  bool GridSearch2D::setGrid(double step, double size)
[detail]    {
[detail]      TRACE;
[detail] -    setGrid(-size, size, step, -size, size, step);
[detail] +    return setGrid(-size, size, step, -size, size, step);
[detail]    }
[detail]  
[detail] -  void GridSearch2D::setGrid(double minX, double maxX, double stepX,
[detail] +  bool GridSearch2D::setGrid(double minX, double maxX, double stepX,
[detail]                               double minY, double maxY, double stepY)
[detail]    {
[detail]      TRACE;
[detail] @@ -60,9 +60,18 @@
[detail]      _min[0]=qCeil(minX*invStep[0]);
[detail]      _min[1]=qCeil(minY*invStep[1]);
[detail]      _max[0]=_min[0]+qFloor((maxX-_min[0]*_step[0])*invStep[0]);
[detail] -    ASSERT(_max[0]-_min[0]>=2);
[detail] +    if(_max[0]-_min[0]<2) {
[detail] +      App::log(tr("Grid, the difference between maxX (%1) and minX (%2) is too small compared to stepX (%3).\n")
[detail] +                   .arg(maxX).arg(minX).arg(stepX));
[detail] +      return false;
[detail] +    }
[detail]      _max[1]=_min[1]+qFloor((maxY-_min[1]*_step[1])*invStep[1]);
[detail] -    ASSERT(_max[1]-_min[1]>=2);
[detail] +    if(_max[1]-_min[1]<2) {
[detail] +      App::log(tr("Grid, the difference between maxY (%1) and minY (%2) is too small compared to stepY (%3).\n")
[detail] +                   .arg(maxY).arg(minY).arg(stepY));
[detail] +      return false;
[detail] +    }
[detail] +    return true;
[detail]    }
[detail]  
[detail]    inline void GridSearch2D::setCurrentPosition(int ix, int iy)
[detail] @@ -135,11 +144,52 @@
[detail]      for(ix=_min[0]; ix<=_max[0]; ix++) {
[detail]        currentLine[ix]=value(index);
[detail]      }
[detail] +    
[detail] +    
[detail] +    
[detail] +    ix=_min[0]+1;
[detail] +    val=previousLine[ix-1];
[detail] +    if(val>currentLine[ix-1] &&
[detail] +       val>currentLine[ix] &&
[detail] +       val>previousLine[ix]) {
[detail] +      setCurrentPosition(ix-1, iy-1);
[detail] +      addMaximum(val);
[detail] +    }
[detail] +    
[detail] +    for(ix++; ix<=_max[0]; ix++) {
[detail] +      val=previousLine[ix-1];
[detail] +      if(val>currentLine[ix-2] &&
[detail] +         val>currentLine[ix-1] &&
[detail] +         val>currentLine[ix] &&
[detail] +         val>previousLine[ix-2] &&
[detail] +         val>previousLine[ix]) {
[detail] +        setCurrentPosition(ix-1, iy-1);
[detail] +        addMaximum(val);
[detail] +      }
[detail] +    }
[detail] +    
[detail] +    val=previousLine[ix-1];
[detail] +    if(val>currentLine[ix-2] &&
[detail] +       val>currentLine[ix-1] &&
[detail] +       val>previousLine[ix-2]) {
[detail] +      setCurrentPosition(ix-1, iy-1);
[detail] +      addMaximum(val);
[detail] +    }
[detail]      for(iy++; iy<=_max[1]; iy++) {
[detail]        ix=_min[0];
[detail]        nextLine[ix]=value(index);
[detail]        ix++;
[detail]        nextLine[ix]=value(index);
[detail] +      
[detail] +      val=currentLine[ix-1];
[detail] +      if(val>nextLine[ix] &&
[detail] +         val>nextLine[ix-1] &&
[detail] +         val>currentLine[ix] &&
[detail] +         val>previousLine[ix-1] &&
[detail] +         val>previousLine[ix]) {
[detail] +        setCurrentPosition(ix-1, iy-1);
[detail] +        addMaximum(val);
[detail] +      }
[detail]        for(ix++; ix<=_max[0]; ix++) {
[detail]          nextLineVal=value(index);
[detail]          nextLine[ix]=nextLineVal;
[detail] @@ -152,17 +202,54 @@
[detail]             val>previousLine[ix-2] &&
[detail]             val>previousLine[ix-1] &&
[detail]             val>previousLine[ix]) {
[detail] -          
[detail] -          
[detail]            setCurrentPosition(ix-1, iy-1);
[detail]            addMaximum(val);
[detail]          }
[detail]        }
[detail] +      
[detail] +      val=currentLine[ix-1];
[detail] +      if(val>nextLine[ix-1] &&
[detail] +         val>nextLine[ix-2] &&
[detail] +         val>currentLine[ix-2] &&
[detail] +         val>previousLine[ix-2] &&
[detail] +         val>previousLine[ix-1]) {
[detail] +        setCurrentPosition(ix-1, iy-1);
[detail] +        addMaximum(val);
[detail] +      }
[detail]        swapLine=previousLine;
[detail]        previousLine=currentLine;
[detail]        currentLine=nextLine;
[detail]        nextLine=swapLine;
[detail]      }
[detail] +    
[detail] +    ix=_min[0]+1;
[detail] +    val=currentLine[ix-1];
[detail] +    if(val>currentLine[ix] &&
[detail] +       val>previousLine[ix-1] &&
[detail] +       val>previousLine[ix]) {
[detail] +      setCurrentPosition(ix-1, iy-1);
[detail] +      addMaximum(val);
[detail] +    }
[detail] +    
[detail] +    for(ix++; ix<=_max[0]; ix++) {
[detail] +      val=currentLine[ix-1];
[detail] +      if(val>currentLine[ix-2] &&
[detail] +         val>currentLine[ix] &&
[detail] +         val>previousLine[ix-2] &&
[detail] +         val>previousLine[ix-1] &&
[detail] +         val>previousLine[ix]) {
[detail] +        setCurrentPosition(ix-1, iy-1);
[detail] +        addMaximum(val);
[detail] +      }
[detail] +    }
[detail] +    
[detail] +    val=currentLine[ix-1];
[detail] +    if(val>currentLine[ix-2] &&
[detail] +       val>previousLine[ix-2] &&
[detail] +       val>previousLine[ix-1]) {
[detail] +      setCurrentPosition(ix-1, iy-1);
[detail] +      addMaximum(val);
[detail] +    }
[detail]      delete [] (previousLine+_min[0]);
[detail]      delete [] (currentLine+_min[0]);
[detail]      delete [] (nextLine+_min[0]);
[detail] @@ -264,7 +351,7 @@
[detail]      
[detail]      
[detail]      
[detail] -    if(val==val0 && _testPosition.count()>2) {
[detail] +    if(val==val0 && _currentPosition.size()>2) {
[detail]        value(_currentPosition);
[detail]      }
[detail]      return val;
[detail]                     src/GridSearch3D.cpp:  version-1.5.2	not modified
[detail]                   src/GridSearchTest.cpp:  version-1.5.2	not modified
[detail]                  src/HermitianMatrix.cpp:  version-1.5.2	no last version available
[detail]                  src/IrregularGrid2D.cpp:  version-1.5.2	not modified
[detail]              src/IrregularGrid2DData.cpp:  version-1.5.2	not modified
[detail]            src/IrregularGridSearch2D.cpp:  version-1.5.2	no last version available
[detail]          src/IterativeFunctionSearch.cpp:  version-1.5.2	no last version available
[detail]                src/JointOptimization.cpp:  version-1.5.2	no last version available
[detail]                      src/LabelLayout.cpp:  version-1.5.2	no last version available
[detail]                      src/LeastSquare.cpp:  version-1.5.2	not modified
[detail]                           src/Line2D.cpp:  version-1.5.2	not modified
[detail]                 src/LinearRegression.cpp:  version-1.5.2	not modified
[detail]                           src/Matrix.cpp:  version-1.5.2	not modified
[detail]              src/MatrixConstIterator.cpp:  version-1.5.2	no last version available
[detail]                   src/MatrixIterator.cpp:  version-1.5.2	not modified
[detail]                       src/MisfitType.cpp:  version-1.5.2	no last version available
[detail]     src/ModifiedCholeskyOptimization.cpp:  version-1.5.2	no last version available
[detail]   src/MultivariateNormalDistribution.cpp:  version-1.5.2	modified out of comments
[detail] --- src/MultivariateNormalDistribution.cpp-version-1.5.2-stripped	2025-09-28 04:00:52.619443152 +0200
[detail] +++ src/MultivariateNormalDistribution.cpp-HEAD-stripped	2025-09-28 04:00:52.619443152 +0200
[detail] @@ -22,14 +22,14 @@
[detail]                                                                   const DoubleMatrix& covariance)
[detail]      : _mean(mean), _invVariance(covariance)
[detail]    {
[detail] -    ASSERT(mean.count()==_invVariance.rowCount());
[detail] +    ASSERT(mean.size()==_invVariance.rowCount());
[detail]      ASSERT(_invVariance.rowCount()==_invVariance.columnCount());
[detail]      _factor=1.0/sqrt(2.0*M_PI*_invVariance.determinant());
[detail]      _invVariance.invert();
[detail]    }
[detail]  
[detail]    MultivariateNormalDistribution:: MultivariateNormalDistribution(const MultivariateStatistics& stat)
[detail] -    : _mean(stat.dimensionCount())
[detail] +    : _mean(stat.size())
[detail]    {
[detail]      stat.mean(_mean);
[detail]      _invVariance=stat.variance();
[detail] @@ -45,7 +45,7 @@
[detail]  
[detail]    bool MultivariateNormalDistribution::isSimilar(const MultivariateNormalDistribution& o, double precision)
[detail]    {
[detail] -    int n=_mean.count();
[detail] +    int n=_mean.size();
[detail]      for(int i=0; i<n; i++) {
[detail]        double s=stddev(i);
[detail]        double sp=s*precision;
[detail] @@ -87,10 +87,10 @@
[detail]  
[detail]    double MultivariateNormalDistribution::value(const Vector<double>& x) const
[detail]    {
[detail] -    PrivateVector<double> x0(x), xs(_mean.count());
[detail] +    PrivateVector<double> x0(x), xs(_mean.size());
[detail]      x0-=_mean;
[detail]      xs.multiply(_invVariance, x0);
[detail] -    return _factor*exp(-0.5*xs.scalarProductConjugate(x0));
[detail] +    return _factor*exp(-0.5*xs.scalarProduct(x0));
[detail]    }
[detail]  
[detail]    double MultivariateNormalDistribution::value1D(int index, double x) const
[detail] @@ -115,7 +115,7 @@
[detail]    
[detail]    bool MultivariateNormalDistribution::overlap(const MultivariateNormalDistribution& o) const
[detail]    {
[detail] -    int n=_mean.count();
[detail] +    int n=_mean.size();
[detail]      for(int i=0; i<n; i++) {
[detail]        if(fabs(_mean[i]-o._mean[i])>stddev(i)+o.stddev(i)) {
[detail]          return false;
[detail] @@ -126,7 +126,7 @@
[detail]  
[detail]    void MultivariateNormalDistribution::stddev(Vector<double>& s) const
[detail]    {
[detail] -    int n=_mean.count();
[detail] +    int n=_mean.size();
[detail]      for(int i=0; i<n; i++) {
[detail]        s[i]=stddev(i);
[detail]      }
[detail]           src/MultivariateStatistics.cpp:  version-1.5.2	modified out of comments
[detail] --- src/MultivariateStatistics.cpp-version-1.5.2-stripped	2025-09-28 04:00:52.639443249 +0200
[detail] +++ src/MultivariateStatistics.cpp-HEAD-stripped	2025-09-28 04:00:52.643443269 +0200
[detail] @@ -22,7 +22,7 @@
[detail]  
[detail]    void MultivariateStatistics::add(const Vector<double>& val, double weight)
[detail]    {
[detail] -    int n=_sum.count();
[detail] +    int n=_sum.size();
[detail]      for(int i=0; i<n; i++) {
[detail]        double c=weight*val[i];
[detail]        _sum[i]+=c;
[detail] @@ -52,7 +52,7 @@
[detail]        double invSumWeight=1.0/_sumWeight;
[detail]        double unbiasFactor=_sumWeight-_sumWeight2*invSumWeight;
[detail]        if(unbiasFactor>0.0) {
[detail] -        int n=_sum.count();
[detail] +        int n=_sum.size();
[detail]          double s2;
[detail]          for(int i=0; i<n; i++) {
[detail]            v.at(i, i)-=_sum[i]*_sum[i]*invSumWeight;
[detail]                       src/NamedPoint.cpp:  version-1.5.2	modified out of comments
[detail] --- src/NamedPoint.cpp-version-1.5.2-stripped	2025-09-28 04:00:52.659443346 +0200
[detail] +++ src/NamedPoint.cpp-HEAD-stripped	2025-09-28 04:00:52.659443346 +0200
[detail] @@ -34,18 +34,27 @@
[detail]    } else {
[detail]      return false;
[detail]    }
[detail] +  if(!ok) {
[detail] +    return false;
[detail] +  }
[detail]    f=str.nextField(ptr);
[detail]    if(f.isValid()) {
[detail]      setZ(f.toDouble(ok));
[detail] -  } else {
[detail] -    setZ(0.0);
[detail] -  }
[detail] +    if(ok) {
[detail]    f=str.nextField(ptr);
[detail]    if(f.isValid()) {
[detail]      _name=f.toStringBuffer();
[detail]    } else {
[detail]      _name=QString();
[detail]    }
[detail] +    } else {
[detail] +      ok=true;
[detail] +      _name=f.toStringBuffer();
[detail] +      setZ(0.0);
[detail] +    }
[detail] +  } else {
[detail] +    setZ(0.0);
[detail] +  }
[detail]    return ok;
[detail]  }
[detail]  
[detail]             src/NewtonOptimization1D.cpp:  version-1.5.2	modified out of comments
[detail] --- src/NewtonOptimization1D.cpp-version-1.5.2-stripped	2025-09-28 04:00:52.675443423 +0200
[detail] +++ src/NewtonOptimization1D.cpp-HEAD-stripped	2025-09-28 04:00:52.679443443 +0200
[detail] @@ -4,13 +4,417 @@
[detail]  
[detail]  namespace QGpCoreMath {
[detail]  
[detail] +  QMutex NewtonOptimization1Df::_iterationStatsMutex;
[detail] +  Statistics NewtonOptimization1Df::_convergedIterationStats;
[detail] +  Statistics NewtonOptimization1Df::_smallStepIterationStats;
[detail] +  int NewtonOptimization1Df::_maxIterationsReached=0;
[detail] +
[detail] +  NewtonOptimization1Df::Attributes::Attributes()
[detail] +  {
[detail] +    x=0.0;
[detail] +    value=0.0;
[detail] +    gradient=0.0;
[detail] +    hessian=0.0;
[detail] +  }
[detail] +
[detail] +  
[detail] +
[detail] +  
[detail] +  NewtonOptimization1Df::NewtonOptimization1Df()
[detail] +      : FunctionSearch(1)
[detail] +  {
[detail] +    _a1=new Attributes;
[detail] +    _a2=new Attributes;
[detail] +    _maxIterations=1000;
[detail] +  }
[detail] +
[detail] +  
[detail] +  NewtonOptimization1Df::~NewtonOptimization1Df()
[detail] +  {
[detail] +    delete _a1;
[detail] +    delete _a2;
[detail] +    printf("Iteration statistics\n"
[detail] +           "  converged:  %i %lf %lf+/-%lf %lf\n"
[detail] +           "  small step: %i %lf %lf+/-%lf %lf\n"
[detail] +           "  max iterations reached: %i\n",
[detail] +           _convergedIterationStats.count(),
[detail] +           _convergedIterationStats.minimum(),
[detail] +           _convergedIterationStats.mean(),
[detail] +           _convergedIterationStats.stddev(),
[detail] +           _convergedIterationStats.maximum(),
[detail] +           _smallStepIterationStats.count(),
[detail] +           _smallStepIterationStats.minimum(),
[detail] +           _smallStepIterationStats.mean(),
[detail] +           _smallStepIterationStats.stddev(),
[detail] +           _smallStepIterationStats.maximum(),
[detail] +           _maxIterationsReached);
[detail] +
[detail] +  }
[detail] +
[detail] +  inline bool NewtonOptimization1Df::atEnd(const double& x, const double& dx) const
[detail] +  {
[detail] +    if(_relative[0]) {
[detail] +      return fabs(dx)<=fabs(_precision[0]*x);
[detail] +    } else {
[detail] +      return fabs(dx)<=_precision[0];
[detail] +    }
[detail] +  }
[detail] +
[detail] +  inline bool NewtonOptimization1Df::isNegativeConcavity(const double& x,
[detail] +                                                         double& hessian)
[detail] +  {
[detail] +    hessian=_function->hessian(x);
[detail] +    return hessian<0.0;
[detail] +  }
[detail] +
[detail] +  inline bool NewtonOptimization1Df::isPositiveConcavity(const double& x,
[detail] +                                                         double& hessian)
[detail] +  {
[detail] +    hessian=_function->hessian(x);
[detail] +    return hessian>0.0;
[detail] +  }
[detail] +
[detail] +  inline void NewtonOptimization1Df::ascentStep(const double& gradient,
[detail] +                                                double& dx) const
[detail] +  {
[detail] +    if(gradient>0.0) {
[detail] +      if(dx<0.0) {
[detail] +        dx=-dx;
[detail] +      }
[detail] +    } else {
[detail] +      if(dx>0.0) {
[detail] +        dx=-dx;
[detail] +      }
[detail] +    }
[detail] +  }
[detail] +
[detail] +  inline void NewtonOptimization1Df::descentStep(const double& gradient,
[detail] +                                                 double& dx) const
[detail] +  {
[detail] +    if(gradient<0.0) {
[detail] +      if(dx<0.0) {
[detail] +        dx=-dx;
[detail] +      }
[detail] +    } else {
[detail] +      if(dx>0.0) {
[detail] +        dx=-dx;
[detail] +      }
[detail] +    }
[detail] +  }
[detail] +
[detail] +  inline bool NewtonOptimization1Df::newtonStep(const Attributes& a,
[detail] +                                               double& dx) const
[detail] +  {
[detail] +    double olddx=fabs(dx);
[detail] +    if(a.hessian!=0.0) {
[detail] +      dx=-a.gradient/a.hessian;
[detail] +      if(fabs(dx)>olddx) {
[detail] +        dx=dx<0.0 ? -olddx : olddx;
[detail] +      }
[detail] +      return true;
[detail] +    } else {
[detail] +      return false;
[detail] +    }
[detail] +  }
[detail] +
[detail] +  inline bool NewtonOptimization1Df::nextAscent(const double& dx, const double& max)
[detail] +  {
[detail] +    _a2->x=_a1->x;
[detail] +    do {
[detail] +      _a2->x+=dx;
[detail] +      if(_a2->x>max) {
[detail] +        return false;
[detail] +      }
[detail] +      _a2->value=_function->value(_a2->x);
[detail] +      _a2->gradient=_function->gradient(_a2->x);
[detail] +    } while(_a2->gradient<0.0);
[detail] +    qSwap(_a1, _a2);
[detail] +    return true;
[detail] +  }
[detail] +
[detail] +  inline bool NewtonOptimization1Df::increaseStepAscent(const double& dx)
[detail] +  {
[detail] +    _a2->x=_a1->x+dx;
[detail] +    _a2->value=_function->value(_a2->x);
[detail] +    if(_a2->value>_a1->value) {
[detail] +      _a2->gradient=_function->gradient(_a2->x);
[detail] +      if(dx*_a2->gradient>0.0) {
[detail] +        do {
[detail] +          qSwap(_a1, _a2);
[detail] +          _a2->x=_a1->x+dx;
[detail] +          _a2->value=_function->value(_a2->x);
[detail] +          if(_a2->value<_a1->value) {
[detail] +            break;
[detail] +          }
[detail] +          _a2->gradient=_function->gradient(_a2->x);
[detail] +        } while(dx*_a2->gradient>0.0);
[detail] +        
[detail] +        
[detail] +        _a1->value=_function->value(_a1->x);
[detail] +        return true;
[detail] +      }
[detail] +    }
[detail] +    return false;
[detail] +  }
[detail] +
[detail] +  inline bool NewtonOptimization1Df::decreaseStepAscent(double dx)
[detail] +  {
[detail] +    do {
[detail] +      dx*=0.5;
[detail] +      _a2->x=_a1->x+dx;
[detail] +      _a2->value=_function->value(_a2->x);
[detail] +      if(atEnd(_a2->x, dx)) {
[detail] +        qSwap(_a1, _a2);
[detail] +        return false;
[detail] +      }
[detail] +    } while(_a2->value<_a1->value);
[detail] +    
[detail] +    qSwap(_a1, _a2);
[detail] +    return true;
[detail] +  }
[detail] +
[detail] +  inline bool NewtonOptimization1Df::increaseStepDescent(const double& dx)
[detail] +  {
[detail] +    _a2->x=_a1->x+dx;
[detail] +    _a2->value=_function->value(_a2->x);
[detail] +    if(_a2->value<_a1->value) {
[detail] +      _a2->gradient=_function->gradient(_a2->x);
[detail] +      if(dx*_a2->gradient<0.0) {
[detail] +        do {
[detail] +          qSwap(_a1, _a2);
[detail] +          _a2->x=_a1->x+dx;
[detail] +          _a2->value=_function->value(_a2->x);
[detail] +          if(_a2->value>_a1->value) {
[detail] +            break;
[detail] +          }
[detail] +          _a2->gradient=_function->gradient(_a2->x);
[detail] +        } while(dx*_a2->gradient<0.0);
[detail] +        
[detail] +        
[detail] +        _a1->value=_function->value(_a1->x);
[detail] +        return true;
[detail] +      }
[detail] +    }
[detail] +    return false;
[detail] +  }
[detail] +
[detail] +  inline bool NewtonOptimization1Df::decreaseStepDescent(double dx)
[detail] +  {
[detail] +    do {
[detail] +      dx*=0.5;
[detail] +      _a2->x=_a1->x+dx;
[detail] +      _a2->value=_function->value(_a2->x);
[detail] +      if(atEnd(_a2->x, dx)) {
[detail] +        qSwap(_a1, _a2);
[detail] +        return false;
[detail] +      }
[detail] +    } while(_a2->value>_a1->value);
[detail] +    
[detail] +    qSwap(_a1, _a2);
[detail] +    return true;
[detail] +  }
[detail] +
[detail] +  void NewtonOptimization1Df::reset(double x)
[detail] +  {
[detail] +    _a1->x=x;
[detail] +  }
[detail] +
[detail] +  bool NewtonOptimization1Df::maximize(double defaultStep)
[detail] +  {
[detail] +    _a1->value=_function->value(_a1->x);
[detail] +    _a1->gradient=_function->gradient(_a1->x);
[detail] +    double dx=defaultStep;
[detail] +    int iterations=0;
[detail] +    while(true) {
[detail] +      if(isNegativeConcavity(_a1->x, _a1->hessian)) {
[detail] +        
[detail] +        
[detail] +        
[detail] +        newtonStep(*_a1, dx);
[detail] +        _a2->x=_a1->x+dx;
[detail] +        _a2->value=_function->value(_a2->x);
[detail] +        if(atEnd(_a2->x, dx)) {
[detail] +          qSwap(_a1, _a2);
[detail] +          _iterationStatsMutex.lock();
[detail] +          _convergedIterationStats.add(iterations);
[detail] +          _iterationStatsMutex.unlock();
[detail] +          return true;
[detail] +        }
[detail] +        if(_a1->value>_a2->value) {
[detail] +          if(!decreaseStepAscent(dx)) {
[detail] +            _iterationStatsMutex.lock();
[detail] +            _smallStepIterationStats.add(iterations);
[detail] +            _iterationStatsMutex.unlock();
[detail] +            return false;
[detail] +          }
[detail] +        } else {
[detail] +          qSwap(_a1, _a2);
[detail] +        }
[detail] +        _a1->gradient=_function->gradient(_a1->x);
[detail] +      } else {                       
[detail] +        ascentStep(_a1->gradient, dx);
[detail] +        if(!increaseStepAscent(dx)) {
[detail] +          if(!decreaseStepAscent(dx)) {
[detail] +            _iterationStatsMutex.lock();
[detail] +            _smallStepIterationStats.add(iterations);
[detail] +            _iterationStatsMutex.unlock();
[detail] +            return false;
[detail] +          }
[detail] +        }
[detail] +        _a1->gradient=_function->gradient(_a1->x);
[detail] +      }
[detail] +      iterations++;
[detail] +      if(iterations>_maxIterations) {
[detail] +        _iterationStatsMutex.lock();
[detail] +        _maxIterationsReached++;
[detail] +        _iterationStatsMutex.unlock();
[detail] +        return false;
[detail] +      }
[detail] +    }
[detail] +  }
[detail] +
[detail] +  bool NewtonOptimization1Df::minimize(double defaultStep)
[detail] +  {
[detail] +    _a1->value=_function->value(_a1->x);
[detail] +    _a1->gradient=_function->gradient(_a1->x);
[detail] +    double dx=defaultStep;
[detail] +    int iterations=0;
[detail] +    while(true) {
[detail] +      if(isPositiveConcavity(_a1->x, _a1->hessian)) {
[detail] +        
[detail] +        
[detail] +        
[detail] +        newtonStep(*_a1, dx);
[detail] +        _a2->x=_a1->x+dx;
[detail] +        _a2->value=_function->value(_a2->x);
[detail] +        if(atEnd(_a2->x, dx)) {
[detail] +          qSwap(_a1, _a2);
[detail] +          _iterationStatsMutex.lock();
[detail] +          _convergedIterationStats.add(iterations);
[detail] +          _iterationStatsMutex.unlock();
[detail] +          return true;
[detail] +        }
[detail] +        if(_a1->value<_a2->value) {
[detail] +          if(!decreaseStepDescent(dx)) {
[detail] +            _iterationStatsMutex.lock();
[detail] +            _smallStepIterationStats.add(iterations);
[detail] +            _iterationStatsMutex.unlock();
[detail] +            return false;
[detail] +          }
[detail] +        } else {
[detail] +          qSwap(_a1, _a2);
[detail] +        }
[detail] +        _a1->gradient=_function->gradient(_a1->x);
[detail] +      } else {                       
[detail] +        descentStep(_a1->gradient, dx);
[detail] +        if(!increaseStepDescent(dx)) {
[detail] +          if(!decreaseStepDescent(dx)) {
[detail] +            _iterationStatsMutex.lock();
[detail] +            _smallStepIterationStats.add(iterations);
[detail] +            _iterationStatsMutex.unlock();
[detail] +            return false;
[detail] +          }
[detail] +        }
[detail] +        _a1->gradient=_function->gradient(_a1->x);
[detail] +      }
[detail] +      iterations++;
[detail] +      if(iterations>_maxIterations) {
[detail] +        _iterationStatsMutex.lock();
[detail] +        _maxIterationsReached++;
[detail] +        _iterationStatsMutex.unlock();
[detail] +        return false;
[detail] +      }
[detail] +    }
[detail] +  }
[detail] +
[detail] +  
[detail] +  bool NewtonOptimization1Df::globalMaximize(double min, double max, double defaultStep)
[detail] +  {
[detail] +    Attributes best;
[detail] +    best.x=min;
[detail] +    best.value=-std::numeric_limits<double>::infinity();
[detail] +    _a1->x=min;
[detail] +    _a1->value=_function->value(_a1->x);
[detail] +    _a1->gradient=_function->gradient(_a1->x);
[detail] +    while(_a1->x<max) {
[detail] +      if(_a1->gradient<0.0) {
[detail] +        
[detail] +        
[detail] +        if(!nextAscent(defaultStep, max)) {
[detail] +          break;
[detail] +        }
[detail] +      }
[detail] +      double currentX=_a1->x;
[detail] +      if(maximize(defaultStep)) {
[detail] +        if(_a1->x>currentX) {
[detail] +          if(_a1->x<max) {
[detail] +            if(_a1->value>best.value) {
[detail] +              best.x=_a1->x;
[detail] +              best.value=_a1->value;
[detail] +            }
[detail] +          } else {
[detail] +            break;
[detail] +          }
[detail] +          _a1->x+=defaultStep; 
[detail] +        } else {
[detail] +          _a1->x=currentX+defaultStep;
[detail] +        }
[detail] +        _a1->value=_function->value(_a1->x);
[detail] +        _a1->gradient=_function->gradient(_a1->x);
[detail] +      } else {
[detail] +        best.x=min;
[detail] +        break;
[detail] +      }
[detail] +    }
[detail] +    _a1->x=best.x;
[detail] +    _a1->value=best.value;
[detail] +    return best.x!=min;
[detail] +  }
[detail] +
[detail] +  void NewtonOptimization1Df::grids(double minX, double maxX, double stepX) const
[detail] +  {
[detail] +    Attributes a;
[detail] +
[detail] +    QString baseName("/tmp/newton");
[detail] +    QFile fval(baseName+"-values");
[detail] +    QFile fgrad(baseName+"-grad");
[detail] +    QFile fhes(baseName+"-hessian");
[detail] +
[detail] +    fval.open(QIODevice::WriteOnly);
[detail] +    fgrad.open(QIODevice::WriteOnly);
[detail] +    fhes.open(QIODevice::WriteOnly);
[detail] +
[detail] +    QTextStream sval(&fval);
[detail] +    QTextStream sgrad(&fgrad);
[detail] +    QTextStream shes(&fhes);
[detail] +    sval.setRealNumberPrecision(20);
[detail] +    sgrad.setRealNumberPrecision(20);
[detail] +    shes.setRealNumberPrecision(20);
[detail] +
[detail] +    sval << "#" << Qt::endl;
[detail] +    sgrad << "#" << Qt::endl;
[detail] +    shes << "#" << Qt::endl;
[detail] +    for(a.x=minX; a.x<=maxX; a.x+=stepX) {
[detail] +      a.value=_function->value(a.x);
[detail] +      a.gradient=_function->gradient(a.x);
[detail] +      a.hessian=_function->hessian(a.x);
[detail] +      sval << a.x << " " << a.value << Qt::endl;
[detail] +      sgrad << a.x << " " << a.gradient << Qt::endl;
[detail] +      shes << a.x << " " << a.hessian << Qt::endl;
[detail] +    }
[detail] +
[detail] +    fval.close();
[detail] +    fgrad.close();
[detail] +    fhes.close();
[detail] +  }
[detail] +
[detail]    
[detail]  
[detail]    
[detail]    NewtonOptimization1D::NewtonOptimization1D()
[detail]    {
[detail] -    _relativePrecision=0.0;
[detail] -    _absolutePrecision=0.0;
[detail] +    _precisionType=Absolute;
[detail] +    _precision=0.0;
[detail]    }
[detail]  
[detail]    
[detail] @@ -18,6 +422,18 @@
[detail]    {
[detail]    }
[detail]  
[detail] +  void NewtonOptimization1D::setRelativePrecision(double p)
[detail] +  {
[detail] +    _precisionType=Relative;
[detail] +    _precision=p;
[detail] +  }
[detail] +
[detail] +  void NewtonOptimization1D::setAbsolutePrecision(double p)
[detail] +  {
[detail] +    _precisionType=Absolute;
[detail] +    _precision=p;
[detail] +  }
[detail] +
[detail]    
[detail]  
[detail]  } 
[detail]             src/NewtonOptimizationND.cpp:  version-1.5.2	no last version available
[detail]      src/NewtonPrincipalOptimization.cpp:  version-1.5.2	no last version available
[detail]        src/NonUniformFourierTranform.cpp:  version-1.5.2	no last version available
[detail]               src/NormalDistribution.cpp:  version-1.5.2	not modified
[detail]                 src/OptimizationBFGS.cpp:  version-1.5.2	modified out of comments
[detail] --- src/OptimizationBFGS.cpp-version-1.5.2-stripped	2025-09-28 04:00:52.731443695 +0200
[detail] +++ src/OptimizationBFGS.cpp-HEAD-stripped	2025-09-28 04:00:52.731443695 +0200
[detail] @@ -68,30 +68,30 @@
[detail]    
[detail]  
[detail]    
[detail] -  OptimizationBFGS::OptimizationBFGS(int dimensionCount)
[detail] -    : FunctionSearch(dimensionCount),
[detail] -      _precision(dimensionCount, 0.0),
[detail] -      _phi(dimensionCount),
[detail] -      _absStep(dimensionCount, 0.0),
[detail] -      _absShift(dimensionCount, 0.0),
[detail] -      _sk(dimensionCount, 0.0),
[detail] -      _yk(dimensionCount, 0.0),
[detail] -      _x(dimensionCount, 0.0),
[detail] -      _x0(dimensionCount, 0.0),
[detail] -      _hk(dimensionCount, dimensionCount),
[detail] -      _tk(dimensionCount, dimensionCount),
[detail] -      _skskt(dimensionCount, dimensionCount)
[detail] +  OptimizationBFGS::OptimizationBFGS(int size)
[detail] +    : IterativeFunctionSearch(size),
[detail] +      _phi(size),
[detail] +      _absStep(size, 0.0),
[detail] +      _absShift(size, 0.0),
[detail] +      _sk(size, 0.0),
[detail] +      _yk(size, 0.0),
[detail] +      _x(size, 0.0),
[detail] +      _x0(size, 0.0),
[detail] +      _hk(size, size),
[detail] +      _tk(size, size),
[detail] +      _skskt(size, size)
[detail]    {
[detail]      TRACE;
[detail]      for(int i=0; i<=3; i++) {
[detail] -      _fValues[i]=new AbstractFunction::Properties(dimensionCount);
[detail] +      _fValues[i]=new AbstractFunction::Properties(size);
[detail]      }
[detail]      for(int i=0; i<=2; i++) {
[detail]        _steps[i]=new Step;
[detail]        _steps[i]->setFunctionProperties(_fValues[i]);
[detail]      }
[detail]      _phi.setFunctionProperties(_fValues[3]);
[detail] -    _iterationCount=0;
[detail] +
[detail] +    _hk.identity();
[detail]    }
[detail]  
[detail]    
[detail] @@ -114,8 +114,15 @@
[detail]      _hk.identity();
[detail]    }
[detail]  
[detail] +  void OptimizationBFGS::reset(const Vector<double>& p, SymmetricMatrix& hessian)
[detail] +  {
[detail] +    _phi.x0().copyValues(p);
[detail] +    hessian.mirrorDown();
[detail] +    _hk=hessian;
[detail] +  }
[detail] +
[detail]    
[detail] -  bool OptimizationBFGS::minimize(const Vector<double>& maxShift, int maxIterationCount)
[detail] +  bool OptimizationBFGS::minimize()
[detail]    {
[detail]      
[detail]      _x0.copyValues(_phi.x0());  
[detail] @@ -125,10 +132,10 @@
[detail]      _phi.functionProperties()->value=_function->value(_phi.x0());
[detail]      _function->gradient(_phi.x0(), _phi.functionProperties()->gradient);
[detail]  
[detail] -    _iterationCount=0;
[detail] +    _iterations=0;
[detail]      int smallStepCount=0;
[detail]      while(true) {
[detail] -      APP_LOG(5, tr("Starting BFGS iteration %1\n").arg(++_iterationCount));
[detail] +      APP_LOG(5, tr("Starting BFGS iteration %1\n").arg(++_iterations));
[detail]        _phi.setSearchDirection(_hk);
[detail]        
[detail]        
[detail] @@ -155,36 +162,34 @@
[detail]          _phi.move(_sk);
[detail]          APP_LOG(1, tr("Step to %1\n").arg(_phi.x0().toString()));
[detail]        } else {
[detail] -        APP_LOG(1, tr("Null step in BFGS optimization after %1 iterations\n").arg(_iterationCount));
[detail] +        APP_LOG(1, tr("Null step in BFGS optimization after %1 iterations\n").arg(_iterations));
[detail]          break;
[detail]        }
[detail]  
[detail] -      _iterationCount++;
[detail] +      _iterations++;
[detail]        APP_LOG(7, tr("it %1: x0=%2 => %3\n")
[detail] -               .arg(_iterationCount, 3, 10, QChar(' '))
[detail] +               .arg(_iterations, 3, 10, QChar(' '))
[detail]                 .arg(_phi.x0().toUserString())
[detail]                 .arg(_phi.functionProperties()->value));
[detail]  
[detail]        
[detail]        _absStep.copyValues(_sk);
[detail] -      _absStep.abs();
[detail]        _absShift.copyValues(_phi.x0());
[detail]        _absShift-=_x0;
[detail] -      _absShift.abs();
[detail] -      if(_absShift.hasElementGreaterThan(maxShift)) {
[detail] -        APP_LOG(1, tr("Maximum shift reached in BFGS optimization after %1 iterations\n").arg(_iterationCount));
[detail] +      if(_absShift.hasAbsElementGreaterThan(_maximumSteps)) {
[detail] +        APP_LOG(1, tr("Maximum shift reached in BFGS optimization after %1 iterations\n").arg(_iterations));
[detail]          return false;
[detail]        }
[detail] -      if(_iterationCount>maxIterationCount) {
[detail] -        APP_LOG(1, tr("Maximum number of BFGS iteration reached (%1)\n").arg(_iterationCount));
[detail] +      if(_iterations>_maxIterations) {
[detail] +        APP_LOG(1, tr("Maximum number of BFGS iteration reached (%1)\n").arg(_iterations));
[detail]          return false;
[detail]        }
[detail] -      if(_absStep.hasElementGreaterThan(_precision)) {
[detail] +      if(_absStep.hasAbsElementGreaterThan(_precision)) {
[detail]          smallStepCount=0;
[detail]        } else {
[detail]          if(smallStepCount>5) {  
[detail]            APP_LOG(1, tr("At least 5 successive tiny steps, stop BFGS iteration after %1 iterations.\n")
[detail] -                  .arg(_iterationCount));
[detail] +                  .arg(_iterations));
[detail]            break;
[detail]          } else {
[detail]            smallStepCount++;
[detail] @@ -350,7 +355,7 @@
[detail]  
[detail]    void OptimizationBFGS::debugFunction(double range)
[detail]    {
[detail] -    int n=_x.count();
[detail] +    int n=_x.size();
[detail]      double delta=range/15.0;
[detail]      _x.copyValues(_phi.x0());
[detail]      PrivateVector<double> grad(_x);
[detail]         src/OrderedBoundedParameters.cpp:  version-1.5.2	no last version available
[detail]                   src/Parallelepiped.cpp:  version-1.5.2	not modified
[detail]       src/ParameterConditionFunction.cpp:  version-1.5.2	no last version available
[detail]               src/PeriodicStatistics.cpp:  version-1.5.2	modified out of comments
[detail] --- src/PeriodicStatistics.cpp-version-1.5.2-stripped	2025-09-28 04:00:52.771443887 +0200
[detail] +++ src/PeriodicStatistics.cpp-HEAD-stripped	2025-09-28 04:00:52.775443907 +0200
[detail] @@ -9,15 +9,28 @@
[detail]    
[detail]  
[detail]    
[detail] +  PeriodicStatistics::PeriodicStatistics()
[detail] +  {
[detail] +    setPeriod(2.0*M_PI);
[detail] +    meanReset();
[detail] +    varianceReset();
[detail] +  }
[detail] +
[detail] +  
[detail]    PeriodicStatistics::PeriodicStatistics(double period)
[detail]    {
[detail] -    _period=period;
[detail] -    _halfPeriod=0.5*_period;
[detail] -    _doublePeriod=2.0*_period;
[detail] +    setPeriod(period);
[detail]      meanReset();
[detail]      varianceReset();
[detail]    }
[detail]  
[detail] +  void PeriodicStatistics::setPeriod(double p)
[detail] +  {
[detail] +    _period=p;
[detail] +    _halfPeriod=0.5*_period;
[detail] +    _doublePeriod=2.0*_period;
[detail] +  }
[detail] +
[detail]    void PeriodicStatistics::meanReset()
[detail]    {
[detail]      _sum=0.0;
[detail]                src/PermutationVector.cpp:  version-1.5.2	not modified
[detail]                            src/Plane.cpp:  version-1.5.2	not modified
[detail]                            src/Point.cpp:  version-1.5.2	modified out of comments
[detail] --- src/Point.cpp-version-1.5.2-stripped	2025-09-28 04:00:52.823444139 +0200
[detail] +++ src/Point.cpp-HEAD-stripped	2025-09-28 04:00:52.827444159 +0200
[detail] @@ -201,5 +201,11 @@
[detail]      }
[detail]    }
[detail]  
[detail] +  uint qHash(Point key)
[detail] +  {
[detail] +    size_t h1=qHash(static_cast<Point2D>(key));
[detail] +    size_t h2=::qHash(quint64(key.z()));
[detail] +    return ((h1 << 16) | (h1 >> 16)) ^ h2;
[detail] +  }
[detail]  
[detail]  } 
[detail]                          src/Point1D.cpp:  version-1.5.2	not modified
[detail]                          src/Point2D.cpp:  version-1.5.2	modified out of comments
[detail] --- src/Point2D.cpp-version-1.5.2-stripped	2025-09-28 04:00:52.863444332 +0200
[detail] +++ src/Point2D.cpp-HEAD-stripped	2025-09-28 04:00:52.867444352 +0200
[detail] @@ -549,10 +549,10 @@
[detail]    }
[detail]  
[detail]    
[detail] -  uint qHash(Point2D key)
[detail] +  size_t qHash(const Point2D& p)
[detail]    {
[detail] -    uint h1=::qHash(quint64(key.x()));
[detail] -    uint h2=::qHash(quint64(key.y()));
[detail] +    size_t h1=::qHash(quint64(p.x()));
[detail] +    size_t h2=::qHash(quint64(p.y()));
[detail]      return ((h1 << 16) | (h1 >> 16)) ^ h2;
[detail]    }
[detail]  
[detail]                      src/PointLocate.cpp:  version-1.5.2	not modified
[detail]                          src/PointND.cpp:  version-1.5.2	modified out of comments
[detail] --- src/PointND.cpp-version-1.5.2-stripped	2025-09-28 04:00:52.895444486 +0200
[detail] +++ src/PointND.cpp-HEAD-stripped	2025-09-28 04:00:52.899444506 +0200
[detail] @@ -116,28 +116,77 @@
[detail]      }
[detail]    }
[detail]  
[detail] -  void PointND::yLog()
[detail] +  void PointND::yLog(const CurvePointOptions * options)
[detail]    {
[detail] +    if(options) {
[detail] +      const PointNDOptions * po=static_cast<const PointNDOptions *>(options);
[detail] +      int index=po->index();
[detail] +      setY(index, ::log(y(index)));
[detail] +    } else {
[detail]      int n=count();
[detail]      for(int i=0; i<n; i++) {
[detail]        setY(i, ::log(y(i)));
[detail]      }
[detail]    }
[detail] +  }
[detail]  
[detail] -  void PointND::yExp()
[detail] +  void PointND::yExp(const CurvePointOptions * options)
[detail]    {
[detail] +    if(options) {
[detail] +      const PointNDOptions * po=static_cast<const PointNDOptions *>(options);
[detail] +      int index=po->index();
[detail] +      setY(index, ::exp(y(index)));
[detail] +    } else {
[detail]      int n=count();
[detail]      for(int i=0; i<n; i++) {
[detail]        setY(i, ::exp(y(i)));
[detail]      }
[detail]    }
[detail] +  }
[detail]  
[detail] -  void PointND::yInverse()
[detail] +  void PointND::yInverse(const CurvePointOptions * options)
[detail]    {
[detail] +    if(options) {
[detail] +      const PointNDOptions * po=static_cast<const PointNDOptions *>(options);
[detail] +      int index=po->index();
[detail] +      setY(index, 1.0/y(index));
[detail] +    } else {
[detail]      int n=count();
[detail]      for(int i=0; i<n; i++) {
[detail]        setY(i, 1.0/y(i));
[detail]      }
[detail]    }
[detail] +  }
[detail] +
[detail] +  void PointND::ySquare(const CurvePointOptions * options)
[detail] +  {
[detail] +    double v;
[detail] +    if(options) {
[detail] +      const PointNDOptions * po=static_cast<const PointNDOptions *>(options);
[detail] +      int index=po->index();
[detail] +      v=y(index);
[detail] +      setY(index, v*v);
[detail] +    } else {
[detail] +      int n=count();
[detail] +      for(int i=0; i<n; i++) {
[detail] +        v=y(i);
[detail] +        setY(i, v*v);
[detail] +      }
[detail] +    }
[detail] +  }
[detail] +
[detail] +  void PointND::ySqrt(const CurvePointOptions * options)
[detail] +  {
[detail] +    if(options) {
[detail] +      const PointNDOptions * po=static_cast<const PointNDOptions *>(options);
[detail] +      int index=po->index();
[detail] +      setY(index, sqrt(y(index)));
[detail] +    } else {
[detail] +      int n=count();
[detail] +      for(int i=0; i<n; i++) {
[detail] +        setY(i, sqrt(y(i)));
[detail] +      }
[detail] +    }
[detail] +  }
[detail]  
[detail]  } 
[detail]                   src/PointNDOptions.cpp:  version-1.5.2	not modified
[detail]                          src/Polygon.cpp:  version-1.5.2	not modified
[detail]                       src/Polynomial.cpp:  version-1.5.2	modified out of comments
[detail] --- src/Polynomial.cpp-version-1.5.2-stripped	2025-09-28 04:00:52.947444737 +0200
[detail] +++ src/Polynomial.cpp-HEAD-stripped	2025-09-28 04:00:52.951444757 +0200
[detail] @@ -37,6 +37,16 @@
[detail]      _coefficients[3]=c3;
[detail]    }
[detail]  
[detail] +  Polynomial::Polynomial(double c0, double c1, double c2, double c3, double c4)
[detail] +      : _coefficients(5)
[detail] +  {
[detail] +    _coefficients[0]=c0;
[detail] +    _coefficients[1]=c1;
[detail] +    _coefficients[2]=c2;
[detail] +    _coefficients[3]=c3;
[detail] +    _coefficients[4]=c4;
[detail] +  }
[detail] +
[detail]    void Polynomial::setDegree(int newDegree)
[detail]    {
[detail]      ASSERT(newDegree>=0);
[detail] @@ -86,7 +96,7 @@
[detail]        companion.at(i-1, d)=_coefficients.at(i-1)*inverseLeadingCoefficient;
[detail]      }
[detail]      companion.at(d, d)=_coefficients.at(d)*inverseLeadingCoefficient;
[detail] -    return companion.eigenValues();
[detail] +    return companion.eigenvalues();
[detail]    }
[detail]  
[detail]    VectorList<double> Polynomial::realRoots(double roundPrecision, double minImaginaryRatio) const
[detail] @@ -227,7 +237,7 @@
[detail]      _coefficients[d]=0.0;
[detail]    }
[detail]  
[detail] -  QString Polynomial::toString() const
[detail] +  QString Polynomial::toString(char format, int precision) const
[detail]    {
[detail]      const QString formatExpN("%1x^%2");
[detail]      const QString formatCoef1ExpN("x^%2");
[detail] @@ -243,7 +253,7 @@
[detail]        } else if(c==-1.0) {
[detail]          r="-"+formatCoef1ExpN.arg(d);
[detail]        } else {
[detail] -        r=formatExpN.arg(c).arg(d);
[detail] +        r=formatExpN.arg(c, 0, format, precision).arg(d);
[detail]        }
[detail]      }
[detail]      for(int i=d-1; i>1; i--) {
[detail] @@ -252,13 +262,13 @@
[detail]          if(c==1.0) {
[detail]            r+="+"+formatCoef1ExpN.arg(i);
[detail]          } else {
[detail] -          r+="+"+formatExpN.arg(c).arg(i);
[detail] +          r+="+"+formatExpN.arg(c, 0, format, precision).arg(i);
[detail]          }
[detail]        } else if(c<0.0) {
[detail]          if(c==-1.0) {
[detail]            r+="-"+formatCoef1ExpN.arg(i);
[detail]          } else {
[detail] -          r+=formatExpN.arg(c).arg(i);
[detail] +          r+=formatExpN.arg(c, 0, format, precision).arg(i);
[detail]          }
[detail]        }
[detail]      }
[detail] @@ -268,7 +278,7 @@
[detail]          if(c==-1.0) {
[detail]            r+="-"+formatCoef1Exp1;
[detail]          } else {
[detail] -          r+=formatExp1.arg(c);
[detail] +          r+=formatExp1.arg(c, 0, format, precision);
[detail]          }
[detail]        } else if(c>0.0) {
[detail]          if(!r.isEmpty()) {
[detail] @@ -277,16 +287,16 @@
[detail]          if(c==1.0) {
[detail]            r+=formatCoef1Exp1;
[detail]          } else {
[detail] -          r+=formatExp1.arg(c);
[detail] +          r+=formatExp1.arg(c, 0, format, precision);
[detail]          }
[detail]        }
[detail]      }
[detail]      if(d>=0) {
[detail]        const double& c=_coefficients.at(0);
[detail]        if(c>0.0 && !r.isEmpty()) {
[detail] -        r+="+"+formatExp0.arg(c);
[detail] +        r+="+"+formatExp0.arg(c, 0, format, precision);
[detail]        } else if(c!=0.0){
[detail] -        r+=formatExp0.arg(c);
[detail] +        r+=formatExp0.arg(c, 0, format, precision);
[detail]        }
[detail]      }
[detail]      return r;
[detail] @@ -312,5 +322,29 @@
[detail]      }
[detail]    }
[detail]  
[detail] +  double Polynomial::firstKindChebyshev(double x, int order)
[detail] +  {
[detail] +    switch(order) {
[detail] +    case 0:
[detail] +      return 1.0;
[detail] +    case 1:
[detail] +      return x;
[detail] +    case 2:
[detail] +      return 2.0*x*x-1;
[detail] +    default:
[detail] +      break;
[detail] +    }
[detail] +    double t[3];
[detail] +    t[0]=1.0;
[detail] +    t[1]=x;
[detail] +    t[2]=2.0*x*t[1]-t[0];  
[detail] +    for(int i=3; i<=order; i++) {
[detail] +      t[0]=t[1];
[detail] +      t[1]=t[2];
[detail] +      t[2]=2.0*x*t[1]-t[0];
[detail] +    }
[detail] +    return t[2];
[detail] +  }
[detail] +
[detail]  } 
[detail]  
[detail]               src/PolynomialFraction.cpp:  version-1.5.2	modified out of comments
[detail] --- src/PolynomialFraction.cpp-version-1.5.2-stripped	2025-09-28 04:00:52.967444834 +0200
[detail] +++ src/PolynomialFraction.cpp-HEAD-stripped	2025-09-28 04:00:52.975444874 +0200
[detail] @@ -25,12 +25,13 @@
[detail]      _denominator=tmp;
[detail]    }
[detail]  
[detail] -  QString PolynomialFraction::toString() const
[detail] +  QString PolynomialFraction::toString(char format, int precision) const
[detail]    {
[detail]      if(_denominator.degree()>0 || _denominator.coefficient(0)!=1.0) {
[detail] -      return "["+_numerator.toString()+"] / ["+_denominator.toString()+"]";
[detail] +      return "["+_numerator.toString(format, precision)+
[detail] +             "] / ["+_denominator.toString(format, precision)+"]";
[detail]      } else {
[detail] -      return "["+_numerator.toString()+"]";
[detail] +      return "["+_numerator.toString(format, precision)+"]";
[detail]      }
[detail]    }
[detail]  
[detail]               src/PrimeFactorization.cpp:  version-1.5.2	modified out of comments
[detail] --- src/PrimeFactorization.cpp-version-1.5.2-stripped	2025-09-28 04:00:52.991444950 +0200
[detail] +++ src/PrimeFactorization.cpp-HEAD-stripped	2025-09-28 04:00:52.995444970 +0200
[detail] @@ -172,7 +172,7 @@
[detail]    QString PrimeFactorization::toString() const
[detail]    {
[detail]      QString str;
[detail] -    if(_factors.count()>0) {
[detail] +    if(!_factors.isEmpty()) {
[detail]        const Factor& f=_factors[0];
[detail]        if(f.exponent==1) {
[detail]          str=QString::number(f.base);
[detail] @@ -188,6 +188,15 @@
[detail]          }
[detail]        }
[detail]      }
[detail] +    if(!_valid) {
[detail] +      if(str.isEmpty()) {
[detail] +        str+="?>"+QString::number(PRIMEFACTORIZATION_MAXIMUM_PRIME);
[detail] +      } else {
[detail] +        str+="*(";
[detail] +        str+="?>"+QString::number(PRIMEFACTORIZATION_MAXIMUM_PRIME);
[detail] +        str+=")";
[detail] +      }
[detail] +    }
[detail]      return str;
[detail]    }
[detail]    
[detail] @@ -266,6 +275,26 @@
[detail]      }
[detail]    }
[detail]  
[detail] +  int PrimeFactorization::closestValueAbove(int n, int maxPrime)
[detail] +  {
[detail] +    while(true) {
[detail] +      if(isValid(n, maxPrime)) {
[detail] +        return n;
[detail] +      }
[detail] +      n++;
[detail] +    }
[detail] +  }
[detail] +
[detail] +  int PrimeFactorization::closestValueBelow(int n, int maxPrime)
[detail] +  {
[detail] +    while(true) {
[detail] +      if(isValid(n, maxPrime)) {
[detail] +        return n;
[detail] +      }
[detail] +      n--;
[detail] +    }
[detail] +  }
[detail] +
[detail]    
[detail]    bool PrimeFactorization::test()
[detail]    {
[detail]                    src/PrivateVector.cpp:  version-1.5.2	not modified
[detail]                src/ProcessStatistics.cpp:  version-1.5.2	not modified
[detail]                      src/QGpCoreMath.cpp:  version-1.5.2	not modified
[detail]                           src/Random.cpp:  version-1.5.2	not modified
[detail]             src/RealStatisticalCurve.cpp:  version-1.5.2	not modified
[detail]             src/RealStatisticalProxy.cpp:  version-1.5.2	not modified
[detail]                             src/Rect.cpp:  version-1.5.2	not modified
[detail]                       src/RootSolver.cpp:  version-1.5.2	not modified
[detail]               src/SamplingParameters.cpp:  version-1.5.2	modified out of comments
[detail] --- src/SamplingParameters.cpp-version-1.5.2-stripped	2025-09-28 04:00:53.139445665 +0200
[detail] +++ src/SamplingParameters.cpp-HEAD-stripped	2025-09-28 04:00:53.147445704 +0200
[detail] @@ -322,16 +322,16 @@
[detail]        setCount();
[detail]        return ok;
[detail]      case 4:      
[detail] -      if(value=="y") {
[detail] +      if(Number::toBoolean(value, ok)) {
[detail]          setScaleType(Inverse);
[detail]        }
[detail] -      return true;
[detail] +      return ok;
[detail]      case 5:
[detail]        setStep(value.toDouble(&ok));
[detail]        return ok;
[detail]      case 6:
[detail]        setStepType(convertStepType(value, ok));
[detail] -      return true;
[detail] +      return ok;
[detail]      default:
[detail]        break;
[detail]      }
[detail]                            src/Scale.cpp:  version-1.5.2	modified out of comments
[detail] --- src/Scale.cpp-version-1.5.2-stripped	2025-09-28 04:00:53.163445782 +0200
[detail] +++ src/Scale.cpp-HEAD-stripped	2025-09-28 04:00:53.167445800 +0200
[detail] @@ -276,7 +276,7 @@
[detail]          if(delta<=300.0) {
[detail]            if(delta<=60.0) {
[detail]              
[detail] -            double expo=pow(10., floor(log10(delta)));
[detail] +            double expo=Number::exp10(Number::floorLog10(delta));
[detail]              delta/=expo;
[detail]              setTicks(delta, expo, dmajor, dminor);
[detail]              dmajor*=_majorTicks;
[detail] @@ -439,7 +439,7 @@
[detail]                
[detail]                
[detail]                delta=maxTime.date().year()-minTime.date().year();
[detail] -              double expo=pow(10., floor(log10(delta)));
[detail] +              double expo=Number::exp10(Number::floorLog10(delta));
[detail]                delta/=expo;
[detail]                setTicks(delta, expo, dmajor, dminor);
[detail]                imajor=qRound(dmajor*_majorTicks);
[detail] @@ -478,7 +478,7 @@
[detail]        _minorTicks=0.5;
[detail]        return;
[detail]      }
[detail] -    double expo=pow(10., floor(log10(delta)));
[detail] +    double expo=Number::exp10(Number::floorLog10(delta));
[detail]      delta/=expo;
[detail]      setTicks(delta, expo, _majorTicks, _minorTicks);
[detail]    }
[detail] @@ -513,6 +513,8 @@
[detail]      double visMin, visMax, majorTicks, minorTicks, baseTicks;
[detail]      double inv_majorTicks;
[detail]      double eps_baseTicks;
[detail] +    int octavePrecisionStep=1;
[detail] +    double octaveFactor=10;
[detail]  
[detail]      SAFE_UNINITIALIZED(visMin, 0.0)
[detail]      SAFE_UNINITIALIZED(visMax, 0.0)
[detail] @@ -544,22 +546,36 @@
[detail]      case Log:
[detail]        visMin=_minimum;
[detail]        visMax=_maximum;
[detail] -      baseTicks=pow(10.0, floor(log10(visMin)));
[detail] +      baseTicks=Number::exp10(Number::floorLog10(visMin));
[detail]        majorTicks=baseTicks*_majorTicks;
[detail]        minorTicks=baseTicks*_minorTicks;
[detail]        inv_majorTicks=1.0/majorTicks;
[detail]        baseTicks*=10.0;
[detail]        eps_baseTicks=baseTicks*(1-1e-10);
[detail] +      octavePrecisionStep=Number::floorLog10(_majorTicks);
[detail] +      if(octavePrecisionStep<=1) {
[detail] +        octavePrecisionStep=1;
[detail] +        octaveFactor=10.0;
[detail] +      } else {
[detail] +        octaveFactor=Number::exp10(octavePrecisionStep);
[detail] +      }
[detail]        break;
[detail]      case InverseLog:
[detail]        visMin=1.0/_maximum;
[detail]        visMax=1.0/_minimum;
[detail] -      baseTicks=pow(10.0, floor(log10(visMin)));
[detail] +      baseTicks=Number::exp10(Number::floorLog10(visMin));
[detail]        majorTicks=baseTicks*_majorTicks;
[detail]        minorTicks=baseTicks*_minorTicks;
[detail]        inv_majorTicks=1.0/majorTicks;
[detail]        baseTicks*=10.0;
[detail]        eps_baseTicks=baseTicks*(1-1e-10);
[detail] +      octavePrecisionStep=Number::floorLog10(_majorTicks);
[detail] +      if(octavePrecisionStep<=1) {
[detail] +        octavePrecisionStep=1;
[detail] +        octaveFactor=10.0;
[detail] +      } else {
[detail] +        octaveFactor=Number::exp10(octavePrecisionStep);
[detail] +      }
[detail]        break;
[detail]      }
[detail]      int numberPrecision=0;
[detail] @@ -572,6 +588,7 @@
[detail]        case Linear:
[detail]        case RelativeTime:
[detail]        case Inverse:
[detail] +        if(fabs(visMax-majorX)<1000.0*majorTicks) {
[detail]          while(majorX<=visMax) {
[detail]            _majorTickValues.append(majorX);
[detail]            minorX=majorX;
[detail] @@ -594,22 +611,26 @@
[detail]            _minorTickValues.prepend(minorX);
[detail]            if(!safeSubtract(minorX, originalMinorTicks)) break;
[detail]          }
[detail] +        }
[detail]          break;
[detail]        case Log:
[detail]        case InverseLog:
[detail]          if(majorX>eps_baseTicks) {  
[detail] -          numberPrecision++;
[detail] +          numberPrecision+=octavePrecisionStep;
[detail]          }
[detail]          while(majorX<=visMax) {
[detail]            _majorTickValues.append(majorX);
[detail]            if(majorX>eps_baseTicks) {
[detail] -            majorTicks*=10.0;
[detail] -            minorTicks*=10.0;
[detail] -            baseTicks*=10.0;
[detail] +            majorTicks*=octaveFactor;
[detail] +            minorTicks*=octaveFactor;
[detail] +            baseTicks*=octaveFactor;
[detail]              eps_baseTicks=baseTicks*(1.0-1e-10);
[detail] -            numberPrecision--;
[detail] +            numberPrecision-=octavePrecisionStep;
[detail]              minorX=majorX;
[detail] -            if(!safeAdd(minorX, minorTicks)) break;
[detail] +            if(!safeAdd(minorX, minorTicks)) {
[detail] +              _majorTickPrecision.append(numberPrecision);
[detail] +              break;
[detail] +            }
[detail]              if(majorTicks>majorX) {
[detail]                majorX=majorTicks;
[detail]              } else {
[detail] @@ -617,8 +638,11 @@
[detail]              }
[detail]            } else {
[detail]              minorX=majorX;
[detail] -            if(!safeAdd(minorX, minorTicks)) break;
[detail] -            if(!safeAdd(majorX, majorTicks)) break;
[detail] +            if(!safeAdd(minorX, minorTicks) ||
[detail] +                !safeAdd(majorX, majorTicks)) {
[detail] +              _majorTickPrecision.append(numberPrecision);
[detail] +              break;
[detail] +            }
[detail]            }
[detail]            _majorTickPrecision.append(numberPrecision);
[detail]            if(majorX<visMax) {
[detail]                          src/Segment.cpp:  version-1.5.2	not modified
[detail]                        src/Segment2D.cpp:  version-1.5.2	not modified
[detail]                          src/Simplex.cpp:  version-1.5.2	not modified
[detail]              src/SmoothingParameters.cpp:  version-1.5.2	not modified
[detail]                     src/SparseMatrix.cpp:  version-1.5.2	not modified
[detail]                     src/SparseVector.cpp:  version-1.5.2	no last version available
[detail]                  src/SparseVectorMap.cpp:  version-1.5.2	no last version available
[detail]                           src/Sphere.cpp:  version-1.5.2	not modified
[detail]                   src/StatComparator.cpp:  version-1.5.2	not modified
[detail]                       src/StationXML.cpp:  version-1.5.2	no last version available
[detail]                     src/Stationarity.cpp:  version-1.5.2	not modified
[detail]                 src/StatisticalPoint.cpp:  version-1.5.2	not modified
[detail]                 src/StatisticalValue.cpp:  version-1.5.2	not modified
[detail]                       src/Statistics.cpp:  version-1.5.2	modified out of comments
[detail] --- src/Statistics.cpp-version-1.5.2-stripped	2025-09-28 04:00:53.359446728 +0200
[detail] +++ src/Statistics.cpp-HEAD-stripped	2025-09-28 04:00:53.363446748 +0200
[detail] @@ -15,6 +15,8 @@
[detail]      _sum2=0.0;
[detail]      _sumWeight=0.0;
[detail]      _sumWeight2=0.0;
[detail] +    _min=std::numeric_limits<double>::infinity();
[detail] +    _max=-std::numeric_limits<double>::infinity();
[detail]    }
[detail]  
[detail]    
[detail] @@ -25,6 +27,12 @@
[detail]      _sum2+=c*val;
[detail]      _sumWeight+=weight;
[detail]      _sumWeight2+=weight*weight;
[detail] +    if(val<_min) {
[detail] +      _min=val;
[detail] +    }
[detail] +    if(val>_max) {
[detail] +      _max=val;
[detail] +    }
[detail]    }
[detail]  
[detail]    double Statistics::mean() const
[detail]             src/SteepestOptimization.cpp:  version-1.5.2	no last version available
[detail]                  src/SymmetricMatrix.cpp:  version-1.5.2	no last version available
[detail]                         src/Triangle.cpp:  version-1.5.2	not modified
[detail]                 src/TriangularMatrix.cpp:  version-1.5.2	not modified
[detail]                   src/TwiddleFactors.cpp:  version-1.5.2	not modified
[detail]                          src/UtmZone.cpp:  version-1.5.2	modified out of comments
[detail] --- src/UtmZone.cpp-version-1.5.2-stripped	2025-09-28 04:00:53.439447116 +0200
[detail] +++ src/UtmZone.cpp-HEAD-stripped	2025-09-28 04:00:53.443447134 +0200
[detail] @@ -172,11 +172,11 @@
[detail]    }
[detail]  
[detail]    
[detail] -  void UtmZone::fromString(const QString& zone)
[detail] +  bool UtmZone::fromString(const QString& zone)
[detail]    {
[detail]      if(zone.isEmpty()) {
[detail]        *this=UtmZone();
[detail] -      return;
[detail] +      return true;
[detail]      }
[detail]      char l=zone[zone.size()-1].toUpper().toLatin1();
[detail]      switch(l) {
[detail] @@ -212,15 +212,25 @@
[detail]      case 'Z':
[detail]        _y=21;
[detail]        break;
[detail] +    case '#':
[detail] +      if(zone=="###") {
[detail] +        *this=UtmZone();
[detail] +        return true;
[detail] +      }
[detail] +      break;
[detail]      default:
[detail]        *this=UtmZone();
[detail] -      return;
[detail] +      App::log(tr("invalid utm zone '%1'\n").arg(zone));
[detail] +      return false;
[detail]      }
[detail]      bool ok;
[detail]      _x=zone.left(zone.size()-1).toInt(&ok);
[detail]      if(!ok || _x<1 || _x>60) {
[detail]        *this=UtmZone();
[detail] +      App::log(tr("invalid utm zone '%1'\n").arg(zone));
[detail] +      return false;
[detail]      }
[detail] +    return true;
[detail]    }
[detail]  
[detail]    
[detail] @@ -238,7 +248,7 @@
[detail]      default:
[detail]        ref.setY((_y << 3)-76.0);
[detail]      }
[detail] -    APP_LOG(1, tr("Reference for UTM zone %1 (%2, %3): %4\n")
[detail] +    APP_LOG(3, tr("Reference for UTM zone %1 (%2, %3): %4\n")
[detail]              .arg(toString())
[detail]              .arg(_x).arg(_y)
[detail]              .arg(ref.toString()));
[detail]                            src/Value.cpp:  version-1.5.2	not modified
[detail]                           src/Vector.cpp:  version-1.5.2	modified out of comments
[detail] --- src/Vector.cpp-version-1.5.2-stripped	2025-09-28 04:00:53.475447289 +0200
[detail] +++ src/Vector.cpp-HEAD-stripped	2025-09-28 04:00:53.479447309 +0200
[detail] @@ -39,10 +39,12 @@
[detail]    
[detail]  
[detail]    
[detail] +
[detail] +  
[detail]    VectorList<double> qVector(const Vector<double>& v)
[detail]    {
[detail] -    VectorList<double> qv(v.count());
[detail] -    for(int i=v.count()-1; i>=0; i--) {
[detail] +    VectorList<double> qv(v.size());
[detail] +    for(int i=v.size()-1; i>=0; i--) {
[detail]        qv[i]=v[i];
[detail]      }
[detail]      return qv;
[detail]                   src/WindowFunction.cpp:  version-1.5.2	not modified
[detail]         src/WindowFunctionParameters.cpp:  version-1.5.2	modified out of comments
[detail] --- src/WindowFunctionParameters.cpp-version-1.5.2-stripped	2025-09-28 04:00:53.511447463 +0200
[detail] +++ src/WindowFunctionParameters.cpp-HEAD-stripped	2025-09-28 04:00:53.515447483 +0200
[detail] @@ -15,13 +15,6 @@
[detail]      _alpha=0.5;
[detail]    }
[detail]  
[detail] -  ENUM_AS_STRING_BEGIN(WindowFunctionParameters, Shape)
[detail] -  ENUM_AS_STRING_DATA_18(Bartlett, BartlettHann, Blackman, BlackmanHarris, BlackmanNuttall,
[detail] -                         Cosine, FlatTop, Gaussian, Hamming, Hann, KonnoOhmachi, Lanczos,
[detail] -                         Nuttall, Parzen, Rectangular, Triangular, Tukey, Welch);
[detail] -  ENUM_AS_STRING_SYNONYM("Tuckey", Tukey);
[detail] -  ENUM_AS_STRING_END
[detail] -
[detail]    QString WindowFunctionParameters::toString(PARAMETERS_TOSTRING_ARGS_IMPL) const
[detail]    {
[detail]      TRACE;
[detail] @@ -66,8 +59,8 @@
[detail]        _shape=convertShape(value, ok);
[detail]        return ok;
[detail]      case 1:
[detail] -      setReversed(value=="y");
[detail] -      return true;
[detail] +      setReversed(Number::toBoolean(value, ok));
[detail] +      return ok;
[detail]      case 2:
[detail]        setSigma(value.toDouble(&ok));
[detail]        return ok;
[detail] @@ -130,4 +123,11 @@
[detail]      }
[detail]    }
[detail]  
[detail] +  ENUM_AS_STRING_BEGIN(WindowFunctionParameters, Shape)
[detail] +  ENUM_AS_STRING_DATA_18(Bartlett, BartlettHann, Blackman, BlackmanHarris, BlackmanNuttall,
[detail] +                         Cosine, FlatTop, Gaussian, Hamming, Hann, KonnoOhmachi, Lanczos,
[detail] +                         Nuttall, Parzen, Rectangular, Triangular, Tukey, Welch);
[detail] +  ENUM_AS_STRING_SYNONYM("Tuckey", Tukey);
[detail] +  ENUM_AS_STRING_END
[detail] +
[detail]  } 
[detail]                src/XUniqueYColorData.cpp:  version-1.5.2	not modified
[detail]               src/AbstractColorPalette.h:  version-1.5.2	modified out of comments
[detail] --- src/AbstractColorPalette.h-version-1.5.2-stripped	2025-09-28 04:00:53.547447638 +0200
[detail] +++ src/AbstractColorPalette.h-HEAD-stripped	2025-09-28 04:00:53.551447656 +0200
[detail] @@ -14,7 +14,7 @@
[detail]      AbstractColorPalette() {}
[detail]      virtual ~AbstractColorPalette() {}
[detail]  
[detail] -    virtual void generate(int imin, int imax, const QString& model=ColorPalette::defaultSequential,
[detail] +    virtual void generate(int imin, int imax, int step, const QString& model=ColorPalette::defaultSequential,
[detail]                            ColorPalette::Options options=ColorPalette::Continuous,
[detail]                            quint16 transparency=COLOR_COMPONENT_MAX)=0;
[detail]      virtual void toGray()=0;
[detail]        src/AbstractComplexPointOptions.h:  version-1.5.2	not modified
[detail]                   src/AbstractFunction.h:  version-1.5.2	modified out of comments
[detail] --- src/AbstractFunction.h-version-1.5.2-stripped	2025-09-28 04:00:53.583447811 +0200
[detail] +++ src/AbstractFunction.h-HEAD-stripped	2025-09-28 04:00:53.583447811 +0200
[detail] @@ -6,12 +6,13 @@
[detail]  #include <QtCore>
[detail]  
[detail]  #include "QGpCoreMathDLLExport.h"
[detail] -#include "FunctionSearchMaximum.h"
[detail] +#include "FunctionSearchExtremum.h"
[detail]  #include "PrivateVector.h"
[detail] +#include "SymmetricMatrix.h"
[detail]  
[detail]  namespace QGpCoreMath {
[detail]  
[detail] -  class FunctionSearchMaximum;
[detail] +  class FunctionSearchExtremum;
[detail]  
[detail]    class QGPCOREMATH_EXPORT AbstractFunction
[detail]    {
[detail] @@ -22,55 +23,44 @@
[detail]      class Properties
[detail]      {
[detail]      public:
[detail] -      Properties(int dimensionCount) : gradient(dimensionCount, 0.0) {value=0.0;}
[detail] +      Properties(int size) : gradient(size, 0.0) {value=0.0;}
[detail]  
[detail]        double value;
[detail]        PrivateVector<double> gradient;
[detail]      };
[detail]  
[detail] +    virtual bool isValid(double , double /*theta*/=0.0) const {return true;}
[detail] +    virtual bool isValid(Vector<double>& ) const {return true;}
[detail] +
[detail] +    virtual double value(double x) const;
[detail] +    virtual double gradient(double x) const;
[detail] +    virtual double hessian(double x) const;
[detail] +
[detail]      virtual double value(const Vector<int>& index) const;
[detail]      virtual double value(Vector<double>& x) const;
[detail]      virtual double valueFixed(const Vector<double>& x) const;
[detail] +    virtual void canonical(Vector<double>& x) const {Q_UNUSED(x);}
[detail] +
[detail]      virtual void gradient(const Vector<double>& x, Vector<double>& grad) const;
[detail] +
[detail] +    virtual double hessianDiagonalElement(const Vector<double>& x, int index) const;
[detail] +    virtual void hessianOffDiagonalElements(const Vector<double>& x, SymmetricMatrix& hessian) const;
[detail] +    virtual void hessian(const Vector<double>& x, SymmetricMatrix& hessian) const;
[detail] +
[detail] +    void numericalGradient(const Vector<double>& x, Vector<double>& grad) const;
[detail] +    void numericalHessian(const Vector<double>& x, SymmetricMatrix& hessian) const;
[detail] +
[detail]      virtual double admissibleStep(const Vector<double>& x, const Vector<double>& step) const;
[detail]  
[detail]      virtual double concavity(const Vector<double>& x, int axis) const {Q_UNUSED(x); Q_UNUSED(axis); return 0.0;}
[detail]      virtual void stepDirection(const Vector<double>& x, Vector<double>& dir) const;
[detail]  
[detail]      double maximumValue(Vector<double>& x, int axis) const;
[detail] -    inline double gradientLength2D(const Vector<double>& x, int axis1, int axis2) const;
[detail] -    inline double gradientDirection2D(const Vector<double>& x, int axis1, int axis2) const;
[detail] -    inline double stepLength2D(const Vector<double>& x, int axis1, int axis2) const;
[detail] -    inline double stepDirection2D(const Vector<double>& x, int axis1, int axis2) const;
[detail] -  };
[detail] -
[detail] -  inline double AbstractFunction::gradientLength2D(const Vector<double>& x, int axis1, int axis2) const
[detail] -  {
[detail] -    PrivateVector<double> g(x.count(), 0.0);
[detail] -    gradient(x, g);
[detail] -    return g.length(axis1, axis2);
[detail] -  }
[detail]  
[detail] -  inline double AbstractFunction::gradientDirection2D(const Vector<double>& x, int axis1, int axis2) const
[detail] -  {
[detail] -    PrivateVector<double> g(x.count(), 0.0);
[detail] -    gradient(x, g);
[detail] -    return g.azimuth(axis1, axis2);
[detail] -  }
[detail] -
[detail] -  inline double AbstractFunction::stepLength2D(const Vector<double>& x, int axis1, int axis2) const
[detail] -  {
[detail] -    PrivateVector<double> dir(x.count(), 0.0);
[detail] -    stepDirection(x, dir);
[detail] -    return dir.length(axis1, axis2);
[detail] -  }
[detail] -
[detail] -  inline double AbstractFunction::stepDirection2D(const Vector<double>& x, int axis1, int axis2) const
[detail] -  {
[detail] -    PrivateVector<double> dir(x.count(), 0.0);
[detail] -    stepDirection(x, dir);
[detail] -    return dir.azimuth(axis1, axis2);
[detail] -  }
[detail] +    void numerical(const Vector<double>& x, const Vector<double>& dx,
[detail] +                   Vector<double>& grad, SymmetricMatrix& hessian) const;
[detail] +    void timeReport(Vector<double>& x) const;
[detail] +  };
[detail]  
[detail]  } 
[detail]  
[detail]             src/AbstractNumericalCache.h:  version-1.5.2	modified out of comments
[detail] --- src/AbstractNumericalCache.h-version-1.5.2-stripped	2025-09-28 04:00:53.599447889 +0200
[detail] +++ src/AbstractNumericalCache.h-HEAD-stripped	2025-09-28 04:00:53.603447908 +0200
[detail] @@ -38,6 +38,7 @@
[detail]    };
[detail]  
[detail]    inline AbstractNumericalCache::AbstractNumericalCache(AbstractNumericalKey * key)
[detail] +      : _locked(QReadWriteLock::Recursive)
[detail]    {
[detail]      _key=key;
[detail]      _lastUse=clock();
[detail]               src/AbstractNumericalKey.h:  version-1.5.2	modified out of comments
[detail] --- src/AbstractNumericalKey.h-version-1.5.2-stripped	2025-09-28 04:00:53.619447986 +0200
[detail] +++ src/AbstractNumericalKey.h-HEAD-stripped	2025-09-28 04:00:53.623448004 +0200
[detail] @@ -16,7 +16,7 @@
[detail]    virtual ~AbstractNumericalKey() {}
[detail]  
[detail]    virtual bool operator==(const AbstractNumericalKey& o)=0;
[detail] -  virtual int hash() const=0;
[detail] +  virtual size_t hash() const=0;
[detail]    virtual AbstractNumericalCache * createCache()=0;
[detail]  
[detail]    virtual int id() const=0;
[detail]                              src/Angle.h:  version-1.5.2	not modified
[detail]                        src/AngleSearch.h:  version-1.5.2	not modified
[detail]                       src/AverageAngle.h:  version-1.5.2	not modified
[detail]                            src/BSpline.h:  version-1.5.2	not modified
[detail]                    src/BasicCurveProxy.h:  version-1.5.2	not modified
[detail]                  src/BoundedParameters.h:  version-1.5.2	no last version available
[detail]                   src/ChangeOfVariable.h:  version-1.5.2	no last version available
[detail]                      src/ChiSquareTest.h:  version-1.5.2	not modified
[detail]                             src/Circle.h:  version-1.5.2	not modified
[detail]                            src/Cluster.h:  version-1.5.2	not modified
[detail]                           src/ColorMap.h:  version-1.5.2	modified out of comments
[detail] --- src/ColorMap.h-version-1.5.2-stripped	2025-09-28 04:00:53.779448759 +0200
[detail] +++ src/ColorMap.h-HEAD-stripped	2025-09-28 04:00:53.783448777 +0200
[detail] @@ -30,7 +30,7 @@
[detail]  
[detail]      ColorPalette palette() const;
[detail]      void setPalette(const ColorPalette& pal);
[detail] -    void generate(int imin, int imax, const QString& model=ColorPalette::defaultSequential,
[detail] +    void generate(int imin, int imax, int step=1, const QString& model=ColorPalette::defaultSequential,
[detail]                    ColorPalette::Options options=ColorPalette::Continuous,
[detail]                    quint16 transparency=COLOR_COMPONENT_MAX);
[detail]      void toGray();
[detail]                       src/ColorMapData.h:  version-1.5.2	modified out of comments
[detail] --- src/ColorMapData.h-version-1.5.2-stripped	2025-09-28 04:00:53.803448874 +0200
[detail] +++ src/ColorMapData.h-HEAD-stripped	2025-09-28 04:00:53.803448874 +0200
[detail] @@ -24,7 +24,7 @@
[detail]  
[detail]      ColorPalette palette() const {return _palette;}
[detail]      void setPalette(const ColorPalette& pal);
[detail] -    inline void generate(int imin, int imax, const QString& model,
[detail] +    inline void generate(int imin, int imax, int step, const QString& model,
[detail]                           ColorPalette::Options options=ColorPalette::Continuous,
[detail]                           quint16 transparency=COLOR_COMPONENT_MAX);
[detail]      inline void toGray();
[detail] @@ -55,13 +55,13 @@
[detail]      int _n2;
[detail]    };
[detail]  
[detail] -  inline void ColorMapData::generate(int imin, int imax, const QString& model,
[detail] +  inline void ColorMapData::generate(int imin, int imax, int step, const QString& model,
[detail]                                       ColorPalette::Options options, quint16 transparency)
[detail]    {
[detail]      if(imax>_palette.count()-1) {
[detail]        resize(imax+1);
[detail]      }
[detail] -    _palette.generate(imin, imax, model, options, transparency);
[detail] +    _palette.generate(imin, imax, step, model, options, transparency);
[detail]    }
[detail]  
[detail]    inline void ColorMapData::toGray()
[detail]                       src/ColorPalette.h:  version-1.5.2	modified out of comments
[detail] --- src/ColorPalette.h-version-1.5.2-stripped	2025-09-28 04:00:53.823448970 +0200
[detail] +++ src/ColorPalette.h-HEAD-stripped	2025-09-28 04:00:53.827448990 +0200
[detail] @@ -35,7 +35,7 @@
[detail]      Q_DECLARE_FLAGS(Options, Option)
[detail]      ENUM_AS_STRING_DECL(Option)
[detail]  
[detail] -    void generate(int imin, int imax, const QString& model=defaultSequential,
[detail] +    void generate(int imin, int imax, int step, const QString& model=defaultSequential,
[detail]                    Options options=Continuous, quint16 transparency=COLOR_COMPONENT_MAX);
[detail]      void setWhiteTransparent(bool b);
[detail]  
[detail]                 src/ColorPaletteModels.h:  version-1.5.2	not modified
[detail]             src/CompactSymmetricMatrix.h:  version-1.5.2	no last version available
[detail]                 src/ComplexExponential.h:  version-1.5.2	not modified
[detail]                    src/ComplexMPMatrix.h:  version-1.5.2	not modified
[detail]                      src/ComplexMatrix.h:  version-1.5.2	modified out of comments
[detail] --- src/ComplexMatrix.h-version-1.5.2-stripped	2025-09-28 04:00:53.903449358 +0200
[detail] +++ src/ComplexMatrix.h-HEAD-stripped	2025-09-28 04:00:53.907449378 +0200
[detail] @@ -5,6 +5,7 @@
[detail]  
[detail]  #include "Matrix.h"
[detail]  #include "MatrixIterator.h"
[detail] +#include "PrivateVector.h"
[detail]  #include "QGpCoreMathDLLExport.h"
[detail]  
[detail]  namespace QGpCoreMath {
[detail] @@ -15,28 +16,28 @@
[detail]    {
[detail]    public:
[detail]      ComplexMatrix() : Matrix<Complex>() {}
[detail] -    ComplexMatrix(int ndim) : Matrix<Complex>(ndim, ndim) {}
[detail] +    ComplexMatrix(int size) : Matrix<Complex>(size) {}
[detail]      ComplexMatrix(int nrow, int ncol) : Matrix<Complex>(nrow, ncol) {}
[detail] -    ComplexMatrix(const Matrix<Complex> m) : Matrix<Complex>(m) {}
[detail] +    ComplexMatrix(const Matrix<Complex>& m) : Matrix<Complex>(m) {}
[detail]  
[detail]      void operator*=(double v);
[detail]      void operator*=(const ComplexMatrix& m) {Matrix<Complex>::operator*=(m);}
[detail]      void operator*=(const Complex& v) {Matrix<Complex>::operator*=(v);}
[detail] -    ComplexMatrix dotMultiply(const ComplexMatrix& m) const {return Matrix<Complex>::dotMultiply(m);}
[detail] -    ComplexMatrix dotMultiply(const DoubleMatrix& m) const;
[detail] +    void dotMultiply(const ComplexMatrix& m) {Matrix<Complex>::dotMultiply(m);}
[detail] +    void dotMultiply(const DoubleMatrix& m);
[detail]  
[detail]      void rand();
[detail]      ComplexMatrix conjugate() const;
[detail]      void conjugateTransposeVector();
[detail] -    ComplexMatrix conjugateTransposedVector();
[detail] +    ComplexMatrix conjugateTransposedVector() const;
[detail]      bool invert();
[detail]      bool choleskyInvert();
[detail] -    bool singularValue(VectorList<double>& sigma, ComplexMatrix& u, ComplexMatrix& vt) const;
[detail] -    bool invert(const ComplexMatrix& u, const VectorList<double>& sigma, const ComplexMatrix& vt);
[detail] -    bool pseudoInvert(const ComplexMatrix& u, const VectorList<double>& sigma, const ComplexMatrix& vt);
[detail] -    VectorList<double> hermitianEigenValues(ComplexMatrix& u, bool& ok) const;
[detail] +    bool singularValue(PrivateVector<double>& sigma, ComplexMatrix& u, ComplexMatrix& vt) const;
[detail] +    bool invert(const ComplexMatrix& u, const Vector<double>& sigma, const ComplexMatrix& vt);
[detail] +    bool pseudoInvert(const ComplexMatrix& u, const Vector<double>& sigma, const ComplexMatrix& vt);
[detail] +    VectorList<double> hermitianEigenvalues(ComplexMatrix& u, bool& ok) const;
[detail]      QString toUserString(char format='g', int precision=6) const;
[detail] -  private:
[detail] +    double identityMisfit() const;
[detail]      void hermitianUpToLow();
[detail]    };
[detail]  
[detail]                src/ComplexPointOptions.h:  version-1.5.2	not modified
[detail]            src/ComplexStatisticalProxy.h:  version-1.5.2	not modified
[detail]                   src/ConcentricSearch.h:  version-1.5.2	not modified
[detail]                     src/CoordinateFile.h:  version-1.5.2	not modified
[detail]                         src/Covariance.h:  version-1.5.2	not modified
[detail]                      src/CubicEquation.h:  version-1.5.2	not modified
[detail]                        src/CubicSpline.h:  version-1.5.2	not modified
[detail]                              src/Curve.h:  version-1.5.2	modified out of comments
[detail] --- src/Curve.h-version-1.5.2-stripped	2025-09-28 04:00:54.031449977 +0200
[detail] +++ src/Curve.h-HEAD-stripped	2025-09-28 04:00:54.035449995 +0200
[detail] @@ -33,9 +33,11 @@
[detail]  
[detail]      bool operator==(const Curve<pointType>& o) const {return VectorList<pointType>::operator==(o);}
[detail]      bool operator<(const Curve<pointType>& o) const;
[detail] -    int count() const {return VectorList<pointType>::count();}
[detail] +    int count() const {return VectorList<pointType>::size();}
[detail] +    int size() const {return VectorList<pointType>::size();}
[detail]      bool isEmpty() const {return VectorList<pointType>::isEmpty();}
[detail] -    void resize(int n) {if(n>count()) {_sorted=false;} VectorList<pointType>::resize(n);}
[detail] +    void resize(int n) {if(n>size()) {_sorted=false;} VectorList<pointType>::resize(n);}
[detail] +    void reserve(int n) {VectorList<pointType>::reserve(n);}
[detail]      int indexAfter(double valX) const;
[detail]      int indexOf(double valX, double relPrec) const;
[detail]      int indexOf(const pointType& p) const {return VectorList<pointType>::indexOf(p);}
[detail] @@ -118,8 +120,7 @@
[detail]                              SamplingOptions options=LinearScale, const CurvePointOptions * pointOptions=nullptr);
[detail]  
[detail]      bool leastSquare(double& a, double& b, const CurvePointOptions * pointOptions=nullptr) const;
[detail] -    double azimuth(const CurvePointOptions * pointOptions=nullptr) const;
[detail] -    VectorList<double> project(const CurvePointOptions * pointOptions=nullptr) const;
[detail] +    VectorList<double> project(double a, double b, const CurvePointOptions * pointOptions=nullptr) const;
[detail]  
[detail]      void swapXY(const CurvePointOptions * pointOptions=nullptr);
[detail]      Curve<pointType> derivative(const CurvePointOptions * pointOptions=nullptr) const;
[detail] @@ -145,7 +146,7 @@
[detail]      Curve<Point2D> xyCurve() const;
[detail]  
[detail]      QString toString(char format='g', int precision=6) const;
[detail] -    bool fromStream(QTextStream& s, QString * comments=nullptr);
[detail] +    bool fromStream(QTextStream& s, QString * comments=nullptr, QString * nextComments=nullptr);
[detail]  
[detail]      void operator+=(const Curve<pointType>& o);
[detail]      void operator*=(const Curve<pointType>& o);
[detail] @@ -217,9 +218,9 @@
[detail]        std::sort(begin(), end(), lessThan);
[detail]        
[detail]        Curve<pointType> f;
[detail] -      f.reserve(f.count());
[detail] +      f.reserve(f.size());
[detail]        f.append(constAt(0));
[detail] -      for(int i=1; i<count(); i++) {
[detail] +      for(int i=1; i<size(); i++) {
[detail]          if(x(i-1)!=x(i)) {
[detail]            f.append(constAt(i));
[detail]          }
[detail] @@ -234,7 +235,7 @@
[detail]    template <class pointType>
[detail]    void Curve<pointType>::checkSort()
[detail]    {
[detail] -    int n=count();
[detail] +    int n=size();
[detail]      for(int i=1; i<n; i++) {
[detail]        if(x(i-1)>=x(i)) {
[detail]          _sorted=false;
[detail] @@ -247,9 +248,9 @@
[detail]    template <class pointType>
[detail]    bool Curve<pointType>::operator<(const Curve<pointType>& o) const
[detail]    {
[detail] -    int n=count();
[detail] -    if(o.count()<n) {
[detail] -      n=o.count();
[detail] +    int n=size();
[detail] +    if(o.size()<n) {
[detail] +      n=o.size();
[detail]      }
[detail]      for(int i=0; i<n; i++) {
[detail]        if(constAt(i)<o.constAt(i)) {
[detail] @@ -258,7 +259,7 @@
[detail]          return false;
[detail]        }
[detail]      }
[detail] -    return count()<o.count();
[detail] +    return size()<o.size();
[detail]    }
[detail]  
[detail]    template <class pointType>
[detail] @@ -281,12 +282,12 @@
[detail]      if(valX<=firstX()) {
[detail]        return 0;
[detail]      }
[detail] -    int lasti=count()-1;
[detail] +    int lasti=size()-1;
[detail]      if(valX>x(lasti)) {
[detail]        return lasti+1;
[detail]      }
[detail]      int i=1;
[detail] -    while(i<count()) {
[detail] +    while(i<size()) {
[detail]        i=i << 1;
[detail]      }
[detail]      int step2=i >> 1;
[detail] @@ -322,12 +323,12 @@
[detail]      } else if(valXLow<firstX()) {
[detail]        return 0;
[detail]      }
[detail] -    int lasti=count()-1;
[detail] +    int lasti=size()-1;
[detail]      if(valXLow>x(lasti)) {
[detail]        return -1;
[detail]      }
[detail]      int i=1;
[detail] -    while(i<count()) {
[detail] +    while(i<size()) {
[detail]        i=i << 1;
[detail]      }
[detail]      int step2=i >> 1;
[detail] @@ -364,8 +365,8 @@
[detail]      i=indexAfter(xMax);
[detail]      if(i<indexMax) {
[detail]        indexMax=i;
[detail] -      if(indexMax>=count()) {
[detail] -        indexMax=count()-1;
[detail] +      if(indexMax>=size()) {
[detail] +        indexMax=size()-1;
[detail]        }
[detail]      }
[detail]  
[detail] @@ -375,14 +376,14 @@
[detail]    bool Curve<pointType>::isInsideRange(double x) const
[detail]    {
[detail]      ASSERT(_sorted);
[detail] -    if(count()<2) {
[detail] -      if(count()==1) {
[detail] +    if(size()<2) {
[detail] +      if(size()==1) {
[detail]          return constAt(0).x()==x;
[detail]        } else {
[detail]          return false;
[detail]        }
[detail]      } else {
[detail] -      int firstIndex=0, lastIndex=count()-1;
[detail] +      int firstIndex=0, lastIndex=size()-1;
[detail]        firstValid(firstIndex);
[detail]        lastValid(lastIndex);
[detail]        return constAt(firstIndex).x()*(1.0-1e-12) <=x &&
[detail] @@ -396,8 +397,8 @@
[detail]                                          SamplingOptions ySampling) const
[detail]    {
[detail]      ASSERT(_sorted);
[detail] -    if(count()<2) {
[detail] -      if(count()==1) {
[detail] +    if(size()<2) {
[detail] +      if(size()==1) {
[detail]          return constAt(0);
[detail]        } else {
[detail]          return pointType();
[detail] @@ -405,7 +406,7 @@
[detail]      } else {
[detail]        int i=indexAfter(x);
[detail]        if(i==0) i++;                
[detail] -      else if(i==count()) i--;
[detail] +      else if(i==size()) i--;
[detail]        pointType p;
[detail]        p.interpole(x, constAt(i-1), constAt(i), xSampling, ySampling);
[detail]        return p;
[detail] @@ -416,7 +417,7 @@
[detail]    void Curve<pointType>::insert(const pointType& p)
[detail]    {
[detail]      TRACE;
[detail] -    if(count()<2) {
[detail] +    if(size()<2) {
[detail]        if(isEmpty()) {
[detail]          VectorList<pointType>::append(p);
[detail]        } else if(p.x()<firstX()) {
[detail] @@ -429,7 +430,7 @@
[detail]        _sorted=true;
[detail]      } else {
[detail]        int i=indexAfter(p.x());
[detail] -      if(i<count() && x(i)==p.x()) {
[detail] +      if(i<size() && x(i)==p.x()) {
[detail]          (*this)[i]=p;
[detail]        } else {
[detail]          if(interpole(p.x(), LinearScale, LinearScale).y()!=p.y()) {
[detail] @@ -464,7 +465,7 @@
[detail]        if(max>VectorList<pointType>::last().x())
[detail]          max=VectorList<pointType>::last().x();
[detail]      }
[detail] -    int currentN=count();
[detail] +    int currentN=size();
[detail]  
[detail]      
[detail]      Curve<Point2D> distances(currentN);
[detail] @@ -562,8 +563,8 @@
[detail]    {
[detail]      TRACE;
[detail]      ASSERT(_sorted);
[detail] -    VectorList<double> x(xModel.count());
[detail] -    for(int i=0; i<xModel.count(); i++) {
[detail] +    VectorList<double> x(xModel.size());
[detail] +    for(int i=0; i<xModel.size(); i++) {
[detail]        x[i]=xModel.x(i);
[detail]      }
[detail]      resample(x);
[detail] @@ -574,8 +575,8 @@
[detail]    {
[detail]      TRACE;
[detail]      ASSERT(_sorted);
[detail] -    int nCurve=count();
[detail] -    int nModel=xModel.count();
[detail] +    int nCurve=size();
[detail] +    int nModel=xModel.size();
[detail]      if(nCurve<2 || nModel<2) return;
[detail]      Curve<pointType> interpolated(nModel);
[detail]      
[detail] @@ -661,7 +662,7 @@
[detail]      }
[detail]      
[detail]      ix=indexAfter(max);
[detail] -    if(ix < count()) {
[detail] +    if(ix < size()) {
[detail]        if(fabs(max-x(ix))<1e-15) {
[detail]          ix++;
[detail]        } else if((options & Interpole) && fabs(max-x(ix-1))>1e-15) {
[detail] @@ -671,7 +672,7 @@
[detail]        }
[detail]      }
[detail]      
[detail] -    for(int i=count()-1; i>=ix; i--) {
[detail] +    for(int i=size()-1; i>=ix; i--) {
[detail]        remove(i);
[detail]      }
[detail]      
[detail] @@ -690,14 +691,14 @@
[detail]      if(options & InverseScale) {
[detail]        xInverse();
[detail]      }
[detail] -    int firstIndex=0, lastIndex=count()-1;
[detail] +    int firstIndex=0, lastIndex=size()-1;
[detail]      firstValid(firstIndex);
[detail]      lastValid(lastIndex);
[detail] -    if(firstIndex==count()) {
[detail] +    if(firstIndex==size()) {
[detail]        firstIndex=0;
[detail]      }
[detail]      if(lastIndex<0) {
[detail] -      lastIndex=count()-1;
[detail] +      lastIndex=size()-1;
[detail]      }
[detail]      double currentMin=constAt(firstIndex).x();
[detail]      double currentMax=constAt(lastIndex).x();
[detail] @@ -720,7 +721,7 @@
[detail]          ixe--;
[detail]        }
[detail]      }
[detail] -    if(ixe==count()) {
[detail] +    if(ixe==size()) {
[detail]        ixe--;
[detail]      }
[detail]      for(int i=ixs; i<=ixe; i++) {
[detail] @@ -753,8 +754,8 @@
[detail]    {
[detail]      TRACE;
[detail]      pointType sum;
[detail] -    if(count()<2) {
[detail] -      if(count()==1) {
[detail] +    if(size()<2) {
[detail] +      if(size()==1) {
[detail]          return constAt(0);
[detail]        } else {
[detail]          return sum;
[detail] @@ -763,9 +764,11 @@
[detail]      double min=param.minimum(x);
[detail]      double max=param.maximum(x);
[detail]      int i0=indexAfter(min);
[detail] +    firstValid(i0);
[detail]      int n=indexAfter(max);
[detail] +    lastValid(n);
[detail]      if(i0>=n) {
[detail] -      if(i0==count()) {
[detail] +      if(i0==size()) {
[detail]          i0--;
[detail]        }
[detail]        if(i0==0) {
[detail] @@ -791,26 +794,26 @@
[detail]          case SamplingParameters::Log:
[detail]            for(int i=i0; i<n; i++) {
[detail]              pointType p=constAt(i);
[detail] -            p.yLog();
[detail] +            p.yLog(pointOption);
[detail]              double weight=WindowFunction::value(p.x(), x, min, max, param.windowFunction());
[detail]              sumWeight+=weight;
[detail]              p*=weight;
[detail]              sum+=p;
[detail]            }
[detail]            sum/=sumWeight;
[detail] -          sum.yExp();
[detail] +          sum.yExp(pointOption);
[detail]            break;
[detail]          case SamplingParameters::Inverse:
[detail]            for(int i=i0; i<n; i++) {
[detail]              pointType p=constAt(i);
[detail] -            p.yInverse();
[detail] +            p.yInverse(pointOption);
[detail]              double weight=WindowFunction::value(p.x(), x, min, max, param.windowFunction());
[detail]              sumWeight+=weight;
[detail]              p*=weight;
[detail]              sum+=p;
[detail]            }
[detail]            sum/=sumWeight;
[detail] -          sum.yInverse();
[detail] +          sum.yInverse(pointOption);
[detail]            break;
[detail]          }
[detail]        }
[detail] @@ -835,7 +838,7 @@
[detail]    void Curve<pointType>::average(const Curve<pointType>& o)
[detail]    {
[detail]      TRACE;
[detail] -    if(o.count()<2) return;
[detail] +    if(o.size()<2) return;
[detail]      if(isEmpty()) {
[detail]        *this=o;
[detail]        return;
[detail] @@ -855,7 +858,7 @@
[detail]      }
[detail]      oResamp.resample(x);
[detail]      
[detail] -    for(int i=x.count()-1; i>=0; i--) {
[detail] +    for(int i=x.size()-1; i>=0; i--) {
[detail]        VectorList<pointType>::operator[](i).average(oResamp.at(i));
[detail]      }
[detail]      sort();
[detail] @@ -875,7 +878,7 @@
[detail]    void Curve<pointType>::removeInvalid()
[detail]    {
[detail]      TRACE;
[detail] -    for(int i=count()-1; i>=0; i--) {
[detail] +    for(int i=size()-1; i>=0; i--) {
[detail]        if(!isValid(i)) {
[detail]          remove(i);
[detail]        }
[detail] @@ -900,7 +903,7 @@
[detail]    {
[detail]      TRACE;
[detail]      ASSERT(_sorted);
[detail] -    int n=count()-1;
[detail] +    int n=size()-1;
[detail]      ASSERT(n>1);
[detail]      Curve<pointType> d(n-1);
[detail]      for(int i=1; i<n; i++) {
[detail] @@ -935,7 +938,7 @@
[detail]    {
[detail]      TRACE;
[detail]      ASSERT(_sorted);
[detail] -    int n=count()-1;
[detail] +    int n=size()-1;
[detail]      ASSERT(n>1);
[detail]      Curve<pointType> d(n-1);
[detail]      for(int i=1; i<n; i++) {
[detail] @@ -954,7 +957,7 @@
[detail]    {
[detail]      TRACE;
[detail]      ASSERT(_sorted);
[detail] -    int n=count();
[detail] +    int n=size();
[detail]      ASSERT(n>1);
[detail]      Curve<pointType> d(n-1);
[detail]      for(int i=1; i<n; i++) {
[detail] @@ -971,7 +974,7 @@
[detail]    void Curve<pointType>::xMultiply(double factor)
[detail]    {
[detail]      TRACE;
[detail] -    int n=count();
[detail] +    int n=size();
[detail]      for(int i=0; i<n; i++) {
[detail]        pointType& p=constXAt(i); 
[detail]        p.setX(p.x()*factor);
[detail] @@ -985,7 +988,7 @@
[detail]    void Curve<pointType>::xInverse()
[detail]    {
[detail]      TRACE;
[detail] -    int n=count();
[detail] +    int n=size();
[detail]      for(int i=0; i<n; i++) {
[detail]        pointType& p=constXAt(i); 
[detail]        p.setX(1.0/p.x());
[detail] @@ -999,7 +1002,7 @@
[detail]    void Curve<pointType>::xExp()
[detail]    {
[detail]      TRACE;
[detail] -    int n=count();
[detail] +    int n=size();
[detail]      for(int i=0; i<n; i++) {
[detail]        pointType& p=constXAt(i); 
[detail]        p.setX(exp(p.x()));
[detail] @@ -1010,7 +1013,7 @@
[detail]    void Curve<pointType>::xLog()
[detail]    {
[detail]      TRACE;
[detail] -    int n=count();
[detail] +    int n=size();
[detail]      for(int i=0; i<n; i++) {
[detail]        pointType& p=constXAt(i); 
[detail]        if(p.x()>0.0) {
[detail] @@ -1022,7 +1025,7 @@
[detail]    template <class pointType>
[detail]    void Curve<pointType>::ySetValue(double v, const CurvePointOptions * pointOptions)
[detail]    {
[detail] -    int n=count();
[detail] +    int n=size();
[detail]      for(int i=0; i<n; i++) {
[detail]        setY(i, v, pointOptions);
[detail]      }
[detail] @@ -1031,7 +1034,7 @@
[detail]    template <class pointType>
[detail]    void Curve<pointType>::ySetMinimumValue(double v, const CurvePointOptions * pointOptions)
[detail]    {
[detail] -    int n=count();
[detail] +    int n=size();
[detail]      for(int i=0; i<n; i++) {
[detail]        pointType& p=constXAt(i);
[detail]        if(p.y(pointOptions)<v) {
[detail] @@ -1043,7 +1046,7 @@
[detail]    template <class pointType>
[detail]    void Curve<pointType>::ySetMaximumValue(double v, const CurvePointOptions * pointOptions)
[detail]    {
[detail] -    int n=count();
[detail] +    int n=size();
[detail]      for(int i=0; i<n; i++) {
[detail]        pointType& p=constXAt(i);
[detail]        if(p.y(pointOptions)>v) {
[detail] @@ -1056,7 +1059,7 @@
[detail]    void Curve<pointType>::ySum(double value, const CurvePointOptions * pointOptions)
[detail]    {
[detail]      TRACE;
[detail] -    int n=count();
[detail] +    int n=size();
[detail]      for(int i=0; i<n; i++) {
[detail]        pointType& p=constXAt(i);
[detail]        p.setY(p.y(pointOptions)+value, pointOptions);
[detail] @@ -1070,9 +1073,9 @@
[detail]        *this=o;
[detail]        return;
[detail]      }
[detail] -    int n=count();
[detail] -    if(n!=o.count()) {
[detail] -      App::log(tr("Curve::ySum(): uncompatible sampling (count=%1 & %2).\n").arg(n).arg(o.count()) );
[detail] +    int n=size();
[detail] +    if(n!=o.size()) {
[detail] +      App::log(tr("Curve::ySum(): uncompatible sampling (size=%1 & %2).\n").arg(n).arg(o.size()) );
[detail]        return;
[detail]      }
[detail]      for(int i=0; i<n; i++) {
[detail] @@ -1088,9 +1091,9 @@
[detail]        *this=o;
[detail]        return;
[detail]      }
[detail] -    int n=count();
[detail] -    if(n!=o.count()) {
[detail] -      App::log(tr("Curve::ySum(): uncompatible sampling (count=%1 & %2).\n").arg(n).arg(o.count()) );
[detail] +    int n=size();
[detail] +    if(n!=o.size()) {
[detail] +      App::log(tr("Curve::ySum(): uncompatible sampling (size=%1 & %2).\n").arg(n).arg(o.size()) );
[detail]        return;
[detail]      }
[detail]      for(int i=0; i<n; i++) {
[detail] @@ -1103,7 +1106,7 @@
[detail]    void Curve<pointType>::yMultiply(double factor, const CurvePointOptions * pointOptions)
[detail]    {
[detail]      TRACE;
[detail] -    int n=count();
[detail] +    int n=size();
[detail]      for(int i=0; i<n; i++) {
[detail]        pointType& p=constXAt(i);
[detail]        p.setY(p.y(pointOptions)*factor, pointOptions);
[detail] @@ -1117,8 +1120,8 @@
[detail]        *this=o;
[detail]        return;
[detail]      }
[detail] -    int n=count();
[detail] -    if(n!=o.count()) {
[detail] +    int n=size();
[detail] +    if(n!=o.size()) {
[detail]        App::log(tr("Curve::yMultiply(): uncompatible sampling.\n") );
[detail]        return;
[detail]      }
[detail] @@ -1135,8 +1138,8 @@
[detail]        *this=o;
[detail]        return;
[detail]      }
[detail] -    int n=count();
[detail] -    if(n!=o.count()) {
[detail] +    int n=size();
[detail] +    if(n!=o.size()) {
[detail]        App::log(tr("Curve::yDivide(): uncompatible sampling.\n") );
[detail]        return;
[detail]      }
[detail] @@ -1150,7 +1153,7 @@
[detail]    void Curve<pointType>::yMultiplyByX(double factor, const CurvePointOptions * pointOptions)
[detail]    {
[detail]      TRACE;
[detail] -    int n=count();
[detail] +    int n=size();
[detail]      for(int i=0; i<n; i++) {
[detail]        pointType& p=constXAt(i);
[detail]        p.setY(p.y(pointOptions)*p.x()*factor, pointOptions);
[detail] @@ -1161,7 +1164,7 @@
[detail]    void Curve<pointType>::yDivideByX(double factor, const CurvePointOptions * pointOptions)
[detail]    {
[detail]      TRACE;
[detail] -    int n=count();
[detail] +    int n=size();
[detail]      for(int i=0; i<n; i++) {
[detail]        pointType& p=constXAt(i);
[detail]        p.setY(p.y(pointOptions)/(p.x()*factor), pointOptions);
[detail] @@ -1171,22 +1174,18 @@
[detail]    template <class pointType>
[detail]    void Curve<pointType>::ySquare(const CurvePointOptions * pointOptions)
[detail]    {
[detail] -    int n=count();
[detail] +    int n=size();
[detail]      for(int i=0; i<n; i++) {
[detail] -      pointType& p=constXAt(i);
[detail] -      double v=p.y(pointOptions);
[detail] -      p.setY(v*v, pointOptions);
[detail] +      constXAt(i).ySquare(pointOptions);
[detail]      }
[detail]    }
[detail]  
[detail]    template <class pointType>
[detail]    void Curve<pointType>::ySqrt(const CurvePointOptions * pointOptions)
[detail]    {
[detail] -    int n=count();
[detail] +    int n=size();
[detail]      for(int i=0; i<n; i++) {
[detail] -      pointType& p=constXAt(i);
[detail] -      double v=p.y(pointOptions);
[detail] -      if(v>=0.0) p.setY(::sqrt(v), pointOptions);
[detail] +      constXAt(i).ySqrt(pointOptions);
[detail]      }
[detail]    }
[detail]  
[detail] @@ -1194,11 +1193,9 @@
[detail]    void Curve<pointType>::yInverse(const CurvePointOptions * pointOptions)
[detail]    {
[detail]      TRACE;
[detail] -    int n=count();
[detail] +    int n=size();
[detail]      for(int i=0; i<n; i++) {
[detail] -      pointType& p=constXAt(i);
[detail] -      double v=p.y(pointOptions);
[detail] -      if(v!=0.0) p.setY(1.0/v, pointOptions);
[detail] +      constXAt(i).yInverse(pointOptions);
[detail]      }
[detail]    }
[detail]  
[detail] @@ -1206,11 +1203,9 @@
[detail]    void Curve<pointType>::yLog(const CurvePointOptions * pointOptions)
[detail]    {
[detail]      TRACE;
[detail] -    int n=count();
[detail] +    int n=size();
[detail]      for(int i=0; i<n; i++) {
[detail] -      pointType& p=constXAt(i);
[detail] -      double v=p.y(pointOptions);
[detail] -      if(v>0.0) p.setY(::log(v), pointOptions);
[detail] +      constXAt(i).yLog(pointOptions);
[detail]      }
[detail]    }
[detail]  
[detail] @@ -1218,10 +1213,9 @@
[detail]    void Curve<pointType>::yExp(const CurvePointOptions * pointOptions)
[detail]    {
[detail]      TRACE;
[detail] -    int n=count();
[detail] +    int n=size();
[detail]      for(int i=0; i<n; i++) {
[detail] -      pointType& p=constXAt(i);
[detail] -      p.setY(exp(p.y(pointOptions)), pointOptions);
[detail] +      constXAt(i).yExp(pointOptions);
[detail]      }
[detail]    }
[detail]  
[detail] @@ -1229,10 +1223,9 @@
[detail]    void Curve<pointType>::yAbs(const CurvePointOptions * pointOptions)
[detail]    {
[detail]      TRACE;
[detail] -    int n=count();
[detail] +    int n=size();
[detail]      for(int i=0; i<n; i++) {
[detail] -      pointType& p=constXAt(i);
[detail] -      p.setY(fabs(p.y(pointOptions)), pointOptions);
[detail] +      constXAt(i).yAbs(pointOptions);
[detail]      }
[detail]    }
[detail]  
[detail] @@ -1254,7 +1247,7 @@
[detail]    template <class pointType>
[detail]    VectorList<double> Curve<pointType>::xVector() const
[detail]    {
[detail] -    int n=count();
[detail] +    int n=size();
[detail]      VectorList<double> x(n);
[detail]      for(int i=0; i<n; i++) {
[detail]        x[i]=Curve<pointType>::x(i);
[detail] @@ -1265,7 +1258,7 @@
[detail]    template <class pointType>
[detail]    Curve<Point2D> Curve<pointType>::xyCurve() const
[detail]    {
[detail] -    int n=count();
[detail] +    int n=size();
[detail]      Curve<Point2D> c(n);
[detail]      for(int i=0; i<n; i++) {
[detail]        c.at(i)=Point2D(x(i), y(i));
[detail] @@ -1276,9 +1269,11 @@
[detail]    template <class pointType>
[detail]    void Curve<pointType>::firstValid(int& startIndex) const
[detail]    {
[detail] -    int n=count();
[detail] +    int n=size();
[detail]      if(startIndex<0) {
[detail] +      if(n>0) {
[detail]        startIndex=0;
[detail] +      }
[detail]      } else if(startIndex>=n) {
[detail]        startIndex=n-1;
[detail]      }
[detail] @@ -1290,9 +1285,11 @@
[detail]    template <class pointType>
[detail]    void Curve<pointType>::lastValid(int& startIndex) const
[detail]    {
[detail] -    int n=count();
[detail] +    int n=size();
[detail]      if(startIndex<0) {
[detail] +      if(n>0) {
[detail]        startIndex=0;
[detail] +      }
[detail]      } else if(startIndex>=n) {
[detail]        startIndex=n-1;
[detail]      }
[detail] @@ -1304,7 +1301,7 @@
[detail]    template <class pointType>
[detail]    int Curve<pointType>::minimumX(int startIndex) const
[detail]    {
[detail] -    int n=count();
[detail] +    int n=size();
[detail]      if(n<=0  || startIndex>=n) {
[detail]        return -1;
[detail]      }
[detail] @@ -1328,7 +1325,7 @@
[detail]    template <class pointType>
[detail]    int Curve<pointType>::maximumX(int startIndex) const
[detail]    {
[detail] -    int n=count();
[detail] +    int n=size();
[detail]      if(n<=0 || startIndex>=n) {
[detail]        return -1;
[detail]      }
[detail] @@ -1352,7 +1349,7 @@
[detail]    template <class pointType>
[detail]    int Curve<pointType>::minimumY(int startIndex, const CurvePointOptions * pointOptions) const
[detail]    {
[detail] -    int n=count();
[detail] +    int n=size();
[detail]      if(n<=0 || startIndex>=n) {
[detail]        return -1;
[detail]      }
[detail] @@ -1376,7 +1373,7 @@
[detail]    template <class pointType>
[detail]    int Curve<pointType>::maximumY(int startIndex, const CurvePointOptions * pointOptions) const
[detail]    {
[detail] -    int n=count();
[detail] +    int n=size();
[detail]      if(n<=0 || startIndex>=n) {
[detail]        return -1;
[detail]      }
[detail] @@ -1400,7 +1397,7 @@
[detail]    template <class pointType>
[detail]    int Curve<pointType>::localMaximumY(int startIndex, const CurvePointOptions * pointOptions) const
[detail]    {
[detail] -    int n=count();
[detail] +    int n=size();
[detail]      if(n<=0 || startIndex>=n) {
[detail]        return -1;
[detail]      }
[detail] @@ -1431,7 +1428,7 @@
[detail]    template <class pointType>
[detail]    int Curve<pointType>::localMinimumY(int startIndex, const CurvePointOptions * pointOptions) const
[detail]    {
[detail] -    int n=count();
[detail] +    int n=size();
[detail]      if(n<=0 || startIndex>=n) {
[detail]        return -1;
[detail]      }
[detail] @@ -1463,7 +1460,7 @@
[detail]    int Curve<pointType>::closestMax(int index)
[detail]    {
[detail]      TRACE;
[detail] -    int n=count();
[detail] +    int n=size();
[detail]      int di;
[detail]  
[detail]      if(index==0) {
[detail] @@ -1590,7 +1587,7 @@
[detail]    bool Curve<pointType>::leastSquare(double& a, double& b, const CurvePointOptions * pointOptions) const
[detail]    {
[detail]      TRACE;
[detail] -    int n=count();
[detail] +    int n=size();
[detail]      if(n>1) {
[detail]        double invn=1.0/static_cast<double>(n);
[detail]        double sx=sumX();
[detail] @@ -1603,7 +1600,7 @@
[detail]          b=(invn*sy*sx2-invn*sxy*sx)/denom;
[detail]          return true;
[detail]        } else {
[detail] -        a=0.0;
[detail] +        a=std::numeric_limits<double>::infinity();
[detail]          b=sx*invn;
[detail]        }
[detail]      }
[detail] @@ -1612,33 +1609,15 @@
[detail]  
[detail]    
[detail]    template <class pointType>
[detail] -  double Curve<pointType>::azimuth(const CurvePointOptions * pointOptions) const
[detail] +  VectorList<double> Curve<pointType>::project(double a, double b, const CurvePointOptions * pointOptions) const
[detail]    {
[detail]      TRACE;
[detail] -    int n=count();
[detail] -    if(n>1) {
[detail] -      double a, b;
[detail] -      if(leastSquare(a, b, pointOptions)) {
[detail] -        return atan(a);
[detail] -      } else {
[detail] -        return 0.5*M_PI;
[detail] -      }
[detail] -    }
[detail] -    return 0.0;
[detail] -  }
[detail] -
[detail] -  
[detail] -  template <class pointType>
[detail] -  VectorList<double> Curve<pointType>::project(const CurvePointOptions * pointOptions) const
[detail] -  {
[detail] -    TRACE;
[detail] -    int n=count();
[detail] +    int n=size();
[detail]      if(!n) return VectorList<double>();
[detail]      VectorList<double> projections(n);
[detail]      if(n>1) {
[detail] -      double a, b;
[detail]        double min=std::numeric_limits<double>::infinity();
[detail] -      if(leastSquare(a, b, pointOptions)) {
[detail] +      if(isnormal(a)) {
[detail]          for(int i=0; i<n; i++) {
[detail]            const pointType& p=constAt(i);
[detail]            double denom=a*a+1.0;
[detail] @@ -1647,17 +1626,23 @@
[detail]            double yp=(-a*cp+b)/denom-b;
[detail]            double d=::sqrt(xp*xp+yp*yp);
[detail]            projections[i]=(xp>=0)? d : -d;
[detail] -          if(projections[i]<min) min=projections[i];
[detail] +          if(projections[i]<min) {
[detail] +            min=projections[i];
[detail] +          }
[detail]          }
[detail]        } else {
[detail]          for(int i=0; i<n; i++) {
[detail]            const pointType& p=constAt(i);
[detail]            projections[i]=p.y(pointOptions);
[detail] -          if(projections[i]<min) min=projections[i];
[detail] +          if(projections[i]<min) {
[detail] +            min=projections[i];
[detail] +          }
[detail]          }
[detail]        }
[detail]        
[detail] -      for(int i=0; i<n;i++) projections[i]-=min;
[detail] +      for(int i=0; i<n;i++) {
[detail] +        projections[i]-=min;
[detail] +      }
[detail]      } else {
[detail]        projections[0]=0;
[detail]      }
[detail] @@ -1668,8 +1653,8 @@
[detail]    bool Curve<pointType>::sameSampling(const Curve<pointType>& o) const
[detail]    {
[detail]      TRACE;
[detail] -    int n=count();
[detail] -    if(n!=o.count()) {
[detail] +    int n=size();
[detail] +    if(n!=o.size()) {
[detail]        return false;
[detail]      }
[detail]      for(int i=0; i<n; i++) {
[detail] @@ -1685,7 +1670,7 @@
[detail]    {
[detail]      TRACE;
[detail]      ASSERT(_sorted);
[detail] -    int n=count();
[detail] +    int n=size();
[detail]      double s, min=std::numeric_limits<double>::infinity();
[detail]      if(options & LogScale) {
[detail]        for(int i=1; i<n; i++) {
[detail] @@ -1713,7 +1698,7 @@
[detail]                                                    const CurvePointOptions * pointOptions) const
[detail]    {
[detail]      TRACE;
[detail] -    int n=count();
[detail] +    int n=size();
[detail]      CurveSplitter splitter;
[detail]      if(options & LogScale) {
[detail]        double invMaxX=1.0/maxX;
[detail] @@ -1758,14 +1743,14 @@
[detail]      QList<Curve<pointType>> list;
[detail]      for(int ic=0; ic<nc; ic++) {
[detail]        VectorList<int> indexList=splitter.pointIndex(ic);
[detail] -      int ni=indexList.count();
[detail] +      int ni=indexList.size();
[detail]        if(ni>minCount) {
[detail]          Curve<pointType> c(ni);
[detail]          for(int ii=0; ii<ni; ii++) {
[detail]            c.at(ii)=constAt(indexList.at(ii));
[detail]          }
[detail]          c.sort();
[detail] -        if(c.count()>minCount) { 
[detail] +        if(c.size()>minCount) { 
[detail]            list.append(c);
[detail]          }
[detail]        }
[detail] @@ -1781,7 +1766,7 @@
[detail]    {
[detail]      TRACE;
[detail]      ASSERT(_sorted);
[detail] -    int n=count();
[detail] +    int n=size();
[detail]      double step=minimumStep(options);
[detail]      double a, b;
[detail]  
[detail] @@ -1789,11 +1774,11 @@
[detail]      for(int i=0; i<n; i++) {
[detail]        const pointType& p=constAt(i);
[detail]        curveBegin.append(Point2D(p.x(), p.y(pointOptions)));
[detail] -      if(curveBegin.count()==leastSquareCount) {
[detail] +      if(curveBegin.size()==leastSquareCount) {
[detail]          break;
[detail]        }
[detail]      }
[detail] -    if(curveBegin.count()<leastSquareCount) {
[detail] +    if(curveBegin.size()<leastSquareCount) {
[detail]        return false;
[detail]      }
[detail]  
[detail] @@ -1840,7 +1825,7 @@
[detail]    {
[detail]      TRACE;
[detail]      ASSERT(_sorted);
[detail] -    int n=count();
[detail] +    int n=size();
[detail]      double step=minimumStep(options);
[detail]      double a, b;
[detail]  
[detail] @@ -1848,17 +1833,17 @@
[detail]      for(int i=n-1; i>=0; i--) {
[detail]        const pointType& p=constAt(i);
[detail]        curveEnd.append(Point2D(p.x(), p.y(pointOptions)));
[detail] -      if(curveEnd.count()==leastSquareCount) {
[detail] +      if(curveEnd.size()==leastSquareCount) {
[detail]          break;
[detail]        }
[detail]      }
[detail] -    if(curveEnd.count()<leastSquareCount) {
[detail] +    if(curveEnd.size()<leastSquareCount) {
[detail]        return false;
[detail]      }
[detail]  
[detail]      
[detail]      bool extrapolated=false;
[detail] -    double x=Curve<pointType>::x(count()-1);
[detail] +    double x=Curve<pointType>::x(size()-1);
[detail]      if(options & LogScale) {
[detail]        curveEnd.xLog();
[detail]        curveEnd.leastSquare(a, b, pointOptions);
[detail] @@ -1891,7 +1876,7 @@
[detail]    }
[detail]  
[detail]    template <class pointType>
[detail] -  bool Curve<pointType>::fromStream(QTextStream& s, QString * comments)
[detail] +  bool Curve<pointType>::fromStream(QTextStream& s, QString * comments, QString * nextComments)
[detail]    {
[detail]      TRACE;
[detail]      pointType p;
[detail] @@ -1905,6 +1890,9 @@
[detail]              (*comments)+=buf+"\n";
[detail]            }
[detail]          } else {
[detail] +          if(nextComments) {
[detail] +            *nextComments=buf+"\n";
[detail] +          }
[detail]            return true;
[detail]          }
[detail]        } else {
[detail]                  src/CurvePointOptions.h:  version-1.5.2	not modified
[detail]                    src/CurveProperties.h:  version-1.5.2	not modified
[detail]                         src/CurveProxy.h:  version-1.5.2	not modified
[detail]                      src/CurveSplitter.h:  version-1.5.2	not modified
[detail]              src/DelaunayTriangulation.h:  version-1.5.2	not modified
[detail]                  src/DirectionalSearch.h:  version-1.5.2	not modified
[detail]                       src/DoubleMatrix.h:  version-1.5.2	modified out of comments
[detail] --- src/DoubleMatrix.h-version-1.5.2-stripped	2025-09-28 04:00:54.147450537 +0200
[detail] +++ src/DoubleMatrix.h-HEAD-stripped	2025-09-28 04:00:54.151450557 +0200
[detail] @@ -16,9 +16,9 @@
[detail]    {
[detail]    public:
[detail]      DoubleMatrix() : Matrix<double>() {}
[detail] -    DoubleMatrix(int ndim) : Matrix<double>(ndim) {}
[detail] +    DoubleMatrix(int size) : Matrix<double>(size) {}
[detail]      DoubleMatrix(int nrow, int ncol) : Matrix<double>(nrow, ncol) {}
[detail] -    DoubleMatrix(const Matrix<double> m) : Matrix<double>(m) {}
[detail] +    DoubleMatrix(const Matrix<double>& m) : Matrix<double>(m) {}
[detail]  
[detail]      void rotation(int axis1, int axis2, const Angle& angle);
[detail]      void rotation3D(AxisType ax, const Angle& angle);
[detail] @@ -26,15 +26,14 @@
[detail]      double determinant() const;
[detail]      bool invert();
[detail]      void singularValues(VectorList<double>& values, DoubleMatrix * u=nullptr, DoubleMatrix * vt=nullptr) const;
[detail] -    VectorList<double> symetricEigenValues(bool& ok) const;
[detail] -    VectorList<Complex> eigenValues() const;
[detail] +    VectorList<Complex> eigenvalues() const;
[detail]      DoubleMatrix leastSquare(const DoubleMatrix& b) const;
[detail]    };
[detail]  
[detail]    class QGPCOREMATH_EXPORT Matrix2x2: public DoubleMatrix
[detail]    {
[detail]    public:
[detail] -    Matrix2x2() : DoubleMatrix(2, 2) {}
[detail] +    Matrix2x2() : DoubleMatrix(2) {}
[detail]      Matrix2x2(const Matrix2x2& o) : DoubleMatrix(static_cast<const DoubleMatrix&>(o)) {}
[detail]      Matrix2x2(const Matrix<double>& o) : DoubleMatrix(static_cast<const DoubleMatrix&>(o)) {ASSERT(o.columnCount()==2 && o.rowCount()==2);}
[detail]  
[detail] @@ -53,16 +52,16 @@
[detail]    inline Point2D Matrix2x2::operator*(const Point2D& p) const
[detail]    {
[detail]      Point2D rp;
[detail] -    const double * values=_d->values();
[detail] -    rp.setX(values[0]*p.x()+values[2]*p.y());
[detail] -    rp.setY(values[1]*p.x()+values[3]*p.y());
[detail] +    const double * v=values();
[detail] +    rp.setX(v[0]*p.x()+v[2]*p.y());
[detail] +    rp.setY(v[1]*p.x()+v[3]*p.y());
[detail]      return rp;
[detail]    }
[detail]  
[detail]    class QGPCOREMATH_EXPORT Matrix3x3: public DoubleMatrix
[detail]    {
[detail]    public:
[detail] -    Matrix3x3() : DoubleMatrix(3, 3) {}
[detail] +    Matrix3x3() : DoubleMatrix(3) {}
[detail]      Matrix3x3(const Matrix3x3& o) : DoubleMatrix(static_cast<const DoubleMatrix&>(o)) {}
[detail]      Matrix3x3(const Matrix<double>& o) : DoubleMatrix(static_cast<const DoubleMatrix&>(o)) {ASSERT(o.columnCount()==3 && o.rowCount()==3);}
[detail]  
[detail] @@ -84,17 +83,17 @@
[detail]    {
[detail]      TRACE;
[detail]      Point rp;
[detail] -    const double * values=_d->values();
[detail] -    rp.setX(values[0]*p.x()+values[3]*p.y()+values[6]*p.z());
[detail] -    rp.setY(values[1]*p.x()+values[4]*p.y()+values[7]*p.z());
[detail] -    rp.setZ(values[2]*p.x()+values[5]*p.y()+values[8]*p.z());
[detail] +    const double * v=values();
[detail] +    rp.setX(v[0]*p.x()+v[3]*p.y()+v[6]*p.z());
[detail] +    rp.setY(v[1]*p.x()+v[4]*p.y()+v[7]*p.z());
[detail] +    rp.setZ(v[2]*p.x()+v[5]*p.y()+v[8]*p.z());
[detail]      return rp;
[detail]    }
[detail]  
[detail]    class QGPCOREMATH_EXPORT Matrix4x4: public DoubleMatrix
[detail]    {
[detail]    public:
[detail] -    Matrix4x4() : DoubleMatrix(4, 4) {}
[detail] +    Matrix4x4() : DoubleMatrix(4) {}
[detail]      Matrix4x4(const Matrix4x4& o) : DoubleMatrix(static_cast<const DoubleMatrix&>(o)) {}
[detail]      Matrix4x4(const Matrix<double>& o) : DoubleMatrix(static_cast<const DoubleMatrix&>(o)) {ASSERT(o.columnCount()==4 && o.rowCount()==4);}
[detail]  
[detail] @@ -117,10 +116,10 @@
[detail]    {
[detail]      TRACE;
[detail]      Point rp;
[detail] -    const double * values=_d->values();
[detail] -    rp.setX(values[0]*p.x()+values[4]*p.y()+values[8]*p.z()+values[12]);
[detail] -    rp.setY(values[1]*p.x()+values[5]*p.y()+values[9]*p.z()+values[13]);
[detail] -    rp.setZ(values[2]*p.x()+values[6]*p.y()+values[10]*p.z()+values[14]);
[detail] +    const double * v=values();
[detail] +    rp.setX(v[0]*p.x()+v[4]*p.y()+v[8]*p.z()+v[12]);
[detail] +    rp.setY(v[1]*p.x()+v[5]*p.y()+v[9]*p.z()+v[13]);
[detail] +    rp.setZ(v[2]*p.x()+v[6]*p.y()+v[10]*p.z()+v[14]);
[detail]      return rp;
[detail]    }
[detail]  
[detail]                            src/Ellipse.h:  version-1.5.2	not modified
[detail]                      src/FrequencyBand.h:  version-1.5.2	not modified
[detail]                src/FrequencyCurveProxy.h:  version-1.5.2	not modified
[detail]                       src/FunctionPlot.h:  version-1.5.2	not modified
[detail]                    src/FunctionProduct.h:  version-1.5.2	no last version available
[detail]                     src/FunctionSearch.h:  version-1.5.2	modified out of comments
[detail] --- src/FunctionSearch.h-version-1.5.2-stripped	2025-09-28 04:00:54.235450963 +0200
[detail] +++ src/FunctionSearch.h-HEAD-stripped	2025-09-28 04:00:54.239450981 +0200
[detail] @@ -12,9 +12,11 @@
[detail]    class QGPCOREMATH_EXPORT FunctionSearch
[detail]    {
[detail]    public:
[detail] -    FunctionSearch(int dimensionCount);
[detail] +    FunctionSearch(int size);
[detail]      virtual ~FunctionSearch();
[detail]  
[detail] +    virtual void resize(int size);
[detail] +
[detail]      void setFunction(AbstractFunction * f);
[detail]      AbstractFunction * function() const {return _function;}
[detail]      AbstractFunction * takeFunction();
[detail] @@ -27,14 +29,19 @@
[detail]      virtual void localMax(int nMax, double absThres=0.0, double relThres=0.0);
[detail]      void unique();
[detail]  
[detail] -    int maximaCount() const {return _maxima.count();}
[detail] -    FunctionMaximaIterator begin() {return _maxima.begin();}
[detail] -    FunctionMaximaIterator end() {return _maxima.end();}
[detail] +    const VectorList<FunctionSearchExtremum *>& extrema() const {return _extrema;}
[detail]  
[detail]      void setRelativePrecision(int axis, double p) {_precision[axis]=p; _relative[axis]=true;}
[detail]      void setAbsolutePrecision(int axis, double p) {_precision[axis]=p; _relative[axis]=false;}
[detail] +    Vector<double>& precision() {return _precision;}
[detail]      double precision(int axis) const {return _precision[axis];}
[detail] -    bool relative(int axis) const {return _relative[axis];}
[detail] +
[detail] +    bool isRelativeValue(int axis) const {return _relative[axis];}
[detail] +    void setRelativeValue(int axis) {_relative[axis]=true;}
[detail] +    void setAbsoluteValue(int axis) {_relative[axis]=false;}
[detail] +
[detail] +    int size() const {return _currentPosition.size();}
[detail] +    int capacity() const {return _precision.size();}
[detail]  
[detail]      void debugScan(const Vector<double>& min, const Vector<double>& max, int n);
[detail]    protected:
[detail] @@ -45,12 +52,11 @@
[detail]      static inline double lowLimit(int i, double * axis);
[detail]      static inline double highLimit(int i, double * axis, int nAxis);
[detail]  
[detail] -    Vector<double> _currentPosition;
[detail] -    PrivateVector<double> _testPosition;
[detail] +    Vector<double> _currentPosition, _testPosition;
[detail]      AbstractFunction * _function;
[detail]      PrivateVector<bool> _relative;
[detail]      PrivateVector<double> _precision;
[detail] -    VectorList<FunctionSearchMaximum *> _maxima;
[detail] +    VectorList<FunctionSearchExtremum *> _extrema;
[detail]    };
[detail]  
[detail]    inline double FunctionSearch::lowLimit(int i, double * axis)
[detail]             src/FunctionSearchExtremum.h:  version-1.5.2	no last version available
[detail]              src/GaussianFrequencyBand.h:  version-1.5.2	not modified
[detail]                       src/GlobalRandom.h:  version-1.5.2	not modified
[detail]                     src/GoogleEarthKML.h:  version-1.5.2	modified out of comments
[detail] --- src/GoogleEarthKML.h-version-1.5.2-stripped	2025-09-28 04:00:54.295451252 +0200
[detail] +++ src/GoogleEarthKML.h-HEAD-stripped	2025-09-28 04:00:54.299451272 +0200
[detail] @@ -18,15 +18,15 @@
[detail]      public:
[detail]        Point();
[detail]  
[detail] -      virtual const QString& xml_tagName() const {return xmlPointTag;}
[detail] +      const QString& xml_tagName() const {return xmlPointTag;}
[detail]        static const QString xmlPointTag;
[detail]  
[detail]        const ::QGpCoreMath::Point& coordinates() const {return _coordinates;}
[detail]        void setCoodinates(const ::QGpCoreMath::Point& p) {_coordinates=p;}
[detail]      protected:
[detail] -      virtual void xml_writeProperties(XML_WRITEPROPERTIES_ARGS) const;
[detail] -      virtual XMLMember xml_member(XML_MEMBER_ARGS);
[detail] -      virtual bool xml_setProperty(XML_SETPROPERTY_ARGS);
[detail] +      void xml_writeProperties(XML_WRITEPROPERTIES_ARGS) const;
[detail] +      XMLMember xml_member(XML_MEMBER_ARGS);
[detail] +      bool xml_setProperty(XML_SETPROPERTY_ARGS);
[detail]      private:
[detail]        ::QGpCoreMath::Point _coordinates;
[detail]      };
[detail] @@ -36,7 +36,7 @@
[detail]      public:
[detail]        Placemark();
[detail]  
[detail] -      virtual const QString& xml_tagName() const {return xmlPlacemarkTag;}
[detail] +      const QString& xml_tagName() const {return xmlPlacemarkTag;}
[detail]        static const QString xmlPlacemarkTag;
[detail]  
[detail]        void setName(const QString& n) {_name=n;}
[detail] @@ -48,10 +48,10 @@
[detail]        const ::QGpCoreMath::Point& coordinates() const {return _point.coordinates();}
[detail]        void setCoordinates(const ::QGpCoreMath::Point& p) {_point.setCoodinates(p);}
[detail]      protected:
[detail] -      virtual void xml_writeProperties(XML_WRITEPROPERTIES_ARGS) const;
[detail] -      virtual void xml_writeChildren(XML_WRITECHILDREN_ARGS) const;
[detail] -      virtual XMLMember xml_member(XML_MEMBER_ARGS);
[detail] -      virtual bool xml_setProperty(XML_SETPROPERTY_ARGS);
[detail] +      void xml_writeProperties(XML_WRITEPROPERTIES_ARGS) const;
[detail] +      void xml_writeChildren(XML_WRITECHILDREN_ARGS) const;
[detail] +      XMLMember xml_member(XML_MEMBER_ARGS);
[detail] +      bool xml_setProperty(XML_SETPROPERTY_ARGS);
[detail]      private:
[detail]        QString _name;
[detail]        Point _point;
[detail] @@ -66,7 +66,7 @@
[detail]        Folder(Folder * parent=nullptr);
[detail]        ~Folder();
[detail]  
[detail] -      virtual const QString& xml_tagName() const {return xmlFolderTag;}
[detail] +      const QString& xml_tagName() const {return xmlFolderTag;}
[detail]        static const QString xmlFolderTag;
[detail]  
[detail]        void setName(const QString& n) {_name=n;}
[detail] @@ -80,10 +80,10 @@
[detail]  
[detail]        void collectPoints(QList<NamedPoint>& list) const;
[detail]      protected:
[detail] -      virtual void xml_writeProperties(XML_WRITEPROPERTIES_ARGS) const;
[detail] -      virtual void xml_writeChildren(XML_WRITECHILDREN_ARGS) const;
[detail] -      virtual XMLMember xml_member(XML_MEMBER_ARGS);
[detail] -      virtual bool xml_setProperty(XML_SETPROPERTY_ARGS);
[detail] +      void xml_writeProperties(XML_WRITEPROPERTIES_ARGS) const;
[detail] +      void xml_writeChildren(XML_WRITECHILDREN_ARGS) const;
[detail] +      XMLMember xml_member(XML_MEMBER_ARGS);
[detail] +      bool xml_setProperty(XML_SETPROPERTY_ARGS);
[detail]      private:
[detail]        QList<Document *> _documents;
[detail]        QString _name;
[detail] @@ -96,7 +96,7 @@
[detail]      public:
[detail]        Document();
[detail]  
[detail] -      virtual const QString& xml_tagName() const {return xmlDocumentTag;}
[detail] +      const QString& xml_tagName() const {return xmlDocumentTag;}
[detail]        static const QString xmlDocumentTag;
[detail]  
[detail]        void setName(const QString& n) {_name=n;}
[detail] @@ -110,10 +110,10 @@
[detail]  
[detail]        void collectPoints(QList<NamedPoint>& list) const;
[detail]      protected:
[detail] -      virtual void xml_writeProperties(XML_WRITEPROPERTIES_ARGS) const;
[detail] -      virtual void xml_writeChildren(XML_WRITECHILDREN_ARGS) const;
[detail] -      virtual XMLMember xml_member(XML_MEMBER_ARGS);
[detail] -      virtual bool xml_setProperty(XML_SETPROPERTY_ARGS);
[detail] +      void xml_writeProperties(XML_WRITEPROPERTIES_ARGS) const;
[detail] +      void xml_writeChildren(XML_WRITECHILDREN_ARGS) const;
[detail] +      XMLMember xml_member(XML_MEMBER_ARGS);
[detail] +      bool xml_setProperty(XML_SETPROPERTY_ARGS);
[detail]      private:
[detail]        QString _name;
[detail]        Folder _root;
[detail] @@ -123,7 +123,7 @@
[detail]    public:
[detail]      GoogleEarthKML();
[detail]  
[detail] -    virtual const QString& xml_tagName() const {return xmlGoogleEarthKMLTag;}
[detail] +    const QString& xml_tagName() const {return xmlGoogleEarthKMLTag;}
[detail]      static const QString xmlGoogleEarthKMLTag;
[detail]  
[detail]      bool save(const QString& fileName);
[detail] @@ -131,10 +131,10 @@
[detail]      Document& document() {return _document;}
[detail]      const Document& document() const {return _document;}
[detail]  
[detail] -    virtual void xml_attributes(XML_ATTRIBUTES_ARGS) const;
[detail] +    void xml_attributes(XML_ATTRIBUTES_ARGS) const;
[detail]    protected:
[detail] -    virtual void xml_writeChildren(XML_WRITECHILDREN_ARGS) const;
[detail] -    virtual XMLMember xml_member(XML_MEMBER_ARGS);
[detail] +    void xml_writeChildren(XML_WRITECHILDREN_ARGS) const;
[detail] +    XMLMember xml_member(XML_MEMBER_ARGS);
[detail]    private:
[detail]      Document _document;
[detail]    };
[detail]                             src/Grid2D.h:  version-1.5.2	not modified
[detail]                             src/Grid3D.h:  version-1.5.2	not modified
[detail]                 src/GridParallelWriter.h:  version-1.5.2	not modified
[detail]                       src/GridSearch1D.h:  version-1.5.2	modified out of comments
[detail] --- src/GridSearch1D.h-version-1.5.2-stripped	2025-09-28 04:00:54.359451562 +0200
[detail] +++ src/GridSearch1D.h-HEAD-stripped	2025-09-28 04:00:54.359451562 +0200
[detail] @@ -14,7 +14,7 @@
[detail]      GridSearch1D(size_t dimensionCount=1);
[detail]      ~GridSearch1D();
[detail]  
[detail] -    void setGrid(double min, double max, double step);
[detail] +    bool setGrid(double min, double max, double step);
[detail]  
[detail]      void globalMax(double absThres);
[detail]      void localMax(int nMax, double absThres, double relThres);
[detail]                       src/GridSearch2D.h:  version-1.5.2	modified out of comments
[detail] --- src/GridSearch2D.h-version-1.5.2-stripped	2025-09-28 04:00:54.379451658 +0200
[detail] +++ src/GridSearch2D.h-HEAD-stripped	2025-09-28 04:00:54.383451678 +0200
[detail] @@ -11,13 +11,16 @@
[detail]    class QGPCOREMATH_EXPORT GridSearch2D : public FunctionSearch
[detail]    {
[detail]    public:
[detail] -    GridSearch2D(size_t dimensionCount=2);
[detail] +    GridSearch2D(int size=2);
[detail]      ~GridSearch2D();
[detail]  
[detail] -    void setGrid(double step, double size);
[detail] -    void setGrid(double minX, double maxX, double stepX,
[detail] +    bool setGrid(double step, double size);
[detail] +    bool setGrid(double minX, double maxX, double stepX,
[detail]                   double minY, double maxY, double stepY);
[detail]  
[detail] +    int xCount() const {return _max[0];}
[detail] +    int yCount() const {return _max[1];}
[detail] +
[detail]      void globalMax(double absThres=0.0);
[detail]      void localMax(int nMax, double absThres=0.0, double relThres=0.0);
[detail]  
[detail]                       src/GridSearch3D.h:  version-1.5.2	not modified
[detail]                     src/GridSearchTest.h:  version-1.5.2	not modified
[detail]                    src/HermitianMatrix.h:  version-1.5.2	no last version available
[detail]                    src/IrregularGrid2D.h:  version-1.5.2	not modified
[detail]                src/IrregularGrid2DData.h:  version-1.5.2	not modified
[detail]              src/IrregularGridSearch2D.h:  version-1.5.2	no last version available
[detail]            src/IterativeFunctionSearch.h:  version-1.5.2	no last version available
[detail]                  src/JointOptimization.h:  version-1.5.2	no last version available
[detail]                        src/LabelLayout.h:  version-1.5.2	no last version available
[detail]                        src/LeastSquare.h:  version-1.5.2	not modified
[detail]                             src/Line2D.h:  version-1.5.2	not modified
[detail]                   src/LinearRegression.h:  version-1.5.2	not modified
[detail]                             src/Matrix.h:  version-1.5.2	modified out of comments
[detail] --- src/Matrix.h-version-1.5.2-stripped	2025-09-28 04:00:54.531452393 +0200
[detail] +++ src/Matrix.h-HEAD-stripped	2025-09-28 04:00:54.535452411 +0200
[detail] @@ -5,141 +5,675 @@
[detail]  
[detail]  #include <QGpCoreTools.h>
[detail]  
[detail] -#include "MatrixData.h"
[detail] -#include "Point.h"
[detail] +#include "PermutationVector.h"
[detail]  
[detail]  namespace QGpCoreMath {
[detail]  
[detail] -  template <typename T> class MatrixIterator;
[detail] -  template <typename T> class MutableMatrixIterator;
[detail] -  template <typename T> class MatrixRowIterator;
[detail] -  template <typename T> class MutableMatrixRowIterator;
[detail] -  template <typename T> class MatrixColumnIterator;
[detail] -  template <typename T> class MutableMatrixColumnIterator;
[detail] +  template <typename T> class RowConstIterator;
[detail] +  template <typename T> class ColumnConstIterator;
[detail] +  template <typename T> class Vector;
[detail]  
[detail]    template <typename T> class QGPCOREMATH_EXPORT Matrix
[detail]    {
[detail]    public:
[detail] -    Matrix() {_d=new MatrixData<T>;}
[detail] -    Matrix(int ndim) {_d=new MatrixData<T>(ndim);}
[detail] -    Matrix(int nrow, int ncol) {_d=new MatrixData<T>(nrow, ncol);}
[detail] -    Matrix(const Matrix<T>& o) : _d(o._d) {}
[detail] -
[detail] -    bool operator<(const Matrix<T>& m) const {return _d->operator<(*m._d);}
[detail] -    bool operator>(const Matrix<T>& m) const {return _d->operator<(*m._d);}
[detail] -    Matrix<T> operator=(const Matrix<T>& m) {_d=m._d; return *this;}
[detail] -    bool operator==(const Matrix<T>& m) const {return _d->operator==(*m._d);}
[detail] -    bool operator!=(const Matrix<T>& m) const {return !_d->operator==(*m._d);}
[detail] -    Matrix<T> operator+(const Matrix<T>& m) const {return _d->operator+(*m._d);}
[detail] -    void operator+=(const Matrix<T>& m) {_d->operator+=(*m._d);}
[detail] -    Matrix<T> operator-() const {return _d->operator-();}
[detail] -    Matrix<T> operator-(const Matrix<T>& m) const {return _d->operator-(*m._d);}
[detail] -    void operator-=(const Matrix<T>& m) {_d->operator-=(*m._d);}
[detail] -    Matrix<T> operator*(const Matrix<T>& m) const {return _d->operator*(*m._d);}
[detail] -    Matrix<T> operator*(const T& v) const {return _d->operator*(v);}
[detail] -    T scalarProduct(const Matrix<T>& m) const {return _d->scalarProduct(*m._d);}
[detail] -    Matrix<T> dotMultiply(const Matrix<T>& m) const {return _d->dotMultiply(*m._d);}
[detail] -    void multiply(const Vector<T>& column, const Vector<T>& row, const T& factor) {_d->multiply(column, row, factor);}
[detail] -    void operator*=(const Matrix<T>& m);
[detail] -    void operator*=(const T& v) {_d->operator*=(v);}
[detail] -    void operator/=(const T& v) {_d->operator/=(v);}
[detail] -    void zero() {_d->fill(0);}
[detail] -    void identity() {_d->identity();}
[detail] -    void identity(const T& factor) {_d->identity(factor);}
[detail] -    void addIdentity() {_d->addIdentity();}
[detail] -    void fill(const T& v) {_d->fill(v);}
[detail] -    T& at(int row, int col) {return _d->at(row, col);}
[detail] -    const T& at(int row, int col) const {return _d->at(row, col);}
[detail] -    T& at(int index) {return _d->at(index);}
[detail] -    const T& at(int index) const {return _d->at(index);}
[detail] -    const T * values() const {return _d->values();}
[detail] -    T * values() {return _d->values();}
[detail] -    T minimum() const {return _d->minimum();}
[detail] -    T maximum() const {return _d->maximum();}
[detail] -    T * copyOfValues() const {return _d->copyOfValues();}
[detail] +    inline Matrix();
[detail] +    inline Matrix(int size);
[detail] +    inline Matrix(int nrow, int ncol);
[detail] +    inline Matrix(const Matrix<T>& m);
[detail] +    inline ~Matrix();
[detail] +
[detail] +    inline void operator=(const Matrix<T>& m);
[detail] +    inline bool operator==(const Matrix<T>& m) const;
[detail] +    bool operator!=(const Matrix<T>& m) const {return !operator==(m);}
[detail] +    bool operator<(const Matrix<T>& m) const;
[detail] +    bool operator>(const Matrix<T>& m) const;
[detail] +    Matrix<T> operator+(const Matrix<T>& m) const;
[detail] +    void operator+=(const Matrix<T>& m);
[detail] +    Matrix<T> operator-() const;
[detail] +    Matrix<T> operator-(const Matrix<T>& m) const;
[detail] +    void operator-=(const Matrix<T>& m);
[detail] +    void operator*=(const Matrix<T>& m) {*this=operator*(m);}
[detail] +    void operator*=(const T& v);
[detail] +    void operator/=(const T& v);
[detail] +    Matrix<T> operator*(const T& v) const;
[detail] +    Matrix<T> operator*(const Matrix<T>& m) const;
[detail] +    Vector<T> operator*(const Vector<T>& v) const;
[detail] +    T scalarProduct(const Matrix<T>& m) const;
[detail] +    void dotMultiply(const Matrix<T>& m);
[detail] +    void multiply(const Vector<T>& column, const Vector<T>& row, const T& factor);
[detail] +    void zero() {fill(0);}
[detail] +    void identity();
[detail] +    void identity(const T& factor);
[detail] +    void addIdentity();
[detail] +    void addIdentity(const T& factor);
[detail] +    void fill(const T& v);
[detail] +
[detail] +    int indexAt(int row, int col) const {return col*_nrow+row;}
[detail] +    inline T& at(int row, int col);
[detail] +    inline const T& at(int row, int col) const;
[detail] +    inline T& at(int index);
[detail] +    inline const T& at(int index) const;
[detail] +
[detail] +    T minimum() const;
[detail] +    T maximum() const;
[detail] +    Matrix<T> transposed() const;
[detail] +    void transpose() {*this=transposed();}
[detail] +    void transposeVector();
[detail] +    Matrix<T> transposedVector() const;
[detail]      VectorList<T> rowAt(int row) const;
[detail]      VectorList<T> columnAt(int col) const;
[detail] -    Matrix<T> transposed() const {return _d->transposed();}
[detail] -    Matrix<T> transposedVector() const;
[detail] -    void transpose() {*this=transposed();}
[detail] -    void transposeVector() {_d->transposeVector();}
[detail] -    T trace(const T& null) const {return _d->trace(null);}
[detail] -    void abs() {_d->abs();}
[detail] -    void mergeRow(const Matrix<T>& row1, const Matrix<T>& row2) {_d->mergeRow(*row1._d, *row2._d);}
[detail] -    void mergeColumn(const Matrix<T>& col1, const Matrix<T>& col2) {_d->mergeColumn(*col1._d, *col2._d);}
[detail] -    void copyAt(int row, int col, const Matrix<T>& m, int nRow=-1, int nCol=-1) {_d->copyAt(row, col, *m._d, nRow, nCol);}
[detail] -    void copySubMatrixAt(int row, int col, const Matrix<T>& m, int mRow, int mCol, int nRow=-1, int nCol=-1, double factor=1.0) {
[detail] -      _d->copySubMatrixAt(row, col, *m._d, mRow, mCol, nRow, nCol, factor);
[detail] -    }
[detail] -    Matrix<T> subMatrix(int rowStart, int colStart, int rowEnd, int colEnd) const {return _d->subMatrix(rowStart, colStart, rowEnd, colEnd);}
[detail] -    Matrix<T> sortedRows(const PermutationVector& p) {return _d->sortedRows(p);}
[detail] -    Matrix<T> sortedColumns(const PermutationVector& p) {return _d->sortedColumns(p);}
[detail] -
[detail] -    bool isVector() const {return _d->isVector();}
[detail] -    bool isEmpty() const {return _d->columnCount()==0 || _d->rowCount()==0;}
[detail] -    int columnCount() const {return _d->columnCount();}
[detail] -    int rowCount() const {return _d->rowCount();}
[detail] -    int nextNullRow(int startRow) const {return _d->nextNullRow(startRow);}
[detail] -    bool hasNullOnDiagonal(double relativePrecision) const {return _d->hasNullOnDiagonal(relativePrecision);}
[detail] -    void resize(int ndim) {_d->resize(ndim);}
[detail] -    void resize(int nrow, int ncol) {_d->resize(nrow, ncol);}
[detail] -
[detail] -    QString toUserString(char format='g', int precision=6) const {return _d->toUserString(format, precision);}
[detail] -    QString toOctaveString(char format='g', int precision=6) const {return _d->toOctaveString(format, precision);}
[detail] -    QString toGridString() const {return _d->toGridString();}
[detail] -    QString toString() const {return _d->toString();}
[detail] -    bool fromString(const StringSection& s) {return _d->fromString(s);}
[detail] -    void toOctaveFile(const QString& fileName, const QString& variableName) const {_d->toOctaveFile(fileName, variableName);}
[detail] +    T trace() const;
[detail] +    void abs();
[detail] +    void mergeRow(const Matrix<T>& row1, const Matrix<T>& row2);
[detail] +    void mergeColumn(const Matrix<T>& col1, const Matrix<T>& col2);
[detail] +    void copyAt(int row, int col, const Matrix<T>& m, int nRow=-1, int nCol=-1);
[detail] +    void copySubMatrixAt(int row, int col, const Matrix<T>& m, int mRow, int mCol, int nRow=-1, int nCol=-1, double factor=1);
[detail] +    void subMatrix(int rowStart, int colStart, int rowEnd, int colEnd, const Matrix<T>& m);
[detail] +    Matrix<T> sortedRows(const PermutationVector& p);
[detail] +    Matrix<T> sortedColumns(const PermutationVector& p);
[detail] +
[detail] +    bool isVector() const {return _nrow==1 || _ncol==1;}
[detail] +    bool isEmpty() const {return _nrow==0 || _ncol==0;}
[detail] +    int columnCount() const {return _ncol;}
[detail] +    int rowCount() const {return _nrow;}
[detail] +    T * values() {return _values;}
[detail] +    T * columnValues(int col) {return _values+col*_nrow;}
[detail] +    const T * values() const {return _values;}
[detail] +    const T * columnValues(int col) const {return _values+col*_nrow;}
[detail] +    T * copyOfValues() const;
[detail] +    void setValues(T * values) {delete _values; _values=values;}
[detail] +    int nextNullRow(int startRow) const;
[detail] +    bool hasNullOnDiagonal(double relativePrecision) const;
[detail] +    void resize(int size);
[detail] +    void resize(int nrow, int ncol);
[detail] +
[detail] +    QString toUserString(char format='g', int precision=6) const;
[detail] +    QString toOctaveString(char format='g', int precision=6) const;
[detail] +    QString toGridString() const;
[detail] +    QString toString() const;
[detail] +    bool fromString(const StringSection& s);
[detail] +    void toOctaveFile(const QString& fileName, const QString& variableName) const;
[detail] +
[detail] +    void swapRowColumn();
[detail]    protected:
[detail] -    void swapRowColumn() {_d->swapRowColumn();}
[detail] +    int _nrow, _ncol;
[detail] +    int _capacity;
[detail] +    T * _values;
[detail] +  };
[detail] +
[detail] +  template <typename T> inline Matrix<T>::Matrix()
[detail] +  {
[detail] +    _nrow=0;
[detail] +    _ncol=0;
[detail] +    _capacity=0;
[detail] +    _values=nullptr;
[detail] +  }
[detail]  
[detail] -    friend class MatrixData<T>;
[detail] -    friend class MatrixIterator<T>;
[detail] -    friend class MutableMatrixIterator<T>;
[detail] -    friend class MatrixRowIterator<T>;
[detail] -    friend class MutableMatrixRowIterator<T>;
[detail] -    friend class MatrixColumnIterator<T>;
[detail] -    friend class MutableMatrixColumnIterator<T>;
[detail] +  template <typename T> inline Matrix<T>::Matrix(int size)
[detail] +  {
[detail] +    _nrow=size;
[detail] +    _ncol=size;
[detail] +    _capacity=_nrow*_ncol;
[detail] +    _values=new T[_capacity];
[detail] +  }
[detail]  
[detail] -    QSharedDataPointer< MatrixData<T> > _d;
[detail] -  };
[detail] +  template <typename T> inline Matrix<T>::Matrix(int nrow, int ncol)
[detail] +  {
[detail] +    _nrow=nrow;
[detail] +    _ncol=ncol;
[detail] +    _capacity=_nrow*_ncol;
[detail] +    _values=new T[_capacity];
[detail] +  }
[detail] +
[detail] +  template <typename T> inline Matrix<T>::Matrix(const Matrix<T>& m)
[detail] +  {
[detail] +    _nrow=m._nrow;
[detail] +    _ncol=m._ncol;
[detail] +    _capacity=_nrow*_ncol;
[detail] +    _values=new T[_capacity];
[detail] +    memcpy(_values, m._values, sizeof(T)*_capacity);
[detail] +  }
[detail] +
[detail] +  template <typename T> inline Matrix<T>::~Matrix()
[detail] +  {
[detail] +    delete [] _values;
[detail] +  }
[detail] +
[detail] +  template <typename T> inline void Matrix<T>::operator=(const Matrix<T>& m)
[detail] +  {
[detail] +    resize(m._nrow, m._ncol);
[detail] +    memcpy(_values, m._values, sizeof(T)*_nrow *_ncol);
[detail] +  }
[detail] +
[detail] +  template <typename T> bool Matrix<T>::operator<(const Matrix<T>& m) const
[detail] +  {
[detail] +    for(int i=_nrow*_ncol-1; i>=0; i--) {
[detail] +      if(_values[i]<m._values[i]) {
[detail] +        return true;
[detail] +      }
[detail] +    }
[detail] +    return false;
[detail] +  }
[detail] +
[detail] +  template <typename T> bool Matrix<T>::operator>(const Matrix<T>& m) const
[detail] +  {
[detail] +    for(int i=_nrow*_ncol-1; i>=0; i--) {
[detail] +      if(_values[i]>m._values[i]) {
[detail] +        return true;
[detail] +      }
[detail] +    }
[detail] +    return false;
[detail] +  }
[detail] +
[detail] +  template <typename T> void Matrix<T>::resize(int size)
[detail] +  {
[detail] +    ASSERT(size>0);
[detail] +    _nrow=size;
[detail] +    _ncol=size;
[detail] +    int capacity=_nrow*_ncol;
[detail] +    if(capacity>_capacity) {
[detail] +      _capacity=capacity;
[detail] +      delete [] _values;
[detail] +      _values=new T[_capacity];
[detail] +    }
[detail] +  }
[detail] +
[detail] +  template <typename T> void Matrix<T>::resize(int nrow, int ncol)
[detail] +  {
[detail] +    ASSERT(nrow>0 && ncol>0);
[detail] +    _nrow=nrow;
[detail] +    _ncol=ncol;
[detail] +    int capacity=_nrow*_ncol;
[detail] +    if(capacity>_capacity) {
[detail] +      _capacity=capacity;
[detail] +      delete [] _values;
[detail] +      _values=new T[_capacity];
[detail] +    }
[detail] +  }
[detail] +
[detail] +  template <typename T> inline void Matrix<T>::swapRowColumn()
[detail] +  {
[detail] +    qSwap(_nrow, _ncol);
[detail] +  }
[detail]  
[detail] -  template <typename T> Matrix<T> MatrixData<T>::operator+(const MatrixData<T>& m) const
[detail] +  template <typename T> inline bool Matrix<T>::operator==(const Matrix<T>& m) const
[detail] +  {
[detail] +    if(_nrow!=m._nrow || _ncol!=m._ncol) return false;
[detail] +    for(int i=_nrow*_ncol-1; i>=0;i--) {
[detail] +      if(_values[i]!=m._values[i]) return false;
[detail] +    }
[detail] +    return true;
[detail] +  }
[detail] +
[detail] +  template <typename T> void Matrix<T>::operator+=(const Matrix<T>& m)
[detail] +  {
[detail] +    ASSERT(_nrow==m._nrow && _ncol==m._ncol);
[detail] +    for(int i=_nrow*_ncol-1; i>=0; i--) {
[detail] +      _values[i]+=m._values[i];
[detail] +    }
[detail] +  }
[detail] +
[detail] +  template <typename T> void Matrix<T>::operator-=(const Matrix<T>& m)
[detail] +  {
[detail] +    ASSERT(_nrow==m._nrow && _ncol==m._ncol);
[detail] +    for(int i=_nrow*_ncol-1; i>=0; i--) {
[detail] +      _values[i]-=m._values[i];
[detail] +    }
[detail] +  }
[detail] +
[detail] +  template <typename T> void Matrix<T>::operator*=(const T& v)
[detail] +  {
[detail] +    for(int i=_nrow*_ncol-1; i>=0;i--) {
[detail] +      _values[i]*=v;
[detail] +    }
[detail] +  }
[detail] +
[detail] +  template <typename T> void Matrix<T>::operator/=(const T& v)
[detail] +  {
[detail] +    T inv=1.0/v;
[detail] +    for(int i=_nrow*_ncol-1; i>=0;i--) {
[detail] +      _values[i]*=inv;
[detail] +    }
[detail] +  }
[detail] +
[detail] +  template <typename T> inline void Matrix<T>::identity()
[detail] +  {
[detail] +    fill(0);
[detail] +    int offset=_nrow+1;
[detail] +    int n=_nrow*_ncol;
[detail] +    for(int i=0; i<n; i+=offset) _values[i]=1;
[detail] +  }
[detail] +
[detail] +  template <typename T> inline void Matrix<T>::identity(const T& factor)
[detail] +  {
[detail] +    fill(0);
[detail] +    int offset=_nrow+1;
[detail] +    int n=_nrow*_ncol;
[detail] +    for(int i=0; i<n; i+=offset) _values[i]=factor;
[detail] +  }
[detail] +
[detail] +  template <typename T> void Matrix<T>::fill(const T& v)
[detail] +  {
[detail] +    for(int i=_nrow*_ncol-1; i>=0; i--) {
[detail] +      _values[i]=v;
[detail] +    }
[detail] +  }
[detail] +
[detail] +  template <typename T> T Matrix<T>::trace() const
[detail] +  {
[detail] +    ASSERT(_nrow==_ncol);
[detail] +    T sum=0;
[detail] +    for(int i=_nrow-1; i>=0; i--) {
[detail] +      sum+=at(i, i);
[detail] +    }
[detail] +    return sum;
[detail] +  }
[detail] +
[detail] +  template <typename T> inline T& Matrix<T>::at(int row, int col)
[detail] +  {
[detail] +    ASSERT(row>=0 && row<_nrow);
[detail] +    ASSERT(col>=0 && col<_ncol);
[detail] +    return _values[indexAt(row, col)];
[detail] +  }
[detail] +
[detail] +  template <typename T> inline const T& Matrix<T>::at(int row, int col) const
[detail] +  {
[detail] +    ASSERT(row>=0 && row<_nrow);
[detail] +    ASSERT(col>=0 && col<_ncol);
[detail] +    return _values[indexAt(row, col)];
[detail] +  }
[detail] +
[detail] +  template <typename T> inline T& Matrix<T>::at(int index)
[detail] +  {
[detail] +    ASSERT(index>=0 && index<_ncol*_nrow);
[detail] +    return _values[index];
[detail] +  }
[detail] +
[detail] +  template <typename T> inline const T& Matrix<T>::at(int index) const
[detail] +  {
[detail] +    ASSERT(index>=0 && index<_ncol*_nrow);
[detail] +    return _values[index];
[detail] +  }
[detail] +
[detail] +  template <typename T> void Matrix<T>::mergeRow(const Matrix<T>& row1, const Matrix<T>& row2)
[detail] +  {
[detail] +    ASSERT(row1._ncol==row2._ncol);
[detail] +    resize(row1._nrow+row2._nrow, row1._ncol);
[detail] +    int length1=sizeof(T)*row1._nrow;
[detail] +    int length2=sizeof(T)*row2._nrow;
[detail] +    T * values=_values;
[detail] +    T * lastValue=_values+_nrow*_ncol;
[detail] +    T * row1Values=row1._values;
[detail] +    T * row2Values=row2._values;
[detail] +    while(values<lastValue) {
[detail] +      memcpy(values, row1Values, length1);
[detail] +      values+=row1._nrow;
[detail] +      row1Values+=row1._nrow;
[detail] +      memcpy(values, row2Values, length2);
[detail] +      values+=row2._nrow;
[detail] +      row2Values+=row2._nrow;
[detail] +    }
[detail] +  }
[detail] +
[detail] +  template <typename T> void Matrix<T>::mergeColumn(const Matrix<T>& col1, const Matrix<T>& col2)
[detail] +  {
[detail] +    ASSERT(col1._nrow==col2._nrow);
[detail] +    resize(col1._nrow, col1._ncol+col2._ncol);
[detail] +    int offset=_nrow*col1._ncol;
[detail] +    memcpy(_values, col1._values, sizeof(T)*offset);
[detail] +    memcpy(_values+offset, col2._values, sizeof(T)*_nrow*col2._ncol);
[detail] +  }
[detail] +
[detail] +  template <typename T> int Matrix<T>::nextNullRow(int startRow) const
[detail] +  {
[detail] +    for(int ir=startRow; ir<_nrow; ir++) {
[detail] +      int ic=0;
[detail] +      for(; ic<_ncol; ic++) {
[detail] +        if(_values[ic*_nrow+ir]!=0.0) {
[detail] +          break;
[detail] +        }
[detail] +      }
[detail] +      if(ic==_ncol) {
[detail] +        return ir;
[detail] +      }
[detail] +    }
[detail] +    return -1;
[detail] +  }
[detail] +
[detail] +  template <typename T> bool Matrix<T>::hasNullOnDiagonal(double relativePrecision) const
[detail] +  {
[detail] +    ASSERT(_ncol==_nrow);
[detail] +    
[detail] +    double max=-std::numeric_limits<double>::infinity();
[detail] +    double * values=new double[_nrow];
[detail] +    for(int i=0; i<_nrow; i++) {
[detail] +      values[i]=QGpCoreTools::abs(_values[i*_nrow+i]);
[detail] +      if(values[i]>max) {
[detail] +        max=values[i];
[detail] +      }
[detail] +    }
[detail] +    
[detail] +    max*=relativePrecision;
[detail] +    for(int i=0; i<_nrow; i++) {
[detail] +      if(values[i]<max) {
[detail] +        delete [] values;
[detail] +        return true;
[detail] +      }
[detail] +    }
[detail] +    delete [] values;
[detail] +    return false;
[detail] +  }
[detail] +
[detail] +  template <typename T> QString Matrix<T>::toUserString(char format, int precision) const
[detail] +  {
[detail] +    QString str("    | ");
[detail] +    for(int j=0; j<_ncol; j++) {
[detail] +      str+=QString(" %1 |").arg(j, 12, 10, QChar(' '));
[detail] +    }
[detail] +    str+="\n----|-";
[detail] +    for(int j=0; j<_ncol; j++) {
[detail] +      str+="--------------|";
[detail] +    }
[detail] +    str+="\n";
[detail] +    for(int i=0; i<_nrow; i++) {
[detail] +      str+=QString("%1 | ").arg(i, 3, 10, QChar(' '));
[detail] +      for(int j=0; j<_ncol; j++) {
[detail] +        str+=QString(" %1 |").arg(Number::toDouble(at(i, j)), 12, format, precision, QChar(' '));
[detail] +      }
[detail] +      str+="\n";
[detail] +    }
[detail] +    str+="----|-";
[detail] +    for(int j=0; j<_ncol; j++) {
[detail] +      str+="--------------|";
[detail] +    }
[detail] +    str+="\n";
[detail] +    return str;
[detail] +  }
[detail] +
[detail] +  template <typename T> QString Matrix<T>::toOctaveString(char format, int precision) const
[detail] +  {
[detail] +    QString str("[");
[detail] +    for(int i=0; i<rowCount(); i++) {
[detail] +      for(int j=0; j<columnCount(); j++) {
[detail] +        str+=QString(" %1").arg(Number::toString(at(i, j), format, precision));
[detail] +      }
[detail] +      str+=";";
[detail] +    }
[detail] +    str+=" ]";
[detail] +    return str;
[detail] +  }
[detail] +
[detail] +  template <typename T> QString Matrix<T>::toString() const
[detail] +  {
[detail] +    QString str;
[detail] +    int n=_nrow*_ncol;
[detail] +    for(int i=0; i<n; i++) {
[detail] +      str+=Number::toString(_values[i], 'g', 20);
[detail] +      str+=" ";
[detail] +    }
[detail] +    return str;
[detail] +  }
[detail] +
[detail] +  template <typename T> QString Matrix<T>::toGridString() const
[detail] +  {
[detail] +    QString str;
[detail] +    str+="x y val\n";
[detail] +    for(int i=0; i<_ncol; i++) {
[detail] +      for(int j=0; j<_nrow; j++) {
[detail] +        str+=QString::number(i);
[detail] +        str+=" ";
[detail] +        str+=QString::number(j);
[detail] +        str+=" ";
[detail] +        str+=Number::toString(Number::toDouble(at(j, i)), 'g', 20);
[detail] +        str+="\n";
[detail] +      }
[detail] +    }
[detail] +    return str;
[detail] +  }
[detail] +
[detail] +  template <typename T> bool Matrix<T>::fromString(const StringSection& s)
[detail] +  {
[detail] +    const QChar * ptr=nullptr;
[detail] +    int n=_nrow*_ncol;
[detail] +    for(int i=0; i<n; i++) {
[detail] +      if(!s.nextNumber(_values[i], ptr)) {
[detail] +        return false;
[detail] +      }
[detail] +    }
[detail] +    return true;
[detail] +  }
[detail] +
[detail] +  template <typename T> void Matrix<T>::toOctaveFile(const QString& fileName, const QString& variableName) const
[detail] +  {
[detail] +    QFile f(fileName);
[detail] +    if(!f.open(QIODevice::Append)) {
[detail] +      App::log(tr("Cannot write to %1\n").arg(fileName));
[detail] +      return;
[detail] +    }
[detail] +    QTextStream s(&f);
[detail] +    s << variableName << "=" << toOctaveString('g', 20) << ";" << Qt::endl;
[detail] +    f.close();
[detail] +  }
[detail] +
[detail] +  template <typename T> void Matrix<T>::copyAt(int row, int col, const Matrix<T>& m, int nRow, int nCol)
[detail] +  {
[detail] +    T * thisValues=_values;
[detail] +    T * values=m._values;
[detail] +
[detail] +    int mRow=m.rowCount();
[detail] +    if(nRow<0) {
[detail] +      nRow=mRow;
[detail] +    }
[detail] +    int rowCopyCount=nRow;
[detail] +    if(row<0) {
[detail] +      values-=row;
[detail] +      rowCopyCount+=row;
[detail] +    } else {
[detail] +      thisValues+=row;
[detail] +    }
[detail] +    if(row+rowCopyCount>rowCount()) {
[detail] +      rowCopyCount=rowCount()-row;
[detail] +    }
[detail] +
[detail] +    int mCol=m.columnCount();
[detail] +    if(nCol<0) {
[detail] +      nCol=mCol;
[detail] +    }
[detail] +    int colCopyCount=nCol;
[detail] +    if(col<0) {
[detail] +      values-=col*mRow;
[detail] +      colCopyCount+=col;
[detail] +    } else {
[detail] +      thisValues+=col*_nrow;
[detail] +    }
[detail] +    if(col+colCopyCount>columnCount()) {
[detail] +      colCopyCount=columnCount()-col;
[detail] +    }
[detail] +
[detail] +    int length=sizeof(T)*rowCopyCount;
[detail] +    if(length<=0) {
[detail] +      return;
[detail] +    }
[detail] +    T * lastValue=values+colCopyCount*mRow;
[detail] +    while(values<lastValue) {
[detail] +      memcpy(thisValues, values, length);
[detail] +      values+=mRow;
[detail] +      thisValues+=_nrow;
[detail] +    }
[detail] +  }
[detail] +
[detail] +  template <typename T>
[detail] +  void Matrix<T>::copySubMatrixAt(int row, int col, const Matrix<T>& m,
[detail] +                                  int mRow, int mCol, int nRow, int nCol,
[detail] +                                  double factor)
[detail] +  {
[detail] +    T * thisValues=_values;
[detail] +    T * values=m._values;
[detail] +
[detail] +    if(nRow<0) {
[detail] +      nRow=m.rowCount();
[detail] +    }
[detail] +    thisValues+=row;
[detail] +    values+=mRow;
[detail] +    if(row+nRow>_nrow) {
[detail] +      nRow=_nrow-row;
[detail] +    }
[detail] +
[detail] +    if(nCol<0) {
[detail] +      nCol=m.columnCount();
[detail] +    }
[detail] +    thisValues+=col*_nrow;
[detail] +    values+=mCol*m.rowCount();
[detail] +    if(col+nCol>_ncol) {
[detail] +      nCol=_ncol-col;
[detail] +    }
[detail] +
[detail] +    T * lastValue=values+nCol*m.rowCount();
[detail] +    ASSERT(nRow>0);
[detail] +    if(factor==1.0) {
[detail] +      int length=sizeof(T)*nRow;
[detail] +      while(values<lastValue) {
[detail] +        memcpy(thisValues, values, length);
[detail] +        values+=m.rowCount();
[detail] +        thisValues+=_nrow;
[detail] +      }
[detail] +    } else {
[detail] +      while(values<lastValue) {
[detail] +        for(int i=0; i<nRow; i++) {
[detail] +          thisValues[i]=values[i]*factor;
[detail] +        }
[detail] +        values+=m.rowCount();
[detail] +        thisValues+=_nrow;
[detail] +      }
[detail] +    }
[detail] +  }
[detail] +
[detail] +  template <typename T> T Matrix<T>::scalarProduct(const Matrix<T>& m) const
[detail] +  {
[detail] +    ASSERT(_ncol==1 && m._ncol==1); 
[detail] +    ASSERT(_nrow==m._nrow);
[detail] +    T s=0.0;
[detail] +    for(int i=_nrow-1; i>=0; i--) {
[detail] +      s+=_values[i]*m._values[i];
[detail] +    }
[detail] +    return s;
[detail] +  }
[detail] +
[detail] +  template <typename T> void Matrix<T>::abs()
[detail] +  {
[detail] +    for(int i=_nrow*_ncol-1; i>=0; i--) {
[detail] +      _values[i]=QGpCoreTools::abs(_values[i]);
[detail] +    }
[detail] +  }
[detail] +
[detail] +  template <typename T> T Matrix<T>::minimum() const
[detail] +  {
[detail] +    int i=_nrow*_ncol-1;
[detail] +    if(i>0) {
[detail] +      T m=_values[i];
[detail] +      for(i--; i>=0; i--) {
[detail] +        if(_values[i]<m) {
[detail] +          m=_values[i];
[detail] +        }
[detail] +      }
[detail] +      return m;
[detail] +    } else {
[detail] +      return 0.0;
[detail] +    }
[detail] +  }
[detail] +
[detail] +  template <typename T> T Matrix<T>::maximum() const
[detail] +  {
[detail] +    int i=_nrow*_ncol-1;
[detail] +    if(i>0) {
[detail] +      T m=_values[i];
[detail] +      for(i--; i>=0; i--) {
[detail] +        if(_values[i]>m) {
[detail] +          m=_values[i];
[detail] +        }
[detail] +      }
[detail] +      return m;
[detail] +    } else {
[detail] +      return 0.0;
[detail] +    }
[detail] +  }
[detail] +
[detail] +  template <typename T> T* Matrix<T>::copyOfValues() const
[detail] +  {
[detail] +    int mn=_nrow*_ncol;
[detail] +    T * a=new T[mn];
[detail] +    memcpy(a, _values, mn*sizeof(T));
[detail] +    return a;
[detail] +  }
[detail] +
[detail] +  template <typename T>
[detail] +  void Matrix<T>::multiply(const Vector<T>& column, const Vector<T>& row, const T& factor)
[detail] +  {
[detail] +    ASSERT(static_cast<int>(column.size())==_nrow &&
[detail] +           static_cast<int>(row.size())==_ncol);
[detail] +    T * r=_values;
[detail] +    const T * m1=column.values();
[detail] +    const T * m2=row.values();
[detail] +    for(int i=0; i<_ncol; i++) {
[detail] +      T v1f=m2[i]*factor;
[detail] +      for(int j=0; j<_nrow; j++) {
[detail] +        *(r++)=v1f*m1[j];
[detail] +      }
[detail] +    }
[detail] +  }
[detail] +
[detail] +  template <typename T>
[detail] +  void Matrix<T>::addIdentity()
[detail] +  {
[detail] +    int offset=_nrow+1;
[detail] +    int n=_nrow*_ncol;
[detail] +    for(int i=0; i<n; i+=offset) _values[i]+=1;
[detail] +  }
[detail] +
[detail] +  template <typename T>
[detail] +  void Matrix<T>::addIdentity(const T& factor)
[detail] +  {
[detail] +    int offset=_nrow+1;
[detail] +    int n=_nrow*_ncol;
[detail] +    for(int i=0; i<n; i+=offset) _values[i]+=factor;
[detail] +  }
[detail] +
[detail] +  template <typename T> Matrix<T> Matrix<T>::operator+(const Matrix<T>& m) const
[detail]    {
[detail]      ASSERT(_nrow==m._nrow && _ncol==m._ncol);
[detail]      Matrix<T> r(_nrow, _ncol);
[detail] -    T * rValues=r._d->values();
[detail] +    T * rValues=r._values;
[detail]      for(int i=_nrow*_ncol-1; i>=0; i--) {
[detail]        rValues[i]=_values[i]+m._values[i];
[detail]      }
[detail]      return r;
[detail]    }
[detail]  
[detail] -  template <typename T> Matrix<T> MatrixData<T>::operator-() const
[detail] +  template <typename T> Matrix<T> Matrix<T>::operator-() const
[detail]    {
[detail]      Matrix<T> r(_nrow, _ncol);
[detail] -    T * rValues=r._d->values();
[detail] +    T * rValues=r._values;
[detail]      for(int i=_nrow*_ncol-1; i>=0; i--) {
[detail]        rValues[i]=-_values[i];
[detail]      }
[detail]      return r;
[detail]    }
[detail]  
[detail] -  template <typename T> Matrix<T> MatrixData<T>::operator-(const MatrixData<T>& m) const
[detail] +  template <typename T> Matrix<T> Matrix<T>::operator-(const Matrix<T>& m) const
[detail]    {
[detail]      ASSERT(_nrow==m._nrow && _ncol==m._ncol);
[detail]      Matrix<T> r(_nrow, _ncol);
[detail] -    T * rValues=r._d->values();
[detail] +    T * rValues=r._values;
[detail]      for(int i=_nrow*_ncol-1; i>=0; i--) {
[detail]        rValues[i]=_values[i]-m._values[i];
[detail]      }
[detail]      return r;
[detail]    }
[detail]  
[detail] -  template <typename T> Matrix<T> MatrixData<T>::operator*(const T& v) const
[detail] +  template <typename T> Matrix<T> Matrix<T>::operator*(const T& v) const
[detail]    {
[detail]      Matrix<T> r(_nrow, _ncol);
[detail] -    T * rValues=r._d->_values;
[detail] +    T * rValues=r._values;
[detail]      const T * thisValues=_values;
[detail]      for(int i=_nrow*_ncol-1; i>=0; i--) {
[detail]        rValues[i]=thisValues[i]*v;
[detail] @@ -147,12 +681,12 @@
[detail]      return r;
[detail]    }
[detail]  
[detail] -  template <typename T> Matrix<T> MatrixData<T>::operator*(const MatrixData<T>& m) const
[detail] +  template <typename T> Matrix<T> Matrix<T>::operator*(const Matrix<T>& m) const
[detail]    {
[detail]      ASSERT(_ncol==m._nrow);
[detail]      Matrix<T> rMatrix(_nrow, m._ncol);
[detail]      rMatrix.zero();
[detail] -    T * r=rMatrix._d->_values;
[detail] +    T * r=rMatrix._values;
[detail]      const T * m1=_values;
[detail]      const T * m2;
[detail]      const T * m1_end=m1+_nrow;
[detail] @@ -180,24 +714,20 @@
[detail]      return rMatrix;
[detail]    }
[detail]  
[detail] -  template <typename T> Matrix<T> MatrixData<T>::dotMultiply(const MatrixData<T>& m) const
[detail] +  template <typename T> void Matrix<T>::dotMultiply(const Matrix<T>& m)
[detail]    {
[detail]      ASSERT(_ncol==m._ncol);
[detail]      ASSERT(_nrow==m._nrow);
[detail] -    Matrix<T> r(_nrow, _ncol);
[detail] -    T * rValues=r._d->_values;
[detail] -    const T * thisValues=_values;
[detail]      const T * mValues=m._values;
[detail]      for(int i=_nrow*_ncol-1; i>=0; i--) {
[detail] -      rValues[i]=thisValues[i]*mValues[i];
[detail] +      _values[i]*=mValues[i];
[detail]      }
[detail] -    return r;
[detail]    }
[detail]  
[detail] -  template <typename T> Matrix<T> MatrixData<T>::transposed() const
[detail] +  template <typename T> Matrix<T> Matrix<T>::transposed() const
[detail]    {
[detail]      Matrix<T> t(_ncol, _nrow);
[detail] -    T * pt=t._d->_values;
[detail] +    T * pt=t._values;
[detail]      for(int i=0; i<_nrow; i++) {
[detail]        for(int j=0; j<_ncol; j++) {
[detail]          (*pt++)=_values[j*_nrow+i];
[detail] @@ -206,7 +736,7 @@
[detail]      return t;
[detail]    }
[detail]  
[detail] -  template <typename T> void MatrixData<T>::transposeVector()
[detail] +  template <typename T> void Matrix<T>::transposeVector()
[detail]    {
[detail]      ASSERT(isVector());
[detail]      qSwap(_nrow, _ncol);
[detail] @@ -219,31 +749,31 @@
[detail]      return t;
[detail]    }
[detail]  
[detail] -  template <typename T> Matrix<T> MatrixData<T>::subMatrix(int rowStart, int colStart, int rowEnd, int colEnd) const
[detail] +  template <typename T> void Matrix<T>::subMatrix(int rowStart, int colStart, int rowEnd, int colEnd,
[detail] +                                                  const Matrix<T>& m)
[detail]    {
[detail] -    ASSERT(rowStart>=0 && rowStart<=rowEnd && rowEnd<_nrow);
[detail] -    ASSERT(colStart>=0 && colStart<=colEnd && colEnd<_ncol);
[detail] +    ASSERT(rowStart>=0 && rowStart<=rowEnd && rowEnd<m._nrow);
[detail] +    ASSERT(colStart>=0 && colStart<=colEnd && colEnd<m._ncol);
[detail]      int mnrow=rowEnd-rowStart+1;
[detail]      int mncol=colEnd-colStart+1;
[detail] -    Matrix<T> m(mnrow, mncol);
[detail] +    resize(mnrow, mncol);
[detail]      int length=sizeof(T)*mnrow;
[detail] -    T * values=m._d->_values;
[detail] +    T * values=_values;
[detail]      T * lastValue=values+mnrow*mncol;
[detail] -    T * thisValues=_values+rowStart+colStart*_nrow;
[detail] +    T * thisValues=m._values+rowStart+colStart*m._nrow;
[detail]      while(values<lastValue) {
[detail]        memcpy(values, thisValues, length);
[detail]        values+=mnrow;
[detail] -      thisValues+=_nrow;
[detail] +      thisValues+=m._nrow;
[detail]      }
[detail] -    return m;
[detail]    }
[detail]  
[detail] -  template <typename T> Matrix<T> MatrixData<T>::sortedRows(const PermutationVector& p)
[detail] +  template <typename T> Matrix<T> Matrix<T>::sortedRows(const PermutationVector& p)
[detail]    {
[detail]      Matrix<T> m(_nrow, _ncol);
[detail]      for(int i=0; i<_ncol; i++) {
[detail]        int offset=i*_nrow;
[detail] -      T * values=m._d->_values+offset;
[detail] +      T * values=m._values+offset;
[detail]        T * thisValues=_values+offset;
[detail]        for(int j=0; j<_nrow; j++) {
[detail]          values[p.newIndex(j)]=thisValues[j];
[detail] @@ -252,28 +782,24 @@
[detail]      return m;
[detail]    }
[detail]  
[detail] -  template <typename T> Matrix<T> MatrixData<T>::sortedColumns(const PermutationVector& p)
[detail] +  template <typename T> Matrix<T> Matrix<T>::sortedColumns(const PermutationVector& p)
[detail]    {
[detail]      Matrix<T> m(_nrow, _ncol);
[detail] -    T * values=m._d->_values;
[detail] +    T * values=m._values;
[detail]      for(int i=0; i<_ncol; i++) {
[detail]        memcpy(values+p.newIndex(i)*_nrow, _values+i*_nrow, sizeof(T)*_nrow);
[detail]      }
[detail]      return m;
[detail]    }
[detail]  
[detail] -  template <typename T> inline void Matrix<T>::operator*=(const Matrix<T>& m)
[detail] -  {
[detail] -    *this=_d->operator*(*m._d);
[detail] -  }
[detail] -
[detail]    template <typename T> VectorList<T> Matrix<T>::rowAt(int row) const
[detail]    {
[detail]      VectorList<T> r(columnCount());
[detail] -    MatrixColumnIterator<T> it(*this, row);
[detail] +    RowConstIterator<T> it;
[detail]      int i=0;
[detail] +    it.begin(*this, row);
[detail]      while(it.hasNext()) {
[detail] -      r[i++]=*it.next();
[detail] +      r[i++]=it.next();
[detail]      }
[detail]      return r;
[detail]    }
[detail] @@ -281,10 +807,11 @@
[detail]    template <typename T> VectorList<T> Matrix<T>::columnAt(int col) const
[detail]    {
[detail]      VectorList<T> r(rowCount());
[detail] -    MatrixColumnIterator<T> it(*this, col);
[detail] +    ColumnConstIterator<T> it;
[detail]      int i=0;
[detail] +    it.begin(*this, col);
[detail]      while(it.hasNext()) {
[detail] -      r[i++]=*it.next();
[detail] +      r[i++]=it.next();
[detail]      }
[detail]      return r;
[detail]    }
[detail]                src/MatrixConstIterator.h:  version-1.5.2	no last version available
[detail]                     src/MatrixIterator.h:  version-1.5.2	modified out of comments
[detail] --- src/MatrixIterator.h-version-1.5.2-stripped	2025-09-28 04:00:54.571452586 +0200
[detail] +++ src/MatrixIterator.h-HEAD-stripped	2025-09-28 04:00:54.575452605 +0200
[detail] @@ -8,135 +8,292 @@
[detail]  
[detail]  namespace QGpCoreMath {
[detail]  
[detail] -template <typename T> class QGPCOREMATH_EXPORT MatrixIterator
[detail] +  template <typename T>
[detail] +  class QGPCOREMATH_EXPORT MatrixIterator
[detail]  {
[detail]  public:
[detail] -  inline MatrixIterator(const Matrix<T>& m);
[detail] +    MatrixIterator() {_cur=nullptr; _end=nullptr;}
[detail]  
[detail] -  inline const T * next() {_cur += _offset; return _cur;}
[detail] -  inline const T * previous() {_cur -= _offset; return _cur;}
[detail] -  inline const T& operator*() {ASSERT(_cur >= _start && _cur <= _end); return *_cur;}
[detail]    bool hasNext() const {return _cur < _end;}
[detail] -  bool hasPrevious() const {return _cur > _start;}
[detail] -  void toBack() {return _cur=_end;}
[detail] -  void toFront() {return _cur=_start;}
[detail] +    T& next() {T * c=_cur; _cur+=_offset; return *c;}
[detail] +    bool hasPrevious() const {return _cur>=_end;}
[detail] +    T& previous() {_cur-=_offset; return *_cur;}
[detail]  protected:
[detail] -  MatrixIterator() {}
[detail] -
[detail] -  const T * _cur, * _start, * _end;
[detail]    int _offset;
[detail] +    T * _cur, * _end;
[detail]  };
[detail]  
[detail] -template <typename T> class QGPCOREMATH_EXPORT MutableMatrixIterator
[detail] +  template <typename T>
[detail] +  class QGPCOREMATH_EXPORT RowIterator : public MatrixIterator<T>
[detail]  {
[detail]  public:
[detail] -  inline MutableMatrixIterator(Matrix<T>& m);
[detail] -
[detail] -  inline T * next() {_cur+=_offset; return _cur;}
[detail] -  inline T * previous() {_cur-=_offset; return _cur;}
[detail] -  inline T& operator*() {ASSERT(_cur>=_start && _cur<=_end); return *_cur;}
[detail] -  bool hasNext() const {return _cur<_end;}
[detail] -  bool hasPrevious() const {return _cur>_start;}
[detail] -  void toBack() {return _cur=_end+_offset;}
[detail] -  void toFront() {return _cur=_start-_offset;}
[detail] -protected:
[detail] -  MutableMatrixIterator() {}
[detail] -
[detail] -  T * _cur, * _start, * _end;
[detail] -  int _offset;
[detail] +    void begin(Matrix<T>& m, int row) {
[detail] +      MatrixIterator<T>::_cur=m.values()+row;
[detail] +      MatrixIterator<T>::_end=m.values()+m.columnCount()*m.rowCount();
[detail] +      MatrixIterator<T>::_offset=m.rowCount();
[detail] +    }
[detail] +    void begin(Matrix<T>& m, int row, int col) {
[detail] +      MatrixIterator<T>::_cur=m.values()+col*m.rowCount()+row;
[detail] +      MatrixIterator<T>::_end=m.values()+m.columnCount()*m.rowCount();
[detail] +      MatrixIterator<T>::_offset=m.rowCount();
[detail] +    }
[detail] +    void begin(Matrix<T>& m, int row, int col, int increment) {
[detail] +      MatrixIterator<T>::_cur=m.values()+col*m.rowCount()+row;
[detail] +      MatrixIterator<T>::_end=m.values()+m.columnCount()*m.rowCount();
[detail] +      MatrixIterator<T>::_offset=increment*m.rowCount();
[detail] +    }
[detail]  };
[detail]  
[detail] -template <typename T> class QGPCOREMATH_EXPORT MatrixRowIterator : public MatrixIterator<T>
[detail] +  template <typename T>
[detail] +  class QGPCOREMATH_EXPORT RowReverseIterator : public MatrixIterator<T>
[detail]  {
[detail]  public:
[detail] -  inline MatrixRowIterator(const Matrix<T>& m, int iRow);
[detail] +    void begin(Matrix<T>& m, int row) {
[detail] +      MatrixIterator<T>::_end=m.values()+row;
[detail] +      MatrixIterator<T>::_cur=MatrixIterator<T>::_end+m.columnCount()*m.rowCount();
[detail] +      MatrixIterator<T>::_offset=m.rowCount();
[detail] +    }
[detail] +    void begin(Matrix<T>& m, int row, int col) {
[detail] +      MatrixIterator<T>::_end=m.values()+row;
[detail] +      MatrixIterator<T>::_cur=MatrixIterator<T>::_end+m.columnCount()*m.rowCount();
[detail] +      MatrixIterator<T>::_end+=col*m.rowCount();
[detail] +      MatrixIterator<T>::_offset=m.rowCount();
[detail] +    }
[detail] +    void begin(Matrix<T>& m, int row, int col, int increment) {
[detail] +      MatrixIterator<T>::_end=m.values()+row;
[detail] +      MatrixIterator<T>::_cur=MatrixIterator<T>::_end+m.columnCount()*m.rowCount();
[detail] +      MatrixIterator<T>::_end+=col*m.rowCount();
[detail] +      MatrixIterator<T>::_offset=increment*m.rowCount();
[detail] +    }
[detail]  };
[detail]  
[detail] -template <typename T> class QGPCOREMATH_EXPORT MatrixColumnIterator : public MatrixIterator<T>
[detail] +  template <typename T>
[detail] +  class QGPCOREMATH_EXPORT ColumnIterator : public MatrixIterator<T>
[detail]  {
[detail]  public:
[detail] -  inline MatrixColumnIterator(const Matrix<T>& m, int iCol);
[detail] +    void begin(Matrix<T>& m, int col) {
[detail] +      MatrixIterator<T>::_cur=m.values()+col*m.rowCount();
[detail] +      MatrixIterator<T>::_end=MatrixIterator<T>::_cur+m.rowCount();
[detail] +      MatrixIterator<T>::_offset=1;
[detail] +    }
[detail] +    void begin(Matrix<T>& m, int row, int col) {
[detail] +      MatrixIterator<T>::_cur=m.values()+col*m.rowCount();
[detail] +      MatrixIterator<T>::_end=MatrixIterator<T>::_cur+m.rowCount();
[detail] +      MatrixIterator<T>::_cur+=row;
[detail] +      MatrixIterator<T>::_offset=1;
[detail] +    }
[detail] +    void begin(Matrix<T>& m, int row, int col, int increment) {
[detail] +      MatrixIterator<T>::_cur=m.values()+col*m.rowCount();
[detail] +      MatrixIterator<T>::_end=MatrixIterator<T>::_cur+m.rowCount();
[detail] +      MatrixIterator<T>::_cur+=row;
[detail] +      MatrixIterator<T>::_offset=increment;
[detail] +    }
[detail]  };
[detail]  
[detail]  template <typename T>
[detail] -inline MatrixIterator<T>::MatrixIterator(const Matrix<T>& m)
[detail] +  class QGPCOREMATH_EXPORT ColumnReverseIterator : public MatrixIterator<T>
[detail]  {
[detail] -  TRACE;
[detail] -  _offset=1;
[detail] -  _start=m._d->values();
[detail] -  _end=_start+m.rowCount()*m.columnCount()-1;
[detail] -  _cur=_start-_offset;
[detail] +  public:
[detail] +    void begin(Matrix<T>& m, int col) {
[detail] +      MatrixIterator<T>::_end=m.values()+col*m.rowCount();;
[detail] +      MatrixIterator<T>::_cur=MatrixIterator<T>::_end+m.rowCount();
[detail] +      MatrixIterator<T>::_offset=1;
[detail] +    }
[detail] +    void begin(Matrix<T>& m, int row, int col) {
[detail] +      MatrixIterator<T>::_end=m.values()+col*m.rowCount();
[detail] +      MatrixIterator<T>::_cur=MatrixIterator<T>::_cur+m.rowCount();
[detail] +      MatrixIterator<T>::_end+=row;
[detail] +      MatrixIterator<T>::_offset=1;
[detail]  }
[detail] +    void begin(Matrix<T>& m, int row, int col, int increment) {
[detail] +      MatrixIterator<T>::_end=m.values()+col*m.rowCount();
[detail] +      MatrixIterator<T>::_cur=MatrixIterator<T>::_cur+m.rowCount();
[detail] +      MatrixIterator<T>::_end+=row;
[detail] +      MatrixIterator<T>::_offset=increment;
[detail] +    }
[detail] +  };
[detail]  
[detail]  template <typename T>
[detail] -inline MutableMatrixIterator<T>::MutableMatrixIterator(Matrix<T>& m)
[detail] +  class QGPCOREMATH_EXPORT UpTriangleRowIterator : public MatrixIterator<T>
[detail]  {
[detail] -  TRACE;
[detail] -  _offset=1;
[detail] -  _start=m._d->values();
[detail] -  _end=_start+m.rowCount()*m.columnCount()-1;
[detail] -  _cur=_start-_offset;
[detail] +  public:
[detail] +    void begin(Matrix<T>& m, int row) {
[detail] +      MatrixIterator<T>::_cur=m.values()+row*m.rowCount()+row;
[detail] +      MatrixIterator<T>::_end=m.values()+m.columnCount()*m.rowCount();
[detail] +      MatrixIterator<T>::_offset=m.rowCount();
[detail] +    }
[detail] +    void begin(Matrix<T>& m, int row, int increment) {
[detail] +      MatrixIterator<T>::_cur=m.values()+row*m.rowCount()+row;
[detail] +      MatrixIterator<T>::_end=m.values()+m.columnCount()*m.rowCount();
[detail] +      MatrixIterator<T>::_offset=increment*m.rowCount();
[detail]  }
[detail] +  };
[detail]  
[detail]  template <typename T>
[detail] -inline MatrixRowIterator<T>::MatrixRowIterator(const Matrix<T>& m, int iRow)
[detail] -   : MatrixIterator<T>()
[detail] +  class QGPCOREMATH_EXPORT StrictUpTriangleRowIterator : public MatrixIterator<T>
[detail]  {
[detail] -  TRACE;
[detail] -  ASSERT(iRow>=0 && iRow<m.rowCount());
[detail] +  public:
[detail] +    void begin(Matrix<T>& m, int row) {
[detail] +      MatrixIterator<T>::_cur=m.values()+(row+1)*m.rowCount()+row;
[detail] +      MatrixIterator<T>::_end=m.values()+m.columnCount()*m.rowCount();
[detail]    MatrixIterator<T>::_offset=m.rowCount();
[detail] -  MatrixIterator<T>::_start=m._d->values() + iRow;
[detail] -  MatrixIterator<T>::_end=MatrixIterator<T>::_start+m.rowCount()*(m.columnCount()-1);
[detail] -  MatrixIterator<T>::_cur=MatrixIterator<T>::_start-MatrixIterator<T>::_offset;
[detail]  }
[detail] +    void begin(Matrix<T>& m, int row, int increment) {
[detail] +      MatrixIterator<T>::_cur=m.values()+(row+1)*m.rowCount()+row;
[detail] +      MatrixIterator<T>::_end=m.values()+m.columnCount()*m.rowCount();
[detail] +      MatrixIterator<T>::_offset=increment*m.rowCount();
[detail] +    }
[detail] +  };
[detail] +
[detail] +  template <typename T>
[detail] +  class QGPCOREMATH_EXPORT UpTriangleColumnIterator : public MatrixIterator<T>
[detail] +  {
[detail] +  public:
[detail] +    void begin(Matrix<T>& m, int col) {
[detail] +      MatrixIterator<T>::_cur=m.values()+col*m.rowCount();
[detail] +      MatrixIterator<T>::_end=MatrixIterator<T>::_cur+col+1;
[detail] +      MatrixIterator<T>::_offset=1;
[detail] +    }
[detail] +    void begin(Matrix<T>& m, int row, int col) {
[detail] +      MatrixIterator<T>::_cur=m.values()+col*m.rowCount();
[detail] +      MatrixIterator<T>::_end=MatrixIterator<T>::_cur+col+1;
[detail] +      MatrixIterator<T>::_cur+=row;
[detail] +      MatrixIterator<T>::_offset=1;
[detail] +    }
[detail] +    void begin(Matrix<T>& m, int row, int col, int increment) {
[detail] +      MatrixIterator<T>::_cur=m.values()+col*m.rowCount();
[detail] +      MatrixIterator<T>::_end=MatrixIterator<T>::_cur+col+1;
[detail] +      MatrixIterator<T>::_cur+=row;
[detail] +      MatrixIterator<T>::_offset=increment;
[detail] +    }
[detail] +  };
[detail]  
[detail]  template <typename T>
[detail] -inline MatrixColumnIterator<T>::MatrixColumnIterator(const Matrix<T>& m, int iCol)
[detail] -   : MatrixIterator<T>()
[detail] +  class QGPCOREMATH_EXPORT StrictUpTriangleColumnIterator : public MatrixIterator<T>
[detail]  {
[detail] -  TRACE;
[detail] -  ASSERT(iCol>=0 && iCol<m.columnCount());
[detail] +  public:
[detail] +    void begin(Matrix<T>& m, int col) {
[detail] +      MatrixIterator<T>::_cur=m.values()+col*m.rowCount();
[detail] +      MatrixIterator<T>::_end=MatrixIterator<T>::_cur+col;
[detail]    MatrixIterator<T>::_offset=1;
[detail] -  MatrixIterator<T>::_start=m._d->values()+m.rowCount()*iCol;
[detail] -  MatrixIterator<T>::_end=MatrixIterator<T>::_start+m.rowCount()-1;
[detail] -  MatrixIterator<T>::_cur=MatrixIterator<T>::_start-MatrixIterator<T>::_offset;
[detail]  }
[detail] +    void begin(Matrix<T>& m, int row, int col) {
[detail] +      MatrixIterator<T>::_cur=m.values()+col*m.rowCount();
[detail] +      MatrixIterator<T>::_end=MatrixIterator<T>::_cur+col;
[detail] +      MatrixIterator<T>::_cur+=row;
[detail] +      MatrixIterator<T>::_offset=1;
[detail] +    }
[detail] +    void begin(Matrix<T>& m, int row, int col, int increment) {
[detail] +      MatrixIterator<T>::_cur=m.values()+col*m.rowCount();
[detail] +      MatrixIterator<T>::_end=MatrixIterator<T>::_cur+col;
[detail] +      MatrixIterator<T>::_cur+=row;
[detail] +      MatrixIterator<T>::_offset=increment;
[detail] +    }
[detail] +  };
[detail]  
[detail] -template <typename T> class QGPCOREMATH_EXPORT MutableMatrixRowIterator : public MatrixIterator<T>
[detail] +  template <typename T>
[detail] +  class QGPCOREMATH_EXPORT DownTriangleRowIterator : public MatrixIterator<T>
[detail]  {
[detail]  public:
[detail] -  inline MutableMatrixRowIterator(const Matrix<T>& m, int iRow);
[detail] +    void begin(Matrix<T>& m, int row) {
[detail] +      MatrixIterator<T>::_cur=m.values()+row;
[detail] +      MatrixIterator<T>::_end=m.values()+(row+1)*m.rowCount();
[detail] +      MatrixIterator<T>::_offset=m.rowCount();
[detail] +    }
[detail] +    void begin(Matrix<T>& m, int row, int col) {
[detail] +      MatrixIterator<T>::_cur=m.values()+col*m.rowCount()+row;
[detail] +      MatrixIterator<T>::_end=m.values()+(row+1)*m.rowCount();
[detail] +      MatrixIterator<T>::_offset=m.rowCount();
[detail] +    }
[detail] +    void begin(Matrix<T>& m, int row, int col, int increment) {
[detail] +      MatrixIterator<T>::_cur=m.values()+col*m.rowCount()+row;
[detail] +      MatrixIterator<T>::_end=m.values()+(row+1)*m.rowCount();
[detail] +      MatrixIterator<T>::_offset=increment*m.rowCount();
[detail] +    }
[detail]  };
[detail]  
[detail]  template <typename T>
[detail] -inline MutableMatrixRowIterator<T>::MutableMatrixRowIterator(const Matrix<T>& m, int iRow)
[detail] -   : MutableMatrixIterator<T>()
[detail] +  class QGPCOREMATH_EXPORT StrictDownTriangleRowIterator : public MatrixIterator<T>
[detail]  {
[detail] -  TRACE;
[detail] -  ASSERT(iRow >= 0 && iRow < m.rowCount());
[detail] -  MutableMatrixIterator<T>::_offset=m.rowCount();
[detail] -  MutableMatrixIterator<T>::_start=m._data.data()+iRow;
[detail] -  MutableMatrixIterator<T>::_end=MutableMatrixIterator<T>::_start+m.rowCount()*(m.columnCount()-1);
[detail] -  MutableMatrixIterator<T>::_cur=MutableMatrixIterator<T>::_start-m.rowCount();
[detail] +  public:
[detail] +    void begin(Matrix<T>& m, int row) {
[detail] +      MatrixIterator<T>::_cur=m.values()+row;
[detail] +      MatrixIterator<T>::_end=m.values()+row*m.rowCount();
[detail] +      MatrixIterator<T>::_offset=m.rowCount();
[detail]  }
[detail] +    void begin(Matrix<T>& m, int row, int col) {
[detail] +      MatrixIterator<T>::_cur=m.values()+col*m.rowCount()+row;
[detail] +      MatrixIterator<T>::_end=m.values()+row*m.rowCount();
[detail] +      MatrixIterator<T>::_offset=m.rowCount();
[detail] +    }
[detail] +    void begin(Matrix<T>& m, int row, int col, int increment) {
[detail] +      MatrixIterator<T>::_cur=m.values()+col*m.rowCount()+row;
[detail] +      MatrixIterator<T>::_end=m.values()+row*m.rowCount();
[detail] +      MatrixIterator<T>::_offset=increment*m.rowCount();
[detail] +    }
[detail] +  };
[detail] +
[detail] +  template <typename T>
[detail] +  class QGPCOREMATH_EXPORT DownTriangleColumnIterator : public MatrixIterator<T>
[detail] +  {
[detail] +  public:
[detail] +    void begin(Matrix<T>& m, int col) {
[detail] +      MatrixIterator<T>::_cur=m.values()+col*m.rowCount();
[detail] +      MatrixIterator<T>::_end=MatrixIterator<T>::_cur+m.rowCount();
[detail] +      MatrixIterator<T>::_cur+=col;
[detail] +      MatrixIterator<T>::_offset=1;
[detail] +    }
[detail] +    void begin(Matrix<T>& m, int col, int increment) {
[detail] +      MatrixIterator<T>::_cur=m.values()+col*m.rowCount();
[detail] +      MatrixIterator<T>::_end=MatrixIterator<T>::_cur+m.rowCount();
[detail] +      MatrixIterator<T>::_cur+=col;
[detail] +      MatrixIterator<T>::_offset=increment;
[detail] +    }
[detail] +  };
[detail]  
[detail] -template <typename T> class QGPCOREMATH_EXPORT MutableMatrixColumnIterator : public MatrixIterator<T>
[detail] +  template <typename T>
[detail] +  class QGPCOREMATH_EXPORT StrictDownTriangleColumnIterator : public MatrixIterator<T>
[detail]  {
[detail]  public:
[detail] -  inline MutableMatrixColumnIterator(const Matrix<T>& m, int iCol);
[detail] +    void begin(Matrix<T>& m, int col) {
[detail] +      MatrixIterator<T>::_cur=m.values()+col*m.rowCount();
[detail] +      MatrixIterator<T>::_end=MatrixIterator<T>::_cur+m.rowCount();
[detail] +      MatrixIterator<T>::_cur+=col+1;
[detail] +      MatrixIterator<T>::_offset=1;
[detail] +    }
[detail] +    void begin(Matrix<T>& m, int col, int increment) {
[detail] +      MatrixIterator<T>::_cur=m.values()+col*m.rowCount();
[detail] +      MatrixIterator<T>::_end=MatrixIterator<T>::_cur+m.rowCount();
[detail] +      MatrixIterator<T>::_cur+=col+1;
[detail] +      MatrixIterator<T>::_offset=increment;
[detail] +    }
[detail]  };
[detail]  
[detail]  template <typename T>
[detail] -inline MutableMatrixColumnIterator<T>::MutableMatrixColumnIterator(const Matrix<T>& m, int iCol)
[detail] -   : MutableMatrixIterator<T>()
[detail] +  class QGPCOREMATH_EXPORT DiagonalIterator : public MatrixIterator<T>
[detail]  {
[detail] -  TRACE;
[detail] -  ASSERT(iCol >= 0 && iCol < m.columnCount());
[detail] -  MutableMatrixIterator<T>::_offset=1;
[detail] -  MutableMatrixIterator<T>::_start=m._data.data() + m.rowCount() * iCol;
[detail] -  MutableMatrixIterator<T>::_end=MutableMatrixIterator<T>::_start + m.rowCount() - 1;
[detail] -  MutableMatrixIterator<T>::_cur=MutableMatrixIterator<T>::_start - 1;
[detail] +  public:
[detail] +    void begin(Matrix<T>& m) {
[detail] +      MatrixIterator<T>::_cur=m.values();
[detail] +      MatrixIterator<T>::_end=m.values()+m.columnCount()*m.rowCount();
[detail] +      MatrixIterator<T>::_offset=m.rowCount()+1;
[detail] +    }
[detail] +    void begin(Matrix<T>& m, int index) {
[detail] +      MatrixIterator<T>::_cur=m.values()+index*m.rowCount()+index;
[detail] +      MatrixIterator<T>::_end=m.values()+m.columnCount()*m.rowCount();
[detail] +      MatrixIterator<T>::_offset=m.rowCount()+1;
[detail] +    }
[detail] +    void begin(Matrix<T>& m, int row, int col) {
[detail] +      MatrixIterator<T>::_cur=m.values()+col*m.rowCount()+row;
[detail] +      MatrixIterator<T>::_end=m.values()+m.columnCount()*m.rowCount();
[detail] +      MatrixIterator<T>::_offset=m.rowCount()+1;
[detail]  }
[detail] +    void begin(Matrix<T>& m, int row, int col, int increment) {
[detail] +      MatrixIterator<T>::_cur=m.values()+col*m.rowCount()+row;
[detail] +      MatrixIterator<T>::_end=m.values()+m.columnCount()*m.rowCount();
[detail] +      MatrixIterator<T>::_offset=increment*(m.rowCount()+1);
[detail] +    }
[detail] +  };
[detail]  
[detail]  } 
[detail]  
[detail]                         src/MisfitType.h:  version-1.5.2	no last version available
[detail]       src/ModifiedCholeskyOptimization.h:  version-1.5.2	no last version available
[detail]     src/MultivariateNormalDistribution.h:  version-1.5.2	modified out of comments
[detail] --- src/MultivariateNormalDistribution.h-version-1.5.2-stripped	2025-09-28 04:00:54.603452741 +0200
[detail] +++ src/MultivariateNormalDistribution.h-HEAD-stripped	2025-09-28 04:00:54.607452759 +0200
[detail] @@ -25,7 +25,7 @@
[detail]  
[detail]      bool isSimilar(const MultivariateNormalDistribution& o, double precision);
[detail]  
[detail] -    int count() const {return _mean.count();}
[detail] +    int size() const {return _mean.size();}
[detail]  
[detail]      const Vector<double>& mean() const {return _mean;}
[detail]      double mean(int index) const {return _mean[index];}
[detail]             src/MultivariateStatistics.h:  version-1.5.2	modified out of comments
[detail] --- src/MultivariateStatistics.h-version-1.5.2-stripped	2025-09-28 04:00:54.623452837 +0200
[detail] +++ src/MultivariateStatistics.h-HEAD-stripped	2025-09-28 04:00:54.627452857 +0200
[detail] @@ -17,7 +17,7 @@
[detail]  
[detail]      void add(const Vector<double>& val, double weight=1.0);
[detail]  
[detail] -    int dimensionCount() const {return _sum.count();}
[detail] +    int size() const {return _sum.size();}
[detail]      void mean(Vector<double>& m) const;
[detail]      DoubleMatrix variance() const;
[detail]    private:
[detail]                         src/NamedPoint.h:  version-1.5.2	not modified
[detail]               src/NewtonOptimization1D.h:  version-1.5.2	modified out of comments
[detail] --- src/NewtonOptimization1D.h-version-1.5.2-stripped	2025-09-28 04:00:54.655452992 +0200
[detail] +++ src/NewtonOptimization1D.h-HEAD-stripped	2025-09-28 04:00:54.659453012 +0200
[detail] @@ -6,25 +6,82 @@
[detail]  #include <QGpCoreTools.h>
[detail]  
[detail]  #include "QGpCoreMathDLLExport.h"
[detail] +#include "FunctionSearch.h"
[detail] +#include "Statistics.h"
[detail]  
[detail]  namespace QGpCoreMath {
[detail]  
[detail] +  class QGPCOREMATH_EXPORT NewtonOptimization1Df : public FunctionSearch
[detail] +  {
[detail] +  public:
[detail] +    NewtonOptimization1Df();
[detail] +    ~NewtonOptimization1Df();
[detail] +
[detail] +    void setMaximumIterations(int m) {_maxIterations=m;}
[detail] +    int maximumIterations() const {return _maxIterations;}
[detail] +
[detail] +    void reset(double x);
[detail] +    bool maximize(double defaultStep);
[detail] +    bool minimize(double defaultStep);
[detail] +    bool globalMaximize(double min, double max, double defaultStep);
[detail] +
[detail] +    double value() const {return _a1->value;}
[detail] +    double position() {return _a1->x;}
[detail] +
[detail] +    void grids(double minX, double maxX, double stepX) const;
[detail] +  private:
[detail] +    class Attributes
[detail] +    {
[detail] +    public:
[detail] +      Attributes();
[detail] +
[detail] +      double x;
[detail] +      double value;
[detail] +      double gradient;
[detail] +      double hessian;
[detail] +    };
[detail] +
[detail] +    Attributes * _a1, * _a2;
[detail] +    int _maxIterations;
[detail] +
[detail] +    inline bool atEnd(const double& x, const double& dx) const;
[detail] +    inline void ascentStep(const double& gradient, double& dx) const;
[detail] +    inline void descentStep(const double& gradient, double& dx) const;
[detail] +    inline bool newtonStep(const Attributes& a, double& dx) const;
[detail] +    inline bool isNegativeConcavity(const double& x, double& hessian);
[detail] +    inline bool isPositiveConcavity(const double& x, double& hessian);
[detail] +    inline bool nextAscent(const double& dx, const double& max);
[detail] +    inline bool increaseStepAscent(const double& dx);
[detail] +    inline bool decreaseStepAscent(double dx);
[detail] +    inline bool increaseStepDescent(const double& dx);
[detail] +    inline bool decreaseStepDescent(double dx);
[detail] +
[detail] +    static QMutex _iterationStatsMutex;
[detail] +    static Statistics _convergedIterationStats;
[detail] +    static Statistics _smallStepIterationStats;
[detail] +    static int _maxIterationsReached;
[detail] +  };
[detail] +
[detail]    class QGPCOREMATH_EXPORT NewtonOptimization1D
[detail]    {
[detail]    public:
[detail]      NewtonOptimization1D();
[detail]      ~NewtonOptimization1D();
[detail]  
[detail] -    void setRelativePrecision(double p) {_relativePrecision=p;}
[detail] -    double relativePrecision() const {return _relativePrecision;}
[detail] +    enum PrecisionType {Relative, Absolute};
[detail] +
[detail] +    void setRelativePrecision(double p);
[detail] +    void setAbsolutePrecision(double p);
[detail] +    double precision() const {return _precision;}
[detail]  
[detail] -    void setAbsolutePrecision(double p) {_absolutePrecision=p;}
[detail] -    double absolutePrecision() const {return _absolutePrecision;}
[detail] +    int size() const {return 1;}
[detail]  
[detail]      template <class Function, class Attributes>
[detail]      bool minimize(Attributes& s0, const Function * f, double defaultStep) const;
[detail]      template <class Function, class Attributes>
[detail]      bool maximize(Attributes& s0, const Function * f, double defaultStep) const;
[detail] +    template <class Function, class Attributes>
[detail] +    bool verboseMaximize(Attributes& s0, const Function * f, double defaultStep) const;
[detail]  
[detail]      template <class Function, class Attributes>
[detail]      void curves(const Function * f, double minX, double maxX, double curveStepX) const;
[detail] @@ -34,16 +91,20 @@
[detail]      void test(const Function * f, double minX, double maxX, double curveStepX, double optimizationdefaultStep) const;
[detail]    private:
[detail]      inline bool atEnd(double x, double dx) const;
[detail] -    template <class Attributes> inline double step(const Attributes& a, double oldDx, double defaultStep) const;
[detail] -    double _relativePrecision, _absolutePrecision;
[detail] +    template <class Attributes>
[detail] +    inline double step(const Attributes& a,
[detail] +                       double oldDx,
[detail] +                       double defaultStep) const;
[detail] +    PrecisionType _precisionType;
[detail] +    double _precision;
[detail]    };
[detail]  
[detail]    inline bool NewtonOptimization1D::atEnd(double x, double dx) const
[detail]    {
[detail] -    if(_relativePrecision>0.0) {
[detail] -      return fabs(dx)<fabs(x*_relativePrecision);
[detail] +    if(_precisionType==Relative) {
[detail] +      return fabs(dx)<fabs(x*_precision);
[detail]      } else {
[detail] -      return fabs(dx)<_absolutePrecision;
[detail] +      return fabs(dx)<_precision;
[detail]      }
[detail]    }
[detail]  
[detail] @@ -273,6 +334,142 @@
[detail]      }
[detail]    }
[detail]  
[detail] +  template <class Attributes>
[detail] +  void showValueAndDerivative(int line, int evaluationCount, Attributes * a1)
[detail] +  {
[detail] +    App::log(tr("%7 : %1 : %2 f( %3 )= %4 f'= %5 f\"= %6\n")
[detail] +                 .arg(line)
[detail] +                 .arg(evaluationCount)
[detail] +                 .arg(a1->x)
[detail] +                 .arg(a1->value)
[detail] +                 .arg(a1->slope)
[detail] +                 .arg(a1->concavity)
[detail] +                 .arg(Thread::currentThread()->objectName()));
[detail] +  }
[detail] +
[detail] +  template <class Attributes>
[detail] +  void showValue(int line, int evaluationCount, Attributes * a1)
[detail] +  {
[detail] +    App::log(tr("%5 : %1 : %2 f( %3 )= %4\n")
[detail] +                 .arg(line)
[detail] +                 .arg(evaluationCount)
[detail] +                 .arg(a1->x)
[detail] +                 .arg(a1->value)
[detail] +                 .arg(Thread::currentThread()->objectName()));
[detail] +  }
[detail] +
[detail] +  template <class Function, class Attributes>
[detail] +  bool NewtonOptimization1D::verboseMaximize(Attributes& a0, const Function * f, double defaultStep) const
[detail] +  {
[detail] +    Attributes aSwap;
[detail] +    Attributes * a1, * a2;
[detail] +    a1=&a0;
[detail] +    a2=&aSwap;
[detail] +    int evaluationCount=2;
[detail] +    f->setFunctionValue(*a1);
[detail] +    f->setFunctionDerivatives(*a1);
[detail] +    showValueAndDerivative(__LINE__, evaluationCount, a1);
[detail] +    double dx;
[detail] +    if(a1->slope>=0.0) {        
[detail] +      dx=defaultStep;
[detail] +    } else {
[detail] +      dx=-defaultStep;
[detail] +    }
[detail] +    while(true) {
[detail] +      if(a1->concavity>=0.0) {  
[detail] +        a2->x=a1->x+dx;
[detail] +        evaluationCount++;
[detail] +        f->setFunctionValue(*a2);
[detail] +        showValue(__LINE__, evaluationCount, a2);
[detail] +        while(a1->value<a2->value) { 
[detail] +          qSwap(a1, a2);
[detail] +          a2->x=a1->x+dx;
[detail] +          evaluationCount++;
[detail] +          f->setFunctionValue(*a2);
[detail] +          showValue(__LINE__, evaluationCount, a2);
[detail] +        }
[detail] +        f->setFunctionValue(*a1);   
[detail] +        f->setFunctionDerivatives(*a1);
[detail] +        showValueAndDerivative(__LINE__, evaluationCount, a1);
[detail] +        if(a1->concavity>=0.0) {    
[detail] +          if(a1->slope>=0.0) {      
[detail] +            dx=defaultStep;
[detail] +          } else {
[detail] +            dx=-defaultStep;
[detail] +          }
[detail] +          while(true) {             
[detail] +            dx*=0.5;
[detail] +            a2->x=a1->x+dx;
[detail] +            evaluationCount++;
[detail] +            f->setFunctionValue(*a2);
[detail] +            showValue(__LINE__, evaluationCount, a2);
[detail] +            if(a1->value<a2->value) {
[detail] +              evaluationCount++;
[detail] +              f->setFunctionDerivatives(*a2);
[detail] +              showValueAndDerivative(__LINE__, evaluationCount, a2);
[detail] +              qSwap(a1, a2);
[detail] +              if(a1->concavity<0.0) {
[detail] +                break;
[detail] +              }
[detail] +              if(a1->slope>=0.0) {  
[detail] +                dx=fabs(dx);
[detail] +              } else {
[detail] +                dx=-fabs(dx);
[detail] +              }
[detail] +            }
[detail] +            if(evaluationCount>100) {
[detail] +              App::log("More than 100 evaluations in NewtonOptimization1D::maximize(), aborting\n");
[detail] +              return false;
[detail] +            }
[detail] +          }
[detail] +        }
[detail] +      } else {
[detail] +        dx=step(*a1, dx, defaultStep);
[detail] +        while(true) {             
[detail] +          a2->x=a1->x+dx;         
[detail] +          evaluationCount++;      
[detail] +          f->setFunctionValue(*a2);
[detail] +          showValue(__LINE__, evaluationCount, a2);
[detail] +          while(a1->value>a2->value) { 
[detail] +            dx*=0.5;
[detail] +            a2->x=a1->x+dx;
[detail] +            evaluationCount++;
[detail] +            f->setFunctionValue(*a2);
[detail] +            showValue(__LINE__, evaluationCount, a2);
[detail] +          }
[detail] +          if(atEnd(a2->x, dx)) {  
[detail] +            if(a2!=&a0) {
[detail] +              a0=aSwap;
[detail] +            }
[detail] +            a0.evaluationCount=evaluationCount;
[detail] +            return true;
[detail] +          }
[detail] +          evaluationCount++;
[detail] +          f->setFunctionDerivatives(*a2);
[detail] +          showValueAndDerivative(__LINE__, evaluationCount, a2);
[detail] +          
[detail] +          
[detail] +          
[detail] +          if(a2->concavity>=0.0) {
[detail] +            qSwap(a1, a2);
[detail] +            if(a1->slope>=0.0) {        
[detail] +              dx=defaultStep;
[detail] +            } else {
[detail] +              dx=-defaultStep;
[detail] +            }
[detail] +            break;
[detail] +          }
[detail] +          dx=step(*a2, dx, defaultStep);
[detail] +          qSwap(a1, a2);
[detail] +          if(evaluationCount>100) {
[detail] +            App::log("More than 100 evaluations in NewtonOptimization1D::maximize(), aborting\n");
[detail] +            return false;
[detail] +          }
[detail] +        }
[detail] +      }
[detail] +    }
[detail] +  }
[detail] +
[detail]    template <class Function, class Attributes>
[detail]    void NewtonOptimization1D::curves(const Function * f, double minX, double maxX, double curveStepX) const
[detail]    {
[detail] @@ -281,6 +478,8 @@
[detail]      QFile fout("/tmp/newton-curve");
[detail]      fout.open(QIODevice::WriteOnly);
[detail]      QTextStream sout(&fout);
[detail] +    sout.setRealNumberPrecision(20);
[detail] +    sout.setRealNumberNotation(QTextStream::SmartNotation);
[detail]      sout << "# value" << Qt::endl;
[detail]      for(a.x=minX; a.x<=maxX; a.x+=curveStepX) {
[detail]        f->setFunctionValue(a);
[detail] @@ -309,6 +508,8 @@
[detail]      QFile fout("/tmp/newton-step");
[detail]      fout.open(QIODevice::WriteOnly);
[detail]      QTextStream sout(&fout);
[detail] +    sout.setRealNumberPrecision(20);
[detail] +    sout.setRealNumberNotation(QTextStream::SmartNotation);
[detail]      sout << "# newton step" << Qt::endl;
[detail]      for(a.x=minX; a.x<=maxX; a.x+=curveStepX) {
[detail]        f->setFunctionValue(a);
[detail] @@ -326,6 +527,8 @@
[detail]      QFile fout("/tmp/newton-test");
[detail]      fout.open(QIODevice::WriteOnly);
[detail]      QTextStream sout(&fout);
[detail] +    sout.setRealNumberPrecision(20);
[detail] +    sout.setRealNumberNotation(QTextStream::SmartNotation);
[detail]      sout << "# convergence" << Qt::endl;
[detail]      for(double x=0.5*minX; x<=0.5*maxX; x+=curveStepX) {
[detail]        a.x=x;
[detail]               src/NewtonOptimizationND.h:  version-1.5.2	no last version available
[detail]        src/NewtonPrincipalOptimization.h:  version-1.5.2	no last version available
[detail]          src/NonUniformFourierTranform.h:  version-1.5.2	no last version available
[detail]                 src/NormalDistribution.h:  version-1.5.2	not modified
[detail]                   src/OptimizationBFGS.h:  version-1.5.2	modified out of comments
[detail] --- src/OptimizationBFGS.h-version-1.5.2-stripped	2025-09-28 04:00:54.707453243 +0200
[detail] +++ src/OptimizationBFGS.h-HEAD-stripped	2025-09-28 04:00:54.711453263 +0200
[detail] @@ -3,27 +3,27 @@
[detail]  #ifndef OPTIMIZATIONBFGS_H
[detail]  #define OPTIMIZATIONBFGS_H
[detail]  
[detail] -#include "FunctionSearch.h"
[detail] +#include "IterativeFunctionSearch.h"
[detail]  #include "Vector.h"
[detail]  #include "DoubleMatrix.h"
[detail]  #include "QGpCoreMathDLLExport.h"
[detail]  
[detail]  namespace QGpCoreMath {
[detail]  
[detail] -  class QGPCOREMATH_EXPORT OptimizationBFGS : public FunctionSearch
[detail] +  class QGPCOREMATH_EXPORT OptimizationBFGS : public IterativeFunctionSearch
[detail]    {
[detail]    public:
[detail] -    OptimizationBFGS(int dimensionCount);
[detail] +    OptimizationBFGS(int size);
[detail]      ~OptimizationBFGS();
[detail]  
[detail] -    void setPrecision(const Vector<double>& p) {_precision.copyValues(p);}
[detail] -
[detail]      void reset(const Vector<double>& p);
[detail] -    bool minimize(const Vector<double>& maxShift, int maxIterationCount);
[detail] +    void reset(const Vector<double>& p, SymmetricMatrix& hessian);
[detail] +
[detail] +    bool minimize();
[detail]  
[detail]      double value() const {return _phi.functionProperties()->value;}
[detail]      Vector<double>& position() {return _phi.x0();}
[detail] -    int iterationCount() const {return _iterationCount;}
[detail] +    Vector<double>& position(int) {return _phi.x0();}
[detail]    private:
[detail]      class Phi;
[detail]  
[detail] @@ -84,9 +84,6 @@
[detail]      void debugAlpha(double min, double max);
[detail]      void debugFunction(double range);
[detail]  
[detail] -    
[detail] -    PrivateVector<double> _precision;
[detail] -    
[detail]      Step * _steps[3];
[detail]      Phi _phi;
[detail]      AbstractFunction::Properties * _fValues[4];
[detail] @@ -100,7 +97,6 @@
[detail]      DoubleMatrix _tk;
[detail]      DoubleMatrix _skskt;
[detail]      double _dalpha;
[detail] -    int _iterationCount;
[detail]    };
[detail]  
[detail]  } 
[detail]           src/OrderedBoundedParameters.h:  version-1.5.2	no last version available
[detail]                     src/Parallelepiped.h:  version-1.5.2	not modified
[detail]         src/ParameterConditionFunction.h:  version-1.5.2	no last version available
[detail]                 src/PeriodicStatistics.h:  version-1.5.2	modified out of comments
[detail] --- src/PeriodicStatistics.h-version-1.5.2-stripped	2025-09-28 04:00:54.755453474 +0200
[detail] +++ src/PeriodicStatistics.h-HEAD-stripped	2025-09-28 04:00:54.759453494 +0200
[detail] @@ -12,8 +12,11 @@
[detail]    class QGPCOREMATH_EXPORT PeriodicStatistics
[detail]    {
[detail]    public:
[detail] +    PeriodicStatistics();
[detail]      PeriodicStatistics(double period);
[detail]  
[detail] +    void setPeriod(double p);
[detail] +
[detail]      void meanAdd(double val, double weight=1.0);
[detail]      void setAverage(double average) {_currentAverage=average;}
[detail]      void varianceAdd(double val, double weight=1.0);
[detail]                  src/PermutationVector.h:  version-1.5.2	not modified
[detail]                              src/Plane.h:  version-1.5.2	not modified
[detail]                              src/Point.h:  version-1.5.2	modified out of comments
[detail] --- src/Point.h-version-1.5.2-stripped	2025-09-28 04:00:54.803453707 +0200
[detail] +++ src/Point.h-HEAD-stripped	2025-09-28 04:00:54.807453727 +0200
[detail] @@ -133,21 +133,25 @@
[detail]  
[detail]  inline bool Point::operator<(const Point& p) const
[detail]  {
[detail] -  if(Point2D::operator>(p)) {
[detail] +  if(x()<p.x()) {
[detail]      return true;
[detail] -  } else if(Point2D::operator==(p) && _z<p._z) {
[detail] +  } else if(x()==p.x()) {
[detail] +    if(y()<p.y() || (y()==p.y() && _z<p._z)) {
[detail]      return true;
[detail]    }
[detail] +  }
[detail]    return false;
[detail]  }
[detail]  
[detail]  inline bool Point::operator>(const Point& p) const
[detail]  {
[detail] -  if(Point2D::operator>(p)) {
[detail] +  if(x()>p.x()) {
[detail]      return true;
[detail] -  } else if(Point2D::operator==(p) && _z>p._z) {
[detail] +  } else if(x()==p.x()) {
[detail] +    if(y()>p.y() || (y()==p.y() && _z>p._z)) {
[detail]      return true;
[detail]    }
[detail] +  }
[detail]    return false;
[detail]  }
[detail]  
[detail]                            src/Point1D.h:  version-1.5.2	not modified
[detail]                            src/Point2D.h:  version-1.5.2	modified out of comments
[detail] --- src/Point2D.h-version-1.5.2-stripped	2025-09-28 04:00:54.835453861 +0200
[detail] +++ src/Point2D.h-HEAD-stripped	2025-09-28 04:00:54.843453900 +0200
[detail] @@ -92,18 +92,20 @@
[detail]    double geographicalAzimuthTo(const Point2D &p) const;
[detail]    void move(double distance, const Angle& azimuth);
[detail]    void round(double maximum=1.0);
[detail] -  inline double abs2() const;
[detail] -  inline void abs();
[detail] -  inline void yLog();
[detail] -  inline void yExp();
[detail] -  inline void yInverse();
[detail] +  inline double abs2(const CurvePointOptions * pointOptions=nullptr) const;
[detail] +  inline void abs(const CurvePointOptions * pointOptions=nullptr);
[detail] +  inline void yLog(const CurvePointOptions * pointOptions=nullptr);
[detail] +  inline void yExp(const CurvePointOptions * pointOptions=nullptr);
[detail] +  inline void yInverse(const CurvePointOptions * pointOptions=nullptr);
[detail] +  inline void ySquare(const CurvePointOptions * pointOptions=nullptr);
[detail] +  inline void ySqrt(const CurvePointOptions * pointOptions=nullptr);
[detail]  private:
[detail]    static double utmM(double phi);
[detail]  
[detail]    double _x[2];
[detail]  };
[detail]  
[detail] -QGPCOREMATH_EXPORT uint qHash(Point2D key);
[detail] +QGPCOREMATH_EXPORT size_t qHash(const Point2D& key);
[detail]  
[detail]  } 
[detail]  
[detail] @@ -288,31 +290,40 @@
[detail]           fabs(p.y()-y())<tolerance;
[detail]  }
[detail]  
[detail] -inline void Point2D::abs()
[detail] +inline void Point2D::abs(const CurvePointOptions *)
[detail]  {
[detail]    _x[0]=fabs(_x[0]);
[detail]    _x[1]=fabs(_x[1]);
[detail]  }
[detail]  
[detail] -inline double Point2D::abs2() const
[detail] +inline double Point2D::abs2(const CurvePointOptions *) const
[detail]  {
[detail]    return _x[0]*_x[0]+_x[1]*_x[1];
[detail]  }
[detail]  
[detail] -inline void Point2D::yLog()
[detail] +inline void Point2D::yLog(const CurvePointOptions *)
[detail]  {
[detail]    _x[1]=::log(_x[1]);
[detail]  }
[detail]  
[detail] -inline void Point2D::yExp()
[detail] +inline void Point2D::yExp(const CurvePointOptions *)
[detail]  {
[detail]    _x[1]=::exp(_x[1]);
[detail]  }
[detail]  
[detail] -inline void Point2D::yInverse()
[detail] +inline void Point2D::yInverse(const CurvePointOptions *)
[detail]  {
[detail]    _x[1]=1.0/_x[1];
[detail]  }
[detail] +inline void Point2D::ySquare(const CurvePointOptions *)
[detail] +{
[detail] +  _x[1]*=_x[1];
[detail] +}
[detail] +
[detail] +inline void Point2D::ySqrt(const CurvePointOptions *)
[detail] +{
[detail] +  _x[1]=sqrt(_x[1]);
[detail] +}
[detail]  
[detail]  QGPCOREMATH_EXPORT QTextStream& operator<< (QTextStream& s, const QList<Point2D>& plist);
[detail]  QGPCOREMATH_EXPORT QTextStream& operator>> (QTextStream& s, QList<Point2D>& plist);
[detail]                        src/PointLocate.h:  version-1.5.2	not modified
[detail]                            src/PointND.h:  version-1.5.2	modified out of comments
[detail] --- src/PointND.h-version-1.5.2-stripped	2025-09-28 04:00:54.875454055 +0200
[detail] +++ src/PointND.h-HEAD-stripped	2025-09-28 04:00:54.879454075 +0200
[detail] @@ -45,9 +45,11 @@
[detail]    void operator+=(const PointND& p);
[detail]    void operator*=(double mul);
[detail]    void operator/=(double div) {operator*=(1.0/div);}
[detail] -  void yLog();
[detail] -  void yExp();
[detail] -  void yInverse();
[detail] +  void yLog(const CurvePointOptions * pointOptions=nullptr);
[detail] +  void yExp(const CurvePointOptions * pointOptions=nullptr);
[detail] +  void yInverse(const CurvePointOptions * pointOptions=nullptr);
[detail] +  void ySquare(const CurvePointOptions * pointOptions=nullptr);
[detail] +  void ySqrt(const CurvePointOptions * pointOptions=nullptr);
[detail]  
[detail]    
[detail]    bool fromString(const StringSection& str);
[detail]                     src/PointNDOptions.h:  version-1.5.2	not modified
[detail]                            src/Polygon.h:  version-1.5.2	not modified
[detail]                         src/Polynomial.h:  version-1.5.2	modified out of comments
[detail] --- src/Polynomial.h-version-1.5.2-stripped	2025-09-28 04:00:54.931454326 +0200
[detail] +++ src/Polynomial.h-HEAD-stripped	2025-09-28 04:00:54.935454344 +0200
[detail] @@ -15,6 +15,7 @@
[detail]      Polynomial(double c0, double c1);
[detail]      Polynomial(double c0, double c1, double c2);
[detail]      Polynomial(double c0, double c1, double c2, double c3);
[detail] +    Polynomial(double c0, double c1, double c2, double c3, double c4);
[detail]  
[detail]      int degree() const {return _coefficients.count()-1;}
[detail]      int effectiveDegree() const;
[detail] @@ -42,7 +43,9 @@
[detail]  
[detail]      double multiple(const Polynomial& o, bool& ok) const;
[detail]  
[detail] -    QString toString() const;
[detail] +    static double firstKindChebyshev(double x, int order);
[detail] +
[detail] +    QString toString(char format='g', int precision=6) const;
[detail]    private:
[detail]      VectorList<double> _coefficients;
[detail]    };
[detail]                 src/PolynomialFraction.h:  version-1.5.2	modified out of comments
[detail] --- src/PolynomialFraction.h-version-1.5.2-stripped	2025-09-28 04:00:54.955454442 +0200
[detail] +++ src/PolynomialFraction.h-HEAD-stripped	2025-09-28 04:00:54.959454460 +0200
[detail] @@ -47,7 +47,7 @@
[detail]      void inverse();
[detail]      void derivate();
[detail]  
[detail] -    QString toString() const;
[detail] +    QString toString(char format='g', int precision=6) const;
[detail]      double value(double x) const {return _numerator.value(x)/_denominator.value(x);}
[detail]    private:
[detail]      Polynomial _numerator, _denominator;
[detail]                 src/PrimeFactorization.h:  version-1.5.2	modified out of comments
[detail] --- src/PrimeFactorization.h-version-1.5.2-stripped	2025-09-28 04:00:54.971454518 +0200
[detail] +++ src/PrimeFactorization.h-HEAD-stripped	2025-09-28 04:00:54.975454538 +0200
[detail] @@ -42,6 +42,8 @@
[detail]      static bool isValid(int val, int maxPrime);
[detail]      static void primeList(int min, int max);
[detail]      static int closestValue(int n, int maxPrime);
[detail] +    static int closestValueAbove(int n, int maxPrime);
[detail] +    static int closestValueBelow(int n, int maxPrime);
[detail]      static bool test();
[detail]  
[detail]      static const int primes[];
[detail]                      src/PrivateVector.h:  version-1.5.2	modified out of comments
[detail] --- src/PrivateVector.h-version-1.5.2-stripped	2025-09-28 04:00:54.991454615 +0200
[detail] +++ src/PrivateVector.h-HEAD-stripped	2025-09-28 04:00:54.995454635 +0200
[detail] @@ -13,9 +13,9 @@
[detail]    template <typename T> class QGPCOREMATH_EXPORT PrivateVector : public Vector<T>
[detail]    {
[detail]    public:
[detail] -    inline PrivateVector(int count);
[detail] -    inline PrivateVector(int count, const T& value);
[detail] -    inline PrivateVector(int count, T * values);
[detail] +    inline PrivateVector(int size);
[detail] +    inline PrivateVector(int size, const T& value);
[detail] +    inline PrivateVector(int size, T * values);
[detail]      inline PrivateVector(const Vector<T>& o);
[detail]      inline PrivateVector(const PrivateVector<T>& o);
[detail]      inline PrivateVector(const VectorList<T>& o);
[detail] @@ -34,29 +34,32 @@
[detail]      inline void setValues(const T& v1, const T& v2, const T& v3);
[detail]      inline void setValues(const T& v1, const T& v2, const T& v3, const T& v4);
[detail]  
[detail] -    inline void resize(int count);
[detail] +    inline T * detach();
[detail] +    inline void resize(int size);
[detail] +
[detail] +    qint64 dataSize() const;
[detail]    };
[detail]  
[detail]    template <typename T>
[detail] -  inline PrivateVector<T>::PrivateVector(int count)
[detail] -    : Vector<T>(count, static_cast<T *>(malloc(count*sizeof(T))))
[detail] +  inline PrivateVector<T>::PrivateVector(int size)
[detail] +    : Vector<T>(size, static_cast<T *>(malloc(size*sizeof(T))))
[detail]    {
[detail]    }
[detail]  
[detail]    template <typename T>
[detail] -  inline PrivateVector<T>::PrivateVector(int count, const T& value)
[detail] -    : Vector<T>(count, static_cast<T *>(malloc(count*sizeof(T))))
[detail] +  inline PrivateVector<T>::PrivateVector(int size, const T& value)
[detail] +    : Vector<T>(size, static_cast<T *>(malloc(size*sizeof(T))))
[detail]    {
[detail] -    for(int i=0; i<count; i++) {
[detail] +    for(int i=0; i<size; i++) {
[detail]        Vector<T>::at(i)=value;
[detail]      }
[detail]    }
[detail]  
[detail]    template <typename T>
[detail] -  inline PrivateVector<T>::PrivateVector(int count, T * values)
[detail] -    : Vector<T>(count, static_cast<T *>(malloc(count*sizeof(T))))
[detail] +  inline PrivateVector<T>::PrivateVector(int size, T * values)
[detail] +    : Vector<T>(size, static_cast<T *>(malloc(size*sizeof(T))))
[detail]    {
[detail] -    memcpy(Vector<T>::values(), values, count*sizeof(T));
[detail] +    memcpy(Vector<T>::values(), values, size*sizeof(T));
[detail]    }
[detail]  
[detail]    template <typename T>
[detail] @@ -91,30 +94,30 @@
[detail]  
[detail]    template <typename T>
[detail]    inline PrivateVector<T>::PrivateVector(const Vector<T>& o)
[detail] -    : Vector<T>(o.count(), static_cast<T *>(malloc(o.count()*sizeof(T))))
[detail] +    : Vector<T>(o.size(), static_cast<T *>(malloc(o.size()*sizeof(T))))
[detail]    {
[detail] -    memcpy(Vector<T>::values(), o.values(), Vector<T>::count()*sizeof(T));
[detail] +    memcpy(Vector<T>::values(), o.values(), Vector<T>::size()*sizeof(T));
[detail]    }
[detail]  
[detail]    template <typename T>
[detail]    inline PrivateVector<T>::PrivateVector(const VectorList<T>& o)
[detail] -    : Vector<T>(o.count(), static_cast<T *>(malloc(o.count()*sizeof(T))))
[detail] +    : Vector<T>(o.size(), static_cast<T *>(malloc(o.size()*sizeof(T))))
[detail]    {
[detail] -    memcpy(Vector<T>::values(), o.data(), Vector<T>::count()*sizeof(T));
[detail] +    memcpy(Vector<T>::values(), o.data(), Vector<T>::size()*sizeof(T));
[detail]    }
[detail]  
[detail]    template <typename T>
[detail]    inline PrivateVector<T>::PrivateVector(const PrivateVector<T>& o)
[detail] -    : Vector<T>(o.count(), static_cast<T *>(malloc(o.count()*sizeof(T))))
[detail] +    : Vector<T>(o.size(), static_cast<T *>(malloc(o.size()*sizeof(T))))
[detail]    {
[detail] -    memcpy(Vector<T>::values(), o.values(), Vector<T>::count()*sizeof(T));
[detail] +    memcpy(Vector<T>::values(), o.values(), Vector<T>::size()*sizeof(T));
[detail]    }
[detail]  
[detail]    template <typename T>
[detail]    inline PrivateVector<T>::PrivateVector(const Vector<T>& o, int firstIndex, int lastIndex)
[detail]      : Vector<T>(lastIndex-firstIndex+1, nullptr)
[detail]    {
[detail] -    Vector<T>::setValues(static_cast<T *>(malloc(Vector<T>::count()*sizeof(T))));
[detail] +    Vector<T>::setValues(static_cast<T *>(malloc(Vector<T>::size()*sizeof(T))));
[detail]      for(int i=firstIndex; i<=lastIndex; i++) {
[detail]        Vector<T>::at(i-firstIndex)=o.at(i);
[detail]      }
[detail] @@ -124,7 +127,7 @@
[detail]    inline PrivateVector<T>::PrivateVector(const PrivateVector<T>& o, int firstIndex, int lastIndex)
[detail]      : Vector<T>(lastIndex-firstIndex+1, nullptr)
[detail]    {
[detail] -    Vector<T>::setValues(static_cast<T *>(malloc(Vector<T>::count()*sizeof(T))));
[detail] +    Vector<T>::setValues(static_cast<T *>(malloc(Vector<T>::size()*sizeof(T))));
[detail]      for(int i=firstIndex; i<=lastIndex; i++) {
[detail]        Vector<T>::at(i-firstIndex)=o.at(i);
[detail]      }
[detail] @@ -134,7 +137,7 @@
[detail]    inline PrivateVector<T>::PrivateVector(const Vector<T>& o, int firstIndex, int lastIndex, double factor)
[detail]      : Vector<T>(lastIndex-firstIndex+1, nullptr)
[detail]    {
[detail] -    Vector<T>::setValues(static_cast<T *>(malloc(Vector<T>::count()*sizeof(T))));
[detail] +    Vector<T>::setValues(static_cast<T *>(malloc(Vector<T>::size()*sizeof(T))));
[detail]      for(int i=firstIndex; i<=lastIndex; i++) {
[detail]        Vector<T>::at(i-firstIndex)=o.at(i)*factor;
[detail]      }
[detail] @@ -144,7 +147,7 @@
[detail]    inline PrivateVector<T>::PrivateVector(const PrivateVector<T>& o, int firstIndex, int lastIndex, double factor)
[detail]      : Vector<T>(lastIndex-firstIndex+1, nullptr)
[detail]    {
[detail] -    Vector<T>::setValues(static_cast<T *>(malloc(Vector<T>::count()*sizeof(T))));
[detail] +    Vector<T>::setValues(static_cast<T *>(malloc(Vector<T>::size()*sizeof(T))));
[detail]      for(int i=firstIndex; i<=lastIndex; i++) {
[detail]        Vector<T>::at(i-firstIndex)=o.at(i)*factor;
[detail]      }
[detail] @@ -164,26 +167,41 @@
[detail]    }
[detail]  
[detail]    template <typename T>
[detail] -  inline void PrivateVector<T>::resize(int count)
[detail] +  inline T * PrivateVector<T>::detach()
[detail] +  {
[detail] +    T * data=Vector<T>::values();
[detail] +    Vector<T>::setValues(nullptr);
[detail] +    Vector<T>::resize(0);
[detail] +    return data;
[detail] +  }
[detail] +
[detail] +  template <typename T>
[detail] +  inline void PrivateVector<T>::resize(int size)
[detail]    {
[detail] -    if(count!=Vector<T>::count()) {
[detail] -      Vector<T>::setValues(static_cast<T *>(realloc(Vector<T>::values(), count)));
[detail] -      Vector<T>::resize(count);
[detail] +    if(size!=Vector<T>::size()) {
[detail] +      Vector<T>::setValues(static_cast<T *>(realloc(Vector<T>::values(), size)));
[detail] +      Vector<T>::resize(size);
[detail]      }
[detail]    }
[detail]  
[detail]    template <typename T>
[detail]    inline void PrivateVector<T>::operator=(const Vector<T>& o)
[detail]    {
[detail] -    resize(o.count());
[detail] -    memcpy(Vector<T>::values(), o.Vector<T>::values(), Vector<T>::count()*sizeof(T));
[detail] +    resize(o.size());
[detail] +    memcpy(Vector<T>::values(), o.Vector<T>::values(), Vector<T>::size()*sizeof(T));
[detail]    }
[detail]  
[detail]    template <typename T>
[detail]    inline void PrivateVector<T>::operator=(const PrivateVector<T>& o)
[detail]    {
[detail] -    resize(o.count());
[detail] -    memcpy(Vector<T>::values(), o.Vector<T>::values(), Vector<T>::count()*sizeof(T));
[detail] +    resize(o.size());
[detail] +    memcpy(Vector<T>::values(), o.Vector<T>::values(), Vector<T>::size()*sizeof(T));
[detail] +  }
[detail] +
[detail] +  template <typename T>
[detail] +  qint64 PrivateVector<T>::dataSize() const
[detail] +  {
[detail] +    return sizeof(int)+sizeof(T*)+Vector<T>::size()*sizeof(T);
[detail]    }
[detail]  
[detail]  } 
[detail]                  src/ProcessStatistics.h:  version-1.5.2	not modified
[detail]                             src/Random.h:  version-1.5.2	not modified
[detail]               src/RealStatisticalCurve.h:  version-1.5.2	not modified
[detail]               src/RealStatisticalProxy.h:  version-1.5.2	not modified
[detail]                               src/Rect.h:  version-1.5.2	not modified
[detail]                         src/RootSolver.h:  version-1.5.2	not modified
[detail]                 src/SamplingParameters.h:  version-1.5.2	not modified
[detail]                              src/Scale.h:  version-1.5.2	not modified
[detail]                            src/Segment.h:  version-1.5.2	not modified
[detail]                          src/Segment2D.h:  version-1.5.2	not modified
[detail]                            src/Simplex.h:  version-1.5.2	not modified
[detail]                src/SmoothingParameters.h:  version-1.5.2	not modified
[detail]                       src/SparseMatrix.h:  version-1.5.2	modified out of comments
[detail] --- src/SparseMatrix.h-version-1.5.2-stripped	2025-09-28 04:00:55.195455601 +0200
[detail] +++ src/SparseMatrix.h-HEAD-stripped	2025-09-28 04:00:55.199455621 +0200
[detail] @@ -4,6 +4,9 @@
[detail]  #define SPARSEMATRIX_H
[detail]  
[detail]  #include "Matrix.h"
[detail] +#include "Vector.h"
[detail] +#include "SparseVector.h"
[detail] +#include "SparseVectorMap.h"
[detail]  #include "QGpCoreMathDLLExport.h"
[detail]  
[detail]  namespace QGpCoreMath {
[detail] @@ -12,276 +15,150 @@
[detail]    {
[detail]    public:
[detail]      SparseMatrix();
[detail] -    SparseMatrix(int nrow, int ncol);
[detail] +    SparseMatrix(int nRows, int nColumns, int nElements);
[detail] +    ~SparseMatrix();
[detail]  
[detail] -    bool operator==(const Matrix<T>& m) const;
[detail] +    void resize(int nRows, int nColumns, int nElements);
[detail] +    int rowCount() const {return _nRows;}
[detail] +    int columnCount() const {return _nColumns;}
[detail] +    int elementCount() const {return _nElements;}
[detail]  
[detail] -    int rowCount() const {return _nrow;}
[detail] -    int columnCount() const {return _ncol;}
[detail] -    int realRowCount() const {return _values.count();}
[detail] -    int valueCount() const;
[detail] -
[detail] -    void clear();
[detail] -    void setRowCount(int nrow);
[detail] -    void setColumnCount(int ncol);
[detail] -
[detail] -    T at(int row, int col) const;
[detail] -    T& at(int row, int col);
[detail] -
[detail] -    typedef QHash<int, T> Row;
[detail] -    typedef typename QHash<int, Row>::ConstIterator ConstRowIterator;
[detail] -    typedef typename QHash<int, Row>::Iterator RowIterator;
[detail] -    typedef typename Row::ConstIterator ConstColumnIterator;
[detail] -    typedef typename Row::Iterator ColumnIterator;
[detail] -
[detail] -    Row& addRow(int row);
[detail] -
[detail] -    ConstRowIterator begin() const {return _values.begin();}
[detail] -    RowIterator begin() {return _values.begin();}
[detail] -    ConstRowIterator end() const {return _values.end();}
[detail] -    RowIterator end() {return _values.end();}
[detail] +    qint64 dataSize() const;
[detail] +    inline void zero();
[detail]  
[detail] -    Matrix<T> plainMatrix() const;
[detail] -    void setPlainMatrix(const Matrix<T>& m);
[detail] -
[detail] -    Matrix<T> operator*(const Matrix<T>& m) const;
[detail] -
[detail] -    QString toUserString(char format='g', int precision=6) const;
[detail] -  private:
[detail] -    int _nrow, _ncol;
[detail] -    QHash<int, Row> _values;
[detail] +    class ElementIndex
[detail] +    {
[detail] +    public:
[detail] +      ElementIndex() {_row=0; _column=0;}
[detail] +      ElementIndex(int row, int column) {_row=row; _column=column;}
[detail] +      int _row, _column;
[detail]    };
[detail]  
[detail] -  template <typename T> SparseMatrix<T>::SparseMatrix()
[detail] +    class Element
[detail]    {
[detail] -    _nrow=0;
[detail] -    _ncol=0;
[detail] -  }
[detail] +    public:
[detail] +      Element() : _index() {_value=0;}
[detail] +      Element(int row, int column, const T& val) : _index(row, column) {_value=val;}
[detail]  
[detail] -  template <typename T> SparseMatrix<T>::SparseMatrix(int nrow, int ncol)
[detail] -  {
[detail] -    _nrow=nrow;
[detail] -    _ncol=ncol;
[detail] -  }
[detail] +      ElementIndex _index;
[detail] +      T _value;
[detail] +    };
[detail]  
[detail] -  template <typename T> bool SparseMatrix<T>::operator==(const Matrix<T>& m) const
[detail] -  {
[detail] -    if(_nrow!=m.rowCount() || _ncol!=m.columnCount()) {
[detail] -      return false;
[detail] -    }
[detail] -    for(int ir=0; ir<_nrow; ir++) {
[detail] -      for(int ic=0; ic<_ncol; ic++) {
[detail] -        const T& v=m.at(ir, ic);
[detail] -        if(v!=0.0 && at(ir, ic)!=v) {
[detail] -          return false;
[detail] -        }
[detail] -      }
[detail] -    }
[detail] -    return true;
[detail] -  }
[detail] +    void setValues(Element * values) {_values=values;}
[detail] +    inline void setValue(int row, int column, const T& value);
[detail] +    inline T& valueAt(int elementIndex) {return _values[elementIndex]._value;}
[detail] +    inline const T& constValueAt(int elementIndex) const {return _values[elementIndex]._value;}
[detail] +
[detail] +    template <typename TVector> void multiply(const Vector<TVector>& v, Vector<TVector>& r) const;
[detail] +    template <typename TVector> void multiply(const Vector<TVector>& v, SparseVector<TVector>& r,
[detail] +                                              SparseVectorMap& map) const;
[detail]  
[detail] -  template <typename T> Matrix<T> SparseMatrix<T>::plainMatrix() const
[detail] -  {
[detail] -    Matrix<T> m(_nrow, _ncol);
[detail] -    for(int ir=0; ir<_nrow; ir++) {
[detail] -      ConstRowIterator itr=_values.constFind(ir);
[detail] -      if(itr!=_values.end()) {
[detail] -        const Row& rowHash=itr.value();
[detail] -        for(int ic=0; ic<_ncol; ic++) {
[detail] -          ConstColumnIterator itc=rowHash.constFind(ic);
[detail] -          if(itc!=rowHash.end()) {
[detail] -            m.at(ir, ic)=itc.value();
[detail] -          } else {
[detail] -            m.at(ir, ic)=0.0;
[detail] -          }
[detail] -        }
[detail] -      } else {
[detail] -        for(int ic=0; ic<_ncol; ic++) {
[detail] -          m.at(ir,ic)=0.0;
[detail] -        }
[detail] -      }
[detail] -    }
[detail] -    return m;
[detail] -  }
[detail] +    Matrix<T> plainMatrix() const;
[detail] +  private:
[detail] +    int _nRows, _nColumns, _nElements, _maxNElements;
[detail]  
[detail] -  template <typename T> void SparseMatrix<T>::setPlainMatrix(const Matrix<T>& m)
[detail] -  {
[detail] -    clear();
[detail] -    setRowCount(m.rowCount());
[detail] -    setColumnCount(m.columnCount());
[detail] -    for(int ir=0; ir<_nrow; ir++) {
[detail] -      for(int ic=0; ic<_ncol; ic++) {
[detail] -        const T& v=m.at(ir, ic);
[detail] -        if(v!=0.0) {
[detail] -          at(ir, ic)=v;
[detail] -        }
[detail] -      }
[detail] -    }
[detail] -  }
[detail] +    Element * _values;
[detail] +  };
[detail]  
[detail] -  template <typename T> int SparseMatrix<T>::valueCount() const
[detail] +  template <typename T> SparseMatrix<T>::SparseMatrix()
[detail]    {
[detail] -    int n=0;
[detail] -    for(ConstRowIterator itr=_values.begin(); itr!=_values.end(); itr++) {
[detail] -      const Row& rowHash=itr.value();
[detail] -      n+=rowHash.count();
[detail] -    }
[detail] -    return n;
[detail] +    _nRows=0;
[detail] +    _nColumns=0;
[detail] +    _maxNElements=0;
[detail] +    _nElements=0;
[detail] +    _values=nullptr;
[detail]    }
[detail]  
[detail] -  template <typename T> Matrix<T> SparseMatrix<T>::operator*(const Matrix<T>& m) const
[detail] +  template <typename T> SparseMatrix<T>::SparseMatrix(int nRows, int nColumns, int nElements)
[detail]    {
[detail] -    Matrix<T> r(_nrow, m.columnCount());
[detail] -    for(int ir=0; ir<_nrow; ir++) {
[detail] -     ConstRowIterator itr=_values.constFind(ir);
[detail] -      if(itr!=_values.end()) {
[detail] -        const Row& rowHash=itr.value();
[detail] -        for(int ic=0; ic<m.columnCount(); ic++) {
[detail] -          T s=0.0;
[detail] -          for(ConstColumnIterator itc=rowHash.begin(); itc!=rowHash.end(); itc++) {
[detail] -            s+=itc.value()*m.at(itc.key(), ic);
[detail] -          }
[detail] -          r.at(ir, ic)=s;
[detail] -        }
[detail] -      } else {
[detail] -        for(int ic=0; ic<r.columnCount(); ic++) {
[detail] -          r.at(ir,ic)=0.0;
[detail] -        }
[detail] -      }
[detail] -    }
[detail] -    return r;
[detail] +    _nRows=nRows;
[detail] +    _nColumns=nColumns;
[detail] +    _maxNElements=nElements;
[detail] +    _nElements=0;
[detail] +    _values=new Element[_maxNElements];
[detail]    }
[detail]  
[detail] -  template <typename T> void SparseMatrix<T>::clear()
[detail] +  template <typename T> SparseMatrix<T>::~SparseMatrix()
[detail]    {
[detail] -    _nrow=0;
[detail] -    _ncol=0;
[detail] -    _values.clear();
[detail] +    delete [] _values;
[detail]    }
[detail]  
[detail] -  template <typename T> void SparseMatrix<T>::setRowCount(int nrow)
[detail] +  template <typename T> void SparseMatrix<T>::resize(int nRows, int nColumns, int nElements)
[detail]    {
[detail] -    _nrow=nrow;
[detail] -    for(RowIterator itr=_values.begin(); itr!=_values.end(); itr++) {
[detail] -      if(itr.key()>=nrow) {
[detail] -        _values.remove(itr.key());
[detail] -      }
[detail] -    }
[detail] +    _nRows=nRows;
[detail] +    _nColumns=nColumns;
[detail] +    _maxNElements=nElements;
[detail] +    _nElements=0;
[detail] +    delete [] _values;
[detail] +    _values=new Element[_maxNElements];
[detail]    }
[detail]  
[detail] -  template <typename T> void SparseMatrix<T>::setColumnCount(int ncol)
[detail] +  template <typename T>
[detail] +  inline void SparseMatrix<T>::setValue(int row, int column, const T& value)
[detail]    {
[detail] -    _ncol=ncol;
[detail] -    for(RowIterator itr=_values.begin(); itr!=_values.end(); itr++) {
[detail] -      Row& rowHash=itr.value();
[detail] -      for(ColumnIterator itc=rowHash.begin(); itc!=rowHash.end(); itc++) {
[detail] -        if(itc.key()>=ncol) {
[detail] -          rowHash.remove(itc.key());
[detail] -        }
[detail] -      }
[detail] -    }
[detail] +    ASSERT(_nElements<_maxNElements);
[detail] +    Element& e=_values[_nElements++];
[detail] +    e._index._row=row;
[detail] +    e._index._column=column;
[detail] +    e._value=value;
[detail]    }
[detail]  
[detail] -  template <typename T> typename SparseMatrix<T>::Row& SparseMatrix<T>::addRow(int row)
[detail] +  template <typename T>
[detail] +  inline void SparseMatrix<T>::zero()
[detail]    {
[detail] -    RowIterator itr=_values.insert(row, QHash<int, T>());
[detail] -    return itr.value();
[detail] +    _nElements=0;
[detail]    }
[detail]  
[detail] -  template <typename T> T SparseMatrix<T>::at(int row, int col) const
[detail] +  template <typename T>
[detail] +  template <typename TVector>
[detail] +  void SparseMatrix<T>::multiply(const Vector<TVector>& v, Vector<TVector>& r) const
[detail]    {
[detail] -    ConstRowIterator itr=_values.constFind(row);
[detail] -    if(itr!=_values.end()) {
[detail] -      const Row& rowHash=itr.value();
[detail] -      ConstColumnIterator itc=rowHash.constFind(col);
[detail] -      if(itc!=rowHash.end()) {
[detail] -        return itc.value();
[detail] -      } else {
[detail] -        return 0.0;
[detail] -      }
[detail] -    } else {
[detail] -      return 0.0;
[detail] +    ASSERT(_nColumns==v.size());
[detail] +    ASSERT(_nRows==r.size());
[detail] +    r.setValue(0);
[detail] +    for(int i=0; i<_nElements; i++) {
[detail] +      const Element& e=_values[i];
[detail] +      r[e._index._row]+=e._value*v[e._index._column];
[detail]      }
[detail]    }
[detail]  
[detail] -  template <typename T> T& SparseMatrix<T>::at(int row, int col)
[detail] +  template <typename T>
[detail] +  template <typename TVector>
[detail] +  void SparseMatrix<T>::multiply(const Vector<TVector>& v, SparseVector<TVector>& r,
[detail] +                                 SparseVectorMap& map) const
[detail]    {
[detail] -    RowIterator itr=_values.find(row);
[detail] -    if(itr!=_values.end()) {
[detail] -      Row& rowHash=itr.value();
[detail] -      ColumnIterator itc=rowHash.find(col);
[detail] -      if(itc!=rowHash.end()) {
[detail] -        return itc.value();
[detail] -      } else {
[detail] -        ColumnIterator itc=rowHash.insert(col, 0.0);
[detail] -        return itc.value();
[detail] -      }
[detail] +    ASSERT(_nColumns==v.size());
[detail] +    ASSERT(_nRows==r.size());
[detail] +    ASSERT(_nRows<=map.size());
[detail] +    r.zero();
[detail] +    for(int i=0; i<_nElements; i++) {
[detail] +      const Element& e=_values[i];
[detail] +      if(map.hasIndex(e._index._row)) {
[detail] +        r.valueAt(map.index(e._index._row))+=e._value*v[e._index._column];
[detail]      } else {
[detail] -      Row& rowHash=addRow(row);
[detail] -      ColumnIterator itc=rowHash.insert(col, 0.0);
[detail] -      return itc.value();
[detail] -    }
[detail] -  }
[detail] -
[detail] -  template <typename T> QString SparseMatrix<T>::toUserString(char format, int precision) const
[detail] -  {
[detail] -    QString str("    | ");
[detail] -    for(int j=0; j<_ncol; j++) {
[detail] -      str+=QString(" %1 |").arg(j, 12, 10, QChar(' '));
[detail] -    }
[detail] -    str+="\n----|-";
[detail] -    for(int j=0; j<_ncol; j++) {
[detail] -      str+="--------------|";
[detail] -    }
[detail] -    str+="\n";
[detail] -    for(int i=0; i<_nrow; i++) {
[detail] -      str+=QString("%1 | ").arg(i, 3, 10, QChar(' '));
[detail] -      for(int j=0; j<_ncol; j++) {
[detail] -        str+=QString(" %1 |").arg(Number::toDouble(at(i, j)), 12, format, precision, QChar(' '));
[detail] -      }
[detail] -      str+="\n";
[detail] +        map.setIndex(e._index._row, r.elementCount());
[detail] +        r.setValue(e._index._row, e._value*v[e._index._column]);
[detail]      }
[detail] -    str+="----|-";
[detail] -    for(int j=0; j<_ncol; j++) {
[detail] -      str+="--------------|";
[detail]      }
[detail] -    str+="\n";
[detail] -    return str;
[detail] +    r.reset(map);
[detail]    }
[detail]  
[detail] -  template <typename T> QDataStream& operator<<(QDataStream& s, const SparseMatrix<T>& m)
[detail] +  template <typename T>
[detail] +  Matrix<T> SparseMatrix<T>::plainMatrix() const
[detail]    {
[detail] -    s << m.rowCount() << m.columnCount();
[detail] -    s << m.realRowCount();
[detail] -    for(typename SparseMatrix<T>::ConstRowIterator itr=m.begin(); itr!=m.end(); itr++) {
[detail] -      const typename SparseMatrix<T>::Row& rowHash=itr.value();
[detail] -      s << itr.key() << rowHash.count();
[detail] -      for(typename SparseMatrix<T>::ConstColumnIterator itc=rowHash.begin(); itc!=rowHash.end(); itc++) {
[detail] -        s<< itc.key() << itc.value();
[detail] +    Matrix<T> m(_nRows, _nColumns);
[detail] +    m.zero();
[detail] +    for(int i=0; i<_nElements; i++) {
[detail] +      const Element& e=_values[i];
[detail] +      m.at(e._index._row, e._index._column)=e._value;
[detail]        }
[detail] -    }
[detail] -    return s;
[detail] +    return m;
[detail]    }
[detail]  
[detail] -  template <typename T> QDataStream& operator>>(QDataStream& s, SparseMatrix<T>& m)
[detail] +  template <typename T>
[detail] +  qint64 SparseMatrix<T>::dataSize() const
[detail]    {
[detail] -    m.clear();
[detail] -    int nrow, ncol;
[detail] -    s >> nrow >> ncol;
[detail] -    m.setRowCount(nrow);
[detail] -    m.setColumnCount(ncol);
[detail] -    s >> nrow;
[detail] -    int index;
[detail] -    T value;
[detail] -    for(int ir=0; ir<nrow; ir++) {
[detail] -      s >> index >> ncol;
[detail] -      typename SparseMatrix<T>::Row& rowHash=m.addRow(index);
[detail] -      for(int ic=0; ic<ncol; ic++) {
[detail] -        s >> index >> value;
[detail] -        rowHash.insert(index, value);
[detail] -      }
[detail] -    }
[detail] -    return s;
[detail] +    return 4*sizeof(int)+sizeof(Element *)+_maxNElements*sizeof(Element);
[detail]    }
[detail]  
[detail]  } 
[detail]                       src/SparseVector.h:  version-1.5.2	no last version available
[detail]                    src/SparseVectorMap.h:  version-1.5.2	no last version available
[detail]                             src/Sphere.h:  version-1.5.2	not modified
[detail]                     src/StatComparator.h:  version-1.5.2	not modified
[detail]                         src/StationXML.h:  version-1.5.2	no last version available
[detail]                       src/Stationarity.h:  version-1.5.2	not modified
[detail]                   src/StatisticalPoint.h:  version-1.5.2	modified out of comments
[detail] --- src/StatisticalPoint.h-version-1.5.2-stripped	2025-09-28 04:00:55.279456007 +0200
[detail] +++ src/StatisticalPoint.h-HEAD-stripped	2025-09-28 04:00:55.283456027 +0200
[detail] @@ -19,6 +19,8 @@
[detail]      StatisticalPoint() {_x=0.0;}
[detail]      StatisticalPoint(double x, const numberType& y)
[detail]        : StatisticalValue<numberType>(y), _x(x) {}
[detail] +    StatisticalPoint(double x, const StatisticalValue<numberType>& y)
[detail] +        : StatisticalValue<numberType>(y), _x(x) {}
[detail]  
[detail]      inline void operator=(const StatisticalValue<numberType>& o);
[detail]  
[detail]                   src/StatisticalValue.h:  version-1.5.2	modified out of comments
[detail] --- src/StatisticalValue.h-version-1.5.2-stripped	2025-09-28 04:00:55.299456104 +0200
[detail] +++ src/StatisticalValue.h-HEAD-stripped	2025-09-28 04:00:55.303456124 +0200
[detail] @@ -7,8 +7,10 @@
[detail]  #include <QGpCoreTools.h>
[detail]  
[detail]  #include "Value.h"
[detail] -#include "Misfit.h"
[detail] +#include "MisfitType.h"
[detail]  #include "QGpCoreMathDLLExport.h"
[detail] +#include "CurvePointOptions.h"
[detail] +#include "PeriodicStatistics.h"
[detail]  
[detail]  namespace QGpCoreMath {
[detail]  
[detail] @@ -24,6 +26,7 @@
[detail]      inline void operator+=(const StatisticalValue& o);
[detail]      inline void operator*=(double mul);
[detail]      inline void operator/=(double mul);
[detail] +    inline bool operator<(const StatisticalValue& o) const;
[detail]  
[detail]      void setMean(const numberType& v) {_mean=v;}
[detail]      void setStddev(double v) {_stddev=v;}
[detail] @@ -36,14 +39,15 @@
[detail]      void setValid(bool f) {_valid=f; if(_valid && _weight==0.0) _weight=1.0;}
[detail]      bool isValid() const {return _valid;}
[detail]  
[detail] -    double misfit(int& nValues, int& nData, const Value<numberType>& value, Misfit::Type type, double min) const;
[detail] +    double misfit(int& nValues, int& nData, const Value<numberType>& value,
[detail] +                  const MisfitType& type, double min) const;
[detail]  
[detail]      inline void average(const StatisticalValue& p);
[detail]      static bool compareWeights(const StatisticalValue<numberType>& v1, const StatisticalValue<numberType>& v2);
[detail]  
[detail] -    inline void yExp();
[detail] -    inline void yLog();
[detail] -    inline void yInverse();
[detail] +    inline void yExp(const CurvePointOptions * pointOptions=nullptr);
[detail] +    inline void yLog(const CurvePointOptions * pointOptions=nullptr);
[detail] +    inline void yInverse(const CurvePointOptions * pointOptions=nullptr);
[detail]    protected:
[detail]      numberType _mean;
[detail]      double _stddev;
[detail] @@ -107,14 +111,20 @@
[detail]    template <class numberType>
[detail]    inline void StatisticalValue<numberType>::operator+=(const StatisticalValue<numberType>& o)
[detail]    {
[detail] +    if(_valid && o._valid) {
[detail]      _mean+=o._mean;
[detail] +      _stddev+=o._stddev;
[detail]      _weight+=o._weight;
[detail] +    } else {
[detail] +      _valid=false;
[detail] +    }
[detail]    }
[detail]  
[detail]    template <class numberType>
[detail]    inline void StatisticalValue<numberType>::operator*=(double mul)
[detail]    {
[detail]      _mean*=mul;
[detail] +    _stddev*=mul;
[detail]    }
[detail]  
[detail]  
[detail] @@ -122,6 +132,35 @@
[detail]    inline void StatisticalValue<numberType>::operator/=(double mul)
[detail]    {
[detail]      _mean/=mul;
[detail] +    _stddev/=mul;
[detail] +  }
[detail] +
[detail] +  template <class numberType>
[detail] +  inline bool StatisticalValue<numberType>::operator<(const StatisticalValue& o) const
[detail] +  {
[detail] +    return _mean<o._mean;
[detail] +  }
[detail] +
[detail] +  template <class numberType>
[detail] +  inline void StatisticalValue<numberType>::yExp(const CurvePointOptions *)
[detail] +  {
[detail] +    _mean=exp(_mean);
[detail] +    _stddev=exp(_stddev);
[detail] +  }
[detail] +
[detail] +  template <class numberType>
[detail] +  inline void StatisticalValue<numberType>::yLog(const CurvePointOptions *)
[detail] +  {
[detail] +    _mean=log(_mean);
[detail] +    _stddev=log(_stddev);
[detail] +  }
[detail] +
[detail] +  template <class numberType>
[detail] +  inline void StatisticalValue<numberType>::yInverse(const CurvePointOptions *)
[detail] +  {
[detail] +    numberType m=inverse(_mean);
[detail] +    _mean=m;
[detail] +    _stddev*=QGpCoreTools::abs2(m);
[detail]    }
[detail]  
[detail]    template <class numberType>
[detail] @@ -150,7 +189,7 @@
[detail]          } else {
[detail]            sigma2+=o._weight*o._stddev*o._stddev;
[detail]          }
[detail] -        sigma2-=QGpCoreTools::abs2(_mean)*wt;
[detail] +        sigma2-=abs2(_mean)*wt;
[detail]          if(wt>1.0) {
[detail]            sigma2/=wt-1.0;
[detail]          } else {
[detail] @@ -213,7 +252,7 @@
[detail]    template <class numberType>
[detail]    double StatisticalValue<numberType>::misfit(int& nValues, int& nData,
[detail]                                                const Value<numberType>& val,
[detail] -                                              Misfit::Type type, double min) const
[detail] +                                              const MisfitType& type, double min) const
[detail]    {
[detail]      TRACE;
[detail]      if(isValid()) {
[detail] @@ -221,14 +260,14 @@
[detail]        if(val.isValid()) {
[detail]          nValues++;
[detail]          double diff;
[detail] -        switch (type) {
[detail] -        case Misfit::L1:
[detail] +        switch (type.typeId()) {
[detail] +        case MisfitType::L1:
[detail]            diff=QGpCoreTools::abs(_mean-val.value());
[detail]            if(diff<min) {
[detail]              diff=min;
[detail]            }
[detail]            return diff;
[detail] -        case Misfit::L1_Normalized:
[detail] +        case MisfitType::L1_Normalized:
[detail]            if(_stddev>0.0) {
[detail]              diff=QGpCoreTools::abs((_mean-val.value())/_stddev);
[detail]            } else {
[detail] @@ -238,7 +277,7 @@
[detail]              diff=min;
[detail]            }
[detail]            return diff;
[detail] -        case Misfit::L1_LogNormalized:
[detail] +        case MisfitType::L1_LogNormalized:
[detail]            if(_stddev>1.0) {
[detail]              diff=QGpCoreTools::abs((log(_mean/val.value()))/log(_stddev));
[detail]            } else {
[detail] @@ -256,7 +295,7 @@
[detail]              diff=min;
[detail]            }
[detail]            return diff;
[detail] -        case Misfit::L1_NormalizedBySigmaOnly:
[detail] +        case MisfitType::L1_NormalizedBySigmaOnly:
[detail]            if(_stddev>0.0) {
[detail]              diff=QGpCoreTools::abs((_mean-val.value())/_stddev);
[detail]            } else {
[detail] @@ -266,22 +305,22 @@
[detail]              diff=min;
[detail]            }
[detail]            return diff;
[detail] -        case Misfit::L2:
[detail] -        case Misfit::RMS:
[detail] +        case MisfitType::L2:
[detail] +        case MisfitType::RMS:
[detail]            diff=QGpCoreTools::abs(_mean-val.value());
[detail]            if(diff<min) {
[detail]              diff=min;
[detail]            }
[detail]            return diff*diff;
[detail] -        case Misfit::L2_Inverse:
[detail] +        case MisfitType::L2_Inverse:
[detail]            diff=QGpCoreTools::abs(1.0/_mean-1.0/val.value());
[detail]            if(diff<min) {
[detail]              diff=min;
[detail]            }
[detail]            return diff*diff;
[detail] -        case Misfit::Akaike:
[detail] -        case Misfit::AkaikeFewSamples:
[detail] -        case Misfit::L2_Normalized:
[detail] +        case MisfitType::Akaike:
[detail] +        case MisfitType::AkaikeFewSamples:
[detail] +        case MisfitType::L2_Normalized:
[detail]            if(_stddev>0.0) {
[detail]              diff=QGpCoreTools::abs((_mean-val.value())/_stddev);
[detail]            } else {
[detail] @@ -291,7 +330,7 @@
[detail]              diff=min;
[detail]            }
[detail]            return diff*diff;
[detail] -        case Misfit::L2_LogNormalized:
[detail] +        case MisfitType::L2_LogNormalized:
[detail]            if(_stddev>1.0) {
[detail]              diff=QGpCoreTools::abs((log(_mean/val.value()))/log(_stddev));
[detail]            } else {
[detail] @@ -309,7 +348,7 @@
[detail]              diff=min;
[detail]            }
[detail]            return diff*diff;
[detail] -        case Misfit::L2_NormalizedBySigmaOnly:
[detail] +        case MisfitType::L2_NormalizedBySigmaOnly:
[detail]            if(_stddev>0.0) {
[detail]              diff=QGpCoreTools::abs((_mean-val.value())/_stddev);
[detail]            } else {
[detail] @@ -319,8 +358,21 @@
[detail]              diff=min;
[detail]            }
[detail]            return diff*diff;
[detail] -        case Misfit::Determinant:
[detail] -        case Misfit::TypeCount:
[detail] +        case MisfitType::L2_PeriodicNormalized: {
[detail] +            double v=Number::toDouble(val.value());
[detail] +            PeriodicStatistics::shiftValue(v, Number::toDouble(_mean), type.period(), type.period()*0.5);
[detail] +            if(_stddev>0.0) {
[detail] +              diff=QGpCoreTools::abs((_mean-v)/_stddev);
[detail] +            } else {
[detail] +              diff=QGpCoreTools::abs((_mean-v)/_mean);
[detail] +            }
[detail] +            if(diff<min) {
[detail] +              diff=min;
[detail] +            }
[detail] +            return diff*diff;
[detail] +          }
[detail] +        case MisfitType::Determinant:
[detail] +        case MisfitType::TypeCount:
[detail]            return 0.0;
[detail]          }
[detail]          return 0.0;
[detail] @@ -333,24 +385,6 @@
[detail]    }
[detail]  
[detail]    template <class numberType>
[detail] -  inline void StatisticalValue<numberType>::yExp()
[detail] -  {
[detail] -    setMean(exp(mean()));
[detail] -  }
[detail] -
[detail] -  template <class numberType>
[detail] -  inline void StatisticalValue<numberType>::yLog()
[detail] -  {
[detail] -    setMean(log(mean()));
[detail] -  }
[detail] -
[detail] -  template <class numberType>
[detail] -  inline void StatisticalValue<numberType>::yInverse()
[detail] -  {
[detail] -    setMean(inverse(mean()));
[detail] -  }
[detail] -
[detail] -  template <class numberType>
[detail]    QDataStream& operator>> (QDataStream& s, StatisticalValue<numberType>& p)
[detail]    {
[detail]      TRACE;
[detail]                         src/Statistics.h:  version-1.5.2	modified out of comments
[detail] --- src/Statistics.h-version-1.5.2-stripped	2025-09-28 04:00:55.319456200 +0200
[detail] +++ src/Statistics.h-HEAD-stripped	2025-09-28 04:00:55.323456220 +0200
[detail] @@ -30,8 +30,10 @@
[detail]      double stddevLog(double average) const {return exp(stddev(average));}
[detail]      double relativeStddev() const {return stddev()*_sumWeight/_sum;}
[detail]      double weight() const {return _sumWeight;}
[detail] +    double minimum() const {return _min;}
[detail] +    double maximum() const {return _max;}
[detail]    private:
[detail] -    double _sum, _sum2, _sumWeight, _sumWeight2;
[detail] +    double _sum, _sum2, _sumWeight, _sumWeight2, _min, _max;
[detail]    };
[detail]  
[detail]    inline void Statistics::addLog(double val, double weight)
[detail]               src/SteepestOptimization.h:  version-1.5.2	no last version available
[detail]                    src/SymmetricMatrix.h:  version-1.5.2	no last version available
[detail]                           src/Triangle.h:  version-1.5.2	not modified
[detail]                   src/TriangularMatrix.h:  version-1.5.2	not modified
[detail]                     src/TwiddleFactors.h:  version-1.5.2	not modified
[detail]                            src/UtmZone.h:  version-1.5.2	modified out of comments
[detail] --- src/UtmZone.h-version-1.5.2-stripped	2025-09-28 04:00:55.407456626 +0200
[detail] +++ src/UtmZone.h-HEAD-stripped	2025-09-28 04:00:55.411456646 +0200
[detail] @@ -24,7 +24,7 @@
[detail]      bool isValid(const Point2D& p, double tolerance=10000.0) const;
[detail]  
[detail]      QString toString() const;
[detail] -    void fromString(const QString& zone);
[detail] +    bool fromString(const QString& zone);
[detail]      static QStringList names();
[detail]  
[detail]      Point2D reference() const;
[detail]                              src/Value.h:  version-1.5.2	not modified
[detail]                             src/Vector.h:  version-1.5.2	modified out of comments
[detail] --- src/Vector.h-version-1.5.2-stripped	2025-09-28 04:00:55.439456781 +0200
[detail] +++ src/Vector.h-HEAD-stripped	2025-09-28 04:00:55.443456799 +0200
[detail] @@ -4,24 +4,34 @@
[detail]  #define VECTOR_H
[detail]  
[detail]  #include "QGpCoreMathDLLExport.h"
[detail] +#include "Point2D.h"
[detail]  #include "Matrix.h"
[detail]  
[detail]  namespace QGpCoreMath {
[detail]  
[detail] +  class HermitianMatrix;
[detail] +
[detail]    template <typename T> class QGPCOREMATH_EXPORT Vector
[detail]    {
[detail]    public:
[detail] -    inline Vector(int count, T * values);
[detail] +    inline Vector();
[detail] +    inline Vector(int size, T * values);
[detail]      inline Vector(const Vector<T>& o);
[detail]      inline ~Vector() {}
[detail]  
[detail]      void operator=(const Vector<T>&) {ASSERT(false);}
[detail] -    void copyValues(const Vector<T>& o);
[detail] -
[detail] -    inline void operator+=(const Vector<T>& o);
[detail] -    inline void operator-=(const Vector<T>& o);
[detail] -    inline void operator*=(const T& value);
[detail] -    inline void operator/=(const T& value);
[detail] +    void copyValues(const Vector<T>& from);
[detail] +    template <typename T1> void copyValues(const Vector<T1>& from);
[detail] +    void copyValues(const T * from);
[detail] +    template <typename T1> void copyValues(const T1 * from);
[detail] +    void copyValues(int thisStart, const Vector<T>& from, int fromStart=0, int size=-1);
[detail] +    template <typename T1> void copyValues(int thisStart, const Vector<T1>& from, int fromStart=0, int size=-1);
[detail] +
[detail] +    template <typename T1> inline void operator+=(const Vector<T1>& o);
[detail] +    template <typename T1> inline void operator-=(const Vector<T1>& o);
[detail] +    template <typename T1> inline void operator*=(const T1& value);
[detail] +    template <typename T1> inline void operator/=(const T1& value);
[detail] +    template <typename T1, typename T2> inline void add(const Vector<T1>& o, const T2& factor);
[detail]  
[detail]      inline bool operator==(const Vector<T>& o) const;
[detail]      inline bool operator!=(const Vector<T>& o) const;
[detail] @@ -30,8 +40,11 @@
[detail]      inline bool operator>(const Vector<T>& o) const;
[detail]      inline bool operator>=(const Vector<T>& o) const;
[detail]      inline bool hasElementGreaterThan(const Vector<T>& o) const;
[detail] +    inline bool hasAbsElementGreaterThan(const Vector<T>& o) const;
[detail] +    inline bool hasAbsElementGreaterThan(const Vector<T>& o, const Vector<T>& f) const;
[detail]  
[detail] -    int count() const {return _count;}
[detail] +    void resize(int size) {_size=size;}
[detail] +    int size() const {return _size;}
[detail]  
[detail]      T& at(int index) {return _values[index];}
[detail]      const T& at(int index) const {return _values[index];}
[detail] @@ -41,7 +54,7 @@
[detail]  
[detail]      inline void setValue(const T& value);
[detail]      void setValues(T * values) {_values=values;}
[detail] -    void setValues(const Vector<T>& o) {_values=o._values;}
[detail] +    void setValues(const Vector<T>& o) {_values=o._values; _size=o._size;}
[detail]      T * values() {return _values;}
[detail]      const T * values() const {return _values;}
[detail]  
[detail] @@ -59,94 +72,191 @@
[detail]      inline double azimuth(int axis1, int axis2) const;
[detail]  
[detail]      double minimumAbsRatio(const Vector<T>& o) const;
[detail] +    double maximumAbsRatio(const Vector<T>& o) const;
[detail] +    void clipAbs(const Vector<T>& o);
[detail]  
[detail]      template <typename T1, typename T2>
[detail]      inline void multiply(const Matrix<T1>& m, const Vector<T2>& v);
[detail]      template <typename T1, typename T2>
[detail]      inline void multiply(const Vector<T1>& v, const Matrix<T2>& m);
[detail] +    template <typename T1>
[detail] +    inline void dotMultiply(const Vector<T1>& v);
[detail]      template <typename T1, typename T2>
[detail]      inline void dotMultiply(const Vector<T1>& v1, const Vector<T2>& v2);
[detail] +    template <typename T1>
[detail] +    T sumDotMultiply(const Vector<T1>& v) const;
[detail]      inline Matrix<T> crossMatrix() const;
[detail]      template <typename T1> inline T scalarProduct(const Vector<T1>& o) const;
[detail]      inline T scalarProduct(const Point2D& p) const;
[detail] -    template <typename T1>
[detail] -    inline T scalarProductConjugate(const Vector<T1>& o) const;
[detail] +    template <typename T1> inline T scalarProductConjugate(const Vector<T1>& o) const;
[detail] +    void columnAt(const Matrix<T>& m, int index);
[detail] +    void rowAt(const Matrix<T>& m, int index);
[detail]      inline void abs();
[detail]      inline void changeSign();
[detail] +    inline void conjugate();
[detail]  
[detail]      QString toString(char format='g', int precision=6) const;
[detail] +    bool fromString(const StringSection& s);
[detail] +
[detail]      QString toUserString(char format='g', int precision=6) const;
[detail]      QString toOctaveString(char format='g', int precision=6) const;
[detail]      void toOctaveFile(const QString& fileName, const QString& variableName) const;
[detail] -  protected:
[detail] -    void resize(int count) {_count=count;}
[detail]    private:
[detail] -    int _count;
[detail] +    int _size;
[detail]      T * _values;
[detail]    };
[detail]  
[detail]    QGPCOREMATH_EXPORT VectorList<double> qVector(const Vector<double>& v);
[detail]  
[detail]    template <typename T>
[detail] -  inline Vector<T>::Vector(int count, T * values)
[detail] +  inline Vector<T>::Vector()
[detail]    {
[detail] -    _count=count;
[detail] +    _size=0;
[detail] +    _values=nullptr;
[detail] +  }
[detail] +
[detail] +  template <typename T>
[detail] +  inline Vector<T>::Vector(int size, T * values)
[detail] +  {
[detail] +    _size=size;
[detail]      _values=values;
[detail]    }
[detail]  
[detail]    template <typename T>
[detail]    inline Vector<T>::Vector(const Vector<T>& o)
[detail]    {
[detail] -    _count=o._count;
[detail] +    _size=o._size;
[detail]      _values=o._values;
[detail]    }
[detail]  
[detail]    template <typename T>
[detail] -  inline void Vector<T>::copyValues(const Vector<T>& o)
[detail] +  inline void Vector<T>::copyValues(const Vector<T>& from)
[detail] +  {
[detail] +    ASSERT(_size==from._size);
[detail] +    memcpy(_values, from._values, _size*sizeof(T));
[detail] +  }
[detail] +
[detail] +  template <typename T>
[detail] +  template <typename T1>
[detail] +  inline void Vector<T>::copyValues(const Vector<T1>& from)
[detail] +  {
[detail] +    ASSERT(_size==from.size());
[detail] +    for(int i=0; i<_size; i++) {
[detail] +      _values[i]=from[i];
[detail] +    }
[detail] +  }
[detail] +
[detail] +  template <typename T>
[detail] +  inline void Vector<T>::copyValues(const T * from)
[detail] +  {
[detail] +    memcpy(_values, from, _size*sizeof(T));
[detail] +  }
[detail] +
[detail] +  template <typename T>
[detail] +  template <typename T1>
[detail] +  inline void Vector<T>::copyValues(const T1 * from)
[detail] +  {
[detail] +    for(int i=0; i<_size; i++) {
[detail] +      _values[i]=from[i];
[detail] +    }
[detail] +  }
[detail] +
[detail] +  template <typename T>
[detail] +  inline void Vector<T>::copyValues(int thisStart, const Vector<T>& from,
[detail] +                                    int fromStart, int size)
[detail] +  {
[detail] +    if(size<0) {
[detail] +      size=_size-thisStart;
[detail] +      int fromSize=from._size-fromStart;
[detail] +      if(fromSize<size) {
[detail] +        size=fromSize;
[detail] +      }
[detail] +    } else {
[detail] +      ASSERT(_size-thisStart>=size);
[detail] +      ASSERT(from._size-fromStart>=size);
[detail] +    }
[detail] +    if(size>0) {
[detail] +      memcpy(_values+thisStart, from._values+fromStart, size*sizeof(T));
[detail] +    }
[detail] +  }
[detail] +
[detail] +  template <typename T>
[detail] +  template <typename T1>
[detail] +  inline void Vector<T>::copyValues(int thisStart, const Vector<T1>& from,
[detail] +                                    int fromStart, int size)
[detail]    {
[detail] -    ASSERT(_count==o._count);
[detail] -    memcpy(_values, o._values, _count*sizeof(T));
[detail] +    if(size<0) {
[detail] +      size=_size-thisStart;
[detail] +      int fromSize=from.size()-fromStart;
[detail] +      if(fromSize<size) {
[detail] +        size=fromSize;
[detail] +      }
[detail] +    } else {
[detail] +      ASSERT(_size-thisStart>=size);
[detail] +      ASSERT(from.size()-fromStart>=size);
[detail] +    }
[detail] +    if(size>0) {
[detail] +      T * thisPtr=_values+thisStart;
[detail] +      T1 * fromPtr=from.values()+fromStart;
[detail] +      for(int i=0; i<size; i++) {
[detail] +        thisPtr[i]=fromPtr[i];
[detail] +      }
[detail] +    }
[detail]    }
[detail]  
[detail]    template <typename T>
[detail] -  inline void Vector<T>::operator+=(const Vector<T>& o)
[detail] +  template <typename T1>
[detail] +  inline void Vector<T>::operator+=(const Vector<T1>& o)
[detail]    {
[detail] -    ASSERT(_count==o._count);
[detail] -    for(int i=0; i<_count; i++) {
[detail] +    ASSERT(_size==o._size);
[detail] +    for(int i=0; i<_size; i++) {
[detail]        _values[i]+=o._values[i];
[detail]      }
[detail]    }
[detail]  
[detail]    template <typename T>
[detail] -  inline void Vector<T>::operator-=(const Vector<T>& o)
[detail] +  template <typename T1>
[detail] +  inline void Vector<T>::operator-=(const Vector<T1>& o)
[detail]    {
[detail] -    ASSERT(_count==o._count);
[detail] -    for(int i=0; i<_count; i++) {
[detail] +    ASSERT(_size==o._size);
[detail] +    for(int i=0; i<_size; i++) {
[detail]        _values[i]-=o._values[i];
[detail]      }
[detail]    }
[detail]  
[detail]    template <typename T>
[detail] -  inline void Vector<T>::operator*=(const T& value)
[detail] +  template <typename T1>
[detail] +  inline void Vector<T>::operator*=(const T1& value)
[detail]    {
[detail] -    for(int i=0; i<_count; i++) {
[detail] +    for(int i=0; i<_size; i++) {
[detail]        _values[i]*=value;
[detail]      }
[detail]    }
[detail]  
[detail]    template <typename T>
[detail] -  inline void Vector<T>::operator/=(const T& value)
[detail] +  template <typename T1>
[detail] +  inline void Vector<T>::operator/=(const T1& value)
[detail]    {
[detail] -    for(int i=0; i<_count; i++) {
[detail] +    for(int i=0; i<_size; i++) {
[detail]        _values[i]/=value;
[detail]      }
[detail]    }
[detail]  
[detail]    template <typename T>
[detail] +  template <typename T1, typename T2>
[detail] +  inline void Vector<T>::add(const Vector<T1>& o, const T2& factor)
[detail] +  {
[detail] +    ASSERT(_size==o.size());
[detail] +    for(int i=0; i<_size; i++) {
[detail] +      _values[i]+=factor*o[i];
[detail] +    }
[detail] +  }
[detail] +
[detail] +  template <typename T>
[detail]    inline bool Vector<T>::operator==(const Vector<T>& o) const
[detail]    {
[detail] -    ASSERT(_count==o._count);
[detail] -    for(int i=0; i<_count; i++) {
[detail] +    ASSERT(_size==o._size);
[detail] +    for(int i=0; i<_size; i++) {
[detail]        if(_values[i]!=o._values[i]) {
[detail]          return false;
[detail]        }
[detail] @@ -157,7 +267,7 @@
[detail]    template <typename T>
[detail]    inline bool Vector<T>::operator!=(const Vector<T>& o) const
[detail]    {
[detail] -    for(int i=0; i<_count; i++) {
[detail] +    for(int i=0; i<_size; i++) {
[detail]        if(_values[i]!=o._values[i]) {
[detail]          return true;
[detail]        }
[detail] @@ -168,8 +278,8 @@
[detail]    template <typename T>
[detail]    inline bool Vector<T>::operator<(const Vector<T>& o) const
[detail]    {
[detail] -    ASSERT(_count==o._count);
[detail] -    for(int i=0; i<_count; i++) {
[detail] +    ASSERT(_size==o._size);
[detail] +    for(int i=0; i<_size; i++) {
[detail]        if(_values[i]<o._values[i]) {
[detail]          return true;
[detail]        } else if(_values[i]>o._values[i]) {
[detail] @@ -183,8 +293,8 @@
[detail]    template <typename T>
[detail]    inline bool Vector<T>::operator<=(const Vector<T>& o) const
[detail]    {
[detail] -    ASSERT(_count==o._count);
[detail] -    for(int i=0; i<_count; i++) {
[detail] +    ASSERT(_size==o._size);
[detail] +    for(int i=0; i<_size; i++) {
[detail]        if(_values[i]<o._values[i]) {
[detail]          return true;
[detail]        } else if(_values[i]>o._values[i]) {
[detail] @@ -198,8 +308,8 @@
[detail]    template <typename T>
[detail]    inline bool Vector<T>::operator>(const Vector<T>& o) const
[detail]    {
[detail] -    ASSERT(_count==o._count);
[detail] -    for(int i=0; i<_count; i++) {
[detail] +    ASSERT(_size==o._size);
[detail] +    for(int i=0; i<_size; i++) {
[detail]        if(_values[i]>o._values[i]) {
[detail]          return true;
[detail]        } else if(_values[i]<o._values[i]) {
[detail] @@ -213,8 +323,8 @@
[detail]    template <typename T>
[detail]    inline bool Vector<T>::operator>=(const Vector<T>& o) const
[detail]    {
[detail] -    ASSERT(_count==o._count);
[detail] -    for(int i=0; i<_count; i++) {
[detail] +    ASSERT(_size==o._size);
[detail] +    for(int i=0; i<_size; i++) {
[detail]        if(_values[i]>o._values[i]) {
[detail]          return true;
[detail]        } else if(_values[i]<o._values[i]) {
[detail] @@ -228,8 +338,8 @@
[detail]    template <typename T>
[detail]    inline bool Vector<T>::hasElementGreaterThan(const Vector<T>& o) const
[detail]    {
[detail] -    ASSERT(_count==o._count);
[detail] -    for(int i=0; i<_count; i++) {
[detail] +    ASSERT(_size==o._size);
[detail] +    for(int i=0; i<_size; i++) {
[detail]        if(_values[i]>o._values[i]) {
[detail]          return true;
[detail]        }
[detail] @@ -238,9 +348,33 @@
[detail]    }
[detail]  
[detail]    template <typename T>
[detail] +  inline bool Vector<T>::hasAbsElementGreaterThan(const Vector<T>& o) const
[detail] +  {
[detail] +    ASSERT(_size==o._size);
[detail] +    for(int i=0; i<_size; i++) {
[detail] +      if(QGpCoreTools::abs(_values[i])>QGpCoreTools::abs(o._values[i])) {
[detail] +        return true;
[detail] +      }
[detail] +    }
[detail] +    return false;
[detail] +  }
[detail] +
[detail] +  template <typename T>
[detail] +  inline bool Vector<T>::hasAbsElementGreaterThan(const Vector<T>& o, const Vector<T>& f) const
[detail] +  {
[detail] +    ASSERT(_size==o._size);
[detail] +    for(int i=0; i<_size; i++) {
[detail] +      if(QGpCoreTools::abs(_values[i])>QGpCoreTools::abs(o._values[i]*f._values[i])) {
[detail] +        return true;
[detail] +      }
[detail] +    }
[detail] +    return false;
[detail] +  }
[detail] +
[detail] +  template <typename T>
[detail]    inline void Vector<T>::setValue(const T& value)
[detail]    {
[detail] -    for(int i=0; i<_count; i++) {
[detail] +    for(int i=0; i<_size; i++) {
[detail]        _values[i]=value;
[detail]      }
[detail]    }
[detail] @@ -248,9 +382,9 @@
[detail]    template <typename T>
[detail]    double Vector<T>::distanceTo(const Vector<T>& o) const
[detail]    {
[detail] -    ASSERT(_count==o._count);
[detail] +    ASSERT(_size==o._size);
[detail]      double sum=0.0, x;
[detail] -    for(int i=0; i<_count; i++) {
[detail] +    for(int i=0; i<_size; i++) {
[detail]        x=_values[i]-o._values[i];
[detail]        sum+=x*x;
[detail]      }
[detail] @@ -260,7 +394,7 @@
[detail]    template <typename T>
[detail]    double Vector<T>::distanceTo(const Vector<T>& o, int axis1, int axis2) const
[detail]    {
[detail] -    ASSERT(axis2<_count && axis2<o._count && axis1<axis2);
[detail] +    ASSERT(axis2<_size && axis2<o._size && axis1<axis2);
[detail]      double sum=0.0, x;
[detail]      x=_values[axis1];
[detail]      x-=o._values[axis1];
[detail] @@ -274,10 +408,9 @@
[detail]    template <typename T>
[detail]    inline double Vector<T>::squareLength() const
[detail]    {
[detail] -    double sum=0.0, x;
[detail] -    for(int i=0; i<_count; i++) {
[detail] -      x=_values[i];
[detail] -      sum+=x*x;
[detail] +    double sum=0.0;
[detail] +    for(int i=0; i<_size; i++) {
[detail] +      sum+=abs2(_values[i]);
[detail]      }
[detail]      return sum;
[detail]    }
[detail] @@ -291,7 +424,7 @@
[detail]    template <typename T>
[detail]    inline double Vector<T>::squareLength(int axis1, int axis2) const
[detail]    {
[detail] -    ASSERT(axis1<_count && axis2<_count);
[detail] +    ASSERT(axis1<_size && axis2<_size);
[detail]      double sum=0.0, x;
[detail]      x=_values[axis1];
[detail]      sum+=x*x;
[detail] @@ -309,7 +442,7 @@
[detail]    template <typename T>
[detail]    inline double Vector<T>::azimuth(int axis1, int axis2) const
[detail]    {
[detail] -    ASSERT(axis1<_count && axis2<_count);
[detail] +    ASSERT(axis1<_size && axis2<_size);
[detail]      double a=atan2(_values[axis2], _values[axis1]);
[detail]      if(a<0.0) a+=2.0*M_PI;
[detail]      return a;
[detail] @@ -318,7 +451,7 @@
[detail]    template <typename T>
[detail]    inline Vector<T>& Vector<T>::init(const T& v1)
[detail]    {
[detail] -    ASSERT(_count==1);
[detail] +    ASSERT(_size==1);
[detail]      _values[0]=v1;
[detail]      return *this;
[detail]    }
[detail] @@ -326,7 +459,7 @@
[detail]    template <typename T>
[detail]    inline Vector<T>& Vector<T>::init(const T& v1, const T& v2)
[detail]    {
[detail] -    ASSERT(_count==2);
[detail] +    ASSERT(_size==2);
[detail]      _values[0]=v1;
[detail]      _values[1]=v2;
[detail]      return *this;
[detail] @@ -335,7 +468,7 @@
[detail]    template <typename T>
[detail]    inline Vector<T>& Vector<T>::init(const T& v1, const T& v2, const T& v3)
[detail]    {
[detail] -    ASSERT(_count==3);
[detail] +    ASSERT(_size==3);
[detail]      _values[0]=v1;
[detail]      _values[1]=v2;
[detail]      _values[2]=v3;
[detail] @@ -345,7 +478,7 @@
[detail]    template <typename T>
[detail]    inline Vector<T>& Vector<T>::init(const T& v1, const T& v2, const T& v3, const T& v4)
[detail]    {
[detail] -    ASSERT(_count==4);
[detail] +    ASSERT(_size==4);
[detail]      _values[0]=v1;
[detail]      _values[1]=v2;
[detail]      _values[2]=v3;
[detail] @@ -357,14 +490,15 @@
[detail]    template <typename T1, typename T2>
[detail]    inline void Vector<T>::multiply(const Matrix<T1>& m, const Vector<T2>& v)
[detail]    {
[detail] -    ASSERT(static_cast<int>(m.columnCount())==v.count());
[detail] -    ASSERT(_count==v.count());
[detail] +    ASSERT(static_cast<int>(m.columnCount())==v.size());
[detail] +    ASSERT(_size==v._size);
[detail]      setValue(0);
[detail]      T * r=_values;
[detail] -    const T * m1=m.values();
[detail] -    const T * m2=v._values;
[detail] -    const T * m1_end=m1+m.rowCount();
[detail] -    const T * m10, * m20, * m20_end;
[detail] +    const T1 * m1=m.values();
[detail] +    const T2 * m2=v._values;
[detail] +    const T1 * m1_end=m1+m.rowCount();
[detail] +    const T1 * m10;
[detail] +    const T2 * m20, * m20_end;
[detail]      while(m1<m1_end) {
[detail]        m10=m1;
[detail]        m20=m2;
[detail] @@ -380,26 +514,41 @@
[detail]    }
[detail]  
[detail]    template <typename T>
[detail] +  void Vector<T>::columnAt(const Matrix<T>& m, int col)
[detail] +  {
[detail] +    ASSERT(m.rowCount()==_size);
[detail] +    for(int i=0; i<_size; i++) {
[detail] +      _values[i]=m.at(i, col);
[detail] +    }
[detail] +  }
[detail] +
[detail] +  template <typename T>
[detail] +  void Vector<T>::rowAt(const Matrix<T>& m, int row)
[detail] +  {
[detail] +    ASSERT(m.columnCount()==_size);
[detail] +    for(int i=0; i<_size; i++) {
[detail] +      _values[i]=m.at(row, i);
[detail] +    }
[detail] +  }
[detail] +
[detail] +  template <typename T>
[detail]    template <typename T1, typename T2>
[detail]    inline void Vector<T>::multiply(const Vector<T1>& v, const Matrix<T2>& m)
[detail]    {
[detail] -    ASSERT(m.count()==v.count());
[detail] -    ASSERT(_count==v._count);
[detail] +    ASSERT(m.rowCount()==v.size());
[detail] +    ASSERT(_size==v._size);
[detail]      setValue(0);
[detail]      T * r=_values;
[detail]      const T * m1=v._values;
[detail]      const T * m2=m.values();
[detail]      const T * m2_end=m2+m.columnCount()*m.rowCount();
[detail]      const T * m10, * m20, * m10_end;
[detail] -    T x;
[detail]      while(m2<m2_end) {
[detail]        m10=m1;
[detail]        m20=m2;
[detail] -      m10_end=m1+v._count;
[detail] +      m10_end=m1+v._size;
[detail]        while(m10<m10_end) {
[detail] -        x=*m10;
[detail] -        x*=*m20
[detail] -        *r+=x;
[detail] +        *r+=(*m10)*(*m20);
[detail]          m20++;
[detail]          m10++;
[detail]        }
[detail] @@ -412,8 +561,8 @@
[detail]    template <typename T1, typename T2>
[detail]    inline void Vector<T>::dotMultiply(const Vector<T1>& v1, const Vector<T2>& v2)
[detail]    {
[detail] -    ASSERT(_count==v1.count() && v1.count()==v2.count());
[detail] -    for(int i=0; i<_count; i++) {
[detail] +    ASSERT(_size==v1.size() && v1.size()==v2.size());
[detail] +    for(int i=0; i<_size; i++) {
[detail]        T& val=_values[i];
[detail]        val=v1.at(i);
[detail]        val*=v2.at(i);
[detail] @@ -422,25 +571,22 @@
[detail]  
[detail]    template <typename T>
[detail]    template <typename T1>
[detail] -  inline T Vector<T>::scalarProduct(const Vector<T1>& o) const
[detail] +  inline void Vector<T>::dotMultiply(const Vector<T1>& v)
[detail]    {
[detail] -    ASSERT(_count==o.count());
[detail] -    T sum=0, x;
[detail] -    for(int i=0; i<_count; i++) {
[detail] -      x=_values[i];
[detail] -      x*=o._values[i];
[detail] -      sum+=x;
[detail] +    ASSERT(_size==v.size());
[detail] +    for(int i=0; i<_size; i++) {
[detail] +      T& val=_values[i];
[detail] +      val*=v.at(i);
[detail]      }
[detail] -    return sum;
[detail]    }
[detail]  
[detail]    template <typename T>
[detail]    inline Matrix<T> Vector<T>::crossMatrix() const
[detail]    {
[detail] -    Matrix<T> m(_count);
[detail] -    for(int i=0; i<_count; i++) {
[detail] -      for(int j=0; j<_count; j++) {
[detail] -        m.at(i, j)=_values[i]*conjugate(_values[j]);
[detail] +    Matrix<T> m(_size);
[detail] +    for(int i=0; i<_size; i++) {
[detail] +      for(int j=0; j<_size; j++) {
[detail] +        m.at(i, j)=_values[i]*::conjugate(_values[j]);
[detail]        }
[detail]      }
[detail]      return m;
[detail] @@ -448,13 +594,42 @@
[detail]  
[detail]    template <typename T>
[detail]    template <typename T1>
[detail] +  T Vector<T>::sumDotMultiply(const Vector<T1>& v) const
[detail] +  {
[detail] +    ASSERT(_size==v.size());
[detail] +    T sum=0.0;
[detail] +    for(int i=0; i<_size; i++) {
[detail] +      T val=_values[i];
[detail] +      val*=v.at(i);
[detail] +      sum+=val;
[detail] +    }
[detail] +    return sum;
[detail] +  }
[detail] +
[detail] +  template <typename T>
[detail] +  template <typename T1>
[detail]    inline T Vector<T>::scalarProductConjugate(const Vector<T1>& o) const
[detail]    {
[detail] -    ASSERT(_count==o.count());
[detail] -    T sum=0, x;
[detail] -    for(int i=0; i<_count; i++) {
[detail] -      x=conjugate(o._values[i]);
[detail] -      x*=_values[i];
[detail] +    ASSERT(_size==o.size());
[detail] +    T sum;
[detail] +    sum.conjugateProduct(_values[0], o._values[0]);
[detail] +    for(int i=1; i<_size; i++) {
[detail] +      sum.addConjugateProduct(_values[i], o._values[i]);
[detail] +    }
[detail] +    return sum;
[detail] +  }
[detail] +
[detail] +  template <typename T>
[detail] +  template <typename T1>
[detail] +  inline T Vector<T>::scalarProduct(const Vector<T1>& o) const
[detail] +  {
[detail] +    ASSERT(_size==o.size());
[detail] +    T sum=_values[0];
[detail] +    sum*=o._values[0];
[detail] +    T x;
[detail] +    for(int i=1; i<_size; i++) {
[detail] +      x=_values[i];
[detail] +      x*=o._values[i];
[detail]        sum+=x;
[detail]      }
[detail]      return sum;
[detail] @@ -463,7 +638,7 @@
[detail]    template <typename T>
[detail]    inline T Vector<T>::scalarProduct(const Point2D& p) const
[detail]    {
[detail] -    ASSERT(_count>=2);
[detail] +    ASSERT(_size>=2);
[detail]      T x=_values[0];
[detail]      x*=p.x();
[detail]      T y=_values[1];
[detail] @@ -475,7 +650,7 @@
[detail]    template <typename T>
[detail]    inline void Vector<T>::abs()
[detail]    {
[detail] -    for(int i=0; i<_count; i++) {
[detail] +    for(int i=0; i<_size; i++) {
[detail]        _values[i]=QGpCoreTools::abs(_values[i]);
[detail]      }
[detail]    }
[detail] @@ -483,16 +658,24 @@
[detail]    template <typename T>
[detail]    inline void Vector<T>::changeSign()
[detail]    {
[detail] -    for(int i=0; i<_count; i++) {
[detail] +    for(int i=0; i<_size; i++) {
[detail]        _values[i]=-_values[i];
[detail]      }
[detail]    }
[detail]  
[detail]    template <typename T>
[detail] +  inline void Vector<T>::conjugate()
[detail] +  {
[detail] +    for(int i=0; i<_size; i++) {
[detail] +      _values[i]=::conjugate(_values[i]);
[detail] +    }
[detail] +  }
[detail] +
[detail] +  template <typename T>
[detail]    QString Vector<T>::toString(char format, int precision) const
[detail]    {
[detail]      QString str;
[detail] -    for(int i=0; i<_count; i++) {
[detail] +    for(int i=0; i<_size; i++) {
[detail]        str+=Number::toString(_values[i], format, precision);
[detail]        str+=" ";
[detail]      }
[detail] @@ -500,12 +683,24 @@
[detail]    }
[detail]  
[detail]    template <typename T>
[detail] +  bool Vector<T>::fromString(const StringSection& s)
[detail] +  {
[detail] +    const QChar * ptr=nullptr;
[detail] +    for(int i=0; i<_size; i++) {
[detail] +      if(!s.nextNumber(_values[i], ptr)) {
[detail] +        return false;
[detail] +      }
[detail] +    }
[detail] +    return true;
[detail] +  }
[detail] +
[detail] +  template <typename T>
[detail]    QString Vector<T>::toUserString(char format, int precision) const
[detail]    {
[detail]      QString str;
[detail] -    if(_count>0) {
[detail] +    if(_size>0) {
[detail]        str=QString("%1").arg(_values[0], 12, format, precision, QChar(' '));
[detail] -      for(int i=1; i<_count; i++) {
[detail] +      for(int i=1; i<_size; i++) {
[detail]          str+=QString(" %1").arg(_values[i], 12, format, precision, QChar(' '));
[detail]        }
[detail]      }
[detail] @@ -516,7 +711,7 @@
[detail]    QString Vector<T>::toOctaveString(char format, int precision) const
[detail]    {
[detail]      QString str("[");
[detail] -    for(int i=0; i<_count; i++) {
[detail] +    for(int i=0; i<_size; i++) {
[detail]        str+=QString(" %1;").arg(Number::toString(_values[i], format, precision));
[detail]      }
[detail]      str+=" ]";
[detail] @@ -538,18 +733,51 @@
[detail]    template <typename T>
[detail]    double Vector<T>::minimumAbsRatio(const Vector<T>& o) const
[detail]    {
[detail] -    ASSERT(_count==o._count);
[detail] +    ASSERT(_size==o._size);
[detail]      double minR=std::numeric_limits<double>::infinity();
[detail]      double r;
[detail] -    for(int i=0; i<_count; i++) {
[detail] +    for(int i=0; i<_size; i++) {
[detail]        r=fabs(_values[i]/o._values[i]);
[detail] -      if(r<minR) {
[detail] +      if(r>0 && r<minR) {
[detail]          minR=r;
[detail]        }
[detail]      }
[detail]      return minR;
[detail]    }
[detail]  
[detail] +  template <typename T>
[detail] +  double Vector<T>::maximumAbsRatio(const Vector<T>& o) const
[detail] +  {
[detail] +    ASSERT(_size==o._size);
[detail] +    double maxR=0.0;
[detail] +    double r;
[detail] +    for(int i=0; i<_size; i++) {
[detail] +      if(o._values[i]!=0) {
[detail] +        r=fabs(_values[i]/o._values[i]);
[detail] +        if(r>maxR) {
[detail] +          maxR=r;
[detail] +        }
[detail] +      }
[detail] +    }
[detail] +    return maxR;
[detail] +  }
[detail] +
[detail] +  template <typename T>
[detail] +  void Vector<T>::clipAbs(const Vector<T>& o)
[detail] +  {
[detail] +    ASSERT(_size==o._size);
[detail] +    for(int i=0; i<_size; i++) {
[detail] +      if(_values[i]<0) {
[detail] +        if(_values[i]<-o._values[i]) {
[detail] +          _values[i]=-o._values[i];
[detail] +        }
[detail] +      } else {
[detail] +        if(_values[i]>o._values[i]) {
[detail] +          _values[i]=o._values[i];
[detail] +        }
[detail] +      }
[detail] +    }
[detail] +  }
[detail]  
[detail]  } 
[detail]  
[detail]                     src/WindowFunction.h:  version-1.5.2	not modified
[detail]           src/WindowFunctionParameters.h:  version-1.5.2	not modified
[detail]                  src/XUniqueYColorData.h:  version-1.5.2	not modified
[summary] Total differences: 7288 lines
[summary] Modification level is B
OLD_DIR=$(pwd)
echo "QGpCoreMath"
cd $(find . -name "QGpCoreMath" | tail -n 1) || exit 2
pwd
dpversion B  || exit 2
cd $OLD_DIR || exit 2
################## SciFigs
[detail]                     src/AbstractLine.cpp:  version-3.4.1	not modified
[detail]                 src/AbstractNameLine.cpp:  version-3.4.1	not modified
[detail]                  src/ActivityMonitor.cpp:  version-3.4.1	not modified
[detail]              src/AlignGridParameters.cpp:  version-3.4.1	not modified
[detail]                  src/AutoAdjustScale.cpp:  version-3.4.1	modified out of comments
[detail] --- src/AutoAdjustScale.cpp-version-3.4.1-stripped	2025-09-28 04:00:55.603457572 +0200
[detail] +++ src/AutoAdjustScale.cpp-HEAD-stripped	2025-09-28 04:00:55.607457592 +0200
[detail] @@ -15,7 +15,7 @@
[detail]      _forceMinimumValue=false;
[detail]      _forceMaximumValue=false;
[detail]      _forceRatio=true;
[detail] -    _symetric=false;
[detail] +    _symmetric=false;
[detail]      _scale=SamplingParameters::Linear;
[detail]      _minimumValue=0.0;
[detail]      _maximumValue=0.0;
[detail] @@ -30,7 +30,7 @@
[detail]      _forceMinimumValue=o._forceMinimumValue;
[detail]      _forceMaximumValue=o._forceMaximumValue;
[detail]      _forceRatio=o._forceRatio;
[detail] -    _symetric=o._symetric;
[detail] +    _symmetric=o._symmetric;
[detail]      _scale=o._scale;
[detail]      _minimumValue=o._minimumValue;
[detail]      _maximumValue=o._maximumValue;
[detail] @@ -45,7 +45,7 @@
[detail]      w->setValue(AutoAdjustScaleProperties::ForceMinValue, forceMinimumValue());
[detail]      w->setValue(AutoAdjustScaleProperties::ForceMaxValue, forceMaximumValue());
[detail]      w->setValue(AutoAdjustScaleProperties::ForceRatio, forceRatio());
[detail] -    w->setValue(AutoAdjustScaleProperties::Symetric, symetric());
[detail] +    w->setValue(AutoAdjustScaleProperties::Symmetric, symmetric());
[detail]      w->setValue(AutoAdjustScaleProperties::MinValue, minimumValue());
[detail]      w->setValue(AutoAdjustScaleProperties::MaxValue, maximumValue());
[detail]      w->setValue(AutoAdjustScaleProperties::Ratio, ratio());
[detail] @@ -72,8 +72,8 @@
[detail]      case AutoAdjustScaleProperties::ForceRatio:
[detail]        setForceRatio(val.toBool());
[detail]        break;
[detail] -    case AutoAdjustScaleProperties::Symetric:
[detail] -      setSymetric(val.toBool());
[detail] +    case AutoAdjustScaleProperties::Symmetric:
[detail] +      setSymmetric(val.toBool());
[detail]        break;
[detail]      case AutoAdjustScaleProperties::MinValue:
[detail]        setMinimumValue(val.toDouble());
[detail]        src/AutoAdjustScaleProperties.cpp:  version-3.4.1	modified out of comments
[detail] --- src/AutoAdjustScaleProperties.cpp-version-3.4.1-stripped	2025-09-28 04:00:55.623457669 +0200
[detail] +++ src/AutoAdjustScaleProperties.cpp-HEAD-stripped	2025-09-28 04:00:55.627457689 +0200
[detail] @@ -20,7 +20,7 @@
[detail]      addProperty(ForceMinValue, forceMinValue);
[detail]      addProperty(ForceMaxValue, forceMaxValue);
[detail]      addProperty(ForceRatio, forceRatio);
[detail] -    addProperty(Symetric, symetric);
[detail] +    addProperty(Symmetric, symmetric);
[detail]      addProperty(MinValue, minValueEdit);
[detail]      addProperty(MaxValue, maxValueEdit);
[detail]      addProperty(Ratio, ratioEdit);
[detail] @@ -28,7 +28,7 @@
[detail]  
[detail]    void AutoAdjustScaleProperties::on_linearScale_toggled(bool c)
[detail]    {
[detail] -    symetric->setEnabled(c);
[detail] +    symmetric->setEnabled(c);
[detail]    }
[detail]  
[detail]    void AutoAdjustScaleProperties::on_forceMinValue_toggled(bool c)
[detail]                             src/Axis.cpp:  version-3.4.1	modified out of comments
[detail] --- src/Axis.cpp-version-3.4.1-stripped	2025-09-28 04:00:55.643457767 +0200
[detail] +++ src/Axis.cpp-HEAD-stripped	2025-09-28 04:00:55.647457785 +0200
[detail] @@ -106,6 +106,7 @@
[detail]      _numberType='f';
[detail]      _numberPrecision=0;
[detail]      _unitFactor=1.0;
[detail] +    _annotationFactor=1.0;
[detail]      _autoPrecision=true;
[detail]      _numberPrecisionInverseScale=1;
[detail]      _zoomEnabled=true;
[detail] @@ -374,67 +375,16 @@
[detail]    {
[detail]      TRACE;
[detail]      const Scale& s=constScale();
[detail] -    double visMin, visMax, majorTicks;
[detail] -    SAFE_UNINITIALIZED(visMin,0);
[detail] -    SAFE_UNINITIALIZED(visMax,0);
[detail] -    SAFE_UNINITIALIZED(majorTicks,0);
[detail] -    switch (s.type()) {
[detail] -    case Scale::Linear:
[detail] -    case Scale::RelativeTime:
[detail] -    case Scale::Log:
[detail] -      visMin=s.minimum()*_unitFactor;
[detail] -      visMax=s.maximum()*_unitFactor;
[detail] -      majorTicks=s.majorTicks()*_unitFactor;
[detail] -      break;
[detail] -    case Scale::Inverse:
[detail] -    case Scale::InverseLog:
[detail] -      visMin=_unitFactor/s.maximum();
[detail] -      visMax=_unitFactor/s.minimum();
[detail] -      majorTicks=s.majorTicks()*_unitFactor;
[detail] -      break;
[detail] -    case Scale::AbsoluteTime:
[detail] -      visMin=s.minimum();
[detail] -      visMax=s.maximum();
[detail] -      if(visMax-visMin<=60.0) {
[detail] -        const VectorList<double>& ticks=s.majorTickValues();
[detail] -        if(ticks.count()>=2) {
[detail] -          majorTicks=ticks.at(1)-ticks.at(0);
[detail] -        } else {
[detail] -          majorTicks=s.majorTicks();
[detail] -        }
[detail] -      } else {
[detail] -        majorTicks=1.0;
[detail] -      }
[detail] -      break;
[detail] -    }
[detail]      int numberPrecision=0;
[detail] -    switch(s.type()) {
[detail] -    case Scale::Log:
[detail] -    case Scale::InverseLog:
[detail] -      if(_numberType=='e') {
[detail] -        numberPrecision=qCeil(round(-log10(s.majorTicks())*100.0)*0.01);
[detail] -      } else {
[detail] -        double baseLabel=pow(10.0, floor(log10(visMin)));
[detail] -        double label=baseLabel*s.majorTicks();
[detail] -        numberPrecision=qCeil(round(-log10(label)*100.0)*0.01);
[detail] +    if(_numberType=='f') {
[detail] +      if(!s.majorTickValues().isEmpty()) {
[detail] +        numberPrecision=Number::minimumPrecision(s.majorTickValues().first(), 10);
[detail] +        if(s.majorTickValues().size()>=2) { 
[detail] +          int np2=Number::minimumPrecision(s.majorTickValues().at(1), 10);
[detail] +          if(np2>numberPrecision) {
[detail] +            numberPrecision=np2;
[detail]        }
[detail] -      break;
[detail] -    case Scale::Linear:
[detail] -    case Scale::Inverse:
[detail] -    case Scale::AbsoluteTime:
[detail] -    case Scale::RelativeTime:
[detail] -      if(_numberType=='e') {
[detail] -        double max=fabs(visMax);
[detail] -        if(visMin<-max) {
[detail] -          max=-visMin;
[detail] -        }
[detail] -        max=floor(max/majorTicks)*majorTicks;
[detail] -        int baseExponent=qFloor(log10(max));
[detail] -        numberPrecision=qCeil(round(-log10(majorTicks)*100.0)*0.01)+baseExponent;
[detail] -      } else {
[detail] -        numberPrecision=qCeil(round(-log10(majorTicks)*100.0)*0.01);
[detail]        }
[detail] -      break;
[detail]      }
[detail]      if(numberPrecision<0) {
[detail]        numberPrecision=0;
[detail] @@ -446,6 +396,7 @@
[detail]        emit sizeChanged();
[detail]      }
[detail]    }
[detail] +  }
[detail]  
[detail]    QString Axis::stringLabels() const
[detail]    {
[detail] @@ -826,8 +777,9 @@
[detail]      _font.setFont(p, dotpercm);
[detail]    }
[detail]  
[detail] -  QString Axis::label(int index, int numberPrecision, double unitFactor) const
[detail] +  QString Axis::label(int index, int numberPrecision) const
[detail]    {
[detail] +    double factor=_unitFactor/_annotationFactor;
[detail]      const Scale& scl=constScale();
[detail]      double val=scl.majorTickValues().at(index);
[detail]      if(_showLabels) {
[detail] @@ -835,41 +787,36 @@
[detail]        case Scale::Linear:
[detail]          if(_stringLabels && (val>0.0 && val<=_stringLabels->count()) && round(val)==val) {
[detail]             return (*_stringLabels)[qRound(val)-1];
[detail] -        } else {
[detail] -          return Number::toString(val*unitFactor, _numberType, numberPrecision);
[detail]          }
[detail] +        break;
[detail]        case Scale::Log:
[detail] -        if(_numberType=='e') {
[detail] -          return Number::toString(val*unitFactor, _numberType, numberPrecision);
[detail] -        } else {
[detail] -          numberPrecision+=scl.majorTickPrecision().at(index);
[detail] -          if(numberPrecision<0) {
[detail] -            numberPrecision=0;
[detail] -          }
[detail] -          return Number::toString(val*unitFactor, _numberType, numberPrecision);
[detail] -        }
[detail] -      case Scale::Inverse:
[detail] -        return Number::toString(val*unitFactor, _numberType, numberPrecision);
[detail]        case Scale::InverseLog:
[detail] -        if(_numberType=='e') {
[detail] -          return Number::toString(val*unitFactor, _numberType, numberPrecision);
[detail] -        } else {
[detail] +        if(_numberType=='f') {
[detail]            numberPrecision+=scl.majorTickPrecision().at(index);
[detail]            if(numberPrecision<0) {
[detail]              numberPrecision=0;
[detail]            }
[detail] -          return Number::toString(val*unitFactor, _numberType, numberPrecision);
[detail] +          return Number::toUserString(val*factor, _numberType, numberPrecision);
[detail]          }
[detail] +        break;
[detail] +      case Scale::Inverse:
[detail] +        break;
[detail]        case Scale::RelativeTime:
[detail] -        return Number::secondsToDuration(val*unitFactor, numberPrecision);
[detail] +        break;
[detail]        case Scale::AbsoluteTime:
[detail]          DateTime t(scl.timeReference());
[detail]          t.addSeconds(val);
[detail]          return t.toString(scl.timeFormat(), numberPrecision);
[detail]        }
[detail] +      if(_numberType=='f') {
[detail] +        return Number::toUserString(val*factor, _numberType, numberPrecision);
[detail] +      } else {
[detail] +        return Number::toUserString(val*factor, _numberType, -10);
[detail]      }
[detail] +   } else {
[detail]      return QString();
[detail]    }
[detail] +  }
[detail]  
[detail]    void Axis::paintHorizontal(QPainter& p, double dotpercm, int w, int h, bool mask)
[detail]    {
[detail] @@ -899,19 +846,24 @@
[detail]  
[detail]      int x=0;
[detail]      QString str;
[detail] -    QRect r;
[detail] +    QTextDocument td;
[detail] +    td.setDocumentMargin(0.0);
[detail] +    td.setDefaultFont(p.font());
[detail]      
[detail]      for(int i=scl.majorTickValues().count()-1; i>=0; i--) {
[detail] -      QString str=label(i, numberPrecision, _unitFactor);
[detail]        x=scl.a2s(scl.majorTickValues().at(i));
[detail]        p.drawLine(x, posMainLine, x, posMajorTicks);
[detail]        if(_showLabels) {
[detail] -        r=p.boundingRect(0, 0, INT_MAX, INT_MAX, Qt::AlignLeft | Qt::AlignTop, str);
[detail] +        str=label(i, numberPrecision);
[detail] +        td.setHtml(str);
[detail] +        p.save();
[detail]          if(_orientation==North) {
[detail] -          p.drawText(x-r.width()/2, posLabels+(r.height()*2)/3, str);
[detail] +          p.translate(x-td.idealWidth()/2, posLabels);
[detail]          } else {
[detail] -          p.drawText(x-r.width()/2, posLabels, str);
[detail] +          p.translate(x-td.idealWidth()/2, posLabels-td.size().height());
[detail]          }
[detail] +        td.drawContents(&p);
[detail] +        p.restore();
[detail]        }
[detail]      }
[detail]  
[detail] @@ -922,29 +874,52 @@
[detail]      }
[detail]  
[detail]      
[detail] -    str=currentTitle();
[detail] -    if(str.length()>0) {
[detail] -      r=p.boundingRect(0, 0, w, INT_MAX, Qt::AlignHCenter | Qt::AlignTop | Qt::TextWordWrap, str);
[detail] +    if(!scl.majorTickValues().isEmpty()) {
[detail] +      if(scl.type()==Scale::AbsoluteTime) {
[detail] +        DateTime t(scl.timeReference());
[detail] +        t.addSeconds(floor(scl.majorTickValues().constFirst()));
[detail] +        str=t.toString("yyyy-MM-dd hh:mm:ss", 0);
[detail] +      } else if(_annotationFactor!=1.0) {
[detail] +        str="×"+Number::toUserString(_annotationFactor, _numberType, -10);
[detail] +      } else {
[detail] +        str=QString();
[detail] +      }
[detail] +      if(!str.isEmpty()) {
[detail] +        td.setHtml(str);
[detail] +        p.save();
[detail]        if(_orientation==North) {
[detail] -        p.drawText(0, h-r.height(), w, r.height(),
[detail] -                   Qt::AlignHCenter | Qt::AlignTop | Qt::TextWordWrap, str);
[detail] +          p.translate(w-td.idealWidth(), h-td.size().height());
[detail]        } else {
[detail] -        p.drawText(0, 0, w, r.height(), Qt::AlignHCenter | Qt::AlignTop | Qt::TextWordWrap, str);
[detail] +          p.translate(w-td.idealWidth(), 0);
[detail] +        }
[detail] +        td.drawContents(&p);
[detail] +        p.restore();
[detail] +        w-=td.idealWidth();
[detail]        }
[detail]      }
[detail]      
[detail] -    if(scl.type()==Scale::AbsoluteTime && scl.majorTickValues().count()>0) {
[detail] -      DateTime t(scl.timeReference());
[detail] -      t.addSeconds(floor(scl.majorTickValues().constFirst()));
[detail] -      str=t.toString("yyyy-MM-dd hh:mm:ss", 0);
[detail] -      r=p.boundingRect(0, 0, w, INT_MAX, Qt::AlignLeft | Qt::AlignTop | Qt::TextWordWrap, str);
[detail] +    
[detail] +    str=currentTitle();
[detail] +    if(str.length()>0) {
[detail] +      td.setHtml(str);
[detail] +      td.setTextWidth(w);
[detail] +      p.save();
[detail] +      if(str.startsWith("<center>")) {
[detail] +        if(_orientation==North) {
[detail] +          p.translate(0, h-td.size().height());
[detail] +        } else {
[detail] +          p.translate(0, 0);
[detail] +        }
[detail] +      } else {
[detail]        if(_orientation==North) {
[detail] -        p.drawText(0, h-r.height(), w, r.height(),
[detail] -                   Qt::AlignLeft | Qt::AlignTop | Qt::TextWordWrap, str);
[detail] +          p.translate((w-td.idealWidth())/2, h-td.size().height());
[detail]        } else {
[detail] -        p.drawText(0, 0, w, r.height(), Qt::AlignLeft | Qt::AlignTop | Qt::TextWordWrap, str);
[detail] +          p.translate((w-td.idealWidth())/2, 0);
[detail]        }
[detail]      }
[detail] +      td.drawContents(&p);
[detail] +      p.restore();
[detail] +    }
[detail]    }
[detail]  
[detail]    void Axis::paintVertical(QPainter& p, double dotpercm, int w, int h, bool mask)
[detail] @@ -960,40 +935,41 @@
[detail]  
[detail]      int numberPrecision=currentNumberPrecision();
[detail]  
[detail] -    int posMainLine, posMajorTicks, posLabel, posMinorTicks, posRotation, posXTitle, posYTitle;
[detail] +    int posMainLine, posMajorTicks, posLabel, posMinorTicks, posRotation;
[detail]      if(_orientation==East) {
[detail]        posMainLine=w;
[detail]        posMajorTicks=w-tickLength;
[detail]        posLabel=w - tickShift;
[detail]        posMinorTicks=w-tickLength/2;
[detail]        posRotation=-90;
[detail] -      posXTitle=-h;
[detail] -      posYTitle=0;
[detail]      } else {
[detail]        posMainLine=0;
[detail]        posMajorTicks=tickLength;
[detail]        posLabel=tickShift;
[detail]        posMinorTicks=tickLength/2;
[detail]        posRotation=90;
[detail] -      posXTitle=0;
[detail] -      posYTitle=-w;
[detail]      }
[detail]  
[detail]      int y=0;
[detail]      QString str;
[detail] -    QRect r;
[detail] +    QTextDocument td;
[detail] +    td.setDocumentMargin(0.0);
[detail] +    td.setDefaultFont(p.font());
[detail]      
[detail]      for(int i=scl.majorTickValues().count()-1; i>=0; i--) {
[detail] -      str=label(i, numberPrecision, _unitFactor);
[detail]        y=scl.a2s(scl.majorTickValues().at(i));
[detail]        p.drawLine(posMainLine, y, posMajorTicks, y);
[detail]        if(_showLabels) {
[detail] -        r=p.boundingRect(0, 0, INT_MAX, INT_MAX, Qt::AlignLeft | Qt::AlignTop, str);
[detail] +        str=label(i, numberPrecision);
[detail] +        td.setHtml(str);
[detail] +        p.save();
[detail]          if(_orientation==East) {
[detail] -          p.drawText(posLabel-r.width(), y+r.height()/3, str);
[detail] +          p.translate(posLabel-td.idealWidth(), y-td.size().height()/2);
[detail]          } else {
[detail] -          p.drawText(posLabel, y+r.height()/3, str);
[detail] +          p.translate(posLabel, y-td.size().height()/2);
[detail]          }
[detail] +        td.drawContents(&p);
[detail] +        p.restore();
[detail]        }
[detail]      }
[detail]  
[detail] @@ -1004,25 +980,64 @@
[detail]      }
[detail]  
[detail]      
[detail] +    if(!scl.majorTickValues().isEmpty()) {
[detail] +      if(_annotationFactor!=1.0) {
[detail] +        str="×"+Number::toUserString(_annotationFactor, _numberType, -10);
[detail] +      } else {
[detail] +        str=QString();
[detail] +      }
[detail] +      if(!str.isEmpty()) {
[detail] +        td.setHtml(str);
[detail] +        p.save();
[detail] +        if(_orientation==East) {
[detail] +          p.translate(0, h-td.size().height());
[detail] +        } else {
[detail] +          p.translate(w-td.idealWidth(), h-td.size().height());
[detail] +        }
[detail] +        td.drawContents(&p);
[detail] +        p.restore();
[detail] +        h-=td.size().height();
[detail] +      }
[detail] +    }
[detail] +
[detail] +    
[detail]      str=currentTitle();
[detail] -    if(str.length() > 0) {
[detail] -      r=p.boundingRect(0, 0, h, INT_MAX, Qt::AlignHCenter | Qt::AlignTop | Qt::TextWordWrap, str);
[detail] +    if(!str.isEmpty()) {
[detail] +      td.setHtml(str);
[detail] +      td.setTextWidth(h);
[detail]        p.save();
[detail] +      if(str.startsWith("<center>")) {
[detail] +        if(_orientation==East) {
[detail] +          p.translate(0, h);
[detail] +        } else {
[detail] +          p.translate(w, 0);
[detail] +        }
[detail] +      } else {
[detail] +        if(_orientation==East) {
[detail] +          p.translate(0, h-(h-td.idealWidth())/2);
[detail] +        } else {
[detail] +          p.translate(w, (h-td.idealWidth())/2);
[detail] +        }
[detail] +      }
[detail]        p.rotate(posRotation);
[detail] -      p.drawText(posXTitle, posYTitle, h, r.height(),
[detail] -                  Qt::AlignHCenter | Qt::AlignTop | Qt::TextWordWrap, str);
[detail] +      td.drawContents(&p);
[detail]        p.restore();
[detail]      }
[detail]    }
[detail]  
[detail] -  QRectF Axis::textBoundingRect(QPainter * p, const QString& str, int length, int flags) const
[detail] +  QRectF Axis::textBoundingRect(QPainter * p, const QString& str, int length) const
[detail]    {
[detail]      TRACE;
[detail] +    QTextDocument td;
[detail] +    td.setDocumentMargin(0.0);
[detail]      if(p) {
[detail] -      return p->boundingRect(QRectF(0.0, 0.0, length, INT_MAX), flags, str);
[detail] +      td.setDefaultFont(p->font());
[detail]      } else {
[detail] -      return _font.boundingRect(str, length, flags);
[detail] +      td.setDefaultFont(_font);
[detail]      }
[detail] +    td.setTextWidth(length);
[detail] +    td.setHtml(str);
[detail] +    return QRectF(QPointF(), QSizeF(td.idealWidth(), td.size().height()));
[detail]    }
[detail]  
[detail]    
[detail] @@ -1031,6 +1046,7 @@
[detail]      TRACE;
[detail]      QString str;
[detail]      QRectF r;
[detail] +    const Scale& scl=constScale();
[detail]      if(p) {
[detail]        _font.setFont(*p, dotpercm);
[detail]      }
[detail] @@ -1048,23 +1064,39 @@
[detail]              }
[detail]            }
[detail]          } else {
[detail] -          if(constScale().isMajorTicksEmpty()) {
[detail] +          if(scl.isMajorTicksEmpty()) {
[detail]              maxThickness=0.0;
[detail]            } else {
[detail] -            r=textBoundingRect(p, label(0, numberPrecision, _unitFactor));
[detail] -            maxThickness=r.height();
[detail] -            r=textBoundingRect(p, label(constScale().majorTickValues().count()-1, numberPrecision, _unitFactor));
[detail] +            for(int i=scl.majorTickValues().count()-1; i>=0; i--) {
[detail] +              r=textBoundingRect(p, label(i, numberPrecision));
[detail]              if(r.height()>maxThickness) {
[detail]                maxThickness=r.height();
[detail]              }
[detail]            }
[detail]          }
[detail]        }
[detail] +      }
[detail]        maxThickness+=(_tickSize+_lineWeight)*dotpercm*0.1;
[detail]        
[detail] +      if(!scl.majorTickValues().isEmpty()) {
[detail] +        if(scl.type()==Scale::AbsoluteTime) {
[detail] +          DateTime t(scl.timeReference());
[detail] +          t.addSeconds(floor(scl.majorTickValues().constFirst()));
[detail] +          str=t.toString("yyyy-MM-dd hh:mm:ss", 0);
[detail] +        } else if(_annotationFactor!=1.0) {
[detail] +          str="×"+Number::toUserString(_annotationFactor, _numberType, -10);
[detail] +        } else {
[detail] +          str=QString();
[detail] +        }
[detail] +        if(!str.isEmpty()) {
[detail] +          r=textBoundingRect(p, str);
[detail] +          length-=r.width();
[detail] +        }
[detail] +      }
[detail] +      
[detail]        str=currentTitle();
[detail] -      if(!str.isEmpty() || constScale().type()==Scale::AbsoluteTime) {
[detail] -        r=textBoundingRect(p, str, length, Qt::AlignLeft | Qt::AlignTop | Qt::TextWordWrap);
[detail] +      if(!str.isEmpty() || scl.type()==Scale::AbsoluteTime) {
[detail] +        r=textBoundingRect(p, str, length);
[detail]          maxThickness+=r.height();
[detail]        }
[detail]        break;
[detail] @@ -1079,23 +1111,35 @@
[detail]              }
[detail]            }
[detail]          } else {
[detail] -          if(constScale().isMajorTicksEmpty()) {
[detail] +          if(scl.isMajorTicksEmpty()) {
[detail]              maxThickness=0.0;
[detail]            } else {
[detail] -            r=textBoundingRect(p, label(0, numberPrecision, _unitFactor));
[detail] -            maxThickness=r.width();
[detail] -            r=textBoundingRect(p, label(constScale().majorTickValues().count()-1, numberPrecision, _unitFactor));
[detail] +            for(int i=scl.majorTickValues().count()-1; i>=0; i--) {
[detail] +              r=textBoundingRect(p, label(i, numberPrecision));
[detail]              if(r.width()>maxThickness) {
[detail]                maxThickness=r.width();
[detail]              }
[detail]            }
[detail]          }
[detail]        }
[detail] +      }
[detail]        maxThickness+=(_tickSize+_lineWeight)*dotpercm*0.1;
[detail]        
[detail] +      if(!scl.majorTickValues().isEmpty()) {
[detail] +        if(_annotationFactor!=1.0) {
[detail] +          str="×"+Number::toUserString(_annotationFactor, _numberType, -10);
[detail] +        } else {
[detail] +          str=QString();
[detail] +        }
[detail] +        if(!str.isEmpty()) {
[detail] +          r=textBoundingRect(p, str);
[detail] +          length-=r.height();
[detail] +        }
[detail] +      }
[detail] +      
[detail]        str=currentTitle();
[detail]        if(!str.isEmpty()) {
[detail] -        r=textBoundingRect(p, str, length, Qt::AlignLeft | Qt::AlignTop | Qt::TextWordWrap);
[detail] +        r=textBoundingRect(p, str, length);
[detail]          maxThickness+=r.height();
[detail]        }
[detail]        break;
[detail] @@ -1190,6 +1234,7 @@
[detail]        w->setValue(AxisFormatProperties::NumberPrecision, currentNumberPrecision());
[detail]        w->setValue(AxisFormatProperties::Autoprecision, autoPrecision());
[detail]        w->setValue(AxisFormatProperties::UnitFactor, Number::toString(unitFactor(), 'g', 6));
[detail] +      w->setValue(AxisFormatProperties::AnnotationFactor, Number::toString(annotationFactor(), 'g', 6));
[detail]      }
[detail]    }
[detail]  
[detail] @@ -1376,6 +1421,15 @@
[detail]            if(autoPrecision()) {
[detail]              visibleRangeChange=true;
[detail]            }
[detail] +        }
[detail] +        break;
[detail] +      case AxisFormatProperties::AnnotationFactor:
[detail] +        dVal=Number::toDouble(val, ok);
[detail] +        if(ok && dVal>0.0) {
[detail] +          setAnnotationFactor(dVal);
[detail] +          if(autoPrecision()) {
[detail] +            visibleRangeChange=true;
[detail] +          }
[detail]          }
[detail]          break;
[detail]        default:
[detail]             src/AxisFormatProperties.cpp:  version-3.4.1	modified out of comments
[detail] --- src/AxisFormatProperties.cpp-version-3.4.1-stripped	2025-09-28 04:00:55.663457863 +0200
[detail] +++ src/AxisFormatProperties.cpp-HEAD-stripped	2025-09-28 04:00:55.667457882 +0200
[detail] @@ -22,6 +22,7 @@
[detail]    addProperty(NumberPrecision, precisionEdit, precisionLabel);
[detail]    addProperty(Autoprecision, automaticPrecision);
[detail]    addProperty(UnitFactor, unitFactorEdit, unitFactorLabel);
[detail] +  addProperty(AnnotationFactor, annotationFactorEdit, annotationFactorLabel);
[detail]  }
[detail]  
[detail]  PropertyValue::WidgetType AxisFormatProperties::determineCustomWidgetType(int pid, QWidget *, QWidget * )
[detail]              src/AxisScaleProperties.cpp:  version-3.4.1	not modified
[detail]                       src/AxisWindow.cpp:  version-3.4.1	modified out of comments
[detail] --- src/AxisWindow.cpp-version-3.4.1-stripped	2025-09-28 04:00:55.699458036 +0200
[detail] +++ src/AxisWindow.cpp-HEAD-stripped	2025-09-28 04:00:55.703458056 +0200
[detail] @@ -73,8 +73,8 @@
[detail]      connect(_yAxis, SIGNAL(sizeChanged()), this, SLOT(updateExternalGeometry()) );
[detail]      connect(_xAxis, SIGNAL(contentChanged()), this, SLOT(deepUpdate()) );
[detail]      connect(_yAxis, SIGNAL(contentChanged()), this, SLOT(deepUpdate()) );
[detail] -    connect(_content, SIGNAL(zoomIn(double, double, double, double)),
[detail] -            this, SLOT(zoomIn(double, double, double, double)));
[detail] +    connect(_content, SIGNAL(zoomIn(double, double, double, double, bool)),
[detail] +            this, SLOT(zoomIn(double, double, double, double, bool)));
[detail]      connect(_content, SIGNAL(zoomOut()), this, SLOT(zoomOut()));
[detail]      connect(_content, SIGNAL(browse(QRect&)), this, SLOT(browse(QRect&)));
[detail]      connect(_content, SIGNAL(mouseMoved(QPoint, Qt::MouseButtons, Qt::KeyboardModifiers)),
[detail] @@ -101,7 +101,9 @@
[detail]    void AxisWindow::polish()
[detail]    {
[detail]      TRACE;
[detail] -    if(_content) _content->polish();
[detail] +    if(_content) {
[detail] +      _content->polish();
[detail] +    }
[detail]      GraphicObject::polish();
[detail]      if( !sheet()) {
[detail]        updateInternalGeometry();
[detail] @@ -197,7 +199,7 @@
[detail]    }
[detail]  
[detail]    
[detail] -  void AxisWindow::zoomIn(double rx1, double ry1, double rx2, double ry2)
[detail] +  void AxisWindow::zoomIn(double rx1, double ry1, double rx2, double ry2, bool store)
[detail]    {
[detail]      TRACE;
[detail]      
[detail] @@ -222,8 +224,10 @@
[detail]        a=_content->action("Browse");
[detail]        if(a) a->setEnabled(true);
[detail]      }
[detail] +    if(store) {
[detail]      _zoomRects.push_back(Rect(_xAxis->visibleMinimum(), _yAxis->visibleMinimum(),
[detail]                                _xAxis->visibleMaximum(), _yAxis->visibleMaximum()));
[detail] +    }
[detail]      if(_xAxis->sizeType()==Axis::Scaled &&
[detail]         _yAxis->sizeType()==Axis::Scaled) {
[detail]        
[detail] @@ -347,13 +351,12 @@
[detail]      TRACE;
[detail]      _xSBar->blockSignals(true);
[detail]      _xSBar->setMaximum(_xAxis->lineCount()-1);
[detail] +    _xSBar->setValue(_xAxis->currentLine());
[detail]      _xSBar->blockSignals(false);
[detail]      _ySBar->blockSignals(true);
[detail]      _ySBar->setMaximum(_yAxis->lineCount()-1);
[detail] -    _ySBar->blockSignals(false);
[detail] -
[detail] -    _xSBar->setValue(_xAxis->currentLine());
[detail]      _ySBar->setValue(_yAxis->currentLine());
[detail] +    _ySBar->blockSignals(false);
[detail]      deepUpdate();
[detail]    }
[detail]  
[detail] @@ -864,7 +867,7 @@
[detail]            1, 1.25, 1.5, 1.75, 2.0, 2.5, 4.0, 5.0, 6.0, 7.5, 8.0, 9.0, 10.0
[detail]      };
[detail]      
[detail] -    double baseScaleFactor=pow(10.0, floor(log10( startAt)));
[detail] +    double baseScaleFactor=Number::exp10(Number::floorLog10(startAt));
[detail]      int ibaseScale=0;
[detail]      while(baseScaleFactor*baseScales[ibaseScale]<startAt &&
[detail]            ibaseScale<N_BASESCALES) {
[detail]                            src/Brush.cpp:  version-3.4.1	modified out of comments
[detail] --- src/Brush.cpp-version-3.4.1-stripped	2025-09-28 04:00:55.723458153 +0200
[detail] +++ src/Brush.cpp-HEAD-stripped	2025-09-28 04:00:55.727458173 +0200
[detail] @@ -90,8 +90,8 @@
[detail]  QBrush Brush::qbrush(double dotpercm) const
[detail]  {
[detail]    TRACE;
[detail] -  if(dotpercm==SciFigsGlobal::screenResolution()) return *this;
[detail] -  if(dotpercm<40) return *this;
[detail] +  if(dotpercm==SciFigsGlobal::screenResolution() ||
[detail] +     dotpercm<40) return *this;
[detail]    switch (style()) {
[detail]    case Qt::HorPattern:
[detail]    case Qt::VerPattern:
[detail]                       src/CircleMask.cpp:  version-3.4.1	not modified
[detail]                     src/CircleViewer.cpp:  version-3.4.1	not modified
[detail]                    src/ColorMapLayer.cpp:  version-3.4.1	not modified
[detail]               src/ColorMapProperties.cpp:  version-3.4.1	not modified
[detail]                    src/ColorMapTable.cpp:  version-3.4.1	not modified
[detail]                   src/ColorMapWidget.cpp:  version-3.4.1	modified out of comments
[detail] --- src/ColorMapWidget.cpp-version-3.4.1-stripped	2025-09-28 04:00:55.815458597 +0200
[detail] +++ src/ColorMapWidget.cpp-HEAD-stripped	2025-09-28 04:00:55.819458616 +0200
[detail] @@ -128,22 +128,22 @@
[detail]    return _colorMapLayer->colorMap();
[detail]  }
[detail]  
[detail] -void ColorMapWidget::generate(int imin, int imax, const QString& model,
[detail] +void ColorMapWidget::generate(int imin, int imax, int step, const QString& model,
[detail]                                ColorPalette::Options options, quint16 transparency)
[detail]  {
[detail]    ColorMap map;
[detail] -  map.generate(imin, imax, model, options, transparency);
[detail] +  map.generate(imin, imax, step, model, options, transparency);
[detail]    _colorMapLayer->setColorMap(map);
[detail]    emit changed(map);
[detail]  }
[detail]  
[detail] -void ColorMapWidget::generate(int imin, int imax, const QString& model,
[detail] +void ColorMapWidget::generate(int imin, int imax, int step, const QString& model,
[detail]                                const QString& options, quint16 transparency)
[detail]  {
[detail]    bool ok=true;
[detail]    ColorPalette::Option opt=ColorPalette::convertOption(options, ok);
[detail]    if(ok) {
[detail] -    generate(imin, imax, model, opt, transparency);
[detail] +    generate(imin, imax, step, model, opt, transparency);
[detail]    }
[detail]  }
[detail]  
[detail]               src/ColorPaletteEditor.cpp:  version-3.4.1	modified out of comments
[detail] --- src/ColorPaletteEditor.cpp-version-3.4.1-stripped	2025-09-28 04:00:55.835458693 +0200
[detail] +++ src/ColorPaletteEditor.cpp-HEAD-stripped	2025-09-28 04:00:55.839458713 +0200
[detail] @@ -96,7 +96,7 @@
[detail]        if(reversed->isChecked()) {
[detail]          options|=ColorPalette::Reversed;
[detail]        }
[detail] -      _palette->generate(d->fromIndex(), d->toIndex(), currentModel(), options);
[detail] +      _palette->generate(d->fromIndex(), d->toIndex(), d->step(), currentModel(), options);
[detail]      }
[detail]      emit endPaletteChange();
[detail]      
[detail]           src/ComplexStatisticalLine.cpp:  version-3.4.1	not modified
[detail]                         src/CoordTip.cpp:  version-3.4.1	modified out of comments
[detail] --- src/CoordTip.cpp-version-3.4.1-stripped	2025-09-28 04:00:55.875458888 +0200
[detail] +++ src/CoordTip.cpp-HEAD-stripped	2025-09-28 04:00:55.879458906 +0200
[detail] @@ -2,7 +2,6 @@
[detail]  
[detail]  #include "CoordTip.h"
[detail]  #include "GraphContents.h"
[detail] -#include "AxisWindow.h"
[detail]  
[detail]  namespace SciFigs {
[detail]  
[detail]                    src/ExportOptions.cpp:  version-3.4.1	not modified
[detail]               src/ExternalPlotLine2D.cpp:  version-3.4.1	not modified
[detail]                             src/Font.cpp:  version-3.4.1	not modified
[detail]                       src/FontScales.cpp:  version-3.4.1	not modified
[detail]                    src/GraphContents.cpp:  version-3.4.1	modified out of comments
[detail] --- src/GraphContents.cpp-version-3.4.1-stripped	2025-09-28 04:00:55.959459294 +0200
[detail] +++ src/GraphContents.cpp-HEAD-stripped	2025-09-28 04:00:55.963459312 +0200
[detail] @@ -12,7 +12,6 @@
[detail]  #include "MouseTracking.h"
[detail]  #include "GraphContentsLayerFactory.h"
[detail]  #include "LayerMouseTracking.h"
[detail] -#include "LayerLocker.h"
[detail]  
[detail]  namespace SciFigs {
[detail]  
[detail] @@ -106,35 +105,52 @@
[detail]    {
[detail]      TRACE;
[detail]      setMouseTracking(true);
[detail] +    QList<GraphContentsLayer *>::iterator it;
[detail] +    for(it=_layers.begin();it!=_layers.end();++it) {
[detail] +      (*it)->addActions();
[detail] +    }
[detail]    }
[detail]  
[detail]    
[detail] -  void GraphContents::appendLayer(GraphContentsLayer * newlayer)
[detail] +  void GraphContents::appendLayer(GraphContentsLayer * layer)
[detail]    {
[detail]      TRACE;
[detail] -    newlayer->setParent(this);
[detail] +    layer->setParent(this);
[detail]      QList<GraphContentsLayer *>::iterator it;
[detail]      for(it=_layers.begin();it!=_layers.end();++it) {
[detail] -      ASSERT(*it!=newlayer);
[detail] +      ASSERT(*it!=layer);
[detail]      }
[detail]      QString layerName("layer%1");
[detail] -    newlayer->setObjectName(layerName.arg(_layers.count()));
[detail] -    _layers.append(newlayer); 
[detail] +    layer->setObjectName(layerName.arg(_layers.count()));
[detail] +    _layers.append(layer); 
[detail]      _paintDepth=0;
[detail]    }
[detail]  
[detail]    
[detail] -  void GraphContents::prependLayer(GraphContentsLayer * newlayer)
[detail] +  void GraphContents::prependLayer(GraphContentsLayer * layer)
[detail]    {
[detail]      TRACE;
[detail] -    newlayer->setParent(this);
[detail] +    layer->setParent(this);
[detail] +    QList<GraphContentsLayer *>::iterator it;
[detail] +    for(it=_layers.begin(); it!=_layers.end(); ++it) {
[detail] +      ASSERT(*it!=layer);
[detail] +    }
[detail] +    QString layerName("layer%1");
[detail] +    layer->setObjectName(layerName.arg(_layers.count()));
[detail] +    _layers.prepend(layer); 
[detail] +    _paintDepth=0;
[detail] +  }
[detail] +
[detail] +  void GraphContents::insertLayer(GraphContentsLayer * layer, int atIndex)
[detail] +  {
[detail] +    layer->setParent(this);
[detail]      QList<GraphContentsLayer *>::iterator it;
[detail]      for(it=_layers.begin(); it!=_layers.end(); ++it) {
[detail] -      ASSERT(*it!=newlayer);
[detail] +      ASSERT(*it!=layer);
[detail]      }
[detail]      QString layerName("layer%1");
[detail] -    newlayer->setObjectName(layerName.arg(_layers.count()));
[detail] -    _layers.prepend(newlayer); 
[detail] +    layer->setObjectName(layerName.arg(_layers.count()));
[detail] +    _layers.insert(atIndex, layer); 
[detail]      _paintDepth=0;
[detail]    }
[detail]  
[detail] @@ -598,7 +614,7 @@
[detail]            } else {
[detail]              switch(l.id()) {
[detail]              case Zoom:
[detail] -              emit(zoomIn(rx1,ry1,rx2,ry2));
[detail] +              emit(zoomIn(rx1,ry1,rx2,ry2, true));
[detail]                break;
[detail]              default:
[detail]                break;
[detail] @@ -656,29 +672,17 @@
[detail]      }
[detail]      if(e->modifiers() & Qt::ControlModifier) {
[detail]  #if(QT_VERSION >= QT_VERSION_CHECK(5, 14, 0))
[detail] -      Point2D mousePosReal=_options.s2r(e->position().toPoint()); 
[detail] -                                                                  
[detail]        if(e->angleDelta().y()<0) {
[detail]          emit zoomOut();
[detail]        } else {
[detail] -        zoomIn(e->position().toPoint());
[detail] -      }
[detail] -      QPoint mp=_options.r2s(mousePosReal);
[detail] -      if(rect().contains(mp)) {
[detail] -        QCursor::setPos(screen(), mapToGlobal(mp));
[detail] +        zoomIn(e->position());
[detail]        }
[detail]  #else
[detail] -      Point2D mousePosReal=_options.s2r(e->pos()); 
[detail] -                                                   
[detail]        if(e->delta()<0) {
[detail]          emit zoomOut();
[detail]        } else {
[detail]          zoomIn(e->pos());
[detail]        }
[detail] -      QPoint mp=_options.r2s(mousePosReal);
[detail] -      if(rect().contains(mp)) {
[detail] -        QCursor::setPos(mapToGlobal(mp));
[detail] -      }
[detail]  #endif
[detail]        e->accept();
[detail]      } else if(graph()->xAxis()->isZoomed() && e->modifiers() & Qt::AltModifier) {  
[detail] @@ -709,7 +713,11 @@
[detail]      }
[detail]    }
[detail]  
[detail] +#if(QT_VERSION>=QT_VERSION_CHECK(6, 0, 0))
[detail]    void GraphContents::enterEvent(QEnterEvent *)
[detail] +#else
[detail] +  void GraphContents::enterEvent(QEvent *)
[detail] +#endif
[detail]    {
[detail]      TRACE;
[detail]      _coordTip->setEnabled(true);
[detail] @@ -914,30 +922,31 @@
[detail]    }
[detail]  
[detail]    
[detail] -  void GraphContents::zoomIn (const QPoint& c)
[detail] +  void GraphContents::zoomIn(const QPointF& c)
[detail]    {
[detail]      TRACE;
[detail] -    int w=width()/4;
[detail] -    int h=height()/4;
[detail] -    int x1=c.x()-w;
[detail] -    int y1=c.y()-h;
[detail] -    int x2=c.x()+w;
[detail] -    int y2=c.y()+h;
[detail] -    if(x1<0) {
[detail] -      x2-=x1;
[detail] -      x1=0;
[detail] -    } else if(x2>width()) {
[detail] -      x1-=x2-width();
[detail] -      x2=width();
[detail] -    }
[detail] -    if(y1<0) {
[detail] -      y2-=y1;
[detail] -      y1=0;
[detail] -    } else if(y2>height()) {
[detail] -      y1-=y2-height();
[detail] -      y2=height();
[detail] -    }
[detail] -    emit(zoomIn(_options.xs2r(x1), _options.ys2r(y1), _options.xs2r(x2), _options.ys2r(y2)));
[detail] +    
[detail] +    
[detail] +    
[detail] +    
[detail] +    
[detail] +    double xr=_options.xs2r(c.x());
[detail] +    double yr=_options.ys2r(c.y());
[detail] +    
[detail] +    double x1=0.75*c.x();
[detail] +    double x2=x1+0.25*width();
[detail] +    double y1=0.75*c.y();
[detail] +    double y2=y1+0.25*height();
[detail] +    emit(zoomIn(_options.xs2r(x1), _options.ys2r(y1), _options.xs2r(x2), _options.ys2r(y2), true));
[detail] +    return;
[detail] +    
[detail] +    double xds, yds;
[detail] +    do {
[detail] +      xds=_options.xr2sF(xr)-c.x();
[detail] +      yds=_options.yr2sF(yr)-c.y();
[detail] +      emit(zoomIn(_options.xs2r(xds), _options.ys2r(yds),
[detail] +                  _options.xs2r(width()+xds), _options.ys2r(height()+yds), false));
[detail] +    } while(fabs(xds)>1.0 || fabs(yds)>1.0);
[detail]    }
[detail]  
[detail]    
[detail] @@ -948,7 +957,7 @@
[detail]      double ry1=_options.ys2r(3*height()/4);
[detail]      double rx2=_options.xs2r(3*width()/4);
[detail]      double ry2=_options.ys2r(height()/4);
[detail] -    emit(zoomIn(rx1,ry1,rx2,ry2));
[detail] +    emit(zoomIn(rx1,ry1,rx2,ry2, true));
[detail]    }
[detail]  
[detail]    void GraphContents::zoom()
[detail] @@ -1086,6 +1095,21 @@
[detail]      }
[detail]    }
[detail]  
[detail] +  void GraphContents::insertLayers(QString fileName, const QString& beforeLayerName)
[detail] +  {
[detail] +    static QString title=tr("Insert layers");
[detail] +    if(fileName.length()>0) {
[detail] +      XMLErrorReport xmler(XMLErrorReport::Read);
[detail] +      xmler.setTitle(title);
[detail] +      xmler.setFileName(fileName);
[detail] +      XMLSciFigs s;
[detail] +      s.setLayerMode(XMLSciFigs::InsertLayer);
[detail] +      s.setBeforeLayer(beforeLayerName);
[detail] +      xmler.exec(s.restoreFile(fileName, this, XMLSciFigs::Layer));
[detail] +      deepUpdate();
[detail] +    }
[detail] +  }
[detail] +
[detail]    
[detail]    bool GraphContents::mergeLayers()
[detail]    {
[detail] @@ -1193,6 +1217,16 @@
[detail]            case XMLSciFigs::PrependLayer:
[detail]              prependLayer(layer);
[detail]              break;
[detail] +          case XMLSciFigs::InsertLayer: {
[detail] +              QList<GraphContentsLayer *> list=findLayers<GraphContentsLayer>(scifigsContext->beforeLayer());
[detail] +              if(list.size()==1) {
[detail] +                insertLayer(layer, indexOf(list.first()));
[detail] +              } else {
[detail] +                App::log(tr("inserting before layer '%1', not found or several matches in current layer stack\n")
[detail] +                             .arg(scifigsContext->beforeLayer()));
[detail] +              }
[detail] +            }
[detail] +            break;
[detail]            }
[detail]            layer->setObjectName(it.value().toStringBuffer()); 
[detail]            layer->removeReference(); 
[detail]    src/GraphContentsFormatProperties.cpp:  version-3.4.1	not modified
[detail]               src/GraphContentsLayer.cpp:  version-3.4.1	not modified
[detail]        src/GraphContentsLayerFactory.cpp:  version-3.4.1	not modified
[detail]     src/GraphContentsLayerProperties.cpp:  version-3.4.1	not modified
[detail]             src/GraphContentsOptions.cpp:  version-3.4.1	not modified
[detail]                    src/GraphicObject.cpp:  version-3.4.1	modified out of comments
[detail] --- src/GraphicObject.cpp-version-3.4.1-stripped	2025-09-28 04:00:56.059459776 +0200
[detail] +++ src/GraphicObject.cpp-HEAD-stripped	2025-09-28 04:00:56.063459796 +0200
[detail] @@ -1,9 +1,9 @@
[detail]  
[detail]  
[detail] -#ifndef NO_SVG
[detail] +#ifdef QT_SVG_LIB
[detail]  #include <QtSvg>
[detail]  #endif
[detail] -#if(QT_VERSION > QT_VERSION_CHECK(5, 0, 0))
[detail] +#ifdef QT_PRINTSUPPORT_LIB
[detail]  #include <QtPrintSupport>
[detail]  #endif
[detail]  
[detail] @@ -31,7 +31,7 @@
[detail]      "BMP (*.bmp);;JPEG (*.jpg *.jpeg);;"
[detail]      "PNG (*.png);;PPM (*.ppm);;XBM (*.xbm);;XPM (*.xpm)";
[detail]  
[detail] -  #ifndef NO_SVG
[detail] +  #ifdef QT_SVG_LIB
[detail]    const QString GraphicObject::vectorialImageFilter =
[detail]      "PDF (*.pdf);;SVG (*.svg)";
[detail]    #else
[detail] @@ -645,17 +645,23 @@
[detail]    void GraphicObject::print(int dpi)
[detail]    {
[detail]      TRACE;
[detail] +#ifdef QT_PRINTSUPPORT_LIB
[detail]      QPrinter printer(QPrinter::HighResolution);
[detail]      if(dpi==0) printer.setResolution(_printResolution);
[detail]      else printer.setResolution(dpi);
[detail]      if(Settings::printSetup(&printer) ) {
[detail]        print(printer);
[detail]      }
[detail] +#else
[detail] +    Q_UNUSED(dpi);
[detail] +    SciFigsGlobal::noPrintSupport();
[detail] +#endif
[detail]    }
[detail]  
[detail]    void GraphicObject::print(QPrinter& printer)
[detail]    {
[detail]      TRACE;
[detail] +#ifdef QT_PRINTSUPPORT_LIB
[detail]      QPainter p;
[detail]      if(p.begin(&printer)) {
[detail]        print(p, ((double)printer.resolution())/2.54, 0, 0, false);
[detail] @@ -664,12 +670,17 @@
[detail]        Message::warning(MSG_ID, tr("Printing..."), tr("Error encountered while printing. If you are printing to a pdf file, "
[detail]                                                       "check file permissions."));
[detail]      }
[detail] +#else
[detail] +    Q_UNUSED(printer);
[detail] +    SciFigsGlobal::noPrintSupport();
[detail] +#endif
[detail]    }
[detail]  
[detail]    
[detail]    void GraphicObject::print(bool outputToFile, QString name, int dpi)
[detail]    {
[detail]      TRACE;
[detail] +#ifdef QT_PRINTSUPPORT_LIB
[detail]      QPrinter printer(QPrinter::HighResolution);
[detail]      if(dpi==0) printer.setResolution(printResolution());
[detail]      else printer.setResolution(dpi);
[detail] @@ -679,6 +690,12 @@
[detail]      p.begin(&printer);
[detail]      print(p,((double)printer.resolution())/2.54, 0, 0, false);
[detail]      p.end();
[detail] +#else
[detail] +    Q_UNUSED(outputToFile);
[detail] +    Q_UNUSED(name);
[detail] +    Q_UNUSED(dpi);
[detail] +    SciFigsGlobal::noPrintSupport();
[detail] +#endif
[detail]    }
[detail]  
[detail]    
[detail] @@ -717,6 +734,7 @@
[detail]          imageFormat=Settings::getFilter(Message::filterKey(allImageFilter)).section(' ', 0, 0);
[detail]        }
[detail]        if(imageFormat=="PDF") {
[detail] +#ifdef QT_PRINTSUPPORT_LIB
[detail]          QPrinter printer(QPrinter::HighResolution);
[detail]          if(dpi==0) dpi=_printResolution;
[detail]          printer.setResolution(dpi);
[detail] @@ -724,6 +742,9 @@
[detail]          printer.setOutputFileName(fileName);
[detail]          printer.setOutputFormat(QPrinter::PdfFormat);
[detail]          print(printer);
[detail] +#else
[detail] +        SciFigsGlobal::noPrintSupport();
[detail] +#endif
[detail]        } else if(imageFormat=="SVG") {
[detail]          printSvg(fileName, dpi);
[detail]        } else {
[detail] @@ -816,11 +837,7 @@
[detail]    void GraphicObject::printSvg(const QString& fileName, int dpi)
[detail]    {
[detail]      TRACE;
[detail] -  #ifdef NO_SVG
[detail] -    Q_UNUSED(fileName)
[detail] -    Q_UNUSED(dpi)
[detail] -    App::log(1, tr("SciFigs not compiled with SVG support.\n");
[detail] -  #else
[detail] +#ifdef QT_SVG_LIB
[detail]      QSvgGenerator gen;
[detail]      gen.setFileName(fileName);
[detail]      if(dpi==0) dpi=_printResolution;
[detail] @@ -848,6 +865,10 @@
[detail]      p.end();
[detail]      restoreScaleFonts(originalFonts);
[detail]      setPrintSize(SciFigsGlobal::screenResolution());
[detail] +#else
[detail] +    Q_UNUSED(fileName)
[detail] +    Q_UNUSED(dpi)
[detail] +    SciFigsGlobal::noSvgSupport();
[detail]    #endif
[detail]    }
[detail]  
[detail]             src/GraphicObjectFactory.cpp:  version-3.4.1	not modified
[detail]  src/GraphicObjectGeometryProperties.cpp:  version-3.4.1	not modified
[detail]               src/GraphicObjectGroup.cpp:  version-3.4.1	modified out of comments
[detail] --- src/GraphicObjectGroup.cpp-version-3.4.1-stripped	2025-09-28 04:00:56.111460027 +0200
[detail] +++ src/GraphicObjectGroup.cpp-HEAD-stripped	2025-09-28 04:00:56.115460047 +0200
[detail] @@ -272,5 +272,17 @@
[detail]      }
[detail]    }
[detail]  
[detail] +  GraphicObject * GraphicObjectGroup::object(int index)
[detail] +  {
[detail] +    TRACE;
[detail] +    GraphicObjectList objectList=objects();
[detail] +    if(index>=0 && index<objectList.count()) {
[detail] +      return objectList.at(index);
[detail] +    } else {
[detail] +      qWarning("Index out of bounds (%i)\n", index);
[detail] +      return nullptr;
[detail] +    }
[detail] +  }
[detail] +
[detail]  } 
[detail]  
[detail]        src/GraphicObjectIdProperties.cpp:  version-3.4.1	not modified
[detail]                src/GraphicObjectList.cpp:  version-3.4.1	not modified
[detail]     src/GraphicObjectPrintProperties.cpp:  version-3.4.1	not modified
[detail]                     src/GraphicSheet.cpp:  version-3.4.1	modified out of comments
[detail] --- src/GraphicSheet.cpp-version-3.4.1-stripped	2025-09-28 04:00:56.175460336 +0200
[detail] +++ src/GraphicSheet.cpp-HEAD-stripped	2025-09-28 04:00:56.179460356 +0200
[detail] @@ -1,9 +1,9 @@
[detail]  
[detail]  
[detail] -#ifndef NO_SVG
[detail] +#ifdef QT_SVG_LIB
[detail]  #include <QtSvg>
[detail]  #endif
[detail] -#if(QT_VERSION > QT_VERSION_CHECK(5, 0, 0))
[detail] +#ifdef QT_PRINTSUPPORT_LIB
[detail]  #include <QtPrintSupport>
[detail]  #endif
[detail]  
[detail] @@ -768,6 +768,7 @@
[detail]          imageFormat=Settings::getFilter(Message::filterKey(GraphicObject::allImageFilter)).section(' ', 0, 0);
[detail]        }
[detail]        if(imageFormat=="PDF") {
[detail] +#ifdef QT_PRINTSUPPORT_LIB
[detail]          QPrinter printer(QPrinter::HighResolution);
[detail]          if(dpi==0) {
[detail]            printer.setResolution(maximumResolution());
[detail] @@ -779,6 +780,9 @@
[detail]          printer.setPageLayout(pageLayout());
[detail]          QApplication::processEvents(QEventLoop::ExcludeUserInputEvents);
[detail]          print(printer);
[detail] +#else
[detail] +        SciFigsGlobal::noPrintSupport();
[detail] +#endif
[detail]        } else if(imageFormat=="SVG") {
[detail]          printSvg(fileName, dpi);
[detail]        } else { 
[detail] @@ -878,11 +882,7 @@
[detail]    void GraphicSheet::printSvg(const QString& fileName, int dpi)
[detail]    {
[detail]      TRACE;
[detail] -  #ifdef NO_SVG
[detail] -    Q_UNUSED(fileName)
[detail] -    Q_UNUSED(dpi)
[detail] -    App::log(1, tr("SciFigs not compiled with SVG support.\n");
[detail] -  #else
[detail] +#ifdef QT_SVG_LIB
[detail]      QApplication::processEvents(QEventLoop::ExcludeUserInputEvents);
[detail]      QProgressDialog * progress=nullptr;
[detail]      GraphicObjectList objectList=objects();
[detail] @@ -939,12 +939,17 @@
[detail]      if(progress) {
[detail]        delete progress;
[detail]      }
[detail] +#else
[detail] +    Q_UNUSED(fileName)
[detail] +    Q_UNUSED(dpi)
[detail] +    SciFigsGlobal::noSvgSupport();
[detail]    #endif
[detail]    }
[detail]  
[detail]    void GraphicSheet::print(int dpi)
[detail]    {
[detail]      TRACE;
[detail] +#ifdef QT_PRINTSUPPORT_LIB
[detail]      QPrinter printer(QPrinter::HighResolution);
[detail]      if(dpi==0) {
[detail]        printer.setResolution(maximumResolution());
[detail] @@ -956,11 +961,16 @@
[detail]        QApplication::processEvents(QEventLoop::ExcludeUserInputEvents);
[detail]        print(printer);
[detail]      }
[detail] +#else
[detail] +    Q_UNUSED(dpi)
[detail] +    SciFigsGlobal::noPrintSupport();
[detail] +#endif
[detail]    }
[detail]  
[detail]    void GraphicSheet::print(QPrinter& printer)
[detail]    {
[detail]      TRACE;
[detail] +#ifdef QT_PRINTSUPPORT_LIB
[detail]      updatePageLimits(printer);
[detail]      QPainter p;
[detail]      if(p.begin(&printer)) {
[detail] @@ -1011,12 +1021,17 @@
[detail]        Message::warning(MSG_ID, tr("Printing..."), tr("Error encountered while printing. If you are printing to a pdf file, "
[detail]                                                       "check file permissions."));
[detail]      }
[detail] +#else
[detail] +    Q_UNUSED(printer)
[detail] +    SciFigsGlobal::noPrintSupport();
[detail] +#endif
[detail]    }
[detail]  
[detail]    
[detail]    void GraphicSheet::updatePageLimits(QPrinter& p)
[detail]    {
[detail]      TRACE;
[detail] +#ifdef QT_PRINTSUPPORT_LIB
[detail]      
[detail]      PageLimit * limit;
[detail]      QList<PageLimit *> pageList=findChildren<PageLimit>(Qt::FindDirectChildrenOnly);
[detail] @@ -1037,6 +1052,10 @@
[detail]        limit->show();
[detail]        h+=hpage;
[detail]      }
[detail] +#else
[detail] +    Q_UNUSED(p)
[detail] +    SciFigsGlobal::noPrintSupport();
[detail] +#endif
[detail]    }
[detail]  
[detail]    
[detail] @@ -1157,7 +1176,11 @@
[detail]      fileNames=Message::getOpenFileNames(title, tr("Graph layers (*.layer)"));
[detail]      if(!fileNames.isEmpty()) {
[detail]        int n=objectList.count();
[detail] -      if(fileNames.count()!=n) {
[detail] +      if(fileNames.size()==1) {
[detail] +        for(int i=0; i<n; i++) {
[detail] +          objectList.at(i)->graphContents()->appendLayers(fileNames.first());
[detail] +        }
[detail] +      } else if(fileNames.count()!=n) {
[detail]          if(Message::warning(MSG_ID, title, tr("The number of selected graphs (%1) is not the same as the number "
[detail]                                    "of files (%2). Do you want to continue?").arg(n).arg(fileNames.count()),
[detail]                                    Message::yes(), Message::no())==Message::Answer1) return;
[detail] @@ -1170,6 +1193,37 @@
[detail]      }
[detail]    }
[detail]  
[detail] +  
[detail] +  void GraphicSheet::prependLayers()
[detail] +  {
[detail] +    TRACE;
[detail] +    QString title=tr("Prepend layers");
[detail] +    QList<AxisWindow *> objectList=selectedObjects<AxisWindow>();
[detail] +    if(objectList.isEmpty()) {
[detail] +      if(!selectAll(title)) return;
[detail] +      objectList=selectedObjects<AxisWindow>();
[detail] +    }
[detail] +    QStringList fileNames;
[detail] +    fileNames=Message::getOpenFileNames(title, tr("Graph layers (*.layer)"));
[detail] +    if(!fileNames.isEmpty()) {
[detail] +      int n=objectList.count();
[detail] +      if(fileNames.size()==1) {
[detail] +        for(int i=0; i<n; i++) {
[detail] +          objectList.at(i)->graphContents()->prependLayers(fileNames.first());
[detail] +        }
[detail] +      } else if(fileNames.count()!=n) {
[detail] +        if(Message::warning(MSG_ID, title, tr("The number of selected graphs (%1) is not the same as the number "
[detail] +                                               "of files (%2). Do you want to continue?").arg(n).arg(fileNames.count()),
[detail] +                             Message::yes(), Message::no())==Message::Answer1) return;
[detail] +        if(n>fileNames.count()) n=fileNames.count();
[detail] +      }
[detail] +      std::sort(fileNames.begin(), fileNames.end());
[detail] +      for(int i=0; i<n; i++) {
[detail] +        objectList.at(i)->graphContents()->prependLayers(fileNames.at(i));
[detail] +      }
[detail] +    }
[detail] +  }
[detail] +
[detail]    void GraphicSheet::mousePressEvent (QMouseEvent * e)
[detail]    {
[detail]      TRACE;
[detail] @@ -1348,7 +1402,7 @@
[detail]    bool GraphicSheet::selectAll(QString actionTitle)
[detail]    {
[detail]      TRACE;
[detail] -    if(Message::question(MSG_ID, actionTitle, tr("No graph is currently selected. The action you choose apply only "
[detail] +    if(Message::question(MSG_ID, actionTitle, tr("No graph is currently selected. The action you choose applies only "
[detail]                                "to the selected graphs. Do you want to select all of them?"),
[detail]                                Message::yes(), Message::no())==Message::Answer1) return false;
[detail]      selectAll();
[detail] @@ -1539,6 +1593,9 @@
[detail]      }
[detail]      a->setStatusTip(tr("Print sheet"));
[detail]      connect(a, SIGNAL(triggered()), this, SLOT(print()));
[detail] +#ifndef QT_PRINTSUPPORT_LIB
[detail] +    a->setEnabled(false);
[detail] +#endif
[detail]      if(m)
[detail]        m->addAction(a);
[detail]      if(tb)
[detail] @@ -1648,11 +1705,17 @@
[detail]        m->addAction(a);
[detail]  
[detail]      a=new QAction(tr("&Append layers"), this);
[detail] -    a->setToolTip(tr("Add layers to the selected plots from multiple .layer files"));
[detail] +    a->setToolTip(tr("Append layers to the selected plots from multiple .layer files"));
[detail]      connect(a, SIGNAL(triggered(bool)) , this, SLOT(appendLayers()));
[detail]      if(m)
[detail]        m->addAction(a);
[detail]  
[detail] +    a=new QAction(tr("&Prepend layers"), this);
[detail] +    a->setToolTip(tr("Prepend layers to the selected plots from multiple .layer files"));
[detail] +    connect(a, SIGNAL(triggered(bool)) , this, SLOT(prependLayers()));
[detail] +    if(m)
[detail] +      m->addAction(a);
[detail] +
[detail]      if(m) m->addSeparator();
[detail]  
[detail]      a=new QAction(tr("&Properties"), this);
[detail] @@ -2010,6 +2073,7 @@
[detail]    void GraphicSheet::print(bool outputToFile, QString name, int dpi)
[detail]    {
[detail]      TRACE;
[detail] +#ifdef QT_PRINTSUPPORT_LIB
[detail]      QPrinter printer(QPrinter::HighResolution);
[detail]      if(dpi==0) {
[detail]        printer.setResolution(maximumResolution());
[detail] @@ -2023,6 +2087,12 @@
[detail]        printer.setPrinterName(name);
[detail]      }
[detail]      print(printer);
[detail] +#else
[detail] +    Q_UNUSED(outputToFile)
[detail] +    Q_UNUSED(name)
[detail] +    Q_UNUSED(dpi)
[detail] +    SciFigsGlobal::noPrintSupport();
[detail] +#endif
[detail]    }
[detail]  
[detail]    GraphicObject * GraphicSheet::object(QString objectName)
[detail] @@ -2035,7 +2105,6 @@
[detail]    {
[detail]      TRACE;
[detail]      GraphicObjectList objectList=objects();
[detail] -    GraphicObjectList::iterator it;
[detail]      if(index>=0 && index<objectList.count()) {
[detail]        return objectList.at(index);
[detail]      } else {
[detail] @@ -2054,10 +2123,8 @@
[detail]    void GraphicSheet::addRecentFile(const QString& fileName)
[detail]    {
[detail]      TRACE;
[detail] -    if(!CoreApplication::instance()->isBatch()) {
[detail]        Settings::setHistory("RecentFiles", fileName, 20);
[detail]      }
[detail] -  }
[detail]  
[detail]    void GraphicSheet::showOpenRecentMenu()
[detail]    {
[detail]                 src/GraphicSheetMenu.cpp:  version-3.4.1	not modified
[detail]           src/GraphicSheetProperties.cpp:  version-3.4.1	not modified
[detail]                  src/GridMaxFollower.cpp:  version-3.4.1	not modified
[detail]                         src/GridPlot.cpp:  version-3.4.1	modified out of comments
[detail] --- src/GridPlot.cpp-version-3.4.1-stripped	2025-09-28 04:00:56.247460685 +0200
[detail] +++ src/GridPlot.cpp-HEAD-stripped	2025-09-28 04:00:56.247460685 +0200
[detail] @@ -29,6 +29,17 @@
[detail]    TRACE;
[detail]  }
[detail]  
[detail] +void GridPlot::addActions()
[detail] +{
[detail] +  TRACE;
[detail] +  if(graphContents()) {
[detail] +    QAction * a=graphContents()->addAction("ExportGridValues");
[detail] +    a->setText(tr("Export values"));
[detail] +    a->setStatusTip(tr("Export grid values of layer '%1' into a text file").arg(objectName()));
[detail] +    connect(a, SIGNAL(triggered( bool)) , this, SLOT(exportValues()));
[detail] +  }
[detail] +}
[detail] +
[detail]  uint GridPlot::_tabColorMap=PropertyTab::uniqueId();
[detail]  uint GridPlot::_tabGrid=PropertyTab::uniqueId();
[detail]  
[detail]                   src/GridProperties.cpp:  version-3.4.1	not modified
[detail]                       src/GridViewer.cpp:  version-3.4.1	modified out of comments
[detail] --- src/GridViewer.cpp-version-3.4.1-stripped	2025-09-28 04:00:56.283460859 +0200
[detail] +++ src/GridViewer.cpp-HEAD-stripped	2025-09-28 04:00:56.287460879 +0200
[detail] @@ -104,4 +104,21 @@
[detail]    return GridPlot::xml_member(tag, attributes, context);
[detail]  }
[detail]  
[detail] +  void GridViewer::exportValues(QString fileName)
[detail] +  {
[detail] +    TRACE;
[detail] +    if(fileName.isEmpty()) {
[detail] +      fileName=Message::getSaveFileName(tr("Export grid values"), tr("All files (*)"));
[detail] +    }
[detail] +    if( !fileName.isEmpty()) {
[detail] +      QFile f(fileName);
[detail] +      if(f.open(QIODevice::WriteOnly)) {
[detail] +        QTextStream s(&f);
[detail] +        s << _grid;
[detail] +      } else {
[detail] +        Message::warning(MSG_ID, tr("Export grid values"), tr("Cannot write to file '%1'").arg(fileName));
[detail] +      }
[detail] +    }
[detail] +  }
[detail] +
[detail]  } 
[detail]                   src/HistogramLayer.cpp:  version-3.4.1	modified out of comments
[detail] --- src/HistogramLayer.cpp-version-3.4.1-stripped	2025-09-28 04:00:56.307460975 +0200
[detail] +++ src/HistogramLayer.cpp-HEAD-stripped	2025-09-28 04:00:56.311460995 +0200
[detail] @@ -41,10 +41,6 @@
[detail]      const QBrush& brush=line.symbol().brush();
[detail]      
[detail]      if(brush.style()!=Qt::NoBrush) {
[detail] -      int penWidth=qCeil(pen.width()*0.5);
[detail] -      if(penWidth==0) {
[detail] -        penWidth=1;
[detail] -      }
[detail]        for(int j=startAt+1; j<endAt; j++) {
[detail]          QPoint& p1=path[j-1];
[detail]          QPoint& p2=path[j];
[detail]                      src/ImageWidget.cpp:  version-3.4.1	not modified
[detail]            src/ImageWidgetProperties.cpp:  version-3.4.1	not modified
[detail]              src/IrregularGrid2DDraw.cpp:  version-3.4.1	not modified
[detail]              src/IrregularGrid2DPlot.cpp:  version-3.4.1	modified out of comments
[detail] --- src/IrregularGrid2DPlot.cpp-version-3.4.1-stripped	2025-09-28 04:00:56.371461284 +0200
[detail] +++ src/IrregularGrid2DPlot.cpp-HEAD-stripped	2025-09-28 04:00:56.375461303 +0200
[detail] @@ -21,12 +21,6 @@
[detail]      GridPlot(parent)
[detail]  {
[detail]    TRACE;
[detail] -  addActions();
[detail] -}
[detail] -
[detail] -IrregularGrid2DPlot::~IrregularGrid2DPlot()
[detail] -{
[detail] -  TRACE;
[detail]  }
[detail]  
[detail]  
[detail] @@ -51,17 +45,6 @@
[detail]    setLinearColorMap(minimum, _grid.maximumValue());
[detail]  }
[detail]  
[detail] -void IrregularGrid2DPlot::addActions()
[detail] -{
[detail] -  TRACE;
[detail] -  if(graphContents()) {
[detail] -    QAction * a=graphContents()->addAction("ExportGridValues");
[detail] -    a->setText(tr("Export values"));
[detail] -    a->setToolTip(tr("Export grid values into a text file"));
[detail] -    connect(a, SIGNAL(triggered( bool) ) , this, SLOT(exportValues()));
[detail] -  }
[detail] -}
[detail] -
[detail]  void IrregularGrid2DPlot::paintData(const LayerPainterRequest& lp, QPainter& p, double) const
[detail]  {
[detail]    TRACE;
[detail] @@ -135,7 +118,7 @@
[detail]        QTextStream s(&f);
[detail]        s << _grid;
[detail]      } else {
[detail] -      Message::warning(MSG_ID, tr("Export grid values"), tr("Cannot write to file %1").arg(fileName));
[detail] +        Message::warning(MSG_ID, tr("Export grid values"), tr("Cannot write to file '%1'").arg(fileName));
[detail]      }
[detail]    }
[detail]  }
[detail]                      src/LayerLocker.cpp:  version-3.4.1	not modified
[detail]               src/LayerMouseTracking.cpp:  version-3.4.1	not modified
[detail]                     src/LayerPainter.cpp:  version-3.4.1	not modified
[detail]              src/LayerPainterRequest.cpp:  version-3.4.1	not modified
[detail]               src/LayerPainterThread.cpp:  version-3.4.1	not modified
[detail]                      src/LayerPicker.cpp:  version-3.4.1	not modified
[detail]                           src/Legend.cpp:  version-3.4.1	modified out of comments
[detail] --- src/Legend.cpp-version-3.4.1-stripped	2025-09-28 04:00:56.475461787 +0200
[detail] +++ src/Legend.cpp-HEAD-stripped	2025-09-28 04:00:56.479461806 +0200
[detail] @@ -9,6 +9,7 @@
[detail]  namespace SciFigs {
[detail]  
[detail]    const QString Legend::xmlLegendTag="Legend";
[detail] +  static const QString indexKey("index");
[detail]  
[detail]    Legend::~Legend()
[detail]    {
[detail] @@ -94,7 +95,7 @@
[detail]      }
[detail]    }
[detail]  
[detail] -  void Legend::generate(int imin, int imax, const QString& model,
[detail] +  void Legend::generate(int imin, int imax, int step, const QString& model,
[detail]                          ColorPalette::Options options, quint16 transparency)
[detail]    {
[detail]      TRACE;
[detail] @@ -102,7 +103,7 @@
[detail]        resize(imax+1); 
[detail]      }
[detail]      ColorPalette pal;
[detail] -    pal.generate(imin, imax, model, options, transparency);
[detail] +    pal.generate(imin, imax, step, model, options, transparency);
[detail]      setPalette(pal);
[detail]    }
[detail]  
[detail] @@ -353,7 +354,9 @@
[detail]    {
[detail]      TRACE;
[detail]      int n=count();
[detail] -    if(n > o.count()) n=o.count();
[detail] +    if(n>o.count()) {
[detail] +      n=o.count();
[detail] +    }
[detail]      for(int i=0; i<n; i++ ) {
[detail]        _items[ i ].setSymbol(o.symbol(i) );
[detail]      }
[detail] @@ -362,17 +365,29 @@
[detail]    void Legend::xml_writeChildren(XML_WRITECHILDREN_ARGS) const
[detail]    {
[detail]      TRACE;
[detail] -    for(int i=0;i < _items.count();i++ ) _items[ i ].xml_save(s, context);
[detail] +    for(int i=0; i<_items.count(); i++) {
[detail] +      _items[i].xml_save(s, context);
[detail] +    }
[detail]    }
[detail]  
[detail]    XMLMember Legend::xml_member(XML_MEMBER_ARGS)
[detail]    {
[detail]      TRACE;
[detail] -    Q_UNUSED(attributes)
[detail]      Q_UNUSED(context)
[detail]      if(tag=="LegendItem" ) {
[detail] +      XMLRestoreAttributeIterator it=attributes.find(indexKey);
[detail] +      if(it==attributes.end()) {
[detail]        resize(_items.count() + 1);
[detail]        return XMLMember(&_items[ _items.count() - 1 ] );
[detail] +      } else {
[detail] +        bool ok=true;
[detail] +        int i=it.value().toInt(ok);
[detail] +        if(ok && i>=0 && i<_items.count()) {
[detail] +          return XMLMember(&_items[i]);
[detail] +        } else {
[detail] +          App::log(tr("bad legend item index (%1)\n").arg(i));
[detail] +        }
[detail] +      }
[detail]      }
[detail]      return XMLMember(XMLMember::Unknown);
[detail]    }
[detail]           src/LegendFormatProperties.cpp:  version-3.4.1	not modified
[detail]                       src/LegendItem.cpp:  version-3.4.1	not modified
[detail]                 src/LegendItemWidget.cpp:  version-3.4.1	modified out of comments
[detail] --- src/LegendItemWidget.cpp-version-3.4.1-stripped	2025-09-28 04:00:56.531462058 +0200
[detail] +++ src/LegendItemWidget.cpp-HEAD-stripped	2025-09-28 04:00:56.535462076 +0200
[detail] @@ -51,7 +51,7 @@
[detail]    p.setPen(_pen.qpen(dotpercm));
[detail]    int yc=y+(h >> 1);
[detail]    p.drawLine(x, yc, x+lim, yc);
[detail] -  _symbol.paint(p, QPointF(x+(lim >> 1), yc));
[detail] +  _symbol.paint(p, QPointF(x+(lim >> 1), yc), dotpercm);
[detail]  }
[detail]  
[detail]  LegendItemWidget::LegendItemWidget(QWidget *parent) :
[detail]                 src/LegendProperties.cpp:  version-3.4.1	not modified
[detail]                      src/LegendTable.cpp:  version-3.4.1	modified out of comments
[detail] --- src/LegendTable.cpp-version-3.4.1-stripped	2025-09-28 04:00:56.567462231 +0200
[detail] +++ src/LegendTable.cpp-HEAD-stripped	2025-09-28 04:00:56.571462250 +0200
[detail] @@ -147,8 +147,8 @@
[detail]    QPainter p;
[detail]    p.begin(&pm);
[detail]    p.fillRect(0, 0, 16, 16, palette.window().color());
[detail] -  Symbol s(t, 3.5, palette.windowText().color());
[detail] -  s.paint(p, QPointF(7, 7));
[detail] +  Symbol s(t, 2.5, palette.windowText().color());
[detail] +  s.paint(p, QPointF(7, 7), SciFigsGlobal::screenResolution());
[detail]    p.end();
[detail]    return pm;
[detail]  }
[detail]              src/LegendTableDelegate.cpp:  version-3.4.1	modified out of comments
[detail] --- src/LegendTableDelegate.cpp-version-3.4.1-stripped	2025-09-28 04:00:56.583462309 +0200
[detail] +++ src/LegendTableDelegate.cpp-HEAD-stripped	2025-09-28 04:00:56.587462327 +0200
[detail] @@ -140,8 +140,8 @@
[detail]      case LegendTable::ColumnSymbolType: {
[detail]          drawBackground(painter, option, index);
[detail]          Symbol::Type t=(Symbol::Type) index.model()->data(index).toInt();
[detail] -        Symbol s(t, 3.5, painter->pen().color());
[detail] -        s.paint(*painter, QPointF(p.x()-1, p.y()-1));
[detail] +        Symbol s(t, 2.5, painter->pen().color());
[detail] +        s.paint(*painter, QPointF(p.x()-1, p.y()-1), SciFigsGlobal::screenResolution());
[detail]        }
[detail]        break;
[detail]      case LegendTable::ColumnSymbolBrushStyle: {
[detail]                  src/LegendTableItem.cpp:  version-3.4.1	not modified
[detail]                     src/LegendWidget.cpp:  version-3.4.1	modified out of comments
[detail] --- src/LegendWidget.cpp-version-3.4.1-stripped	2025-09-28 04:00:56.623462502 +0200
[detail] +++ src/LegendWidget.cpp-HEAD-stripped	2025-09-28 04:00:56.627462522 +0200
[detail] @@ -147,7 +146,7 @@
[detail]  void LegendWidget::adjustSize(double dotpercm, int& width, int& height)
[detail]  {
[detail]    TRACE;
[detail] -  QFontMetrics f(font());
[detail] +  QFontMetrics f(_font);
[detail]    int spacing=qRound(0.2* dotpercm);
[detail]    int lineSize=qRound(_lineSize*dotpercm);
[detail]    width=0;
[detail]                     src/LineDelegate.cpp:  version-3.4.1	not modified
[detail]                       src/LineEditor.cpp:  version-3.4.1	not modified
[detail]                      src/LineFactory.cpp:  version-3.4.1	not modified
[detail]                         src/LineItem.cpp:  version-3.4.1	not modified
[detail]                        src/LineLayer.cpp:  version-3.4.1	modified out of comments
[detail] --- src/LineLayer.cpp-version-3.4.1-stripped	2025-09-28 04:00:56.703462889 +0200
[detail] +++ src/LineLayer.cpp-HEAD-stripped	2025-09-28 04:00:56.707462908 +0200
[detail] @@ -210,7 +214,7 @@
[detail]                                              QPainter& p, Rect& r, int tickLength) const
[detail]  {
[detail]    TRACE;
[detail] -  QPoint pscreen1, pscreen2;
[detail] +  QPointF pscreen1, pscreen2;
[detail]    Point2D minPoint(x, minY);
[detail]    Point2D maxPoint(x, maxY);
[detail]    if(gc.r2s(maxPoint, minPoint, pscreen1, pscreen2) )
[detail] @@ -230,7 +234,7 @@
[detail]                                                QPainter& p, Rect& r, int tickLength) const
[detail]  {
[detail]    TRACE;
[detail] -  QPoint pscreen1, pscreen2;
[detail] +  QPointF pscreen1, pscreen2;
[detail]    Point2D minPoint(minX, y);
[detail]    Point2D maxPoint(maxX, y);
[detail]    if(gc.r2s(maxPoint, minPoint, pscreen1, pscreen2) )
[detail] @@ -254,17 +258,16 @@
[detail]    QPointF pscreen1, pscreen2;
[detail]    QPointF * polyline=new QPointF[endAt-startAt];
[detail]    Pen pen=line.pen();
[detail] -  int j;
[detail] -  if(pen.lineStyle()!=Pen::NoLine) {
[detail] +  double sizeFactor;
[detail]      if(line.isSelected()) { 
[detail]        pen.setColor(Qt::red);
[detail] -      double s=pen.width();
[detail] -      if(s==0.0) {
[detail] -        s=0.1;
[detail] -      }
[detail] -      pen.setWidth(s*2);
[detail] +    sizeFactor=2.0;
[detail] +  } else {
[detail] +    sizeFactor=1.0;
[detail]      }
[detail] -    p.setPen(pen.qpen(dotpercm));
[detail] +  int j;
[detail] +  if(pen.lineStyle()!=Pen::NoLine) {
[detail] +    p.setPen(pen.qpen(dotpercm, sizeFactor));
[detail]      int subCurveCount=0;
[detail]      for(j=startAt+1; j<endAt; j++) {
[detail]        if(!line.isValid(j)) {
[detail] @@ -310,20 +313,12 @@
[detail]      }
[detail]    }
[detail]    delete [] polyline;
[detail] -  Symbol sym=line.symbol();
[detail] -  pen=sym.pen();
[detail] -  if(line.isSelected()) { 
[detail] -    double symSize=sym.size();
[detail] -    symSize=symSize==0.0 ? 0.2 : symSize*2.0;
[detail] -    double penWidth=sym.pen().width();
[detail] -    penWidth=penWidth==0.0 ? 0.2 : penWidth*2.0;
[detail] -    sym=Symbol(sym.type(), symSize,
[detail] -                     Pen(Qt::red, penWidth, sym.pen().lineStyle()),
[detail] -                     Brush(Qt::red, sym.brush().style()) );
[detail] -  }
[detail]    if(_errorBar!=NoBar) {
[detail] -    int tickLength=qRound(0.1*sym.size()*dotpercm);
[detail] -    p.setPen(pen.qpen(dotpercm));
[detail] +    int tickLength=qRound(0.1*line.symbol().size()*dotpercm);
[detail] +    if(tickLength==0) {
[detail] +      tickLength=1;
[detail] +    }
[detail] +    p.setPen(pen.qpen(dotpercm, sizeFactor));
[detail]      for(j=startAt; j<endAt; j++) {
[detail]        if(!line.isValid(j)) {
[detail]          continue;
[detail] @@ -349,13 +344,13 @@
[detail]        }
[detail]      }
[detail]    }
[detail] -  if(sym.type()!=Symbol::NoSymbol) {
[detail] +  if(line.symbol().type()!=Symbol::NoSymbol) {
[detail]      for(j=startAt; j<endAt; j++) {
[detail]        if(!line.isValid(j)) {
[detail]          continue;
[detail]        }
[detail]        if(r.includes(line.point(j, _pointOptions))) {
[detail] -        sym.paint(p, gc.r2sF(line.point(j, _pointOptions)), dotpercm);
[detail] +        line.symbol().paint(p, gc.r2sF(line.point(j, _pointOptions)), dotpercm, sizeFactor);
[detail]        }
[detail]      }
[detail]    }
[detail]              src/LineLayerProperties.cpp:  version-3.4.1	not modified
[detail]                    src/ListInterpole.cpp:  version-3.4.1	modified out of comments
[detail] --- src/ListInterpole.cpp-version-3.4.1-stripped	2025-09-28 04:00:56.739463062 +0200
[detail] +++ src/ListInterpole.cpp-HEAD-stripped	2025-09-28 04:00:56.743463082 +0200
[detail] @@ -59,6 +59,12 @@
[detail]    return toList->currentIndex();
[detail]  }
[detail]  
[detail] +int ListInterpole::step() const
[detail] +{
[detail] +  TRACE;
[detail] +  return stepList->value();
[detail] +}
[detail] +
[detail]  void ListInterpole::on_firstEntry_clicked()
[detail]  {
[detail]    TRACE;
[detail]                   src/LiveCurveLayer.cpp:  version-3.4.1	not modified
[detail]                    src/LiveGridLayer.cpp:  version-3.4.1	modified out of comments
[detail] --- src/LiveGridLayer.cpp-version-3.4.1-stripped	2025-09-28 04:00:56.775463237 +0200
[detail] +++ src/LiveGridLayer.cpp-HEAD-stripped	2025-09-28 04:00:56.779463255 +0200
[detail] @@ -69,7 +69,7 @@
[detail]    if(forceRatio()) {
[detail]      min=max/ratio();
[detail]    }
[detail] -  if(symetric() && scale()==SamplingParameters::Linear) {
[detail] +    if(symmetric() && scale()==SamplingParameters::Linear) {
[detail]      if(fabs(max)>fabs(min)) {
[detail]        min=-max;
[detail]      } else {
[detail] @@ -251,17 +251,18 @@
[detail]    if(!_function || !_function->function() || !_functionValid) {
[detail]      return;
[detail]    }
[detail] +    XMLSciFigs * scifigsContext=static_cast<XMLSciFigs *>(context);
[detail] +    if(scifigsContext->data()) {
[detail]    
[detail]    GridIterator it(graphContents()->size(), _sampling,
[detail]                    graph()->xAxis()->isEffectivelyReversed(),
[detail]                    graph()->yAxis()->isEffectivelyReversed());
[detail]    IrregularGrid2D * grid=calculateGrid(it, graphContents()->options(), nullptr);
[detail] -
[detail] -  XMLSciFigs * scifigsContext=static_cast<XMLSciFigs *>(context);
[detail] -  if(scifigsContext->data()) {
[detail] +      if(grid) {
[detail]      grid->xml_save(s, context);
[detail] -  }
[detail]    delete grid;
[detail] +      }
[detail] +    }
[detail]    GridPlot::xml_writeChildren(s, context);
[detail]  }
[detail]  
[detail] @@ -269,8 +270,6 @@
[detail]  {
[detail]    TRACE;
[detail]    if(_function && _function->function() && _functionValid) {
[detail] -    PrivateVector<double> vec(3, 0.0);
[detail] -    PrivateVector<double> grad(3, 0.0);
[detail]      double val;
[detail]      lock(); 
[detail]      val=_function->value(p.x(), p.y());
[detail] @@ -288,4 +287,29 @@
[detail]    return str.arg(value(pReal));
[detail]  }
[detail]  
[detail] +
[detail] +  void LiveGridLayer::exportValues(QString fileName)
[detail] +  {
[detail] +    TRACE;
[detail] +    if(fileName.isEmpty()) {
[detail] +      fileName=Message::getSaveFileName(tr("Export grid values"), tr("All files (*)"));
[detail] +    }
[detail] +    if( !fileName.isEmpty()) {
[detail] +      QFile f(fileName);
[detail] +      if(f.open(QIODevice::WriteOnly)) {
[detail] +        QTextStream s(&f);
[detail] +        GridIterator it(graphContents()->size(), _sampling,
[detail] +                        graph()->xAxis()->isEffectivelyReversed(),
[detail] +                        graph()->yAxis()->isEffectivelyReversed());
[detail] +        IrregularGrid2D * grid=calculateGrid(it, graphContents()->options(), nullptr);
[detail] +        if(grid) {
[detail] +          s << *grid;
[detail] +          delete grid;
[detail] +        }
[detail] +      } else {
[detail] +        Message::warning(MSG_ID, tr("Export grid values"), tr("Cannot write to file '%1'").arg(fileName));
[detail] +      }
[detail] +    }
[detail] +  }
[detail] +
[detail]  } 
[detail]                     src/MakeUpFilter.cpp:  version-3.4.1	not modified
[detail]                        src/MeshLayer.cpp:  version-3.4.1	not modified
[detail]                    src/MouseTracking.cpp:  version-3.4.1	not modified
[detail]                         src/NameLine.cpp:  version-3.4.1	not modified
[detail]                 src/NameLineDelegate.cpp:  version-3.4.1	not modified
[detail]                     src/NameLineItem.cpp:  version-3.4.1	not modified
[detail]                    src/NameLineLayer.cpp:  version-3.4.1	not modified
[detail]          src/NameLineLayerProperties.cpp:  version-3.4.1	not modified
[detail]                         src/OrderTip.cpp:  version-3.4.1	not modified
[detail]                        src/PageLimit.cpp:  version-3.4.1	not modified
[detail]                         src/PageSize.cpp:  version-3.4.1	not modified
[detail]               src/PageSizeProperties.cpp:  version-3.4.1	not modified
[detail]                    src/PaintProgress.cpp:  version-3.4.1	not modified
[detail]                     src/ParallelBand.cpp:  version-3.4.1	not modified
[detail]                    src/ParallelBands.cpp:  version-3.4.1	not modified
[detail]                              src/Pen.cpp:  version-3.4.1	modified out of comments
[detail] --- src/Pen.cpp-version-3.4.1-stripped	2025-09-28 04:00:57.031464474 +0200
[detail] +++ src/Pen.cpp-HEAD-stripped	2025-09-28 04:00:57.039464513 +0200
[detail] @@ -63,12 +63,14 @@
[detail]      _width=content.toDouble(ok);
[detail]      if(_width==0.0) {
[detail]        static const Version vRef(3, 3, 3);
[detail] -      XMLSciFigs * scifigsContext=static_cast<XMLSciFigs *>(context);
[detail] +      XMLSciFigs * scifigsContext=dynamic_cast<XMLSciFigs *>(context);
[detail] +      if(scifigsContext) {
[detail]        Version v(scifigsContext->currentFileVersion());
[detail]        if(v<vRef) {
[detail]          _width=0.1;
[detail]        }
[detail]      }
[detail] +    }
[detail]      return ok;
[detail]    default:
[detail]      return false;
[detail] @@ -92,16 +94,17 @@
[detail]  ENUM_AS_STRING_DATA_3(BevelJoin, MiterJoin, RoundJoin);
[detail]  ENUM_AS_STRING_END
[detail]  
[detail] -QPen Pen::qpen(double dotpercm) const
[detail] +QPen Pen::qpen(double dotpercm, double sizeFactor) const
[detail]  {
[detail]    TRACE;
[detail]    
[detail] -  QPen p(QBrush(_color), 0.1*dotpercm*_width, Qt::CustomDashLine);
[detail] -
[detail] +  double w;
[detail]    if(_width==0.0) {
[detail] -    p.setStyle(Qt::NoPen);
[detail] -    return p;
[detail] +    w=sizeFactor;
[detail] +  } else {
[detail] +    w=0.1*dotpercm*sizeFactor*_width;
[detail]    }
[detail] +  QPen p(QBrush(_color), w, Qt::CustomDashLine);
[detail]  
[detail]    switch(_capStyle) {
[detail]    case SquareCap:
[detail]                         src/PlotLine.cpp:  version-3.4.1	not modified
[detail]                       src/PlotLine2D.cpp:  version-3.4.1	not modified
[detail]                  src/PointProperties.cpp:  version-3.4.1	not modified
[detail]                    src/PolarGridPlot.cpp:  version-3.4.1	not modified
[detail]              src/RealStatisticalLine.cpp:  version-3.4.1	not modified
[detail]                          src/SciFigs.cpp:  version-3.4.1	not modified
[detail]                    src/SciFigsGlobal.cpp:  version-3.4.1	modified out of comments
[detail] --- src/SciFigsGlobal.cpp-version-3.4.1-stripped	2025-09-28 04:00:57.155465073 +0200
[detail] +++ src/SciFigsGlobal.cpp-HEAD-stripped	2025-09-28 04:00:57.159465092 +0200
[detail] @@ -134,6 +134,16 @@
[detail]      return pmask;
[detail]    }
[detail]  
[detail] +  void SciFigsGlobal::noPrintSupport()
[detail] +  {
[detail] +    App::log(tr("SciFigs is not compiled with print support.\n"));
[detail] +  }
[detail] +
[detail] +  void SciFigsGlobal::noSvgSupport()
[detail] +  {
[detail] +    App::log(tr("SciFigs is not compiled with SVG support.\n"));
[detail] +  }
[detail] +
[detail]    SciFigsPluginSettings::SciFigsPluginSettings()
[detail]    {
[detail]      _reg=&CoreApplicationPrivate::instance()->globalSettings();
[detail]                    src/SciFigsPlugin.cpp:  version-3.4.1	modified out of comments
[detail] --- src/SciFigsPlugin.cpp-version-3.4.1-stripped	2025-09-28 04:00:57.179465189 +0200
[detail] +++ src/SciFigsPlugin.cpp-HEAD-stripped	2025-09-28 04:00:57.183465208 +0200
[detail] @@ -58,7 +58,7 @@
[detail]        }
[detail]        SciFigsPlugin * instance=loadPlugin(*it, debug);
[detail]        if(instance) {
[detail] -        if(instance->isValid()) {
[detail] +        if(instance->isValid() && instance->init()) {
[detail]            if(debug) {
[detail]              printf("  SciFigs plugin interface\n");
[detail]              printf("  SciFigs interface version=%s\n",instance->interfaceVersion());
[detail]               src/SciFigsPreferences.cpp:  version-3.4.1	not modified
[detail]                 src/SciFigsXMLEditor.cpp:  version-3.4.1	not modified
[detail]             src/SheetSelectionWidget.cpp:  version-3.4.1	not modified
[detail]                   src/SlopeEstimator.cpp:  version-3.4.1	not modified
[detail]                           src/Symbol.cpp:  version-3.4.1	modified out of comments
[detail] --- src/Symbol.cpp-version-3.4.1-stripped	2025-09-28 04:00:57.255465556 +0200
[detail] +++ src/Symbol.cpp-HEAD-stripped	2025-09-28 04:00:57.259465575 +0200
[detail] @@ -76,16 +76,88 @@
[detail]    }
[detail]  }
[detail]  
[detail] -void Symbol::paint(QPainter& p, const QPointF& center, double dotpercm) const
[detail] +  void Symbol::paint(QPainter& p, const QPointF& center, double dotpercm, double sizeFactor) const
[detail]  {
[detail]    TRACE;
[detail] -  double size=_size*dotpercm*0.1;
[detail] +    double size=_size*dotpercm*sizeFactor*0.1;
[detail] +    if(size<1) {
[detail] +      size=1;
[detail] +    }
[detail]    p.save();
[detail]    p.setRenderHints(QPainter::Antialiasing, true);
[detail]    p.setBrush(_brush.qbrush(dotpercm) );
[detail] -  p.setPen(_pen.qpen(dotpercm));
[detail] +    p.setPen(_pen.qpen(dotpercm, sizeFactor));
[detail]    paint(_type, p, center, size, 0.5*size);
[detail]    p.restore();
[detail]  }
[detail]  
[detail] +  void Symbol::paint(Type type, QPainter& p, QPointF center,
[detail] +                     double size, double halfSize)
[detail] +  {
[detail] +    TRACE;
[detail] +    switch(type) {
[detail] +    case Cross: {
[detail] +      QPointF h1(halfSize, halfSize);
[detail] +      QPointF h2(halfSize, -halfSize);
[detail] +      p.drawLine(center-h1, center+h1);
[detail] +      p.drawLine(center-h2, center+h2);
[detail] +    }
[detail] +    break;
[detail] +    case Square: {
[detail] +      p.drawRect(QRectF(center-QPointF(halfSize, halfSize),QSizeF(size,size)));
[detail] +    }
[detail] +    break;
[detail] +    case Circle: {
[detail] +      p.drawEllipse(center, halfSize, halfSize);
[detail] +    }
[detail] +    break;
[detail] +    case TriangleUp: {
[detail] +      QPolygonF points(4);
[detail] +      double halfSize=0.5*0.866025403784439*size;
[detail] +      center+=QPointF(-halfSize, 0.25*size);
[detail] +      points[0]=center;
[detail] +      points[1]=center+QPointF(0.866025403784439*size, 0);
[detail] +      points[2]=center+QPointF(halfSize, -0.75*size);
[detail] +      points[3]=points[0];
[detail] +      p.drawPolygon(points);
[detail] +    }
[detail] +    break;
[detail] +    case TriangleDown: {
[detail] +      QPolygonF points(4);
[detail] +      double halfSize=0.5*0.866025403784439*size;
[detail] +      center+=QPointF(-halfSize, -0.25*size);
[detail] +      points[0]=center;
[detail] +      points[1]=center+QPointF(0.866025403784439*size, 0);
[detail] +      points[2]=center+QPointF(halfSize, 0.75*size);
[detail] +      points[3]=points[0];
[detail] +      p.drawPolygon(points);
[detail] +    }
[detail] +    break;
[detail] +    case Losange: {
[detail] +      QPolygonF points(5);
[detail] +      double quarterSize=size*0.25;
[detail] +      points[0]=center-QPointF(0.0, halfSize);
[detail] +      points[1]=center+QPointF(quarterSize, 0.0);
[detail] +      points[2]=center+QPointF(0.0, halfSize);
[detail] +      points[3]=center-QPointF(quarterSize, 0.0);
[detail] +      points[4]=points[0];
[detail] +      p.drawPolygon (points);
[detail] +    }
[detail] +    break;
[detail] +    case Star: {
[detail] +      QPointF h1(halfSize, halfSize);
[detail] +      QPointF h2(halfSize, -halfSize);
[detail] +      QPointF h3(halfSize, 0.0);
[detail] +      QPointF h4(0.0, halfSize);
[detail] +      p.drawLine(center-h1, center+h1);
[detail] +      p.drawLine(center-h2, center+h2);
[detail] +      p.drawLine(center-h3, center+h3);
[detail] +      p.drawLine(center-h4, center+h4);
[detail] +    }
[detail] +    break;
[detail] +    default:
[detail] +      break;
[detail] +    }
[detail] +  }
[detail] +
[detail]  } 
[detail]                         src/TextEdit.cpp:  version-3.4.1	not modified
[detail]               src/TextEditProperties.cpp:  version-3.4.1	not modified
[detail]                            src/Ticks.cpp:  version-3.4.1	not modified
[detail]                       src/XMLSciFigs.cpp:  version-3.4.1	modified out of comments
[detail] --- src/XMLSciFigs.cpp-version-3.4.1-stripped	2025-09-28 04:00:57.323465884 +0200
[detail] +++ src/XMLSciFigs.cpp-HEAD-stripped	2025-09-28 04:00:57.327465904 +0200
[detail] @@ -10,7 +10,6 @@
[detail]  
[detail]  
[detail]  XMLSciFigs::XMLSciFigs()
[detail] - : XMLContext(false)
[detail]  {
[detail]    TRACE;
[detail]    _currentObject=nullptr;
[detail]               src/XUniqueYColorLines.cpp:  version-3.4.1	not modified
[detail]                     src/XYColorLines.cpp:  version-3.4.1	not modified
[detail]           src/XYColorLinesProperties.cpp:  version-3.4.1	not modified
[detail]                      src/XYColorPlot.cpp:  version-3.4.1	not modified
[detail]                           src/XYPlot.cpp:  version-3.4.1	not modified
[detail]                 src/XYPlotProperties.cpp:  version-3.4.1	not modified
[detail]                     src/XYValueLines.cpp:  version-3.4.1	not modified
[detail]                      src/XYValuePlot.cpp:  version-3.4.1	not modified
[detail]                       src/AbstractLine.h:  version-3.4.1	not modified
[detail]                   src/AbstractNameLine.h:  version-3.4.1	not modified
[detail]                    src/ActivityMonitor.h:  version-3.4.1	not modified
[detail]                src/AlignGridParameters.h:  version-3.4.1	not modified
[detail]                    src/AutoAdjustScale.h:  version-3.4.1	modified out of comments
[detail] --- src/AutoAdjustScale.h-version-3.4.1-stripped	2025-09-28 04:00:57.539466929 +0200
[detail] +++ src/AutoAdjustScale.h-HEAD-stripped	2025-09-28 04:00:57.543466947 +0200
[detail] @@ -36,8 +36,8 @@
[detail]      bool forceRatio() const {return _forceRatio;}
[detail]      void setForceRatio(bool f) {_forceRatio=f;}
[detail]  
[detail] -    bool symetric() const {return _symetric;}
[detail] -    void setSymetric(bool f) {_symetric=f;}
[detail] +    bool symmetric() const {return _symmetric;}
[detail] +    void setSymmetric(bool f) {_symmetric=f;}
[detail]  
[detail]      double ratio() const {return _ratio;}
[detail]      void setRatio(double r) {_ratio=r;}
[detail] @@ -52,7 +52,7 @@
[detail]      uint _forceMinimumValue:1;
[detail]      uint _forceMaximumValue:1;
[detail]      uint _forceRatio:1;
[detail] -    uint _symetric:1;
[detail] +    uint _symmetric:1;
[detail]      SamplingParameters::ScaleType _scale;
[detail]      double _minimumValue, _maximumValue, _ratio;
[detail]    };
[detail]          src/AutoAdjustScaleProperties.h:  version-3.4.1	modified out of comments
[detail] --- src/AutoAdjustScaleProperties.h-version-3.4.1-stripped	2025-09-28 04:00:57.559467026 +0200
[detail] +++ src/AutoAdjustScaleProperties.h-HEAD-stripped	2025-09-28 04:00:57.563467044 +0200
[detail] @@ -21,7 +21,7 @@
[detail]                       ForceMinValue, MinValue,
[detail]                       ForceMaxValue, MaxValue,
[detail]                       ForceRatio, Ratio,
[detail] -                     Symetric};
[detail] +                     Symmetric};
[detail]  
[detail]    private slots:
[detail]      void on_linearScale_toggled(bool c);
[detail]                               src/Axis.h:  version-3.4.1	modified out of comments
[detail] --- src/Axis.h-version-3.4.1-stripped	2025-09-28 04:00:57.583467141 +0200
[detail] +++ src/Axis.h-HEAD-stripped	2025-09-28 04:00:57.587467160 +0200
[detail] @@ -132,6 +132,9 @@
[detail]      void setUnitFactor(double s) {_unitFactor=s;}
[detail]      double unitFactor() const {return _unitFactor;}
[detail]  
[detail] +    void setAnnotationFactor(double s) {_annotationFactor=s;}
[detail] +    double annotationFactor() const {return _annotationFactor;}
[detail] +
[detail]      bool autoPrecision() const {return _autoPrecision;}
[detail]      void setAutoPrecision(bool p);
[detail]  
[detail] @@ -220,8 +223,8 @@
[detail]      void paintVertical(QPainter& p, double dotpercm, int w, int h, bool mask);
[detail]      
[detail]      inline void setPenFont(QPainter& p, bool mask, double dotpercm) const;
[detail] -    QString label(int index, int numberPrecision, double unitFactor) const;
[detail] -    QRectF textBoundingRect(QPainter * p, const QString& str, int length=INT_MAX, int flags=Qt::AlignLeft | Qt::AlignTop) const;
[detail] +    QString label(int index, int numberPrecision) const;
[detail] +    QRectF textBoundingRect(QPainter * p, const QString& str, int length=-1) const;
[detail]  
[detail]      
[detail]      GraphContents * _content;
[detail] @@ -232,6 +235,7 @@
[detail]      int _numberPrecision;
[detail]      int _numberPrecisionInverseScale;
[detail]      double _unitFactor;
[detail] +    double _annotationFactor;
[detail]      Font _font;
[detail]      
[detail]      QString _title;
[detail]               src/AxisFormatProperties.h:  version-3.4.1	modified out of comments
[detail] --- src/AxisFormatProperties.h-version-3.4.1-stripped	2025-09-28 04:00:57.603467238 +0200
[detail] +++ src/AxisFormatProperties.h-HEAD-stripped	2025-09-28 04:00:57.603467238 +0200
[detail] @@ -17,7 +17,7 @@
[detail]    AxisFormatProperties(QWidget * parent=nullptr);
[detail]  
[detail]    enum Properties {Title, Font, Orientation, LineWeight, TickSize,
[detail] -                   NumberType, NumberPrecision, Autoprecision, UnitFactor};
[detail] +                   NumberType, NumberPrecision, Autoprecision, UnitFactor, AnnotationFactor};
[detail]  
[detail]    static int numberType2item(char nt);
[detail]    static char item2numberType(int index);
[detail]                src/AxisScaleProperties.h:  version-3.4.1	not modified
[detail]                         src/AxisWindow.h:  version-3.4.1	modified out of comments
[detail] --- src/AxisWindow.h-version-3.4.1-stripped	2025-09-28 04:00:57.639467411 +0200
[detail] +++ src/AxisWindow.h-HEAD-stripped	2025-09-28 04:00:57.643467431 +0200
[detail] @@ -59,7 +59,7 @@
[detail]  public slots:
[detail]    void update();
[detail]    void deepUpdate();
[detail] -  void zoomIn(double rx1, double ry1, double rx2, double ry2);
[detail] +  void zoomIn(double rx1, double ry1, double rx2, double ry2, bool store);
[detail]    void zoomOut();
[detail]    void browse(QRect& r);
[detail]    void setMapScale(double rx1, double ry1, double rx2, double ry2);
[detail]                              src/Brush.h:  version-3.4.1	not modified
[detail]                         src/CircleMask.h:  version-3.4.1	not modified
[detail]                       src/CircleViewer.h:  version-3.4.1	not modified
[detail]                      src/ColorMapLayer.h:  version-3.4.1	not modified
[detail]                 src/ColorMapProperties.h:  version-3.4.1	not modified
[detail]                      src/ColorMapTable.h:  version-3.4.1	not modified
[detail]                     src/ColorMapWidget.h:  version-3.4.1	modified out of comments
[detail] --- src/ColorMapWidget.h-version-3.4.1-stripped	2025-09-28 04:00:57.747467933 +0200
[detail] +++ src/ColorMapWidget.h-HEAD-stripped	2025-09-28 04:00:57.751467953 +0200
[detail] @@ -39,9 +39,9 @@
[detail]  
[detail]      const ColorMap& colorMap() const;
[detail]  
[detail] -    void generate(int imin, int imax, const QString& model=ColorPalette::defaultSequential,
[detail] +    void generate(int imin, int imax, int step=1, const QString& model=ColorPalette::defaultSequential,
[detail]                    ColorPalette::Options options=ColorPalette::Continuous, quint16 transparency=COLOR_COMPONENT_MAX);
[detail] -    Q_INVOKABLE void generate(int imin, int imax, const QString& model,
[detail] +    Q_INVOKABLE void generate(int imin, int imax, int step, const QString& model,
[detail]                                const QString& options, quint16 transparency=COLOR_COMPONENT_MAX);
[detail]      Q_INVOKABLE void toGray();
[detail]  
[detail]                 src/ColorPaletteEditor.h:  version-3.4.1	not modified
[detail]             src/ComplexStatisticalLine.h:  version-3.4.1	not modified
[detail]                           src/CoordTip.h:  version-3.4.1	not modified
[detail]                      src/ExportOptions.h:  version-3.4.1	not modified
[detail]                 src/ExternalPlotLine2D.h:  version-3.4.1	not modified
[detail]                               src/Font.h:  version-3.4.1	not modified
[detail]                         src/FontScales.h:  version-3.4.1	not modified
[detail]                      src/GraphContents.h:  version-3.4.1	modified out of comments
[detail] --- src/GraphContents.h-version-3.4.1-stripped	2025-09-28 04:00:57.875468552 +0200
[detail] +++ src/GraphContents.h-HEAD-stripped	2025-09-28 04:00:57.879468571 +0200
[detail] @@ -50,10 +50,10 @@
[detail]  
[detail]      void appendLayer(GraphContentsLayer * layer);
[detail]      void prependLayer(GraphContentsLayer * layer);
[detail] +    void insertLayer(GraphContentsLayer * layer, int atIndex);
[detail]      void removeLayer(GraphContentsLayer * layer);
[detail]      void moveLayerUp(GraphContentsLayer * layer);
[detail]      void moveLayerDown(GraphContentsLayer * layer);
[detail] -    bool mergeLayers();
[detail]  
[detail]      AxisWindow * graph() const {return reinterpret_cast<AxisWindow *>(parent());}
[detail]  
[detail] @@ -94,7 +94,7 @@
[detail]    #endif
[detail]      QAction * action(QString actionName);
[detail]      QAction * addAction(QString actionName);
[detail] -    void zoomIn (const QPoint& c);
[detail] +    void zoomIn(const QPointF& c);
[detail]      Rect boundingRect() const;
[detail]      void swapAxes() {_options.swapAxes();}
[detail]  
[detail] @@ -117,8 +117,6 @@
[detail]      int layerCount() const {return _layers.count();}
[detail]      GraphContentsLayer * findLayer(QString tagName, QString layerName=QString(), int startIndex=0);
[detail]      template <class T> QList<T *> findLayers(QString layerName);
[detail] -    void selectLayers(QString layerName);
[detail] -    void selectAllLayers(bool s);
[detail]      bool hasSameLayers(const GraphContents& o) const;
[detail]  
[detail]      int indexOf(GraphContentsLayer * layer) {return _layers.indexOf(layer);}
[detail] @@ -127,13 +125,17 @@
[detail]  
[detail]      void wheelEvent(QWheelEvent * e);
[detail]    public slots:
[detail] +    void selectLayers(QString layerName);
[detail] +    void selectAllLayers(bool s);
[detail]      void zoom();
[detail]      void zoomIn();
[detail]      void browse();
[detail]      void saveLayers(QString fileName=QString(),
[detail]                      const QString& layerName=QString());
[detail]      void appendLayers(QString fileName=QString());
[detail] +    void insertLayers(QString fileName, const QString& beforeLayerName);
[detail]      void prependLayers(QString fileName=QString());
[detail] +    bool mergeLayers();
[detail]      void copyLayers();
[detail]      void pasteLayers();
[detail]      void copyTipLabel();
[detail] @@ -152,7 +154,11 @@
[detail]      void mouseReleaseEvent(QMouseEvent * e);
[detail]      void mouseMoveEvent(QMouseEvent * e);
[detail]      void leaveEvent(QEvent *);
[detail] +#if(QT_VERSION>=QT_VERSION_CHECK(6, 0, 0))
[detail]      void enterEvent(QEnterEvent *);
[detail] +#else
[detail] +    void enterEvent(QEvent *);
[detail] +#endif
[detail]      void paintEvent(QPaintEvent * e);
[detail]      void resizeEvent(QResizeEvent *);
[detail]  
[detail] @@ -207,7 +213,7 @@
[detail]      void setPixmap(QImage image, LayerImages layerImages);
[detail]      void paintProgress();
[detail]    signals:
[detail] -    void zoomIn(double, double, double, double);
[detail] +    void zoomIn(double rx1, double ry1, double rx2, double ry2, bool store);
[detail]      void zoomOut();
[detail]      void browse(QRect& r);
[detail]      void mouseTrackingBegin();
[detail]      src/GraphContentsFormatProperties.h:  version-3.4.1	not modified
[detail]                 src/GraphContentsLayer.h:  version-3.4.1	modified out of comments
[detail] --- src/GraphContentsLayer.h-version-3.4.1-stripped	2025-09-28 04:00:57.911468726 +0200
[detail] +++ src/GraphContentsLayer.h-HEAD-stripped	2025-09-28 04:00:57.915468745 +0200
[detail] @@ -87,6 +87,7 @@
[detail]    void setSelected(bool s) {_isSelected=s;}
[detail]    bool isSelected() const {return _isSelected;}
[detail]  
[detail] +  virtual void addActions() {}
[detail]    QAction * addTrackingAction(QString text, int id=0, QString statusTip=QString());
[detail]    void setTrackingAction(int id, bool checked);
[detail]    static QString trackingActionCtrlHelp();
[detail]          src/GraphContentsLayerFactory.h:  version-3.4.1	not modified
[detail]       src/GraphContentsLayerProperties.h:  version-3.4.1	not modified
[detail]               src/GraphContentsOptions.h:  version-3.4.1	not modified
[detail]                      src/GraphicObject.h:  version-3.4.1	not modified
[detail]               src/GraphicObjectFactory.h:  version-3.4.1	not modified
[detail]    src/GraphicObjectGeometryProperties.h:  version-3.4.1	not modified
[detail]                 src/GraphicObjectGroup.h:  version-3.4.1	modified out of comments
[detail] --- src/GraphicObjectGroup.h-version-3.4.1-stripped	2025-09-28 04:00:58.027469287 +0200
[detail] +++ src/GraphicObjectGroup.h-HEAD-stripped	2025-09-28 04:00:58.031469306 +0200
[detail] @@ -34,6 +34,8 @@
[detail]    public slots:
[detail]      void deepUpdate();
[detail]      void resize();
[detail] +    int numberOfObjects() const {return objects().size();}
[detail] +    GraphicObject * object(int index);
[detail]    protected:
[detail]      template <typename T> inline QList<T *> findChildren() const;
[detail]      void addActions();
[detail]          src/GraphicObjectIdProperties.h:  version-3.4.1	not modified
[detail]                  src/GraphicObjectList.h:  version-3.4.1	not modified
[detail]       src/GraphicObjectPrintProperties.h:  version-3.4.1	not modified
[detail]                       src/GraphicSheet.h:  version-3.4.1	modified out of comments
[detail] --- src/GraphicSheet.h-version-3.4.1-stripped	2025-09-28 04:00:58.091469595 +0200
[detail] +++ src/GraphicSheet.h-HEAD-stripped	2025-09-28 04:00:58.095469615 +0200
[detail] @@ -215,6 +215,7 @@
[detail]      void removeObjects(const QString& type, bool force);
[detail]      GraphicObject * object(QString objectName);
[detail]      GraphicObject * object(int index);
[detail] +    int numberOfObjects() const {return objects().size();}
[detail]  
[detail]      void moveObject(GraphicObject * obj=0);
[detail]      void moveObjects(Point2D delta);
[detail] @@ -237,6 +238,7 @@
[detail]      void saveLayers(QString fileName=QString(),
[detail]                      const QString& layerName=QString());
[detail]      void appendLayers();
[detail] +    void prependLayers();
[detail]      virtual void update();
[detail]      virtual void deepUpdate();
[detail]      void showOrderIndex(bool isOn);
[detail]                   src/GraphicSheetMenu.h:  version-3.4.1	not modified
[detail]             src/GraphicSheetProperties.h:  version-3.4.1	not modified
[detail]                    src/GridMaxFollower.h:  version-3.4.1	not modified
[detail]                           src/GridPlot.h:  version-3.4.1	modified out of comments
[detail] --- src/GridPlot.h-version-3.4.1-stripped	2025-09-28 04:00:58.159469924 +0200
[detail] +++ src/GridPlot.h-HEAD-stripped	2025-09-28 04:00:58.163469944 +0200
[detail] @@ -18,17 +18,18 @@
[detail]      Q_PROPERTY(bool smooth READ smooth WRITE setSmooth SCRIPTABLE true)
[detail]      Q_PROPERTY(bool showGrid READ showGrid WRITE setShowGrid SCRIPTABLE true)
[detail]    public:
[detail] -    GridPlot(AxisWindow * parent);
[detail] +    GridPlot(AxisWindow * parent=nullptr);
[detail]      ~GridPlot();
[detail]  
[detail] -    virtual const QString& xml_tagName() const {return xmlGridPlotTag;}
[detail] +    const QString& xml_tagName() const {return xmlGridPlotTag;}
[detail]      static const QString xmlGridPlotTag;
[detail]  
[detail] -    virtual bool hasProperties() {return true;}
[detail] -    virtual void addProperties(PropertyProxy * pp);
[detail] -    virtual void removeProperties(PropertyProxy * pp);
[detail] -    virtual void properties(PropertyWidget * w) const;
[detail] -    virtual void setProperty(uint wid, int pid, QVariant val);
[detail] +    void addActions();
[detail] +    bool hasProperties() {return true;}
[detail] +    void addProperties(PropertyProxy * pp);
[detail] +    void removeProperties(PropertyProxy * pp);
[detail] +    void properties(PropertyWidget * w) const;
[detail] +    void setProperty(uint wid, int pid, QVariant val);
[detail]  
[detail]      const ColorMap& colorMap() const {return _colorMap;}
[detail]      ColorMap& beginColorMapChange();
[detail] @@ -47,6 +48,7 @@
[detail]      double fillValue() const {return _fillValue;}
[detail]      void setFillValue(double v) {_fillValue=v;}
[detail]    public slots:
[detail] +    virtual void exportValues(QString fileName=QString())=0;
[detail]      void setColorMap(const ColorMap& map);
[detail]    signals:
[detail]      void colorMapChanged(const ColorMap& map);
[detail] @@ -66,9 +68,9 @@
[detail]      void drawGridLines(const Grid2D<ValueType>& grid,
[detail]                         const LayerPainterRequest& lp, QPainter& p) const;
[detail]  
[detail] -    virtual void xml_writeChildren(XML_WRITECHILDREN_ARGS) const;
[detail] -    virtual XMLMember xml_member(XML_MEMBER_ARGS);
[detail] -    virtual void xml_polishChild(XML_POLISHCHILD_ARGS);
[detail] +    void xml_writeChildren(XML_WRITECHILDREN_ARGS) const;
[detail] +    XMLMember xml_member(XML_MEMBER_ARGS);
[detail] +    void xml_polishChild(XML_POLISHCHILD_ARGS);
[detail]  
[detail]      Rect::Area _fillType;
[detail]      double _fillValue;
[detail]                     src/GridProperties.h:  version-3.4.1	not modified
[detail]                         src/GridViewer.h:  version-3.4.1	modified out of comments
[detail] --- src/GridViewer.h-version-3.4.1-stripped	2025-09-28 04:00:58.199470117 +0200
[detail] +++ src/GridViewer.h-HEAD-stripped	2025-09-28 04:00:58.203470137 +0200
[detail] @@ -16,21 +16,23 @@
[detail]    GridViewer(AxisWindow * parent=nullptr);
[detail]    ~GridViewer();
[detail]  
[detail] -  virtual const QString& xml_tagName() const {return xmlGridViewerTag;}
[detail] +    const QString& xml_tagName() const {return xmlGridViewerTag;}
[detail]    static const QString xmlGridViewerTag;
[detail]  
[detail] -  virtual bool mouseReleaseEvent (QMouseEvent * e, int);
[detail] -  virtual bool trackRectangle(int, double rx1,double ry1, double rx2, double ry2,
[detail] +    bool mouseReleaseEvent (QMouseEvent * e, int);
[detail] +    bool trackRectangle(int, double rx1,double ry1, double rx2, double ry2,
[detail]                                 Qt::KeyboardModifiers m);
[detail] -  virtual Rect boundingRect() const;
[detail] +    Rect boundingRect() const;
[detail]  
[detail]    void setGrid(Grid2D<double> * grid);
[detail] +
[detail] +    void exportValues(QString fileName=QString());
[detail]  signals:
[detail]    void clicked(int ix, int iy);
[detail]  protected:
[detail] -  virtual void paintData(const LayerPainterRequest& lp, QPainter& p, double dotpercm) const;
[detail] -  virtual void xml_writeChildren(XML_WRITECHILDREN_ARGS) const;
[detail] -  virtual XMLMember xml_member(XML_MEMBER_ARGS);
[detail] +    void paintData(const LayerPainterRequest& lp, QPainter& p, double dotpercm) const;
[detail] +    void xml_writeChildren(XML_WRITECHILDREN_ARGS) const;
[detail] +    XMLMember xml_member(XML_MEMBER_ARGS);
[detail]  protected:
[detail]    Grid2D<double> * _grid;
[detail]  };
[detail]                     src/HistogramLayer.h:  version-3.4.1	not modified
[detail]                        src/ImageWidget.h:  version-3.4.1	not modified
[detail]              src/ImageWidgetProperties.h:  version-3.4.1	not modified
[detail]                src/IrregularGrid2DDraw.h:  version-3.4.1	not modified
[detail]                src/IrregularGrid2DPlot.h:  version-3.4.1	modified out of comments
[detail] --- src/IrregularGrid2DPlot.h-version-3.4.1-stripped	2025-09-28 04:00:58.275470485 +0200
[detail] +++ src/IrregularGrid2DPlot.h-HEAD-stripped	2025-09-28 04:00:58.279470505 +0200
[detail] @@ -14,13 +14,12 @@
[detail]    Q_OBJECT
[detail]  public:
[detail]    IrregularGrid2DPlot(AxisWindow * parent=nullptr);
[detail] -  ~IrregularGrid2DPlot();
[detail]  
[detail] -  virtual const QString& xml_tagName() const {return xmlIrregularGrid2DPlotTag;}
[detail] +    const QString& xml_tagName() const {return xmlIrregularGrid2DPlotTag;}
[detail]    static const QString xmlIrregularGrid2DPlotTag;
[detail]  
[detail] -  virtual bool mouseReleaseEvent (QMouseEvent * e, int);
[detail] -  virtual bool trackRectangle(int, double rx1, double ry1, double rx2, double ry2,
[detail] +    bool mouseReleaseEvent (QMouseEvent * e, int);
[detail] +    bool trackRectangle(int, double rx1, double ry1, double rx2, double ry2,
[detail]                                 Qt::KeyboardModifiers eventState);
[detail]  
[detail]    const IrregularGrid2D& grid() const {return _grid;}
[detail] @@ -30,9 +29,9 @@
[detail]    void setLinearColorMap(double minimum);
[detail]    void setLinearColorMap(double minimum, double maximum) {GridPlot::setLinearColorMap(minimum, maximum);}
[detail]  
[detail] -  virtual Rect boundingRect() const;
[detail] -  virtual QString coordinateTipInfo(const Point2D&, const Point2D& pReal) const;
[detail] - public slots:
[detail] +    Rect boundingRect() const;
[detail] +    QString coordinateTipInfo(const Point2D&, const Point2D& pReal) const;
[detail] +
[detail]    void exportValues(QString fileName=QString());
[detail]  signals:
[detail]    void clicked(int ix, int iy);
[detail] @@ -41,10 +40,8 @@
[detail]  
[detail]    IrregularGrid2D _grid;
[detail]  private:
[detail] -  void addActions();
[detail] -
[detail] -  virtual void xml_writeChildren(XML_WRITECHILDREN_ARGS) const;
[detail] -  virtual XMLMember xml_member(XML_MEMBER_ARGS);
[detail] +    void xml_writeChildren(XML_WRITECHILDREN_ARGS) const;
[detail] +    XMLMember xml_member(XML_MEMBER_ARGS);
[detail]  };
[detail]  
[detail]  } 
[detail]                        src/LayerLocker.h:  version-3.4.1	not modified
[detail]                 src/LayerMouseTracking.h:  version-3.4.1	not modified
[detail]                       src/LayerPainter.h:  version-3.4.1	not modified
[detail]                src/LayerPainterRequest.h:  version-3.4.1	not modified
[detail]                 src/LayerPainterThread.h:  version-3.4.1	not modified
[detail]                        src/LayerPicker.h:  version-3.4.1	not modified
[detail]                             src/Legend.h:  version-3.4.1	modified out of comments
[detail] --- src/Legend.h-version-3.4.1-stripped	2025-09-28 04:00:58.391471045 +0200
[detail] +++ src/Legend.h-HEAD-stripped	2025-09-28 04:00:58.395471065 +0200
[detail] @@ -19,7 +19,7 @@
[detail]    Legend() {_textLookup=nullptr;}
[detail]    Legend(const Legend& o) : XMLClass() {_textLookup=nullptr; operator=(o);}
[detail]    Legend(int n) {_textLookup=nullptr; resize(n);}
[detail] -  virtual ~Legend();
[detail] +    ~Legend();
[detail]  
[detail]    Legend& operator=(const Legend& o);
[detail]    bool operator==(const Legend& o) const;
[detail] @@ -35,7 +35,7 @@
[detail]  
[detail]    ColorPalette palette() const;
[detail]    void setPalette(const ColorPalette& pal);
[detail] -  void generate(int imin, int imax, const QString& model=ColorPalette::defaultSequential,
[detail] +    void generate(int imin, int imax, int step=1, const QString& model=ColorPalette::defaultSequential,
[detail]                  ColorPalette::Options options=ColorPalette::Categorical,
[detail]                  quint16 transparency=COLOR_COMPONENT_MAX);
[detail]    void toGray();
[detail]             src/LegendFormatProperties.h:  version-3.4.1	not modified
[detail]                         src/LegendItem.h:  version-3.4.1	modified out of comments
[detail] --- src/LegendItem.h-version-3.4.1-stripped	2025-09-28 04:00:58.423471200 +0200
[detail] +++ src/LegendItem.h-HEAD-stripped	2025-09-28 04:00:58.427471220 +0200
[detail] @@ -51,7 +51,9 @@
[detail]    _symbol=s;
[detail]  }
[detail]  
[detail] -
[detail]  } 
[detail]  
[detail] +
[detail] +Q_DECLARE_METATYPE(SciFigs::LegendItem)
[detail] +
[detail]  #endif 
[detail]                   src/LegendItemWidget.h:  version-3.4.1	not modified
[detail]                   src/LegendProperties.h:  version-3.4.1	not modified
[detail]                        src/LegendTable.h:  version-3.4.1	not modified
[detail]                src/LegendTableDelegate.h:  version-3.4.1	not modified
[detail]                    src/LegendTableItem.h:  version-3.4.1	not modified
[detail]                       src/LegendWidget.h:  version-3.4.1	not modified
[detail]                       src/LineDelegate.h:  version-3.4.1	not modified
[detail]                         src/LineEditor.h:  version-3.4.1	not modified
[detail]                        src/LineFactory.h:  version-3.4.1	not modified
[detail]                           src/LineItem.h:  version-3.4.1	not modified
[detail]                          src/LineLayer.h:  version-3.4.1	modified out of comments
[detail] --- src/LineLayer.h-version-3.4.1-stripped	2025-09-28 04:00:58.595472031 +0200
[detail] +++ src/LineLayer.h-HEAD-stripped	2025-09-28 04:00:58.599472051 +0200
[detail] @@ -46,7 +46,6 @@
[detail]  
[detail]      void setVisible(int i, bool v);
[detail]      void setSelected(int i, bool s);
[detail] -    virtual Legend legend() const;
[detail]  
[detail]      
[detail]      int count() const {return _lines.count();}
[detail] @@ -99,7 +98,10 @@
[detail]      void pickLine(AbstractLine * line);
[detail]      void lineEdited(int lineIndex);
[detail]    public slots:
[detail] +    virtual Legend legend() const;
[detail]      void setLegend(const Legend& legend);
[detail] +    
[detail] +    
[detail]    protected:
[detail]      void xml_writeChildren(XML_WRITECHILDREN_ARGS) const;
[detail]      XMLMember xml_member(XML_MEMBER_ARGS);
[detail] @@ -130,12 +132,14 @@
[detail]    {
[detail]    public:
[detail]      LineLayerContext(XMLSciFigs * parent, CurvePointOptions * options)
[detail] -        : XMLContext(true)
[detail] +        : XMLContext()
[detail]      {
[detail]        _parent=parent;
[detail]        _pointOptions=options;
[detail]      }
[detail]  
[detail] +    bool isDeletable() const {return true;}
[detail] +
[detail]      CurvePointOptions * options() const {return _pointOptions;}
[detail]      XMLSciFigs * parent() const {return _parent;}
[detail]    private:
[detail]                src/LineLayerProperties.h:  version-3.4.1	not modified
[detail]                      src/ListInterpole.h:  version-3.4.1	modified out of comments
[detail] --- src/ListInterpole.h-version-3.4.1-stripped	2025-09-28 04:00:58.631472205 +0200
[detail] +++ src/ListInterpole.h-HEAD-stripped	2025-09-28 04:00:58.635472225 +0200
[detail] @@ -24,6 +24,7 @@
[detail]  
[detail]    int fromIndex() const;
[detail]    int toIndex() const;
[detail] +  int step() const;
[detail]  private slots:
[detail]    void on_firstEntry_clicked();
[detail]    void on_lastEntry_clicked();
[detail]                     src/LiveCurveLayer.h:  version-3.4.1	not modified
[detail]                      src/LiveGridLayer.h:  version-3.4.1	modified out of comments
[detail] --- src/LiveGridLayer.h-version-3.4.1-stripped	2025-09-28 04:00:58.671472399 +0200
[detail] +++ src/LiveGridLayer.h-HEAD-stripped	2025-09-28 04:00:58.675472418 +0200
[detail] @@ -40,6 +40,8 @@
[detail]      QString coordinateTipInfo(const Point2D&, const Point2D& pReal) const;
[detail]      Rect boundingRect() const;
[detail]      double value(const Point2D& p) const;
[detail] +
[detail] +    void exportValues(QString fileName=QString());
[detail]    private slots:
[detail]      void showAdjustedPalette(const QGpCoreMath::ColorMap& map);
[detail]    signals:
[detail]                       src/MakeUpFilter.h:  version-3.4.1	not modified
[detail]                          src/MeshLayer.h:  version-3.4.1	not modified
[detail]                      src/MouseTracking.h:  version-3.4.1	not modified
[detail]                           src/NameLine.h:  version-3.4.1	not modified
[detail]                   src/NameLineDelegate.h:  version-3.4.1	not modified
[detail]                       src/NameLineItem.h:  version-3.4.1	not modified
[detail]                      src/NameLineLayer.h:  version-3.4.1	not modified
[detail]            src/NameLineLayerProperties.h:  version-3.4.1	not modified
[detail]                           src/OrderTip.h:  version-3.4.1	not modified
[detail]                          src/PageLimit.h:  version-3.4.1	not modified
[detail]                           src/PageSize.h:  version-3.4.1	not modified
[detail]                 src/PageSizeProperties.h:  version-3.4.1	not modified
[detail]                      src/PaintProgress.h:  version-3.4.1	not modified
[detail]                       src/ParallelBand.h:  version-3.4.1	not modified
[detail]                      src/ParallelBands.h:  version-3.4.1	not modified
[detail]                                src/Pen.h:  version-3.4.1	modified out of comments
[detail] --- src/Pen.h-version-3.4.1-stripped	2025-09-28 04:00:58.935473675 +0200
[detail] +++ src/Pen.h-HEAD-stripped	2025-09-28 04:00:58.939473693 +0200
[detail] @@ -33,7 +33,7 @@
[detail]    const QString& xml_tagName() const {return xmlPenTag;}
[detail]    static const QString xmlPenTag;
[detail]  
[detail] -  QPen qpen(double dotpercm) const;
[detail] +    QPen qpen(double dotpercm, double sizeFactor=1.0) const;
[detail]    inline bool operator==(const Pen& o) const;
[detail]  
[detail]    LineStyle lineStyle() const {return _lineStyle;}
[detail] @@ -116,4 +116,7 @@
[detail]  
[detail]  } 
[detail]  
[detail] +
[detail] +Q_DECLARE_METATYPE(SciFigs::Pen)
[detail] +
[detail]  #endif 
[detail]                           src/PlotLine.h:  version-3.4.1	not modified
[detail]                         src/PlotLine2D.h:  version-3.4.1	not modified
[detail]                    src/PointProperties.h:  version-3.4.1	not modified
[detail]                      src/PolarGridPlot.h:  version-3.4.1	modified out of comments
[detail] --- src/PolarGridPlot.h-version-3.4.1-stripped	2025-09-28 04:00:58.995473964 +0200
[detail] +++ src/PolarGridPlot.h-HEAD-stripped	2025-09-28 04:00:58.999473984 +0200
[detail] @@ -16,11 +16,11 @@
[detail]    PolarGridPlot(AxisWindow * parent);
[detail]    ~PolarGridPlot();
[detail]  
[detail] -  virtual bool mouseReleaseEvent (QMouseEvent * e, int);
[detail] +    bool mouseReleaseEvent (QMouseEvent * e, int);
[detail]  signals:
[detail]    void clicked(double r, double phi);
[detail]  protected:
[detail] -  virtual void paintData(const LayerPainterRequest& lp, QPainter& p, double dotpercm) const;
[detail] +    void paintData(const LayerPainterRequest& lp, QPainter& p, double dotpercm) const;
[detail]  private:
[detail]    void drawCircularGridLines(const LayerPainterRequest& lp, QPainter& p, Rect& limits) const;
[detail]    void grid2DPolarLimits(const LayerPainterRequest& lp, Rect& limits) const;
[detail]                src/RealStatisticalLine.h:  version-3.4.1	not modified
[detail]                      src/SciFigsGlobal.h:  version-3.4.1	modified out of comments
[detail] --- src/SciFigsGlobal.h-version-3.4.1-stripped	2025-09-28 04:00:59.031474139 +0200
[detail] +++ src/SciFigsGlobal.h-HEAD-stripped	2025-09-28 04:00:59.035474157 +0200
[detail] @@ -21,6 +21,9 @@
[detail]      static void initPlugins(bool debug);
[detail]  
[detail]      static QBitmap colorMask(const QPixmap& pixmap, uint blankColor);
[detail] +
[detail] +    static void noPrintSupport();
[detail] +    static void noSvgSupport();
[detail]    private:
[detail]      static double _screenResolution;
[detail]    };
[detail]                      src/SciFigsPlugin.h:  version-3.4.1	modified out of comments
[detail] --- src/SciFigsPlugin.h-version-3.4.1-stripped	2025-09-28 04:00:59.051474235 +0200
[detail] +++ src/SciFigsPlugin.h-HEAD-stripped	2025-09-28 04:00:59.055474254 +0200
[detail] @@ -18,6 +18,7 @@
[detail]    virtual QString tag() const=0;
[detail]    virtual QString title() const=0;
[detail]    virtual QString description() const {return QString();}
[detail] +  virtual bool init() {return true;}
[detail]  
[detail]    static QStringList getPluginList(QStringList libs, bool& ok, bool debug=false);
[detail]    static bool loadPlugins(QStringList libs, bool debug=false);
[detail]                 src/SciFigsPreferences.h:  version-3.4.1	not modified
[detail]                   src/SciFigsXMLEditor.h:  version-3.4.1	not modified
[detail]               src/SheetSelectionWidget.h:  version-3.4.1	not modified
[detail]                     src/SlopeEstimator.h:  version-3.4.1	not modified
[detail]                             src/Symbol.h:  version-3.4.1	modified out of comments
[detail] --- src/Symbol.h-version-3.4.1-stripped	2025-09-28 04:00:59.131474621 +0200
[detail] +++ src/Symbol.h-HEAD-stripped	2025-09-28 04:00:59.135474641 +0200
[detail] @@ -37,8 +37,9 @@
[detail]      void setBrush(const Brush& b) {_brush=b;}
[detail]      const Brush& brush() const {return _brush;}
[detail]  
[detail] -    void paint(QPainter& p, const QPointF &center, double dotpercm=28.346457) const;
[detail] -    static inline void paint(Type type, QPainter& p, QPointF center,
[detail] +    void paint(QPainter& p, const QPointF &center,
[detail] +               double dotpercm, double sizeFactor=1.0) const;
[detail] +    static void paint(Type type, QPainter& p, QPointF center,
[detail]                               double size, double halfSize);
[detail]  
[detail]      static const Symbol null;
[detail] @@ -55,77 +56,9 @@
[detail]      Brush _brush;
[detail]    };
[detail]  
[detail] -  
[detail] -
[detail] -  inline void Symbol::paint(Type type, QPainter& p, QPointF center,
[detail] -                            double size, double halfSize)
[detail] -  {
[detail] -    TRACE;
[detail] -    switch(type) {
[detail] -    case Cross: {
[detail] -        QPointF h1(halfSize, halfSize);
[detail] -        QPointF h2(halfSize, -halfSize);
[detail] -        p.drawLine(center-h1, center+h1);
[detail] -        p.drawLine(center-h2, center+h2);
[detail] -      }
[detail] -      break;
[detail] -    case Square: {
[detail] -        p.drawRect(QRectF(center-QPointF(halfSize, halfSize),QSizeF(size,size)));
[detail] -      }
[detail] -      break;
[detail] -    case Circle: {
[detail] -        p.drawEllipse(center, halfSize, halfSize);
[detail] -      }
[detail] -      break;
[detail] -    case TriangleUp: {
[detail] -        QPolygonF points(4);
[detail] -        double halfSize=0.5*0.866025403784439*size;
[detail] -        center+=QPointF(-halfSize, 0.25*size);
[detail] -        points[0]=center;
[detail] -        points[1]=center+QPointF(0.866025403784439*size, 0);
[detail] -        points[2]=center+QPointF(halfSize, -0.75*size);
[detail] -        points[3]=points[0];
[detail] -        p.drawPolygon(points);
[detail] -      }
[detail] -      break;
[detail] -    case TriangleDown: {
[detail] -        QPolygonF points(4);
[detail] -        double halfSize=0.5*0.866025403784439*size;
[detail] -        center+=QPointF(-halfSize, -0.25*size);
[detail] -        points[0]=center;
[detail] -        points[1]=center+QPointF(0.866025403784439*size, 0);
[detail] -        points[2]=center+QPointF(halfSize, 0.75*size);
[detail] -        points[3]=points[0];
[detail] -        p.drawPolygon(points);
[detail] -      }
[detail] -      break;
[detail] -    case Losange: {
[detail] -        QPolygonF points(5);
[detail] -        double quarterSize=size*0.25;
[detail] -        points[0]=center-QPointF(0.0, halfSize);
[detail] -        points[1]=center+QPointF(quarterSize, 0.0);
[detail] -        points[2]=center+QPointF(0.0, halfSize);
[detail] -        points[3]=center-QPointF(quarterSize, 0.0);
[detail] -        points[4]=points[0];
[detail] -        p.drawPolygon (points);
[detail] -      }
[detail] -      break;
[detail] -    case Star: {
[detail] -        QPointF h1(halfSize, halfSize);
[detail] -        QPointF h2(halfSize, -halfSize);
[detail] -        QPointF h3(halfSize, 0.0);
[detail] -        QPointF h4(0.0, halfSize);
[detail] -        p.drawLine(center-h1, center+h1);
[detail] -        p.drawLine(center-h2, center+h2);
[detail] -        p.drawLine(center-h3, center+h3);
[detail] -        p.drawLine(center-h4, center+h4);
[detail] -      }
[detail] -      break;
[detail] -    default:
[detail] -      break;
[detail] -    }
[detail]    }
[detail]  
[detail] -} 
[detail] +
[detail] +Q_DECLARE_METATYPE(SciFigs::Symbol)
[detail]  
[detail]  #endif 
[detail]                           src/TextEdit.h:  version-3.4.1	not modified
[detail]                 src/TextEditProperties.h:  version-3.4.1	not modified
[detail]                              src/Ticks.h:  version-3.4.1	not modified
[detail]                         src/XMLSciFigs.h:  version-3.4.1	modified out of comments
[detail] --- src/XMLSciFigs.h-version-3.4.1-stripped	2025-09-28 04:00:59.203474969 +0200
[detail] +++ src/XMLSciFigs.h-HEAD-stripped	2025-09-28 04:00:59.207474989 +0200
[detail] @@ -9,6 +9,8 @@
[detail]  
[detail]  namespace SciFigs {
[detail]  
[detail] +  class GraphContentLayer;
[detail] +
[detail]  class SCIFIGS_EXPORT XMLSciFigs : public XMLClass, public XMLContext
[detail]  {
[detail]    TRANSLATIONS( "XMLSciFigs" )
[detail] @@ -21,7 +23,7 @@
[detail]    enum FileType{None=0, MakeUp=1, Data=2, PageHeader=4, Layer=3, Page=7, Selection=8};
[detail]    Q_DECLARE_FLAGS(FileTypes, FileType)
[detail]  
[detail] -  enum LayerMode {AppendLayer, PrependLayer};
[detail] +    enum LayerMode {AppendLayer, PrependLayer, InsertLayer};
[detail]  
[detail]    XMLClass::Error saveFile(QString fileName, const XMLClass * object, FileTypes type);
[detail]    QString saveString(const XMLClass * object, FileTypes type);
[detail] @@ -35,8 +37,11 @@
[detail]    bool layer() {return _currentFile==Layer;}
[detail]    bool selection() {return _currentFile & Selection;}
[detail]    QString currentFileVersion() {return _currentFileVersion;}
[detail] +
[detail]    void setLayerMode(LayerMode m) {_layerMode=m;}
[detail]    LayerMode layerMode() const {return _layerMode;}
[detail] +    void setBeforeLayer(const QString& layerName) {_beforeLayer=layerName;}
[detail] +    const QString& beforeLayer() const {return _beforeLayer;}
[detail]  protected:
[detail]    void xml_writeProperties(XML_WRITEPROPERTIES_ARGS) const;
[detail]    void xml_writeChildren(XML_WRITECHILDREN_ARGS) const;
[detail] @@ -47,6 +52,7 @@
[detail]    QString _currentFileVersion;
[detail]    const XMLClass * _currentObject;
[detail]    LayerMode _layerMode;
[detail] +    QString _beforeLayer;
[detail]  };
[detail]  
[detail]  } 
[detail]                 src/XUniqueYColorLines.h:  version-3.4.1	not modified
[detail]                       src/XYColorLines.h:  version-3.4.1	not modified
[detail]             src/XYColorLinesProperties.h:  version-3.4.1	not modified
[detail]                        src/XYColorPlot.h:  version-3.4.1	not modified
[detail]                             src/XYPlot.h:  version-3.4.1	not modified
[detail]                   src/XYPlotProperties.h:  version-3.4.1	not modified
[detail]                       src/XYValueLines.h:  version-3.4.1	not modified
[detail]                        src/XYValuePlot.h:  version-3.4.1	not modified
[detail]               src/AlignGridParameters.ui:  version-3.4.1	not modified
[detail]         src/AutoAdjustScaleProperties.ui:  version-3.4.1	modified out of comments
[detail] --- src/AutoAdjustScaleProperties.ui-version-3.4.1-stripped	2025-09-28 04:00:59.363475742 +0200
[detail] +++ src/AutoAdjustScaleProperties.ui-HEAD-stripped	2025-09-28 04:00:59.367475762 +0200
[detail] @@ -71,9 +71,9 @@
[detail]         </widget>
[detail]        </item>
[detail]        <item row="6" column="0">
[detail] -       <widget class="QCheckBox" name="symetric">
[detail] +       <widget class="QCheckBox" name="symmetric">
[detail]          <property name="text">
[detail] -         <string>Symetric</string>
[detail] +         <string>Symmetric</string>
[detail]          </property>
[detail]         </widget>
[detail]        </item>
[detail]              src/AxisFormatProperties.ui:  version-3.4.1	modified out of comments
[detail] --- src/AxisFormatProperties.ui-version-3.4.1-stripped	2025-09-28 04:00:59.383475839 +0200
[detail] +++ src/AxisFormatProperties.ui-HEAD-stripped	2025-09-28 04:00:59.391475879 +0200
[detail] @@ -6,7 +6,7 @@
[detail]     <rect>
[detail]      <x>0</x>
[detail]      <y>0</y>
[detail] -    <width>220</width>
[detail] +    <width>254</width>
[detail]      <height>316</height>
[detail]     </rect>
[detail]    </property>
[detail] @@ -14,77 +14,87 @@
[detail]     <string>Form</string>
[detail]    </property>
[detail]    <layout class="QGridLayout">
[detail] -   <item row="0" column="0">
[detail] -    <widget class="QLabel" name="numberTypeLabel">
[detail] +   <item row="1" column="2">
[detail] +    <widget class="QCheckBox" name="automaticPrecision">
[detail]       <property name="text">
[detail] -      <string>Number:</string>
[detail] +      <string>Auto</string>
[detail]       </property>
[detail]      </widget>
[detail]     </item>
[detail] -   <item row="3" column="0">
[detail] -    <widget class="QLabel" name="orientationLabel">
[detail] +   <item row="5" column="1" colspan="2">
[detail] +    <widget class="QGpGuiTools::DoubleSpinBox" name="lineWeightEdit">
[detail] +     <property name="suffix">
[detail] +      <string> mm</string>
[detail] +     </property>
[detail] +    </widget>
[detail] +   </item>
[detail] +   <item row="1" column="1">
[detail] +    <widget class="QSpinBox" name="precisionEdit">
[detail] +     <property name="sizePolicy">
[detail] +      <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
[detail] +       <horstretch>0</horstretch>
[detail] +       <verstretch>0</verstretch>
[detail] +      </sizepolicy>
[detail] +     </property>
[detail] +    </widget>
[detail] +   </item>
[detail] +   <item row="1" column="0">
[detail] +    <widget class="QLabel" name="precisionLabel">
[detail]       <property name="whatsThis">
[detail] -      <string>Select the position of the axis relative to the graph's content.</string>
[detail] +      <string>Number of digits after decimal point</string>
[detail]       </property>
[detail]       <property name="text">
[detail] -      <string>Orientation:</string>
[detail] +      <string>Precision:</string>
[detail]       </property>
[detail]      </widget>
[detail]     </item>
[detail] -   <item row="6" column="2">
[detail] -    <widget class="QPushButton" name="fontEdit">
[detail] +   <item row="4" column="1" colspan="2">
[detail] +    <widget class="QComboBox" name="orientationEdit">
[detail] +     <property name="sizePolicy">
[detail] +      <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
[detail] +       <horstretch>0</horstretch>
[detail] +       <verstretch>0</verstretch>
[detail] +      </sizepolicy>
[detail] +     </property>
[detail]       <property name="minimumSize">
[detail]        <size>
[detail] -       <width>50</width>
[detail] +       <width>30</width>
[detail]         <height>0</height>
[detail]        </size>
[detail]       </property>
[detail] -     <property name="text">
[detail] -      <string>Fonts</string>
[detail] +     <property name="whatsThis">
[detail] +      <string>Select the position of the axis relative to the graph's content.</string>
[detail]       </property>
[detail] -     <property name="autoDefault">
[detail] -      <bool>false</bool>
[detail] +     <item>
[detail] +      <property name="text">
[detail] +       <string>North</string>
[detail]       </property>
[detail] -    </widget>
[detail] -   </item>
[detail] -   <item row="2" column="1" colspan="2">
[detail] -    <widget class="QLineEdit" name="unitFactorEdit"/>
[detail]     </item>
[detail] -   <item row="7" column="0" colspan="3">
[detail] -    <widget class="QTextEdit" name="titleEdit">
[detail] -     <property name="minimumSize">
[detail] -      <size>
[detail] -       <width>50</width>
[detail] -       <height>30</height>
[detail] -      </size>
[detail] +     <item>
[detail] +      <property name="text">
[detail] +       <string>South</string>
[detail]       </property>
[detail] -    </widget>
[detail]     </item>
[detail] -   <item row="0" column="1" colspan="2">
[detail] -    <widget class="QComboBox" name="numberTypeEdit">
[detail]       <item>
[detail]        <property name="text">
[detail] -       <string>Fixed</string>
[detail] +       <string>East</string>
[detail]        </property>
[detail]       </item>
[detail]       <item>
[detail]        <property name="text">
[detail] -       <string>Scientific</string>
[detail] +       <string>West</string>
[detail]        </property>
[detail]       </item>
[detail]      </widget>
[detail]     </item>
[detail] -   <item row="1" column="1">
[detail] -    <widget class="QSpinBox" name="precisionEdit">
[detail] -     <property name="sizePolicy">
[detail] -      <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
[detail] -       <horstretch>0</horstretch>
[detail] -       <verstretch>0</verstretch>
[detail] -      </sizepolicy>
[detail] +   <item row="6" column="0">
[detail] +    <widget class="QLabel" name="tickSizeLabel">
[detail] +     <property name="text">
[detail] +      <string>Tick size:</string>
[detail]       </property>
[detail]      </widget>
[detail]     </item>
[detail] -   <item row="6" column="1">
[detail] +   <item row="7" column="1">
[detail]      <spacer>
[detail]       <property name="orientation">
[detail]        <enum>Qt::Horizontal</enum>
[detail] @@ -97,6 +107,22 @@
[detail]       </property>
[detail]      </spacer>
[detail]     </item>
[detail] +   <item row="7" column="0">
[detail] +    <widget class="QLabel" name="titleLabel">
[detail] +     <property name="sizePolicy">
[detail] +      <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
[detail] +       <horstretch>0</horstretch>
[detail] +       <verstretch>0</verstretch>
[detail] +      </sizepolicy>
[detail] +     </property>
[detail] +     <property name="whatsThis">
[detail] +      <string>Axis title (e.g., name of the physical property and its units)</string>
[detail] +     </property>
[detail] +     <property name="text">
[detail] +      <string>Title:</string>
[detail] +     </property>
[detail] +    </widget>
[detail] +   </item>
[detail]     <item row="2" column="0">
[detail]      <widget class="QLabel" name="unitFactorLabel">
[detail]       <property name="text">
[detail] @@ -104,106 +130,90 @@
[detail]       </property>
[detail]      </widget>
[detail]     </item>
[detail] -   <item row="5" column="0">
[detail] -    <widget class="QLabel" name="tickSizeLabel">
[detail] -     <property name="text">
[detail] -      <string>Tick size:</string>
[detail] +   <item row="6" column="1" colspan="2">
[detail] +    <widget class="QGpGuiTools::DoubleSpinBox" name="tickSizeEdit">
[detail] +     <property name="suffix">
[detail] +      <string> mm</string>
[detail]       </property>
[detail]      </widget>
[detail]     </item>
[detail] -   <item row="1" column="2">
[detail] -    <widget class="QCheckBox" name="automaticPrecision">
[detail] +   <item row="5" column="0">
[detail] +    <widget class="QLabel" name="lineWeightLabel">
[detail]       <property name="text">
[detail] -      <string>Auto</string>
[detail] +      <string>Line weight:</string>
[detail]       </property>
[detail]      </widget>
[detail]     </item>
[detail] -   <item row="3" column="1" colspan="2">
[detail] -    <widget class="QComboBox" name="orientationEdit">
[detail] -     <property name="sizePolicy">
[detail] -      <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
[detail] -       <horstretch>0</horstretch>
[detail] -       <verstretch>0</verstretch>
[detail] -      </sizepolicy>
[detail] -     </property>
[detail] +   <item row="7" column="2">
[detail] +    <widget class="QPushButton" name="fontEdit">
[detail]       <property name="minimumSize">
[detail]        <size>
[detail] -       <width>30</width>
[detail] +       <width>50</width>
[detail]         <height>0</height>
[detail]        </size>
[detail]       </property>
[detail] -     <property name="whatsThis">
[detail] -      <string>Select the position of the axis relative to the graph's content.</string>
[detail] -     </property>
[detail] -     <item>
[detail]        <property name="text">
[detail] -       <string>North</string>
[detail] +      <string>Fonts</string>
[detail] +     </property>
[detail] +     <property name="autoDefault">
[detail] +      <bool>false</bool>
[detail]        </property>
[detail] +    </widget>
[detail]       </item>
[detail] -     <item>
[detail] +   <item row="0" column="0">
[detail] +    <widget class="QLabel" name="numberTypeLabel">
[detail]        <property name="text">
[detail] -       <string>South</string>
[detail] +      <string>Number:</string>
[detail]        </property>
[detail] +    </widget>
[detail]       </item>
[detail] +   <item row="0" column="1" colspan="2">
[detail] +    <widget class="QComboBox" name="numberTypeEdit">
[detail]       <item>
[detail]        <property name="text">
[detail] -       <string>East</string>
[detail] +       <string>Fixed</string>
[detail]        </property>
[detail]       </item>
[detail]       <item>
[detail]        <property name="text">
[detail] -       <string>West</string>
[detail] +       <string>Scientific</string>
[detail]        </property>
[detail]       </item>
[detail]      </widget>
[detail]     </item>
[detail] -   <item row="5" column="1" colspan="2">
[detail] -    <widget class="QGpGuiTools::DoubleSpinBox" name="tickSizeEdit">
[detail] -     <property name="suffix">
[detail] -      <string> mm</string>
[detail] -     </property>
[detail] -    </widget>
[detail] -   </item>
[detail] -   <item row="4" column="1" colspan="2">
[detail] -    <widget class="QGpGuiTools::DoubleSpinBox" name="lineWeightEdit">
[detail] -     <property name="suffix">
[detail] -      <string> mm</string>
[detail] -     </property>
[detail] -    </widget>
[detail] +   <item row="2" column="1" colspan="2">
[detail] +    <widget class="QLineEdit" name="unitFactorEdit"/>
[detail]     </item>
[detail] -   <item row="6" column="0">
[detail] -    <widget class="QLabel" name="titleLabel">
[detail] -     <property name="sizePolicy">
[detail] -      <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
[detail] -       <horstretch>0</horstretch>
[detail] -       <verstretch>0</verstretch>
[detail] -      </sizepolicy>
[detail] -     </property>
[detail] +   <item row="4" column="0">
[detail] +    <widget class="QLabel" name="orientationLabel">
[detail]       <property name="whatsThis">
[detail] -      <string>Axis title (e.g., name of the physical property and its units)</string>
[detail] +      <string>Select the position of the axis relative to the graph's content.</string>
[detail]       </property>
[detail]       <property name="text">
[detail] -      <string>Title:</string>
[detail] +      <string>Orientation:</string>
[detail]       </property>
[detail]      </widget>
[detail]     </item>
[detail] -   <item row="4" column="0">
[detail] -    <widget class="QLabel" name="lineWeightLabel">
[detail] -     <property name="text">
[detail] -      <string>Line weight:</string>
[detail] +   <item row="8" column="0" colspan="3">
[detail] +    <widget class="QTextEdit" name="titleEdit">
[detail] +     <property name="minimumSize">
[detail] +      <size>
[detail] +       <width>50</width>
[detail] +       <height>30</height>
[detail] +      </size>
[detail]       </property>
[detail]      </widget>
[detail]     </item>
[detail] -   <item row="1" column="0">
[detail] -    <widget class="QLabel" name="precisionLabel">
[detail] -     <property name="whatsThis">
[detail] -      <string>Number of digits after decimal point</string>
[detail] -     </property>
[detail] +   <item row="3" column="0">
[detail] +    <widget class="QLabel" name="annotationFactorLabel">
[detail]       <property name="text">
[detail] -      <string>Precision:</string>
[detail] +      <string>Annotation factor</string>
[detail]       </property>
[detail]      </widget>
[detail]     </item>
[detail] +   <item row="3" column="1" colspan="2">
[detail] +    <widget class="QLineEdit" name="annotationFactorEdit"/>
[detail] +   </item>
[detail]    </layout>
[detail]   </widget>
[detail]   <customwidgets>
[detail]               src/AxisScaleProperties.ui:  version-3.4.1	not modified
[detail]                src/ColorMapProperties.ui:  version-3.4.1	not modified
[detail]                src/ColorPaletteEditor.ui:  version-3.4.1	modified out of comments
[detail] --- src/ColorPaletteEditor.ui-version-3.4.1-stripped	2025-09-28 04:00:59.439476110 +0200
[detail] +++ src/ColorPaletteEditor.ui-HEAD-stripped	2025-09-28 04:00:59.443476130 +0200
[detail] @@ -85,6 +85,9 @@
[detail]        </item>
[detail]        <item>
[detail]         <widget class="QCheckBox" name="categorical">
[detail] +        <property name="toolTip">
[detail] +         <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Palette must sequential (ending with 'S')&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
[detail] +        </property>
[detail]          <property name="text">
[detail]           <string>Categorical</string>
[detail]          </property>
[detail]     src/GraphContentsFormatProperties.ui:  version-3.4.1	not modified
[detail]      src/GraphContentsLayerProperties.ui:  version-3.4.1	not modified
[detail]   src/GraphicObjectGeometryProperties.ui:  version-3.4.1	not modified
[detail]         src/GraphicObjectIdProperties.ui:  version-3.4.1	not modified
[detail]      src/GraphicObjectPrintProperties.ui:  version-3.4.1	not modified
[detail]            src/GraphicSheetProperties.ui:  version-3.4.1	not modified
[detail]                    src/GridProperties.ui:  version-3.4.1	not modified
[detail]             src/ImageWidgetProperties.ui:  version-3.4.1	not modified
[detail]            src/LegendFormatProperties.ui:  version-3.4.1	not modified
[detail]                  src/LegendProperties.ui:  version-3.4.1	modified out of comments
[detail] --- src/LegendProperties.ui-version-3.4.1-stripped	2025-09-28 04:00:59.611476941 +0200
[detail] +++ src/LegendProperties.ui-HEAD-stripped	2025-09-28 04:00:59.615476961 +0200
[detail] @@ -6,7 +6,7 @@
[detail]     <rect>
[detail]      <x>0</x>
[detail]      <y>0</y>
[detail] -    <width>528</width>
[detail] +    <width>473</width>
[detail]      <height>377</height>
[detail]     </rect>
[detail]    </property>
[detail] @@ -103,7 +103,7 @@
[detail]       <item>
[detail]        <widget class="QLabel" name="TextLabel1">
[detail]         <property name="text">
[detail] -        <string>Number of entries</string>
[detail] +        <string>Number of elements</string>
[detail]         </property>
[detail]        </widget>
[detail]       </item>
[detail]               src/LineLayerProperties.ui:  version-3.4.1	not modified
[detail]                     src/ListInterpole.ui:  version-3.4.1	modified out of comments
[detail] --- src/ListInterpole.ui-version-3.4.1-stripped	2025-09-28 04:00:59.647477116 +0200
[detail] +++ src/ListInterpole.ui-HEAD-stripped	2025-09-28 04:00:59.651477134 +0200
[detail] @@ -1,3 +1,4 @@
[detail] +<?xml version="1.0" encoding="UTF-8"?>
[detail]  <ui version="4.0" >
[detail]   <class>ListInterpole</class>
[detail]   <widget class="QDialog" name="ListInterpole" >
[detail] @@ -12,6 +13,30 @@
[detail]    <layout class="QVBoxLayout" >
[detail]     <item>
[detail]      <layout class="QGridLayout" >
[detail] +     <item row="2" column="2">
[detail] +      <widget class="QPushButton" name="lastEntry">
[detail] +       <property name="text">
[detail] +        <string>Last</string>
[detail] +       </property>
[detail] +      </widget>
[detail] +     </item>
[detail] +     <item row="2" column="0">
[detail] +      <widget class="QLabel" name="label_2">
[detail] +       <property name="text">
[detail] +        <string>To</string>
[detail] +       </property>
[detail] +      </widget>
[detail] +     </item>
[detail] +     <item row="0" column="2">
[detail] +      <widget class="QPushButton" name="firstEntry">
[detail] +       <property name="text">
[detail] +        <string>First</string>
[detail] +       </property>
[detail] +      </widget>
[detail] +     </item>
[detail] +     <item row="2" column="1">
[detail] +      <widget class="QComboBox" name="toList"/>
[detail] +     </item>
[detail]       <item row="0" column="0" >
[detail]        <widget class="QLabel" name="label" >
[detail]         <property name="text" >
[detail] @@ -22,34 +47,27 @@
[detail]       <item row="0" column="1" >
[detail]        <widget class="QComboBox" name="fromList" >
[detail]         <property name="sizePolicy" >
[detail] -        <sizepolicy vsizetype="Fixed" hsizetype="Expanding" >
[detail] +        <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
[detail]           <horstretch>0</horstretch>
[detail]           <verstretch>0</verstretch>
[detail]          </sizepolicy>
[detail]         </property>
[detail]        </widget>
[detail]       </item>
[detail] -     <item row="0" column="2" >
[detail] -      <widget class="QPushButton" name="firstEntry" >
[detail] -       <property name="text" >
[detail] -        <string>First</string>
[detail] -       </property>
[detail] -      </widget>
[detail] -     </item>
[detail]       <item row="1" column="0" >
[detail] -      <widget class="QLabel" name="label_2" >
[detail] +      <widget class="QLabel" name="label_3">
[detail]         <property name="text" >
[detail] -        <string>To</string>
[detail] +        <string>Step</string>
[detail]         </property>
[detail]        </widget>
[detail]       </item>
[detail]       <item row="1" column="1" >
[detail] -      <widget class="QComboBox" name="toList" />
[detail] -     </item>
[detail] -     <item row="1" column="2" >
[detail] -      <widget class="QPushButton" name="lastEntry" >
[detail] -       <property name="text" >
[detail] -        <string>Last</string>
[detail] +      <widget class="QSpinBox" name="stepList">
[detail] +       <property name="minimum">
[detail] +        <number>1</number>
[detail] +       </property>
[detail] +       <property name="maximum">
[detail] +        <number>999999</number>
[detail]         </property>
[detail]        </widget>
[detail]       </item>
[detail] @@ -61,7 +79,7 @@
[detail]        <enum>Qt::Horizontal</enum>
[detail]       </property>
[detail]       <property name="standardButtons" >
[detail] -      <set>QDialogButtonBox::Cancel|QDialogButtonBox::NoButton|QDialogButtonBox::Ok</set>
[detail] +      <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
[detail]       </property>
[detail]      </widget>
[detail]     </item>
[detail]                      src/MakeUpFilter.ui:  version-3.4.1	not modified
[detail]           src/NameLineLayerProperties.ui:  version-3.4.1	not modified
[detail]                src/PageSizeProperties.ui:  version-3.4.1	not modified
[detail]                   src/PointProperties.ui:  version-3.4.1	not modified
[detail]                src/SciFigsPreferences.ui:  version-3.4.1	not modified
[detail]                src/TextEditProperties.ui:  version-3.4.1	not modified
[detail]            src/XYColorLinesProperties.ui:  version-3.4.1	not modified
[detail]                  src/XYPlotProperties.ui:  version-3.4.1	not modified
[summary] Total differences: 2939 lines
[summary] Modification level is B
OLD_DIR=$(pwd)
echo "SciFigs"
cd $(find . -name "SciFigs" | tail -n 1) || exit 2
pwd
dpversion B  || exit 2
cd $OLD_DIR || exit 2
################## QGpGuiMath
[detail]      src/ComplexStatisticalPlotProxy.cpp:  version-1.4.0	not modified
[detail]                src/CoordinateConvert.cpp:  version-1.4.0	not modified
[detail]             src/CoordinateFileWidget.cpp:  version-1.4.0	not modified
[detail]                     src/CurveBrowser.cpp:  version-1.4.0	modified out of comments
[detail] --- src/CurveBrowser.cpp-version-1.4.0-stripped	2025-09-28 04:00:59.883478255 +0200
[detail] +++ src/CurveBrowser.cpp-HEAD-stripped	2025-09-28 04:00:59.891478295 +0200
[detail] @@ -524,17 +524,13 @@
[detail]      ASSERT(!_legendEditor);
[detail]      _legendEditor=new LegendProperties(this);
[detail]      _legendEditor->setPropertySections(LegendTable::AllSections);
[detail] -    d->setMainWidget(_legendEditor, Dialog::OkCancel);
[detail] +    d->setMainWidget(_legendEditor, Dialog::TitleClose);
[detail]      _legendEditor->setLegend(legend);
[detail]      _legendEditor->setReadOnlyText(true);
[detail] -    connect(_legendEditor, SIGNAL(touched()), this, SLOT(commitLegend()));
[detail]      Settings::getRect(d, "CurveBrowser::legend");
[detail] -    if(d->exec()!=QDialog::Accepted) {
[detail] -      _currentLayer->setLegend(legend);
[detail] -      _currentLayer->deepUpdate();
[detail] -    } else {
[detail] +    connect(_legendEditor, SIGNAL(touched()), this, SLOT(commitLegend()));
[detail] +    d->exec();
[detail]        Settings::setRect(d, "CurveBrowser::legend");
[detail] -    }
[detail]      delete d;
[detail]      _legendEditor=nullptr;
[detail]    }
[detail]                  src/CurveBrowserCut.cpp:  version-1.4.0	not modified
[detail]             src/CurveBrowserDelegate.cpp:  version-1.4.0	not modified
[detail]                 src/CurveBrowserItem.cpp:  version-1.4.0	not modified
[detail]             src/CurveBrowserResample.cpp:  version-1.4.0	not modified
[detail]               src/CurveBrowserSmooth.cpp:  version-1.4.0	not modified
[detail]                src/CurveBrowserSplit.cpp:  version-1.4.0	not modified
[detail]             src/CurveBrowserValidate.cpp:  version-1.4.0	not modified
[detail]                   src/CurvePlotProxy.cpp:  version-1.4.0	not modified
[detail]            src/CurvePropertiesWidget.cpp:  version-1.4.0	not modified
[detail]                    src/CurveSelector.cpp:  version-1.4.0	not modified
[detail]                src/CurveSelectorItem.cpp:  version-1.4.0	not modified
[detail]               src/FrequencyPlotProxy.cpp:  version-1.4.0	not modified
[detail]            src/GeographicalReference.cpp:  version-1.4.0	not modified
[detail]                    src/GuiMathGlobal.cpp:  version-1.4.0	not modified
[detail]                       src/ImageLayer.cpp:  version-1.4.0	modified out of comments
[detail] --- src/ImageLayer.cpp-version-1.4.0-stripped	2025-09-28 04:01:00.127479434 +0200
[detail] +++ src/ImageLayer.cpp-HEAD-stripped	2025-09-28 04:01:00.131479454 +0200
[detail] @@ -451,6 +451,26 @@
[detail]      return XMLMember(XMLMember::Unknown);
[detail]    }
[detail]  
[detail] +  bool ImageLayer::xml_polish(XML_POLISH_ARGS)
[detail] +  {
[detail] +    Q_UNUSED(context)
[detail] +    if(!_fileName.isEmpty()) {
[detail] +      QFileInfo fi(_fileName);
[detail] +      if(!fi.exists()) {
[detail] +        PathTranslatorOptions options;
[detail] +        options.setTitle(tr("Loading image layer..."));
[detail] +        options.setFileType(tr("Image file (%1)"));
[detail] +        options.setForceAsk(false);
[detail] +        QString fileName=CoreApplication::instance()->translatePath(_fileName, options);
[detail] +        if(!fileName.isEmpty()) {
[detail] +          _fileName=fileName;
[detail] +        }
[detail] +      }
[detail] +      loadImage();
[detail] +    }
[detail] +    return true;
[detail] +  }
[detail] +
[detail]    
[detail]  
[detail]    const QString ImageLayer::ReferencePoint::xmlReferencePointTag="ReferencePoint";
[detail] @@ -505,11 +525,4 @@
[detail]      }
[detail]    }
[detail]  
[detail] -  bool ImageLayer::xml_polish(XML_POLISH_ARGS)
[detail] -  {
[detail] -    Q_UNUSED(context)
[detail] -    loadImage();
[detail] -    return true;
[detail] -  }
[detail] -
[detail]  } 
[detail]             src/ImageLayerProperties.cpp:  version-1.4.0	not modified
[detail]                src/ImageScalingPoint.cpp:  version-1.4.0	not modified
[detail]        src/ImageScalingPointDelegate.cpp:  version-1.4.0	not modified
[detail]           src/ImageScalingPointModel.cpp:  version-1.4.0	not modified
[detail]                       src/QGpGuiMath.cpp:  version-1.4.0	not modified
[detail]         src/RealStatisticalPlotProxy.cpp:  version-1.4.0	not modified
[detail]          src/SamplingParameterWidget.cpp:  version-1.4.0	modified out of comments
[detail] --- src/SamplingParameterWidget.cpp-version-1.4.0-stripped	2025-09-28 04:01:00.235479957 +0200
[detail] +++ src/SamplingParameterWidget.cpp-HEAD-stripped	2025-09-28 04:01:00.239479976 +0200
[detail] @@ -163,7 +163,7 @@
[detail]        stepCountValue->setDecimals(ndec<0 ? 0 : ndec);
[detail]        stepCountValue->setMinimum(minStep);
[detail]        stepCountValue->setMaximum(delta);
[detail] -      stepCountValue->setSingleStep(::pow(10.0, ::floor(::log10(_param.step()-1.0)))-1.0);
[detail] +      stepCountValue->setSingleStep(Number::exp10(Number::floorLog10(_param.step()-1.0))-1.0);
[detail]        stepCountValue->setValue(_param.step());
[detail]      } else {
[detail]        stepCountValue->setDecimals(0);
[detail] @@ -207,6 +207,7 @@
[detail]          break;
[detail]        }
[detail]        stepCountOption->setCurrentIndex(param.stepType()==SamplingParameters::Step ? 0 : 1);
[detail] +      stepCountValue->setValue(param.step());
[detail]      }
[detail]    }
[detail]  
[detail]         src/SmoothingParameterWidget.cpp:  version-1.4.0	not modified
[detail]    src/WindowFunctionParameterWidget.cpp:  version-1.4.0	not modified
[detail]        src/ComplexStatisticalPlotProxy.h:  version-1.4.0	not modified
[detail]                  src/CoordinateConvert.h:  version-1.4.0	not modified
[detail]               src/CoordinateFileWidget.h:  version-1.4.0	not modified
[detail]                       src/CurveBrowser.h:  version-1.4.0	not modified
[detail]                    src/CurveBrowserCut.h:  version-1.4.0	not modified
[detail]               src/CurveBrowserDelegate.h:  version-1.4.0	not modified
[detail]                   src/CurveBrowserItem.h:  version-1.4.0	not modified
[detail]               src/CurveBrowserResample.h:  version-1.4.0	not modified
[detail]                 src/CurveBrowserSmooth.h:  version-1.4.0	not modified
[detail]                  src/CurveBrowserSplit.h:  version-1.4.0	not modified
[detail]               src/CurveBrowserValidate.h:  version-1.4.0	not modified
[detail]                     src/CurvePlotProxy.h:  version-1.4.0	not modified
[detail]              src/CurvePropertiesWidget.h:  version-1.4.0	not modified
[detail]                      src/CurveSelector.h:  version-1.4.0	not modified
[detail]                  src/CurveSelectorItem.h:  version-1.4.0	not modified
[detail]                 src/FrequencyPlotProxy.h:  version-1.4.0	not modified
[detail]              src/GeographicalReference.h:  version-1.4.0	not modified
[detail]                      src/GuiMathGlobal.h:  version-1.4.0	not modified
[detail]                         src/ImageLayer.h:  version-1.4.0	not modified
[detail]               src/ImageLayerProperties.h:  version-1.4.0	not modified
[detail]                  src/ImageScalingPoint.h:  version-1.4.0	not modified
[detail]          src/ImageScalingPointDelegate.h:  version-1.4.0	not modified
[detail]             src/ImageScalingPointModel.h:  version-1.4.0	not modified
[detail]           src/RealStatisticalPlotProxy.h:  version-1.4.0	not modified
[detail]            src/SamplingParameterWidget.h:  version-1.4.0	not modified
[detail]           src/SmoothingParameterWidget.h:  version-1.4.0	not modified
[detail]      src/WindowFunctionParameterWidget.h:  version-1.4.0	not modified
[detail]                 src/CoordinateConvert.ui:  version-1.4.0	not modified
[detail]              src/CoordinateFileWidget.ui:  version-1.4.0	not modified
[detail]                      src/CurveBrowser.ui:  version-1.4.0	not modified
[detail]                   src/CurveBrowserCut.ui:  version-1.4.0	not modified
[detail]              src/CurveBrowserResample.ui:  version-1.4.0	not modified
[detail]                src/CurveBrowserSmooth.ui:  version-1.4.0	not modified
[detail]                 src/CurveBrowserSplit.ui:  version-1.4.0	not modified
[detail]              src/CurveBrowserValidate.ui:  version-1.4.0	not modified
[detail]             src/CurvePropertiesWidget.ui:  version-1.4.0	not modified
[detail]                     src/CurveSelector.ui:  version-1.4.0	not modified
[detail]             src/GeographicalReference.ui:  version-1.4.0	not modified
[detail]              src/ImageLayerProperties.ui:  version-1.4.0	not modified
[detail]                 src/ImageScalingPoint.ui:  version-1.4.0	not modified
[detail]           src/SamplingParameterWidget.ui:  version-1.4.0	not modified
[detail]          src/SmoothingParameterWidget.ui:  version-1.4.0	not modified
[detail]     src/WindowFunctionParameterWidget.ui:  version-1.4.0	not modified
[summary] Total differences: 83 lines
[summary] Modification level is C
OLD_DIR=$(pwd)
echo "QGpGuiMath"
cd $(find . -name "QGpGuiMath" | tail -n 1) || exit 2
pwd
dpversion C  || exit 2
cd $OLD_DIR || exit 2
################## figue
[detail]                       src/MainWindow.cpp:  version-2.0.7	not modified
[detail]                             src/main.cpp:  version-2.0.7	modified out of comments
[detail] --- src/main.cpp-version-2.0.7-stripped	2025-09-28 04:01:00.991483611 +0200
[detail] +++ src/main.cpp-HEAD-stripped	2025-09-28 04:01:00.995483629 +0200
[detail] @@ -32,6 +32,7 @@
[detail]  static QList<int> yColumns, yerrColumns, nameColumns;
[detail]  static DateTime xTimeRef, yTimeRef;
[detail]  static QString layerName;
[detail] +static bool valueOrderMinOnTop=true;
[detail]  
[detail]  
[detail]  static double dx0=0.0, dy0=0.0, dx=0.0, dy=0.0, maxX=0.0, maxY=0.0;
[detail] @@ -299,6 +300,10 @@
[detail]            printf("%s\n",it->toLatin1().data());
[detail]          }
[detail]          return 0;
[detail] +      } else if(arg=="-min-on-top") {
[detail] +        valueOrderMinOnTop=true;
[detail] +      } else if(arg=="-max-on-top") {
[detail] +        valueOrderMinOnTop=false;
[detail]        } else {
[detail]          App::log(tr("figue: bad option %1, see -help\n").arg(argv[i]) );
[detail]          return 2;
[detail] @@ -471,6 +476,8 @@
[detail]    h->addOption("-layer-name <NAME>", "Sets name of the created layer.");
[detail]    h->addOption("-x-abs-time-ref <REF>", "Specify the time reference for X axis with format 'yyyyMMddhhmmssz'.");
[detail]    h->addOption("-y-abs-time-ref <REF>", "Specify the time reference for Y axis with format 'yyyyMMddhhmmssz'.");
[detail] +  h->addOption("-min-on-top", "For dots, show minimum value on top (default).");
[detail] +  h->addOption("-max-on-top", "For dots, show maximum value on top.");
[detail]    h->addGroup("Output","output");
[detail]    exportOptions.help(h);
[detail]    h->addOption("-cpp <n>","Number of curves per plot (option -c only).");
[detail] @@ -652,7 +659,7 @@
[detail]    TRACE;
[detail]    Legend legend;
[detail]    if(exportOptions.legendFile().isEmpty()) {
[detail] -    legend.generate(0, 20, ColorPalette::defaultCategorical, ColorPalette::Categorical);
[detail] +    legend.generate(0, 20, 1, ColorPalette::defaultCategorical, ColorPalette::Categorical);
[detail]    } else {
[detail]      XMLErrorReport xmler(XMLErrorReport::Read | XMLErrorReport::NoMessageBox);
[detail]      xmler.setTitle(tr("Load legend"));
[detail] @@ -746,7 +753,7 @@
[detail]    TRACE;
[detail]    Legend legend;
[detail]    if(exportOptions.legendFile().isEmpty()) {
[detail] -    legend.generate(0, 20, ColorPalette::defaultCategorical, ColorPalette::Categorical);
[detail] +    legend.generate(0, 20, 1, ColorPalette::defaultCategorical, ColorPalette::Categorical);
[detail]    } else {
[detail]      XMLErrorReport xmler(XMLErrorReport::Read | XMLErrorReport::NoMessageBox);
[detail]      xmler.setTitle(tr("Load legend"));
[detail] @@ -897,8 +904,12 @@
[detail]  public:
[detail]    ValueDot() {_value=0.0;}
[detail]  
[detail] -  bool operator<(const ValueDot& o) const {
[detail] -    return _value>o._value;
[detail] +  static bool compareMinOnTop(const ValueDot& v1, const ValueDot& v2) {
[detail] +    return v1._value>v2._value;
[detail] +  }
[detail] +
[detail] +  static bool compareMaxOnTop(const ValueDot& v1, const ValueDot& v2) {
[detail] +    return v1._value<v2._value;
[detail]    }
[detail]    void setValue(double v) {_value=v;}
[detail]    double value() const {return _value;}
[detail] @@ -909,7 +920,11 @@
[detail]  void addDotPlot(VectorList<ValueDot>& dots, XYValuePlot * plot, int iPlot,
[detail]                   GraphicSheet * sheet)
[detail]  {
[detail] -  std::sort(dots.begin(), dots.end());
[detail] +  if(valueOrderMinOnTop) {
[detail] +    std::sort(dots.begin(), dots.end(), ValueDot::compareMinOnTop);
[detail] +  } else {
[detail] +    std::sort(dots.begin(), dots.end(), ValueDot::compareMaxOnTop);
[detail] +  }
[detail]    AxisWindow * w=plot->graph();
[detail]    VectorList<double> * x=new VectorList<double>;
[detail]    VectorList<double> * y=new VectorList<double>;
[detail]                         src/MainWindow.h:  version-2.0.7	not modified
[summary] Total differences: 76 lines
[summary] Modification level is C
OLD_DIR=$(pwd)
echo "figue"
cd $(find . -name "figue" | tail -n 1) || exit 2
pwd
dpversion C  || exit 2
cd $OLD_DIR || exit 2
################## QGpCoreWave
[detail]                      src/ArrivalTime.cpp:  version-2.3.0	not modified
[detail]                   src/AutocorrCurves.cpp:  version-2.3.0	not modified
[detail]               src/AutocorrDispersion.cpp:  version-2.3.0	not modified
[detail]                   src/AutocorrEngine.cpp:  version-2.3.0	not modified
[detail]                  src/AutocorrFactory.cpp:  version-2.3.0	not modified
[detail]                    src/AutocorrProxy.cpp:  version-2.3.0	not modified
[detail]                     src/AutocorrRing.cpp:  version-2.3.0	not modified
[detail]                       src/Dispersion.cpp:  version-2.3.0	not modified
[detail]                src/DispersionFactory.cpp:  version-2.3.0	not modified
[detail]                  src/DispersionProxy.cpp:  version-2.3.0	not modified
[detail]                      src/Ellipticity.cpp:  version-2.3.0	not modified
[detail]               src/EllipticityFactory.cpp:  version-2.3.0	not modified
[detail]                 src/EllipticityProxy.cpp:  version-2.3.0	not modified
[detail]                     src/FactoryPoint.cpp:  version-2.3.0	not modified
[detail]                 src/FortranInterface.cpp:  version-2.3.0	not modified
[detail]                 src/GeophysicalModel.cpp:  version-2.3.0	not modified
[detail]                        src/KennettSH.cpp:  version-2.3.0	modified out of comments
[detail] --- src/KennettSH.cpp-version-2.3.0-stripped	2025-09-28 04:01:01.307485137 +0200
[detail] +++ src/KennettSH.cpp-HEAD-stripped	2025-09-28 04:01:01.311485157 +0200
[detail] @@ -11,7 +11,7 @@
[detail]    {
[detail]      TRACE;
[detail]      _model=model;
[detail] -    _layerCount=_model->layerCount();
[detail] +    _layerCount=_model->numberOfLayers();
[detail]  
[detail]      ai.set(0.0, 1.0);
[detail]      pi=M_PI;
[detail]                             src/Love.cpp:  version-2.3.0	modified out of comments
[detail] --- src/Love.cpp-version-2.3.0-stripped	2025-09-28 04:01:01.331485254 +0200
[detail] +++ src/Love.cpp-HEAD-stripped	2025-09-28 04:01:01.335485272 +0200
[detail] @@ -17,7 +17,7 @@
[detail]  double Love::y(double slowness)
[detail]  {
[detail]    TRACE;
[detail] -  int i=_model->layerCount()-1;
[detail] +  int i=_model->numberOfLayers()-1;
[detail]    
[detail]    double k=_omega*slowness;
[detail]    
[detail]                     src/LoveFunction.cpp:  version-2.3.0	not modified
[detail]             src/MagnetoTelluricCurve.cpp:  version-2.3.0	modified out of comments
[detail] --- src/MagnetoTelluricCurve.cpp-version-2.3.0-stripped	2025-09-28 04:01:01.367485427 +0200
[detail] +++ src/MagnetoTelluricCurve.cpp-HEAD-stripped	2025-09-28 04:01:01.371485446 +0200
[detail] @@ -76,7 +76,7 @@
[detail]    }
[detail]  
[detail]    
[detail] -  double MagnetoTelluricCurve::misfit(int& nValues, int& nData, const MagnetoTelluricFactory& f, Misfit::Type type, double minMisfit) const
[detail] +  double MagnetoTelluricCurve::misfit(int& nValues, int& nData, const MagnetoTelluricFactory& f, const MisfitType& type, double minMisfit) const
[detail]    {
[detail]      TRACE;
[detail]      double res=0.0;
[detail]           src/MagnetoTelluricFactory.cpp:  version-2.3.0	not modified
[detail]             src/MagnetoTelluricPoint.cpp:  version-2.3.0	not modified
[detail]      src/MagnetoTelluricPointOptions.cpp:  version-2.3.0	not modified
[detail]             src/MagnetoTelluricProxy.cpp:  version-2.3.0	not modified
[detail]                       src/ModalCurve.cpp:  version-2.3.0	modified out of comments
[detail] --- src/ModalCurve.cpp-version-2.3.0-stripped	2025-09-28 04:01:01.451485833 +0200
[detail] +++ src/ModalCurve.cpp-HEAD-stripped	2025-09-28 04:01:01.455485852 +0200
[detail] @@ -104,7 +104,7 @@
[detail]  }
[detail]  
[detail]  
[detail] -double ModalCurve::misfit(int& nValues, int& nData, const ModalFactory& f, Misfit::Type type, double minMisfit) const
[detail] +double ModalCurve::misfit(int& nValues, int& nData, const ModalFactory& f, const MisfitType& type, double minMisfit) const
[detail]  {
[detail]    TRACE;
[detail]    double res=0.0;
[detail]                     src/ModalFactory.cpp:  version-2.3.0	not modified
[detail]                       src/ModalProxy.cpp:  version-2.3.0	not modified
[detail]                      src/ModalRefine.cpp:  version-2.3.0	not modified
[detail]                     src/ModalStorage.cpp:  version-2.3.0	not modified
[detail]                             src/Mode.cpp:  version-2.3.0	not modified
[detail]     src/OmnidirectionalArrayResponse.cpp:  version-2.3.0	not modified
[detail]                         src/Podvin2D.cpp:  version-2.3.0	not modified
[detail]                         src/Podvin3D.cpp:  version-2.3.0	not modified
[detail]                          src/Profile.cpp:  version-2.3.0	not modified
[detail]                      src/QGpCoreWave.cpp:  version-2.3.0	not modified
[detail]                         src/Rayleigh.cpp:  version-2.3.0	not modified
[detail]                 src/RayleighFunction.cpp:  version-2.3.0	not modified
[detail]                  src/RefractionCurve.cpp:  version-2.3.0	modified out of comments
[detail] --- src/RefractionCurve.cpp-version-2.3.0-stripped	2025-09-28 04:01:01.663486857 +0200
[detail] +++ src/RefractionCurve.cpp-HEAD-stripped	2025-09-28 04:01:01.671486897 +0200
[detail] @@ -43,7 +43,7 @@
[detail]  }
[detail]  
[detail]  
[detail] -double RefractionCurve::misfit(int& nValues, int& nData, const RefractionFactory& f, Misfit::Type type, double minMisfit) const
[detail] +double RefractionCurve::misfit(int& nValues, int& nData, const RefractionFactory& f, const MisfitType& type, double minMisfit) const
[detail]  {
[detail]    TRACE;
[detail]    double res=0;
[detail]           src/RefractionDippingModel.cpp:  version-2.3.0	modified out of comments
[detail] --- src/RefractionDippingModel.cpp-version-2.3.0-stripped	2025-09-28 04:01:01.687486973 +0200
[detail] +++ src/RefractionDippingModel.cpp-HEAD-stripped	2025-09-28 04:01:01.691486993 +0200
[detail] @@ -197,8 +197,8 @@
[detail]                                                  Seismic1DModel::SlownessType slowType)
[detail]  {
[detail]    TRACE;
[detail] -  if(_layerCount!=ref.layerCount()) {
[detail] -    _layerCount=ref.layerCount();
[detail] +  if(_layerCount!=ref.numberOfLayers()) {
[detail] +    _layerCount=ref.numberOfLayers();
[detail]      deleteData();
[detail]      allocateData();
[detail]    }
[detail]                src/RefractionFactory.cpp:  version-2.3.0	not modified
[detail]                  src/RefractionProxy.cpp:  version-2.3.0	not modified
[detail]               src/Resistivity1DModel.cpp:  version-2.3.0	not modified
[detail]                   src/Seismic1DModel.cpp:  version-2.3.0	modified out of comments
[detail] --- src/Seismic1DModel.cpp-version-2.3.0-stripped	2025-09-28 04:01:01.755487303 +0200
[detail] +++ src/Seismic1DModel.cpp-HEAD-stripped	2025-09-28 04:01:01.759487321 +0200
[detail] @@ -37,7 +37,7 @@
[detail]    QVariant Seismic1DModel::VariableN::value(const QString&) const
[detail]    {
[detail]      TRACE;
[detail] -    return _context->model()->layerCount();
[detail] +    return _context->model()->numberOfLayers();
[detail]    }
[detail]  
[detail]    QVariant Seismic1DModel::VariableH::value(const QString& index) const
[detail] @@ -46,7 +46,7 @@
[detail]      Seismic1DModel * m=_context->model();
[detail]      bool ok;
[detail]      int i=index.toInt(&ok);
[detail] -    if(ok && i>=0 && i<m->layerCount()-1) {
[detail] +    if(ok && i>=0 && i<m->numberOfLayers()-1) {
[detail]        return m->h(i);
[detail]      } else {
[detail]        return QVariant();
[detail] @@ -59,7 +59,7 @@
[detail]      Seismic1DModel * m=_context->model();
[detail]      bool ok;
[detail]      int i=index.toInt(&ok);
[detail] -    if(ok && i>=0 && i<m->layerCount()-1) {
[detail] +    if(ok && i>=0 && i<m->numberOfLayers()-1) {
[detail]        m->setH(i, val.toDouble());
[detail]      }
[detail]    }
[detail] @@ -70,7 +70,7 @@
[detail]      Seismic1DModel * m=_context->model();
[detail]      bool ok;
[detail]      int i=index.toInt(&ok);
[detail] -    if(ok && i>=0 && i<m->layerCount()) {
[detail] +    if(ok && i>=0 && i<m->numberOfLayers()) {
[detail]        return 1.0/m->slowP(i);
[detail]      } else {
[detail]        return QVariant();
[detail] @@ -83,7 +83,7 @@
[detail]      Seismic1DModel * m=_context->model();
[detail]      bool ok;
[detail]      int i=index.toInt(&ok);
[detail] -    if(ok && i>=0 && i<m->layerCount()) {
[detail] +    if(ok && i>=0 && i<m->numberOfLayers()) {
[detail]        m->setSlowP(i, 1.0/val.toDouble());
[detail]      }
[detail]    }
[detail] @@ -94,7 +94,7 @@
[detail]      Seismic1DModel * m=_context->model();
[detail]      bool ok;
[detail]      int i=index.toInt(&ok);
[detail] -    if(ok && i>=0 && i<m->layerCount()) {
[detail] +    if(ok && i>=0 && i<m->numberOfLayers()) {
[detail]        return 1.0/m->slowS(i);
[detail]      } else {
[detail]        return QVariant();
[detail] @@ -107,7 +107,7 @@
[detail]      Seismic1DModel * m=_context->model();
[detail]      bool ok;
[detail]      int i=index.toInt(&ok);
[detail] -    if(ok && i>=0 && i<m->layerCount()) {
[detail] +    if(ok && i>=0 && i<m->numberOfLayers()) {
[detail]        m->setSlowS(i, 1.0/val.toDouble());
[detail]      }
[detail]    }
[detail] @@ -118,7 +118,7 @@
[detail]      Seismic1DModel * m=_context->model();
[detail]      bool ok;
[detail]      int i=index.toInt(&ok);
[detail] -    if(ok && i>=0 && i<m->layerCount()) {
[detail] +    if(ok && i>=0 && i<m->numberOfLayers()) {
[detail]        return m->rho(i);
[detail]      } else {
[detail]        return QVariant();
[detail] @@ -131,7 +131,7 @@
[detail]      Seismic1DModel * m=_context->model();
[detail]      bool ok;
[detail]      int i=index.toInt(&ok);
[detail] -    if(ok && i>=0 && i<m->layerCount()) {
[detail] +    if(ok && i>=0 && i<m->numberOfLayers()) {
[detail]        m->setRho(i, val.toDouble());
[detail]      }
[detail]    }
[detail] @@ -142,7 +142,7 @@
[detail]      Seismic1DModel * m=_context->model();
[detail]      bool ok;
[detail]      int i=index.toInt(&ok);
[detail] -    if(ok && i>=0 && i<m->layerCount()) {
[detail] +    if(ok && i>=0 && i<m->numberOfLayers()) {
[detail]        return m->qp(i);
[detail]      } else {
[detail]        return QVariant();
[detail] @@ -155,7 +155,7 @@
[detail]      Seismic1DModel * m=_context->model();
[detail]      bool ok;
[detail]      int i=index.toInt(&ok);
[detail] -    if(ok && i>=0 && i<m->layerCount()) {
[detail] +    if(ok && i>=0 && i<m->numberOfLayers()) {
[detail]        m->setQp(i, val.toDouble());
[detail]      }
[detail]    }
[detail] @@ -166,7 +166,7 @@
[detail]      Seismic1DModel * m=_context->model();
[detail]      bool ok;
[detail]      int i=index.toInt(&ok);
[detail] -    if(ok && i>=0 && i<m->layerCount()) {
[detail] +    if(ok && i>=0 && i<m->numberOfLayers()) {
[detail]        return m->qs(i);
[detail]      } else {
[detail]        return QVariant();
[detail] @@ -179,7 +179,7 @@
[detail]      Seismic1DModel * m=_context->model();
[detail]      bool ok;
[detail]      int i=index.toInt(&ok);
[detail] -    if(ok && i>=0 && i<m->layerCount()) {
[detail] +    if(ok && i>=0 && i<m->numberOfLayers()) {
[detail]        m->setQs(i, val.toDouble());
[detail]      }
[detail]    }
[detail] @@ -190,8 +190,8 @@
[detail]    Seismic1DModel::Seismic1DModel()
[detail]    {
[detail]      TRACE;
[detail] -    _layerCount=0;
[detail] -    initMembers();
[detail] +    _numberOfLayers=0;
[detail] +    _layers=nullptr;
[detail]    }
[detail]  
[detail]    
[detail] @@ -199,64 +199,60 @@
[detail]       : GeophysicalModel(o)
[detail]    {
[detail]      TRACE;
[detail] -    _layerCount=0;
[detail] -    initMembers();
[detail] +    _numberOfLayers=0;
[detail] +    _layers=nullptr;
[detail]      operator=(o);
[detail]    }
[detail]  
[detail]    
[detail] -  Seismic1DModel::Seismic1DModel(int layerCount)
[detail] +  Seismic1DModel::Seismic1DModel(int numberOfLayers)
[detail]    {
[detail]      TRACE;
[detail] -    
[detail] -    _layerCount=layerCount;
[detail] -    initMembers();
[detail] -    allocateData();
[detail] +    _numberOfLayers=numberOfLayers;
[detail] +    _layers=new Layer[_numberOfLayers];
[detail]    }
[detail]  
[detail]    
[detail] -  Seismic1DModel::Seismic1DModel(int layerCount, double * h, double * vp, double * vs, double * rho)
[detail] +  Seismic1DModel::Seismic1DModel(int numberOfLayers, double * h, double * vp, double * vs, double * rho)
[detail]    {
[detail]      TRACE;
[detail] -    _layerCount=layerCount;
[detail] -    initMembers();
[detail] -    allocateData();
[detail] -    int i=_layerCount-1;
[detail] -    _slowP[i]=1.0/vp[i];
[detail] -    _slowS[i]=1.0/vs[i];
[detail] -    _rho[i]=rho[i];
[detail] -    _qp[i]=0.0;
[detail] -    _qs[i]=0.0;
[detail] +    _numberOfLayers=numberOfLayers;
[detail] +    _layers=new Layer[_numberOfLayers];
[detail] +    int i=_numberOfLayers-1;
[detail] +    _layers[i].slowP=1.0/vp[i];
[detail] +    _layers[i].slowS=1.0/vs[i];
[detail] +    _layers[i].rho=rho[i];
[detail] +    _layers[i].qp=0.0;
[detail] +    _layers[i].qs=0.0;
[detail]      for(i--; i>=0; i--) {
[detail] -      _h[i]=h[i];
[detail] -      _slowP[i]=1.0/vp[i];
[detail] -      _slowS[i]=1.0/vs[i];
[detail] -      _rho[i]=rho[i];
[detail] -      _qp[i]=0.0;
[detail] -      _qs[i]=0.0;
[detail] +      _layers[i].h=h[i];
[detail] +      _layers[i].slowP=1.0/vp[i];
[detail] +      _layers[i].slowS=1.0/vs[i];
[detail] +      _layers[i].rho=rho[i];
[detail] +      _layers[i].qp=0.0;
[detail] +      _layers[i].qs=0.0;
[detail]      }
[detail]    }
[detail]  
[detail]    
[detail] -  Seismic1DModel::Seismic1DModel(int layerCount, double * h, double * vs, double * rho)
[detail] +  Seismic1DModel::Seismic1DModel(int numberOfLayers, double * h, double * vs, double * rho)
[detail]    {
[detail]      TRACE;
[detail] -    _layerCount=layerCount;
[detail] -    initMembers();
[detail] -    allocateData();
[detail] -    int i=_layerCount-1;
[detail] -    _slowP[i]=0.5/vs[i];
[detail] -    _slowS[i]=1.0/vs[i];
[detail] -    _rho[i]=rho[i];
[detail] -    _qp[i]=0.0;
[detail] -    _qs[i]=0.0;
[detail] +    _numberOfLayers=numberOfLayers;
[detail] +    _layers=new Layer[_numberOfLayers];
[detail] +    int i=_numberOfLayers-1;
[detail] +    _layers[i].slowP=0.5/vs[i];
[detail] +    _layers[i].slowS=1.0/vs[i];
[detail] +    _layers[i].rho=rho[i];
[detail] +    _layers[i].qp=0.0;
[detail] +    _layers[i].qs=0.0;
[detail]      for(i--; i>=0; i--) {
[detail] -      _h[i]=h[i];
[detail] -      _slowP[i]=0.5/vs[i];
[detail] -      _slowS[i]=1.0/vs[i];
[detail] -      _rho[i]=rho[i];
[detail] -      _qp[i]=0.0;
[detail] -      _qs[i]=0.0;
[detail] +      _layers[i].h=h[i];
[detail] +      _layers[i].slowP=0.5/vs[i];
[detail] +      _layers[i].slowS=1.0/vs[i];
[detail] +      _layers[i].rho=rho[i];
[detail] +      _layers[i].qp=0.0;
[detail] +      _layers[i].qs=0.0;
[detail]      }
[detail]    }
[detail]  
[detail] @@ -264,82 +260,17 @@
[detail]    Seismic1DModel::~Seismic1DModel()
[detail]    {
[detail]      TRACE;
[detail] -    deleteData();
[detail] +    delete [] _layers;
[detail]    }
[detail]  
[detail]    
[detail] -  void Seismic1DModel::initMembers()
[detail] -  {
[detail] -    _h=nullptr;
[detail] -    _slowP=nullptr;
[detail] -    _slowS=nullptr;
[detail] -    _rho=nullptr;
[detail] -    _mu=nullptr;
[detail] -    _qp=nullptr;
[detail] -    _qs=nullptr;
[detail] -  }
[detail] -
[detail] -  
[detail] -  void Seismic1DModel::allocateData()
[detail] -  {
[detail] -    TRACE;
[detail] -    deleteData();
[detail] -    
[detail] -    if(_layerCount>0) {
[detail] -      if(_layerCount>1) {
[detail] -        _h=new double [_layerCount-1];
[detail] -      }
[detail] -      _slowP=new double [_layerCount];
[detail] -      _slowS=new double [_layerCount];
[detail] -      _rho=new double [_layerCount];
[detail] -      _mu=new double [_layerCount];
[detail] -      _qp=new double [_layerCount];
[detail] -      _qs=new double [_layerCount];
[detail] -    }
[detail] -  }
[detail] -
[detail] -  
[detail] -  void Seismic1DModel::deleteData()
[detail] -  {
[detail] -    TRACE;
[detail] -    delete [ ] _h;
[detail] -    delete [ ] _slowP;
[detail] -    delete [ ] _slowS;
[detail] -    delete [ ] _rho;
[detail] -    delete [ ] _mu;
[detail] -    delete [ ] _qp;
[detail] -    delete [ ] _qs;
[detail] -    _h=nullptr;
[detail] -    _slowP=nullptr;
[detail] -    _slowS=nullptr;
[detail] -    _rho=nullptr;
[detail] -    _mu=nullptr;
[detail] -    _qp=nullptr;
[detail] -    _qs=nullptr;
[detail] -  }
[detail] -
[detail]    
[detail]    void Seismic1DModel::operator=(const Seismic1DModel& o)
[detail]    {
[detail] -    deleteData();
[detail] -    _layerCount=o._layerCount;
[detail] -    allocateData();
[detail] -    int i=_layerCount-1;
[detail] -    _slowP[i]=o._slowP[i];
[detail] -    _slowS[i]=o._slowS[i];
[detail] -    _rho[i]=o._rho[i];
[detail] -    _mu[i]=o._mu[i];
[detail] -    _qp[i]=o._qp[i];
[detail] -    _qs[i]=o._qs[i];
[detail] -    for(i--; i>=0; i--) {
[detail] -      _h[i]=o._h[i];
[detail] -      _slowP[i] =o. _slowP[i];
[detail] -      _slowS[i]=o._slowS[i];
[detail] -      _rho[i]=o._rho[i];
[detail] -      _mu[i]=o._mu[i];
[detail] -      _qp[i]=o._qp[i];
[detail] -      _qs[i]=o._qs[i];
[detail] -    }
[detail] +    _numberOfLayers=o._numberOfLayers;
[detail] +    delete [] _layers;
[detail] +    _layers=new Layer[_numberOfLayers];
[detail] +    memcpy(_layers, o._layers, _numberOfLayers*sizeof(Layer));
[detail]      
[detail]      _slowSMin=o._slowSMin;
[detail]      _slowSMax=o._slowSMax;
[detail] @@ -352,8 +283,10 @@
[detail]      TRACE;
[detail]      bool ret=true;
[detail]      
[detail] -    for(int i=0;i<_layerCount;i++) {
[detail] -      if(_slowS[i]!=0) _mu[i]=_rho[i]/ (_slowS[i]*_slowS[i]);
[detail] +    for(int i=0;i<_numberOfLayers;i++) {
[detail] +      if(_layers[i].slowS!=0) {
[detail] +        _layers[i].mu=_layers[i].rho/ (_layers[i].slowS*_layers[i].slowS);
[detail] +      }
[detail]      }
[detail]      
[detail]      int iSlowSMax;
[detail] @@ -367,9 +300,9 @@
[detail]    bool Seismic1DModel::checkPoissonRatio()
[detail]    {
[detail]      TRACE;
[detail] -    for(int i=0;i<_layerCount;i++) {
[detail] -      double sp=_slowP[i];
[detail] -      double ss=_slowS[i];
[detail] +    for(int i=0;i<_numberOfLayers;i++) {
[detail] +      double sp=_layers[i].slowP;
[detail] +      double ss=_layers[i].slowS;
[detail]        if(ss<=0 || sp*::sqrt(2.0)>=ss) {
[detail]          double sp2=sp*sp;
[detail]          double ss2=ss*ss;
[detail] @@ -387,14 +320,14 @@
[detail]      TRACE;
[detail]      _slowSMin=std::numeric_limits<double>::infinity();
[detail]      _slowSMax=-std::numeric_limits<double>::infinity();
[detail] -    for(int i=0;i<_layerCount;i++) {
[detail] -      if(_slowS[i]>_slowSMax) {
[detail] -        _slowSMax=_slowS[i];
[detail] +    for(int i=0;i<_numberOfLayers;i++) {
[detail] +      if(_layers[i].slowS>_slowSMax) {
[detail] +        _slowSMax=_layers[i].slowS;
[detail]          iSlowSMax=i;
[detail]        }
[detail]        
[detail]        
[detail] -      if(_slowS[i]<_slowSMin) _slowSMin=_slowS[i];
[detail] +      if(_layers[i].slowS<_slowSMin) _slowSMin=_layers[i].slowS;
[detail]      }
[detail]      
[detail]      
[detail] @@ -429,7 +362,6 @@
[detail]      p.setCoefficient(2, -8.0);
[detail]      p.setCoefficient(3, 1.0);
[detail]      VectorList<double> roots=p.realRoots();
[detail] -    ASSERT(roots.count()==1);  
[detail]      return sqrt(roots.first());
[detail]    }
[detail]  
[detail] @@ -509,7 +441,7 @@
[detail]    double Seismic1DModel::halfSpaceRayleighSlowness(int iLayer) const
[detail]    {
[detail]      TRACE;
[detail] -    return _slowS[iLayer]/rayleighRelativeVelocity(poisson(iLayer));
[detail] +    return _layers[iLayer].slowS/rayleighRelativeVelocity(poisson(iLayer));
[detail]    }
[detail]  
[detail]    
[detail] @@ -535,8 +467,8 @@
[detail]    int Seismic1DModel::checkVelocityInversion() const
[detail]    {
[detail]      TRACE;
[detail] -    for(int i=1;i<_layerCount;i++) {
[detail] -      if(_slowS[i]>_slowS[i-1] || _slowP[i]>_slowP[i-1]) {
[detail] +    for(int i=1;i<_numberOfLayers;i++) {
[detail] +      if(_layers[i].slowS>_layers[i-1].slowS || _layers[i].slowP>_layers[i-1].slowP) {
[detail]          return i;
[detail]        }
[detail]      }
[detail] @@ -559,12 +491,12 @@
[detail]    double Seismic1DModel::depth(int iLayer) const
[detail]    {
[detail]      TRACE;
[detail] -    if(iLayer>=_layerCount) {
[detail] -      iLayer=_layerCount-1;
[detail] +    if(iLayer>=_numberOfLayers) {
[detail] +      iLayer=_numberOfLayers-1;
[detail]      }
[detail]      double d=0;
[detail]      for(int i=0;i<iLayer;i++) {
[detail] -      d+=_h[i];
[detail] +      d+=_layers[i].h;
[detail]      }
[detail]      return d;
[detail]    }
[detail] @@ -573,17 +505,17 @@
[detail]    double Seismic1DModel::expGrad(int iLayer) const
[detail]    {
[detail]      TRACE;
[detail] -    if(iLayer>=_layerCount-1) {
[detail] -      iLayer=_layerCount-2;
[detail] +    if(iLayer>=_numberOfLayers-1) {
[detail] +      iLayer=_numberOfLayers-2;
[detail]      }
[detail]      if(iLayer<0) {
[detail]        return 0.0;
[detail]      }
[detail] -    double v1=1.0/_slowS[iLayer];
[detail] -    double v2=1.0/_slowS[iLayer+1];
[detail] +    double v1=1.0/_layers[iLayer].slowS;
[detail] +    double v2=1.0/_layers[iLayer+1].slowS;
[detail]      double z0=depth(iLayer)+1;
[detail] -    double z1=z0+0.5*_h[iLayer];
[detail] -    double z2=z0+_h[iLayer]+0.5*_h[iLayer+1];
[detail] +    double z1=z0+0.5*_layers[iLayer].h;
[detail] +    double z2=z0+_layers[iLayer].h+0.5*_layers[iLayer+1].h;
[detail]      double v21=v2/v1;
[detail]      double v211=v21-1;
[detail]      
[detail] @@ -605,16 +537,16 @@
[detail]      
[detail]      Profile p=slowsProfile();
[detail]      p.average();
[detail] -    return p.values()[_layerCount-1]/(4*depth(_layerCount-1));
[detail] +    return p.values()[_numberOfLayers-1]/(4*depth(_numberOfLayers-1));
[detail]    }
[detail]  
[detail]    
[detail]    double Seismic1DModel::poisson(int iLayer) const
[detail]    {
[detail]      TRACE;
[detail] -    double slowP2=_slowP[iLayer];
[detail] +    double slowP2=_layers[iLayer].slowP;
[detail]      slowP2*=slowP2;
[detail] -    double slowS2=_slowS[iLayer];
[detail] +    double slowS2=_layers[iLayer].slowS;
[detail]      slowS2*=slowS2;
[detail]      return (slowP2-0.5*slowS2)/(slowP2-slowS2);
[detail]    }
[detail] @@ -629,8 +561,8 @@
[detail]    
[detail]    bool Seismic1DModel::elastic() const
[detail]    {
[detail] -    for(int i=_layerCount-1;i>=0;i--) {
[detail] -      if(_qp[i]>0.0 || _qs[i]>0.0) return false;
[detail] +    for(int i=_numberOfLayers-1;i>=0;i--) {
[detail] +      if(_layers[i].qp>0.0 || _layers[i].qs>0.0) return false;
[detail]      }
[detail]      return true;
[detail]    }
[detail] @@ -678,55 +610,55 @@
[detail]      field=fields.nextField(ptr);
[detail]      if(field.isValid()) {
[detail]        bool ok=true;
[detail] -      _layerCount=field.toInt(ok);
[detail] +      _numberOfLayers=field.toInt(ok);
[detail]        if(!ok && !field.isEmpty()) { 
[detail]          App::log(tr("Layered model: bad number of layers: \"%1\" interpreted as %2\n")
[detail] -                     .arg(field.toStringView()).arg(_layerCount) );
[detail] -         _layerCount=0;
[detail] +                     .arg(field.toStringView()).arg(_numberOfLayers) );
[detail] +         _numberOfLayers=0;
[detail]           return false;
[detail]        }
[detail]      } else {
[detail] -      _layerCount=0;
[detail] +      _numberOfLayers=0;
[detail]        return true;  
[detail]      }
[detail] -    if(_layerCount>1 && !s.atEnd()) {
[detail] -      allocateData();
[detail] +    if(_numberOfLayers>1 && !s.atEnd()) {
[detail] +      _layers=new Layer[_numberOfLayers];
[detail]        
[detail] -      for(int i=0; i<_layerCount; i++) {
[detail] +      for(int i=0; i<_numberOfLayers; i++) {
[detail]          if(s.atEnd()) {
[detail]            App::log(tr("Layered model: reaching the end of file, %1 layers found, expecting %2\n")
[detail] -                         .arg(i).arg(_layerCount));
[detail] -          _layerCount=0;
[detail] +                         .arg(i).arg(_numberOfLayers));
[detail] +          _numberOfLayers=0;
[detail]            return false;
[detail]          }
[detail]          buf=File::readLineNoComments(s, comments);
[detail]          fields.set(buf);
[detail]          fields.trimmed();
[detail]          ptr=0;
[detail] -        if(i<_layerCount-1) {
[detail] +        if(i<_numberOfLayers-1) {
[detail]            field=fields.nextField(ptr);
[detail] -          if(!setValue(_h[i], field, i, tr("thickness"), false)) return false;
[detail] +          if(!setValue(_layers[i].h, field, i, tr("thickness"), false)) return false;
[detail]          } else {
[detail]            fields.nextField(ptr);
[detail]          }
[detail]          field=fields.nextField(ptr);
[detail] -        if(!setValue(_slowP[i], field, i, tr("Vp"), false)) return false;
[detail] +        if(!setValue(_layers[i].slowP, field, i, tr("Vp"), false)) return false;
[detail]          field=fields.nextField(ptr);
[detail] -        if(!setValue(_slowS[i], field, i, tr("Vs"), false)) return false;
[detail] +        if(!setValue(_layers[i].slowS, field, i, tr("Vs"), false)) return false;
[detail]          field=fields.nextField(ptr);
[detail] -        if(!setValue(_rho[i], field, i, tr("density"), false)) return false;
[detail] +        if(!setValue(_layers[i].rho, field, i, tr("density"), false)) return false;
[detail]          
[detail]          field=fields.nextField(ptr);
[detail] -        if(!setValue(_qp[i], field, i, tr("Qp"), true)) _qp[i]=0.0;
[detail] +        if(!setValue(_layers[i].qp, field, i, tr("Qp"), true)) _layers[i].qp=0.0;
[detail]          field=fields.nextField(ptr);
[detail] -        if(!setValue(_qs[i], field, i, tr("Qs"), true)) _qs[i]=0.0;
[detail] +        if(!setValue(_layers[i].qs, field, i, tr("Qs"), true)) _layers[i].qs=0.0;
[detail]          
[detail] -        _slowP[i]=1/_slowP[i];
[detail] -        _slowS[i]=1/_slowS[i];
[detail] +        _layers[i].slowP=1/_layers[i].slowP;
[detail] +        _layers[i].slowS=1/_layers[i].slowS;
[detail]        }
[detail]        return initCalculation();
[detail]      } else {
[detail] -      _layerCount=0;
[detail] +      _numberOfLayers=0;
[detail]        return false;
[detail]      }
[detail]    }
[detail] @@ -737,34 +669,34 @@
[detail]      TRACE;
[detail]      static const QString str4("%1 %2 %3 %4\n");
[detail]      static const QString str6("%1 %2 %3 %4 %5 %6\n");
[detail] -    s << _layerCount << "\n";
[detail] -    int nl1=_layerCount-1;
[detail] +    s << _numberOfLayers << "\n";
[detail] +    int nl1=_numberOfLayers-1;
[detail]      if(elastic()) {
[detail]        for(int i=0; i<nl1; i++) {
[detail] -        s << str4.arg(_h[i], 0, 'g', 20)
[detail] -                 .arg(_slowP[i]==0.0 ? 0.0 : 1/_slowP[i], 0, 'g', 20)
[detail] -                 .arg(_slowS[i]==0.0 ? 0.0 : 1/_slowS[i], 0, 'g', 20)
[detail] -                 .arg(_rho[i], 0, 'g', 20);
[detail] +        s << str4.arg(_layers[i].h, 0, 'g', 20)
[detail] +                 .arg(_layers[i].slowP==0.0 ? 0.0 : 1/_layers[i].slowP, 0, 'g', 20)
[detail] +                 .arg(_layers[i].slowS==0.0 ? 0.0 : 1/_layers[i].slowS, 0, 'g', 20)
[detail] +                 .arg(_layers[i].rho, 0, 'g', 20);
[detail]        }
[detail]        s << str4.arg(0.0, 0, 'g', 20)
[detail] -               .arg(_slowP[_layerCount-1]==0.0 ? 0.0 : 1/_slowP[_layerCount-1], 0, 'g', 20)
[detail] -               .arg(_slowS[_layerCount-1]==0.0 ? 0.0 : 1/_slowS[_layerCount-1], 0, 'g', 20)
[detail] -               .arg(_rho[_layerCount-1], 0, 'g', 20) << Qt::flush;
[detail] +               .arg(_layers[_numberOfLayers-1].slowP==0.0 ? 0.0 : 1/_layers[_numberOfLayers-1].slowP, 0, 'g', 20)
[detail] +               .arg(_layers[_numberOfLayers-1].slowS==0.0 ? 0.0 : 1/_layers[_numberOfLayers-1].slowS, 0, 'g', 20)
[detail] +               .arg(_layers[_numberOfLayers-1].rho, 0, 'g', 20) << Qt::flush;
[detail]       } else {
[detail]        for(int i=0; i<nl1; i++) {
[detail] -        s << str6.arg(_h[i], 0, 'g', 20)
[detail] -                 .arg(_slowP[i]==0.0 ? 0.0 : 1/_slowP[i], 0, 'g', 20)
[detail] -                 .arg(_slowS[i]==0.0 ? 0.0 : 1/_slowS[i], 0, 'g', 20)
[detail] -                 .arg(_rho[i], 0, 'g', 20)
[detail] -                 .arg(_qp[i], 0, 'g', 20)
[detail] -                 .arg(_qs[i], 0, 'g', 20);
[detail] +        s << str6.arg(_layers[i].h, 0, 'g', 20)
[detail] +                 .arg(_layers[i].slowP==0.0 ? 0.0 : 1/_layers[i].slowP, 0, 'g', 20)
[detail] +                 .arg(_layers[i].slowS==0.0 ? 0.0 : 1/_layers[i].slowS, 0, 'g', 20)
[detail] +                 .arg(_layers[i].rho, 0, 'g', 20)
[detail] +                 .arg(_layers[i].qp, 0, 'g', 20)
[detail] +                 .arg(_layers[i].qs, 0, 'g', 20);
[detail]        }
[detail]        s << str6.arg(0.0, 0, 'g', 20)
[detail] -               .arg(_slowP[_layerCount-1]==0.0 ? 0.0 : 1/_slowP[_layerCount-1], 0, 'g', 20)
[detail] -               .arg(_slowS[_layerCount-1]==0.0 ? 0.0 : 1/_slowS[_layerCount-1], 0, 'g', 20)
[detail] -               .arg(_rho[_layerCount-1], 0, 'g', 20)
[detail] -               .arg(_qp[_layerCount-1], 0, 'g', 20)
[detail] -               .arg(_qs[_layerCount-1], 0, 'g', 20) << Qt::flush;
[detail] +               .arg(_layers[_numberOfLayers-1].slowP==0.0 ? 0.0 : 1/_layers[_numberOfLayers-1].slowP, 0, 'g', 20)
[detail] +               .arg(_layers[_numberOfLayers-1].slowS==0.0 ? 0.0 : 1/_layers[_numberOfLayers-1].slowS, 0, 'g', 20)
[detail] +               .arg(_layers[_numberOfLayers-1].rho, 0, 'g', 20)
[detail] +               .arg(_layers[_numberOfLayers-1].qp, 0, 'g', 20)
[detail] +               .arg(_layers[_numberOfLayers-1].qs, 0, 'g', 20) << Qt::flush;
[detail]       }
[detail]    }
[detail]  
[detail] @@ -773,20 +705,20 @@
[detail]    {
[detail]      TRACE;
[detail]      QString str;
[detail] -    str=QString("%1 layers\n").arg(_layerCount);
[detail] +    str=QString("%1 layers\n").arg(_numberOfLayers);
[detail]      str+="          H(m)       Vp(m/s)       Vs(m/s)    Rho(kg/m3)\n";
[detail] -    int nl1=_layerCount-1;
[detail] +    int nl1=_numberOfLayers-1;
[detail]      for(int i=0; i<nl1; i++) {
[detail] -      str+=QString::number(_h[i],'f',1).leftJustified(14,' ',true);
[detail] -      str+=QString::number(1/_slowP[i],'f',1).leftJustified(14,' ',true);
[detail] -      str+=QString::number(1/_slowS[i],'f',1).leftJustified(14,' ',true);
[detail] -      str+=QString::number(_rho[i],'f',1).leftJustified(14,' ',true);
[detail] +      str+=QString::number(_layers[i].h,'f',1).leftJustified(14,' ',true);
[detail] +      str+=QString::number(1/_layers[i].slowP,'f',1).leftJustified(14,' ',true);
[detail] +      str+=QString::number(1/_layers[i].slowS,'f',1).leftJustified(14,' ',true);
[detail] +      str+=QString::number(_layers[i].rho,'f',1).leftJustified(14,' ',true);
[detail]        str+="\n";
[detail]      }
[detail]      str+=QString("-").leftJustified(14,' ',true);
[detail] -    str+=QString::number(1/_slowP[_layerCount-1],'f',1).leftJustified(14,' ',true);
[detail] -    str+=QString::number(1/_slowS[_layerCount-1],'f',1).leftJustified(14,' ',true);
[detail] -    str+=QString::number(_rho[_layerCount-1],'f',1).leftJustified(14,' ',true);
[detail] +    str+=QString::number(1/_layers[_numberOfLayers-1].slowP,'f',1).leftJustified(14,' ',true);
[detail] +    str+=QString::number(1/_layers[_numberOfLayers-1].slowS,'f',1).leftJustified(14,' ',true);
[detail] +    str+=QString::number(_layers[_numberOfLayers-1].rho,'f',1).leftJustified(14,' ',true);
[detail]      str+="\n";
[detail]      return str;
[detail]    }
[detail] @@ -797,34 +729,34 @@
[detail]      TRACE;
[detail]      static const QString str("%1 %2 %3 %4 1\n");
[detail]      s << "2 1 0 2.25 250 1\n";
[detail] -    int nl1=_layerCount-1;
[detail] +    int nl1=_numberOfLayers-1;
[detail]      for(int i=0;i<nl1;i++) {
[detail] -      s << str.arg(_h[i], 0, 'f', 15)
[detail] -              .arg(1/_slowP[i], 0, 'f', 15)
[detail] -              .arg(1/_slowS[i], 0, 'f', 15)
[detail] -              .arg(_rho[i], 0, 'f', 15);
[detail] +      s << str.arg(_layers[i].h, 0, 'f', 15)
[detail] +              .arg(1/_layers[i].slowP, 0, 'f', 15)
[detail] +              .arg(1/_layers[i].slowS, 0, 'f', 15)
[detail] +              .arg(_layers[i].rho, 0, 'f', 15);
[detail]      }
[detail]      s << str.arg(0.0, 0, 'f', 20)
[detail] -            .arg(1/_slowP[_layerCount-1], 0, 'f', 20)
[detail] -            .arg(1/_slowS[_layerCount-1], 0, 'f', 20)
[detail] -            .arg(_rho[_layerCount-1], 0, 'f', 20) << Qt::flush;
[detail] +            .arg(1/_layers[_numberOfLayers-1].slowP, 0, 'f', 20)
[detail] +            .arg(1/_layers[_numberOfLayers-1].slowS, 0, 'f', 20)
[detail] +            .arg(_layers[_numberOfLayers-1].rho, 0, 'f', 20) << Qt::flush;
[detail]    }
[detail]  
[detail]    
[detail]    void Seismic1DModel::toStream(QDataStream& s) const
[detail]    {
[detail]      TRACE;
[detail] -    s << _layerCount;
[detail] -    int nl1=_layerCount-1;
[detail] +    s << _numberOfLayers;
[detail] +    int nl1=_numberOfLayers-1;
[detail]      for(int i=0;i<nl1;i++) {
[detail] -      s << _h[i];
[detail] -      s << _slowP[i];
[detail] -      s << _slowS[i];
[detail] -      s << _rho[i];
[detail] -    }
[detail] -    s << _slowP[_layerCount-1];
[detail] -    s << _slowS[_layerCount-1];
[detail] -    s << _rho[_layerCount-1];
[detail] +      s << _layers[i].h;
[detail] +      s << _layers[i].slowP;
[detail] +      s << _layers[i].slowS;
[detail] +      s << _layers[i].rho;
[detail] +    }
[detail] +    s << _layers[_numberOfLayers-1].slowP;
[detail] +    s << _layers[_numberOfLayers-1].slowS;
[detail] +    s << _layers[_numberOfLayers-1].rho;
[detail]    }
[detail]  
[detail]    
[detail] @@ -833,22 +765,22 @@
[detail]      TRACE;
[detail]      int n;
[detail]      s >> n;
[detail] -    if(n>_layerCount) {
[detail] -      n=_layerCount;
[detail] +    if(n>_numberOfLayers) {
[detail] +      n=_numberOfLayers;
[detail]      } else if(n<0) {
[detail]        App::log(tr("Seismic1DModel::fromStream: null number of layers\n") );
[detail]        return;
[detail]      }
[detail]      n--;
[detail]      for(int i=0; i<n; i++) {
[detail] -      s >> _h[i];
[detail] -      s >> _slowP[i];
[detail] -      s >> _slowS[i];
[detail] -      s >> _rho[i];
[detail] -    }
[detail] -    s >> _slowP[n];
[detail] -    s >> _slowS[n];
[detail] -    s >> _rho[n];
[detail] +      s >> _layers[i].h;
[detail] +      s >> _layers[i].slowP;
[detail] +      s >> _layers[i].slowS;
[detail] +      s >> _layers[i].rho;
[detail] +    }
[detail] +    s >> _layers[n].slowP;
[detail] +    s >> _layers[n].slowS;
[detail] +    s >> _layers[n].rho;
[detail]    }
[detail]  
[detail]    
[detail] @@ -856,17 +788,17 @@
[detail]    {
[detail]      TRACE;
[detail]      Profile p;
[detail] -    p.resize(_layerCount);
[detail] +    p.resize(_numberOfLayers);
[detail]      double d=0;
[detail]      int i;
[detail] -    int nl1=_layerCount-1;
[detail] +    int nl1=_numberOfLayers-1;
[detail]      for(i=0; i<nl1; i++) {
[detail] -      d+= _h[i];
[detail] +      d+= _layers[i].h;
[detail]        p.setDepth(i, d);
[detail] -      p.setValue(i, _slowP[i]);
[detail] +      p.setValue(i, _layers[i].slowP);
[detail]      }
[detail]      p.setDepth(i, std::numeric_limits<double>::infinity());
[detail] -    p.setValue(i, _slowP[i]);
[detail] +    p.setValue(i, _layers[i].slowP);
[detail]      return p;
[detail]    }
[detail]  
[detail] @@ -875,17 +807,17 @@
[detail]    {
[detail]      TRACE;
[detail]      Profile p;
[detail] -    p.resize(_layerCount);
[detail] +    p.resize(_numberOfLayers);
[detail]      double d=0;
[detail]      int i;
[detail] -    int nl1=_layerCount-1;
[detail] +    int nl1=_numberOfLayers-1;
[detail]      for(i=0;i<nl1;i++) {
[detail] -      d+= _h[i];
[detail] +      d+= _layers[i].h;
[detail]        p.setDepth(i, d);
[detail] -      p.setValue(i, _slowS[i] );
[detail] +      p.setValue(i, _layers[i].slowS );
[detail]      }
[detail]      p.setDepth(i, std::numeric_limits<double>::infinity());
[detail] -    p.setValue(i, _slowS[i] );
[detail] +    p.setValue(i, _layers[i].slowS );
[detail]      return p;
[detail]    }
[detail]  
[detail] @@ -894,17 +826,17 @@
[detail]    {
[detail]      TRACE;
[detail]      Profile p;
[detail] -    p.resize(_layerCount);
[detail] +    p.resize(_numberOfLayers);
[detail]      double d=0;
[detail]      int i;
[detail] -    int nl1=_layerCount-1;
[detail] +    int nl1=_numberOfLayers-1;
[detail]      for(i=0; i<nl1; i++) {
[detail] -      d+= _h[i];
[detail] +      d+= _layers[i].h;
[detail]        p.setDepth(i, d);
[detail] -      p.setValue(i, _rho[i]);
[detail] +      p.setValue(i, _layers[i].rho);
[detail]      }
[detail]      p.setDepth(i, std::numeric_limits<double>::infinity());
[detail] -    p.setValue(i, _rho[i]);
[detail] +    p.setValue(i, _layers[i].rho);
[detail]      return p;
[detail]    }
[detail]  
[detail] @@ -913,12 +845,12 @@
[detail]    {
[detail]      TRACE;
[detail]      Profile p;
[detail] -    p.resize(_layerCount);
[detail] +    p.resize(_numberOfLayers);
[detail]      double d=0;
[detail]      int i;
[detail] -    int nl1=_layerCount-1;
[detail] +    int nl1=_numberOfLayers-1;
[detail]      for(i=0; i<nl1; i++) {
[detail] -      d+= _h[i];
[detail] +      d+= _layers[i].h;
[detail]        p.setDepth(i, d);
[detail]        p.setValue(i, poisson(i));
[detail]      }
[detail] @@ -932,17 +864,17 @@
[detail]    {
[detail]      TRACE;
[detail]      Profile p;
[detail] -    p.resize(_layerCount);
[detail] +    p.resize(_numberOfLayers);
[detail]      double d=0;
[detail]      int i;
[detail] -    int nl1=_layerCount-1;
[detail] +    int nl1=_numberOfLayers-1;
[detail]      for(i=0; i<nl1; i++) {
[detail] -      d+= _h[i];
[detail] +      d+= _layers[i].h;
[detail]        p.setDepth(i, d);
[detail] -      p.setValue(i, _rho[i]/_slowS[i]);
[detail] +      p.setValue(i, _layers[i].rho/_layers[i].slowS);
[detail]      }
[detail]      p.setDepth(i, std::numeric_limits<double>::infinity());
[detail] -    p.setValue(i, _rho[i]/_slowS[i]);
[detail] +    p.setValue(i, _layers[i].rho/_layers[i].slowS);
[detail]      return p;
[detail]    }
[detail]  
[detail] @@ -950,109 +882,109 @@
[detail]    {
[detail]      TRACE;
[detail]      double d=0;
[detail] -    int nl1=_layerCount-1;
[detail] +    int nl1=_numberOfLayers-1;
[detail]      for(int i=0; i<nl1; i++) {
[detail] -      d+=_h[i];
[detail] +      d+=_layers[i].h;
[detail]        if(depth<d) {
[detail] -        return 1/_slowP[i];
[detail] +        return 1/_layers[i].slowP;
[detail]        }
[detail]      }
[detail] -    return 1/_slowP[_layerCount-1];
[detail] +    return 1/_layers[_numberOfLayers-1].slowP;
[detail]    }
[detail]  
[detail]    double Seismic1DModel::vsAt(double depth) const
[detail]    {
[detail]      TRACE;
[detail]      double d=0;
[detail] -    int nl1=_layerCount-1;
[detail] +    int nl1=_numberOfLayers-1;
[detail]      for(int i=0; i<nl1; i++) {
[detail] -      d+=_h[i];
[detail] +      d+=_layers[i].h;
[detail]        if(depth<d) {
[detail] -        return 1/_slowS[i];
[detail] +        return 1/_layers[i].slowS;
[detail]        }
[detail]      }
[detail] -    return 1/_slowS[_layerCount-1];
[detail] +    return 1/_layers[_numberOfLayers-1].slowS;
[detail]    }
[detail]  
[detail]    double Seismic1DModel::slowPAt(double depth) const
[detail]    {
[detail]      TRACE;
[detail]      double d=0;
[detail] -    int nl1=_layerCount-1;
[detail] +    int nl1=_numberOfLayers-1;
[detail]      for(int i=0; i<nl1; i++) {
[detail] -      d+=_h[i];
[detail] +      d+=_layers[i].h;
[detail]        if(depth<d) {
[detail] -        return _slowP[i];
[detail] +        return _layers[i].slowP;
[detail]        }
[detail]      }
[detail] -    return _slowP[_layerCount-1];
[detail] +    return _layers[_numberOfLayers-1].slowP;
[detail]    }
[detail]  
[detail]    double Seismic1DModel::slowSAt(double depth) const
[detail]    {
[detail]      TRACE;
[detail]      double d=0;
[detail] -    int nl1=_layerCount-1;
[detail] +    int nl1=_numberOfLayers-1;
[detail]      for(int i=0; i<nl1; i++) {
[detail] -      d+=_h[i];
[detail] +      d+=_layers[i].h;
[detail]        if(depth<d) {
[detail] -        return _slowS[i];
[detail] +        return _layers[i].slowS;
[detail]        }
[detail]      }
[detail] -    return _slowS[_layerCount-1];
[detail] +    return _layers[_numberOfLayers-1].slowS;
[detail]    }
[detail]  
[detail]    double Seismic1DModel::rhoAt(double depth) const
[detail]    {
[detail]      TRACE;
[detail]      double d=0;
[detail] -    int nl1=_layerCount-1;
[detail] +    int nl1=_numberOfLayers-1;
[detail]      for(int i=0; i<nl1; i++) {
[detail] -      d+=_h[i];
[detail] -      if(depth<d) return _rho[i];
[detail] +      d+=_layers[i].h;
[detail] +      if(depth<d) return _layers[i].rho;
[detail]      }
[detail] -    return _rho[_layerCount-1];
[detail] +    return _layers[_numberOfLayers-1].rho;
[detail]    }
[detail]  
[detail]    double Seismic1DModel::poissonAt(double depth) const
[detail]    {
[detail]      TRACE;
[detail]      double d=0;
[detail] -    int nl1=_layerCount-1;
[detail] +    int nl1=_numberOfLayers-1;
[detail]      for(int i=0; i<nl1; i++) {
[detail] -      d+=_h[i];
[detail] +      d+=_layers[i].h;
[detail]        if(depth<d) return poisson(i);
[detail]      }
[detail] -    return poisson(_layerCount-1);
[detail] +    return poisson(_numberOfLayers-1);
[detail]    }
[detail]  
[detail]    double Seismic1DModel::impedanceAt(double depth) const
[detail]    {
[detail]      TRACE;
[detail]      double d=0;
[detail] -    int nl1=_layerCount-1;
[detail] +    int nl1=_numberOfLayers-1;
[detail]      for(int i=0; i<nl1; i++) {
[detail] -      d+=_h[i];
[detail] +      d+=_layers[i].h;
[detail]        if(depth<d) {
[detail] -        return _rho[i]/_slowS[i];
[detail] +        return _layers[i].rho/_layers[i].slowS;
[detail]        }
[detail]      }
[detail] -    return _rho[_layerCount-1]/_slowS[_layerCount-1];
[detail] +    return _layers[_numberOfLayers-1].rho/_layers[_numberOfLayers-1].slowS;
[detail]    }
[detail]  
[detail]    void Seismic1DModel::setQp(double v)
[detail]    {
[detail]      TRACE;
[detail] -    for(int i=0; i<_layerCount; i++) {
[detail] -      _qp[i]=v;
[detail] +    for(int i=0; i<_numberOfLayers; i++) {
[detail] +      _layers[i].qp=v;
[detail]      }
[detail]    }
[detail]  
[detail]    void Seismic1DModel::setQs(double v)
[detail]    {
[detail]      TRACE;
[detail] -    for(int i=0; i<_layerCount; i++) {
[detail] -      _qs[i]=v;
[detail] +    for(int i=0; i<_numberOfLayers; i++) {
[detail] +      _layers[i].qs=v;
[detail]      }
[detail]    }
[detail]  
[detail] @@ -1060,49 +992,132 @@
[detail]    void Seismic1DModel::changeHKeepOtherDepth(int iLayer, double newH)
[detail]    {
[detail]      TRACE;
[detail] -    if(iLayer>=_layerCount-1) return;
[detail] -    if(iLayer==_layerCount-2 || newH>=_h[iLayer]+_h[iLayer+1]) {
[detail] -      _h[iLayer]=newH;
[detail] +    if(iLayer>=_numberOfLayers-1) return;
[detail] +    if(iLayer==_numberOfLayers-2 || newH>=_layers[iLayer].h+_layers[iLayer+1].h) {
[detail] +      _layers[iLayer].h=newH;
[detail]        return;
[detail]      }
[detail] -    double dH=newH-_h[iLayer];
[detail] -    _h[iLayer]=newH;
[detail] -    _h[iLayer+1]-=dH;
[detail] +    double dH=newH-_layers[iLayer].h;
[detail] +    _layers[iLayer].h=newH;
[detail] +    _layers[iLayer+1].h-=dH;
[detail]    }
[detail]  
[detail]    
[detail]    void Seismic1DModel::changeVpKeepPoisson(int iLayer, double newV)
[detail]    {
[detail]      TRACE;
[detail] -    if(iLayer>_layerCount-1) return;
[detail] +    if(iLayer>_numberOfLayers-1) return;
[detail]      
[detail]      
[detail] -    double ratio=_slowS[iLayer]/_slowP[iLayer];
[detail] -    _slowP[iLayer]=1.0/newV;
[detail] -    _slowS[iLayer]=ratio*_slowP[iLayer];
[detail] +    double ratio=_layers[iLayer].slowS/_layers[iLayer].slowP;
[detail] +    _layers[iLayer].slowP=1.0/newV;
[detail] +    _layers[iLayer].slowS=ratio*_layers[iLayer].slowP;
[detail]    }
[detail]  
[detail]    
[detail]    void Seismic1DModel::changeVsKeepPoisson(int iLayer, double newV)
[detail]    {
[detail]      TRACE;
[detail] -    if(iLayer>_layerCount-1) return;
[detail] +    if(iLayer>_numberOfLayers-1) return;
[detail]      
[detail]      
[detail] -    double ratio=_slowP[iLayer]/_slowS[iLayer];
[detail] -    _slowS[iLayer]=1.0/newV;
[detail] -    _slowP[iLayer]=ratio*_slowS[iLayer];
[detail] +    double ratio=_layers[iLayer].slowP/_layers[iLayer].slowS;
[detail] +    _layers[iLayer].slowS=1.0/newV;
[detail] +    _layers[iLayer].slowP=ratio*_layers[iLayer].slowS;
[detail] +  }
[detail] +
[detail] +  
[detail] +  void Seismic1DModel::addVsPerturbation(double depth, double thickness, double deltaVs)
[detail] +  {
[detail] +    double bottomDepth=depth+thickness;
[detail] +    double layerBottomDepth=0.0;
[detail] +    int iLayer;
[detail] +    int lastLayer=_numberOfLayers-1;
[detail] +    Layer * newLayers=nullptr;
[detail] +    for(iLayer=0; iLayer<lastLayer; iLayer++) {
[detail] +      if(depth==layerBottomDepth) {            
[detail] +        newLayers=new Layer[_numberOfLayers+1];
[detail] +        memcpy(newLayers, _layers, (iLayer+1)*sizeof(Layer));
[detail] +        memcpy(newLayers+iLayer+1, _layers+iLayer, sizeof(Layer));
[detail] +        memcpy(newLayers+iLayer+2, _layers+iLayer+1, (_numberOfLayers-iLayer-1)*sizeof(Layer));
[detail] +        newLayers[iLayer].h=thickness;
[detail] +        newLayers[iLayer+1].h=layerBottomDepth+_layers[iLayer].h-bottomDepth;
[detail] +        newLayers[iLayer].slowS=1.0/(1.0/newLayers[iLayer+1].slowS+deltaVs);
[detail] +        _numberOfLayers++;
[detail] +        break;
[detail] +      }
[detail] +      layerBottomDepth+=_layers[iLayer].h;
[detail] +      if(depth<layerBottomDepth) {
[detail] +        if(bottomDepth<layerBottomDepth) {    
[detail] +          newLayers=new Layer[_numberOfLayers+2];
[detail] +          memcpy(newLayers, _layers, (iLayer+1)*sizeof(Layer));
[detail] +          memcpy(newLayers+iLayer+1, _layers+iLayer, sizeof(Layer));
[detail] +          memcpy(newLayers+iLayer+2, _layers+iLayer, sizeof(Layer));
[detail] +          memcpy(newLayers+iLayer+3, _layers+iLayer+1, (_numberOfLayers-iLayer-1)*sizeof(Layer));
[detail] +          newLayers[iLayer].h=depth-(layerBottomDepth-_layers[iLayer].h);
[detail] +          newLayers[iLayer+1].h=thickness;
[detail] +          newLayers[iLayer+2].h=layerBottomDepth-bottomDepth;
[detail] +          newLayers[iLayer+1].slowS=1.0/(1.0/newLayers[iLayer+1].slowS+deltaVs);
[detail] +          _numberOfLayers+=2;
[detail] +        } else {                             
[detail] +          newLayers=new Layer[_numberOfLayers+2];
[detail] +          memcpy(newLayers, _layers, (iLayer+1)*sizeof(Layer));
[detail] +          memcpy(newLayers+iLayer+1, _layers+iLayer, sizeof(Layer));
[detail] +          memcpy(newLayers+iLayer+2, _layers+iLayer+1, sizeof(Layer));
[detail] +          memcpy(newLayers+iLayer+3, _layers+iLayer+1, (_numberOfLayers-iLayer-1)*sizeof(Layer));
[detail] +          newLayers[iLayer].h=depth-(layerBottomDepth-_layers[iLayer].h);
[detail] +          newLayers[iLayer+1].h=layerBottomDepth-depth;
[detail] +          newLayers[iLayer+2].h=bottomDepth-layerBottomDepth;
[detail] +          newLayers[iLayer+1].slowS=1.0/(1.0/newLayers[iLayer+1].slowS+deltaVs);
[detail] +          newLayers[iLayer+2].slowS=1.0/(1.0/newLayers[iLayer+2].slowS+deltaVs);
[detail] +          _numberOfLayers+=2;
[detail] +        }
[detail] +        break;
[detail] +      }
[detail] +      if(bottomDepth==layerBottomDepth) {    
[detail] +        newLayers=new Layer[_numberOfLayers+1];
[detail] +        memcpy(newLayers, _layers, (iLayer+1)*sizeof(Layer));
[detail] +        memcpy(newLayers+iLayer+1, _layers+iLayer, sizeof(Layer));
[detail] +        memcpy(newLayers+iLayer+2, _layers+iLayer+1, (_numberOfLayers-iLayer-1)*sizeof(Layer));
[detail] +        newLayers[iLayer].h=depth-(layerBottomDepth-_layers[iLayer].h);
[detail] +        newLayers[iLayer+1].h=thickness;
[detail] +        newLayers[iLayer+1].slowS=1.0/(1.0/newLayers[iLayer+1].slowS+deltaVs);
[detail] +        _numberOfLayers++;
[detail] +        break;
[detail] +      }
[detail] +    }
[detail] +    if(iLayer==lastLayer) {                  
[detail] +      if(depth==layerBottomDepth) {
[detail] +        newLayers=new Layer[_numberOfLayers+1];
[detail] +        memcpy(newLayers, _layers, (iLayer+1)*sizeof(Layer));
[detail] +        memcpy(newLayers+iLayer+1, _layers+iLayer, sizeof(Layer));
[detail] +        newLayers[iLayer].h=thickness;
[detail] +        newLayers[iLayer].slowS=1.0/(1.0/newLayers[iLayer+1].slowS+deltaVs);
[detail] +        _numberOfLayers++;
[detail] +      } else {                               
[detail] +        newLayers=new Layer[_numberOfLayers+2];
[detail] +        memcpy(newLayers, _layers, (iLayer+1)*sizeof(Layer));
[detail] +        memcpy(newLayers+iLayer+1, _layers+iLayer, sizeof(Layer));
[detail] +        memcpy(newLayers+iLayer+2, _layers+iLayer, sizeof(Layer));
[detail] +        newLayers[iLayer].h=depth-(layerBottomDepth-_layers[iLayer].h);
[detail] +        newLayers[iLayer+1].h=thickness;
[detail] +        newLayers[iLayer+1].slowS=1.0/(1.0/newLayers[iLayer+1].slowS+deltaVs);
[detail] +        _numberOfLayers+=2;
[detail] +      }
[detail] +    }
[detail] +    delete _layers;
[detail] +    _layers=newLayers;
[detail]    }
[detail]  
[detail]    
[detail]    void Seismic1DModel::setHFrom(const Seismic1DModel& o)
[detail]    {
[detail]      TRACE;
[detail] -    if(_layerCount!=o._layerCount) {
[detail] +    if(_numberOfLayers!=o._numberOfLayers) {
[detail]        return;
[detail]      }
[detail] -    for(int i=_layerCount-2; i>=0; i--) {
[detail] -      _h[i]=o._h[i];
[detail] +    for(int i=_numberOfLayers-2; i>=0; i--) {
[detail] +      _layers[i].h=o._layers[i].h;
[detail]      }
[detail]    }
[detail]  
[detail] @@ -1110,17 +1125,17 @@
[detail]    bool Seismic1DModel::interpole(const Point& at, const Point * refPoints, const Seismic1DModel * refModels)
[detail]    {
[detail]      TRACE;
[detail] -    _layerCount=refModels[0].layerCount();
[detail] -    if(_layerCount!=refModels[1].layerCount()) {
[detail] +    _numberOfLayers=refModels[0]._numberOfLayers;
[detail] +    if(_numberOfLayers!=refModels[1]._numberOfLayers) {
[detail]        App::log(tr("Model 1 has not the same number of layers as model 0\n") );
[detail]        return false;
[detail]      }
[detail] -    if(_layerCount!=refModels[2].layerCount()) {
[detail] +    if(_numberOfLayers!=refModels[2]._numberOfLayers) {
[detail]        App::log(tr("Model 2 has not the same number of layers as model 0\n") );
[detail]        return false;
[detail]      }
[detail] -    deleteData();
[detail] -    allocateData();
[detail] +    delete [] _layers;
[detail] +    _layers=new Layer[_numberOfLayers];
[detail]      Plane p;
[detail]      p.setReference(0, refPoints[0]);
[detail]      p.setReference(1, refPoints[1]);
[detail] @@ -1128,39 +1143,39 @@
[detail]      if(!p.setNormalVector()) {
[detail]        return false;
[detail]      }
[detail] -    for(int i=0; i<_layerCount; i++) {
[detail] -      if(i<_layerCount-1) {
[detail] -        p.setZ(0, refModels[0]._h[i]);
[detail] -        p.setZ(1, refModels[1]._h[i]);
[detail] -        p.setZ(2, refModels[2]._h[i]);
[detail] +    for(int i=0; i<_numberOfLayers; i++) {
[detail] +      if(i<_numberOfLayers-1) {
[detail] +        p.setZ(0, refModels[0]._layers[i].h);
[detail] +        p.setZ(1, refModels[1]._layers[i].h);
[detail] +        p.setZ(2, refModels[2]._layers[i].h);
[detail]          p.setNormalVectorXY();
[detail] -        _h[i]=p.z(at);
[detail] +        _layers[i].h=p.z(at);
[detail]        }
[detail] -      p.setZ(0, 1.0/refModels[0]._slowP[i]);
[detail] -      p.setZ(1, 1.0/refModels[1]._slowP[i]);
[detail] -      p.setZ(2, 1.0/refModels[2]._slowP[i]);
[detail] +      p.setZ(0, 1.0/refModels[0]._layers[i].slowP);
[detail] +      p.setZ(1, 1.0/refModels[1]._layers[i].slowP);
[detail] +      p.setZ(2, 1.0/refModels[2]._layers[i].slowP);
[detail]        p.setNormalVectorXY();
[detail] -      _slowP[i]=1.0/p.z(at);
[detail] -      p.setZ(0, 1.0/refModels[0]._slowS[i]);
[detail] -      p.setZ(1, 1.0/refModels[1]._slowS[i]);
[detail] -      p.setZ(2, 1.0/refModels[2]._slowS[i]);
[detail] +      _layers[i].slowP=1.0/p.z(at);
[detail] +      p.setZ(0, 1.0/refModels[0]._layers[i].slowS);
[detail] +      p.setZ(1, 1.0/refModels[1]._layers[i].slowS);
[detail] +      p.setZ(2, 1.0/refModels[2]._layers[i].slowS);
[detail]        p.setNormalVectorXY();
[detail] -      _slowS[i]=1.0/p.z(at);
[detail] -      p.setZ(0, refModels[0]._rho[i]);
[detail] -      p.setZ(1, refModels[1]._rho[i]);
[detail] -      p.setZ(2, refModels[2]._rho[i]);
[detail] +      _layers[i].slowS=1.0/p.z(at);
[detail] +      p.setZ(0, refModels[0]._layers[i].rho);
[detail] +      p.setZ(1, refModels[1]._layers[i].rho);
[detail] +      p.setZ(2, refModels[2]._layers[i].rho);
[detail]        p.setNormalVectorXY();
[detail] -      _rho[i]=p.z(at);
[detail] -      p.setZ(0, refModels[0]._qp[i]);
[detail] -      p.setZ(1, refModels[1]._qp[i]);
[detail] -      p.setZ(2, refModels[2]._qp[i]);
[detail] +      _layers[i].rho=p.z(at);
[detail] +      p.setZ(0, refModels[0]._layers[i].qp);
[detail] +      p.setZ(1, refModels[1]._layers[i].qp);
[detail] +      p.setZ(2, refModels[2]._layers[i].qp);
[detail]        p.setNormalVectorXY();
[detail] -      _qp[i]=p.z(at);
[detail] -      p.setZ(0, refModels[0]._qs[i]);
[detail] -      p.setZ(1, refModels[1]._qs[i]);
[detail] -      p.setZ(2, refModels[2]._qs[i]);
[detail] +      _layers[i].qp=p.z(at);
[detail] +      p.setZ(0, refModels[0]._layers[i].qs);
[detail] +      p.setZ(1, refModels[1]._layers[i].qs);
[detail] +      p.setZ(2, refModels[2]._layers[i].qs);
[detail]        p.setNormalVectorXY();
[detail] -      _qs[i]=p.z(at);
[detail] +      _layers[i].qs=p.z(at);
[detail]      }
[detail]      if(initCalculation()) {
[detail]        return true;
[detail]                    src/TheoreticalFK.cpp:  version-2.3.0	modified out of comments
[detail] --- src/TheoreticalFK.cpp-version-2.3.0-stripped	2025-09-28 04:01:01.775487399 +0200
[detail] +++ src/TheoreticalFK.cpp-HEAD-stripped	2025-09-28 04:01:01.779487418 +0200
[detail] @@ -137,15 +137,25 @@
[detail]        max=0.0;
[detail]        return;
[detail]      }
[detail] -    double d=s.at(i).squareDistanceTo(s.at(j));
[detail] +    const Point2D& p1=s.at(i);
[detail] +    double d=p1.squareDistanceTo(s.at(j));
[detail]      min=d;
[detail]      max=d;
[detail] -    for(; i>=0; i--) {
[detail] -      const Point2D& p1=s.at(i);
[detail]        for(j--; j>=0; j--) {
[detail]          const Point2D& p2=s.at(j);
[detail]          d=p1.squareDistanceTo(p2);
[detail]          if(d<min) {
[detail] +        min=d;
[detail] +      } else if(d>max) {
[detail] +        max=d;
[detail] +      }
[detail] +    }
[detail] +    for(i--; i>=0; i--) {
[detail] +      const Point2D& p1=s.at(i);
[detail] +      for(j=i-1; j>=0; j--) {
[detail] +        const Point2D& p2=s.at(j);
[detail] +        d=p1.squareDistanceTo(p2);
[detail] +        if(d<min) {
[detail]            min=d;
[detail]          } else if(d>max) {
[detail]            max=d;
[detail]              src/TheoreticalLinearFK.cpp:  version-2.3.0	not modified
[detail]                         src/TiltNode.cpp:  version-2.3.0	not modified
[detail]                         src/TiltPath.cpp:  version-2.3.0	not modified
[detail]                        src/ArrivalTime.h:  version-2.3.0	not modified
[detail]                     src/AutocorrCurves.h:  version-2.3.0	not modified
[detail]                 src/AutocorrDispersion.h:  version-2.3.0	not modified
[detail]                     src/AutocorrEngine.h:  version-2.3.0	not modified
[detail]                    src/AutocorrFactory.h:  version-2.3.0	not modified
[detail]                      src/AutocorrProxy.h:  version-2.3.0	not modified
[detail]                       src/AutocorrRing.h:  version-2.3.0	not modified
[detail]                         src/Dispersion.h:  version-2.3.0	not modified
[detail]                  src/DispersionFactory.h:  version-2.3.0	not modified
[detail]                    src/DispersionProxy.h:  version-2.3.0	not modified
[detail]                        src/Ellipticity.h:  version-2.3.0	not modified
[detail]                 src/EllipticityFactory.h:  version-2.3.0	not modified
[detail]                   src/EllipticityProxy.h:  version-2.3.0	not modified
[detail]                       src/FactoryPoint.h:  version-2.3.0	not modified
[detail]                   src/FortranInterface.h:  version-2.3.0	not modified
[detail]                   src/GeophysicalModel.h:  version-2.3.0	not modified
[detail]                          src/KennettSH.h:  version-2.3.0	not modified
[detail]                               src/Love.h:  version-2.3.0	not modified
[detail]                       src/LoveFunction.h:  version-2.3.0	not modified
[detail]               src/MagnetoTelluricCurve.h:  version-2.3.0	modified out of comments
[detail] --- src/MagnetoTelluricCurve.h-version-2.3.0-stripped	2025-09-28 04:01:02.123489080 +0200
[detail] +++ src/MagnetoTelluricCurve.h-HEAD-stripped	2025-09-28 04:01:02.127489100 +0200
[detail] @@ -31,7 +31,7 @@
[detail]      void addLog(QString s) {_log+=s;}
[detail]      QString log() const {return _log;}
[detail]  
[detail] -    double misfit(int& nValues, int& nData, const MagnetoTelluricFactory& f, Misfit::Type type, double minMisfit) const;
[detail] +    double misfit(int& nValues, int& nData, const MagnetoTelluricFactory& f, const MisfitType& type, double minMisfit) const;
[detail]    protected:
[detail]      void xml_writeProperties(XML_WRITEPROPERTIES_ARGS) const;
[detail]      void xml_writeChildren(XML_WRITECHILDREN_ARGS) const;
[detail]             src/MagnetoTelluricFactory.h:  version-2.3.0	not modified
[detail]               src/MagnetoTelluricPoint.h:  version-2.3.0	not modified
[detail]        src/MagnetoTelluricPointOptions.h:  version-2.3.0	not modified
[detail]               src/MagnetoTelluricProxy.h:  version-2.3.0	not modified
[detail]                         src/ModalCurve.h:  version-2.3.0	modified out of comments
[detail] --- src/ModalCurve.h-version-2.3.0-stripped	2025-09-28 04:01:02.207489486 +0200
[detail] +++ src/ModalCurve.h-HEAD-stripped	2025-09-28 04:01:02.215489525 +0200
[detail] @@ -42,7 +42,7 @@
[detail]    void setEnabled(bool e) {_enabled=e;}
[detail]    bool isEnabled() const {return _enabled;}
[detail]  
[detail] -  double misfit(int& nValues, int& nData, const ModalFactory& f, Misfit::Type type, double minMisfit) const;
[detail] +  double misfit(int& nValues, int& nData, const ModalFactory& f, const MisfitType& type, double minMisfit) const;
[detail]    double determinantMisfit(const Seismic1DModel * m) const;
[detail]  protected:
[detail]    void xml_writeProperties(XML_WRITEPROPERTIES_ARGS) const;
[detail]                       src/ModalFactory.h:  version-2.3.0	not modified
[detail]                         src/ModalProxy.h:  version-2.3.0	not modified
[detail]                        src/ModalRefine.h:  version-2.3.0	not modified
[detail]                       src/ModalStorage.h:  version-2.3.0	not modified
[detail]                               src/Mode.h:  version-2.3.0	not modified
[detail]       src/OmnidirectionalArrayResponse.h:  version-2.3.0	not modified
[detail]                           src/Podvin2D.h:  version-2.3.0	not modified
[detail]                           src/Podvin3D.h:  version-2.3.0	not modified
[detail]                            src/Profile.h:  version-2.3.0	not modified
[detail]                           src/Rayleigh.h:  version-2.3.0	modified out of comments
[detail] --- src/Rayleigh.h-version-2.3.0-stripped	2025-09-28 04:01:02.363490240 +0200
[detail] +++ src/Rayleigh.h-HEAD-stripped	2025-09-28 04:01:02.367490260 +0200
[detail] @@ -46,7 +46,7 @@
[detail]    RealType k2=k*k;
[detail]    RealType inv_k2=(RealType)1.0/k2;
[detail]    
[detail] -  int i=_model->layerCount()-1;
[detail] +  int i=_model->numberOfLayers()-1;
[detail]    RealType ka=(RealType)_omega*(RealType)_model->slowP(i);
[detail]    RealType hn2=k2-ka*ka;
[detail]    tmpAbs=hn2;
[detail]                   src/RayleighFunction.h:  version-2.3.0	not modified
[detail]                    src/RefractionCurve.h:  version-2.3.0	modified out of comments
[detail] --- src/RefractionCurve.h-version-2.3.0-stripped	2025-09-28 04:01:02.399490414 +0200
[detail] +++ src/RefractionCurve.h-HEAD-stripped	2025-09-28 04:01:02.403490434 +0200
[detail] @@ -34,7 +34,7 @@
[detail]    void linkSource(const ::VectorList<double>& xSrc);
[detail]    void linkReceivers(const ::VectorList<double>& xRec);
[detail]  
[detail] -  double misfit(int& nValues, int& nData, const RefractionFactory& f, Misfit::Type type, double minMisfit) const;
[detail] +  double misfit(int& nValues, int& nData, const RefractionFactory& f, const MisfitType& type, double minMisfit) const;
[detail]  protected:
[detail]    void xml_writeProperties(XML_WRITEPROPERTIES_ARGS) const;
[detail]    void xml_writeChildren(XML_WRITECHILDREN_ARGS) const;
[detail]             src/RefractionDippingModel.h:  version-2.3.0	modified out of comments
[detail] --- src/RefractionDippingModel.h-version-2.3.0-stripped	2025-09-28 04:01:02.419490511 +0200
[detail] +++ src/RefractionDippingModel.h-HEAD-stripped	2025-09-28 04:01:02.419490511 +0200
[detail] @@ -54,7 +54,7 @@
[detail]  
[detail]    static QString formatHelp();
[detail]    virtual QString toString() const;
[detail] -  virtual bool fromStream(QTextStream& s, QString * comments=0);
[detail] +  virtual bool fromStream(QTextStream& s, QString * comments=nullptr);
[detail]    virtual void toStream(QTextStream& s) const;
[detail]    void fromStream(QDataStream& s);
[detail]    void toStream(QDataStream& s) const;
[detail]                  src/RefractionFactory.h:  version-2.3.0	not modified
[detail]                    src/RefractionProxy.h:  version-2.3.0	not modified
[detail]                 src/Resistivity1DModel.h:  version-2.3.0	not modified
[detail]                     src/Seismic1DModel.h:  version-2.3.0	modified out of comments
[detail] --- src/Seismic1DModel.h-version-2.3.0-stripped	2025-09-28 04:01:02.483490820 +0200
[detail] +++ src/Seismic1DModel.h-HEAD-stripped	2025-09-28 04:01:02.487490840 +0200
[detail] @@ -17,9 +17,9 @@
[detail]  public:
[detail]    Seismic1DModel();
[detail]    Seismic1DModel(const Seismic1DModel& o);
[detail] -  Seismic1DModel(int layerCount);
[detail] -  Seismic1DModel(int layerCount, double * h, double * vp, double * vs, double * rho);
[detail] -  Seismic1DModel(int layerCount, double * h, double * vs, double * rho);
[detail] +  Seismic1DModel(int numberOfLayers);
[detail] +  Seismic1DModel(int numberOfLayers, double * h, double * vp, double * vs, double * rho);
[detail] +  Seismic1DModel(int numberOfLayers, double * h, double * vs, double * rho);
[detail]    ~Seismic1DModel();
[detail]  
[detail]    enum SlownessType {P, S};
[detail] @@ -35,24 +35,24 @@
[detail]    virtual bool isValid() {return initCalculation();}
[detail]    int checkVelocityInversion() const;
[detail]  
[detail] -  void setH(int iLayer, double v) {_h[iLayer]=v;}
[detail] -  void setSlowP(int iLayer, double v) {_slowP[iLayer]=v;}
[detail] -  void setSlowS(int iLayer, double v) {_slowS[iLayer]=v;}
[detail] -  void setRho(int iLayer, double v) {_rho[iLayer]=v;}
[detail] -  void setQp(int iLayer, double v) {_qp[iLayer]=v;}
[detail] -  void setQs(int iLayer, double v) {_qs[iLayer]=v;}
[detail] +  void setH(int iLayer, double v) {_layers[iLayer].h=v;}
[detail] +  void setSlowP(int iLayer, double v) {_layers[iLayer].slowP=v;}
[detail] +  void setSlowS(int iLayer, double v) {_layers[iLayer].slowS=v;}
[detail] +  void setRho(int iLayer, double v) {_layers[iLayer].rho=v;}
[detail] +  void setQp(int iLayer, double v) {_layers[iLayer].qp=v;}
[detail] +  void setQs(int iLayer, double v) {_layers[iLayer].qs=v;}
[detail]    void setQp(double v);
[detail]    void setQs(double v);
[detail]  
[detail] -  int layerCount() const {return _layerCount;}
[detail] -  virtual bool isEmpty() const {return layerCount()==0;}
[detail] -  double h(int iLayer) const {return _h[iLayer];}
[detail] -  double slowP(int iLayer) const {return _slowP[iLayer];}
[detail] -  double slowS(int iLayer) const {return _slowS[iLayer];}
[detail] -  double rho(int iLayer) const {return _rho[iLayer];}
[detail] -  double mu(int iLayer) const {return _mu[iLayer];}
[detail] -  double qp(int iLayer) const {return _qp[iLayer];}
[detail] -  double qs(int iLayer) const {return _qs[iLayer];}
[detail] +  int numberOfLayers() const {return _numberOfLayers;}
[detail] +  virtual bool isEmpty() const {return _numberOfLayers==0;}
[detail] +  double h(int iLayer) const {return _layers[iLayer].h;}
[detail] +  double slowP(int iLayer) const {return _layers[iLayer].slowP;}
[detail] +  double slowS(int iLayer) const {return _layers[iLayer].slowS;}
[detail] +  double rho(int iLayer) const {return _layers[iLayer].rho;}
[detail] +  double mu(int iLayer) const {return _layers[iLayer].mu;}
[detail] +  double qp(int iLayer) const {return _layers[iLayer].qp;}
[detail] +  double qs(int iLayer) const {return _layers[iLayer].qs;}
[detail]    double poisson(int iLayer) const;
[detail]    double depth(int iLayer) const;
[detail]    double expGrad(int iLayer) const;
[detail] @@ -85,7 +85,7 @@
[detail]  
[detail]    static QString formatHelp();
[detail]    virtual QString toString() const;
[detail] -  virtual bool fromStream(QTextStream& s, QString * comments=0);
[detail] +  virtual bool fromStream(QTextStream& s, QString * comments=nullptr);
[detail]    virtual void toStream(QTextStream& s) const;
[detail]    void exportHerrmann(QTextStream& s) const;
[detail]    void toStream(QDataStream& s) const;
[detail] @@ -94,6 +94,7 @@
[detail]    void changeHKeepOtherDepth(int iLayer,double newH);
[detail]    void changeVpKeepPoisson(int iLayer,double newV);
[detail]    void changeVsKeepPoisson(int iLayer,double newV);
[detail] +  void addVsPerturbation(double depth, double thickness, double deltaVs);
[detail]    void setHFrom(const Seismic1DModel& o);
[detail]    bool interpole(const Point& at, const Point * refPoints, const Seismic1DModel * refModels);
[detail]  
[detail] @@ -172,24 +173,17 @@
[detail]      virtual QVariant value(const QString& index) const;
[detail]      virtual void setValue(const QString&, const QVariant& );
[detail]    };
[detail] -protected:
[detail] -  void allocateData();
[detail] -  void deleteData();
[detail]  private:
[detail] -  int _layerCount;
[detail] -  double *_h;
[detail] -  double *_slowP;
[detail] -  double *_slowS;
[detail] -  double *_rho;
[detail] -  double *_mu;
[detail] -  double *_qp;
[detail] -  double *_qs;
[detail] +  int _numberOfLayers;
[detail] +  struct Layer {
[detail] +    double h, slowP, slowS, rho, mu, qp, qs;
[detail] +  };
[detail] +  Layer * _layers;
[detail]    double _maxRayleighSlowness;
[detail]    double _slowSMin;
[detail]    double _slowSMax;
[detail]  
[detail]    bool setValue(double& var, const StringSection& field, int iLayer, const QString& varName, bool optional);
[detail] -  void initMembers();
[detail]    bool checkPoissonRatio();
[detail]    void slowMinMax(int& iSlowSMax);
[detail]  };
[detail]                      src/TheoreticalFK.h:  version-2.3.0	not modified
[detail]                src/TheoreticalLinearFK.h:  version-2.3.0	not modified
[detail]                           src/TiltNode.h:  version-2.3.0	not modified
[detail]                           src/TiltPath.h:  version-2.3.0	not modified
[summary] Total differences: 1452 lines
[summary] Modification level is B
OLD_DIR=$(pwd)
echo "QGpCoreWave"
cd $(find . -name "QGpCoreWave" | tail -n 1) || exit 2
pwd
dpversion B  || exit 2
cd $OLD_DIR || exit 2
################## QGpGuiWave
[detail]             src/DispersionLimitLayer.cpp:  version-1.3.0	not modified
[detail]              src/DispersionPlotProxy.cpp:  version-1.3.0	not modified
[detail]             src/EllipticityPlotProxy.cpp:  version-1.3.0	not modified
[detail]              src/MagnetoTelluricLine.cpp:  version-1.3.0	not modified
[detail]         src/MagnetoTelluricPlotProxy.cpp:  version-1.3.0	not modified
[detail]                src/ModalCurveBrowser.cpp:  version-1.3.0	modified out of comments
[detail] --- src/ModalCurveBrowser.cpp-version-1.3.0-stripped	2025-09-28 04:01:02.679491767 +0200
[detail] +++ src/ModalCurveBrowser.cpp-HEAD-stripped	2025-09-28 04:01:02.683491786 +0200
[detail] @@ -47,9 +47,9 @@
[detail]    CurveBrowser::initLayer(curveLayer);
[detail]    
[detail]    ModalLine * l=new ModalLine;
[detail] -  l->setPen(Pen(Qt::black, 0.6));
[detail] -  l->setSymbol(Symbol(Symbol::Circle, 1.2, Pen(Qt::black, 0.0),
[detail] -                      Brush(Qt::black, Qt::SolidPattern)));
[detail] +  l->setPen(Pen(Qt::black, 0.3));
[detail] +  l->setSymbol(Symbol(Symbol::Circle, 1.2, Pen(Qt::black, 0.1),
[detail] +                      Brush(Qt::black, Qt::NoBrush)));
[detail]    curveLayer->setReferenceLine(l);
[detail]  }
[detail]  
[detail]             src/ModalCurveProperties.cpp:  version-1.3.0	not modified
[detail]                        src/ModalLine.cpp:  version-1.3.0	not modified
[detail]                   src/ModalPlotProxy.cpp:  version-1.3.0	not modified
[detail]                     src/ModeDelegate.cpp:  version-1.3.0	not modified
[detail]                         src/ModeItem.cpp:  version-1.3.0	not modified
[detail]                     src/ModeSelector.cpp:  version-1.3.0	not modified
[detail]                       src/QGpGuiWave.cpp:  version-1.3.0	not modified
[detail]                   src/RefractionLine.cpp:  version-1.3.0	not modified
[detail]              src/RefractionPlotProxy.cpp:  version-1.3.0	not modified
[detail]               src/DispersionLimitLayer.h:  version-1.3.0	not modified
[detail]                src/DispersionPlotProxy.h:  version-1.3.0	not modified
[detail]               src/EllipticityPlotProxy.h:  version-1.3.0	not modified
[detail]                src/MagnetoTelluricLine.h:  version-1.3.0	not modified
[detail]           src/MagnetoTelluricPlotProxy.h:  version-1.3.0	not modified
[detail]                  src/ModalCurveBrowser.h:  version-1.3.0	not modified
[detail]               src/ModalCurveProperties.h:  version-1.3.0	not modified
[detail]                          src/ModalLine.h:  version-1.3.0	not modified
[detail]                     src/ModalPlotProxy.h:  version-1.3.0	not modified
[detail]                       src/ModeDelegate.h:  version-1.3.0	not modified
[detail]                           src/ModeItem.h:  version-1.3.0	not modified
[detail]                       src/ModeSelector.h:  version-1.3.0	not modified
[detail]                     src/RefractionLine.h:  version-1.3.0	not modified
[detail]                src/RefractionPlotProxy.h:  version-1.3.0	not modified
[detail]                      src/ModeSelector.ui:  version-1.3.0	not modified
[summary] Total differences: 15 lines
[summary] Modification level is C
OLD_DIR=$(pwd)
echo "QGpGuiWave"
cd $(find . -name "QGpGuiWave" | tail -n 1) || exit 2
pwd
dpversion C  || exit 2
cd $OLD_DIR || exit 2
################## QGpCompatibility
[detail]             src/CompatAutocorrCurves.cpp:  version-1.2.0	not modified
[detail]               src/CompatAutocorrData.cpp:  version-1.2.0	not modified
[detail]             src/CompatAutocorrReport.cpp:  version-1.2.0	modified out of comments
[detail] --- src/CompatAutocorrReport.cpp-version-1.2.0-stripped	2025-09-28 04:01:03.123493914 +0200
[detail] +++ src/CompatAutocorrReport.cpp-HEAD-stripped	2025-09-28 04:01:03.127493932 +0200
[detail] @@ -169,7 +169,7 @@
[detail]      int nRefines;
[detail]      qint64 blockOffset=_s.device() ->pos();
[detail]      int offset=(_currentDispersion->modesCount() * _currentDispersion->omegasCount() +
[detail] -                   4 * _currentModel->layerCount()) * sizeof(double) + 2 * sizeof(int);
[detail] +                   4 * _currentModel->numberOfLayers()) * sizeof(double) + 2 * sizeof(int);
[detail]      if(_version >= 4) offset += _nd * sizeof(float);
[detail]      if(_version >= 1) {
[detail]        _s.device() ->seek(blockOffset + offset);
[detail]                  src/CompatDataPoint.cpp:  version-1.2.0	not modified
[detail]                 src/CompatDispersion.cpp:  version-1.2.0	not modified
[detail]             src/CompatDispersionData.cpp:  version-1.2.0	not modified
[detail]            src/CompatEllipticityData.cpp:  version-1.2.0	not modified
[detail]                   src/CompatFunction.cpp:  version-1.2.0	not modified
[detail]               src/CompatFunctionList.cpp:  version-1.2.0	not modified
[detail]                 src/CompatHodoChrone.cpp:  version-1.2.0	not modified
[detail]             src/CompatHodoChroneData.cpp:  version-1.2.0	not modified
[detail]            src/CompatInversionReport.cpp:  version-1.2.0	modified out of comments
[detail] --- src/CompatInversionReport.cpp-version-1.2.0-stripped	2025-09-28 04:01:03.267494609 +0200
[detail] +++ src/CompatInversionReport.cpp-HEAD-stripped	2025-09-28 04:01:03.275494647 +0200
[detail] @@ -594,8 +594,8 @@
[detail]  {
[detail]    TRACE;
[detail]    paramAddress& a=_paramAddresses[paramIndex];
[detail] -  if(a.which<NAParam && a.layer>=_currentModel->layerCount()) {
[detail] -    a.layer=_currentModel->layerCount()-1;
[detail] +  if(a.which<NAParam && a.layer>=_currentModel->numberOfLayers()) {
[detail] +    a.layer=_currentModel->numberOfLayers()-1;
[detail]      printf("Layer number for parameter greater than layer number in model\n");
[detail]    }
[detail]    else if(a.which>=NAParam && a.layer>=_nd) {
[detail]                src/CompatModalCurves.cpp:  version-1.2.0	not modified
[detail]            src/CompatModalDispersion.cpp:  version-1.2.0	not modified
[detail]           src/CompatModalEllipticity.cpp:  version-1.2.0	not modified
[detail]             src/CompatModalFrequency.cpp:  version-1.2.0	not modified
[detail]                src/CompatModalRefine.cpp:  version-1.2.0	not modified
[detail]         src/CompatModalRefinedCurves.cpp:  version-1.2.0	not modified
[detail]           src/CompatMultiModalCurves.cpp:  version-1.2.0	not modified
[detail]             src/CompatMultiModalData.cpp:  version-1.2.0	not modified
[detail]        src/CompatMultiModalFrequency.cpp:  version-1.2.0	not modified
[detail]                src/CompatRefraReport.cpp:  version-1.2.0	modified out of comments
[detail] --- src/CompatRefraReport.cpp-version-1.2.0-stripped	2025-09-28 04:01:03.431495402 +0200
[detail] +++ src/CompatRefraReport.cpp-HEAD-stripped	2025-09-28 04:01:03.435495421 +0200
[detail] @@ -110,7 +110,7 @@
[detail]  {
[detail]    TRACE;
[detail]    if(!_currentModel) initCurrentModel();  
[detail] -  _currentTiltModel=new RefractionDippingModel(_currentModel->layerCount());
[detail] +  _currentTiltModel=new RefractionDippingModel(_currentModel->numberOfLayers());
[detail]  }
[detail]  
[detail]  bool CompatRefraReport::initCurrentDispersion()
[detail]           src/CompatRefractionSurvey.cpp:  version-1.2.0	not modified
[detail]              src/CompatReportFactory.cpp:  version-1.2.0	not modified
[detail]              src/CompatSrcHodochrone.cpp:  version-1.2.0	not modified
[detail]                 src/QGpCompatibility.cpp:  version-1.2.0	not modified
[detail]               src/CompatAutocorrCurves.h:  version-1.2.0	not modified
[detail]                 src/CompatAutocorrData.h:  version-1.2.0	not modified
[detail]               src/CompatAutocorrReport.h:  version-1.2.0	not modified
[detail]                    src/CompatDataPoint.h:  version-1.2.0	not modified
[detail]                   src/CompatDispersion.h:  version-1.2.0	not modified
[detail]               src/CompatDispersionData.h:  version-1.2.0	not modified
[detail]              src/CompatEllipticityData.h:  version-1.2.0	not modified
[detail]                     src/CompatFunction.h:  version-1.2.0	not modified
[detail]                 src/CompatFunctionList.h:  version-1.2.0	not modified
[detail]                   src/CompatHodoChrone.h:  version-1.2.0	not modified
[detail]               src/CompatHodoChroneData.h:  version-1.2.0	not modified
[detail]              src/CompatInversionReport.h:  version-1.2.0	not modified
[detail]                  src/CompatModalCurves.h:  version-1.2.0	not modified
[detail]              src/CompatModalDispersion.h:  version-1.2.0	not modified
[detail]             src/CompatModalEllipticity.h:  version-1.2.0	not modified
[detail]               src/CompatModalFrequency.h:  version-1.2.0	not modified
[detail]                  src/CompatModalRefine.h:  version-1.2.0	not modified
[detail]           src/CompatModalRefinedCurves.h:  version-1.2.0	not modified
[detail]             src/CompatMultiModalCurves.h:  version-1.2.0	not modified
[detail]               src/CompatMultiModalData.h:  version-1.2.0	not modified
[detail]          src/CompatMultiModalFrequency.h:  version-1.2.0	not modified
[detail]                  src/CompatRefraReport.h:  version-1.2.0	not modified
[detail]             src/CompatRefractionSurvey.h:  version-1.2.0	not modified
[detail]                src/CompatReportFactory.h:  version-1.2.0	not modified
[detail]                src/CompatSrcHodochrone.h:  version-1.2.0	not modified
[summary] Total differences: 35 lines
[summary] Modification level is C
OLD_DIR=$(pwd)
echo "QGpCompatibility"
cd $(find . -name "QGpCompatibility" | tail -n 1) || exit 2
pwd
dpversion C  || exit 2
cd $OLD_DIR || exit 2
################## QGpSciPy
# Already increased version number:
# Tag = 
# Version = 0.0.0
################## GeopsyCore
[detail]               src/AbstractFileFormat.cpp:  version-4.5.1	modified out of comments
[detail] --- src/AbstractFileFormat.cpp-version-4.5.1-stripped	2025-09-28 04:01:03.943497875 +0200
[detail] +++ src/AbstractFileFormat.cpp-HEAD-stripped	2025-09-28 04:01:03.947497895 +0200
[detail] @@ -165,7 +165,7 @@
[detail]      return false;
[detail]    }
[detail]  
[detail] -  bool AbstractFileFormat::load(const Signal *, double *) const
[detail] +  bool AbstractFileFormat::load(const SignalSegment *, double *) const
[detail]    {
[detail]      TRACE;
[detail]      return false;
[detail]               src/AbstractSignalFile.cpp:  version-4.5.1	no last version available
[detail]              src/AbstractSignalGroup.cpp:  version-4.5.1	modified out of comments
[detail] --- src/AbstractSignalGroup.cpp-version-4.5.1-stripped	2025-09-28 04:01:03.971498012 +0200
[detail] +++ src/AbstractSignalGroup.cpp-HEAD-stripped	2025-09-28 04:01:03.975498030 +0200
[detail] @@ -8,7 +8,7 @@
[detail]  #include "SignalResultsFactory.h"
[detail]  #include "AbstractSignalResults.h"
[detail]  #include "SignalDatabase.h"
[detail] -#include "GeoSignal.h"
[detail] +#include "SignalSegment.h"
[detail]  #include "SignalGroupFactory.h"
[detail]  
[detail]  namespace GeopsyCore {
[detail] @@ -22,7 +22,6 @@
[detail]      : TreeContainer(), _modified(false)
[detail]    {
[detail]      TRACE;
[detail] -    _id=-1;
[detail]      
[detail]      
[detail]      
[detail] @@ -31,7 +30,6 @@
[detail]        parent->reportParentAboutToBeChanged(this, parent);
[detail]        TreeContainer::setParent(parent);
[detail]        parent->reportParentChanged(this, nullptr);
[detail] -      setId(-1);
[detail]      }
[detail]    }
[detail]  
[detail] @@ -60,9 +58,6 @@
[detail]            TreeContainer::setParent(p);
[detail]            gp->reportParentChanged(this, oldp);
[detail]            setModified(true);
[detail] -          if(id()<0) {
[detail] -            setId(-1);
[detail] -          }
[detail]          } else {
[detail]            oldp->reportParentAboutToBeChanged(this, gp);
[detail]            TreeContainer::setParent(p);
[detail] @@ -191,32 +186,6 @@
[detail]    }
[detail]  
[detail]    
[detail] -  void AbstractSignalGroup::setId(int id)
[detail] -  {
[detail] -    TRACE;
[detail] -    _id=-1; 
[detail] -    _id=master()->uniqueId(id);
[detail] -  }
[detail] -
[detail] -  
[detail] -  int AbstractSignalGroup::countId(int id, int& newId) const
[detail] -  {
[detail] -    TRACE;
[detail] -    int n=0;
[detail] -    for(const_iterator it=begin(); it!=end(); ++it) {
[detail] -      AbstractSignalGroup * g=static_cast<AbstractSignalGroup *>(*it);
[detail] -      n+=g->countId(id, newId);
[detail] -    }
[detail] -    if(_id==id) {
[detail] -      n++;
[detail] -    }
[detail] -    if(_id>newId) {
[detail] -      newId=_id;
[detail] -    }
[detail] -    return n;
[detail] -  }
[detail] -
[detail] -  
[detail]    bool AbstractSignalGroup::isModified() const
[detail]    {
[detail]      TRACE;
[detail] @@ -350,7 +319,7 @@
[detail]    }
[detail]  
[detail]    
[detail] -  const AbstractSignalGroup * AbstractSignalGroup::find(int id) const
[detail] +  const AbstractSignalGroup * AbstractSignalGroup::find(const UniqueID& id) const
[detail]    {
[detail]      TRACE;
[detail]      if(_id==id) {
[detail] @@ -366,7 +335,7 @@
[detail]    }
[detail]  
[detail]    
[detail] -  AbstractSignalGroup * AbstractSignalGroup::find(int id)
[detail] +  AbstractSignalGroup * AbstractSignalGroup::find(const UniqueID& id)
[detail]    {
[detail]      TRACE;
[detail]      if(_id==id) {
[detail] @@ -382,7 +351,7 @@
[detail]    }
[detail]  
[detail]    
[detail] -  QList<const AbstractSignalGroup *> AbstractSignalGroup::find(const Signal * sig) const
[detail] +  QList<const AbstractSignalGroup *> AbstractSignalGroup::find(const SignalSegment * sig) const
[detail]    {
[detail]      TRACE;
[detail]      QList<const AbstractSignalGroup *> groups;
[detail] @@ -391,7 +360,7 @@
[detail]    }
[detail]  
[detail]    
[detail] -  void AbstractSignalGroup::find(QList<const AbstractSignalGroup *>& groups, const Signal * sig) const
[detail] +  void AbstractSignalGroup::find(QList<const AbstractSignalGroup *>& groups, const SignalSegment * sig) const
[detail]    {
[detail]      TRACE;
[detail]      if(directlyContains(sig)) {
[detail] @@ -418,7 +387,7 @@
[detail]    }
[detail]  
[detail]    
[detail] -  bool AbstractSignalGroup::contains(const Signal * sig) const
[detail] +  bool AbstractSignalGroup::contains(const SignalSegment * sig) const
[detail]    {
[detail]      TRACE;
[detail]      if(directlyContains(sig)) {
[detail] @@ -433,7 +402,7 @@
[detail]    }
[detail]  
[detail]    
[detail] -  bool AbstractSignalGroup::directlyContains(const Signal * sig) const
[detail] +  bool AbstractSignalGroup::directlyContains(const SignalSegment * sig) const
[detail]    {
[detail]      TRACE;
[detail]      Q_UNUSED(sig)
[detail] @@ -454,7 +423,7 @@
[detail]    }
[detail]  
[detail]    
[detail] -  void AbstractSignalGroup::removeSignal(Signal * sig)
[detail] +  void AbstractSignalGroup::removeSignal(SignalSegment * sig)
[detail]    {
[detail]      TRACE;
[detail]      for(const_iterator it=begin();it!=end();++it) {
[detail] @@ -505,7 +474,7 @@
[detail]    }
[detail]  
[detail]    
[detail] -  bool AbstractSignalGroup::convertIds(const QHash<int, Signal *>& ids)
[detail] +  bool AbstractSignalGroup::convertIds(const QHash<UniqueID, SignalSegment *>& ids)
[detail]    {
[detail]      TRACE;
[detail]      for(iterator it=begin(); it!=end(); ++it) {
[detail] @@ -520,7 +489,14 @@
[detail]    {
[detail]      TRACE;
[detail]      TreeContainer::xml_writeProperties(s, context);
[detail] -    writeProperty(s, "id", id());
[detail] +    if(!_id.isValid()) {
[detail] +      AbstractSignalGroup * g=const_cast<AbstractSignalGroup *>(this);
[detail] +      MasterSignalGroup * m=g->master();
[detail] +      if(m) {
[detail] +        g->_id=m->idGenerator()->generate();
[detail] +      }
[detail] +    }
[detail] +    writeProperty(s, "id", _id.toString());
[detail]      writeProperty(s, "name", name());
[detail]      writeProperty(s, "comments", comments());
[detail]    }
[detail] @@ -583,7 +559,6 @@
[detail]    bool AbstractSignalGroup::xml_setProperty(XML_SETPROPERTY_ARGS)
[detail]    {
[detail]      TRACE;
[detail] -    bool ok=true;
[detail]      switch(memberID) {
[detail]      case 0:
[detail]        setName(content.toStringBuffer());
[detail] @@ -592,8 +567,7 @@
[detail]        setComments(content.toStringBuffer());
[detail]        return true;
[detail]      case 2:
[detail] -      setId(content.toInt(ok));
[detail] -      return ok;
[detail] +      return _id.fromString(content, master()->idGenerator());
[detail]      default:
[detail]        return TreeContainer::xml_setProperty(memberID-3, tag, attributes, content, context);
[detail]      }
[detail]            src/AbstractSignalResults.cpp:  version-4.5.1	not modified
[detail]                     src/AbstractTool.cpp:  version-4.5.1	modified out of comments
[detail] --- src/AbstractTool.cpp-version-4.5.1-stripped	2025-09-28 04:01:04.007498185 +0200
[detail] +++ src/AbstractTool.cpp-HEAD-stripped	2025-09-28 04:01:04.011498205 +0200
[detail] @@ -63,14 +63,17 @@
[detail]      App::log(parameters()->AbstractParameters::toString()+parameters()->toString()+"\n");
[detail]      App::setPrefix(oldPrefix);
[detail]  
[detail] -    if(App::verbosity()>=3) {
[detail] +#ifdef PROCESS_TIMING
[detail] +    
[detail] +    
[detail]        App::log(tr("Preloading signals to remove loading time for the global timing report.\n"));
[detail]        for(int i=0; i<_subPool->count(); i++) {
[detail] -        Signal * sig=_subPool->at(i);
[detail] +      SignalSegment * sig=_subPool->at(i);
[detail]          sig->lockSamples();
[detail]          sig->unlockSamples();
[detail]        }
[detail]      }
[detail] +#endif
[detail]  
[detail]      QString log;
[detail]      log=tr("Process started at %1\n").arg(QDateTime::currentDateTime().toString("yyyy-MM-dd hh:mm:ss"));
[detail]                src/AsciiSignalFormat.cpp:  version-4.5.1	modified out of comments
[detail] --- src/AsciiSignalFormat.cpp-version-4.5.1-stripped	2025-09-28 04:01:04.027498281 +0200
[detail] +++ src/AsciiSignalFormat.cpp-HEAD-stripped	2025-09-28 04:01:04.031498301 +0200
[detail] @@ -350,12 +350,12 @@
[detail]    }
[detail]  
[detail]    
[detail] -  void AsciiSignalFormat::assign(Signal * sig)
[detail] +  void AsciiSignalFormat::assign(SignalSegment * sig)
[detail]    {
[detail]      TRACE;
[detail]      if(_verbose) {
[detail] -      App::log(tr("Assigning values to signal (NumberInFile=%1):\n")
[detail] -                       .arg(sig->numberInFile()));
[detail] +      App::log(tr("Assigning values to signal (IndexInFile=%1):\n")
[detail] +                   .arg(sig->indexInFile().value()));
[detail]      }
[detail]      for(int i=0; i<_rules.count(); i++) {
[detail]        const AsciiSignalFormatRule& r=_rules.at(i);
[detail] @@ -363,7 +363,7 @@
[detail]          App::log(tr("  Rule[%1] for setting '%2'\n").arg(i)
[detail]                           .arg(MetaDataFactory::instance()->name(r.data())));
[detail]        }
[detail] -      if((r.channel()==-1 || sig->numberInFile()==r.channel()) && r.value().isValid()) {
[detail] +      if((r.channel()==-1 || sig->indexInFile().value()==r.channel()) && r.value().isValid()) {
[detail]          switch(r.data().id()) {
[detail]          case MetaDataFactory::Component: {
[detail]              if(_verbose) {
[detail] @@ -372,9 +372,10 @@
[detail]              for(QList<AsciiSignalFormatComponent>::const_iterator it=_components.begin();it!=_components.end();it++) {
[detail]                QRegularExpression exp(it->pattern());
[detail]                if(exp.globalMatch(r.value().toString()).hasNext()) {
[detail] -                sig->setComponent(it->component());
[detail] +                sig->metaData()->setComponent(it->component());
[detail]                  if(_verbose) {
[detail] -                  App::log(tr("    found match in Component table: '%1'\n").arg(sig->componentStandardName()) );
[detail] +                  App::log(tr("    found match in Component table: '%1'\n")
[detail] +                               .arg(sig->metaData()->componentStandardName()) );
[detail]                  }
[detail]                }
[detail]              }
[detail] @@ -468,7 +469,7 @@
[detail]          if((r.channel()==-1 || i==r.channel()) && r.value().isValid() && r.data().id()==MetaDataFactory::Component) {
[detail]            for(QList<AsciiSignalFormatComponent>::const_iterator it=_components.begin();it!=_components.end();it++) {
[detail]              QRegularExpression exp(it->pattern());
[detail] -            if(it->component()==Signal::Time && exp.globalMatch(r.value().toString()).hasNext()) {
[detail] +            if(it->component()==SignalMetaData::Time && exp.globalMatch(r.value().toString()).hasNext()) {
[detail]                columnIndex=i;
[detail]                i=columnCount;
[detail]                break;
[detail] @@ -562,8 +563,8 @@
[detail]          for(QList<AsciiSignalFormatComponent>::const_iterator it=_components.begin();it!=_components.end();it++) {
[detail]            QRegularExpression exp(it->pattern());
[detail]            switch(it->component()) {
[detail] -          case Signal::Time:
[detail] -          case Signal::Ignore:
[detail] +          case SignalMetaData::Time:
[detail] +          case SignalMetaData::Ignore:
[detail]              if(exp.globalMatch(r.value().toString()).hasNext()) {
[detail]                return true;
[detail]              }
[detail]       src/AsciiSignalFormatComponent.cpp:  version-4.5.1	modified out of comments
[detail] --- src/AsciiSignalFormatComponent.cpp-version-4.5.1-stripped	2025-09-28 04:01:04.047498378 +0200
[detail] +++ src/AsciiSignalFormatComponent.cpp-HEAD-stripped	2025-09-28 04:01:04.051498397 +0200
[detail] @@ -11,7 +11,7 @@
[detail]  
[detail]  AsciiSignalFormatComponent::AsciiSignalFormatComponent()
[detail]  {
[detail] -  _component=Signal::UndefinedComponent;
[detail] +  _component=SignalMetaData::UndefinedComponent;
[detail]  }
[detail]  
[detail]  void AsciiSignalFormatComponent::xml_writeProperties(XML_WRITEPROPERTIES_ARGS) const
[detail] @@ -19,7 +19,7 @@
[detail]    TRACE;
[detail]    Q_UNUSED(context)
[detail]    writeProperty(s, "pattern", _pattern);
[detail] -  writeProperty(s, "component", Signal::standardName(_component));
[detail] +  writeProperty(s, "component", SignalMetaData::standardName(_component));
[detail]  }
[detail]  
[detail]  XMLMember AsciiSignalFormatComponent::xml_member(XML_MEMBER_ARGS)
[detail] @@ -38,9 +38,10 @@
[detail]    Q_UNUSED(tag)
[detail]    Q_UNUSED(context)
[detail]    Q_UNUSED(attributes)
[detail] +  bool ok=true;
[detail]    switch(memberID) {
[detail]    case 0: _pattern=content.toStringBuffer(); return true;
[detail] -  case 1: _component=Signal::standardComponent(content.toStringBuffer()); return true;
[detail] +  case 1: _component=SignalMetaData::standardComponent(content.toStringBuffer(), ok); return ok;
[detail]    default:
[detail]      break;
[detail]    }
[detail]          src/AsciiSignalFormatReader.cpp:  version-4.5.1	not modified
[detail]            src/AsciiSignalFormatRule.cpp:  version-4.5.1	not modified
[detail]              src/ChebyshevType1Cache.cpp:  version-4.5.1	no last version available
[detail]                      src/CityScanner.cpp:  version-4.5.1	modified out of comments
[detail] --- src/CityScanner.cpp-version-4.5.1-stripped	2025-09-28 04:01:04.099498630 +0200
[detail] +++ src/CityScanner.cpp-HEAD-stripped	2025-09-28 04:01:04.103498649 +0200
[detail] @@ -132,10 +132,10 @@
[detail]        if(chrono.elapsed()>10000) {
[detail]          if(pos<lastPos+1024) { 
[detail]            pos+=1024*1024;
[detail] -          App::log(tr("         very slow access, skipping 1Mb, read %1 Mb\n").arg(pos/(1024.0*1024.0)) );
[detail] +          App::log(tr("         very slow access, skipping 1Mb, read %1\n").arg(Number::bytesToString(pos)));
[detail]          }
[detail]          lastPos=pos;
[detail] -        App::log(tr("         fine scan, read %1 Mb\n").arg(pos/(1024.0*1024.0)) );
[detail] +        App::log(tr("         fine scan, read %1\n").arg(Number::bytesToString(pos)));
[detail]          chrono.start();
[detail]        }
[detail]        _stream->seek(pos+1);
[detail]                       src/CitySignal.cpp:  version-4.5.1	modified out of comments
[detail] --- src/CitySignal.cpp-version-4.5.1-stripped	2025-09-28 04:01:04.123498745 +0200
[detail] +++ src/CitySignal.cpp-HEAD-stripped	2025-09-28 04:01:04.127498765 +0200
[detail] @@ -4,7 +4,8 @@
[detail]  
[detail]  #include "CitySignal.h"
[detail]  #include "SignalFile.h"
[detail] -#include "GeoSignal.h"
[detail] +#include "SignalSegment.h"
[detail] +#include "StoredSignal.h"
[detail]  #include "Comments.h"
[detail]  
[detail]  namespace GeopsyCore {
[detail] @@ -52,8 +53,8 @@
[detail]      setRecorder(ptr+6);
[detail]    } else {
[detail]      
[detail] -    App::log(tr(" # Warning # No more file header found. Valid data occupy %1 bytes (%2 Mbytes)\n")
[detail] -                     .arg(initialOffset).arg((double)initialOffset/(1024.0*1024.0)));
[detail] +    App::log(tr(" # Warning # No more file header found. Valid data occupy %1 bytes (%2)\n")
[detail] +                     .arg(initialOffset).arg(Number::bytesToString(initialOffset)));
[detail]      return false;
[detail]    }
[detail]  
[detail] @@ -336,29 +337,32 @@
[detail]  
[detail]    
[detail]    SignalFile * newFile=new SignalFile(db, originalFileName, SignalFileFormat::Temporary);
[detail] +  IndexInFileSet index;
[detail]  
[detail]    GeopsyCoreEngine::instance()->setProgressMaximum(db, _channelNum-1);
[detail]    for(int iSig=0; iSig<_channelNum; iSig++) {
[detail] -    Signal * newSignal=new Signal(db);
[detail] +    index.setValue(iSig);
[detail] +    SignalSegment * newSignal=new SignalSegment(db);
[detail]  
[detail]      newSignal->setFile(newFile);
[detail] -    newSignal->setNumberInFile(iSig);
[detail] +    newSignal->setIndexInFile(index);
[detail]      newSignal->setStartTime(_startTime);
[detail] -    newSignal->setSamplingFrequency(_frequency);
[detail] -    newSignal->setType(Signal::Waveform);
[detail] +    newSignal->metaData()->setSamplingFrequency(_frequency);
[detail]      int recNum=iSig/3+1;
[detail] -    if(_channelNum>3)
[detail] +    if(_channelNum>3) {
[detail]        SignalFile::setSignalName(newSignal, originalFileName, QString("_%1").arg(recNum), recNum, originalFileName);
[detail] -    else
[detail] +    } else {
[detail]        SignalFile::setSignalName(newSignal, originalFileName, "", 1, originalFileName);
[detail] -    if(iSig % 3==0)
[detail] -      newSignal->setComponent(Signal::Vertical);
[detail] -    else if(iSig % 3==1)
[detail] -      newSignal->setComponent(Signal::North);
[detail] -    else if(iSig % 3==2)
[detail] -      newSignal->setComponent(Signal::East);
[detail] -    newSignal->setNSamples(_nSamples);
[detail] -    newSignal->setCountPerVolt(countPerVolt);
[detail] +    }
[detail] +    if(iSig % 3==0) {
[detail] +      newSignal->metaData()->setComponent(SignalMetaData::Vertical);
[detail] +    } else if(iSig % 3==1) {
[detail] +      newSignal->metaData()->setComponent(SignalMetaData::North);
[detail] +    } else if(iSig % 3==2) {
[detail] +      newSignal->metaData()->setComponent(SignalMetaData::East);
[detail] +    }
[detail] +    newSignal->setSize(_nSamples);
[detail] +    newSignal->metaData()->setCountPerVolt(countPerVolt);
[detail]      QString cmt;
[detail]      cmt+="Station serial number: "+QString::number(_serialNum)+"\n";
[detail]      cmt+="Station software version: "+QString::number(_softwareVersion)+"\n";
[detail] @@ -377,19 +381,20 @@
[detail]      cmt+="Maximum amplitude: "+QString::number(_maxReachedAmpl)+" / "+QString::number(_maxAllowedAmpl+1)+"\n";
[detail]      
[detail]      cmt+="Time drift: "+QString::number(_startTime.secondsTo(_endTime)-newSignal->duration()+newSignal->samplingPeriod())+" s";
[detail] -    newSignal->setMetaData(Comments(cmt));
[detail] +    newSignal->metaData()->optionalData().set<Comments>(cmt);
[detail]      
[detail] -    LOCK_SAMPLES(double, newSamples, newSignal)
[detail] +    LOCK_SAMPLES(double, newSamples, newSignal->values())
[detail]        char * ptr=data+3*iSig;
[detail]        int di=_channelNum*3;
[detail] -      double unitPerCount=newSignal->unitPerCount();
[detail] +      double unitPerCount=newSignal->metaData()->unitPerCount();
[detail]        for(int i=0; i<_nSamples; i++) {
[detail]          newSamples[i]=getSample(ptr+i*di)*unitPerCount;
[detail]        }
[detail] -    UNLOCK_SAMPLES(newSignal)
[detail] +    UNLOCK_SAMPLES(newSignal->values())
[detail]      GeopsyCoreEngine::instance()->setProgressValue(db, iSig);
[detail]    }
[detail]    delete [] data;
[detail] +  db->addFile(newFile);
[detail]    return true;
[detail]  }
[detail]  
[detail]                         src/Comments.cpp:  version-4.5.1	not modified
[detail]       src/CompatibilityTimeReference.cpp:  version-4.5.1	not modified
[detail]                    src/ComplexSignal.cpp:  version-4.5.1	not modified
[detail]                src/CoreToolInterface.cpp:  version-4.5.1	modified out of comments
[detail] --- src/CoreToolInterface.cpp-version-4.5.1-stripped	2025-09-28 04:01:04.191499075 +0200
[detail] +++ src/CoreToolInterface.cpp-HEAD-stripped	2025-09-28 04:01:04.195499093 +0200
[detail] @@ -19,6 +19,9 @@
[detail]      TRACE;
[detail]      _param=nullptr;
[detail]      _overwrite=true;
[detail] +    _oneProcess=false;
[detail] +    GeopsyCoreEngine::instance()->setConsoleProgress(true);
[detail] +    skipOpenBlasMultiThreading();
[detail]    }
[detail]  
[detail]    
[detail] @@ -49,10 +52,12 @@
[detail]      QString databaseFileName;
[detail]      QStringList groupPaths;
[detail]      QStringList groupPatterns;
[detail] -    QString utmCoordinateFile;
[detail] +    QStringList utmCoordinateFiles;
[detail]      QString saveDatabase;
[detail] -    QList<int> groupIds;
[detail] +    QStringList groupIds;
[detail]      bool showGroups=false, showCoord=false, groupLeaves=false;
[detail] +    AbstractParameters::KeywordMap * paramKeywords=_param->createKeywordMap();
[detail] +    GarbageCollector coll(paramKeywords);
[detail]  
[detail]      int j=1;
[detail]      for (int i=1; i<argc; i++) {
[detail] @@ -67,8 +72,12 @@
[detail]            databaseFileName=argv[i];
[detail]          } else if(arg=="-no-file-key") {
[detail]            GeopsyCoreEngine::instance()->setFileContentKey(false);
[detail] +        } else if(arg=="-no-progress") {
[detail] +          GeopsyCoreEngine::instance()->setConsoleProgress(false);
[detail]          } else if(arg=="-group-leaves") {
[detail]            groupLeaves=true;
[detail] +        } else if(arg=="-one-process") {
[detail] +          _oneProcess=true;
[detail]          } else if(arg=="-groups") {
[detail]            showGroups=true;
[detail]          } else if(arg=="-group" || arg=="-group-path") {
[detail] @@ -79,7 +88,7 @@
[detail]            groupPatterns.append(argv[i]);
[detail]          } else if(arg=="-group-id") {
[detail]            CoreApplication::checkOptionArg(i, argc, argv);
[detail] -          groupIds.append(CoreApplication::toInt(i, i-1, argv));
[detail] +          groupIds.append(argv[i]);
[detail]          } else if(arg=="-o") {
[detail]            CoreApplication::checkOptionArg(i, argc, argv);
[detail]            _outputBaseName=argv[i];
[detail] @@ -95,7 +104,7 @@
[detail]            showCoord=true;
[detail]          } else if(arg=="-utm") {
[detail]            CoreApplication::checkOptionArg(i, argc, argv);
[detail] -          utmCoordinateFile.append(argv[i]);
[detail] +          utmCoordinateFiles.append(argv[i]);
[detail]          } else if(arg=="-save-db") {
[detail]            CoreApplication::checkOptionArg(i, argc, argv);
[detail]            saveDatabase=argv[i];
[detail] @@ -110,12 +119,11 @@
[detail]            }
[detail]          } else if(arg=="-set") {
[detail]            CoreApplication::checkOptionArg(i, argc, argv);
[detail] -          if(!_param->parse(argv[i])) {
[detail] +          if(!_param->parse(argv[i], paramKeywords)) {
[detail]              App::log(tr("Error setting parameter '%1'.\n").arg(argv[i]) );
[detail]              return false;
[detail]            }
[detail]          } else if(arg=="-fix-signal-paths") {
[detail] -          CoreApplication::instance()->setBatch(false);
[detail]            if(databaseFileName.isEmpty()) {
[detail]              App::log(tr("Option '-db' must be defined before '-fix-signal-path'.\n") );
[detail]              return false;
[detail] @@ -151,10 +159,15 @@
[detail]        ::exit(0);
[detail]      }
[detail]      if(!groupIds.isEmpty()) {
[detail] -      for(QList<int>::iterator it=groupIds.begin(); it!=groupIds.end(); it++) {
[detail] -        AbstractSignalGroup * g=db->findGroup(*it);
[detail] +      UniqueID id;
[detail] +      for(QStringList::iterator it=groupIds.begin(); it!=groupIds.end(); it++) {
[detail] +        if(!id.fromString(*it, nullptr)) {
[detail] +          App::log(tr("not a valid id '%1'\n").arg(*it));
[detail] +          return false;
[detail] +        }
[detail] +        AbstractSignalGroup * g=db->findGroup(id);
[detail]          if(!g) {
[detail] -          App::log(tr("group id %1 does not exist\n").arg(*it) );
[detail] +          App::log(tr("group id '%1' does not exist\n").arg(*it));
[detail]            return false;
[detail]          }
[detail]          if(groupLeaves) {
[detail] @@ -201,11 +214,14 @@
[detail]          App::log(tr("Empty group selection\n") );
[detail]          return false;
[detail]        }
[detail] -      _groups=db->masterGroup()->list();
[detail] +    } else {
[detail] +      App::log(tr("Selected groups:\n"));
[detail] +      for(QList<const AbstractSignalGroup *>::iterator it=_groups.begin(); it!=_groups.end(); it++) {
[detail] +        App::log(tr("  '%1': %2 signals\n").arg((*it)->pathName()).arg((*it)->signalCount()) );
[detail] +      }
[detail]      }
[detail] -    if(!utmCoordinateFile.isEmpty()) {
[detail] -      App::log(tr("Setting coordinates from '%1'...\n").arg(utmCoordinateFile));
[detail] -      if(!setUtmCoordinates(utmCoordinateFile)) {
[detail] +    if(!utmCoordinateFiles.isEmpty()) {
[detail] +      if(!setUtmCoordinates(utmCoordinateFiles)) {
[detail]          return false;
[detail]        }
[detail]      }
[detail] @@ -220,10 +236,6 @@
[detail]        }
[detail]        ::exit(0);
[detail]      }
[detail] -    App::log(tr("Selected groups:\n"));
[detail] -    for(QList<const AbstractSignalGroup *>::iterator it=_groups.begin(); it!=_groups.end(); it++) {
[detail] -      App::log(tr("  '%1': %2 signals\n").arg((*it)->pathName()).arg((*it)->signalCount()) );
[detail] -    }
[detail]      if(showCoord) {
[detail]        QTextStream sOut(stdout);
[detail]        int n=subPoolCount();
[detail] @@ -240,33 +252,40 @@
[detail]      return true;
[detail]    }
[detail]  
[detail] -  bool CoreToolInterface::setUtmCoordinates(const QString& utmCoordinateFile)
[detail] +  bool CoreToolInterface::setUtmCoordinates(const QStringList& utmCoordinateFiles)
[detail]    {
[detail]      CoordinateFile cf;
[detail]      cf.setUtmXYNameParser();
[detail] -    if(!cf.setFile(utmCoordinateFile)) {
[detail] +    QList<NamedPoint> coordinates;
[detail] +    for(QStringList::const_iterator it=utmCoordinateFiles.begin(); it!=utmCoordinateFiles.end(); it++) {
[detail] +      App::log(tr("Loading coordinates from '%1'...\n").arg(*it));
[detail] +      if(!cf.setFile(*it)) {
[detail]        return false;
[detail]      }
[detail]      while(!cf.wait()) {}
[detail] -    QList<NamedPoint> coordinates=cf.points();
[detail] +      coordinates.append(cf.points());
[detail] +    }
[detail] +    APP_LOG(1, tr("%1 coordinates available\n").arg(coordinates.size()));
[detail]      
[detail]      QMap<QString, int> coordinateMap;
[detail]      for(int i=coordinates.count()-1; i>=0; i--) {
[detail]        coordinateMap.insert(coordinates.at(i).name(), i);
[detail]      }
[detail] +    APP_LOG(1, tr("%1 coordinates available with unique name\n").arg(coordinateMap.size()));
[detail]      SignalDatabase * db=GeopsyCoreEngine::instance()->defaultDatabase();
[detail]      QMap<QString, int>::iterator it;
[detail] +    App::log(tr("Setting coordinates...\n"));
[detail]      for(int i=db->count()-1; i>=0; i--) {
[detail] -      Signal * sig=db->at(i);
[detail] -      it=coordinateMap.find(sig->name());
[detail] +      SignalSegment * sig=db->at(i);
[detail] +      it=coordinateMap.find(sig->metaData()->name());
[detail]        if(it!=coordinateMap.end()) {
[detail]          const NamedPoint& p=coordinates.at(it.value());
[detail] -        App::log(tr("Set coordinates (%1) to signal %2 (ID=%3)\n")
[detail] +        APP_LOG(1, tr("Set coordinates (%1) to signal %2 (ID=%3)\n")
[detail]                   .arg(p.toString('f', 3))
[detail] -                 .arg(sig->nameComponent())
[detail] -                 .arg(sig->id()));
[detail] -        sig->setReceiver(p);
[detail] -        sig->setUtmZone(cf.utmZone());
[detail] +                 .arg(sig->metaData()->nameComponent())
[detail] +                 .arg(sig->id().toString()));
[detail] +        sig->metaData()->setReceiver(p);
[detail] +        sig->metaData()->setUtmZone(cf.utmZone());
[detail]        }
[detail]      }
[detail]      return true;
[detail] @@ -281,10 +300,10 @@
[detail]    int CoreToolInterface::subPoolCount() const
[detail]    {
[detail]      TRACE;
[detail] -    if(_groups.isEmpty()) {
[detail] +    if(_groups.isEmpty() || _oneProcess) {
[detail]        return 1;
[detail]      } else {
[detail] -      return _groups.count();
[detail] +      return _groups.size();
[detail]      }
[detail]    }
[detail]  
[detail] @@ -295,10 +314,16 @@
[detail]      SubSignalPool p;
[detail]      if(_groups.isEmpty()) {
[detail]        p.addAll(GeopsyCoreEngine::instance()->defaultDatabase());
[detail] +    } else if(_oneProcess) {
[detail] +      int n=_groups.size();
[detail] +      for(int i=0; i<n; i++) {
[detail] +        p.addGroup(_groups.at(i));
[detail] +      }
[detail]      } else {
[detail]        p.addGroup(_groups.at(index));
[detail]      }
[detail]      if(!_stationList.isEmpty()) {
[detail] +      App::log(tr("Selecting stations...\n"));
[detail]        p.remove(_stationList);
[detail]      }
[detail]      return p;
[detail] @@ -307,7 +332,13 @@
[detail]    QString CoreToolInterface::groupName(int index) const
[detail]    {
[detail]      if(_groups.isEmpty()) {
[detail] +      SignalDatabase * db=GeopsyCoreEngine::instance()->defaultDatabase();
[detail] +      if(db->exists()) {
[detail] +        QFileInfo fi(db->name());
[detail] +        return fi.baseName();
[detail] +      } else {
[detail]        return "importedsignals";
[detail] +      }
[detail]      } else {
[detail]        return _groups.at(index)->name();
[detail]      }
[detail] @@ -346,7 +377,7 @@
[detail]        _tool->stop();  
[detail]                       
[detail]        signal(SIGINT, nullptr);
[detail] -      App::log(tr("Waiting for the termination during 60 sec. maximum\n"
[detail] +      App::log(tr("Waiting for the termination during a maximum of 60 seconds.\n"
[detail]                    "The collected results will be saved even if some tasks are blocked.\n"
[detail]                    "Send another interrupt signal to skip saving results.\n"));
[detail]        _tool->waitFinished(60000);
[detail] @@ -369,10 +400,12 @@
[detail]      h->addOption("-db", "Database file to process if no signal files are imported.");
[detail]      h->addOption("-save-db <FILE.gpy>", "Creates database FILE.gpy from the loaded signals and exits.");
[detail]      h->addOption("-no-file-key", "Skip file content key when loading database (only for old database before 2017-09).");
[detail] +    h->addOption("-no-progress", "Do no show progress while loading a database or importing signal files.");
[detail]      h->addOption("-interactive", "Allows interactions through stdin/out.");
[detail]      h->addOption("-no-overwrite", "If output file already exists, does not process.");
[detail]      h->addOption("-groups", "Lists the available groups and exits.");
[detail] -    h->addOption("-group-leaves", "When a group is selected by one of the following options, \"leaves\" means: process "
[detail] +    h->addOption("-one-process", "A single process is started including all selected groups.");
[detail] +    h->addOption("-group-leaves", "When a folder group is selected by one of the following options, \"leaves\" means: process "
[detail]                                    "individualy all elementary children. By default, the selected folder groups are process "
[detail]                                    "in one block. This option has no effect if the selected groups are already elementary groups "
[detail]                                    " with no children.");
[detail] @@ -386,10 +419,10 @@
[detail]      h->addOption("-group-pattern <REGEXP>", "Select for processing all groups whose name matches REGEXP. Only one entry is allowed. "
[detail]                                              "If no group is selected, all groups are processed.");
[detail]      h->addOption("-station-list <STATIONS>", "STATIONS is a coma separated list of station names to be processed. "
[detail] -                                             "'-group-*' options are still required but only a subset of the group "
[detail] -                                             "can be selected with option '-station-list'.");
[detail] +                                             "If a station name contains a '-', a range of station names are considered.");
[detail]      h->addOption("-utm <FILE>", "If provided, the coordinates of stations are assigned from the UTM coordinates in file. "
[detail] -                                "File columns must be: UTM_ZONE X Y STATION_NAME. Use UTM_ZONE as '---' for cartesian non UTM coordinates.");
[detail] +                                "File columns must be: UTM_ZONE X Y STATION_NAME. Use UTM_ZONE as '---' for cartesian non UTM coordinates. "
[detail] +                                "Several files can be provided with several -utm options. The order has no importance.");
[detail]      h->addOption("-coord", "Returns the list of selected stations and their coordinates.");
[detail]      h->addOption("-o <FILE>", "Ouput file name (default='a')");
[detail]      h->addOption("-param <PARAM>", "Load parameters in PARAM");
[detail]                src/CustomFileFormats.cpp:  version-4.5.1	not modified
[detail]               src/DefaultSignalGroup.cpp:  version-4.5.1	not modified
[detail]                src/DeviceCardScanner.cpp:  version-4.5.1	not modified
[detail]                     src/DoubleSignal.cpp:  version-4.5.1	modified out of comments
[detail] --- src/DoubleSignal.cpp-version-4.5.1-stripped	2025-09-28 04:01:04.251499364 +0200
[detail] +++ src/DoubleSignal.cpp-HEAD-stripped	2025-09-28 04:01:04.259499402 +0200
[detail] @@ -5,11 +5,11 @@
[detail]  #include "DoubleSignal.h"
[detail]  #include "MorletParameters.h"
[detail]  #include "KeepSignal.h"
[detail] -#include "FastFourierTransform.h"
[detail] -#include "FastPartialFourierTransform.h"
[detail]  #include "TaperDelegate.h"
[detail]  #include "FFTWCache.h"
[detail]  #include "SubSignalPool.h"
[detail] +#include "StoredSignal.h"
[detail] +#include "ChebyshevType1Cache.h"
[detail]  
[detail]  namespace GeopsyCore {
[detail]  
[detail] @@ -199,21 +199,22 @@
[detail]    bool ret=true;
[detail]    switch(param.method()) {
[detail]    case FilterParameters::Butterworth: {
[detail] +        const ButterworthParameters& sparam=param.butterworth();
[detail]        SignalType ost=saveType(Waveform);
[detail]        LOCK_SAMPLES(double, thisSamples, this)
[detail]          switch (param.band()) {
[detail]          case FilterParameters::BandPass:
[detail] -          filrec(param.maximumFrequency(), 1, 0, _nSamples-1, 1, thisSamples, thisSamples, param.order(), _samplingPeriod);
[detail] -          filrec(param.minimumFrequency(), -1, 0, _nSamples-1, 1, thisSamples, thisSamples, param.order(), _samplingPeriod);
[detail] +            filrec(sparam.maximumFrequency(), 1, 0, _nSamples-1, 1, thisSamples, thisSamples, sparam.order(), _samplingPeriod);
[detail] +            filrec(sparam.minimumFrequency(), -1, 0, _nSamples-1, 1, thisSamples, thisSamples, sparam.order(), _samplingPeriod);
[detail]            break;
[detail] -        case FilterParameters::BandReject: {
[detail] +          case FilterParameters::BandStop: {
[detail]              double * s=new double [_nSamples];
[detail]              int i;
[detail]              for(i=0; i<_nSamples; i++) {
[detail]                s[i]=thisSamples[i];
[detail]              }
[detail] -            filrec(param.minimumFrequency(), 1, 0, _nSamples-1, 1, thisSamples, thisSamples, param.order(), _samplingPeriod);
[detail] -            filrec(param.maximumFrequency(), -1, 0, _nSamples-1, 1, s, s, param.order(), _samplingPeriod);
[detail] +              filrec(sparam.minimumFrequency(), 1, 0, _nSamples-1, 1, thisSamples, thisSamples, sparam.order(), _samplingPeriod);
[detail] +              filrec(sparam.maximumFrequency(), -1, 0, _nSamples-1, 1, s, s, sparam.order(), _samplingPeriod);
[detail]              for(i=0; i<_nSamples; i++) {
[detail]                thisSamples[i]+=s[i];
[detail]              }
[detail] @@ -221,50 +222,64 @@
[detail]            }
[detail]            break;
[detail]          case FilterParameters::LowPass:
[detail] -          filrec(param.minimumFrequency(), 1, 0, _nSamples-1, 1, thisSamples, thisSamples, param.order(), _samplingPeriod);
[detail] +            filrec(sparam.minimumFrequency(), 1, 0, _nSamples-1, 1, thisSamples, thisSamples, sparam.order(), _samplingPeriod);
[detail]            break;
[detail]          case FilterParameters::HighPass:
[detail] -          filrec(param.minimumFrequency(), -1, 0, _nSamples-1, 1, thisSamples, thisSamples, param.order(), _samplingPeriod);
[detail] +            filrec(sparam.minimumFrequency(), -1, 0, _nSamples-1, 1, thisSamples, thisSamples, sparam.order(), _samplingPeriod);
[detail]            break;
[detail]          }
[detail]        UNLOCK_SAMPLES(this) else ret=false;
[detail]        restoreType(ost);
[detail]      }
[detail]      break;
[detail] +    case FilterParameters::ChebyshevType1: {
[detail] +        const ChebyshevParameters& sparam=param.chebyshevType1();
[detail] +        
[detail] +        SignalType ost=saveType(Waveform);
[detail] +        const ChebyshevType1Cache * cache;
[detail] +        cache=ChebyshevType1Cache::begin(_nSamples, _samplingPeriod, sparam);
[detail] +        LOCK_SAMPLES(double, thisSamples, this)
[detail] +        cache->execute(thisSamples);
[detail] +        UNLOCK_SAMPLES(this) else ret=false;
[detail] +        ChebyshevType1Cache::end(cache);
[detail] +        restoreType(ost);
[detail] +      }
[detail] +      break;
[detail]    case FilterParameters::FrequencyWindow: {
[detail] +        const FrequencyWindowParameters& sparam=param.frequencyWindow();
[detail]        SignalType st=saveType(Spectrum);
[detail]        double fac=_samplingPeriod*static_cast<double>(_nSamples);
[detail]        LOCK_SAMPLES(double, thisSamples, this)
[detail]          TaperDelegate::ComplexSample samples(_nSamples, thisSamples);
[detail] -        TaperDelegate window(&param.frequencyWindow());
[detail] +          TaperDelegate window(&sparam.window());
[detail]          switch (param.band()) {
[detail]          case FilterParameters::LowPass:
[detail] -          window.createFunction(qRound(fac*param.minimumFrequency()*(1.0-param.width())),
[detail] +            window.createFunction(qRound(fac*sparam.minimumFrequency()*(1.0-sparam.width())),
[detail]                                  _nyquistIndex,
[detail] -                                qRound(fac*param.minimumFrequency()*(1.0-2.0*param.width())),
[detail] -                                qRound(fac*param.minimumFrequency()));
[detail] +                                  qRound(fac*sparam.minimumFrequency()*(1.0-2.0*sparam.width())),
[detail] +                                  qRound(fac*sparam.minimumFrequency()));
[detail]            if(window.isValid()) {
[detail]              window.apply(samples);
[detail]            }
[detail]            break;
[detail]          case FilterParameters::HighPass: {
[detail] -            int i=qRound(fac*param.minimumFrequency()*(1.0+1.0*param.width()));
[detail] +              int i=qRound(fac*sparam.minimumFrequency()*(1.0+sparam.width()));
[detail]              if(i>_nyquistIndex) {
[detail]                i=_nyquistIndex;
[detail]              }
[detail]              window.createFunction(0, i,
[detail] -                                  qRound(fac*param.minimumFrequency()),
[detail] -                                  qRound(fac*param.minimumFrequency()*(1.0+2.0*param.width())));
[detail] +                                    qRound(fac*sparam.minimumFrequency()),
[detail] +                                    qRound(fac*sparam.minimumFrequency()*(1.0+2.0*sparam.width())));
[detail]              if(window.isValid()) {
[detail]                window.apply(samples);
[detail]              }
[detail]            }
[detail]            break;
[detail]          case FilterParameters::BandPass:
[detail] -        case FilterParameters::BandReject:
[detail] +          case FilterParameters::BandStop:
[detail]            window.createFunction(0, _nyquistIndex,
[detail] -                                qRound(fac*param.minimumFrequency()),
[detail] -                                qRound(fac*param.maximumFrequency()));
[detail] +                                  qRound(fac*sparam.minimumFrequency()),
[detail] +                                  qRound(fac*sparam.maximumFrequency()));
[detail]            if(window.isValid()) {
[detail]              window.apply(samples);
[detail]            }
[detail] @@ -313,7 +328,9 @@
[detail]        csamples[i]=0.0;
[detail]      }
[detail]      
[detail] -    FastFourierTransform::instance()->backward(csig->nSamples(), csamples);
[detail] +      const FFTWCache * cache=FFTWCache::begin(csig->nSamples(), FFTWKey::BackwardComplex);
[detail] +      cache->execute(csamples);
[detail] +      FFTWCache::end(cache);
[detail]    UNLOCK_SAMPLES(csig)
[detail]    return csig;
[detail]  }
[detail] @@ -322,23 +339,22 @@
[detail]  ComplexSignal * DoubleSignal::positiveComplexSpectrum(bool fullSize) const
[detail]  {
[detail]    TRACE;
[detail] -  int n=_nSamples >> 1;
[detail]    
[detail] -  ComplexSignal * csig=new ComplexSignal(fullSize ? _nSamples : n+1);
[detail] +    ComplexSignal * csig=new ComplexSignal(fullSize ? _nSamples : _nyquistIndex+1);
[detail]    LOCK_SAMPLES(Complex, csamples, csig)
[detail]      
[detail]      const DoubleSignal * sig=saveType(Spectrum);
[detail]      CONST_LOCK_SAMPLES(double, sigSamples, sig)
[detail]        csamples[0]=sigSamples[ 0 ];
[detail] -      for(int i=1; i<n; i++) {
[detail] +        for(int i=1; i<_nyquistIndex; i++) {
[detail]          csamples[i].setRe(sigSamples[i]);
[detail]          csamples[i].setIm(sigSamples[_nSamples-i]);
[detail]        }
[detail]        if(_nSamples & 0x00000001) {
[detail] -        csamples[n].setRe(sigSamples[n]);
[detail] -        csamples[n].setIm(sigSamples[_nSamples-n]);
[detail] +          csamples[_nyquistIndex].setRe(sigSamples[_nyquistIndex]);
[detail] +          csamples[_nyquistIndex].setIm(sigSamples[_nSamples-_nyquistIndex]);
[detail]        } else {
[detail] -        csamples[n]=sigSamples[ n ];
[detail] +          csamples[_nyquistIndex]=sigSamples[_nyquistIndex];
[detail]        }
[detail]      UNLOCK_SAMPLES(sig)
[detail]      restoreType(sig);
[detail] @@ -350,7 +366,6 @@
[detail]  ComplexSignal * DoubleSignal::complexSpectrum() const
[detail]  {
[detail]    TRACE;
[detail] -  int n=_nSamples >> 1;
[detail]    
[detail]    ComplexSignal * csig=new ComplexSignal(_nSamples);
[detail]    LOCK_SAMPLES(Complex, csamples, csig)
[detail] @@ -358,16 +373,16 @@
[detail]      const DoubleSignal * sig=saveType(Spectrum);
[detail]      CONST_LOCK_SAMPLES(double, sigSamples, sig)
[detail]        csamples[0]=sigSamples[ 0 ];
[detail] -      for(int i=1; i<n; i++) {
[detail] +        for(int i=1; i<_nyquistIndex; i++) {
[detail]          csamples[i].setRe(sigSamples[i]);              
[detail]          csamples[i].setIm(sigSamples[_nSamples-i]);
[detail]          csamples[_nSamples-i]=conjugate(csamples[i]);  
[detail]        }
[detail]        if(_nSamples & 0x00000001) {
[detail] -        csamples[n].setRe(sigSamples[n]);
[detail] -        csamples[n].setIm(sigSamples[_nSamples-n]);
[detail] +          csamples[_nyquistIndex].setRe(sigSamples[_nyquistIndex]);
[detail] +          csamples[_nyquistIndex].setIm(sigSamples[_nSamples-_nyquistIndex]);
[detail]        } else {
[detail] -        csamples[n]=sigSamples[n];
[detail] +          csamples[_nyquistIndex]=sigSamples[_nyquistIndex];
[detail]        }
[detail]      UNLOCK_SAMPLES(sig)
[detail]      restoreType(sig);
[detail] @@ -467,15 +482,61 @@
[detail]  }
[detail]  
[detail]  
[detail] -bool DoubleSignal::whiten()
[detail] +  bool DoubleSignal::whiten(double fmin, double fmax, double apodization)
[detail]  {
[detail]    TRACE;
[detail] +    ASSERT(apodization>=0.0 && apodization<1.0);
[detail]    bool ret=false;
[detail]    SignalType st=saveType(Spectrum); 
[detail] +    if(fmax==0.0) {
[detail] +      fmax=samplingFrequency()*0.5;
[detail] +    } else if(fmin>=fmax) {
[detail] +      fmin=0.0;
[detail] +      fmax=samplingFrequency()*0.5;
[detail] +    }
[detail] +    double invdf=_samplingPeriod *static_cast<double>(_nSamples);
[detail] +    
[detail] +    int fminStart=qRound(fmin*(1.0-apodization)*invdf);
[detail] +    int fminEnd=qRound(fmin*invdf);
[detail] +    int fmaxStart=qRound(fmax*invdf);
[detail] +    int fmaxEnd=qRound(fmax*(1.0+apodization)*invdf);
[detail] +    
[detail] +    
[detail] +    
[detail] +    
[detail] +    
[detail] +    double fminAlpha=M_PI/(fmin*apodization*invdf);
[detail] +    double fmaxAlpha=M_PI/(fmax*apodization*invdf);
[detail] +    if(fmaxEnd>_nyquistIndex) {
[detail] +      fmaxEnd=_nyquistIndex;
[detail] +      if(fmaxStart>_nyquistIndex) {
[detail] +        fmaxStart=_nyquistIndex;
[detail] +        if(fminEnd>_nyquistIndex) {
[detail] +          fminEnd=_nyquistIndex;
[detail] +          if(fminStart>_nyquistIndex) {
[detail] +            fminStart=_nyquistIndex;
[detail] +          }
[detail] +        }
[detail] +      }
[detail] +    }
[detail]    LOCK_SAMPLES(double, thisSamples, this)
[detail] -    for(int i=0; i<_nyquistIndex; i++) {
[detail] +      int i=0;
[detail] +      Complex nullAmp;
[detail] +      for(; i<fminStart; i++) {
[detail] +        setComplex(thisSamples, i, nullAmp);
[detail] +      }
[detail] +      for(; i<fminEnd; i++) {
[detail] +        setAmplitude(thisSamples, i, 0.5*(1.0-cos(fminAlpha*(i-fminStart))));
[detail] +      }
[detail] +      for(; i<fmaxStart; i++) {
[detail]        setAmplitude(thisSamples, i, 1.0);
[detail]      }
[detail] +      for(; i<fmaxEnd; i++) {
[detail] +        setAmplitude(thisSamples, i, 0.5*(1.0+cos(fmaxAlpha*(i-fmaxStart))));
[detail] +      }
[detail] +      for(; i<_nyquistIndex; i++) {
[detail] +        setComplex(thisSamples, i, nullAmp);
[detail] +      }
[detail]      ret=true;
[detail]    UNLOCK_SAMPLES(this)
[detail]    restoreType(st);
[detail] @@ -607,13 +668,24 @@
[detail]    bool ret=false;
[detail]    LOCK_SAMPLES(double, thisSamples, this)
[detail]      SignalType st=saveType(Waveform); 
[detail] +      if(delta==0.0) {
[detail] +        for(int i=0; i<_nSamples; i++) {
[detail] +          if(thisSamples[i]>0.0) {
[detail] +            thisSamples[i]=1.0;
[detail] +          } else {
[detail] +            thisSamples[i]=-1.0;
[detail] +          }
[detail] +        }
[detail] +      } else {
[detail]      double invDelta=1.0/delta;
[detail]      for(int i=0; i<_nSamples; i++) {
[detail] -      if(thisSamples[i]>0)
[detail] +          if(thisSamples[i]>0.0) {
[detail]          thisSamples[i]=ceil(thisSamples[i] * invDelta) * delta;
[detail] -      else
[detail] +          } else {
[detail]          thisSamples[i]=floor(thisSamples[i] * invDelta) * delta;
[detail]      }
[detail] +        }
[detail] +      }
[detail]      restoreType(st);
[detail]      ret=true;
[detail]    UNLOCK_SAMPLES(this)
[detail] @@ -666,7 +738,7 @@
[detail]      switch (st) {
[detail]      case Waveform: {
[detail]          LOCK_SAMPLES(double, thisSamples, this)
[detail] -          const FFTWCache * cache=FFTWCache::begin(_nSamples, FFTWKey::HC2R);
[detail] +            const FFTWCache * cache=FFTWCache::begin(_nSamples, FFTWKey::HalfComplexToReal);
[detail]            cache->execute(thisSamples);
[detail]            FFTWCache::end(cache);
[detail]            
[detail] @@ -706,7 +777,7 @@
[detail]      case Spectrum:
[detail]      case Phase: {
[detail]          LOCK_SAMPLES(double, thisSamples, this)
[detail] -          const FFTWCache * cache=FFTWCache::begin(_nSamples, FFTWKey::R2HC);
[detail] +            const FFTWCache * cache=FFTWCache::begin(_nSamples, FFTWKey::RealToHalfComplex);
[detail]            cache->execute(thisSamples);
[detail]            FFTWCache::end(cache);
[detail]            
[detail] @@ -888,19 +959,20 @@
[detail]      App::log(tr("DoubleSignal::decimateTime: samples of destination signal cannot be allocated, aborting.\n") );
[detail]      return false;
[detail]    }
[detail] -  int nResampled=(int) floor(sig->nSamples()/(double)factor);
[detail] +    int nResampled=sig->nSamples()/factor;
[detail]    setNSamples(nResampled);
[detail] -  setSamplingPeriod(factor*samplingPeriod());
[detail] +    setSamplingPeriod(factor*sig->samplingPeriod());
[detail]  
[detail]    
[detail]    DoubleSignal * filtsig=new DoubleSignal(*sig);
[detail]    filtsig->copySamplesFrom(sig);
[detail]    
[detail]    FilterParameters param;
[detail] -  param.setFrequencyRange(0.5/_samplingPeriod);
[detail] -  param.setWidth(0.2);
[detail] -  param.setBand(FilterParameters::LowPass);
[detail]    param.setMethod(FilterParameters::FrequencyWindow);
[detail] +    param.setBand(FilterParameters::LowPass);
[detail] +    param.frequencyWindow().setMinimumFrequency(0.5/_samplingPeriod);
[detail] +    param.frequencyWindow().window().setShape(WindowFunctionParameters::Cosine);
[detail] +    param.frequencyWindow().setWidth(0.2);
[detail]    if( !filtsig->filter(param) ) {
[detail]      delete filtsig;
[detail]      return false;
[detail] @@ -975,63 +1047,40 @@
[detail]    return true;
[detail]  }
[detail]  
[detail] -
[detail] -bool DoubleSignal::correlationProcess(const DoubleSignal * s1, const DoubleSignal * s2,
[detail] -                                      DoubleSignal * s1t, DoubleSignal * s2t)
[detail] +  bool DoubleSignal::correlation(const DoubleSignal * s1, const DoubleSignal * s2)
[detail]  {
[detail]    TRACE;
[detail] -  int n1=s1->nSamples();
[detail] -  int n2=s2->nSamples();
[detail] -  CacheProcess cp;
[detail] -  cp << s1t << s2t;
[detail]    
[detail] -  WindowFunctionParameters param;
[detail] -  param.setShape(WindowFunctionParameters::Tukey);
[detail] -  param.setAlpha(0.02);
[detail]  
[detail] -  s1t->setNSamples(n1);
[detail] -  s1t->copySamplesFrom(s1, 0, 0, n1);
[detail] -  s1t->subtractValue();
[detail] -  s1t->taper(param);
[detail]  
[detail] -  s2t->setNSamples(n2);
[detail] -  s2t->copySamplesFrom(s2, 0, 0, n2);
[detail] -  s2t->subtractValue();
[detail] -  s2t->taper(param);
[detail] -
[detail] -  
[detail] -  int n=Number::nextPowerOfTwo(n1+n2-1);
[detail]  
[detail] +    int n1=s1->nSamples();
[detail] +    int n2=s2->nSamples();
[detail] +    int n=n1;
[detail] +    if(n<n2) {
[detail] +      n=n2;
[detail] +    }
[detail] +    n+=_nyquistIndex;
[detail]    
[detail] -  DoubleSignal spec1(*s1t);
[detail] -  cp << &spec1;
[detail] +    DoubleSignal spec1(*s1);
[detail]    spec1.setNSamples(n);
[detail] -  spec1.copySamplesFrom(s1t, 0, 0, n1);
[detail] +    spec1.copySamplesFrom(s1, 0, 0, n1);
[detail]    spec1.initValues(0.0, n1, n-n1);
[detail]  
[detail] -  
[detail] -  DoubleSignal spec2(*s2t);
[detail] -  cp << &spec2;
[detail] +    DoubleSignal spec2(*s2);
[detail]    spec2.setNSamples(n);
[detail] -  int i=n1-1;
[detail] -  spec2.initValues(0.0, 0, i);
[detail] -  spec2.copySamplesFrom(s2t, 0, i, n2);
[detail] -  i+=n2;
[detail] -  spec2.initValues(0.0, i, n-i);
[detail] -
[detail] -  cp.next();
[detail] -  cp.next();
[detail] +    spec2.copySamplesFrom(s2, 0, 0, n2);
[detail] +    spec2.initValues(0.0, n2, n-n2);
[detail]  
[detail]    DoubleSignal conv(n);
[detail]    conv.setType(Spectrum);
[detail]    conv.setSamplingPeriod(s1->samplingPeriod());
[detail] -  cp << &conv << this;
[detail]  
[detail]    bool ret=false;
[detail] -  LOCK_SAMPLES(double, convSamples, (&conv))
[detail] -    LOCK_SAMPLES(double, s1Samples, (&spec1))
[detail] -      LOCK_SAMPLES(double, s2Samples, (&spec2))
[detail] -        const FFTWCache * cache=FFTWCache::begin(n, FFTWKey::R2HC);
[detail] +    LOCK_SAMPLES(double, convSamples, &conv)
[detail] +      LOCK_SAMPLES(double, s1Samples, &spec1)
[detail] +        LOCK_SAMPLES(double, s2Samples, &spec2)
[detail] +          const FFTWCache * cache=FFTWCache::begin(n, FFTWKey::RealToHalfComplex);
[detail]          cache->execute(s1Samples);
[detail]          cache->execute(s2Samples);
[detail]          FFTWCache::end(cache);
[detail] @@ -1046,23 +1093,22 @@
[detail]            convSamples[i]=c1.re();
[detail]            convSamples[n-i]=c1.im();
[detail]          }
[detail] -        if(!(conv._nSamples & 0x00000001)) {
[detail]            convSamples[conv._nyquistIndex]=s1Samples[conv._nyquistIndex]*s2Samples[conv._nyquistIndex];
[detail] -        }
[detail]          ret=true;
[detail]        UNLOCK_SAMPLES((&spec2))
[detail]      UNLOCK_SAMPLES((&spec1))
[detail]      if(ret) {
[detail]        ret=false;
[detail] -      const FFTWCache * cache=FFTWCache::begin(n, FFTWKey::HC2R);
[detail] +        const FFTWCache * cache=FFTWCache::begin(n, FFTWKey::HalfComplexToReal);
[detail]        cache->execute(convSamples);
[detail]        FFTWCache::end(cache);
[detail] -      
[detail]        LOCK_SAMPLES(double, thisSamples, this)
[detail] -        int n0=n1-1-_nyquistIndex;
[detail]          double norm=1.0/static_cast<double>(n);
[detail] -        for(int i=0; i<_nSamples; i++) {
[detail] -          thisSamples[i]=convSamples[n0+i]*norm;
[detail] +        for(int i=_nyquistIndex; i<_nSamples; i++) {
[detail] +          thisSamples[i]=convSamples[i-_nyquistIndex]*norm;
[detail] +        }
[detail] +        for(int i=0; i<_nyquistIndex; i++) {
[detail] +          thisSamples[i]=convSamples[i+n-_nyquistIndex]*norm;
[detail]          }
[detail]          ret=true;
[detail]        UNLOCK_SAMPLES(this)
[detail] @@ -1117,50 +1163,57 @@
[detail]  }
[detail]  
[detail]  
[detail] -bool DoubleSignal::correlation(const DoubleSignal * s1, const DoubleSignal * s2, double maxDelay)
[detail] +  double DoubleSignal::correlationOptimumMaximumDelay(double maximumDelay, int n1, int n2,
[detail] +                                                      double sampFreq, int maxPrimeFactor)
[detail]  {
[detail] -  TRACE;
[detail] -  if(!correlationCheck(s1, s2, maxDelay)) {
[detail] -    return false;
[detail] +    int n0=n1;
[detail] +    if(n0<n2) {
[detail] +      n0=n2;
[detail] +    }
[detail] +    int n=n0;
[detail] +    n+=qRound(maximumDelay*sampFreq);
[detail] +    n=PrimeFactorization::closestValueAbove(n, maxPrimeFactor);
[detail] +    if(App::verbosity()>=1) {
[detail] +      PrimeFactorization p0(n0+qRound(maximumDelay*sampFreq));
[detail] +      PrimeFactorization p(n);
[detail] +      App::log(tr("Number of samples for correlation: %1 (%6) --> %2 (%7)\n"
[detail] +                  "   n1    %3\n"
[detail] +                  "   n2    %4\n"
[detail] +                  "   delay %5\n")
[detail] +                     .arg(n0+qRound(maximumDelay*sampFreq))
[detail] +                     .arg(n)
[detail] +                     .arg(n1).arg(n2)
[detail] +                     .arg(qRound(maximumDelay*sampFreq))
[detail] +                     .arg(p0.toString())
[detail] +                     .arg(p.toString()));
[detail]    }
[detail] -  setNSamples(2*qRound(maxDelay/s1->samplingPeriod())+1);
[detail] -  setSamplingPeriod(s1->samplingPeriod());
[detail] -
[detail] -  DoubleSignal * s1t=new DoubleSignal(*s1);
[detail] -  DoubleSignal * s2t=new DoubleSignal(*s2);
[detail] -  bool ret=correlationProcess(s1, s2, s1t, s2t);
[detail] -  delete s1t;
[detail] -  delete s2t;
[detail] -  return ret;
[detail] +    return static_cast<double>(n-n0)/sampFreq;
[detail]  }
[detail]  
[detail]  
[detail] -bool DoubleSignal::normalizedCorrelation(const DoubleSignal * s1, const DoubleSignal * s2, double maxDelay)
[detail] +  bool DoubleSignal::correlation(const DoubleSignal * s1, const DoubleSignal * s2, double maxDelay)
[detail]  {
[detail]    TRACE;
[detail]    if(!correlationCheck(s1, s2, maxDelay)) {
[detail]      return false;
[detail]    }
[detail] -  setNSamples(2*qRound(maxDelay/s1->samplingPeriod())+1);
[detail] +    setNSamples(2*qRound(maxDelay*s1->samplingFrequency())+1);
[detail]    setSamplingPeriod(s1->samplingPeriod());
[detail]  
[detail] -  DoubleSignal * s1t=new DoubleSignal(*s1);
[detail] -  DoubleSignal * s2t=new DoubleSignal(*s2);
[detail] -  if(!correlationProcess(s1, s2, s1t, s2t)) {
[detail] -    delete s1t;
[detail] -    delete s2t;
[detail] -    return false;
[detail] +    return correlation(s1, s2);
[detail]    }
[detail]  
[detail]    
[detail] +  bool DoubleSignal::normalizeCorrelation(const DoubleSignal * s1, const DoubleSignal * s2)
[detail] +  {
[detail] +    TRACE;
[detail] +           
[detail]    DoubleSignal * s1Norm=new DoubleSignal(_nSamples);
[detail]    DoubleSignal * s2Norm=new DoubleSignal(_nSamples);
[detail]    CacheProcess cp;
[detail]    cp << this << s1Norm << s2Norm;
[detail] -  correlationNormalization(s1t, s1Norm);
[detail] -  correlationNormalization(s2t, s2Norm);
[detail] -  delete s1t;
[detail] -  delete s2t;
[detail] +    correlationNormalization(s1, s1Norm);
[detail] +    correlationNormalization(s2, s2Norm);
[detail]    bool ret=false;
[detail]    LOCK_SAMPLES(double, thisSamples, this)
[detail]      CONST_LOCK_SAMPLES(double, s1Samples, s1Norm)
[detail] @@ -1182,6 +1235,16 @@
[detail]  }
[detail]  
[detail]  
[detail] +  bool DoubleSignal::normalizedCorrelation(const DoubleSignal * s1, const DoubleSignal * s2, double maxDelay)
[detail] +  {
[detail] +    TRACE;
[detail] +    if(!correlation(s1, s2, maxDelay)) {
[detail] +      return false;
[detail] +    }
[detail] +    return normalizeCorrelation(s1, s2);
[detail] +  }
[detail] +
[detail] +  
[detail]  bool DoubleSignal::convolution(const DoubleSignal * s1, const DoubleSignal * s2)
[detail]  {
[detail]    TRACE;
[detail] @@ -1225,7 +1288,9 @@
[detail]      UNLOCK_SAMPLES(cspec1)
[detail]      delete cspec1;
[detail]      delete cspec2;
[detail] -    FastFourierTransform::instance()->backward(n, convSamples);
[detail] +      const FFTWCache * cache=FFTWCache::begin(n, FFTWKey::BackwardComplex);
[detail] +      cache->execute(convSamples);
[detail] +      FFTWCache::end(cache);
[detail]      LOCK_SAMPLES(double, thisSamples, this)
[detail]        for(int i=0; i<n; i++) {
[detail]          thisSamples[i]=convSamples[i].re(); 
[detail] @@ -1250,9 +1315,7 @@
[detail]    }
[detail]  
[detail]    double sampFreq=s1->samplingFrequency();
[detail] -  int nmd=(int)round(maxDelay*sampFreq);     
[detail] -  int n1=s1->nSamples();
[detail] -  int n2=s2->nSamples();
[detail] +    int nmd=qRound(maxDelay*sampFreq);     
[detail]  
[detail]    
[detail]    if(nSamples()!=2*nmd+1 || samplingPeriod()!=s1->samplingPeriod()) {
[detail] @@ -1264,54 +1327,52 @@
[detail]      initValues (0.0, 0, 2*nmd+1);
[detail]    }
[detail]  
[detail] +    int n1=s1->nSamples();
[detail] +    int n2=s2->nSamples();
[detail] +    int n=n1;
[detail] +    if(n<n2) {
[detail] +      n=n2;
[detail] +    }
[detail] +    n+=_nyquistIndex;
[detail] +
[detail] +    DoubleSignal spec1(*s1);
[detail] +    spec1.setNSamples(n);
[detail] +    spec1.copySamplesFrom(s1, 0, 0, n1);
[detail] +    spec1.initValues(0.0, n1, n-n1);
[detail] +
[detail] +    DoubleSignal spec2(*s2);
[detail] +    spec2.setNSamples(n);
[detail] +    spec2.copySamplesFrom(s2, 0, 0, n2);
[detail] +    spec2.initValues(0.0, n2, n-n2);
[detail] +
[detail]    bool ret=false;
[detail] -  CONST_LOCK_SAMPLES(double, s1Samples, s1)
[detail] -    CONST_LOCK_SAMPLES(double, s2Samples, s2)
[detail] +    CONST_LOCK_SAMPLES(double, s1Samples, &spec1)
[detail] +      CONST_LOCK_SAMPLES(double, s2Samples, &spec2)
[detail]        LOCK_SAMPLES(double, thisSamples, this)
[detail]          thisSamples+=nmd;
[detail] -        double corr, en1, en2, v1, v2;
[detail] +          double corr, v1, v2;
[detail]          for(int delay=-nmd; delay<=0; delay++) {
[detail]            corr=0.0;
[detail] -          en1=0.0;
[detail] -          en2=0.0;
[detail] -          int n=n1;
[detail] -          if(n>n2-delay) {
[detail] -            n=n2-delay;
[detail] -          }
[detail] -          for(int i=-delay; i<n; i++) {
[detail] -            v1=s1Samples[i];
[detail] -            v2=s2Samples[i+delay];
[detail] +            for(int i=n+delay-1; i>=0; i--) {
[detail] +              v1=s1Samples[i-delay];
[detail] +              v2=s2Samples[i];
[detail]              corr+=v1*v2;
[detail] -            en1+=v1*v1;
[detail] -            en2+=v2*v2;
[detail] -          }
[detail] -          if(en1>0.0 && en2>0.0) {
[detail] -            thisSamples[delay]+=corr/::sqrt(en1*en2);
[detail]            }
[detail] +            thisSamples[delay]=corr;
[detail]          }
[detail]          for(int delay=1; delay<=nmd; delay++) {
[detail]            corr=0.0;
[detail] -          en1=0.0;
[detail] -          en2=0.0;
[detail] -          int n=n2;
[detail] -          if(n>n1+delay) {
[detail] -            n=n1+delay;
[detail] -          }
[detail]            for(int i=delay; i<n; i++) {
[detail]              v1=s1Samples[i-delay];
[detail]              v2=s2Samples[i];
[detail]              corr+=v1*v2;
[detail] -            en1+=v1*v1;
[detail] -            en2+=v2*v2;
[detail] -          }
[detail] -          if(en1>0.0 && en2>0.0) {
[detail] -            thisSamples[delay]+=corr/::sqrt(en1*en2);
[detail]            }
[detail] +            thisSamples[delay]=corr;
[detail]          }
[detail]          ret=true;
[detail]        UNLOCK_SAMPLES(this)
[detail] -    UNLOCK_SAMPLES(s2)
[detail] -  UNLOCK_SAMPLES(s1)
[detail] +      UNLOCK_SAMPLES(&spec2)
[detail] +    UNLOCK_SAMPLES(&spec1)
[detail]    return ret;
[detail]  }
[detail]  
[detail] @@ -1383,21 +1444,36 @@
[detail]    return nCommon;
[detail]  }
[detail]  
[detail] -int DoubleSignal::add(const DoubleSignal * sig)
[detail] +  void DoubleSignal::add(const DoubleSignal * sig)
[detail]  {
[detail]    TRACE;
[detail]    if(_samplingPeriod<=0) {
[detail]      App::log(tr("DoubleSignal::add: null samplingPeriod, aborting.\n") );
[detail] -    return 0;
[detail] +      return;
[detail]    }
[detail]    if(_samplingPeriod!= sig->samplingPeriod()) {
[detail]      App::log(tr("DoubleSignal::add: samplingPeriod must be equal, aborting.\n") );
[detail] -    return 0;
[detail] +      return;
[detail]    }
[detail]    SignalType st=saveType(Waveform);
[detail] -  int nCommon=SignalTemplate<double>::add (sig);
[detail] +    SignalTemplate<double>::add(sig);
[detail] +    restoreType(st);
[detail] +  }
[detail] +
[detail] +  void DoubleSignal::add(const DoubleSignal * sig, double factor)
[detail] +  {
[detail] +    TRACE;
[detail] +    if(_samplingPeriod<=0) {
[detail] +      App::log(tr("DoubleSignal::add: null samplingPeriod, aborting.\n") );
[detail] +      return;
[detail] +    }
[detail] +    if(_samplingPeriod!=sig->samplingPeriod()) {
[detail] +      App::log(tr("DoubleSignal::add: samplingPeriod must be equal, aborting.\n") );
[detail] +      return;
[detail] +    }
[detail] +    SignalType st=saveType(Waveform);
[detail] +    SignalTemplate<double>::add(sig, factor);
[detail]    restoreType(st);
[detail] -  return nCommon;
[detail]  }
[detail]  
[detail]  
[detail] @@ -1704,10 +1780,7 @@
[detail]    int thisStart, keepStart;
[detail]    int nSamples=commonSamples(delay, keep->nSamples(), thisStart, keepStart);
[detail]    
[detail] -  CacheProcess cp;
[detail] -  cp << this << keep;
[detail]    CONST_LOCK_SAMPLES(double, thisSamples, this)
[detail] -    LOCK_SAMPLES(int, keepSamples, keep)
[detail]        int nsta=(int) (param.shortLength/_samplingPeriod);
[detail]        int nlta=(int) (param.longLength/_samplingPeriod);
[detail]        double aver=average(thisStart, nSamples);
[detail] @@ -1732,8 +1805,9 @@
[detail]          sta_sum+=val;
[detail]          lta_sum+=val;
[detail]          ratioCorr=sta_sum/lta_sum;
[detail] -        if(ratioCorr < minCorr || ratioCorr > maxCorr)
[detail] -          keepSamples[ i + keepStart ]=0;
[detail] +        if(ratioCorr<minCorr || ratioCorr>maxCorr) {
[detail] +          keep->setValue(i+keepStart, 0);
[detail] +        }
[detail]        }
[detail]        n=nlta;
[detail]        if(nSamples < n)
[detail] @@ -1745,8 +1819,9 @@
[detail]          sta_sum+=val-thisSamples[ithis-nsta];
[detail]          lta_sum+=val-aver;
[detail]          ratioCorr=sta_sum/lta_sum;
[detail] -        if(ratioCorr<minCorr || ratioCorr>maxCorr)
[detail] -          keepSamples[i+keepStart]=0;
[detail] +        if(ratioCorr<minCorr || ratioCorr>maxCorr) {
[detail] +          keep->setValue(i+keepStart, 0);
[detail] +        }
[detail]        }
[detail]        for(; i<nSamples; i++) {
[detail]          
[detail] @@ -1755,10 +1830,10 @@
[detail]          sta_sum+=val-thisSamples[ithis-nsta];
[detail]          lta_sum+=val-thisSamples[ithis-nlta];
[detail]          ratioCorr=sta_sum/lta_sum;
[detail] -        if(ratioCorr<minCorr || ratioCorr>maxCorr)
[detail] -          keepSamples[i+keepStart]=0;
[detail] +        if(ratioCorr<minCorr || ratioCorr>maxCorr) {
[detail] +          keep->setValue(i+keepStart, 0);
[detail] +        }
[detail]        }
[detail] -    UNLOCK_SAMPLES(keep)
[detail]    UNLOCK_SAMPLES(this)
[detail]  }
[detail]  
[detail] @@ -1777,15 +1852,11 @@
[detail]    int thisStart, keepStart;
[detail]    int nSamples=commonSamples(delay, keep->nSamples(), thisStart, keepStart);
[detail]    double m=average(0, _nSamples);
[detail] -  CacheProcess cp;
[detail] -  cp << this << keep;
[detail]    CONST_LOCK_SAMPLES(double, thisSamples, this)
[detail] -    LOCK_SAMPLES(int, keepSamples, keep)
[detail]        for(int i=0; i<nSamples; i++) {
[detail]          if(fabs(thisSamples[ i+thisStart]-m)>=value)
[detail] -          keepSamples[i+keepStart]=0;
[detail] +          keep->setValue(i+keepStart, 0);
[detail]        }
[detail] -    UNLOCK_SAMPLES(keep)
[detail]    UNLOCK_SAMPLES(this)
[detail]  }
[detail]  
[detail] @@ -1802,9 +1873,9 @@
[detail]      return 0;
[detail]    }
[detail]    double invdt=1.0/samplingPeriod();
[detail] -  int iSigStart=(int) floor(sigStart * invdt +0.5);
[detail] -  int iThisStart=(int) floor(thisStart * invdt +0.5);
[detail] -  int iLength=(int) floor(length * invdt +0.5);
[detail] +    int iSigStart=qRound(sigStart*invdt);
[detail] +    int iThisStart=qRound(thisStart*invdt);
[detail] +    int iLength=qRound(length*invdt);
[detail]    adjustLimits(sig, iSigStart, iThisStart, iLength);
[detail]    int diStart=iSigStart-iThisStart;
[detail]    int iEnd=iThisStart+iLength;
[detail] @@ -1822,40 +1893,44 @@
[detail]    return corr/(double)iLength;
[detail]  }
[detail]  
[detail] -ENUM_AS_STRING_BEGIN(DoubleSignal, SignalType)
[detail] -ENUM_AS_STRING_DATA_4(Phase, Spectrum, UndefinedSignalType, Waveform);
[detail] -ENUM_AS_STRING_SYNONYM("RealSpectrum", Waveform);
[detail] -ENUM_AS_STRING_SYNONYM("CPhaseWaveform", Waveform);
[detail] -ENUM_AS_STRING_SYNONYM("CAmpWaveform", Waveform);
[detail] -ENUM_AS_STRING_DEFAULT_VALUE(UndefinedSignalType);
[detail] -ENUM_AS_STRING_END
[detail] -
[detail] -
[detail]  
[detail]  double DoubleSignal::maximumAmplitude(int itmin, int itmax) const
[detail]  {
[detail]    TRACE;
[detail] -  if(itmin<0) itmin=0;
[detail] -  if(itmax>=_nSamples) itmax=_nSamples-1;
[detail] +    if(itmin<0) {
[detail] +      itmin=0;
[detail] +    }
[detail] +    if(itmax>=_nSamples) {
[detail] +      itmax=_nSamples-1;
[detail] +    }
[detail]  
[detail] +    const double * thisSamples=tryConstLockSamples();
[detail] +    if(thisSamples) {
[detail]    double vmax=0.0;
[detail] -  CONST_LOCK_SAMPLES(double, thisSamples, this)
[detail]      double v;
[detail]      switch (_type) {
[detail]      case Waveform:
[detail]        for(int i=itmin; i<=itmax; i++) {
[detail]          v=fabs(thisSamples[i]);
[detail] -        if(v>vmax) vmax=v;
[detail] +          if(v>vmax) {
[detail] +            vmax=v;
[detail] +          }
[detail]        }
[detail]        break;
[detail]      case Spectrum:
[detail]      case Phase: {
[detail]          int nSamples2=_nSamples >> 1;
[detail]          int it2max;
[detail] -        if(itmax>nSamples2) it2max=nSamples2; else it2max=itmax;
[detail] +        if(itmax>nSamples2) {
[detail] +          it2max=nSamples2;
[detail] +        } else {
[detail] +          it2max=itmax;
[detail] +        }
[detail]          for(int i=itmin; i<=it2max; i++) {
[detail]            v=amplitude2(thisSamples, i);
[detail] -          if(v>vmax) vmax=v;
[detail] +          if(v>vmax) {
[detail] +            vmax=v;
[detail] +          }
[detail]          }
[detail]          vmax=::sqrt(vmax);
[detail]        }
[detail] @@ -1864,8 +1939,11 @@
[detail]        vmax=1.0;
[detail]        break;
[detail]      }
[detail] -  UNLOCK_SAMPLES(this)
[detail] +      unlockSamples();
[detail]    return vmax;
[detail] +    } else {
[detail] +      return std::numeric_limits<double>::quiet_NaN();
[detail] +    }
[detail]  }
[detail]  
[detail]  
[detail] @@ -2036,11 +2114,11 @@
[detail]  void DoubleSignal::debugSave(const QString& fileName) const
[detail]  {
[detail]    TRACE;
[detail] -  Signal * tmp=new Signal(GeopsyCoreEngine::instance()->defaultDatabase());
[detail] -  tmp->setNSamples(nSamples());
[detail] +    SignalSegment * tmp=new SignalSegment(GeopsyCoreEngine::instance()->defaultDatabase());
[detail] +    tmp->setSize(nSamples());
[detail]    tmp->setSamplingPeriod(samplingPeriod());
[detail] -  tmp->DoubleSignal::copySamplesFrom(this);
[detail] -  tmp->multiply(1e3);
[detail] +    tmp->values()->copySamplesFrom(this);
[detail] +    tmp->values()->multiply(1e3);
[detail]    SubSignalPool pool;
[detail]    pool.addSignal(tmp);
[detail]    pool.save(fileName, false, SignalFileFormat::MiniSeed);
[detail] @@ -2133,32 +2211,33 @@
[detail]  bool DoubleSignal::removeInstrumentalResponse(const InstrumentalResponse& sensor)
[detail]  {
[detail]    TRACE;
[detail] -  int n=nSamples();
[detail]    ComplexSignal * cspec=complexSpectrum();
[detail] -  ComplexSignal * cconv=new ComplexSignal(n);
[detail]    double df=1.0/duration();
[detail]    bool ok=false;
[detail] -  LOCK_SAMPLES(Complex, convSamples, cconv)
[detail] -    CONST_LOCK_SAMPLES(Complex, sSamples, cspec)
[detail] -      for(int i=0; i<n; i++) {
[detail] -        if(i<_nyquistIndex) {
[detail] -          convSamples[i]=sensor.deconvolution(i*df, sSamples[i]);
[detail] -        } else {
[detail] -          convSamples[i]=sensor.deconvolution(-i*df, sSamples[i]);
[detail] -        }
[detail] +    LOCK_SAMPLES(Complex, sSamples, cspec)
[detail] +    sensor.deconvolution(0, sSamples[0]);
[detail] +    for(int i=1; i<_nyquistIndex; i++) {
[detail] +      sensor.deconvolution(i*df, sSamples[i]);
[detail] +      sensor.deconvolution(-i*df, sSamples[_nSamples-i]);
[detail]        }
[detail] +    sensor.deconvolution(_nyquistIndex*df, sSamples[_nyquistIndex]);
[detail]        ok=true;
[detail] -    UNLOCK_SAMPLES(cspec)
[detail] -    delete cspec;
[detail] -    FastFourierTransform::instance()->backward(n, convSamples);
[detail] +    
[detail] +    
[detail] +    
[detail] +    const FFTWCache * cache=FFTWCache::begin(_nSamples, FFTWKey::BackwardComplex);
[detail] +    cache->execute(sSamples);
[detail] +    FFTWCache::end(cache);
[detail] +    SignalType ost=saveType(Waveform);
[detail]      double rn=1.0/::sqrt(2*_samplingPeriod*_nSamples);
[detail]      LOCK_SAMPLES(double, thisSamples, this)
[detail]        for(int i=0; i<_nSamples; i++) {
[detail] -        thisSamples[i]=convSamples[i].re()*rn;
[detail] +      thisSamples[i]=sSamples[i].re()*rn;
[detail]        }
[detail]      UNLOCK_SAMPLES(this)
[detail] -  UNLOCK_SAMPLES(cconv)
[detail] -  delete cconv;
[detail] +    restoreType(ost);
[detail] +    UNLOCK_SAMPLES(cspec)
[detail] +    delete cspec;
[detail]    return ok;
[detail]  }
[detail]  
[detail] @@ -2182,4 +2261,53 @@
[detail]    return ok;
[detail]  }
[detail]  
[detail] +  bool DoubleSignal::derivate()
[detail] +  {
[detail] +    bool ok=false;
[detail] +    LOCK_SAMPLES(double, samples, this)
[detail] +      SignalType ost=saveType(Waveform);
[detail] +      int n=_nSamples-1;
[detail] +      double f=0.5/_samplingPeriod;
[detail] +      double newValue, lastValue=samples[0];
[detail] +      double firstValue=samples[0];
[detail] +      samples[0]=(samples[1]-samples[n])*f;
[detail] +      for(int i=1; i<n; i++) {
[detail] +        newValue=samples[i];
[detail] +        samples[i]=(samples[i+1]-lastValue)*f;
[detail] +        lastValue=newValue;
[detail] +      }
[detail] +      samples[n]=(firstValue-lastValue)*f;
[detail] +      restoreType(ost);
[detail] +      ok=true;
[detail] +    UNLOCK_SAMPLES(this)
[detail] +    return ok;
[detail] +  }
[detail] +
[detail] +  bool DoubleSignal::integrate()
[detail] +  {
[detail] +    bool ok=false;
[detail] +    LOCK_SAMPLES(double, samples, this)
[detail] +      SignalType ost=saveType(Waveform);
[detail] +      double f=0.5*_samplingPeriod;
[detail] +      double newValue, lastValue=samples[0];
[detail] +      samples[0]=0.0;
[detail] +      for(int i=1; i<_nSamples; i++) {
[detail] +        newValue=samples[i];
[detail] +        samples[i]=samples[i-1]+f*(lastValue+samples[i]);
[detail] +        lastValue=newValue;
[detail] +      }
[detail] +      restoreType(ost);
[detail] +      ok=true;
[detail] +    UNLOCK_SAMPLES(this)
[detail] +    return ok;
[detail] +  }
[detail] +
[detail] +  ENUM_AS_STRING_BEGIN(DoubleSignal, SignalType)
[detail] +  ENUM_AS_STRING_DATA_4(Phase, Spectrum, UndefinedSignalType, Waveform);
[detail] +  ENUM_AS_STRING_SYNONYM("RealSpectrum", Waveform);
[detail] +  ENUM_AS_STRING_SYNONYM("CPhaseWaveform", Waveform);
[detail] +  ENUM_AS_STRING_SYNONYM("CAmpWaveform", Waveform);
[detail] +  ENUM_AS_STRING_DEFAULT_VALUE(UndefinedSignalType);
[detail] +  ENUM_AS_STRING_END
[detail] +
[detail]  } 
[detail]                    src/DuplicateRays.cpp:  version-4.5.1	modified out of comments
[detail] --- src/DuplicateRays.cpp-version-4.5.1-stripped	2025-09-28 04:01:04.271499460 +0200
[detail] +++ src/DuplicateRays.cpp-HEAD-stripped	2025-09-28 04:01:04.275499480 +0200
[detail] @@ -81,7 +81,7 @@
[detail]        if(!_rays || _rays->isEmpty()) {
[detail]          return false;
[detail]        } else {
[detail] -        return _rays->first()->metaData<TimePick>().hasIndex(subId, index);
[detail] +        return _rays->first()->metaData()->optionalData().get<TimePick>().hasIndex(subId, index);
[detail]        }
[detail]      }
[detail]    }
[detail] @@ -130,7 +130,7 @@
[detail]      }
[detail]    }
[detail]  
[detail] -  void DuplicateRays::addRay(Signal * sig)
[detail] +  void DuplicateRays::addRay(SignalSegment * sig)
[detail]    {
[detail]      TRACE;
[detail]      if(!_rays) {
[detail] @@ -149,10 +149,10 @@
[detail]        return DateTime::null;
[detail]      } else {
[detail]        SubSignalPool::const_iterator it=_rays->begin();
[detail] -      DateTime t0=(*it)->metaData<TimePick>().value(index);
[detail] +      DateTime t0=(*it)->metaData()->optionalData().get<TimePick>().value(index);
[detail]        double average=0.0;
[detail]        for(it++; it!=_rays->end(); ++it) {
[detail] -        average+=t0.secondsTo((*it)->metaData<TimePick>().value(index));
[detail] +        average+=t0.secondsTo((*it)->metaData()->optionalData().get<TimePick>().value(index));
[detail]        }
[detail]        average/=_rays->count();
[detail]        t0.addSeconds(average);
[detail] @@ -170,7 +170,7 @@
[detail]        DateTime mean=average(index);
[detail]        double tmp, res=0.0;
[detail]        for(SubSignalPool::const_iterator it=_rays->begin(); it!=_rays->end(); ++it) {
[detail] -        tmp=mean.secondsTo((*it)->metaData<TimePick>().value(index));
[detail] +        tmp=mean.secondsTo((*it)->metaData()->optionalData().get<TimePick>().value(index));
[detail]          res+=tmp*tmp;
[detail]        }
[detail]        res=::sqrt(res/_rays->count());
[detail]                    src/DynamicSignal.cpp:  version-4.5.1	modified out of comments
[detail] --- src/DynamicSignal.cpp-version-4.5.1-stripped	2025-09-28 04:01:04.295499577 +0200
[detail] +++ src/DynamicSignal.cpp-HEAD-stripped	2025-09-28 04:01:04.299499597 +0200
[detail] @@ -2,11 +2,19 @@
[detail]  
[detail]  
[detail]  #include "DynamicSignal.h"
[detail] +#include "SignalSegment.h"
[detail]  
[detail]  namespace GeopsyCore {
[detail]  
[detail]    
[detail]  
[detail] +  DynamicSignal::DynamicSignal(SignalSegment * segment)
[detail] +    : StoredSignal(segment)
[detail] +  {
[detail] +    _maxNSamples=0;
[detail] +    _startTimeShift=0;
[detail] +  }
[detail] +
[detail]    DynamicSignal::~DynamicSignal()
[detail]    {
[detail]      TRACE;
[detail] @@ -19,23 +27,29 @@
[detail]    template <class sampleType> inline void DynamicSignal::set(const DateTime& t, const sampleType * samples, int nSamples)
[detail]    {
[detail]      TRACE;
[detail] -    APP_LOG(1, tr("Received %1 samples from %2 for signal %3\n").arg(nSamples).arg(t.toString(DateTime::defaultUserFormat)).arg(nameComponent()));
[detail] +    APP_LOG(1, tr("Received %1 samples from %2 for signal %3\n")
[detail] +                   .arg(nSamples)
[detail] +                   .arg(t.toString(DateTime::defaultUserFormat))
[detail] +                   .arg(_segment->metaData()->nameComponent()));
[detail]  
[detail] -    DateTime epsilonStartTime(startTime());
[detail] +    DateTime startTime(_segment->startTime());
[detail] +    DateTime epsilonStartTime(startTime);
[detail]      epsilonStartTime.addFewSeconds(-1e-10);
[detail]      if(t<epsilonStartTime) {
[detail]        App::log(tr("Cannot set signal before start time (%1), t=%2 for signal %3\n")
[detail] -               .arg(startTime().toString()).arg(t.toString()).arg(nameComponent()) );
[detail] +                   .arg(startTime.toString())
[detail] +                   .arg(t.toString())
[detail] +                   .arg(_segment->metaData()->nameComponent()));
[detail]        return;
[detail]      }
[detail]      
[detail] -    _timeRange.add(TimeRange(t, nSamples*samplingPeriod()));
[detail] +    _segment->addTimeRange(TimeRange(t, nSamples*samplingPeriod()));
[detail]  
[detail] -    double indexD=startTime().secondsTo(t)/samplingPeriod();
[detail] +    double indexD=startTime.secondsTo(t)/samplingPeriod();
[detail]      int index=qRound(indexD);
[detail]      if(fabs(indexD-static_cast<double>(index))>1e-3) {
[detail]        App::log(tr("time drift %1 % %2 %3\n")
[detail] -          .arg(100*(indexD-index)).arg(startTime().toString()).arg(t.toString()));
[detail] +          .arg(100*(indexD-index)).arg(startTime.toString()).arg(t.toString()));
[detail]      }
[detail]      double * newSamples;
[detail]      
[detail] @@ -111,7 +125,7 @@
[detail]      } else if(globalIndex>0 && _maxNSamples==0) { 
[detail]                                                    
[detail]        ASSERT(_maxNSamples==0 && _startTimeShift==0);
[detail] -      _nSamples=globalIndex;
[detail] +      setNSamples(globalIndex);
[detail]        _maxNSamples=_nSamples;
[detail]        LOCK_SAMPLES(double, thisSamples, this)
[detail]          for(int i=0; i<index; i++) {
[detail] @@ -151,7 +165,7 @@
[detail]        }
[detail]      }
[detail]      LOCK_SAMPLES(double, thisSamples, this)
[detail] -      _startTime.addSeconds(nSamples*samplingPeriod());
[detail] +      _segment->shiftStartTime(nSamples*samplingPeriod());
[detail]        _startTimeShift+=nSamples;
[detail]        double * newSamples=thisSamples+nSamples;
[detail]        setSamples(nullptr); 
[detail] @@ -183,9 +197,4 @@
[detail]      }
[detail]    }
[detail]  
[detail] -  void DynamicSignal::setNSamples(int n)
[detail] -  {
[detail] -    DoubleSignal::setNSamples(n);
[detail] -  }
[detail] -
[detail]  } 
[detail]                        src/FFTWCache.cpp:  version-4.5.1	modified out of comments
[detail] --- src/FFTWCache.cpp-version-4.5.1-stripped	2025-09-28 04:01:04.319499693 +0200
[detail] +++ src/FFTWCache.cpp-HEAD-stripped	2025-09-28 04:01:04.323499712 +0200
[detail] @@ -6,7 +6,6 @@
[detail]  
[detail]    
[detail]  
[detail] -  IMPLEMENT_NUMERICALKEY(FFTWKey)
[detail]    Mutex FFTWCache::_plannerMutex;
[detail]  
[detail]    
[detail] @@ -14,6 +13,17 @@
[detail]      : AbstractNumericalCache(key)
[detail]    {
[detail]      TRACE;
[detail] +    _type=key->type();
[detail] +    switch(_type) {
[detail] +    case FFTWKey::RealToHalfComplex:
[detail] +    case FFTWKey::HalfComplexToReal:
[detail] +      _fftReal=new DoubleSignal;
[detail] +      break;
[detail] +    case FFTWKey::ForwardComplex:
[detail] +    case FFTWKey::BackwardComplex:
[detail] +      _fftComplex=new ComplexSignal;
[detail] +      break;
[detail] +    }
[detail]    }
[detail]  
[detail]    
[detail] @@ -23,6 +33,17 @@
[detail]      _plannerMutex.lock();
[detail]      fftw_destroy_plan(_plan);
[detail]      _plannerMutex.unlock();
[detail] +    switch(_type) {
[detail] +    case FFTWKey::RealToHalfComplex:
[detail] +    case FFTWKey::HalfComplexToReal:
[detail] +      delete _fftReal;
[detail] +      break;
[detail] +    case FFTWKey::ForwardComplex:
[detail] +    case FFTWKey::BackwardComplex:
[detail] +      delete _fftComplex;
[detail] +      break;
[detail] +    }
[detail] +
[detail]    }
[detail]  
[detail]    
[detail] @@ -39,25 +60,62 @@
[detail]    {
[detail]      TRACE;
[detail]      const FFTWKey& fKey=static_cast<const FFTWKey&>(key());
[detail] -    _fft.setNSamples(fKey.nSamples());
[detail]  
[detail] -    APP_LOG(1, tr("New fftw plan for %1 samples with direction %2\n")
[detail] -                      .arg(fKey.nSamples()).arg(fKey.direction()))
[detail] +    APP_LOG(1, tr("New fftw plan for %1 samples with type %2\n")
[detail] +                   .arg(fKey.nSamples()).arg(FFTWKey::convertType(fKey.type())))
[detail]  
[detail] -    LOCK_SAMPLES(double, samples, &_fft)
[detail]        _plannerMutex.lock();
[detail] -      _plan=fftw_plan_r2r_1d(_fft.nSamples(), samples, samples,
[detail] -                             fKey.direction()==FFTWKey::R2HC ? FFTW_R2HC : FFTW_HC2R,
[detail] -                             FFTW_ESTIMATE);
[detail] +    switch(_type) {
[detail] +    case FFTWKey::RealToHalfComplex: {
[detail] +        _fftReal->setNSamples(fKey.nSamples());
[detail] +        LOCK_SAMPLES(double, samples, _fftReal)
[detail] +        _plan=fftw_plan_r2r_1d(_fftReal->nSamples(), samples, samples, FFTW_R2HC, FFTW_ESTIMATE);
[detail] +        UNLOCK_SAMPLES(_fftReal)
[detail] +      }
[detail] +      break;
[detail] +    case FFTWKey::HalfComplexToReal: {
[detail] +        _fftReal->setNSamples(fKey.nSamples());
[detail] +        LOCK_SAMPLES(double, samples, _fftReal)
[detail] +        _plan=fftw_plan_r2r_1d(_fftReal->nSamples(), samples, samples, FFTW_HC2R, FFTW_ESTIMATE);
[detail] +        UNLOCK_SAMPLES(_fftReal)
[detail] +      }
[detail] +      break;
[detail] +    case FFTWKey::ForwardComplex: {
[detail] +        _fftComplex->setNSamples(fKey.nSamples());
[detail] +        LOCK_SAMPLES(Complex, samples, _fftComplex)
[detail] +        _plan=fftw_plan_dft_1d(_fftComplex->nSamples(), reinterpret_cast<fftw_complex*>(samples),
[detail] +                               reinterpret_cast<fftw_complex*>(samples), FFTW_FORWARD, FFTW_ESTIMATE);
[detail] +        UNLOCK_SAMPLES(_fftComplex)
[detail] +      }
[detail] +      break;
[detail] +    case FFTWKey::BackwardComplex: {
[detail] +        _fftComplex->setNSamples(fKey.nSamples());
[detail] +        LOCK_SAMPLES(Complex, samples, _fftComplex)
[detail] +        _plan=fftw_plan_dft_1d(_fftComplex->nSamples(), reinterpret_cast<fftw_complex*>(samples),
[detail] +                               reinterpret_cast<fftw_complex*>(samples), FFTW_BACKWARD, FFTW_ESTIMATE);
[detail] +        UNLOCK_SAMPLES(_fftComplex)
[detail] +      }
[detail] +      break;
[detail] +    }
[detail]        _plannerMutex.unlock();
[detail] -    UNLOCK_SAMPLES(&_fft)
[detail]    }
[detail]  
[detail]    void FFTWCache::execute(double * samples) const
[detail]    {
[detail] -    TRACE;
[detail]      fftw_execute_r2r(_plan, samples, samples);
[detail]    }
[detail]  
[detail] +  void FFTWCache::execute(Complex * samples) const
[detail] +  {
[detail] +    fftw_complex * fftwSamples=reinterpret_cast<fftw_complex*>(samples);
[detail] +    fftw_execute_dft(_plan, fftwSamples, fftwSamples);
[detail] +  }
[detail] +
[detail] +  IMPLEMENT_NUMERICALKEY(FFTWKey)
[detail] +
[detail] +  ENUM_AS_STRING_BEGIN(FFTWKey, Type)
[detail] +  ENUM_AS_STRING_DATA_4(BackwardComplex, ForwardComplex, HalfComplexToReal, RealToHalfComplex);
[detail] +  ENUM_AS_STRING_END
[detail] +
[detail]  } 
[detail]  
[detail]      src/FastPartialFourierTransform.cpp:  version-4.5.1	modified out of comments
[detail] --- src/FastPartialFourierTransform.cpp-version-4.5.1-stripped	2025-09-28 04:01:04.335499770 +0200
[detail] +++ src/FastPartialFourierTransform.cpp-HEAD-stripped	2025-09-28 04:01:04.339499790 +0200
[detail] @@ -4,7 +4,6 @@
[detail]  #include "FastPartialFourierTransform.h"
[detail]  #include "DoubleSignal.h"
[detail]  #include "ComplexSignal.h"
[detail] -#include "FastFourierTransform.h"
[detail]  
[detail]  namespace GeopsyCore {
[detail]  
[detail]                 src/FilterParameters.cpp:  version-4.5.1	modified out of comments
[detail] --- src/FilterParameters.cpp-version-4.5.1-stripped	2025-09-28 04:01:04.359499886 +0200
[detail] +++ src/FilterParameters.cpp-HEAD-stripped	2025-09-28 04:01:04.363499906 +0200
[detail] @@ -1,6 +1,7 @@
[detail]  
[detail]  
[detail]  #include <QGpCoreTools.h>
[detail] +#include <QGpSciPy.h>
[detail]  
[detail]  #include "FilterParameters.h"
[detail]  
[detail] @@ -8,83 +9,344 @@
[detail]  
[detail]    
[detail]  
[detail] -  FilterParameters::FilterParameters()
[detail] +  ButterworthParameters::ButterworthParameters()
[detail] +    : AbstractParameters()
[detail]    {
[detail]      _fmin=1.0;
[detail] -    _fmax=1.0;
[detail] -    _band=LowPass;
[detail] -    _method=FrequencyWindow;
[detail] +    _fmax=std::numeric_limits<double>::quiet_NaN();
[detail] +    _order=2;
[detail] +  }
[detail] +
[detail] +  ButterworthParameters::ButterworthParameters(const ButterworthParameters& o)
[detail] +      : AbstractParameters(o)
[detail] +  {
[detail] +    _fmin=o._fmin;
[detail] +    _fmax=o._fmax;
[detail] +    _order=o._order;
[detail] +  }
[detail] +
[detail] +  void ButterworthParameters::operator=(const ButterworthParameters& o)
[detail] +  {
[detail] +    _fmin=o._fmin;
[detail] +    _fmax=o._fmax;
[detail] +    _order=o._order;
[detail] +  }
[detail] +
[detail] +  int ButterworthParameters::keywordCount(PARAMETERS_KEYWORDCOUNT_ARGS) const
[detail] +  {
[detail] +    return 4+AbstractParameters::keywordCount();
[detail] +  }
[detail] +
[detail] +  int ButterworthParameters::totalKeywordCount(PARAMETERS_TOTALKEYWORDCOUNT_ARGS) const
[detail] +  {
[detail] +    return AbstractParameters::totalKeywordCount();
[detail] +  }
[detail] +
[detail] +  void ButterworthParameters::collectKeywords(PARAMETERS_COLLECTKEYWORDS_ARGS)
[detail] +  {
[detail] +    TRACE;
[detail] +    int baseIndex=AbstractParameters::keywordCount();
[detail] +    keywords.add(prefix+"MIN_FREQUENCY"+suffix, this, baseIndex);
[detail] +    keywords.add(prefix+"MAX_FREQUENCY"+suffix, this, baseIndex+1);
[detail] +    keywords.add(prefix+"CAUSAL"+suffix, this, baseIndex+2);
[detail] +    keywords.add(prefix+"ORDER"+suffix, this, baseIndex+3);
[detail] +  }
[detail] +
[detail] +  bool ButterworthParameters::setValue(PARAMETERS_SETVALUE_ARGS)
[detail] +  {
[detail] +    TRACE;
[detail] +    bool ok=true;
[detail] +    switch(index-AbstractParameters::keywordCount()) {
[detail] +    case 0:
[detail] +      _fmin=value.toDouble(&ok);
[detail] +      return ok;
[detail] +    case 1:
[detail] +      _fmax=value.toDouble(&ok);
[detail] +      return ok;
[detail] +    case 2:
[detail] +      setCausal(Number::toBoolean(value, ok));
[detail] +      return ok;
[detail] +    case 3:
[detail] +      setOrder(value.toInt(&ok));
[detail] +      return ok;
[detail] +    default:
[detail] +      break;
[detail] +    }
[detail] +    return AbstractParameters::setValue(index, value, unit, keywords);
[detail] +  }
[detail] +
[detail] +  QString ButterworthParameters::toString(PARAMETERS_TOSTRING_ARGS_IMPL) const
[detail] +  {
[detail] +    TRACE;
[detail] +    QString log;
[detail] +    log+=prefix+"MIN_FREQUENCY"+suffix+" (Hz)="+QString::number(_fmin)+"\n";
[detail] +    log+=prefix+"MAX_FREQUENCY"+suffix+" (Hz)="+QString::number(_fmax)+"\n";
[detail] +    log+=prefix+"CAUSAL"+suffix+" (y/n)="+(causal() ? "y" : "n")+"\n";
[detail] +    log+=prefix+"ORDER"+suffix+"="+QString::number(_order)+"\n";
[detail] +    return log;
[detail] +  }
[detail] +
[detail] +  
[detail] +
[detail] +  FrequencyWindowParameters::FrequencyWindowParameters()
[detail] +      : AbstractParameters()
[detail] +  {
[detail] +    _fmin=1.0;
[detail] +    _fmax=std::numeric_limits<double>::quiet_NaN();
[detail]      _window.setShape(WindowFunctionParameters::Cosine);
[detail]      _width=0.1;
[detail]    }
[detail]  
[detail] -  FilterParameters::FilterParameters(const FilterParameters &o)
[detail] -    : AbstractParameters(o),
[detail] -      _window(o._window)
[detail] +  FrequencyWindowParameters::FrequencyWindowParameters(const FrequencyWindowParameters& o)
[detail] +      : AbstractParameters(o)
[detail]    {
[detail] -    _band=o._band;
[detail] -    setFrequencyRange(o._fmin, o._fmax);
[detail] -    _method=o._method;
[detail] -    _order=o._order;
[detail] +    _fmin=o._fmin;
[detail] +    _fmax=o._fmax;
[detail] +    _window=o._window;
[detail]      _width=o._width;
[detail]    }
[detail]  
[detail] -  void FilterParameters::operator=(const FilterParameters& o)
[detail] +  void FrequencyWindowParameters::operator=(const FrequencyWindowParameters& o)
[detail]    {
[detail] -    AbstractParameters::operator=(o);
[detail] +    _fmin=o._fmin;
[detail] +    _fmax=o._fmax;
[detail]      _window=o._window;
[detail] -    _band=o._band;
[detail] -    setFrequencyRange(o._fmin, o._fmax);
[detail] -    _method=o._method;
[detail] -    _order=o._order;
[detail]      _width=o._width;
[detail]    }
[detail]  
[detail] -  void FilterParameters::setBand(Band b)
[detail] +  void FrequencyWindowParameters::setVersion(PARAMETERS_SETVERSION_ARGS)
[detail]    {
[detail] -    _band=b;
[detail] -    setFrequencyRange(_fmin, _fmax);
[detail] -    _window.setReversed(_band==BandReject);
[detail] +    TRACE;
[detail] +    _window.setVersion(version);
[detail] +    AbstractParameters::setVersion(version);
[detail]    }
[detail]  
[detail] -  void FilterParameters::setFrequencyRange(double min, double max)
[detail] +  int FrequencyWindowParameters::keywordCount(PARAMETERS_KEYWORDCOUNT_ARGS) const
[detail] +  {
[detail] +    return 3+AbstractParameters::keywordCount();
[detail] +  }
[detail] +
[detail] +  int FrequencyWindowParameters::totalKeywordCount(PARAMETERS_TOTALKEYWORDCOUNT_ARGS) const
[detail] +  {
[detail] +    return AbstractParameters::totalKeywordCount()
[detail] +           +_window.totalKeywordCount();
[detail] +  }
[detail] +
[detail] +  void FrequencyWindowParameters::collectKeywords(PARAMETERS_COLLECTKEYWORDS_ARGS)
[detail]    {
[detail]      TRACE;
[detail] -    switch(_band) {
[detail] -    case LowPass:
[detail] -    case HighPass:
[detail] -      _fmin=min;
[detail] -      _fmax=min;
[detail] +    int baseIndex=AbstractParameters::keywordCount();
[detail] +    keywords.add(prefix+"MIN_FREQUENCY"+suffix, this, baseIndex);
[detail] +    keywords.add(prefix+"MAX_FREQUENCY"+suffix, this, baseIndex+1);
[detail] +    keywords.add(prefix+"WIDTH"+suffix, this, baseIndex+2);
[detail] +    _window.collectKeywords(keywords, prefix, suffix);
[detail] +  }
[detail] +
[detail] +  bool FrequencyWindowParameters::setValue(PARAMETERS_SETVALUE_ARGS)
[detail] +  {
[detail] +    TRACE;
[detail] +    bool ok=true;
[detail] +    switch(index-AbstractParameters::keywordCount()) {
[detail] +    case 0:
[detail] +      _fmin=value.toDouble(&ok);
[detail] +      return ok;
[detail] +    case 1:
[detail] +      _fmax=value.toDouble(&ok);
[detail] +      return ok;
[detail] +    case 2:
[detail] +      _width=value.toDouble(&ok);
[detail] +      return ok;
[detail] +    default:
[detail]        break;
[detail] -    case BandPass:
[detail] -    case BandReject:
[detail] -      if(min<max) {
[detail] -        _fmin=min;
[detail] -        _fmax=max;
[detail] -      } else {
[detail] -        _fmin=max;
[detail] -        _fmax=min;
[detail]        }
[detail] +    return AbstractParameters::setValue(index, value, unit, keywords);
[detail] +  }
[detail] +
[detail] +  QString FrequencyWindowParameters::toString(PARAMETERS_TOSTRING_ARGS_IMPL) const
[detail] +  {
[detail] +    TRACE;
[detail] +    QString log;
[detail] +    log+=prefix+"MIN_FREQUENCY"+suffix+" (Hz)="+QString::number(_fmin)+"\n";
[detail] +    log+=prefix+"MAX_FREQUENCY"+suffix+" (Hz)="+QString::number(_fmax)+"\n";
[detail] +    log+=_window.toString(prefix, suffix);
[detail] +    log+=prefix+"WIDTH"+suffix+"="+QString::number(_width)+"\n";
[detail] +    return log;
[detail] +  }
[detail] +
[detail] +  
[detail] +
[detail] +  ChebyshevParameters::ChebyshevParameters()
[detail] +      : AbstractParameters()
[detail] +  {
[detail] +    _fminPass=1.0;
[detail] +    _fmaxPass=std::numeric_limits<double>::quiet_NaN();
[detail] +    _fminStop=1.1;
[detail] +    _fmaxStop=std::numeric_limits<double>::quiet_NaN();
[detail] +    _maxLossPass=1.0;
[detail] +    _minAttenuationStop=5.0;
[detail] +    _maxRipple=0.5;
[detail] +  }
[detail] +
[detail] +
[detail] +  ChebyshevParameters::ChebyshevParameters(const ChebyshevParameters& o)
[detail] +      : AbstractParameters(o)
[detail] +  {
[detail] +    _fminPass=o._fminPass;
[detail] +    _fmaxPass=o._fmaxPass;
[detail] +    _fminStop=o._fminStop;
[detail] +    _fmaxStop=o._fmaxStop;
[detail] +    _maxLossPass=o._maxLossPass;
[detail] +    _minAttenuationStop=o._minAttenuationStop;
[detail] +    _maxRipple=o._maxRipple;
[detail] +  }
[detail] +
[detail] +  void ChebyshevParameters::operator=(const ChebyshevParameters& o)
[detail] +  {
[detail] +    _fminPass=o._fminPass;
[detail] +    _fmaxPass=o._fmaxPass;
[detail] +    _fminStop=o._fminStop;
[detail] +    _fmaxStop=o._fmaxStop;
[detail] +    _maxLossPass=o._maxLossPass;
[detail] +    _minAttenuationStop=o._minAttenuationStop;
[detail] +    _maxRipple=o._maxRipple;
[detail] +  }
[detail] +
[detail] +  bool ChebyshevParameters::operator==(const ChebyshevParameters& o) const
[detail] +  {
[detail] +    return _fminPass==o._fminPass &&
[detail] +           _fmaxPass==o._fmaxPass &&
[detail] +           _fminStop==o._fminStop &&
[detail] +           _fmaxStop==o._fmaxStop &&
[detail] +           _maxLossPass==o._maxLossPass &&
[detail] +           _minAttenuationStop==o._minAttenuationStop &&
[detail] +           _maxRipple==o._maxRipple;
[detail] +  }
[detail] +
[detail] +  size_t ChebyshevParameters::hash() const
[detail] +  {
[detail] +    size_t hs[7];
[detail] +    hs[0]=qHash(_fminPass);
[detail] +    hs[1]=qHash(_fmaxPass);
[detail] +    hs[2]=qHash(_fminStop);
[detail] +    hs[3]=qHash(_fmaxStop);
[detail] +    hs[4]=qHash(_maxLossPass);
[detail] +    hs[5]=qHash(_minAttenuationStop);
[detail] +    hs[6]=qHash(_maxRipple);
[detail] +    size_t h=::qHashBits(static_cast<void *>(hs), sizeof(size_t)*7);
[detail] +    return h;
[detail] +  }
[detail] +
[detail] +  int ChebyshevParameters::keywordCount(PARAMETERS_KEYWORDCOUNT_ARGS) const
[detail] +  {
[detail] +    return 7+AbstractParameters::keywordCount();
[detail] +  }
[detail] +
[detail] +  void ChebyshevParameters::collectKeywords(PARAMETERS_COLLECTKEYWORDS_ARGS)
[detail] +  {
[detail] +    TRACE;
[detail] +    int baseIndex=AbstractParameters::keywordCount();
[detail] +    keywords.add(prefix+"MIN_FREQUENCY_PASS"+suffix, this, baseIndex);
[detail] +    keywords.add(prefix+"MAX_FREQUENCY_PASS"+suffix, this, baseIndex+1);
[detail] +    keywords.add(prefix+"MIN_FREQUENCY_STOP"+suffix, this, baseIndex+2);
[detail] +    keywords.add(prefix+"MAX_FREQUENCY_STOP"+suffix, this, baseIndex+3);
[detail] +    keywords.add(prefix+"MAX_LOSS_PASS"+suffix, this, baseIndex+4);
[detail] +    keywords.add(prefix+"MIN_ATTENUATION_STOP"+suffix, this, baseIndex+5);
[detail] +    keywords.add(prefix+"MAX_RIPPLE"+suffix, this, baseIndex+6);
[detail] +  }
[detail] +
[detail] +  bool ChebyshevParameters::setValue(PARAMETERS_SETVALUE_ARGS)
[detail] +  {
[detail] +    TRACE;
[detail] +    bool ok=true;
[detail] +    switch(index-AbstractParameters::keywordCount()) {
[detail] +    case 0:
[detail] +      _fminPass=value.toDouble(&ok);
[detail] +      return ok;
[detail] +    case 1:
[detail] +      _fmaxPass=value.toDouble(&ok);
[detail] +      return ok;
[detail] +    case 2:
[detail] +      _fminStop=value.toDouble(&ok);
[detail] +      return ok;
[detail] +    case 3:
[detail] +      _fmaxStop=value.toDouble(&ok);
[detail] +      return ok;
[detail] +    case 4:
[detail] +      _maxLossPass=value.toDouble(&ok);
[detail] +      return ok;
[detail] +    case 5:
[detail] +      _minAttenuationStop=value.toDouble(&ok);
[detail] +      return ok;
[detail] +    case 6:
[detail] +      _maxRipple=value.toDouble(&ok);
[detail] +      return ok;
[detail] +    default:
[detail]        break;
[detail]      }
[detail] +    return AbstractParameters::setValue(index, value, unit, keywords);
[detail]    }
[detail]  
[detail] -  ENUM_AS_STRING_BEGIN(FilterParameters, Band)
[detail] -  ENUM_AS_STRING_DATA_4(BandPass, BandReject, HighPass, LowPass);
[detail] -  ENUM_AS_STRING_SYNONYM("band pass", BandPass);
[detail] -  ENUM_AS_STRING_SYNONYM("band reject", BandReject);
[detail] -  ENUM_AS_STRING_END
[detail] +  QString ChebyshevParameters::toString(PARAMETERS_TOSTRING_ARGS_IMPL) const
[detail] +  {
[detail] +    TRACE;
[detail] +    QString log;
[detail] +    log+=prefix+"MIN_FREQUENCY_PASS"+suffix+" (Hz)="+QString::number(_fminPass)+"\n";
[detail] +    log+=prefix+"MAX_FREQUENCY_PASS"+suffix+" (Hz)="+QString::number(_fminPass)+"\n";
[detail] +    log+=prefix+"MIN_FREQUENCY_STOP"+suffix+" (Hz)="+QString::number(_fminStop)+"\n";
[detail] +    log+=prefix+"MAX_FREQUENCY_STOP"+suffix+" (Hz)="+QString::number(_fminStop)+"\n";
[detail] +    log+=prefix+"MAX_LOSS_PASS"+suffix+" (dB)="+QString::number(_maxLossPass)+"\n";
[detail] +    log+=prefix+"MIN_ATTENUATION_STOP"+suffix+" (dB)="+QString::number(_minAttenuationStop)+"\n";
[detail] +    log+=prefix+"MAX_RIPPLE"+suffix+" (dB)="+QString::number(_maxRipple)+"\n";
[detail] +    return log;
[detail] +  }
[detail]  
[detail] -  ENUM_AS_STRING_BEGIN(FilterParameters, Method)
[detail] -  ENUM_AS_STRING_DATA_2(Butterworth, FrequencyWindow);
[detail] -  ENUM_AS_STRING_SYNONYM("Convolution", FrequencyWindow);
[detail] -  ENUM_AS_STRING_SYNONYM("CosineTaper", FrequencyWindow);
[detail] -  ENUM_AS_STRING_END
[detail] +  
[detail] +
[detail] +  FilterParameters::FilterParameters()
[detail] +  {
[detail] +    _band=LowPass;
[detail] +  }
[detail] +
[detail] +  FilterParameters::FilterParameters(const FilterParameters& o)
[detail] +      : AbstractParameters(o),
[detail] +       _butterworth(o._butterworth),
[detail] +       _frequencyWindow(o._frequencyWindow),
[detail] +       _chebyshev(o._chebyshev)
[detail] +  {
[detail] +    _band=o._band;
[detail] +    _method=o._method;
[detail] +  }
[detail] +
[detail] +  FilterParameters::~FilterParameters()
[detail] +  {
[detail] +  }
[detail] +
[detail] +  void FilterParameters::operator=(const FilterParameters& o)
[detail] +  {
[detail] +    _band=o._band;
[detail] +    _method=o._method;
[detail] +    _butterworth=o._butterworth;
[detail] +    _frequencyWindow=o._frequencyWindow;
[detail] +    _chebyshev=o._chebyshev;
[detail] +  }
[detail] +
[detail] +  void FilterParameters::setBand(Band b)
[detail] +  {
[detail] +    _band=b;
[detail] +    _frequencyWindow.window().setReversed(_band==BandStop);
[detail] +  }
[detail] +
[detail] +  void FilterParameters::setMethod(Method m)
[detail] +  {
[detail] +    _method=m;
[detail] +  }
[detail]  
[detail]    void FilterParameters::setVersion(PARAMETERS_SETVERSION_ARGS)
[detail]    {
[detail]      TRACE;
[detail] -    _window.setVersion(version);
[detail] +    _butterworth.setVersion(version);
[detail] +    _frequencyWindow.setVersion(version);
[detail] +    _chebyshev.setVersion(version);
[detail]      AbstractParameters::setVersion(version);
[detail]    }
[detail]  
[detail] @@ -96,7 +358,10 @@
[detail]    int FilterParameters::totalKeywordCount(PARAMETERS_TOTALKEYWORDCOUNT_ARGS) const
[detail]    {
[detail]      return AbstractParameters::totalKeywordCount()
[detail] -        +_window.totalKeywordCount();
[detail] +           +_butterworth.totalKeywordCount()
[detail] +           +_frequencyWindow.window().totalKeywordCount()
[detail] +           +_frequencyWindow.totalKeywordCount()
[detail] +           +_chebyshev.totalKeywordCount();
[detail]    }
[detail]  
[detail]    void FilterParameters::collectKeywords(PARAMETERS_COLLECTKEYWORDS_ARGS)
[detail] @@ -105,12 +370,16 @@
[detail]      int baseIndex=AbstractParameters::keywordCount();
[detail]      keywords.add(prefix+"FILTER_TYPE"+suffix, this, baseIndex);
[detail]      keywords.add(prefix+"FILTER_METHOD"+suffix, this, baseIndex+1);
[detail] +    
[detail]      keywords.add(prefix+"FILTER_MIN_FREQUENCY"+suffix, this, baseIndex+2);
[detail]      keywords.add(prefix+"FILTER_MAX_FREQUENCY"+suffix, this, baseIndex+3);
[detail]      keywords.add(prefix+"FILTER_CAUSAL"+suffix, this, baseIndex+4);
[detail]      keywords.add(prefix+"FILTER_ORDER"+suffix, this, baseIndex+5);
[detail]      keywords.add(prefix+"FILTER_WIDTH"+suffix, this, baseIndex+6);
[detail] -    _window.collectKeywords(keywords, prefix+"FILTER_", suffix);
[detail] +    _frequencyWindow.window().collectKeywords(keywords, prefix+"FILTER_", suffix); 
[detail] +    _butterworth.collectKeywords(keywords, prefix+"FILTER_BUTTERWORTH_", suffix);
[detail] +    _frequencyWindow.collectKeywords(keywords, prefix+"FILTER_FREQUENCYWINDOW_", suffix);
[detail] +    _chebyshev.collectKeywords(keywords, prefix+"FILTER_CHEBYSHEV_", suffix);
[detail]    }
[detail]  
[detail]    bool FilterParameters::setValue(PARAMETERS_SETVALUE_ARGS)
[detail] @@ -124,17 +393,26 @@
[detail]      case 1:
[detail]        setMethod(convertMethod(value, ok));
[detail]        return ok;
[detail] -    case 2:
[detail] -      _fmin=value.toDouble(&ok);
[detail] +    case 2: {   
[detail] +        double f=value.toDouble(&ok);
[detail] +        _butterworth.setMinimumFrequency(f);
[detail] +        _frequencyWindow.setMinimumFrequency(f);
[detail] +      }
[detail]        return ok;
[detail] -    case 3:
[detail] -      _fmax=value.toDouble(&ok);
[detail] +    case 3: {   
[detail] +        double f=value.toDouble(&ok);
[detail] +        _butterworth.setMaximumFrequency(f);
[detail] +        _frequencyWindow.setMaximumFrequency(f);
[detail] +      }
[detail]        return ok;
[detail]      case 4:
[detail] -      setCausal(value=="y");
[detail] -      return true;
[detail] +      _butterworth.setCausal(Number::toBoolean(value, ok));
[detail] +      return ok;
[detail]      case 5:
[detail] -      setOrder(value.toInt(&ok));
[detail] +      _butterworth.setOrder(value.toInt(&ok));
[detail] +      return ok;
[detail] +    case 6:     
[detail] +      _frequencyWindow.setWidth(value.toDouble(&ok));
[detail]        return ok;
[detail]      default:
[detail]        break;
[detail] @@ -148,19 +426,103 @@
[detail]      QString log;
[detail]      log+=prefix+"FILTER_TYPE"+suffix+"="+convertBand(_band)+"\n";
[detail]      log+=prefix+"FILTER_METHOD"+suffix+"="+convertMethod(_method)+"\n";
[detail] -    log+=prefix+"FILTER_MIN_FREQUENCY"+suffix+" (Hz)="+QString::number(_fmin)+"\n";
[detail] -    log+=prefix+"FILTER_MAX_FREQUENCY"+suffix+" (Hz)="+QString::number(_fmax)+"\n";
[detail] +    log+=_butterworth.toString(prefix+"FILTER_BUTTERWORTH_", suffix);
[detail] +    log+=_frequencyWindow.toString(prefix+"FILTER_FREQUENCYWINDOW_", suffix);
[detail] +    log+=_chebyshev.toString(prefix+"FILTER_CHEBYSHEV_", suffix);
[detail] +    return log;
[detail] +  }
[detail] +
[detail] +  double FilterParameters::minimumFrequency() const
[detail] +  {
[detail] +    TRACE;
[detail] +    switch(_band) {
[detail] +    case LowPass:
[detail] +      break;
[detail] +    case HighPass:
[detail] +      switch(_method) {
[detail] +      case Butterworth:
[detail] +        return _butterworth.minimumFrequency();
[detail] +      case FrequencyWindow:
[detail] +        return _frequencyWindow.minimumFrequency();
[detail] +      case ChebyshevType1:
[detail] +        return _chebyshev.minimumFrequencyPass();
[detail] +      }
[detail] +      break;
[detail] +    case BandPass:
[detail]      switch(_method) {
[detail]      case Butterworth:
[detail] -      log+=prefix+"FILTER_CAUSAL"+suffix+" (y/n)="+(causal() ? "y" : "n")+"\n";
[detail] -      log+=prefix+"FILTER_ORDER"+suffix+"="+QString::number(_order)+"\n";
[detail] +        return _butterworth.minimumFrequency();
[detail] +      case FrequencyWindow:
[detail] +        return _frequencyWindow.minimumFrequency();
[detail] +      case ChebyshevType1:
[detail] +        return _chebyshev.minimumFrequencyPass();
[detail] +      }
[detail]        break;
[detail] +    case BandStop:
[detail] +      switch(_method) {
[detail] +      case Butterworth:
[detail] +        return _butterworth.minimumFrequency();
[detail]      case FrequencyWindow:
[detail] -      log+=_window.toString(prefix+"FILTER_", suffix);
[detail] -      log+=prefix+"FILTER_WIDTH"+suffix+"="+QString::number(_width);
[detail] +        return _frequencyWindow.minimumFrequency();
[detail] +      case ChebyshevType1:
[detail] +        return _chebyshev.minimumFrequencyStop();
[detail] +      }
[detail]        break;
[detail]      }
[detail] -    return log;
[detail] +    return 0.0;
[detail]    }
[detail]  
[detail] +  double FilterParameters::maximumFrequency() const
[detail] +  {
[detail] +    TRACE;
[detail] +    switch(_band) {
[detail] +    case LowPass:
[detail] +      switch(_method) {
[detail] +      case Butterworth:
[detail] +        return _butterworth.minimumFrequency();
[detail] +      case FrequencyWindow:
[detail] +        return _frequencyWindow.minimumFrequency();
[detail] +      case ChebyshevType1:
[detail] +        return _chebyshev.minimumFrequencyPass();
[detail] +      }
[detail] +      break;
[detail] +    case HighPass:
[detail] +      break;
[detail] +    case BandPass:
[detail] +      switch(_method) {
[detail] +      case Butterworth:
[detail] +        return _butterworth.maximumFrequency();
[detail] +      case FrequencyWindow:
[detail] +        return _frequencyWindow.maximumFrequency();
[detail] +      case ChebyshevType1:
[detail] +        return _chebyshev.maximumFrequencyPass();
[detail] +      }
[detail] +      break;
[detail] +    case BandStop:
[detail] +      switch(_method) {
[detail] +      case Butterworth:
[detail] +        return _butterworth.maximumFrequency();
[detail] +      case FrequencyWindow:
[detail] +        return _frequencyWindow.maximumFrequency();
[detail] +      case ChebyshevType1:
[detail] +        return _chebyshev.maximumFrequencyStop();
[detail] +      }
[detail] +      break;
[detail] +    }
[detail] +    return std::numeric_limits<double>::infinity();
[detail] +  }
[detail] +
[detail] +  ENUM_AS_STRING_BEGIN(FilterParameters, Band)
[detail] +  ENUM_AS_STRING_DATA_4(BandPass, BandStop, HighPass, LowPass);
[detail] +  ENUM_AS_STRING_SYNONYM("band pass", BandPass);
[detail] +  ENUM_AS_STRING_SYNONYM("band reject", BandStop);
[detail] +  ENUM_AS_STRING_SYNONYM("BandReject", BandStop);
[detail] +  ENUM_AS_STRING_END
[detail] +
[detail] +  ENUM_AS_STRING_BEGIN(FilterParameters, Method)
[detail] +  ENUM_AS_STRING_DATA_3(Butterworth, ChebyshevType1, FrequencyWindow);
[detail] +  ENUM_AS_STRING_SYNONYM("Convolution", FrequencyWindow);
[detail] +  ENUM_AS_STRING_SYNONYM("CosineTaper", FrequencyWindow);
[detail] +  ENUM_AS_STRING_END
[detail] +
[detail]  } 
[detail]                      src/FourierPlan.cpp:  version-4.5.1	modified out of comments
[detail] --- src/FourierPlan.cpp-version-4.5.1-stripped	2025-09-28 04:01:04.383500002 +0200
[detail] +++ src/FourierPlan.cpp-HEAD-stripped	2025-09-28 04:01:04.387500021 +0200
[detail] @@ -11,13 +11,14 @@
[detail]      : _base(n, ::sqrt(2.0*samplingPeriod/static_cast<double>(n)), frequency*samplingPeriod)
[detail]    {
[detail]      _n=n;
[detail] +    _samplingPeriod=samplingPeriod;
[detail]      _frequency=frequency; 
[detail]    }
[detail]  
[detail] -  bool FourierPlan::test(double samplingPeriod)
[detail] +  bool FourierPlan::test()
[detail]    {
[detail] -    double omega=-2.0*M_PI*_frequency*samplingPeriod; 
[detail] -    double rn=::sqrt(2.0*samplingPeriod/static_cast<double>(_n)); 
[detail] +    double omega=-2.0*M_PI*_frequency*_samplingPeriod; 
[detail] +    double rn=::sqrt(2.0*_samplingPeriod/static_cast<double>(_n)); 
[detail]                                                                    
[detail]      Complex c;
[detail]      for(int i=0; i<_n; i++) {
[detail]                       src/GeopsyCore.cpp:  version-4.5.1	not modified
[detail]                 src/GeopsyCoreEngine.cpp:  version-4.5.1	modified out of comments
[detail] --- src/GeopsyCoreEngine.cpp-version-4.5.1-stripped	2025-09-28 04:01:04.419500176 +0200
[detail] +++ src/GeopsyCoreEngine.cpp-HEAD-stripped	2025-09-28 04:01:04.423500195 +0200
[detail] @@ -1,18 +1,13 @@
[detail]  
[detail]  
[detail] -#include <math.h>
[detail] -
[detail]  #include <QGpCoreTools.h>
[detail]  
[detail]  #include "GeopsyCoreEngine.h"
[detail]  #include "GeopsyPreferences.h"
[detail]  #include "GeopsyPlugins.h"
[detail]  #include "SignalDatabase.h"
[detail] -#include "KeepSignal.h"
[detail]  #include "SubSignalPool.h"
[detail]  #include "CustomFileFormats.h"
[detail] -#include "Comments.h"
[detail] -#include "FFTW.h"
[detail]  #include "TimeRange.h"
[detail]  
[detail]  namespace GeopsyCore {
[detail] @@ -31,7 +26,6 @@
[detail]      _preferences=nullptr;
[detail]      _cache=nullptr;
[detail]      _fileContentKey=true;
[detail] -    new FFTW;
[detail]  
[detail]      _customFileFormats=new CustomFileFormats;
[detail]      
[detail] @@ -45,7 +39,7 @@
[detail]      _cache=new Cache;
[detail]      _cache->setSize(_preferences->cacheSize());
[detail]      _cache->setSwapDir(_preferences->cacheSwapDir());
[detail] -    APP_LOG(1, tr("Signal cache size %1 Mb\n").arg(_cache->freeMegaBytes()));
[detail] +    APP_LOG(1, tr("Signal cache size %1\n").arg(Number::bytesToString(_cache->freeBytes())));
[detail]  
[detail]      if(_plugins) {
[detail]        _plugins->polish(); 
[detail] @@ -65,7 +59,6 @@
[detail]      delete _progress;
[detail]      delete _plugins;
[detail]      delete _customFileFormats;
[detail] -    delete FastFourierTransform::instance();
[detail]    }
[detail]  
[detail]    
[detail] @@ -85,6 +78,15 @@
[detail]    
[detail]  
[detail]    
[detail] +  void GeopsyCoreEngine::setProgressCaption(SignalDatabase * , const QString& caption)
[detail] +  {
[detail] +    TRACE;
[detail] +    if(_progress) {
[detail] +      _progress->setCaption(caption);
[detail] +    }
[detail] +  }
[detail] +
[detail] +  
[detail]    void GeopsyCoreEngine::setProgressMaximum(SignalDatabase * , int val)
[detail]    {
[detail]      TRACE;
[detail]              src/GeopsyCoreInterface.cpp:  version-4.5.1	not modified
[detail]             src/GeopsyPluginSettings.cpp:  version-4.5.1	not modified
[detail]                    src/GeopsyPlugins.cpp:  version-4.5.1	not modified
[detail]                src/GeopsyPreferences.cpp:  version-4.5.1	not modified
[detail]               src/GeopsySignalHeader.cpp:  version-4.5.1	not modified
[detail]                              src/Gse.cpp:  version-4.5.1	not modified
[detail]            src/GuralpCompressedBlock.cpp:  version-4.5.1	modified out of comments
[detail] --- src/GuralpCompressedBlock.cpp-version-4.5.1-stripped	2025-09-28 04:01:04.539500756 +0200
[detail] +++ src/GuralpCompressedBlock.cpp-HEAD-stripped	2025-09-28 04:01:04.543500776 +0200
[detail] @@ -1,8 +1,7 @@
[detail]  
[detail]  
[detail] -#include <math.h>
[detail] -
[detail]  #include <QGpCoreTools.h>
[detail] +
[detail]  #include "GuralpCompressedBlock.h"
[detail]  
[detail]  namespace GeopsyCore {
[detail] @@ -300,17 +299,17 @@
[detail]      return "Unknown";
[detail]    }
[detail]  
[detail] -  Signal::Components GuralpCompressedBlock::component() const
[detail] +  SignalMetaData::Components GuralpCompressedBlock::component() const
[detail]    {
[detail]      switch(_component) {
[detail]      case 'Z':
[detail] -      return Signal::Vertical;
[detail] +      return SignalMetaData::Vertical;
[detail]      case 'N':
[detail] -      return Signal::North;
[detail] +      return SignalMetaData::North;
[detail]      case 'E':
[detail] -      return Signal::East;
[detail] +      return SignalMetaData::East;
[detail]      default:
[detail] -      return Signal::UndefinedComponent;
[detail] +      return SignalMetaData::UndefinedComponent;
[detail]      }
[detail]    }
[detail]  
[detail]                    src/GuralpRecords.cpp:  version-4.5.1	modified out of comments
[detail] --- src/GuralpRecords.cpp-version-4.5.1-stripped	2025-09-28 04:01:04.559500852 +0200
[detail] +++ src/GuralpRecords.cpp-HEAD-stripped	2025-09-28 04:01:04.563500872 +0200
[detail] @@ -9,6 +9,11 @@
[detail]  
[detail]    REGISTER_METADATA(GuralpRecords)
[detail]  
[detail] +  void GuralpRecords::operator=(const MetaData& o)
[detail] +  {
[detail] +    _records=reinterpret_cast<const GuralpRecords&>(o)._records;
[detail] +  }
[detail] +
[detail]    QString GuralpRecords::toString(const QString&) const
[detail]    {
[detail]      TRACE;
[detail] @@ -26,11 +31,11 @@
[detail]      _records.clear();
[detail]      StringSection valSection(string);
[detail]      StringSection field;
[detail] -    const QChar * ptr=0;
[detail] +    const QChar * ptr=nullptr;
[detail]      bool ok=true;
[detail] -    while(true) {
[detail] +    while(ok) {
[detail]        field=valSection.nextField(ptr, "," );
[detail] -      if(!field.isValid()) return false;
[detail] +      if(!field.isValid()) break;
[detail]        _records.append(field.toInt(ok));
[detail]      }
[detail]      return ok;
[detail]                     src/GuralpSignal.cpp:  version-4.5.1	not modified
[detail]                         src/HDF5File.cpp:  version-4.5.1	no last version available
[detail]             src/InstrumentalResponse.cpp:  version-4.5.1	modified out of comments
[detail] --- src/InstrumentalResponse.cpp-version-4.5.1-stripped	2025-09-28 04:01:04.599501045 +0200
[detail] +++ src/InstrumentalResponse.cpp-HEAD-stripped	2025-09-28 04:01:04.603501065 +0200
[detail] @@ -1,6 +1,7 @@
[detail]  
[detail]  
[detail]  #include "InstrumentalResponse.h"
[detail] +#include "InstrumentalResponseFunction.h"
[detail]  
[detail]  namespace GeopsyCore {
[detail]  
[detail] @@ -12,10 +13,13 @@
[detail]    InstrumentalResponse::InstrumentalResponse()
[detail]    {
[detail]      TRACE;
[detail] -    _noiseLevel=1e-16;
[detail]      _transductionFactor=1.0;
[detail]      _normalizationFactor=1.0;
[detail]      _frequencyFactor=2.0*M_PI;
[detail] +    _filterFrequencies[0]=0.2;
[detail] +    _filterFrequencies[1]=0.4;
[detail] +    _filterFrequencies[2]=45;
[detail] +    _filterFrequencies[3]=50;
[detail]    }
[detail]  
[detail]    
[detail] @@ -24,45 +28,156 @@
[detail]      TRACE;
[detail]    }
[detail]  
[detail] +  bool InstrumentalResponse::operator==(const InstrumentalResponse& o) const
[detail] +  {
[detail] +    return _poles==o._poles &&
[detail] +           _zeros==o._zeros &&
[detail] +           _filterFrequencies[0]==o._filterFrequencies[0] &&
[detail] +           _filterFrequencies[1]==o._filterFrequencies[1] &&
[detail] +           _filterFrequencies[2]==o._filterFrequencies[2] &&
[detail] +           _filterFrequencies[3]==o._filterFrequencies[3] &&
[detail] +           _name==o._name &&
[detail] +           _normalizationFactor==o._normalizationFactor &&
[detail] +           _frequencyFactor==o._frequencyFactor &&
[detail] +           _transductionFactor==o._transductionFactor;
[detail] +  }
[detail] +
[detail] +  int InstrumentalResponse::compare(const InstrumentalResponse& o) const
[detail] +  {
[detail] +    int c;
[detail] +    c=QGpCoreTools::compare(_poles, o._poles);
[detail] +    if(c!=0) {
[detail] +      return c;
[detail] +    } else {
[detail] +      c=QGpCoreTools::compare(_zeros, o._zeros);
[detail] +      if(c!=0) {
[detail] +        return c;
[detail] +      } else {
[detail] +        for(int i=0; i<4; i++) {
[detail] +          c=QGpCoreTools::compare(_filterFrequencies[i], o._filterFrequencies[i]);
[detail] +          if(c!=0) {
[detail] +            return c;
[detail] +          }
[detail] +        }
[detail] +        c=_name.compare(o._name);
[detail] +        if(c!=0) {
[detail] +          return c;
[detail] +        } else {
[detail] +          c=QGpCoreTools::compare(_normalizationFactor, o._normalizationFactor);
[detail] +          if(c!=0) {
[detail] +            return c;
[detail] +          }
[detail] +          c=QGpCoreTools::compare(_frequencyFactor, o._frequencyFactor);
[detail] +          if(c!=0) {
[detail] +            return c;
[detail] +          }
[detail] +          return QGpCoreTools::compare(_transductionFactor, o._transductionFactor);
[detail] +        }
[detail] +      }
[detail] +    }
[detail] +  }
[detail] +
[detail] +  size_t InstrumentalResponse::hash() const
[detail] +  {
[detail] +    int np=_poles.size();
[detail] +    int nz=_zeros.size();
[detail] +    int nh=np+nz+8;
[detail] +    size_t * hs=new size_t[nh];
[detail] +    for(int i=0; i<np; i++) {
[detail] +      hs[i]=qHash(_poles.at(i));
[detail] +    }
[detail] +    hs+=np;
[detail] +    for(int i=0; i<nz; i++) {
[detail] +      hs[i]=qHash(_zeros.at(i));
[detail] +    }
[detail] +    hs+=nz;
[detail] +    for(int i=0; i<4; i++) {
[detail] +      hs[i]=qHash(_filterFrequencies[i]);
[detail] +    }
[detail] +    hs+=4;
[detail] +    hs[0]=qHash(_name);
[detail] +    hs[1]=qHash(_normalizationFactor);
[detail] +    hs[2]=qHash(_frequencyFactor);
[detail] +    hs[3]=qHash(_transductionFactor);
[detail] +    hs-=nh-4;
[detail] +    size_t h=::qHashBits(static_cast<void *>(hs), sizeof(size_t)*nh);
[detail] +    delete [] hs;
[detail] +    return h;
[detail] +  }
[detail] +
[detail] +  InstrumentalResponseFunction * InstrumentalResponse::deconvolutionFunction(int n, double samplingPeriod) const
[detail] +  {
[detail] +    InstrumentalResponseFunction * f=new InstrumentalResponseFunction(n, samplingPeriod);
[detail] +    f->setValues(*this);
[detail] +    return f;
[detail] +  }
[detail]    
[detail] -  Complex InstrumentalResponse::deconvolution(double frequency, const Complex& sample) const
[detail] +  bool InstrumentalResponse::isValidFilter() const
[detail] +  {
[detail] +    return _filterFrequencies[0]<_filterFrequencies[1] &&
[detail] +           _filterFrequencies[1]<_filterFrequencies[2] &&
[detail] +           _filterFrequencies[2]<_filterFrequencies[3];
[detail] +  }
[detail] +
[detail] +  double InstrumentalResponse::filter(double frequency) const
[detail] +  {
[detail] +    frequency=fabs(frequency);
[detail] +    if(frequency>_filterFrequencies[1]) {
[detail] +      if(frequency<_filterFrequencies[2]) {         
[detail] +        return 1.0;
[detail] +      } else if(frequency<_filterFrequencies[3]) {  
[detail] +        return 0.5+0.5*cos(M_PI*(frequency-_filterFrequencies[2])/(_filterFrequencies[3]-_filterFrequencies[2]));
[detail] +      } else {                                      
[detail] +        return 0.0;
[detail] +      }
[detail] +    } else {
[detail] +      if(frequency>_filterFrequencies[0]) {         
[detail] +        return 0.5-0.5*cos(M_PI*(frequency-_filterFrequencies[0])/(_filterFrequencies[1]-_filterFrequencies[0]));
[detail] +      } else {                                      
[detail] +        return 0.0;
[detail] +      }
[detail] +    }
[detail] +  }
[detail] +
[detail] +  
[detail] +  void InstrumentalResponse::deconvolution(double frequency, Complex& sample) const
[detail] +  {
[detail] +    sample*=inverseValue(frequency);
[detail] +    sample*=filter(frequency)*_normalizationFactor;
[detail] +  }
[detail] +
[detail] +  Complex InstrumentalResponse::inverseValue(double frequency) const
[detail]    {
[detail]      Complex hn(1.0, 0.0), hd(1.0, 0.0);
[detail]      Complex z(0.0, frequency*_frequencyFactor);
[detail] -    for(VectorList<Complex>::const_iterator it=_zeros.begin(); it!=_zeros.end(); it++) {
[detail] +    VectorList<Complex>::const_iterator it;
[detail] +    for(it=_zeros.begin(); it!=_zeros.end(); it++) {
[detail]        hn*=(z-*it);
[detail]      }
[detail] -    for(VectorList<Complex>::const_iterator it=_poles.begin(); it!=_poles.end(); it++) {
[detail] +    for(it=_poles.begin(); it!=_poles.end(); it++) {
[detail]        hd*=(z-*it);
[detail]      }
[detail]      if(hn.isNull()) {
[detail] -      return sample;
[detail] -    } else if(hd.isNull()){
[detail]        return Complex();
[detail] -    } else {
[detail] -      double h2=(hn/hd).abs2();
[detail] -      double wienerFactor=h2/(h2+_noiseLevel/sample.abs());
[detail] -      return sample*(hd/hn)*(wienerFactor*_normalizationFactor);
[detail]      }
[detail] +    return hd/hn;
[detail]    }
[detail]  
[detail]    Complex InstrumentalResponse::value(double frequency) const
[detail]    {
[detail]      Complex hn(1.0, 0.0), hd(1.0, 0.0);
[detail]      Complex z(0.0, frequency*_frequencyFactor);
[detail] -    for(VectorList<Complex>::const_iterator it=_zeros.begin(); it!=_zeros.end(); it++) {
[detail] +    VectorList<Complex>::const_iterator it;
[detail] +    for(it=_zeros.begin(); it!=_zeros.end(); it++) {
[detail]        hn*=(z-*it);
[detail]      }
[detail] -    for(VectorList<Complex>::const_iterator it=_poles.begin(); it!=_poles.end(); it++) {
[detail] +    for(it=_poles.begin(); it!=_poles.end(); it++) {
[detail]        hd*=(z-*it);
[detail]      }
[detail] -    if(hn.isNull()) {
[detail] -      return Complex(_transductionFactor*_normalizationFactor);
[detail] -    } else if(hd.isNull()){
[detail] +    if(hd.isNull()){
[detail]        return Complex();
[detail] -    } else {
[detail] -      return (hn/hd)*(_transductionFactor*_normalizationFactor);
[detail]      }
[detail] +    return hn/hd;
[detail]    }
[detail]  
[detail]    QString InstrumentalResponse::arguments() const
[detail] @@ -85,10 +200,30 @@
[detail]        s+=QString::number(it->im());
[detail]        s+=", ";
[detail]      }
[detail] -    s+=QString::number(_noiseLevel);
[detail] +    s+=filterFrequencies();
[detail]      return s;
[detail]    }
[detail]  
[detail] +  bool InstrumentalResponse::setFilterFrequencies(const StringSection& s)
[detail] +  {
[detail] +    bool ok=true;
[detail] +    const QChar * ptr=nullptr;
[detail] +    StringSection f;
[detail] +    for(int i=0; i<4; i++) {
[detail] +      f=s.nextField(ptr);
[detail] +      _filterFrequencies[i]=f.toDouble(ok);
[detail] +    }
[detail] +    return ok;
[detail] +  }
[detail] +
[detail] +  QString InstrumentalResponse::filterFrequencies() const
[detail] +  {
[detail] +    return QString::number(_filterFrequencies[0])+" "+
[detail] +           QString::number(_filterFrequencies[1])+" "+
[detail] +           QString::number(_filterFrequencies[2])+" "+
[detail] +           QString::number(_filterFrequencies[3]);
[detail] +  }
[detail] +
[detail]    void InstrumentalResponse::xml_writeProperties(XML_WRITEPROPERTIES_ARGS) const
[detail]    {
[detail]      Q_UNUSED(context)
[detail] @@ -96,13 +231,13 @@
[detail]      writeProperty(s, "transductionFactor", _transductionFactor);
[detail]      writeProperty(s, "normalizationFactor", _normalizationFactor);
[detail]      writeProperty(s, "frequencyFactor", _frequencyFactor);
[detail] -    writeProperty(s, "noiseLevel", _noiseLevel);
[detail]      for(VectorList<Complex>::const_iterator it=_poles.begin(); it!=_poles.end(); it++) {
[detail]        writeProperty(s, "pole", it->toString('g', 20));
[detail]      }
[detail]      for(VectorList<Complex>::const_iterator it=_zeros.begin(); it!=_zeros.end(); it++) {
[detail]        writeProperty(s, "zero", it->toString('g', 20));
[detail]      }
[detail] +    writeProperty(s, "filterFrequencies", filterFrequencies());
[detail]    }
[detail]  
[detail]    XMLMember InstrumentalResponse::xml_member(XML_MEMBER_ARGS)
[detail] @@ -115,6 +250,7 @@
[detail]      else if(tag=="transductionFactor") return XMLMember(1);
[detail]      else if(tag=="normalizationFactor") return XMLMember(5);
[detail]      else if(tag=="frequencyFactor") return XMLMember(6);
[detail] +    else if(tag=="filterFrequencies") return XMLMember(7);
[detail]      else if(tag=="noiseLevel") return XMLMember(2);
[detail]      return XMLMember(XMLMember::Unknown);
[detail]    }
[detail] @@ -133,13 +269,12 @@
[detail]        _transductionFactor=content.toDouble(ok);
[detail]        return ok;
[detail]      case 2:
[detail] -      _noiseLevel=content.toDouble(ok);
[detail] -      return ok;
[detail] +      return true;
[detail]      case 3:
[detail] -      addPole(content.toComplex(ok));
[detail] +      addPole(content.toComplex(ok, true));
[detail]        return ok;
[detail]      case 4:
[detail] -      addZero(content.toComplex(ok));
[detail] +      addZero(content.toComplex(ok, true));
[detail]        return ok;
[detail]      case 5:
[detail]        _normalizationFactor=content.toDouble(ok);
[detail] @@ -147,6 +282,9 @@
[detail]      case 6:
[detail]        _frequencyFactor=content.toDouble(ok);
[detail]        return ok;
[detail] +    case 7:
[detail] +      setFilterFrequencies(content);
[detail] +      return isValidFilter();
[detail]      }
[detail]      return false;
[detail]    }
[detail]     src/InstrumentalResponseFunction.cpp:  version-4.5.1	no last version available
[detail]     src/InstrumentalResponseMetaData.cpp:  version-4.5.1	no last version available
[detail]                       src/KeepSignal.cpp:  version-4.5.1	modified out of comments
[detail] --- src/KeepSignal.cpp-version-4.5.1-stripped	2025-09-28 04:01:04.631501200 +0200
[detail] +++ src/KeepSignal.cpp-HEAD-stripped	2025-09-28 04:01:04.635501220 +0200
[detail] @@ -1,8 +1,8 @@
[detail]  
[detail]  
[detail] +#include <QGpCoreMath.h>
[detail] +
[detail]  #include "KeepSignal.h"
[detail] -#include "TimeRange.h"
[detail] -#include "GeoSignal.h"
[detail]  
[detail]  namespace GeopsyCore {
[detail]  
[detail] @@ -10,34 +10,390 @@
[detail]  
[detail]  
[detail]  KeepSignal::KeepSignal()
[detail] -    : SignalTemplate<int>()
[detail]  {
[detail]    TRACE;
[detail]    _samplingPeriod=0.0;
[detail] +    _nSections2=2;
[detail] +    _sections.append(Section(0, 0));
[detail]  }
[detail]  
[detail] -KeepSignal::KeepSignal(int n)
[detail] -    : SignalTemplate<int>(n)
[detail] +  KeepSignal::KeepSignal(qint64 n)
[detail]  {
[detail]    TRACE;
[detail]    _samplingPeriod=0.0;
[detail] +    _nSections2=2;
[detail] +    _sections.append(Section(n, 0));
[detail]  }
[detail]  
[detail] -KeepSignal::KeepSignal(const KeepSignal& o) :
[detail] -    SignalTemplate<int>(o)
[detail] +  QString KeepSignal::debugName() const
[detail]  {
[detail] -  TRACE;
[detail] -  _samplingPeriod=o._samplingPeriod;
[detail] -  _startTime=o._startTime;
[detail] +    return QString("keep_%1").arg(reinterpret_cast<qint64>(this), 0, 16);
[detail]  }
[detail]  
[detail]  void KeepSignal::debugPrint() const
[detail]  {
[detail]    TRACE;
[detail]    printf( "Debug samples for signal %s\n", debugName().toLatin1().data());
[detail] -  CONST_LOCK_SAMPLES(int, thisSamples, this)
[detail] -    for(int i=0;i < _nSamples;i++ ) printf( "%i\t%i\n", i, thisSamples[ i ] );
[detail] -  UNLOCK_SAMPLES(this)
[detail] +    for(int i=0; i<_sections.size(); i++) {
[detail] +      const Section& v=_sections.at(i);
[detail] +      printf("%lli\t%i\n", v.end, v.value);
[detail] +    }
[detail] +  }
[detail] +
[detail] +  
[detail] +  inline void KeepSignal::updatePowerOfTwo()
[detail] +  {
[detail] +    if(_sections.count()>=_nSections2) {
[detail] +      _nSections2=_nSections2 << 1;
[detail] +    }
[detail] +  }
[detail] +
[detail] +  bool KeepSignal::setSamplingPeriod(double newval)
[detail] +  {
[detail] +    if(_samplingPeriod==0.0) {
[detail] +      _samplingPeriod=newval;
[detail] +      return true;
[detail] +    } else {
[detail] +      double factor=_samplingPeriod/newval;
[detail] +      qint64 intFactor=qRound64(factor);
[detail] +      if(intFactor!=factor || factor<1.0) {
[detail] +        App::log(tr("The new sampling frequency (%1 Hz) must be a multiple of the original sampling frequency (%2 Hz).\n")
[detail] +                     .arg(1.0/newval).arg(1.0/_samplingPeriod));
[detail] +        return false;
[detail] +      }
[detail] +      for(int i=0; i<_sections.size(); i++) {
[detail] +        Section& v=_sections[i];
[detail] +        v.end*=intFactor;
[detail] +      }
[detail] +      _samplingPeriod=newval;
[detail] +      
[detail] +      return true;
[detail] +    }
[detail] +  }
[detail] +
[detail] +  void KeepSignal::copySamplesFrom(const KeepSignal * sig)
[detail] +  {
[detail] +    if(sig->nSamples()!=nSamples()) {
[detail] +      return;
[detail] +    }
[detail] +    _nSections2=sig->_nSections2;
[detail] +    _sections=sig->_sections;
[detail] +  }
[detail] +
[detail] +  void KeepSignal::adjustLimits(const KeepSignal * sig,
[detail] +                                qint64& sigStart, qint64& thisStart, qint64& nToCopy) const
[detail] +  {
[detail] +    TRACE;
[detail] +    
[detail] +    if(sigStart>=sig->nSamples() ||
[detail] +        thisStart>=nSamples() ||
[detail] +        sigStart+nToCopy<0 ||
[detail] +        thisStart+nToCopy<0) {
[detail] +      nToCopy=0;
[detail] +      return;
[detail] +    }
[detail] +    if(sigStart<0) {
[detail] +      nToCopy+=sigStart;
[detail] +      thisStart-=sigStart;
[detail] +      sigStart=0;
[detail] +    }
[detail] +    if(thisStart<0) {
[detail] +      nToCopy+=thisStart;
[detail] +      sigStart-=thisStart;
[detail] +      thisStart=0;
[detail] +    }
[detail] +    if(thisStart+nToCopy>=nSamples()) {
[detail] +      nToCopy=nSamples()-thisStart;
[detail] +    }
[detail] +    if(sigStart+nToCopy>=sig->nSamples()) {
[detail] +      nToCopy=sig->nSamples()-sigStart;
[detail] +    }
[detail] +  }
[detail] +
[detail] +  void KeepSignal::copySamplesFrom(const KeepSignal * sig,
[detail] +                                   qint64 sigStart, qint64 thisStart, qint64 nToCopy)
[detail] +  {
[detail] +    adjustLimits(sig, sigStart, thisStart, nToCopy);
[detail] +    if(nToCopy<=0) {
[detail] +      return;
[detail] +    }
[detail] +    qint64 sigIndex=sigStart;
[detail] +    qint64 sigEnd=sigStart+nToCopy;
[detail] +    qint64 thisIndex=thisStart;
[detail] +    int iSig=sig->indexOf(sigIndex);
[detail] +    while(sigIndex<sigEnd) {
[detail] +      const Section& sSig=sig->_sections.at(iSig);
[detail] +      qint64 n=sSig.end-sigIndex;
[detail] +      if(sigIndex+n>sigEnd) {
[detail] +        n=sigEnd-sigIndex;
[detail] +      }
[detail] +      setValues(thisIndex, n, sSig.value);
[detail] +      iSig++;
[detail] +      sigIndex+=n;
[detail] +      thisIndex+=n;
[detail] +    }
[detail] +  }
[detail] +
[detail] +  int KeepSignal::indexOf(qint64 index) const
[detail] +  {
[detail] +    int n=_sections.count();
[detail] +    int i=_nSections2-1;
[detail] +    int step2=_nSections2 >> 1;
[detail] +    while(step2>0) {
[detail] +      if(i>=n) {
[detail] +        i-=step2;
[detail] +      } else {
[detail] +        if(index<_sections.at(i).end) {
[detail] +          i-=step2;
[detail] +        } else {
[detail] +          i+=step2;
[detail] +        }
[detail] +      }
[detail] +      step2=step2 >> 1;
[detail] +    }
[detail] +    if(index>=_sections.at(i).end) {
[detail] +      return i+1;
[detail] +    } else {
[detail] +      return i;
[detail] +    }
[detail] +  }
[detail] +
[detail] +  int KeepSignal::at(qint64 index) const
[detail] +  {
[detail] +    ASSERT(index<nSamples());
[detail] +    return _sections[indexOf(index)].value;
[detail] +  }
[detail] +
[detail] +  int KeepSignal::sectionAt(qint64 index) const
[detail] +  {
[detail] +    ASSERT(index<nSamples());
[detail] +    return indexOf(index);
[detail] +  }
[detail] +
[detail] +  void KeepSignal::whileAt(int value, qint64& index, qint64 maxIndex) const
[detail] +  {
[detail] +    ASSERT(index<nSamples());
[detail] +    int i=indexOf(index);
[detail] +    const Section& v=_sections.at(i);
[detail] +    if(v.value==value) {
[detail] +      index=v.end<maxIndex ? v.end : maxIndex;
[detail] +    }
[detail] +  }
[detail] +
[detail] +  void KeepSignal::extend(int i, qint64 end, int value)
[detail] +  {
[detail] +    while(i<_sections.count() && _sections.at(i).end<=end) {
[detail] +      _sections.removeAt(i);
[detail] +    }
[detail] +    if(i<_sections.count() && _sections[i].value==value) {
[detail] +      _sections.removeAt(i-1);
[detail] +    }
[detail] +  }
[detail] +
[detail] +  void KeepSignal::setValues(qint64 index, qint64 end, int value)
[detail] +  {
[detail] +    ASSERT(index<nSamples());
[detail] +    ASSERT(end<=nSamples());
[detail] +    int i=indexOf(index);
[detail] +    if(_sections[i].value==value) {
[detail] +      if(end<_sections[i].end) {
[detail] +      } else {
[detail] +        _sections[i].end=end;
[detail] +        extend(++i, end, value);
[detail] +      }
[detail] +    } else {
[detail] +      if(i>0 && index==_sections[i-1].end) {
[detail] +        if(_sections[i-1].value==value) {
[detail] +          _sections[i-1].end=end;
[detail] +          if(end<_sections[i].end) {
[detail] +          } else {
[detail] +            extend(i, end, value);
[detail] +          }
[detail] +        } else {
[detail] +          if(end<_sections[i].end) {
[detail] +            _sections.insert(i, Section(end, value));
[detail] +            updatePowerOfTwo();
[detail] +          } else {
[detail] +            _sections[i].value=value;
[detail] +            _sections[i].end=end;
[detail] +            extend(++i, end, value);
[detail] +          }
[detail] +        }
[detail] +      } else if(index==0) {
[detail] +        if(end<_sections[i].end) {
[detail] +          _sections.insert(i+1, _sections[i]);
[detail] +          _sections[i].end=end;
[detail] +          _sections[i].value=value;
[detail] +          updatePowerOfTwo();
[detail] +        } else {
[detail] +          _sections[i].end=end;
[detail] +          _sections[i].value=value;
[detail] +          extend(i+1, end, value);
[detail] +        }
[detail] +      } else {
[detail] +        if(end<_sections[i].end) {
[detail] +          _sections.insert(i+1, _sections[i]);
[detail] +          _sections[i].end=index;
[detail] +          _sections.insert(i+1, Section(end, value));
[detail] +          updatePowerOfTwo();
[detail] +        } else {
[detail] +          _sections[i].end=index;
[detail] +          i++;
[detail] +          _sections.insert(i, Section(end, value));
[detail] +          extend(++i, end, value);
[detail] +          updatePowerOfTwo();
[detail] +        }
[detail] +      }
[detail] +    }
[detail] +  }
[detail] +
[detail] +  bool KeepSignal::checkSections() const
[detail] +  {
[detail] +    bool ok=true;
[detail] +    for(int i=1; i<_sections.size(); i++) {
[detail] +      if(_sections.at(i).value==_sections.at(i-1).value) {
[detail] +        printf("Section %i has same value as previous one\n", i);
[detail] +        ok=false;
[detail] +      }
[detail] +      if(_sections.at(i).end<=_sections.at(i-1).end) {
[detail] +        printf("Section %i has wrong until index %lli (current) %lli (previous)\n",
[detail] +               i, _sections.at(i).end, _sections.at(i-1).end);
[detail] +        ok=false;
[detail] +      }
[detail] +    }
[detail] +    return ok;
[detail] +  }
[detail] +
[detail] +  class KeepSignalPlain: public KeepSignal
[detail] +  {
[detail] +  public:
[detail] +    KeepSignalPlain(qint64 n) {_samples=new int[n]; _nSamples=n;}
[detail] +    ~KeepSignalPlain() {delete [] _samples;}
[detail] +
[detail] +    qint64 nSamples() const {return _nSamples;}
[detail] +
[detail] +    int at(qint64 index) const {return _samples[index];}
[detail] +    void whileAt(int value, qint64& index, qint64 maxIndex) const;
[detail] +    void setValue(qint64 index, int value) {_samples[index]=value;}
[detail] +    void setValues(qint64 index, qint64 end, int value);
[detail] +
[detail] +    void copySamplesFrom(const KeepSignalPlain * sig);
[detail] +    void copySamplesFrom(const KeepSignalPlain * sig,
[detail] +                         qint64 sigStart, qint64 thisStart, qint64 nToCopy);
[detail] +
[detail] +    bool compare(const KeepSignal * sig) const;
[detail] +  private:
[detail] +    qint64 _nSamples;
[detail] +    int * _samples;
[detail] +  };
[detail] +
[detail] +  void KeepSignalPlain::whileAt(int value, qint64& index, qint64 maxIndex) const
[detail] +  {
[detail] +    while(index<maxIndex && _samples[index]==value) {
[detail] +      index++;
[detail] +    }
[detail] +  }
[detail] +
[detail] +  void KeepSignalPlain::setValues(qint64 index, qint64 end, int value)
[detail] +  {
[detail] +    while(index<end) {
[detail] +      _samples[index]=value;
[detail] +      index++;
[detail] +    }
[detail] +  }
[detail] +
[detail] +  void KeepSignalPlain::copySamplesFrom(const KeepSignalPlain * sig)
[detail] +  {
[detail] +    ASSERT(_nSamples==sig->_nSamples);
[detail] +    memcpy(_samples, sig->_samples, _nSamples*sizeof(int));
[detail] +  }
[detail] +
[detail] +  void KeepSignalPlain::copySamplesFrom(const KeepSignalPlain * sig,
[detail] +                                        qint64 sigStart, qint64 thisStart, qint64 nToCopy)
[detail] +  {
[detail] +    adjustLimits(sig, sigStart, thisStart, nToCopy);
[detail] +    if(nToCopy<=0) {
[detail] +      return;
[detail] +    }
[detail] +    memcpy(_samples+thisStart, sig->_samples+sigStart, nToCopy*sizeof(int));
[detail] +  }
[detail] +
[detail] +  bool KeepSignalPlain::compare(const KeepSignal * sig) const
[detail] +  {
[detail] +    if(_nSamples!=sig->nSamples()) {
[detail] +      printf("Number of samples differ (plain=%lli keep=%lli)\n",
[detail] +             nSamples(), sig->nSamples());
[detail] +      return false;
[detail] +    }
[detail] +    bool ok=true;
[detail] +    for(qint64 i=0; i<_nSamples; i++) {
[detail] +      if(at(i)!=sig->at(i)) {
[detail] +        printf("Sample %lli differs: plain=%i keep=%i\n",
[detail] +               i, at(i), sig->at(i));
[detail] +        ok=false;
[detail] +      }
[detail] +    }
[detail] +    if(!sig->checkSections()) {
[detail] +      ok=false;
[detail] +    }
[detail] +    qint64 iPlain=0, iKeep=0;
[detail] +    int value;
[detail] +    while(iPlain<_nSamples) {
[detail] +      value=at(iPlain);
[detail] +      printf("whileAt(%i, %lli, %lli)\n", value, iPlain, _nSamples);
[detail] +      sig->whileAt(value, iKeep, _nSamples);
[detail] +      whileAt(value, iPlain, _nSamples);
[detail] +      if(iPlain!=iKeep) {
[detail] +        printf("whileAt differs: plain=%lli keep=%lli\n", iPlain, iKeep);
[detail] +        ok=false;
[detail] +      }
[detail] +    }
[detail] +    return ok;
[detail] +  }
[detail] +
[detail] +  void report(KeepSignal& keep, KeepSignalPlain& keepPlain)
[detail] +  {
[detail] +    int n=keep.nSamples();
[detail] +    printf("index keep  plain section\n");
[detail] +    for(qint64 i=0; i<n; i++) {
[detail] +      printf("%5lli %5i %5i %6i\n", i, keep.at(i), keepPlain.at(i), keep.sectionAt(i));
[detail] +    }
[detail] +  }
[detail] +
[detail] +  void KeepSignal::test()
[detail] +  {
[detail] +    Random rseed;
[detail] +    int seed=rseed.uniform(1, INT_MAX);
[detail] +    seed=25415913;
[detail] +    printf("Seed=%i\n", seed);
[detail] +    Random r(seed);
[detail] +    int n=r.uniform(1000, 2000);
[detail] +    KeepSignal keep(n);
[detail] +    keep.setValues(0, n, 1);
[detail] +    KeepSignalPlain keepPlain(n);
[detail] +    keepPlain.setValues(0, n, 1);
[detail] +    for(int i=0; i<2000; i++) {
[detail] +      qint64 index=r.uniform(0, n-1);
[detail] +      qint64 end=r.uniform(index+1, n);
[detail] +      int value=r.uniform(-1, 1);
[detail] +      switch(r.uniform(0, 1)) {
[detail] +      case 0:
[detail] +        printf("setValue(%lli, %i)\n", index, value);
[detail] +        keep.setValue(index, value);
[detail] +        keepPlain.setValue(index, value);
[detail] +        break;
[detail] +      case 1:
[detail] +        printf("setValues(%lli, %lli, %i)\n", index, end, value);
[detail] +        keep.setValues(index, end, value);
[detail] +        keepPlain.setValues(index, end, value);
[detail] +        break;
[detail] +      }
[detail] +      
[detail] +      if(!keepPlain.compare(&keep)) {
[detail] +          report(keep, keepPlain);
[detail] +        exit(2);
[detail] +      }
[detail] +    }
[detail]  }
[detail]  
[detail]  } 
[detail]                src/MasterSignalGroup.cpp:  version-4.5.1	modified out of comments
[detail] --- src/MasterSignalGroup.cpp-version-4.5.1-stripped	2025-09-28 04:01:04.655501316 +0200
[detail] +++ src/MasterSignalGroup.cpp-HEAD-stripped	2025-09-28 04:01:04.659501336 +0200
[detail] @@ -66,16 +66,10 @@
[detail]          i++;
[detail]        }
[detail]      }
[detail] +    _idGenerator.reset();
[detail]      setModified(false);
[detail]    }
[detail]  
[detail] -  
[detail] -  int MasterSignalGroup::countId(int id, int& newId) const
[detail] -  {
[detail] -    TRACE;
[detail] -    return AbstractSignalGroup::countId(id, newId);
[detail] -  }
[detail] -
[detail]    bool MasterSignalGroup::xml_inherits(const QString& tagName) const
[detail]    {
[detail]      if(tagName==xmlMasterSignalGroupTag) {
[detail]                         src/MetaData.cpp:  version-4.5.1	modified out of comments
[detail] --- src/MetaData.cpp-version-4.5.1-stripped	2025-09-28 04:01:04.679501433 +0200
[detail] +++ src/MetaData.cpp-HEAD-stripped	2025-09-28 04:01:04.683501451 +0200
[detail] @@ -47,6 +47,27 @@
[detail]      else return 0;
[detail]    }
[detail]  
[detail] +  bool MetaInteger64::setData(int subId, const QString& index, const QVariant& val)
[detail] +  {
[detail] +    Q_UNUSED(subId)
[detail] +    Q_UNUSED(index)
[detail] +    bool ok;
[detail] +    _value=val.toLongLong(&ok);
[detail] +    return ok;
[detail] +  }
[detail] +
[detail] +  
[detail] +  int MetaInteger64::compare(int subId, const QString& index, const MetaData &o) const
[detail] +  {
[detail] +    Q_UNUSED(subId)
[detail] +    Q_UNUSED(index)
[detail] +    qint64 v1=value();
[detail] +    qint64 v2=reinterpret_cast<const MetaInteger64&>(o).value();
[detail] +    if(v1<v2) return -1;
[detail] +    else if(v1>v2) return 1;
[detail] +    else return 0;
[detail] +  }
[detail] +
[detail]    bool MetaDouble::setData(int subId, const QString& index, const QVariant& val)
[detail]    {
[detail]      Q_UNUSED(subId)
[detail]                  src/MetaDataFactory.cpp:  version-4.5.1	modified out of comments
[detail] --- src/MetaDataFactory.cpp-version-4.5.1-stripped	2025-09-28 04:01:04.703501549 +0200
[detail] +++ src/MetaDataFactory.cpp-HEAD-stripped	2025-09-28 04:01:04.703501549 +0200
[detail] @@ -66,7 +66,7 @@
[detail]      case Name: return "Name";
[detail]      case Type: return "Type";
[detail]      case FileNumber: return "FileNumber";
[detail] -    case NumberInFile: return "NumberInFile";
[detail] +    case IndexInFile: return "IndexInFile";
[detail]      case FileName: return "FileName";
[detail]      case FileFormat: return "FileFormat";
[detail]      case ShortFileName: return "ShortFileName";
[detail] @@ -118,6 +118,10 @@
[detail]          index=it.value();
[detail]          return index;
[detail]        }
[detail] +      
[detail] +      if(name=="NumberInFile") {
[detail] +        return MetaDataIndex(MetaDataFactory::IndexInFile);
[detail] +      }
[detail]      }
[detail]      App::log(tr("Meta data '%1': unrecognized name, missing plugin?\n").arg(name) );
[detail]      return MetaDataIndex();
[detail] @@ -176,7 +180,7 @@
[detail]          case Name: return tr("Name");
[detail]          case Type: return tr("Type");
[detail]          case FileNumber: return tr("File number");
[detail] -        case NumberInFile: return tr("Number in file");
[detail] +        case IndexInFile: return tr("Index in file");
[detail]          case FileName: return tr("File name");
[detail]          case FileFormat: return tr("File format");
[detail]          case ShortFileName: return tr("Short file name");
[detail] @@ -195,7 +199,7 @@
[detail]          case CountPerUnit: return tr("Count/Unit");
[detail]          case UnitPerCount: return tr("Unit/Count");
[detail]          case AmplitudeUnit: return tr("Amplitude unit");
[detail] -        case SampleSize: return tr("Sample size (Mb)");
[detail] +        case SampleSize: return tr("Data size");
[detail]          case HeaderModified: return tr("Header modified?");
[detail]          case Dummy: return "Dummy";
[detail]          case DataCount: break;
[detail] @@ -264,7 +268,7 @@
[detail]        case Name:
[detail]        case Type:
[detail]        case Component:
[detail] -      case NumberInFile:
[detail] +      case IndexInFile:
[detail]        case CountPerVolt:
[detail]        case VoltPerUnit:
[detail]        case AmplitudeUnit:
[detail]                    src/MetaDataField.cpp:  version-4.5.1	not modified
[detail]                src/MetaDataFieldList.cpp:  version-4.5.1	modified out of comments
[detail] --- src/MetaDataFieldList.cpp-version-4.5.1-stripped	2025-09-28 04:01:04.735501704 +0200
[detail] +++ src/MetaDataFieldList.cpp-HEAD-stripped	2025-09-28 04:01:04.739501722 +0200
[detail] @@ -7,6 +7,11 @@
[detail]  
[detail]    
[detail]  
[detail] +  MetaDataFieldList::MetaDataFieldList()
[detail] +  {
[detail] +    _multiLine=false;
[detail] +  }
[detail] +
[detail]    void MetaDataFieldList::setDefaults()
[detail]    {
[detail]      TRACE;
[detail] @@ -60,7 +65,7 @@
[detail]        if(!index.isValid()) {
[detail]          index=MetaDataIndex(MetaDataFactory::Dummy);
[detail]        }
[detail] -      append(MetaDataField(index, *itTitles));
[detail] +      add(MetaDataField(index, *itTitles));
[detail]      }
[detail]    }
[detail]  
[detail] @@ -79,4 +84,22 @@
[detail]      reg.setValue("titles",titles);
[detail]    }
[detail]  
[detail] +  void MetaDataFieldList::add(const MetaDataField& d)
[detail] +  {
[detail] +    
[detail] +    if(!_multiLine && d.id()>MetaDataFactory::DataCount) {
[detail] +      MetaData * td=MetaDataFactory::instance()->create(d.id());
[detail] +      if(td->isMultiLine(d.subId())) {
[detail] +        _multiLine=true;
[detail] +      }
[detail] +    }
[detail] +    append(d);
[detail] +  }
[detail] +
[detail] +  void MetaDataFieldList::clear()
[detail] +  {
[detail] +    QList<MetaDataField>::clear();
[detail] +    _multiLine=false;
[detail] +  }
[detail] +
[detail]  } 
[detail]                    src/MetaDataIndex.cpp:  version-4.5.1	not modified
[detail]                      src/MetaDataMap.cpp:  version-4.5.1	modified out of comments
[detail] --- src/MetaDataMap.cpp-version-4.5.1-stripped	2025-09-28 04:01:04.771501877 +0200
[detail] +++ src/MetaDataMap.cpp-HEAD-stripped	2025-09-28 04:01:04.775501897 +0200
[detail] @@ -17,7 +17,7 @@
[detail]    void MetaDataMap::clear()
[detail]    {
[detail]      TRACE;
[detail] -    int n=count();
[detail] +    int n=size();
[detail]      for(int i=0; i<n; i++) {
[detail]        MetaData::removeReference(at(i));
[detail]      }
[detail] @@ -31,6 +31,23 @@
[detail]      add(o);
[detail]    }
[detail]  
[detail] +  bool MetaDataMap::operator==(const MetaDataMap& o) const
[detail] +  {
[detail] +    TRACE;
[detail] +    int n=size();
[detail] +    if(o.size()!=n) {
[detail] +      return false;
[detail] +    }
[detail] +    for(int i=0; i<n; i++) {
[detail] +      MetaData * d1=at(i);
[detail] +      MetaData * d2=o.at(i);
[detail] +      if(!(*d1==*d2)) {
[detail] +        return false;
[detail] +      }
[detail] +    }
[detail] +    return true;
[detail] +  }
[detail] +
[detail]    
[detail]    void MetaDataMap::add(MetaData * d)
[detail]    {
[detail] @@ -47,11 +64,10 @@
[detail]    void MetaDataMap::add(const MetaDataMap& o)
[detail]    {
[detail]      TRACE;
[detail] -    int n=o.count();
[detail] -    reserve(count()+n);
[detail] +    int n=o.size();
[detail] +    reserve(size()+n);
[detail]      for(int i=0; i<n; i++) {
[detail]        MetaData * d=o.at(i);
[detail] -      if(d->copyAllowed()) {
[detail]          if(d->referenceCount()==1) {
[detail]            MetaData *d1=d->clone(); 
[detail]            *d1=*d;
[detail] @@ -60,7 +76,6 @@
[detail]          add(d);
[detail]        }
[detail]      }
[detail] -  }
[detail]  
[detail]    
[detail]    void MetaDataMap::remove(int id)
[detail]                   src/MiniSeedReader.cpp:  version-4.5.1	not modified
[detail]                  src/MiniSeedRecords.cpp:  version-4.5.1	modified out of comments
[detail] --- src/MiniSeedRecords.cpp-version-4.5.1-stripped	2025-09-28 04:01:04.807502051 +0200
[detail] +++ src/MiniSeedRecords.cpp-HEAD-stripped	2025-09-28 04:01:04.811502070 +0200
[detail] @@ -11,6 +11,11 @@
[detail]  
[detail]    REGISTER_METADATA(MiniSeedRecords)
[detail]  
[detail] +  void MiniSeedRecords::operator=(const MetaData& o)
[detail] +  {
[detail] +    _records=reinterpret_cast<const MiniSeedRecords&>(o)._records;
[detail] +  }
[detail] +
[detail]    void MiniSeedRecords::xml_writeChildren(XML_WRITECHILDREN_ARGS) const
[detail]    {
[detail]      TRACE;
[detail]                 src/MiniSeedSequence.cpp:  version-4.5.1	modified out of comments
[detail] --- src/MiniSeedSequence.cpp-version-4.5.1-stripped	2025-09-28 04:01:04.827502148 +0200
[detail] +++ src/MiniSeedSequence.cpp-HEAD-stripped	2025-09-28 04:01:04.831502166 +0200
[detail] @@ -85,4 +85,14 @@
[detail]             _byteLength==o._byteLength;
[detail]    }
[detail]  
[detail] +  size_t MiniSeedSequence::hash() const
[detail] +  {
[detail] +    return ::qHash(_count)+::qHash(_firstPos)+::qHash(_increment)+::qHash(_byteLength);
[detail] +  }
[detail] +
[detail] +  size_t qHash(const MiniSeedSequence& s)
[detail] +  {
[detail] +    return s.hash();
[detail] +  }
[detail] +
[detail]  } 
[detail]                    src/MiniSeedTrace.cpp:  version-4.5.1	not modified
[detail]                   src/MiniSeedVolume.cpp:  version-4.5.1	not modified
[detail]                 src/MorletParameters.cpp:  version-4.5.1	not modified
[detail]          src/NormalizationParameters.cpp:  version-4.5.1	not modified
[detail]                 src/OriginalFileName.cpp:  version-4.5.1	not modified
[detail]           src/OriginalSamplingPeriod.cpp:  version-4.5.1	no last version available
[detail]                src/PasscalSegYHeader.cpp:  version-4.5.1	modified out of comments
[detail] --- src/PasscalSegYHeader.cpp-version-4.5.1-stripped	2025-09-28 04:01:04.927502630 +0200
[detail] +++ src/PasscalSegYHeader.cpp-HEAD-stripped	2025-09-28 04:01:04.931502650 +0200
[detail] @@ -114,21 +114,21 @@
[detail]      return t;
[detail]    }
[detail]  
[detail] -  Signal::Components PasscalSegYHeader::component() const
[detail] +  SignalMetaData::Components PasscalSegYHeader::component() const
[detail]    {
[detail]      TRACE;
[detail]      switch(field.channelNumber) {
[detail]      case 1:
[detail]      case 4:
[detail] -      return Signal::Vertical;
[detail] +      return SignalMetaData::Vertical;
[detail]      case 2:
[detail]      case 5:
[detail] -      return Signal::North;
[detail] +      return SignalMetaData::North;
[detail]      case 3:
[detail]      case 6:
[detail] -      return Signal::East;
[detail] +      return SignalMetaData::East;
[detail]      default:
[detail] -      return Signal::UndefinedComponent;
[detail] +      return SignalMetaData::UndefinedComponent;
[detail]      }
[detail]    }
[detail]  
[detail]                   src/PickParameters.cpp:  version-4.5.1	not modified
[detail]                 src/RotateParameters.cpp:  version-4.5.1	not modified
[detail]                        src/SACHeader.cpp:  version-4.5.1	not modified
[detail]                       src/SEGDHeader.cpp:  version-4.5.1	not modified
[detail]                       src/SEGYHeader.cpp:  version-4.5.1	not modified
[detail]                  src/SEGYTraceHeader.cpp:  version-4.5.1	modified out of comments
[detail] --- src/SEGYTraceHeader.cpp-version-4.5.1-stripped	2025-09-28 04:01:05.031503134 +0200
[detail] +++ src/SEGYTraceHeader.cpp-HEAD-stripped	2025-09-28 04:01:05.035503153 +0200
[detail] @@ -244,18 +244,18 @@
[detail]          fac=1.0;
[detail]        }
[detail]        fac*=theoreticalMaximum/max;
[detail] -      double exp=floor(log10(fac));
[detail] -      if(exp>4.0) {
[detail] -        exp=4.0;
[detail] +      int exp=Number::floorLog10(fac);
[detail] +      if(exp>4) {
[detail] +        exp=4;
[detail]        }
[detail] -      return static_cast<qint16>(-pow(10.0, exp));
[detail] +      return static_cast<qint16>(-Number::exp10(exp));
[detail]      } else {
[detail]        double fac=max/theoreticalMaximum;
[detail] -      double exp=ceil(log10(fac));
[detail] -      if(exp>4.0) {
[detail] +      int exp=qCeil(log10(fac));
[detail] +      if(exp>4) {
[detail]          return 0;
[detail]        }
[detail] -      return static_cast<qint16>(round(pow(10.0, exp)));
[detail] +      return static_cast<qint16>(qRound(Number::exp10(exp)));
[detail]      }
[detail]    }
[detail]  
[detail]                     src/SeismicEvent.cpp:  version-4.5.1	not modified
[detail]                src/SeismicEventTable.cpp:  version-4.5.1	modified out of comments
[detail] --- src/SeismicEventTable.cpp-version-4.5.1-stripped	2025-09-28 04:01:05.071503327 +0200
[detail] +++ src/SeismicEventTable.cpp-HEAD-stripped	2025-09-28 04:01:05.075503346 +0200
[detail] @@ -27,7 +27,7 @@
[detail]    {
[detail]      int i=firstIndexOf(e.time());
[detail]      if(i>=0) {
[detail] -      int n=count();
[detail] +      int n=size();
[detail]        while(i<n && SortedVector<DateTime, SeismicEvent>::at(i)->time()==e.time()) {
[detail]          if(SortedVector<DateTime, SeismicEvent>::at(i)->isSamePosition(e)) {
[detail]            return true;
[detail] @@ -59,12 +59,12 @@
[detail]      DateTime t=e.time();
[detail]      int i=firstIndexOf(t);
[detail]      if(i>=0) {
[detail] -      while(i<count() && at(i)->time()==t) {
[detail] +      while(i<size() && at(i)->time()==t) {
[detail]          SeismicEvent * r=at(i);
[detail]          if(r->isSamePosition(e)) {
[detail]            if(!r->isLocked()) {
[detail] -            SortedVector<DateTime, SeismicEvent>::remove(i);
[detail]              emit eventRemoved(r);
[detail] +            SortedVector<DateTime, SeismicEvent>::remove(i);
[detail]              delete r;
[detail]              _modified=true;
[detail]            }
[detail] @@ -93,7 +93,7 @@
[detail]    {
[detail]      TRACE;
[detail]      ::QList<const SeismicEvent *> list;
[detail] -    int n=count();
[detail] +    int n=size();
[detail]      int i=firstIndexAfter(r.start()); 
[detail]                                        
[detail]      while(i>0 && SortedVector<DateTime, SeismicEvent>::at(i-1)->time()==r.start()) {
[detail] @@ -126,7 +126,7 @@
[detail]    {
[detail]      TRACE;
[detail]      ::QList<const SeismicEvent *> list;
[detail] -    int n=count();
[detail] +    int n=size();
[detail]      for(int i=0; i<n; i++) {
[detail]        const SeismicEvent * e=SortedVector<DateTime, SeismicEvent>::at(i);
[detail]        double d=e->position().horizontalDistanceTo(receiver);
[detail] @@ -139,22 +139,22 @@
[detail]      return list;
[detail]    }
[detail]  
[detail] -  
[detail] -  ::QList<const SeismicEvent *> SeismicEventTable::events(const Signal * sig,
[detail] +  ::QList<const SeismicEvent *> SeismicEventTable::events(const SignalSegment * sig,
[detail]                                                            double minimumSlowness, double maximumSlowness) const
[detail]    {
[detail]      TRACE;
[detail] +    SparseTimeRange str=sig->timeRange();
[detail]      if(minimumSlowness==0.0) {
[detail] -      return events(sig->timeRange());
[detail] +      return events(str);
[detail]      } else {
[detail]        ::QList<const SeismicEvent *> list;
[detail] -      int n=count();
[detail] +      int n=size();
[detail]        for(int i=0; i<n; i++) {
[detail]          const SeismicEvent * e=SortedVector<DateTime, SeismicEvent>::at(i);
[detail] -        double d=e->position().horizontalDistanceTo(sig->receiver());
[detail] +        double d=e->position().horizontalDistanceTo(sig->metaData()->receiver());
[detail]          TimeRange re(e->time().shifted(d*minimumSlowness),
[detail]                       e->time().shifted(d*maximumSlowness+e->duration()));
[detail] -        if(sig->timeRange().intersects(re)) {
[detail] +        if(str.intersects(re)) {
[detail]            list.append(e);
[detail]          }
[detail]        }
[detail] @@ -167,7 +167,7 @@
[detail]    {
[detail]      TRACE;
[detail]      ::QList<const SeismicEvent *> list;
[detail] -    int n=count();
[detail] +    int n=size();
[detail]      int i=firstIndexOf(t);
[detail]      while(i>0 && SortedVector<DateTime, SeismicEvent>::at(i-1)->time()==t) {
[detail]        i--;
[detail] @@ -184,7 +184,7 @@
[detail]    void SeismicEventTable::clear()
[detail]    {
[detail]      TRACE;
[detail] -    for(int i=count()-1; i>=0; i--) {
[detail] +    for(int i=size()-1; i>=0; i--) {
[detail]        emit eventRemoved(at(i));
[detail]      }
[detail]      SortedVector<DateTime, SeismicEvent>::clear(true);
[detail] @@ -192,7 +192,7 @@
[detail]  
[detail]    void SeismicEventTable::xml_writeChildren(XML_WRITECHILDREN_ARGS) const
[detail]    {
[detail] -    int n=count();
[detail] +    int n=size();
[detail]      for(int i=0; i<n; i++) {
[detail]        SortedVector<DateTime, SeismicEvent>::at(i)->xml_save(s, context);
[detail]      }
[detail]                   src/SharedMetaData.cpp:  version-4.5.1	modified out of comments
[detail] --- src/SharedMetaData.cpp-version-4.5.1-stripped	2025-09-28 04:01:05.091503423 +0200
[detail] +++ src/SharedMetaData.cpp-HEAD-stripped	2025-09-28 04:01:05.095503443 +0200
[detail] @@ -2,7 +2,8 @@
[detail]  
[detail]  #include "SharedMetaData.h"
[detail]  #include "MetaData.h"
[detail] -#include "GeoSignal.h"
[detail] +#include "SignalSegment.h"
[detail] +#include "SignalMetaData.h"
[detail]  #include "MetaDataMap.h"
[detail]  #include "MetaDataFactory.h"
[detail]  
[detail] @@ -21,11 +22,11 @@
[detail]      }
[detail]    }
[detail]  
[detail] -  void SharedMetaData::add(Signal * sig)
[detail] +  void SharedMetaData::add(SignalSegment * sig)
[detail]    {
[detail]      TRACE;
[detail] -    const SortedVector<int, MetaData>& m=sig->metaDataMap().vector();
[detail] -    int n=m.count();
[detail] +    const SortedVector<int, MetaData>& m=sig->metaData()->optionalData().vector();
[detail] +    int n=m.size();
[detail]      for(int i=0; i<n; i++) {
[detail]        MetaData * d=m.at(i);
[detail]        if(d->referenceCount()>1) {
[detail]                      src/SharkHeader.cpp:  version-4.5.1	not modified
[detail]                   src/SignalDatabase.cpp:  version-4.5.1	modified out of comments
[detail] --- src/SignalDatabase.cpp-version-4.5.1-stripped	2025-09-28 04:01:05.123503578 +0200
[detail] +++ src/SignalDatabase.cpp-HEAD-stripped	2025-09-28 04:01:05.127503598 +0200
[detail] @@ -4,22 +4,25 @@
[detail]  
[detail]  #include "SignalDatabase.h"
[detail]  #include "SubSignalPool.h"
[detail] -#include "GeoSignal.h"
[detail] +#include "SignalSegment.h"
[detail]  #include "SignalGroupFolder.h"
[detail]  #include "SignalGroup.h"
[detail] +#include "SignalFileSet.h"
[detail]  #include "GeopsyCoreEngine.h"
[detail]  #include "SharedMetaData.h"
[detail] +#include "SignalMetaDataMap.h"
[detail]  #include "GeopsyPreferences.h"
[detail]  #include "Comments.h"
[detail]  #include "KeepSignal.h"
[detail]  #include "GeopsyCoreEngine.h"
[detail] +#include "StoredSignal.h"
[detail]  
[detail]  namespace GeopsyCore {
[detail]  
[detail]    const QString SignalDatabase::xmlSignalDatabaseTag="SignalDatabase";
[detail]  
[detail]    SignalDatabase::SignalDatabase()
[detail] -      : XMLContext(false), _files(this)
[detail] +      : _files(this), _loadTerminated(false)
[detail]    {
[detail]      TRACE;
[detail]      _version=SIGNAL_DATABASE_CURRENT_VERSION;
[detail] @@ -29,6 +32,8 @@
[detail]      _masterGroup->setModified(false);
[detail]      _seismicEvents=new SeismicEventTable;
[detail]      _allSharedMetaData=nullptr;
[detail] +    _signalMetaDataList=nullptr;
[detail] +    _hasDetachedMetaData=0;
[detail]    }
[detail]  
[detail]    SignalDatabase::~SignalDatabase()
[detail] @@ -52,6 +57,9 @@
[detail]      _permanentSharedMetaData.clear();
[detail]      _masterGroup->clear();
[detail]      _seismicEvents->clear();
[detail] +    _signalIdGenerator.reset();
[detail] +    _metaDataIdGenerator.reset();
[detail] +    _hasDetachedMetaData=false;
[detail]    }
[detail]  
[detail]    
[detail] @@ -65,7 +73,7 @@
[detail]      
[detail]      
[detail]      for(int i=0; i<_files.count(); i++) {
[detail] -      SignalFile * fsig=_files.at(i);
[detail] +      AbstractSignalFile * fsig=_files.at(i);
[detail]        if(fsig->format().id()==SignalFileFormat::Temporary ||
[detail]           fsig->isPathModified()) {
[detail]          return true;
[detail] @@ -84,11 +92,11 @@
[detail]    }
[detail]  
[detail]    
[detail] -  Signal * SignalDatabase::signal(int id) const
[detail] +  SignalSegment * SignalDatabase::signal(const UniqueID& id) const
[detail]    {
[detail]      TRACE;
[detail]      for(SubSignalPool::const_iterator it=begin(); it!=end(); ++it) {
[detail] -      Signal * sig=*it;
[detail] +      SignalSegment * sig=*it;
[detail]        if(sig->id()==id) {
[detail]          return sig;
[detail]        }
[detail] @@ -343,11 +351,11 @@
[detail]            fileSubPoolIndex=0;
[detail]          }
[detail]  
[detail] -        Signal * sig;
[detail] +        SignalSegment * sig;
[detail]          int offset=ftell(f);
[detail]          do {
[detail]            if(_version>=3) { 
[detail] -            sig=new Signal(this);
[detail] +            sig=new SignalSegment(this);
[detail]              sig->setFile(newFile);
[detail]            } else { 
[detail]              sig=fileSubPool->at(fileSubPoolIndex);
[detail] @@ -371,8 +379,9 @@
[detail]              delete sig;
[detail]              break;
[detail]            }
[detail] -          if(pathModified)
[detail] -            sig->setHeaderModified(true);
[detail] +          if(pathModified) {
[detail] +            sig->metaData()->setModified(true);
[detail] +          }
[detail]            offset=ftell(f);
[detail]            File::readLine(buf, bufLen, f, true);
[detail]          } while(strncmp( buf, "ID=", 3)==0 && !feof(f) );
[detail] @@ -380,6 +389,7 @@
[detail]          if(strncmp( buf, "FILE=", 5)==0 || feof(f) ) {
[detail]            App::log(tr("file %1 loaded\n").arg(fi.fileName()));
[detail]          }
[detail] +        addFile(newFile);
[detail]        } else {
[detail]          
[detail]          App::log(Message::severityString(Message::Warning)
[detail] @@ -395,46 +405,29 @@
[detail]    }
[detail]  
[detail]    
[detail] -  int SignalDatabase::countId(int id, int& newId) const
[detail] -  {
[detail] -    TRACE;
[detail] -    int n=0;
[detail] -    for(const_iterator it=begin(); it!=end(); ++it) {
[detail] -      int idSig=(*it)->id();
[detail] -      if(idSig==id) {
[detail] -        n++;
[detail] -      }
[detail] -      if(idSig>newId) {
[detail] -        newId=idSig;
[detail] -      }
[detail] -    }
[detail] -    return n;
[detail] -  }
[detail] -
[detail] -  
[detail] -  void SignalDatabase::removeFile(SignalFile * f)
[detail] +  void SignalDatabase::removeFile(AbstractSignalFile * file)
[detail]    {
[detail]      TRACE;
[detail] +    ASSERT(file->database()==this);
[detail]      SubSignalPool subpool;
[detail] -    subpool.addFile(f);
[detail] +    subpool.addFile(file);
[detail]      for(SubSignalPool::iterator it=subpool.begin(); it!=subpool.end(); ++it) {
[detail] -      Signal * sig=*it;
[detail] +      SignalSegment * sig=*it;
[detail]        remove(sig);
[detail]        _masterGroup->removeSignal(sig);
[detail]      }
[detail] -    f->removeFile();
[detail] -    _files.remove(f);
[detail] +    file->hardRemove();
[detail] +    _files.remove(file);
[detail]    }
[detail]  
[detail]    
[detail]  
[detail] -  
[detail] -  void SignalDatabase::signalDeleted(Signal * sig)
[detail] +  void SignalDatabase::signalDeleted(SignalSegment * sig)
[detail]    {
[detail]      TRACE;
[detail] -    int i=QList<Signal *>::indexOf(sig);
[detail] +    int i=QList<SignalSegment *>::indexOf(sig);
[detail]      if(i>=0) {
[detail] -      QList<Signal *>::removeAt(i);
[detail] +      QList<SignalSegment *>::removeAt(i);
[detail]      }
[detail]    }
[detail]  
[detail] @@ -491,10 +484,10 @@
[detail]      }
[detail]      
[detail]      XMLHeader hdr(this);
[detail] -    createAllSharedMetaData();
[detail] -    collectAllSharedMetaData();
[detail] +    createAllMetaData();
[detail] +    collectAllMetaData();
[detail]      XMLClass::Error err=hdr.xml_saveFile(_name);
[detail] -    releaseAllSharedMetaData();
[detail] +    releaseAllMetaData();
[detail]      if(err!=XMLClass::NoError) {
[detail]        return false;
[detail]      }
[detail] @@ -538,12 +531,13 @@
[detail]        _name=fileName;
[detail]      }
[detail]  
[detail] +    GeopsyCoreEngine::instance()->setProgressCaption(this, tr("Open database"));
[detail]      XMLHeader hdr(this);
[detail]      hdr.addAlternateTag("SignalDB"); 
[detail] -    createAllSharedMetaData();
[detail] +    createAllMetaData();
[detail]      
[detail]      XMLClass::Error err=hdr.xml_restoreFile(fileName, this);
[detail] -    releaseAllSharedMetaData();
[detail] +    releaseAllMetaData();
[detail]      bool ret;
[detail]      switch (err) {
[detail]      case ErrorNoDocType:
[detail] @@ -571,8 +565,9 @@
[detail]      _files.add(o->_files);
[detail]      
[detail]      for(const_iterator it=o->begin(); it!=o->end(); it++) {
[detail] -      Signal * sig=*it;
[detail] +      SignalSegment * sig=*it;
[detail]        sig->setDatabase(this);
[detail] +      sig->setId(_signalIdGenerator.generate());
[detail]        addSignal(sig); 
[detail]      }
[detail]      
[detail] @@ -612,9 +607,9 @@
[detail]      QString tempFileList;
[detail]      int nf=0;
[detail]      for(int i=0; i<_files.count(); ++i) {
[detail] -      SignalFile * fsig=_files.at(i);
[detail] +      AbstractSignalFile * fsig=_files.at(i);
[detail]        if(fsig->format().id()==SignalFileFormat::Temporary) {
[detail] -        tempFileList+="\n"+fsig->shortName();
[detail] +        tempFileList+="\n"+fsig->displayName(IndexOfFile::null);
[detail]          nf++;
[detail]        }
[detail]      }
[detail] @@ -639,11 +634,20 @@
[detail]      QDir d=newFilePath();
[detail]      bool ret=true;
[detail]      for(int i=0; i<_files.count(); ++i) {
[detail] -      SignalFile * fsig=_files.at(i);
[detail] +      AbstractSignalFile * fsig=_files.at(i);
[detail]        if(fsig->format().id()==SignalFileFormat::Temporary) {
[detail] -        if(fsig->save(d) ) {
[detail] -          App::log(tr("Temporary file %1 saved in %2\n").arg(fsig->shortName()).arg(d.canonicalPath()) );
[detail] +        
[detail] +        if(fsig->xml_inherits(SignalFile::xmlSignalFileTag)) {
[detail] +          if(static_cast<SignalFile *>(fsig)->save(d)) {
[detail] +            App::log(tr("Temporary file %1 saved in %2\n")
[detail] +                         .arg(fsig->displayName(IndexOfFile::null))
[detail] +                         .arg(d.canonicalPath()) );
[detail] +          } else {
[detail] +            ret=false;
[detail] +          }
[detail]          } else {
[detail] +          qWarning("Found a temprory file that is not a SignalFile class: %s\n",
[detail] +                   fsig->xml_tagName().toLatin1().data());
[detail]            ret=false;
[detail]          }
[detail]        }
[detail] @@ -660,7 +664,7 @@
[detail]      QMap<const AbstractSignalGroup *, SubSignalPool>::iterator itSubPools;
[detail]      QString sigReport(tr("\nSignal ID %1, named '%2'%3"));
[detail]      for(const_iterator it=begin(); it!=end(); ++it) {
[detail] -      Signal * sig=*it;
[detail] +      SignalSegment * sig=*it;
[detail]        if(!sig->file()) {
[detail]          QList<const AbstractSignalGroup *> groupList=masterGroup()->find(sig);
[detail]          if(!groupList.isEmpty()) {
[detail] @@ -672,7 +676,9 @@
[detail]                groupNames+="\n      "+(*it)->name();
[detail]              }
[detail]            }
[detail] -          tempSignalList+=sigReport.arg(sig->id()).arg(sig->name()).arg(groupNames);
[detail] +          tempSignalList+=sigReport.arg(sig->id().toString())
[detail] +                                   .arg(sig->metaData()->name())
[detail] +                                   .arg(groupNames);
[detail]            itSubPools=subPools.find(groupList.first());
[detail]            if(itSubPools==subPools.end()) {
[detail]              SubSignalPool subPool;
[detail] @@ -709,7 +715,7 @@
[detail]                                  "Do you want to save them?\n\n"
[detail]                                  "List of temporary signal(s):\n"
[detail]                                  "%2\n\n"
[detail] -                                "If a signal belongs to several groups, it saved in the first one marked with (*).")
[detail] +                                "If a signal belongs to several groups, it is saved in the first one marked with (*).")
[detail]                               .arg(stateMsg).arg(tempSignalList),
[detail]                               Message::yes(), Message::no(), Message::cancel())) {
[detail]      case Message::Answer0: break;
[detail] @@ -732,23 +738,24 @@
[detail]        if(!newFile->loadGeopsySignal(subPool)) {
[detail]          Message::warning(MSG_ID, tr("Saving signals ..."),
[detail]                           tr("Cannot reload file: %1"). arg(fileName), Message::cancel(), true);
[detail] +        delete newFile;
[detail]          return false;
[detail]        }
[detail]        App::log(tr("%1 temporary signals saved in %2\n").arg(subPool.count()).arg(fileName));
[detail] +      addFile(newFile);
[detail]      }
[detail]      return true;
[detail]    }
[detail]  
[detail]    
[detail] -  void SignalDatabase::addSignal(Signal * sig)
[detail] +  void SignalDatabase::addSignal(SignalSegment * sig)
[detail]    {
[detail]      TRACE;
[detail]      ASSERT(sig->database()==this);
[detail] -    sig->setId(-1);
[detail]      SubSignalPool::addSignal(sig);
[detail]    }
[detail]  
[detail] -  void SignalDatabase::addFile(SignalFile * file)
[detail] +  void SignalDatabase::addFile(AbstractSignalFile * file)
[detail]    {
[detail]      TRACE;
[detail]      ASSERT(file->database()==this);
[detail] @@ -758,7 +765,7 @@
[detail]      eng->endAddFile(this);
[detail]    }
[detail]  
[detail] -  void SignalDatabase::collectAllSharedMetaData()
[detail] +  void SignalDatabase::collectAllMetaData()
[detail]    {
[detail]      TRACE;
[detail]      ASSERT(_allSharedMetaData);
[detail] @@ -770,22 +777,26 @@
[detail]      _allSharedMetaData->setIds();
[detail]    }
[detail]  
[detail] -  void SignalDatabase::createAllSharedMetaData()
[detail] +  void SignalDatabase::createAllMetaData()
[detail]    {
[detail]      TRACE;
[detail]      ASSERT(!_allSharedMetaData);
[detail]      _allSharedMetaData=new SharedMetaData;
[detail] +    ASSERT(!_signalMetaDataList);
[detail] +    _signalMetaDataList=new QList<SignalMetaData *>;
[detail]    }
[detail]  
[detail] -  void SignalDatabase::releaseAllSharedMetaData()
[detail] +  void SignalDatabase::releaseAllMetaData()
[detail]    {
[detail]      TRACE;
[detail]      ASSERT(_allSharedMetaData);
[detail]      delete _allSharedMetaData;
[detail]      _allSharedMetaData=nullptr;
[detail] +    delete _signalMetaDataList;
[detail] +    _signalMetaDataList=nullptr;
[detail]    }
[detail]  
[detail] -  MetaData * SignalDatabase::resolveMetaData(int index)
[detail] +  MetaData * SignalDatabase::resolveSharedMetaData(int index)
[detail]    {
[detail]      TRACE;
[detail]      ASSERT(_allSharedMetaData);
[detail] @@ -804,7 +815,7 @@
[detail]      writeProperty(s, "fileCount", _files.count());
[detail]      
[detail]      ASSERT(_allSharedMetaData);
[detail] -    int n=_permanentSharedMetaData.count();
[detail] +    int n=_permanentSharedMetaData.size();
[detail]      const SortedVector<int, MetaData>& v=_permanentSharedMetaData.vector();
[detail]      for(int i=0; i<n; i++) {
[detail]        const MetaData * d=v.at(i);
[detail] @@ -821,10 +832,29 @@
[detail]      ASSERT(_allSharedMetaData);
[detail]      _allSharedMetaData->xml_save(s, context);
[detail]      
[detail] -    for(QList<SignalFile *>::const_iterator it=_files.begin(); it!=_files.end(); ++it) {
[detail] +    if(_hasDetachedMetaData) {
[detail] +      SignalMetaDataMap map;
[detail] +      map.addOrShare(*this);
[detail] +      _hasDetachedMetaData=false;
[detail] +    }
[detail] +    
[detail] +    QMap<UniqueID, SignalMetaData *> signalMetaData;
[detail] +    for(const_iterator it=begin(); it!=end(); ++it) {
[detail] +      SignalMetaData * m=(*it)->metaData();
[detail] +      signalMetaData.insert(m->id(), m);
[detail] +    }
[detail] +    for(QMap<UniqueID, SignalMetaData *>::const_iterator it=signalMetaData.begin(); it!=signalMetaData.end(); ++it) {
[detail]        (*it)->xml_save(s, context);
[detail]      }
[detail]      
[detail] +    XMLSaveAttributes att;
[detail] +    for(QList<AbstractSignalFile *>::const_iterator it=_files.begin(); it!=_files.end(); ++it) {
[detail] +      AbstractSignalFile * f=*it;
[detail] +      att.clear();
[detail] +      f->xml_attributes(att, context);
[detail] +      f->xml_save(s, context, att);
[detail] +    }
[detail] +    
[detail]      _masterGroup->xml_save(s, context);
[detail]      _masterGroup->setModified(false);
[detail]      
[detail] @@ -838,15 +868,26 @@
[detail]      Q_UNUSED(context)
[detail]      switch (tag[0].unicode()) {
[detail]      case 'F':
[detail] -      if(tag=="File") {
[detail] +      if(tag==SignalFile::xmlSignalFileTag) {
[detail]          GeopsyCoreEngine * eng=GeopsyCoreEngine::instance();
[detail]          eng->setProgressValue(this, _files.count());
[detail] -        SignalFile * f=new SignalFile(this);
[detail] -        return XMLMember(f);
[detail] +        SignalFile * file=new SignalFile(this);
[detail] +        addFile(file);
[detail] +        return XMLMember(file);
[detail] +      } else if(tag==SignalFileSet::xmlSignalFileSetTag) {
[detail] +        GeopsyCoreEngine * eng=GeopsyCoreEngine::instance();
[detail] +        eng->setProgressValue(this, _files.count());
[detail] +        SignalFileSet * file=new SignalFileSet(this);
[detail] +        addFile(file);
[detail] +        return XMLMember(file);
[detail]        }
[detail]        break;
[detail]      case 'M':
[detail] -      if(tag=="MasterGroup") {
[detail] +      if(tag==SignalMetaData::xmlSignalMetaDataTag) {
[detail] +        SignalMetaData * m=new SignalMetaData(this);
[detail] +        _signalMetaDataList->append(m);
[detail] +        return XMLMember(m);
[detail] +      } else if(tag=="MasterGroup") {
[detail]          return XMLMember(_masterGroup);
[detail]        }
[detail]        break;
[detail] @@ -879,7 +920,7 @@
[detail]          XMLRestoreAttributeIterator it=attributes.find(indexAtt);
[detail]          if(it!=attributes.end()) { 
[detail]          bool ok=true;
[detail] -          MetaData * d=resolveMetaData(it.value().toInt(ok));
[detail] +          MetaData * d=resolveSharedMetaData(it.value().toInt(ok));
[detail]            if(ok && d) {
[detail]              if(tag==d->xml_tagName()) {
[detail]                _permanentSharedMetaData.add(d);
[detail] @@ -910,10 +951,8 @@
[detail]          return false;
[detail]        }
[detail]        return ok;
[detail] -    case 1: {
[detail] -        GeopsyCoreEngine * eng=GeopsyCoreEngine::instance();
[detail] -        eng->setProgressMaximum(this, content.toInt(ok)-1);
[detail] -      }
[detail] +    case 1:
[detail] +      GeopsyCoreEngine::instance()->setProgressMaximum(this, content.toInt(ok)-1);
[detail]        return ok;
[detail]      default:
[detail]        return false;
[detail] @@ -925,14 +964,33 @@
[detail]      TRACE;
[detail]      Q_UNUSED(context)
[detail]      
[detail] +    if(_version>=9) {
[detail] +      QHash<UniqueID, SignalMetaData *> signalMetaDataIdLookup;
[detail] +      for(QList<SignalMetaData *>::const_iterator it=_signalMetaDataList->begin(); it!=_signalMetaDataList->end(); ++it) {
[detail] +        SignalMetaData * m=*it;
[detail] +        signalMetaDataIdLookup.insert(m->id(), m);
[detail] +      }
[detail] +      for(SubSignalPool::const_iterator it=begin(); it!=end(); ++it) {
[detail] +        SignalSegment * sig=*it;
[detail] +         QHash<UniqueID, SignalMetaData *>::iterator itHash=signalMetaDataIdLookup.find(sig->metaDataId());
[detail] +        if(itHash==signalMetaDataIdLookup.end()) {
[detail] +          App::log(tr("unknown meta data id '%1'\n").arg(sig->metaDataId().toString()));
[detail] +          return false;
[detail] +        } else {
[detail] +          sig->initMetaData(itHash.value());
[detail] +        }
[detail] +      }
[detail] +    }
[detail] +    
[detail]      
[detail] -    QHash<int, Signal *> lookup;
[detail] +    QHash<UniqueID, SignalSegment *> signalIdLookup;
[detail]      for(SubSignalPool::const_iterator it=begin(); it!=end(); ++it) {
[detail] -      Signal * sig=*it;
[detail] -      lookup.insert(sig->id(), sig);
[detail] +      SignalSegment * sig=*it;
[detail] +      signalIdLookup.insert(sig->id(), sig);
[detail]      }
[detail] -    _masterGroup->convertIds(lookup);
[detail] +    _masterGroup->convertIds(signalIdLookup);
[detail]      _masterGroup->setModified(false);
[detail] +    GeopsyCoreEngine::instance()->progressEnd(this, _files.count()-1);
[detail]      return true;
[detail]    }
[detail]  
[detail] @@ -941,34 +999,31 @@
[detail]    void SignalDatabase::showSignal(const DoubleSignal * sig, const QString& name, const QString& comments)
[detail]    {
[detail]      TRACE;
[detail] -    Signal * gsig=new Signal(this);
[detail] -    gsig->setNSamples(sig->nSamples());
[detail] +    SignalSegment * gsig=new SignalSegment(this);
[detail] +    gsig->setSize(sig->nSamples());
[detail]      gsig->setType(sig->type());
[detail]      gsig->setSamplingPeriod(sig->samplingPeriod());
[detail] -    gsig->DoubleSignal::copySamplesFrom(sig);
[detail] -    gsig->setName(name);
[detail] -    gsig->setMetaData(Comments(comments));
[detail] +    gsig->values()->copySamplesFrom(sig);
[detail] +    gsig->metaData()->setName(name);
[detail] +    gsig->metaData()->optionalData().set<Comments>(comments);
[detail]    }
[detail]  
[detail]    
[detail]    void SignalDatabase::showSignal(const KeepSignal * sig, const QString& name, const QString& comments)
[detail]    {
[detail]      TRACE;
[detail] -    Signal * gsig=new Signal(this);
[detail] -    gsig->setNSamples(sig->nSamples());
[detail] +    SignalSegment * gsig=new SignalSegment(this);
[detail] +    gsig->setSize(sig->nSamples());
[detail]      gsig->setSamplingPeriod(sig->samplingPeriod());
[detail] -    gsig->setType(Signal::Waveform);
[detail]      gsig->setStartTime(sig->startTime());
[detail] -    LOCK_SAMPLES(double, gsigSamples, gsig)
[detail] -      CONST_LOCK_SAMPLES(int, sigSamples, sig)
[detail] +    LOCK_SAMPLES(double, gsigSamples, gsig->values())
[detail]          int n=sig->nSamples();
[detail]          for(int i=0; i<n; i++) {
[detail] -          gsigSamples[i]=sigSamples[i];
[detail] +        gsigSamples[i]=sig->at(i);
[detail]          }
[detail] -      UNLOCK_SAMPLES(sig)
[detail] -    UNLOCK_SAMPLES(gsig)
[detail] -    gsig->setName(name);
[detail] -    gsig->setMetaData(Comments(comments));
[detail] +    UNLOCK_SAMPLES(gsig->values())
[detail] +    gsig->metaData()->setName(name);
[detail] +    gsig->metaData()->optionalData().set<Comments>(comments);
[detail]    }
[detail]  
[detail]  
[detail] @@ -976,6 +1031,9 @@
[detail]    SubSignalPool SignalDatabase::load(QStringList fileNames, SignalFileFormat format, bool viewFiles)
[detail]    {
[detail]      TRACE;
[detail] +    _loadTerminated.setValue(false);
[detail] +    APP_LOG(1, tr("Build metadata hash table...\n"));
[detail] +    SignalMetaDataMap * metaMap=createMetaDataMap();
[detail]      GeopsyPreferences * prefs=GeopsyCoreEngine::instance()->preferences();
[detail]      if(fileNames.isEmpty()) {
[detail]        QSettings& reg=CoreApplication::instance()->settings();
[detail] @@ -988,39 +1046,60 @@
[detail]  
[detail]      SubSignalPool subPool;
[detail]      if(!fileNames.isEmpty()) {
[detail] -      fileNames=File::expand(fileNames);
[detail] +      APP_LOG(1, tr("Expanding %1 file(s) to import...\n").arg(fileNames.size()));
[detail] +      fileNames=File::expand(fileNames, &_loadTerminated);
[detail] +      APP_LOG(1, tr("%1 file(s) to import.\n").arg(fileNames.size()));
[detail]        if(format.id()==SignalFileFormat::Unknown && !prefs->askForFormat()) {
[detail]          format=prefs->fileFormat();
[detail]        }
[detail]        std::sort(fileNames.begin(), fileNames.end(), lessThanLocalAwareCompareString);
[detail] -      bool retLoad=false;
[detail]        if(viewFiles) {
[detail]          viewFiles=!prefs->viewIfFewFiles() ||
[detail]                    (prefs->viewIfFewFiles() &&
[detail]                    fileNames.count()<prefs->maxNofFiles());
[detail]        }
[detail] +      GeopsyCoreEngine::instance()->setProgressCaption(this, tr("Import file(s)"));
[detail]        GeopsyCoreEngine::instance()->setProgressMaximum(this, fileNames.count()-1);
[detail]        int iProgress=0;
[detail] +      QElapsedTimer chrono;
[detail] +      chrono.start();
[detail] +      double remaingTime=0.0;
[detail]        for(QStringList::Iterator it=fileNames.begin();it!=fileNames.end();++it) {
[detail] +        if(_loadTerminated.value()) {
[detail] +          App::log(tr("File import interrupted.\n"));
[detail] +          break;
[detail] +        }
[detail]          GeopsyCoreEngine::instance()->setProgressValue(this, iProgress++);
[detail]          if(prefs->askForFormat()) {
[detail]            format=GeopsyCoreEngine::instance()->askLoadFormat(*it);
[detail]          }
[detail] -        App::log(tr("Loading %1...\n").arg(*it) );
[detail] -        retLoad=_files.load(*it, format);
[detail] -        if(retLoad) {
[detail] -          subPool.addFile(_files.last());
[detail] +        SubSignalPool filePool;
[detail] +        if(_files.load(*it, format, &filePool)) {
[detail] +          subPool.addSubPool(filePool);
[detail] +          APP_LOG(1, tr("%1/%2 (%4 ->|) '%3' imported successfully.\n")
[detail] +                         .arg(iProgress)
[detail] +                         .arg(fileNames.size())
[detail] +                         .arg(*it)
[detail] +                         .arg(Number::secondsToDuration(remaingTime, 0)));
[detail] +          metaMap->addOrShare(filePool);
[detail]            if(viewFiles && prefs->oneWindowPerFile()) {
[detail] -            SubSignalPool subPool;
[detail] -            subPool.addFile(_files.last());
[detail] -            GeopsyCoreEngine::instance()->newSignalViewer(subPool, false);
[detail] +            GeopsyCoreEngine::instance()->newSignalViewer(filePool, false);
[detail]            }
[detail] +        } else {
[detail] +          APP_LOG(1, tr("%1/%2 (%4 ->|) skipping '%3'.\n")
[detail] +                         .arg(iProgress)
[detail] +                         .arg(fileNames.size())
[detail] +                         .arg(*it)
[detail] +                         .arg(Number::secondsToDuration(remaingTime, 0)));
[detail]          }
[detail] +        remaingTime=(fileNames.size()-iProgress)*(1e-9*chrono.nsecsElapsed())/iProgress;
[detail]        }
[detail] +      GeopsyCoreEngine::instance()->progressEnd(this, fileNames.count()-1);
[detail]        if(viewFiles && !prefs->oneWindowPerFile() && !subPool.isEmpty()) {
[detail]          GeopsyCoreEngine::instance()->newSignalViewer(subPool, false);
[detail]        }
[detail]      }
[detail] +    delete metaMap;
[detail]      return subPool;
[detail]    }
[detail]  
[detail] @@ -1070,34 +1149,43 @@
[detail]    {
[detail]      TRACE;
[detail]      
[detail] -    QList<Signal *> signalToDelete;
[detail] +    QList<SignalSegment *> signalToDelete;
[detail]      for(iterator it=begin(); it!=end(); it++) {
[detail] -      Signal * sig=*it;
[detail] +      SignalSegment * sig=*it;
[detail]        if(sig->file()->format()==SignalFileFormat(SignalFileFormat::GeopsySignal)) {
[detail] -        sig->lockSamples();
[detail] +        sig->values()->lockSamples();
[detail]          sig->setFile(nullptr);
[detail]          if(masterGroup()->find(sig).isEmpty()) {
[detail]            signalToDelete.append(sig);
[detail]          }
[detail] -        sig->unlockSamples();
[detail] +        sig->values()->unlockSamples();
[detail]        }
[detail]      }
[detail] -    for(QList<Signal *>::iterator it=signalToDelete.begin(); it!=signalToDelete.end(); it++) {
[detail] +    for(QList<SignalSegment *>::iterator it=signalToDelete.begin(); it!=signalToDelete.end(); it++) {
[detail]        removeSignal(*it);
[detail]      }
[detail]      
[detail] -    QList<SignalFile *> fileToDelete;
[detail] +    QList<AbstractSignalFile *> fileToDelete;
[detail]      for(SignalFilePool::iterator it=_files.begin(); it!=_files.end(); it++) {
[detail] -      SignalFile * f=*it;
[detail] +      AbstractSignalFile * f=*it;
[detail]        SubSignalPool s;
[detail]        s.addFile(f);
[detail]        if(s.isEmpty()) {
[detail]          fileToDelete.append(f);
[detail]        }
[detail]      }
[detail] -    for(QList<SignalFile *>::iterator it=fileToDelete.begin(); it!=fileToDelete.end(); it++) {
[detail] +    for(QList<AbstractSignalFile *>::iterator it=fileToDelete.begin(); it!=fileToDelete.end(); it++) {
[detail]        removeFile(*it);
[detail]      }
[detail]    }
[detail]  
[detail] +  SignalMetaDataMap * SignalDatabase::createMetaDataMap() const
[detail] +  {
[detail] +    SignalMetaDataMap * map=new SignalMetaDataMap;
[detail] +    for(const_iterator it=begin(); it!=end(); it++) {
[detail] +      map->add(*it);
[detail] +    }
[detail] +    return map;
[detail] +  }
[detail] +
[detail]  } 
[detail]                 src/SignalExpression.cpp:  version-4.5.1	modified out of comments
[detail] --- src/SignalExpression.cpp-version-4.5.1-stripped	2025-09-28 04:01:05.143503675 +0200
[detail] +++ src/SignalExpression.cpp-HEAD-stripped	2025-09-28 04:01:05.151503713 +0200
[detail] @@ -2,6 +2,7 @@
[detail]  
[detail]  #include "SignalExpression.h"
[detail]  #include "SignalExpressionContext.h"
[detail] +#include "SignalSegment.h"
[detail]  
[detail]  namespace GeopsyCore {
[detail]  
[detail]          src/SignalExpressionContext.cpp:  version-4.5.1	not modified
[detail]                       src/SignalFile.cpp:  version-4.5.1	modified out of comments
[detail] --- src/SignalFile.cpp-version-4.5.1-stripped	2025-09-28 04:01:05.183503868 +0200
[detail] +++ src/SignalFile.cpp-HEAD-stripped	2025-09-28 04:01:05.187503887 +0200
[detail] @@ -33,38 +33,36 @@
[detail]  #include "TimePick.h"
[detail]  #include "StackCount.h"
[detail]  #include "OriginalFileName.h"
[detail] +#include "OriginalSamplingPeriod.h"
[detail]  #include "Comments.h"
[detail]  #include "SharkHeader.h"
[detail] +#include "HDF5File.h"
[detail]  
[detail]  namespace GeopsyCore {
[detail]  
[detail]  const QString SignalFile::xmlSignalFileTag="File";
[detail]  
[detail]  SignalFile::SignalFile(SignalDatabase * db, QString fileName, const SignalFileFormat& format)
[detail] +    : AbstractSignalFile(db, format)
[detail]  {
[detail]    TRACE;
[detail]    _name=fileName;
[detail] -  _format=format;
[detail]    _crc32=0;
[detail]    _size=0;
[detail]    _isOriginalFile=true;
[detail]    _pathModified=false;
[detail] -  _db=db;
[detail] -  db->addFile(this);
[detail]  }
[detail]  
[detail]  
[detail] -SignalFile::SignalFile(SignalDatabase * db, SignalFile& f, QDir& d)
[detail] +  SignalFile::SignalFile(SignalDatabase * db, const SignalFile& f, const QDir& d)
[detail] +      : AbstractSignalFile(db, SignalFileFormat::GeopsySignal)
[detail]  {
[detail]    TRACE;
[detail] -  _name=File::uniqueName (f.shortName(), d);
[detail] -  _format=SignalFileFormat::GeopsySignal;
[detail] -  _isOriginalFile=false;
[detail] -  _pathModified=false;
[detail] +    _name=File::uniqueName(f.shortName(IndexOfFile::first), d);
[detail]    _crc32=0;
[detail]    _size=0;
[detail] -  _db=db;
[detail] -  db->addFile(this);
[detail] +    _isOriginalFile=false;
[detail] +    _pathModified=false;
[detail]  }
[detail]  
[detail]  SignalFile::~SignalFile()
[detail] @@ -81,38 +79,6 @@
[detail]    return *this;
[detail]  }
[detail]  
[detail] -QString SignalFile::name(int len) const
[detail] -{
[detail] -  TRACE;
[detail] -  QDir d;
[detail] -  QChar sep=d.separator();
[detail] -  QString str;
[detail] -  int compLen=_name.length();
[detail] -  int toDel=compLen - len;
[detail] -  if(toDel <= 0) {
[detail] -    str=_name;
[detail] -    return str;
[detail] -  }
[detail] -  toDel += 3;
[detail] -  int posEnd=compLen - 1;
[detail] -  while(posEnd && _name[ posEnd ]!=sep)
[detail] -    posEnd--;
[detail] -  if(compLen - posEnd + 3 >= len) {
[detail] -    str="..." + _name.right(len - 3);
[detail] -    return str;
[detail] -  }
[detail] -  int half=(len - (compLen - posEnd) - 3)/2;
[detail] -  str=_name.left(half) + "..." + _name.right(compLen - posEnd + half);
[detail] -  return str;
[detail] -}
[detail] -
[detail] -QString SignalFile::shortName() const
[detail] -{
[detail] -  TRACE;
[detail] -  QFileInfo fi(_name);
[detail] -  return fi.fileName();
[detail] -}
[detail] -
[detail]  bool SignalFile::load()
[detail]  {
[detail]    TRACE;
[detail] @@ -215,6 +181,9 @@
[detail]    case SignalFileFormat::FebusHDF5:
[detail]      ret=loadFebusHDF5();
[detail]      break;
[detail] +    case SignalFileFormat::GenericHDF5:
[detail] +      ret=loadGenericHDF5();
[detail] +      break;
[detail]    case SignalFileFormat::Tomo:
[detail]    case SignalFileFormat::Unknown:
[detail]    case SignalFileFormat::Temporary:
[detail] @@ -229,33 +198,6 @@
[detail]  }
[detail]  
[detail]  
[detail] -bool SignalFile::save(const QDir& d)
[detail] -{
[detail] -  TRACE;
[detail] -  _name=File::uniqueName(_name, d);
[detail] -  SubSignalPool subPool;
[detail] -  subPool.addFile(this);
[detail] -  if(subPool.saveGeopsySignal(_name) ) {
[detail] -    
[detail] -    _format=SignalFileFormat::GeopsySignal;
[detail] -    _isOriginalFile=true;
[detail] -    int nSignals=subPool.count();
[detail] -    int offset=GEOPSYSIGNAL_HEADERSIZE+nSignals*4;
[detail] -    for(int i=0;i < nSignals;i++ ) {
[detail] -      Signal * sig=subPool.at(i);
[detail] -      sig->setOffsetInFile(offset);
[detail] -      offset += sizeof(double) * sig->nSamples();
[detail] -    }
[detail] -    return true;
[detail] -  } else {
[detail] -    Message::warning(MSG_ID, tr( "Saving Geopsy signals ..." ),
[detail] -                          tr( "Cannot write to file: %1\n"
[detail] -                              "(Permission, disk space,...)" ). arg(_name), Message::ok(), true);
[detail] -    return false;
[detail] -  }
[detail] -}
[detail] -
[detail] -
[detail]  bool SignalFile::loadGeopsySignal()
[detail]  {
[detail]    TRACE;
[detail] @@ -286,13 +228,15 @@
[detail]    f.close();
[detail]    
[detail]    qint64 offset=h.field.offset-h.field.traceHeaderSize;
[detail] -  for(int i=0; i<h.field.nSignals; i++) {
[detail] -    Signal * newSignal=new Signal(_db);
[detail] -    newSignal->setFile(this);
[detail] -    newSignal->setNumberInFile(i);
[detail] -    newSignal->setNSamples(nSamples[i]);
[detail] -    newSignal->setOffsetInFile(offset);
[detail] -    offset+=sizeof(double)*nSamples[i]+h.field.traceHeaderSize;
[detail] +    IndexInFileSet n;
[detail] +    n.setValue(h.field.nSignals);
[detail] +    for(IndexInFileSet i; i<n; i++) {
[detail] +      SignalSegment * newSignal=new SignalSegment(_db);
[detail] +      newSignal->setFile(this);
[detail] +      newSignal->setIndexInFile(i);
[detail] +      newSignal->setSize(nSamples[i.value()]);
[detail] +      newSignal->fileData().set<OffsetInFile>(offset);
[detail] +      offset+=sizeof(double)*nSamples[i.value()]+h.field.traceHeaderSize;
[detail]    }
[detail]    delete [] nSamples;
[detail]    return true;
[detail] @@ -335,25 +279,27 @@
[detail]      return false;
[detail]    }
[detail]    for(int i=0; i<h.field.nSignals; i++) {
[detail] -    Signal * sig=subPool.at(i);
[detail] -    if(nSamples[i]!=sig->nSamples()) {
[detail] -      App::log(tr("Loading Geopsy Signal: number of samples does not match for signal id %1.\n").arg(sig->id()) );
[detail] +      SignalSegment * sig=subPool.at(i);
[detail] +      if(nSamples[i]!=sig->size()) {
[detail] +        App::log(tr("Loading Geopsy Signal: number of samples does not match for signal id %1.\n").arg(sig->id().toString()));
[detail]        return false;
[detail]      }
[detail]    }
[detail]    
[detail]    qint64 offset=h.field.offset-h.field.traceHeaderSize;
[detail] -  for(int i=0; i<h.field.nSignals; i++) {
[detail] -    Signal * sig=subPool.at(i);
[detail] +    IndexInFileSet n;
[detail] +    n.setValue(h.field.nSignals);
[detail] +    for(IndexInFileSet i; i<n; i++) {
[detail] +      SignalSegment * sig=subPool.at(i.value());
[detail]      if(!sig->file()) {
[detail]        sig->addReference(); 
[detail]                             
[detail]                             
[detail]      }
[detail]      sig->setFile(this);
[detail] -    sig->setNumberInFile(i);
[detail] -    sig->setOffsetInFile(offset);
[detail] -    offset+=sizeof(double)*nSamples[i]+h.field.traceHeaderSize;
[detail] +      sig->setIndexInFile(i);
[detail] +      sig->fileData().set<OffsetInFile>(offset);
[detail] +      offset+=sizeof(double)*nSamples[i.value()]+h.field.traceHeaderSize;
[detail]    }
[detail]    delete [] nSamples;
[detail]    return true;
[detail] @@ -362,7 +308,6 @@
[detail]  bool SignalFile::loadSeg2()
[detail]  {
[detail]    TRACE;
[detail] -  int i;
[detail]    QString str;
[detail]    VectorList<qint32> offsets;
[detail]  
[detail] @@ -390,23 +335,25 @@
[detail]      delete [] buf;
[detail]      return false;
[detail]    }
[detail] -  int nChannels=*reinterpret_cast<qint16 *>(buf+6);
[detail] -  if(nChannels<0) {
[detail] +    IndexInFileSet nChannels;
[detail] +    nChannels.setValue(*reinterpret_cast<qint16 *>(buf+6));
[detail] +    if(nChannels.value()<0) {
[detail]      App::log(tr("Loading SEG2 : negative number of channels\n"));
[detail]      delete [] buf;
[detail]      return false;
[detail]    }
[detail]    int pos;
[detail] -  offsets.resize(nChannels);
[detail] +    offsets.resize(nChannels.value());
[detail]    
[detail] -  for(i=0; i<nChannels; i++) {
[detail] +    for(IndexInFileSet i; i<nChannels; i++) {
[detail]      f.read(reinterpret_cast<char *>(&pos), 4);
[detail]      if(pos>maxOffset) {
[detail] -      App::log(tr("Loading SEG2 : corrupted file, signal offset %1 > file length\n").arg(i));
[detail] +        App::log(tr("Loading SEG2 : corrupted file, signal offset %1 > file length\n")
[detail] +                     .arg(i.value()));
[detail]        delete [] buf;
[detail]        return false;
[detail]      }
[detail] -    offsets[i]=pos;
[detail] +      offsets[i.value()]=pos;
[detail]      
[detail]    }
[detail]  
[detail] @@ -467,7 +414,9 @@
[detail]        }
[detail]      } else {
[detail]        App::log(1, tr("Unprocessed SEG2 keyword in file %1: %2=\"%3\"\n")
[detail] -                       .arg(shortName()).arg(key).arg(str.section(sep, 1, -1, QString::SectionSkipEmpty)));
[detail] +                        .arg(shortName(IndexOfFile::first))
[detail] +                        .arg(key)
[detail] +                        .arg(str.section(sep, 1, -1, QString::SectionSkipEmpty)));
[detail]      }
[detail]    }
[detail]    if(!acquisitionTime.isValid()) { 
[detail] @@ -483,18 +432,17 @@
[detail]    evt.setForce(Point(0.0, 0.0, -1.0));
[detail]    evt.setTime(acquisitionTime);
[detail]    if(GeopsyCoreEngine::instance()->preferences()->eventNameFile()) {
[detail] -    evt.setName(shortName());
[detail] +      evt.setName(shortName(IndexOfFile::first));
[detail]    }
[detail]  
[detail]    
[detail]    
[detail] -  Signal * lastSignal=nullptr;
[detail] -  for(i=0; i<nChannels; i++) {
[detail] -    Signal * newSignal=new Signal(_db);
[detail] +    SignalSegment * lastSignal=nullptr;
[detail] +    for(IndexInFileSet i; i<nChannels; i++) {
[detail] +      SignalSegment * newSignal=new SignalSegment(_db);
[detail]      newSignal->setFile(this);
[detail] -    newSignal->setType(Signal::Waveform);
[detail]  
[detail] -    pos=offsets[i];
[detail] +      pos=offsets[i.value()];
[detail]      f.seek(pos);
[detail]      f.read(buf, 32);
[detail]      qint16 id=*reinterpret_cast<qint16 *>(buf);
[detail] @@ -509,8 +457,8 @@
[detail]        delete [] buf;
[detail]        return false;
[detail]      }
[detail] -    newSignal->setOffsetInFile(offsets[i]);
[detail] -    newSignal->setNSamples(*reinterpret_cast<qint32 *>(buf+8));
[detail] +      newSignal->fileData().set<OffsetInFile>(offsets[i.value()]);
[detail] +      newSignal->setSize(*reinterpret_cast<qint32 *>(buf+8));
[detail]      int format=*reinterpret_cast<qint32 *>(buf+12);
[detail]      int nsamp2=*reinterpret_cast<qint32 *>(buf+4);
[detail]      switch (format) {
[detail] @@ -530,13 +478,14 @@
[detail]      case 5:
[detail]        nsamp2/=8;
[detail]      }
[detail] -    if(newSignal->nSamples()>nsamp2) {
[detail] -      newSignal->setNSamples(nsamp2);
[detail] +      if(newSignal->size()>nsamp2) {
[detail] +        newSignal->setSize(nsamp2);
[detail]      }
[detail] -    newSignal->setNumberInFile(i);
[detail] -    newSignal->setCountPerVolt(1.0/conversionFactor);
[detail] +      newSignal->setIndexInFile(i);
[detail] +      newSignal->metaData()->setCountPerVolt(1.0/conversionFactor);
[detail]      
[detail] -    setSignalName(newSignal, shortName(), "", i + 1, shortName());
[detail] +      setSignalName(newSignal, shortName(IndexOfFile::first), "", i.value()+1,
[detail] +                    shortName(IndexOfFile::first));
[detail]      int blocksize=*reinterpret_cast<qint16 *>(buf+2);
[detail]      int sizeRead=32;
[detail]      bool ok;
[detail] @@ -549,9 +498,10 @@
[detail]            
[detail]            newSignal->setStartTime(lastSignal->startTime());
[detail]            newSignal->setSamplingPeriod(lastSignal->samplingPeriod());
[detail] -          newSignal->setCountPerVolt(lastSignal->countPerVolt());
[detail] -          newSignal->setReceiver(lastSignal->receiver());
[detail] -          setSignalName(newSignal, lastSignal->name(), "", i + 1, shortName());
[detail] +            newSignal->metaData()->setCountPerVolt(lastSignal->metaData()->countPerVolt());
[detail] +            newSignal->metaData()->setReceiver(lastSignal->metaData()->receiver());
[detail] +            setSignalName(newSignal, lastSignal->metaData()->name(), "", i.value()+1,
[detail] +                          shortName(IndexOfFile::first));
[detail]          }
[detail]          sizeRead=blocksize;
[detail]          continue;
[detail] @@ -580,46 +530,55 @@
[detail]          double x=str.section(sep, 1, 1, QString::SectionSkipEmpty).toDouble();
[detail]          double y=str.section(sep, 2, 2, QString::SectionSkipEmpty).toDouble();
[detail]          double z=str.section(sep, 3, 3, QString::SectionSkipEmpty).toDouble();
[detail] -        newSignal->setReceiver(Point(x, y, z));
[detail] +          newSignal->metaData()->setReceiver(Point(x, y, z));
[detail]        } else if(key=="SOURCE_LOCATION") {
[detail]          evt.setPosition(Point(str.section(sep, 1, 1, QString::SectionSkipEmpty).toDouble(),
[detail]                                str.section(sep, 2, 2, QString::SectionSkipEmpty).toDouble(),
[detail]                                str.section(sep, 3, 3, QString::SectionSkipEmpty).toDouble()));
[detail]        } else if(key=="ARRIVAL_TIME") {  
[detail] -        TimePick& tp=newSignal->beginModifyMetaData<TimePick>();
[detail] +          TimePick& tp=newSignal->metaData()->optionalData().beginModify<TimePick>();
[detail]          double p=str.section(sep, 2, 2, QString::SectionSkipEmpty).toDouble();
[detail]          tp.setValue(str.section(sep, 1, 1, QString::SectionSkipEmpty), evt.time().shifted(p));
[detail] -        newSignal->endModifyMetaData(tp);
[detail] +          newSignal->metaData()->optionalData().endModify(tp);
[detail]        } else if(key=="NAME") {
[detail] -        setSignalName(newSignal, str.section( "\n", 1, 1, QString::SectionSkipEmpty), "", i + 1, shortName());
[detail] +          setSignalName(newSignal, str.section( "\n", 1, 1, QString::SectionSkipEmpty), "", i.value()+1,
[detail] +                        shortName(IndexOfFile::first));
[detail]        } else if(key=="DESCALING_FACTOR") {
[detail]          double c=str.section(sep, 1, 1, QString::SectionSkipEmpty).toDouble(&ok);
[detail]          
[detail]          if(ok && c>0.0) {
[detail] -          newSignal->setCountPerVolt(1e3*newSignal->countPerVolt()/c);
[detail] +            newSignal->metaData()->setCountPerVolt(1e3*newSignal->metaData()->countPerVolt()/c);
[detail]          }
[detail]        } else if(key=="STACK") {
[detail]          double c=str.section(sep, 1, 1, QString::SectionSkipEmpty).toInt(&ok);
[detail]          if(ok && c>0) {
[detail] -          newSignal->setCountPerVolt(newSignal->countPerVolt()*c);
[detail] -          newSignal->setMetaData(StackCount(c));
[detail] +            newSignal->metaData()->setCountPerVolt(newSignal->metaData()->countPerVolt()*c);
[detail] +            newSignal->metaData()->optionalData().set<StackCount>(c);
[detail]          }
[detail]        } else if(key=="RAW_RECORD") {
[detail]          QString c=str.section(sep, 1, 1, QString::SectionSkipEmpty);
[detail] -        newSignal->setMetaData(OriginalFileName(c));
[detail] +          newSignal->metaData()->optionalData().set<OriginalFileName>(c);
[detail]        } else if(key=="CHANNEL_NUMBER") {
[detail]          int ch=str.section(sep, 1, 1, QString::SectionSkipEmpty).toInt(&ok);
[detail] -        if(ok && ch!=i+1) {
[detail] +          if(ok && ch!=i.value()+1) {
[detail]            App::log(tr("CHANNEL_NUMBER keyword in file %1 (sig %2) not corresponding to index in file (%3 instead of %4)\n")
[detail] -            .arg(shortName()).arg(i).arg(str).arg(i+1));
[detail] +                         .arg(shortName(IndexOfFile::first))
[detail] +                         .arg(i.value())
[detail] +                         .arg(str)
[detail] +                         .arg(i.value()+1));
[detail]          }
[detail]        } else {
[detail]          
[detail]          App::log(3, tr("Unprocessed SEG2 keyword in file %1 (sig %2): %3=\"%4\"\n")
[detail] -                          .arg(shortName()).arg(i).arg(key).arg(str.section(sep, 1, -1, QString::SectionSkipEmpty)));
[detail] +                          .arg(shortName(IndexOfFile::first))
[detail] +                          .arg(i.value())
[detail] +                          .arg(key)
[detail] +                          .arg(str.section(sep, 1, -1, QString::SectionSkipEmpty)));
[detail] +        }
[detail]        }
[detail] +      if(newSignal->metaData()->name().isEmpty()) {
[detail] +        setSignalName(newSignal, "", "", i.value()+1, shortName(IndexOfFile::first));
[detail]      }
[detail] -    if(newSignal->name().isEmpty()) setSignalName(newSignal, "", "", i + 1, shortName());
[detail]      _db->seismicEvents()->add(evt);
[detail]      lastSignal=newSignal;
[detail]    }
[detail] @@ -715,16 +674,17 @@
[detail]      return false;
[detail]    }
[detail]    int nSamples=wavinfo.subchunk2Size/wavinfo.blockAlign;
[detail] -  for(int i=0; i<wavinfo.numChannels; i++) {
[detail] -    Signal * newSignal=new Signal(_db);
[detail] +    IndexInFileSet n;
[detail] +    n.setValue(wavinfo.numChannels);
[detail] +    for(IndexInFileSet i; i<n; i++) {
[detail] +      SignalSegment * newSignal=new SignalSegment(_db);
[detail]      newSignal->setFile(this);
[detail] -    newSignal->setNumberInFile(i);
[detail] -    newSignal->setNSamples(nSamples);
[detail] +      newSignal->setIndexInFile(i);
[detail] +      newSignal->setSize(nSamples);
[detail]      newSignal->setSamplingPeriod(1.0/(double) wavinfo.sampleRate);
[detail] -    newSignal->setByteIncrement(wavinfo.bitsPerSample/8);
[detail] -    newSignal->setOffsetInFile(wavinfo.blockAlign);
[detail] -    newSignal->setType(Signal::Waveform);
[detail] -    setSignalName(newSignal, "", "", i + 1, shortName());
[detail] +      newSignal->fileData().set<ByteIncrement>(wavinfo.bitsPerSample/8);
[detail] +      newSignal->fileData().set<OffsetInFile>(wavinfo.blockAlign);
[detail] +      setSignalName(newSignal, "", "", i.value()+1, shortName(IndexOfFile::first));
[detail]    }
[detail]    return true;
[detail]  }
[detail] @@ -739,7 +699,6 @@
[detail]    }
[detail]    QDataStream s(&f);
[detail]    s.setByteOrder(bo);
[detail] -  int nChannels=0;
[detail]    qint64 binHeaderOffset=3200;
[detail]    
[detail]    qint16 sampleCoding, nExtendedTextualHeaders;
[detail] @@ -764,9 +723,10 @@
[detail]    e.setType(SeismicEvent::Hammer);
[detail]    e.setForce(Point(0.0, 0.0, -1.0));
[detail]    if(GeopsyCoreEngine::instance()->preferences()->eventNameFile()) {
[detail] -    e.setName(shortName());
[detail] +      e.setName(shortName(IndexOfFile::first));
[detail]    }
[detail]  
[detail] +    IndexInFileSet iChannel;
[detail]    while(!s.atEnd()) {
[detail]      qint64 sigBeginOffset=f.pos();
[detail]      SEGYTraceHeader h;
[detail] @@ -782,21 +742,20 @@
[detail]      }
[detail]      f.seek(sigBeginOffset+sizeof(SEGYTraceHeader)+4*(qint64)h.field.sampleNumber);
[detail]      if(s.status()==QDataStream::Ok) {
[detail] -      Signal * newSignal=new Signal(_db);
[detail] +        SignalSegment * newSignal=new SignalSegment(_db);
[detail]        newSignal->setFile(this);
[detail] -      newSignal->setNSamples(h.field.sampleNumber);
[detail] -      newSignal->setNumberInFile(nChannels);
[detail] -      newSignal->setOffsetInFile(sigBeginOffset + 240);
[detail] -      newSignal->setByteIncrement(sampleCoding);
[detail] -      newSignal->setType(Signal::Waveform);
[detail] -      newSignal->setStartTime(h.startTime(SEGYTraceHeader::SEGYDelay));
[detail] +        newSignal->setSize(h.field.sampleNumber);
[detail] +        newSignal->setIndexInFile(iChannel);
[detail] +        newSignal->fileData().set<OffsetInFile>(sigBeginOffset+240);
[detail] +        newSignal->fileData().set<ByteIncrement>(sampleCoding);
[detail]        newSignal->setSamplingPeriod(( double) h.field.sampleInterval * 1.e-6);
[detail] +        newSignal->setStartTime(h.startTime(SEGYTraceHeader::SEGYDelay));
[detail]        e.setPosition(h.source());
[detail]        e.setTime(h.startTime(SEGYTraceHeader::NoDelay));
[detail]        _db->seismicEvents()->add(e);
[detail] -      newSignal->setReceiver(h.receiver());
[detail] -      setSignalName(newSignal, "", "", nChannels + 1, shortName());
[detail] -      nChannels++;
[detail] +        newSignal->metaData()->setReceiver(h.receiver());
[detail] +        setSignalName(newSignal, "", "", iChannel.value()+1, shortName(IndexOfFile::first));
[detail] +        iChannel++;
[detail]      } else {
[detail]        App::log(tr("Loading SEGY : Error reading SEGY file\n"));
[detail]        return false;
[detail] @@ -816,15 +775,15 @@
[detail]    }
[detail]    QDataStream s(&f);
[detail]    s.setByteOrder(bo);
[detail] -  int nChannels=0;
[detail]  
[detail]    SeismicEvent e;
[detail]    e.setType(SeismicEvent::Hammer);
[detail]    e.setForce(Point(0.0, 0.0, -1.0));
[detail]    if(GeopsyCoreEngine::instance()->preferences()->eventNameFile()) {
[detail] -    e.setName(shortName());
[detail] +      e.setName(shortName(IndexOfFile::first));
[detail]    }
[detail]  
[detail] +    IndexInFileSet iChannel;
[detail]    while(!s.atEnd()) {
[detail]      qint64 sigBeginOffset=f.pos();
[detail]      SEGYTraceHeader h;
[detail] @@ -832,22 +791,21 @@
[detail]      h.read(s);
[detail]      f.seek(sigBeginOffset+sizeof(SEGYTraceHeader)+4*(qint64)h.field.sampleNumber);
[detail]      if(s.status()==QDataStream::Ok) {
[detail] -      Signal * newSignal=new Signal(_db);
[detail] +        SignalSegment * newSignal=new SignalSegment(_db);
[detail]        newSignal->setFile(this);
[detail] -      newSignal->setNSamples(h.field.sampleNumber);
[detail] -      newSignal->setNumberInFile(nChannels);
[detail] -      newSignal->setOffsetInFile(sigBeginOffset + 240);
[detail] -      newSignal->setType(Signal::Waveform);
[detail] -      newSignal->setStartTime(h.startTime(SEGYTraceHeader::SUDelay));
[detail] +        newSignal->setSize(h.field.sampleNumber);
[detail] +        newSignal->setIndexInFile(iChannel);
[detail] +        newSignal->fileData().set<OffsetInFile>(sigBeginOffset+240);
[detail]        newSignal->setSamplingPeriod((double) h.field.sampleInterval * 1.e-6);
[detail] +        newSignal->setStartTime(h.startTime(SEGYTraceHeader::SUDelay));
[detail]        e.setPosition(h.source());
[detail]        e.setTime(h.startTime(SEGYTraceHeader::NoDelay));
[detail]        _db->seismicEvents()->add(e);
[detail] -      newSignal->setReceiver(h.receiver());
[detail] -      newSignal->setMetaData<StackCount>(h.field.numberSumVertical);
[detail] -      newSignal->setMetaData<OriginalFileName>(QString::number(h.field.originalRecordNumber));
[detail] -      setSignalName(newSignal, "", "", nChannels + 1, shortName());
[detail] -      nChannels++;
[detail] +        newSignal->metaData()->setReceiver(h.receiver());
[detail] +        newSignal->metaData()->optionalData().set<StackCount>(h.field.numberSumVertical);
[detail] +        newSignal->metaData()->optionalData().set<OriginalFileName>(QString::number(h.field.originalRecordNumber));
[detail] +        setSignalName(newSignal, "", "", iChannel.value()+1, shortName(IndexOfFile::first));
[detail] +        iChannel++;
[detail]      } else {
[detail]        App::log(tr("Loading SU : Error reading file %1\n").arg(_name) );
[detail]        return false;
[detail] @@ -870,7 +828,8 @@
[detail]    s.setFloatingPointPrecision(QDataStream::SinglePrecision);
[detail]  #endif
[detail]    s.setByteOrder(bo);
[detail] -  int nChannels=0;
[detail] +
[detail] +    IndexInFileSet iChannel;
[detail]    while( !s.atEnd()) {
[detail]      qint64 sigBeginOffset=f.pos();
[detail]      PasscalSegYHeader h;
[detail] @@ -878,22 +837,22 @@
[detail]      h.read(s);
[detail]      f.seek(sigBeginOffset+240+h.sampleSize()*(qint64)h.nSamples());
[detail]      if(s.status()==QDataStream::Ok) {
[detail] -      Signal * newSignal=new Signal(_db);
[detail] +        SignalSegment * newSignal=new SignalSegment(_db);
[detail]        newSignal->setFile(this);
[detail] -      newSignal->setNSamples(h.nSamples());
[detail] -      newSignal->setNumberInFile(nChannels);
[detail] -      newSignal->setOffsetInFile(sigBeginOffset + 240);
[detail] -      newSignal->setType(Signal::Waveform);
[detail] -      newSignal->setStartTime(h.startTime());
[detail] +        newSignal->setSize(h.nSamples());
[detail] +        newSignal->setIndexInFile(iChannel);
[detail] +        newSignal->fileData().set<OffsetInFile>(sigBeginOffset+240);
[detail]        newSignal->setSamplingPeriod(h.samplingPeriod());
[detail] -      newSignal->setComponent(h.component());
[detail] -      newSignal->setByteIncrement(h.sampleSize());
[detail] -      newSignal->setVoltPerCount(h.field.scaleFactor/h.field.gainConstant);
[detail] -      TimePick& tp=newSignal->beginModifyMetaData<TimePick>();
[detail] +        newSignal->setStartTime(h.startTime());
[detail] +        newSignal->metaData()->setComponent(h.component());
[detail] +        newSignal->fileData().set<ByteIncrement>(h.sampleSize());
[detail] +        newSignal->metaData()->setVoltPerCount(h.field.scaleFactor/h.field.gainConstant);
[detail] +        TimePick& tp=newSignal->metaData()->optionalData().beginModify<TimePick>();
[detail]        tp.setValue("P0", h.timePick());
[detail] -      newSignal->endModifyMetaData(tp);
[detail] -      setSignalName(newSignal, QString(h.field.stationName).left(5), "", nChannels + 1, shortName());
[detail] -      nChannels++;
[detail] +        newSignal->metaData()->optionalData().endModify(tp);
[detail] +        setSignalName(newSignal, QString(h.field.stationName).left(5), "", iChannel.value()+1,
[detail] +                      shortName(IndexOfFile::first));
[detail] +        iChannel++;
[detail]      } else {
[detail]        App::log(tr("Loading PASSCAL SEGY : Error reading file %1").arg(_name));
[detail]        return false;
[detail] @@ -910,7 +869,7 @@
[detail]      App::log(tr("Loading GSE 2.0: unable to open file\n") );
[detail]      return false;
[detail]    }
[detail] -  int signalCount=0;
[detail] +    IndexInFileSet iChannel;
[detail]    QByteArray buffer;
[detail]    while(true) {
[detail]      
[detail] @@ -921,10 +880,10 @@
[detail]        }
[detail]      }
[detail]      if(f.atEnd()) {
[detail] -      if(signalCount==0) {
[detail] +        if(iChannel==IndexInFileSet::first) {
[detail]          App::log(tr("Loading GSE 2.0: no signal data found\n") );
[detail]          return false;
[detail] -      } else if(signalCount==1 && sto==SignalFileFormat::Multi) {
[detail] +        } else if(iChannel.value()==1 && sto==SignalFileFormat::Multi) {
[detail]          
[detail]          setFormat(SignalFileFormat::Gse2);
[detail]        }
[detail] @@ -949,45 +908,45 @@
[detail]      startTime.addMinutes(parser.toInt(19, 2));
[detail]      startTime.addSeconds(parser.toInt(22, 2)+parser.toDouble(24, 4));
[detail]  
[detail] -    Signal * newSignal=new Signal(_db);
[detail] +      SignalSegment * newSignal=new SignalSegment(_db);
[detail]      newSignal->setFile(this);
[detail] -    newSignal->setNumberInFile(signalCount);
[detail] -    newSignal->setNSamples(parser.toInt(48, 8));
[detail] -    newSignal->setOffsetInFile(f.pos());
[detail] -    newSignal->setStartTime(startTime);
[detail] +      newSignal->setIndexInFile(iChannel);
[detail] +      newSignal->setSize(parser.toInt(48, 8));
[detail] +      newSignal->fileData().set<OffsetInFile>(f.pos());
[detail]      double fsamp=parser.toDouble(57, 11);
[detail]      if(fsamp<=0) {
[detail]         App::log(tr("Invalid sampling frequency (%1)\n").arg(fsamp) );
[detail]         return false;
[detail]      }
[detail]      newSignal->setSamplingPeriod(1.0 /fsamp);
[detail] -    newSignal->setType(Signal::Waveform);
[detail] -    setSignalName(newSignal, parser.toString(29, 5).trimmed(), "", signalCount + 1, shortName());
[detail] +      newSignal->setStartTime(startTime);
[detail] +      setSignalName(newSignal, parser.toString(29, 5).trimmed(), "", iChannel.value()+1,
[detail] +                    shortName(IndexOfFile::first));
[detail]      QString compString=parser.toString(35, 3);
[detail]      if(compString.endsWith("Z")) {
[detail] -      newSignal->setComponent(Signal::Vertical);
[detail] +         newSignal->metaData()->setComponent(SignalMetaData::Vertical);
[detail]      } else if(compString.endsWith("E")) {
[detail] -      newSignal->setComponent(Signal::East);
[detail] +        newSignal->metaData()->setComponent(SignalMetaData::East);
[detail]      } else if(compString.endsWith("N")) {
[detail] -      newSignal->setComponent(Signal::North);
[detail] +        newSignal->metaData()->setComponent(SignalMetaData::North);
[detail]      }
[detail]      double fac=parser.toDouble(69, 10);
[detail]      if(fac>0.0 && fac!=1.0) {
[detail]        
[detail]        
[detail] -      newSignal->setVoltPerCount(1.0);
[detail] -      newSignal->setUnitPerVolt(1e-9*fac);
[detail] +        newSignal->metaData()->setVoltPerCount(1.0);
[detail] +        newSignal->metaData()->setUnitPerVolt(1e-9*fac);
[detail]      }
[detail]      QString sampleFormat=parser.toString(44, 3);
[detail]      if(sampleFormat.startsWith("CM")) {
[detail] -      newSignal->setByteIncrement(parser.toInt(46, 1));
[detail] +        newSignal->fileData().set<ByteIncrement>(parser.toInt(46, 1));
[detail]      } else if (sampleFormat=="INT") {
[detail] -      newSignal->setByteIncrement(4);
[detail] +        newSignal->fileData().set<ByteIncrement>(4);
[detail]      } else {
[detail]        App::log(tr("Loading GSE 2.0: unrecognized sample encoding '%1'\n").arg(sampleFormat) );
[detail]        return false;
[detail]      }
[detail] -    signalCount++;
[detail] +      iChannel++;
[detail]      if(sto==SignalFileFormat::Single) {
[detail]        break;
[detail]      }
[detail] @@ -1005,7 +964,7 @@
[detail]    }
[detail]    QTextStream s(&f);
[detail]    SharkHeader h(format.id());
[detail] -  h.fileName=shortName();
[detail] +    h.fileName=shortName(IndexOfFile::first);
[detail]    switch(format.id()) {
[detail]    case SignalFileFormat::CityShark2:
[detail]      while(!s.atEnd()) {
[detail] @@ -1035,35 +994,44 @@
[detail]    }
[detail]  
[detail]    qint64 offset=s.pos();
[detail] -  for(int iSig=0; iSig<h.channelCount; iSig++) {
[detail] -    Signal * newSignal=new Signal(_db);
[detail] +    IndexInFileSet n;
[detail] +    n.setValue(h.channelCount);
[detail] +    for(IndexInFileSet i; i<n; i++) {
[detail] +      SignalSegment * newSignal=new SignalSegment(_db);
[detail]      newSignal->setFile(this);
[detail] -    newSignal->setNumberInFile(iSig);
[detail] -    newSignal->setStartTime(h.startTime);
[detail] +      newSignal->setIndexInFile(i);
[detail]      newSignal->setSamplingPeriod(1.0/h.samplingFrequency);
[detail] -    newSignal->setType(Signal::Waveform);
[detail] -    int recNum=iSig/3+1;
[detail] +      int recNum=i.value()/3+1;
[detail]      if(h.channelCount>3) {
[detail]        setSignalName(newSignal, h.fileName,
[detail] -                    QString( "_%1" ).arg(recNum), recNum, shortName());
[detail] +                      QString( "_%1" ).arg(recNum), recNum, shortName(IndexOfFile::first));
[detail]      } else {
[detail] -      setSignalName(newSignal, h.fileName, "", 1, shortName());
[detail] +        setSignalName(newSignal, h.fileName, "", 1, shortName(IndexOfFile::first));
[detail]      }
[detail] -    if(iSig%3==0)
[detail] -      newSignal->setComponent(Signal::Vertical);
[detail] -    else if(iSig%3==1)
[detail] -      newSignal->setComponent(Signal::North);
[detail] -    else if(iSig%3==2)
[detail] -      newSignal->setComponent(Signal::East);
[detail] -    newSignal->setMetaData(OriginalFileName(h.originalFileName));
[detail] -    newSignal->setNSamples(h.sampleCount);
[detail] -    newSignal->setOffsetInFile(offset);
[detail] -    newSignal->setReceiver(h.utmPosition);
[detail] -    newSignal->setUtmZone(h.utmZone);
[detail] -    newSignal->setCountPerVolt(h.conversionFactor*h.gain);
[detail] -    Comments& c=newSignal->beginModifyMetaData<Comments>();
[detail] +      switch(i.value()%3) {
[detail] +      case 0:
[detail] +        newSignal->metaData()->setComponent(SignalMetaData::Vertical);
[detail] +        break;
[detail] +      case 1:
[detail] +        newSignal->metaData()->setComponent(SignalMetaData::North);
[detail] +        break;
[detail] +      case 2:
[detail] +        newSignal->metaData()->setComponent(SignalMetaData::East);
[detail] +        break;
[detail] +      default:
[detail] +        newSignal->metaData()->setComponent(SignalMetaData::UndefinedComponent);
[detail] +        break;
[detail] +      }
[detail] +      newSignal->metaData()->optionalData().set<OriginalFileName>(h.originalFileName);
[detail] +      newSignal->setSize(h.sampleCount);
[detail] +      newSignal->setStartTime(h.startTime);
[detail] +      newSignal->fileData().set<OffsetInFile>(offset);
[detail] +      newSignal->metaData()->setReceiver(h.utmPosition);
[detail] +      newSignal->metaData()->setUtmZone(h.utmZone);
[detail] +      newSignal->metaData()->setCountPerVolt(h.conversionFactor*h.gain);
[detail] +      Comments& c=newSignal->metaData()->optionalData().beginModify<Comments>();
[detail]      c=h.comments;
[detail] -    newSignal->endModifyMetaData(c);
[detail] +      newSignal->metaData()->optionalData().endModify(c);
[detail]    }
[detail]    return true;
[detail]  }
[detail] @@ -1083,10 +1051,10 @@
[detail]    DateTime startTime;
[detail]    QString statName, str;
[detail]    Point p;
[detail] -  Signal::Components comp[3];
[detail] -  comp[0]=Signal::UndefinedComponent;
[detail] -  comp[1]=Signal::UndefinedComponent;
[detail] -  comp[2]=Signal::UndefinedComponent;
[detail] +    SignalMetaData::Components comp[3];
[detail] +    comp[0]=SignalMetaData::UndefinedComponent;
[detail] +    comp[1]=SignalMetaData::UndefinedComponent;
[detail] +    comp[2]=SignalMetaData::UndefinedComponent;
[detail]    bool ok=true;
[detail]    while(!s.atEnd()) {
[detail]      QString line=s.readLine();
[detail] @@ -1120,12 +1088,12 @@
[detail]        int index=keyword.mid(2, 1).toInt();
[detail]        QString valueStr=value.toStringBuffer();
[detail]        if(valueStr.contains('N', Qt::CaseInsensitive)) {
[detail] -        comp[index]=Signal::North;
[detail] +          comp[index]=SignalMetaData::North;
[detail]        } else if(valueStr.contains('E', Qt::CaseInsensitive)) {
[detail] -        comp[index]=Signal::East;
[detail] +          comp[index]=SignalMetaData::East;
[detail]        } else if(valueStr.contains('Z', Qt::CaseInsensitive) ||
[detail]                  valueStr.contains('V', Qt::CaseInsensitive)) {
[detail] -        comp[index]=Signal::Vertical;
[detail] +          comp[index]=SignalMetaData::Vertical;
[detail]        } else {
[detail]          App::log(tr("Unrecognized component name for SAF format: \"%1\"\n").arg(value.toStringView()));
[detail]        }
[detail] @@ -1149,19 +1117,17 @@
[detail]      return false;
[detail]    }
[detail]    qint64 offset=s.pos();
[detail] -  
[detail] -  for(int iSig=0; iSig<3; iSig++) {
[detail] -    Signal * newSignal=new Signal(_db);
[detail] +    for(IndexInFileSet i; i.value()<3; i++) {
[detail] +      SignalSegment * newSignal=new SignalSegment(_db);
[detail]      newSignal->setFile(this);
[detail] -    newSignal->setNumberInFile(iSig);
[detail] -    newSignal->setNSamples(sampNum);
[detail] -    newSignal->setOffsetInFile(offset);
[detail] -    newSignal->setCountPerVolt(convFact);
[detail] -    newSignal->setStartTime(startTime);
[detail] +      newSignal->setIndexInFile(i);
[detail] +      newSignal->setSize(sampNum);
[detail] +      newSignal->fileData().set<OffsetInFile>(offset);
[detail] +      newSignal->metaData()->setCountPerVolt(convFact);
[detail]      newSignal->setSamplingPeriod(1.0/sampFreq);
[detail] -    newSignal->setType(Signal::Waveform);
[detail] -    setSignalName(newSignal, statName, "", 1, shortName());
[detail] -    newSignal->setComponent(comp[ iSig ] );
[detail] +      newSignal->setStartTime(startTime);
[detail] +      setSignalName(newSignal, statName, "", 1, shortName(IndexOfFile::first));
[detail] +      newSignal->metaData()->setComponent(comp[i.value()]);
[detail]    }
[detail]    return true;
[detail]  }
[detail] @@ -1177,11 +1143,23 @@
[detail]  }
[detail]  #endif
[detail]  
[detail] -bool SignalFile::loadFebusHDF5()
[detail] +  bool SignalFile::loadGenericHDF5()
[detail]  {
[detail]    TRACE;
[detail]  #ifdef HAS_HDF5
[detail] +    HDF5File * file=new HDF5File;
[detail] +    return file->open(_name, this, _db->masterGroup());
[detail] +  #else
[detail] +    App::log(tr("HDF5 not supported, check configuration options.\n"));
[detail] +    return false;
[detail] +  #endif
[detail]    
[detail] +  }
[detail] +
[detail] +  bool SignalFile::loadFebusHDF5()
[detail] +  {
[detail] +    TRACE;
[detail] +  #ifdef HAS_HDF5
[detail]    hid_t file, dset, space;
[detail]    int rank;
[detail]  
[detail] @@ -1269,18 +1247,19 @@
[detail]  
[detail]    DateTime startTime(QDate(2000, 1, 1), 0, 0.0);
[detail]    startTime.addSeconds(startSecond);
[detail] -  for(uint iSig=0; iSig<dims[1]; iSig++) {
[detail] -    Signal * newSignal=new Signal(_db);
[detail] -    newSignal->setFile(this);
[detail] -    newSignal->setNumberInFile(iSig);
[detail] -    newSignal->setOffsetInFile(dims[1]);
[detail] -    newSignal->setNSamples(dims[0]);
[detail] -    newSignal->setStartTime(startTime);
[detail] +    IndexInFileSet n;
[detail] +    n.setValue(dims[1]);
[detail] +    for(IndexInFileSet i; i<n; i++) {
[detail] +      SignalSegment * newSignal=new SignalSegment(_db);
[detail] +      newSignal->setFile(this);
[detail] +      newSignal->setIndexInFile(i);
[detail] +      newSignal->fileData().set<OffsetInFile>(dims[1]);
[detail] +      newSignal->setSize(dims[0]);
[detail]      newSignal->setSamplingPeriod(samplingPeriod);
[detail] -    newSignal->setReceiver(Point(distances[iSig], 0.0, 0.0));
[detail] -    newSignal->setType(Signal::Waveform);
[detail] -    setSignalName(newSignal, QString::number(iSig+1), "", 1, shortName());
[detail] -    newSignal->setComponent(Signal::North);
[detail] +      newSignal->setStartTime(startTime);
[detail] +      newSignal->metaData()->setReceiver(Point(distances[i.value()], 0.0, 0.0));
[detail] +      setSignalName(newSignal, QString::number(i.value()+1), "", 1, shortName(IndexOfFile::first));
[detail] +      newSignal->metaData()->setComponent(SignalMetaData::Horizontal);
[detail]    }
[detail]    delete [] distances;
[detail]    return true;
[detail] @@ -1300,7 +1279,7 @@
[detail]    }
[detail]    int lineLen=1024;
[detail]    char * line=new char[ lineLen ];
[detail] -  int chanNum=0;
[detail] +    IndexInFileSet iChannel;
[detail]    while(!feof(fpin)) {
[detail]      
[detail]      while(File::readLine(line, lineLen, fpin)!=0 && line[0]=='#' ) {
[detail] @@ -1308,19 +1287,19 @@
[detail]        if(strlen(ptr)>0) break;
[detail]      }
[detail]      int sampNum=1;
[detail] -    while(File::readLine(line, lineLen, fpin)!=0 && line[0]!='#' && line[0]!='>' ) sampNum++;
[detail] +      while(File::readLine(line, lineLen, fpin)!=0 && line[0]!='#' && line[0]!='>') {
[detail] +        sampNum++;
[detail] +      }
[detail]      if(sampNum>0) {
[detail] -      QString signalNameBase(shortName());
[detail] -      Signal * newSignal=new Signal(_db);
[detail] +        SignalSegment * newSignal=new SignalSegment(_db);
[detail]        newSignal->setFile(this);
[detail] -      newSignal->setNumberInFile(chanNum);
[detail] -      newSignal->setNSamples(sampNum);
[detail] -      newSignal->setOffsetInFile(0);
[detail] +        newSignal->setIndexInFile(iChannel);
[detail] +        newSignal->setSize(sampNum);
[detail] +        newSignal->fileData().set<OffsetInFile>(0);
[detail]        newSignal->setSamplingPeriod(0);
[detail] -      newSignal->setType(Signal::Waveform);
[detail] -      setSignalName(newSignal, "", "", 1, shortName());
[detail] -      newSignal->setComponent(Signal::UndefinedComponent);
[detail] -      chanNum++;
[detail] +        setSignalName(newSignal, "", "", 1, shortName(IndexOfFile::first));
[detail] +        newSignal->metaData()->setComponent(SignalMetaData::UndefinedComponent);
[detail] +        iChannel++;
[detail]      }
[detail]    }
[detail]    fclose(fpin);
[detail] @@ -1382,17 +1361,16 @@
[detail]      return false;
[detail]    }
[detail]    
[detail] -  for(int iSig=0; iSig<chanNum; iSig++) {
[detail] -    if(!format.isIgnored(iSig)) {
[detail] -      Signal * newSignal=new Signal(_db);
[detail] -      newSignal->setFile(this);
[detail] -      newSignal->setNumberInFile(iSig);
[detail] -      newSignal->setNSamples(sampNum);
[detail] -      newSignal->setOffsetInFile(offset);
[detail] +    for(IndexInFileSet i; i.value()<chanNum; i++) {
[detail] +      if(!format.isIgnored(i.value())) {
[detail] +        SignalSegment * newSignal=new SignalSegment(_db);
[detail] +        newSignal->setFile(this);
[detail] +        newSignal->setIndexInFile(i);
[detail] +        newSignal->setSize(sampNum);
[detail] +        newSignal->fileData().set<OffsetInFile>(offset);
[detail]        newSignal->setSamplingFrequency(100.0);
[detail] -      newSignal->setType(Signal::Waveform);
[detail] -      setSignalName(newSignal, "", "", 1, shortName());
[detail] -      newSignal->setComponent(Signal::UndefinedComponent);
[detail] +        setSignalName(newSignal, "", "", 1, shortName(IndexOfFile::first));
[detail] +        newSignal->metaData()->setComponent(SignalMetaData::UndefinedComponent);
[detail]        newSignal->setStartTime(format.startTime());
[detail]        format.assign(newSignal);
[detail]      }
[detail] @@ -1424,6 +1402,7 @@
[detail]    
[detail]    QByteArray buffer=f.readAll();
[detail]    AsciiLineParser pc(&buffer);
[detail] +    pc.setEmptyValues(false);
[detail]    pc.countColumns();
[detail]    int colNum=pc.count();
[detail]    if(colNum<3) {
[detail] @@ -1431,10 +1410,12 @@
[detail]      return false;
[detail]    }
[detail]    if((colNum-1)%2!=0) {
[detail] -    Message::warning(MSG_ID, title, tr("Number of columns must be 2*n+1: frequency, Re(Channel1), Im(Channel1),..."), true);
[detail] +      Message::warning(MSG_ID, title, tr("Number of columns must be 2*n+1 (%1 columns found): "
[detail] +                                         "frequency, Re(Channel1), Im(Channel1),...").arg(colNum), true);
[detail]      return false;
[detail]    }
[detail]    AsciiLineParser p(&buffer, colNum);
[detail] +    p.setEmptyValues(false);
[detail]    int lineNumber=1;
[detail]    VectorList<double> frequencies;
[detail]    p.readLine();
[detail] @@ -1454,7 +1435,16 @@
[detail]    }
[detail]  
[detail]    std::sort(frequencies.begin(), frequencies.end());
[detail] -  double df=(frequencies.last()-frequencies.first())/(frequencies.count()-1);
[detail] +    APP_LOG(1, tr("Found %1 frequencies from %2 to %3\n")
[detail] +                   .arg(frequencies.count())
[detail] +                   .arg(frequencies.first())
[detail] +                   .arg(frequencies.last()));
[detail] +    if(frequencies.first()!=0.0) {
[detail] +      Message::warning(MSG_ID, title,
[detail] +                       tr("The null frequency is missing"), true);
[detail] +      return false;
[detail] +    }
[detail] +    double df=frequencies.last()/(frequencies.count()-1);
[detail]    for(int i=1; i<frequencies.count(); i++) {
[detail]      if(fabs(frequencies.at(i)-frequencies.at(i-1)-df)>0.001*df) {
[detail]        Message::warning(MSG_ID, title,
[detail] @@ -1465,18 +1455,23 @@
[detail]      }
[detail]    }
[detail]  
[detail] -  int sampNum=2*qRound(frequencies.last()/df)+2;
[detail]    int chanNum=(colNum-1)/2;
[detail] -  for(int iSig=0; iSig<chanNum; iSig++) {
[detail] -    Signal * newSignal=new Signal(_db);
[detail] +    for(IndexInFileSet i; i.value()<chanNum; i++) {
[detail] +      SignalSegment * newSignal=new SignalSegment(_db);
[detail]      newSignal->setFile(this);
[detail] -    newSignal->setNumberInFile(iSig);
[detail] -    newSignal->setNSamples(sampNum);
[detail] -    newSignal->setOffsetInFile(0);
[detail] -    newSignal->setSamplingPeriod(1.0/(sampNum*df));
[detail] -    newSignal->setType(Signal::Spectrum);
[detail] -    setSignalName(newSignal, "", "", 1, shortName());
[detail] -    newSignal->setComponent(Signal::UndefinedComponent);
[detail] +      newSignal->setIndexInFile(i);
[detail] +      double lastArg=p.toDouble(i.value()*2+2);
[detail] +      if(lastArg==M_PI || lastArg==0.0) {
[detail] +        newSignal->setSize(2*frequencies.count()-2);
[detail] +      } else {
[detail] +        newSignal->setSize(2*frequencies.count()-1);
[detail] +      }
[detail] +      newSignal->setSamplingPeriod(1.0/(newSignal->size()*df));
[detail] +      
[detail] +      newSignal->metaData()->optionalData().set<OriginalSamplingPeriod>(newSignal->samplingPeriod());
[detail] +      newSignal->setType(DoubleSignal::Spectrum);
[detail] +      setSignalName(newSignal, "", "", 1, shortName(IndexOfFile::first));
[detail] +      newSignal->metaData()->setComponent(SignalMetaData::UndefinedComponent);
[detail]    }
[detail]    return true;
[detail]  }
[detail] @@ -1519,35 +1514,35 @@
[detail]      if(!GeopsyCoreEngine::instance()->askRD3LogParameter(nSamples, sampFreq, startTime)) {
[detail]        return false;
[detail]      }
[detail] -    int nChannels=sizeData/nSamples/2;
[detail] -    for(int i=0; i<nChannels; i++) {
[detail] -      Signal * newSignal=new Signal(_db);
[detail] -      newSignal->setFile(this);
[detail] -      newSignal->setOffsetInFile(i * 2 * nSamples);
[detail] -      newSignal->setNSamples(nSamples);
[detail] -      newSignal->setNumberInFile(i + 1);
[detail] -      newSignal->setType(Signal::Waveform);
[detail] +      int nChannels=sizeData/(nSamples*2);
[detail] +      double samplingPeriod=1e-6/sampFreq;
[detail] +      for(IndexInFileSet i; i.value()<nChannels; i++) {
[detail] +        SignalSegment * newSignal=new SignalSegment(_db);
[detail] +        newSignal->setFile(this);
[detail] +        newSignal->fileData().set<OffsetInFile>(i.value()*2*nSamples);
[detail] +        newSignal->setSize(nSamples);
[detail] +        newSignal->setIndexInFile(i);
[detail] +        newSignal->setSamplingPeriod(samplingPeriod);
[detail]        newSignal->setStartTime(DateTime::null.shifted(startTime*1e-6));
[detail] -      newSignal->setSamplingPeriod(1./sampFreq * 1e-6);
[detail]      }
[detail]    } else { 
[detail]      int sigNum0=_db->count();
[detail]      QString str;
[detail]      QString substr;
[detail]      QTextStream slog(&flog);
[detail] +      IndexInFileSet iChannel;
[detail]      while(!slog.atEnd()) {
[detail]        str=slog.readLine();
[detail]        if(str.length()<=0) {
[detail]          break;
[detail]        }
[detail]        substr=str.section(" ", 2, 2);
[detail] -      int ich=substr.section("=", 1, 1).toInt()-1;
[detail] -      Signal * newSignal=new Signal(_db);
[detail] +        iChannel.setValue(substr.section("=", 1, 1).toInt()-1);
[detail] +        SignalSegment * newSignal=new SignalSegment(_db);
[detail]        newSignal->setFile(this);
[detail]        substr=str.section( " ", 6, 6);
[detail] -      newSignal->setNSamples(substr.section("=", 1, 1).toInt());
[detail] -      newSignal->setNumberInFile(ich);
[detail] -      newSignal->setType(Signal::Waveform);
[detail] +        newSignal->setSize(substr.section("=", 1, 1).toInt());
[detail] +        newSignal->setIndexInFile(iChannel);
[detail]        substr=str.section(" ", 4, 4);
[detail]        newSignal->setStartTime(DateTime::null.shifted(substr.section("=", 1, 1).toDouble()*1.e-6));
[detail]        substr=str.section(" ", 5, 5);
[detail] @@ -1556,9 +1551,9 @@
[detail]      flog.close();
[detail]      int offset=0;
[detail]      for(int i=sigNum0; i<_db->count(); i++) {
[detail] -      Signal * sig=_db->at(i);
[detail] -      sig->setOffsetInFile(offset);
[detail] -      offset += sig->nSamples() * 2;
[detail] +        SignalSegment * sig=_db->at(i);
[detail] +        sig->fileData().set<OffsetInFile>(offset);
[detail] +        offset+=sig->size()*2;
[detail]      }
[detail]    }
[detail]    return true;
[detail] @@ -1590,13 +1585,10 @@
[detail]      return false;
[detail]    }
[detail]  
[detail] -  Signal * newSignal=new Signal(_db);
[detail] +    SignalSegment * newSignal=new SignalSegment(_db);
[detail]    newSignal->setFile(this);
[detail] -  newSignal->setOffsetInFile(f.pos());
[detail] -  newSignal->setNSamples(h.ints.field.NPTS);
[detail] -  newSignal->setNumberInFile(0);
[detail] -  newSignal->setCountPerVolt(h.floats.field.SCALE!=-12345.0 ? Number::toDouble(h.floats.field.SCALE) : 1.0);
[detail] -  newSignal->setType(Signal::Waveform);
[detail] +    newSignal->setSize(h.ints.field.NPTS);
[detail] +    newSignal->metaData()->setCountPerVolt(h.floats.field.SCALE!=-12345.0 ? Number::toDouble(h.floats.field.SCALE) : 1.0);
[detail]    newSignal->setStartTime(h.startTime());
[detail]    if(h.floats.field.ODELTA!=-12345.0) {
[detail]      if(h.floats.field.ODELTA!=h.floats.field.DELTA) {
[detail] @@ -1607,47 +1599,49 @@
[detail]    }
[detail]    newSignal->setSamplingPeriod(Number::toDouble(h.floats.field.DELTA) );
[detail]    QByteArray name_str(h.chars.field.KSTNM, 8); 
[detail] +    name_str.replace(0, ' ');
[detail]    name_str=name_str.trimmed();
[detail] -  setSignalName(newSignal, name_str, "", 1, shortName());
[detail] +    setSignalName(newSignal, name_str, "", 1, shortName(IndexOfFile::first));
[detail]    QByteArray cmp_str(h.chars.field.KCMPNM, 8);
[detail] +    name_str.replace(0, ' ');
[detail]    cmp_str=cmp_str.trimmed().toUpper();
[detail] -  Signal::Components cmp=Signal::globalSeismographicNetworkComponent(cmp_str.data());
[detail] -  if(cmp==Signal::UndefinedComponent) { 
[detail] -    APP_LOG(1, tr("SAC component for signal ID %1 '%2'\n").arg(newSignal->id()).arg(cmp_str.data()));
[detail] +    SignalMetaData::Components cmp=SignalMetaData::globalSeismographicNetworkComponent(cmp_str.data());
[detail] +    if(cmp==SignalMetaData::UndefinedComponent) { 
[detail] +      APP_LOG(2, tr("SAC component for signal ID %1 '%2'\n").arg(newSignal->id().toString()).arg(cmp_str.data()));
[detail]      if(cmp_str.contains("Z"))
[detail] -      cmp=Signal::Vertical;
[detail] +        cmp=SignalMetaData::Vertical;
[detail]      else if(cmp_str.contains("E"))
[detail] -      cmp=Signal::East;
[detail] +        cmp=SignalMetaData::East;
[detail]      else if(cmp_str.contains("N"))
[detail] -      cmp=Signal::North;
[detail] +        cmp=SignalMetaData::North;
[detail]    }
[detail] -  newSignal->setComponent(cmp);
[detail] +    newSignal->metaData()->setComponent(cmp);
[detail]    switch (h.ints.field.IDEP) {
[detail]    case 6:
[detail] -    newSignal->setAmplitudeUnit(Signal::Displacement);
[detail] +      newSignal->metaData()->setAmplitudeUnit(SignalMetaData::Displacement);
[detail]      break;
[detail]    case 50:
[detail]  
[detail]    case 7:
[detail] -    newSignal->setAmplitudeUnit(Signal::Velocity);
[detail] +      newSignal->metaData()->setAmplitudeUnit(SignalMetaData::Velocity);
[detail]      break;
[detail]    case 8:
[detail] -    newSignal->setAmplitudeUnit(Signal::Acceleration);
[detail] +      newSignal->metaData()->setAmplitudeUnit(SignalMetaData::Acceleration);
[detail]      break;
[detail]    default:
[detail]      break;
[detail]    }
[detail]    
[detail] -  newSignal->setReceiver(Point(Number::toDouble(h.floats.field.USER7),
[detail] +    newSignal->metaData()->setReceiver(Point(Number::toDouble(h.floats.field.USER7),
[detail]                                 Number::toDouble(h.floats.field.USER8),
[detail]                                 Number::toDouble(h.floats.field.USER9)));
[detail]    
[detail]    for(int i=0; i<10; i++) {
[detail]      if(h.floats.field.T[i]!=-12345) {
[detail] -      TimePick& tp=newSignal->beginModifyMetaData<TimePick>();
[detail] +        TimePick& tp=newSignal->metaData()->optionalData().beginModify<TimePick>();
[detail]        tp.setValue("SAC_"+QString::number(i),
[detail]                    newSignal->startTime().shifted(Number::toDouble(h.floats.field.T[i])));
[detail] -      newSignal->endModifyMetaData(tp);
[detail] +        newSignal->metaData()->optionalData().endModify(tp);
[detail]      }
[detail]    }
[detail]    return true;
[detail] @@ -1724,20 +1718,20 @@
[detail]    
[detail]    fseek(f, 0, SEEK_END);
[detail]    int sizeData=ftell(f);
[detail] -  int nChannels=sizeData % traceSize;
[detail] +    IndexInFileSet nChannels;
[detail] +    nChannels.setValue(sizeData % traceSize);
[detail]    int byteInc=*(( short * ) (header + 6) )/8;
[detail]    double samplingPeriod=Number::toDouble(*((float *)(header + 26)))/(double)nSamples*0.000000001;
[detail]  
[detail]    
[detail]    long pos=headerSize;
[detail] -  for(int i=0; i < nChannels; i++) {
[detail] -    Signal * newSignal=new Signal(_db);
[detail] +    for(IndexInFileSet i; i<nChannels; i++) {
[detail] +      SignalSegment * newSignal=new SignalSegment(_db);
[detail]      newSignal->setFile(this);
[detail] -    newSignal->setNSamples(nSamples);
[detail] -    newSignal->setByteIncrement(byteInc);
[detail] -    newSignal->setOffsetInFile(pos);
[detail] -    newSignal->setNumberInFile(i);
[detail] -    newSignal->setType(Signal::Waveform);
[detail] +      newSignal->setSize(nSamples);
[detail] +      newSignal->fileData().set<ByteIncrement>(byteInc);
[detail] +      newSignal->fileData().set<OffsetInFile>(pos);
[detail] +      newSignal->setIndexInFile(i);
[detail]      newSignal->setSamplingPeriod(samplingPeriod);
[detail]      pos += traceSize;
[detail]    }
[detail] @@ -1752,7 +1746,6 @@
[detail]    TRACE;
[detail]    QFileInfo fi(_name);
[detail]    QString ext=fi.suffix().toLower();
[detail] -  QString title="Loading Sismalp " + shortName();
[detail]    QDir d(fi.absolutePath());
[detail]    QFileInfo fi_ndx(d.absoluteFilePath(fi.baseName() + ".NDX" ));
[detail]    if( !fi_ndx.exists())
[detail] @@ -1795,39 +1788,42 @@
[detail]      startTime.addMinutes(header1.mid(50, 2).toInt());
[detail]      startTime.addSeconds(header1.mid(53, 6).toInt());
[detail]  
[detail] -    Signal * newSignal=new Signal(_db);
[detail] +      SignalSegment * newSignal=new SignalSegment(_db);
[detail]      newSignal->setFile(this);
[detail] -    newSignal->setNumberInFile(0);
[detail] -    newSignal->setNSamples(nSamples);
[detail] +      newSignal->setIndexInFile(IndexInFileSet::first);
[detail] +      newSignal->setSize(nSamples);
[detail]      uint coding;
[detail]      if(version > 14.00) {
[detail]        uint nrBits=header2.mid(12, 2).toUInt(&ok);
[detail] -      if( !ok)
[detail] +        if(!ok) {
[detail]          nrBits=10;
[detail] +        }
[detail]        coding=nrBits; 
[detail]        uint nrGainBits=header2.mid(15, 1).toUInt(&ok);
[detail] -      if( !ok)
[detail] +        if(!ok) {
[detail]          nrGainBits=0;
[detail] +        }
[detail]        coding += nrGainBits << 8;  
[detail] -    } else
[detail] +      } else {
[detail]        coding=10;
[detail] -    newSignal->setByteIncrement(coding);
[detail] -    newSignal->setOffsetInFile(( (header1.mid(14, 6).toInt() - 1) * 512) );
[detail] -    newSignal->setStartTime(startTime);
[detail] +      }
[detail] +      newSignal->fileData().set<ByteIncrement>(coding);
[detail] +      newSignal->fileData().set<OffsetInFile>(((header1.mid(14, 6).toInt()-1)*512));
[detail]      newSignal->setSamplingPeriod(1.0/header1.mid(26, 8).toDouble());
[detail] -    newSignal->setType(Signal::Waveform);
[detail] -    newSignal->setName(header1.mid(4, 4) );
[detail] +      newSignal->setStartTime(startTime);
[detail] +      newSignal->metaData()->setName(header1.mid(4, 4) );
[detail]      if(version > 14.00) {
[detail]        if(header2.mid(10, 1)=="Z" )
[detail] -        newSignal->setComponent(Signal::Vertical);
[detail] +          newSignal->metaData()->setComponent(SignalMetaData::Vertical);
[detail]        else if(header2.mid(10, 1)=="E" )
[detail] -        newSignal->setComponent(Signal::East);
[detail] +          newSignal->metaData()->setComponent(SignalMetaData::East);
[detail]        else if(header2.mid(10, 1)=="N" )
[detail] -        newSignal->setComponent(Signal::North);
[detail] +          newSignal->metaData()->setComponent(SignalMetaData::North);
[detail]        else
[detail] -        newSignal->setComponent(Signal::Vertical);
[detail] -    } else
[detail] -      newSignal->setComponent(Signal::Vertical);
[detail] +          newSignal->metaData()->setComponent(SignalMetaData::Vertical);
[detail] +      } else {
[detail] +        newSignal->metaData()->setComponent(SignalMetaData::Vertical);
[detail] +      }
[detail]      
[detail]      
[detail]      
[detail] @@ -1862,18 +1858,17 @@
[detail]      return false;
[detail]    }
[detail]  
[detail] -  for(int iSig=0; iSig<3; iSig++) {
[detail] -    Signal * newSignal=new Signal(_db);
[detail] +    for(IndexInFileSet i; i.value()<3; i++) {
[detail] +      SignalSegment * newSignal=new SignalSegment(_db);
[detail]      newSignal->setFile(this);
[detail] -    newSignal->setNumberInFile(iSig);
[detail] -    newSignal->setNSamples(h.field.NB_SAMPLES);
[detail] -    newSignal->setOffsetInFile(256+iSig*3);
[detail] -    newSignal->setStartTime(h.startTime().shifted(static_cast<double>(h.field.INT_OFFSET)/static_cast<double>(h.field.SAMPLING)));
[detail] +      newSignal->setIndexInFile(i);
[detail] +      newSignal->setSize(h.field.NB_SAMPLES);
[detail]      newSignal->setSamplingPeriod(1.0/h.field.SAMPLING);
[detail] -    newSignal->setType(Signal::Waveform);
[detail] -    setSignalName(newSignal, shortName(), "", 1, shortName());
[detail] -    newSignal->setCountPerVolt(h.countPerVolt(iSig));
[detail] -    newSignal->setComponent(h.component(iSig));
[detail] +      newSignal->fileData().set<OffsetInFile>(256+i.value()*3);
[detail] +      newSignal->setStartTime(h.startTime().shifted(static_cast<double>(h.field.INT_OFFSET)/static_cast<double>(h.field.SAMPLING)));
[detail] +      setSignalName(newSignal, shortName(IndexOfFile::first), "", 1, shortName(IndexOfFile::first));
[detail] +      newSignal->metaData()->setCountPerVolt(h.countPerVolt(i.value()));
[detail] +      newSignal->metaData()->setComponent(h.component(i.value()));
[detail]    }
[detail]    return true;
[detail]  }
[detail] @@ -1897,18 +1892,17 @@
[detail]      App::log(tr("Loading Syscom Smr: more or less than 3 channels, file header corrupted\n"));
[detail]      return false;
[detail]    }
[detail] -  for(int iSig=0; iSig<3; iSig++) {
[detail] -    Signal * newSignal=new Signal(_db);
[detail] +    for(IndexInFileSet i; i.value()<3; i++) {
[detail] +      SignalSegment * newSignal=new SignalSegment(_db);
[detail]      newSignal->setFile(this);
[detail] -    newSignal->setNumberInFile(iSig);
[detail] -    newSignal->setNSamples(h.field.NB_SAMPLES);
[detail] -    newSignal->setOffsetInFile(256+iSig*2);
[detail] -    newSignal->setStartTime(h.startTime().shifted(static_cast<double>(h.field.INT_OFFSET)/static_cast<double>(h.field.SAMPLING)));
[detail] +      newSignal->setIndexInFile(i);
[detail] +      newSignal->setSize(h.field.NB_SAMPLES);
[detail]      newSignal->setSamplingPeriod(1.0/h.field.SAMPLING);
[detail] -    newSignal->setType(Signal::Waveform);
[detail] -    setSignalName(newSignal, shortName(), "", 1, shortName());
[detail] -    newSignal->setCountPerVolt(h.countPerVolt(iSig));
[detail] -    newSignal->setComponent(h.component(iSig));
[detail] +      newSignal->fileData().set<OffsetInFile>(256+i.value()*2);
[detail] +      newSignal->setStartTime(h.startTime().shifted(static_cast<double>(h.field.INT_OFFSET)/static_cast<double>(h.field.SAMPLING)));
[detail] +      setSignalName(newSignal, shortName(IndexOfFile::first), "", 1, shortName(IndexOfFile::first));
[detail] +      newSignal->metaData()->setCountPerVolt(h.countPerVolt(i.value()));
[detail] +      newSignal->metaData()->setComponent(h.component(i.value()));
[detail]    }
[detail]    return true;
[detail]  }
[detail] @@ -1952,18 +1946,17 @@
[detail]      return false;
[detail]    }
[detail]  
[detail] -  for(int iSig=0; iSig<3; iSig++) {
[detail] -    Signal * newSignal=new Signal(_db);
[detail] +    for(IndexInFileSet i; i.value()<3; i++) {
[detail] +      SignalSegment * newSignal=new SignalSegment(_db);
[detail]      newSignal->setFile(this);
[detail] -    newSignal->setNumberInFile(iSig);
[detail] -    newSignal->setNSamples(h.field.NB_SAMPLES);
[detail] -    newSignal->setOffsetInFile(headerSize+iSig*2);
[detail] -    newSignal->setStartTime(h.startTime().shifted(static_cast<double>(h.field.INT_OFFSET)/static_cast<double>(h.field.SAMPLING)));
[detail] +      newSignal->setIndexInFile(i);
[detail] +      newSignal->setSize(h.field.NB_SAMPLES);
[detail]      newSignal->setSamplingPeriod(1.0/h.field.SAMPLING);
[detail] -    newSignal->setType(Signal::Waveform);
[detail] -    setSignalName(newSignal, shortName(), "", 1, shortName());
[detail] -    newSignal->setCountPerVolt(h.countPerVolt(iSig));
[detail] -    newSignal->setComponent(h.component(iSig));
[detail] +      newSignal->fileData().set<OffsetInFile>(headerSize+i.value()*2);
[detail] +      newSignal->setStartTime(h.startTime().shifted(static_cast<double>(h.field.INT_OFFSET)/static_cast<double>(h.field.SAMPLING)));
[detail] +      setSignalName(newSignal, shortName(IndexOfFile::first), "", 1, shortName(IndexOfFile::first));
[detail] +      newSignal->metaData()->setCountPerVolt(h.countPerVolt(i.value()));
[detail] +      newSignal->metaData()->setComponent(h.component(i.value()));
[detail]    }
[detail]    return true;
[detail]  }
[detail] @@ -1971,9 +1964,9 @@
[detail]  bool SignalFile::loadGuralpGcf()
[detail]  {
[detail]    TRACE;
[detail] -  QFile f(name());
[detail] +    QFile f(_name);
[detail]    if(!f.open(QIODevice::ReadOnly)) {
[detail] -    App::log(tr("Loading Guralp GCF values: unable to open file %1\n").arg(name()));
[detail] +      App::log(tr("Loading Guralp GCF values: unable to open file %1\n").arg(_name));
[detail]      return false;
[detail]    }
[detail]    QList<GuralpSignal *> sigList;
[detail] @@ -2000,20 +1993,20 @@
[detail]    }
[detail]  
[detail]    
[detail] -  int n=sigList.count();
[detail] -  for(int i=0; i<n; i++) {
[detail] -    GuralpSignal * gsig=sigList.at(i);
[detail] -    Signal * newSignal=new Signal(_db);
[detail] +    IndexInFileSet n;
[detail] +    n.setValue(sigList.count());
[detail] +    for(IndexInFileSet i; i<n; i++) {
[detail] +      GuralpSignal * gsig=sigList.at(i.value());
[detail] +      SignalSegment * newSignal=new SignalSegment(_db);
[detail]      newSignal->setFile(this);
[detail] -    newSignal->setNumberInFile(i);
[detail] -    newSignal->setNSamples(gsig->nSamples());
[detail] -    newSignal->setStartTime(gsig->startTime());
[detail] +      newSignal->setIndexInFile(i);
[detail] +      newSignal->setSize(gsig->nSamples());
[detail]      newSignal->setSamplingPeriod(1.0/gsig->samplingFrequency());
[detail] +      newSignal->setStartTime(gsig->startTime());
[detail]      newSignal->setTimeRange(gsig->timeRange());
[detail] -    newSignal->setType(Signal::Waveform);
[detail] -    setSignalName(newSignal, gsig->name(), "", i+1, shortName());
[detail] -    newSignal->setComponent(gsig->component());
[detail] -    newSignal->setMetaData<GuralpRecords>(gsig->records());
[detail] +      setSignalName(newSignal, gsig->name(), "", i.value()+1, shortName(IndexOfFile::first));
[detail] +      newSignal->metaData()->setComponent(gsig->component());
[detail] +      newSignal->fileData().set<GuralpRecords>(gsig->records());
[detail]    }
[detail]    qDeleteAll(sigList);
[detail]    return true;
[detail] @@ -2028,30 +2021,33 @@
[detail]      return false;
[detail]    }
[detail]  
[detail] -  for(int i=0; i<vol.count(); i++) {
[detail] -    const MiniSeedTrace& trace=*vol.at(i);
[detail] -
[detail] +    IndexInFileSet n;
[detail] +    n.setValue(vol.count());
[detail] +    for(IndexInFileSet i; i<n; i++) {
[detail] +      const MiniSeedTrace& trace=*vol.at(i.value());
[detail]      int nSamples=trace.nSamples();
[detail]      if(nSamples>0) {
[detail] -      Signal * newSignal=new Signal(_db);
[detail] +        SignalSegment * newSignal=new SignalSegment(_db);
[detail]        newSignal->setFile(this);
[detail] -      newSignal->setNumberInFile(i);
[detail] -      newSignal->setNSamples(nSamples);
[detail] -      newSignal->setOffsetInFile(0);
[detail] +        newSignal->setIndexInFile(i);
[detail] +        newSignal->setSize(nSamples);
[detail] +        newSignal->setSamplingFrequency(trace.samplingFrequency());
[detail]        newSignal->setStartTime(trace.startTime());
[detail] -      newSignal->setSamplingPeriod(1.0/trace.samplingFrequency());
[detail] -      newSignal->setType(Signal::Waveform);
[detail]        QString name;
[detail]        if(trace.network().isEmpty()) {
[detail]          name=trace.station();
[detail]        } else {
[detail]          name=trace.network()+"_"+trace.station();
[detail]        }
[detail] -      setSignalName(newSignal, name, "", 1, shortName());
[detail] -      if(trace.channel().endsWith("Z")) newSignal->setComponent(Signal::Vertical);
[detail] -      else if(trace.channel().endsWith("N")) newSignal->setComponent(Signal::North);
[detail] -      else if(trace.channel().endsWith("E")) newSignal->setComponent(Signal::East);
[detail] -      newSignal->setMetaData(trace.records());
[detail] +        setSignalName(newSignal, name, "", 1, shortName(IndexOfFile::first));
[detail] +        if(trace.channel().endsWith("Z")) newSignal->metaData()->setComponent(SignalMetaData::Vertical);
[detail] +        else if(trace.channel().endsWith("N")) newSignal->metaData()->setComponent(SignalMetaData::North);
[detail] +        else if(trace.channel().endsWith("E")) newSignal->metaData()->setComponent(SignalMetaData::East);
[detail] +        else {
[detail] +          App::log(tr("Miniseed: unrecognised channel name '%1'\n").arg(trace.channel()));
[detail] +          newSignal->metaData()->optionalData().set<Comments>(tr("unrecognized channel '%1'").arg(trace.channel()));
[detail] +        }
[detail] +        newSignal->fileData().set<MiniSeedRecords>(trace.records());
[detail]      }
[detail]    }
[detail]    return true;
[detail] @@ -2064,7 +2060,7 @@
[detail]  
[detail]    QFile f(_name);
[detail]    if(!f.open(QIODevice::ReadOnly)) {
[detail] -    App::log(tr("Loading Efispec3D values: unable to open file %1\n").arg(name()));
[detail] +      App::log(tr("Loading Efispec3D values: unable to open file %1\n").arg(_name));
[detail]      return false;
[detail]    }
[detail]    QDataStream s(&f);
[detail] @@ -2091,7 +2087,7 @@
[detail]  
[detail]    
[detail]    
[detail] -  QString name=shortName();
[detail] +    QString name=shortName(IndexOfFile::first);
[detail]    QRegularExpression namePattern("^(.+)\\.fsr\\.([0-9]{6})\\.gpl$");
[detail]    QRegularExpressionMatch nameMatch=namePattern.match(name);
[detail]    if(nameMatch.hasMatch()) {
[detail] @@ -2103,31 +2099,31 @@
[detail]      }
[detail]    }
[detail]  
[detail] -  static Signal::AmplitudeUnits units[]={Signal::Displacement,
[detail] -                                         Signal::Velocity,
[detail] -                                         Signal::Acceleration};
[detail] +    static SignalMetaData::AmplitudeUnits units[]={SignalMetaData::Displacement,
[detail] +                                                   SignalMetaData::Velocity,
[detail] +                                                   SignalMetaData::Acceleration};
[detail]    for(int unitIndex=0; unitIndex<3; unitIndex++) {
[detail]      for(int compIndex=0; compIndex<3; compIndex++) {
[detail] -      int signalIndex=unitIndex*3+compIndex;
[detail] -      Signal * newSignal=new Signal(_db);
[detail] -      newSignal->setFile(this);
[detail] -      newSignal->setNumberInFile(signalIndex);
[detail] -      newSignal->setNSamples(nSamples);
[detail] -      newSignal->setOffsetInFile(4+signalIndex*4);
[detail] -      newSignal->setStartTime(startTime);
[detail] +        IndexInFileSet signalIndex;
[detail] +        signalIndex.setValue(unitIndex*3+compIndex);
[detail] +        SignalSegment * newSignal=new SignalSegment(_db);
[detail] +        newSignal->setFile(this);
[detail] +        newSignal->setIndexInFile(signalIndex);
[detail] +        newSignal->setSize(nSamples);
[detail] +        newSignal->fileData().set<OffsetInFile>(4+signalIndex.value()*4);
[detail]        newSignal->setSamplingPeriod(samplingPeriod);
[detail] -      newSignal->setType(Signal::Waveform);
[detail] -      newSignal->setAmplitudeUnit(units[unitIndex]);
[detail] -      setSignalName(newSignal, name, "", signalIndex, shortName());
[detail] +        newSignal->setStartTime(startTime);
[detail] +        newSignal->metaData()->setAmplitudeUnit(units[unitIndex]);
[detail] +        setSignalName(newSignal, name, "", signalIndex.value(), shortName(IndexOfFile::first));
[detail]        switch(compIndex%3) {
[detail]        case 1:
[detail] -        newSignal->setComponent(Signal::North);
[detail] +          newSignal->metaData()->setComponent(SignalMetaData::North);
[detail]          break;
[detail]        case 2:
[detail] -        newSignal->setComponent(Signal::Vertical);
[detail] +          newSignal->metaData()->setComponent(SignalMetaData::Vertical);
[detail]          break;
[detail]        default:
[detail] -        newSignal->setComponent(Signal::East);
[detail] +          newSignal->metaData()->setComponent(SignalMetaData::East);
[detail]          break;
[detail]        }
[detail]      }
[detail] @@ -2135,20 +2131,20 @@
[detail]    return true;
[detail]  }
[detail]  
[detail] -void SignalFile::setSignalName(Signal * sig, QString stationName,
[detail] +  void SignalFile::setSignalName(SignalSegment * sig, QString stationName,
[detail]                                     QString sufix, int recNum, QString fileName)
[detail]  {
[detail]    TRACE;
[detail]    if(GeopsyCoreEngine::instance()->preferences()->stationNameFile())
[detail] -    sig->setName(stationName + sufix);
[detail] +      sig->metaData()->setName(stationName+sufix);
[detail]    else if(GeopsyCoreEngine::instance()->preferences() ->stationNameRxxx()) {
[detail] -    sig->setName(QString::asprintf("R%03i", recNum));
[detail] +      sig->metaData()->setName(QString::asprintf("R%03i", recNum));
[detail]    } else {
[detail] -    sig->setName(fileName + sufix);
[detail] +      sig->metaData()->setName(fileName+sufix);
[detail]    }
[detail]  }
[detail]  
[detail] -void SignalFile::removeFile()
[detail] +  void SignalFile::hardRemove()
[detail]  {
[detail]    TRACE;
[detail]    if(!_isOriginalFile) {
[detail] @@ -2158,36 +2154,54 @@
[detail]    }
[detail]  }
[detail]  
[detail] -void SignalFile::xml_writeProperties(XML_WRITEPROPERTIES_ARGS) const
[detail] +  void SignalFile::xml_attributes(XML_ATTRIBUTES_ARGS) const
[detail]  {
[detail] -  Q_UNUSED(context)
[detail] -  writeProperty(s, "name", _name);
[detail] -  writeProperty(s, "format", _format.name());
[detail] -  writeProperty(s, "original", _isOriginalFile);
[detail] -  writeProperty(s, "size", _size);
[detail] -  writeProperty(s, "crc32", _crc32);
[detail] +    static const QString keys[]={"name", "size", "crc"};
[detail] +    attributes.add(keys[0], _name);
[detail] +    attributes.add(keys[1], QString::number(_size));
[detail] +    attributes.add(keys[2], QString::number(_crc32));
[detail] +    AbstractSignalFile::xml_attributes(attributes, context);
[detail]  }
[detail]  
[detail] -void SignalFile::xml_writeChildren(XML_WRITECHILDREN_ARGS) const
[detail] +  bool SignalFile::xml_setAttribute(XML_SETATTRIBUTE_ARGS)
[detail]  {
[detail] -  SubSignalPool subPool;
[detail] -  subPool.addFile(this);
[detail] -  for(SubSignalPool::iterator it=subPool.begin(); it!=subPool.end(); ++it) {
[detail] -    (*it)->xml_save(s, context);
[detail] +    bool ok=true;
[detail] +    const StringSection& att=it.key();
[detail] +    if(att.size()<1) return false;
[detail] +    switch (att[0].unicode()) {
[detail] +    case 'n':
[detail] +      _name=it.value().toStringBuffer();
[detail] +      break;
[detail] +    case 's':
[detail] +      _size=it.value().toLongLong(ok);
[detail] +      break;
[detail] +    case 'c':
[detail] +      _crc32=it.value().toUInt(ok);
[detail] +      break;
[detail] +    default:
[detail] +      if(!AbstractSignalFile::xml_setAttribute(it, context)) {
[detail] +        return false;
[detail] +      }
[detail] +      break;
[detail]    }
[detail] +    return ok;
[detail]  }
[detail]  
[detail]  XMLMember SignalFile::xml_member(XML_MEMBER_ARGS)
[detail]  {
[detail] -  Q_UNUSED(context)
[detail]    Q_UNUSED(attributes)
[detail] -  if(tag=="Signal") {
[detail] +    Q_UNUSED(context)
[detail] +    if(tag=="Sig") {
[detail] +      ASSERT(_db==static_cast<SignalDatabase *>(context));
[detail] +      SignalSegment * sig=new SignalSegment(this);
[detail] +      _signalSegments.append(sig);
[detail] +      return XMLMember(sig);
[detail] +    } else if(tag=="Signal") { 
[detail]      ASSERT(_db==static_cast<SignalDatabase *>(context));
[detail] -    Signal * sig=new Signal(_db);
[detail] +      SignalSegment * sig=new SignalSegment(_db);
[detail]      sig->setFile(this);
[detail]      return XMLMember(sig);
[detail] -  }
[detail] -  if(tag=="name") return XMLMember(0);
[detail] +    } else if(tag=="name") return XMLMember(0);   
[detail]    else if(tag=="format") return XMLMember(1);
[detail]    else if(tag=="original") return XMLMember(2);
[detail]    else if(tag=="size") return XMLMember(3);
[detail] @@ -2203,12 +2217,12 @@
[detail]    bool ok=true;
[detail]    switch(memberID) {
[detail]    case 0:
[detail] -    setName(content.toStringBuffer());
[detail] +      _name=content.toStringBuffer();
[detail]      return true;
[detail]    case 1:
[detail]      setFormat(content.toStringBuffer());
[detail]      if(format()==SignalFileFormat(SignalFileFormat::Unknown)) {
[detail] -      App::log(tr("Unkown format '%1' for file '%2'\n").arg(content.toStringView()).arg(name()));
[detail] +        App::log(tr("Unkown format '%1' for file '%2'\n").arg(content.toStringView()).arg(_name));
[detail]        return false;
[detail]      } else {
[detail]        return true;
[detail] @@ -2278,35 +2292,36 @@
[detail]    
[detail]    SubSignalPool subPool;
[detail]    subPool.addFile(this);
[detail] -  int n=subPool.count();
[detail] -  for(int i=0; i<n;i++) {
[detail] -    Signal& sig=*subPool.at(i);
[detail] -    if(sig.numberInFile()==-1) {
[detail] -      sig.setNumberInFile(i);
[detail] +    IndexInFileSet n;
[detail] +    n.setValue(subPool.count());
[detail] +    for(IndexInFileSet i; i<n;i++) {
[detail] +      SignalSegment& sig=*subPool.at(i.value());
[detail] +      if(sig.indexInFile()==IndexInFile::null) {
[detail] +        sig.setIndexInFile(i);
[detail]      }
[detail]    }
[detail]    
[detail]    
[detail]    
[detail] -  QString fileName=name();
[detail] -  if(!CoreApplication::instance()->isBatch()) {
[detail] +    if(CoreApplication::hasInputTerminal() || CoreApplication::instance()->hasGui()) {
[detail]      QString log;
[detail]      StreamRedirection sr(new StringStream(&log));
[detail] -    if(!hasValidContent(fileName)) {
[detail] +      if(!hasValidContent(_name)) {
[detail]        PathTranslatorOptions options;
[detail]        options.setTitle(tr("Opening Database..."));
[detail]        options.setFileType(tr("Signal file (%1)"));
[detail]        options.setForceAsk(false);
[detail] +        QString fileName=_name;
[detail]        do {
[detail]          options.setErrorLog(log);
[detail] -        fileName=CoreApplication::instance()->translatePath(name(), options);
[detail] +          fileName=CoreApplication::instance()->translatePath(_name, options);
[detail]          if(fileName.isEmpty()) {
[detail]            return true;
[detail]          }
[detail]          options.setForceAsk(true); 
[detail]          log.clear();
[detail]        } while(!hasValidContent(fileName));
[detail] -      setName(fileName);
[detail] +        _name=fileName;
[detail]        setPathModified(true);
[detail]      }
[detail]      if(_size==0 || _crc32==0) { 
[detail] @@ -2320,12 +2335,44 @@
[detail]    return true;
[detail]  }
[detail]  
[detail] -QString SignalFile::keyName() const
[detail] +  bool SignalFile::save(const QDir& d)
[detail]  {
[detail]    TRACE;
[detail] -  quint64 val=_size;
[detail] -  val*=_crc32;
[detail] -  return QString("%1").arg(val, 16, 16, QChar('0'));
[detail] +    _name=File::uniqueName(_name, d);
[detail] +    SubSignalPool subPool;
[detail] +    subPool.addFile(this);
[detail] +    if(subPool.saveGeopsySignal(_name) ) {
[detail] +      
[detail] +      _format=SignalFileFormat::GeopsySignal;
[detail] +      _isOriginalFile=true;
[detail] +      int nSignals=subPool.count();
[detail] +      int offset=GEOPSYSIGNAL_HEADERSIZE+nSignals*4;
[detail] +      for(int i=0; i<nSignals; i++) {
[detail] +        SignalSegment * sig=subPool.at(i);
[detail] +        sig->fileData().set<OffsetInFile>(offset);
[detail] +        offset+=sizeof(double)*sig->size();
[detail] +      }
[detail] +      return true;
[detail] +    } else {
[detail] +      Message::warning(MSG_ID, tr( "Saving Geopsy signals ..." ),
[detail] +                                              tr( "Cannot write to file: %1\n"
[detail] +                                                      "(Permission, disk space,...)" ). arg(_name), Message::ok(), true);
[detail] +      return false;
[detail] +    }
[detail] +  }
[detail] +
[detail] +  bool SignalFile::isSameData(const SignalFile * o) const
[detail] +  {
[detail] +    if(!AbstractSignalFile::isSameData(o)) {
[detail] +      return false;
[detail] +    }
[detail] +    int n=numberOfSignals();
[detail] +    for(int i=0; i<n; i++) {
[detail] +      if(!(signalSegment(i)->fileData()==o->signalSegment(i)->fileData())) {
[detail] +        return false;
[detail] +      }
[detail] +    }
[detail] +    return true;
[detail]  }
[detail]  
[detail]  } 
[detail]                 src/SignalFileFormat.cpp:  version-4.5.1	modified out of comments
[detail] --- src/SignalFileFormat.cpp-version-4.5.1-stripped	2025-09-28 04:01:05.207503984 +0200
[detail] +++ src/SignalFileFormat.cpp-HEAD-stripped	2025-09-28 04:01:05.211504004 +0200
[detail] @@ -66,6 +66,11 @@
[detail]    return _id==o._id && _customFormat==o._customFormat;
[detail]  }
[detail]  
[detail] +bool SignalFileFormat::operator!=(const SignalFileFormat& o) const
[detail] +{
[detail] +  return _id!=o._id || _customFormat!=o._customFormat;
[detail] +}
[detail] +
[detail]  bool SignalFileFormat::operator<(const SignalFileFormat& o) const
[detail]  {
[detail]    return _id<o._id;
[detail] @@ -120,59 +125,6 @@
[detail]    return formats;
[detail]  }
[detail]  
[detail] -QString SignalFileFormat::name() const
[detail] -{
[detail] -  TRACE;
[detail] -  switch (_id) {
[detail] -  case Seg2: return "Seg2";
[detail] -  case SegD: return "SegD";
[detail] -  case SuLittleEndian: return "SuLittleEndian";
[detail] -  case SuBigEndian: return "SuBigEndian";
[detail] -  case Tomo: return "Tomo";
[detail] -  case RD3: return "RD3";
[detail] -  case SacLittleEndian: return "SacLittleEndian";
[detail] -  case SacBigEndian: return "SacBigEndian";
[detail] -  case Radan: return "Radan";
[detail] -  case Gse2: return "Gse2";
[detail] -  case CityShark2: return "CityShark2";
[detail] -  case MiniShark: return "MiniShark";
[detail] -  case Ascii:
[detail] -    if(_customFormat) {
[detail] -      return _customFormat->name();
[detail] -    } else {
[detail] -      return "Ascii";
[detail] -    }
[detail] -  case AsciiOneColumn: return "AsciiOneColumn";
[detail] -  case GeopsySignal: return "GeopsySignal";
[detail] -  case Saf: return "Saf";
[detail] -  case MultiGse2: return "MultiGse2";
[detail] -  case Sismalp: return "Sismalp";
[detail] -  case Wav: return "Wav";
[detail] -  case SegYLittleEndian: return "SegYLittleEndian";
[detail] -  case SegYBigEndian: return "SegYBigEndian";
[detail] -  case PasscalSegYLittleEndian: return "PasscalSegYLittleEndian";
[detail] -  case PasscalSegYBigEndian: return "PasscalSegYBigEndian";
[detail] -  case Temporary: return "Temporary";
[detail] -  case SyscomXmr: return "SyscomXmr";
[detail] -  case SyscomSmr: return "SyscomSmr";
[detail] -  case SyscomVmrx: return "SyscomVmrx";
[detail] -  case GuralpGcf: return "GuralpGcf";
[detail] -  case MiniSeed: return "MiniSeed";
[detail] -  case Fourier: return "Fourier";
[detail] -  case Efispec3D: return "Efispec3D";
[detail] -  case FebusHDF5: return "FebusHDF5";
[detail] -  case Custom:
[detail] -    if(_customFormat) {
[detail] -      return _customFormat->name();
[detail] -    }
[detail] -    break;
[detail] -  case FormatCount:
[detail] -  case Unknown:
[detail] -    break;
[detail] -  }
[detail] -  return "Unknown";
[detail] -}
[detail] -
[detail]  QString SignalFileFormat::caption() const
[detail]  {
[detail]    TRACE;
[detail] @@ -213,6 +165,7 @@
[detail]    case Fourier: return tr("Fourier spectrum");
[detail]    case Efispec3D: return "Efispec3D";
[detail]    case FebusHDF5: return "Febus HDF5";
[detail] +  case GenericHDF5: return "Generic HDF5";
[detail]    case Custom:
[detail]      if(_customFormat) {
[detail]        return _customFormat->caption();
[detail] @@ -273,7 +226,9 @@
[detail]    case MiniSeed: return "*.mseed *.msd *";
[detail]    case Fourier: return "*.fourier";
[detail]    case Efispec3D: return "*.gpl";
[detail] -  case FebusHDF5: return "*.hd5";
[detail] +  case FebusHDF5:;
[detail] +  case GenericHDF5:
[detail] +    return "*.hd5 *.h5";
[detail]    }
[detail]    return "*";
[detail]  }
[detail] @@ -326,7 +281,9 @@
[detail]    case MiniSeed: return ".mseed";
[detail]    case Fourier: return ".fourier";
[detail]    case Efispec3D: return ".gpl";
[detail] -  case FebusHDF5: return ".hd5";
[detail] +  case FebusHDF5:;
[detail] +  case GenericHDF5:
[detail] +    return ".hd5";
[detail]    }
[detail]    return QString();
[detail]  }
[detail] @@ -379,91 +336,85 @@
[detail]    return true;
[detail]  }
[detail]  
[detail] +ENUM_AS_STRING_BEGIN(SignalFileFormat, Format)
[detail] +ENUM_AS_STRING_DATA_36(Ascii,
[detail] +                       AsciiOneColumn,
[detail] +                       CityShark2,
[detail] +                       Custom,
[detail] +                       Efispec3D,
[detail] +                       FebusHDF5,
[detail] +                       FormatCount,
[detail] +                       Fourier,
[detail] +                       GenericHDF5,
[detail] +                       GeopsySignal,
[detail] +                       Gse2,
[detail] +                       GuralpGcf,
[detail] +                       MiniSeed,
[detail] +                       MiniShark,
[detail] +                       MultiGse2,
[detail] +                       PasscalSegYBigEndian,
[detail] +                       PasscalSegYLittleEndian,
[detail] +                       Radan,
[detail] +                       RD3,
[detail] +                       SacBigEndian,
[detail] +                       SacLittleEndian,
[detail] +                       Saf,
[detail] +                       Seg2,
[detail] +                       SegD,
[detail] +                       SegYBigEndian,
[detail] +                       SegYLittleEndian,
[detail] +                       Sismalp,
[detail] +                       SuBigEndian,
[detail] +                       SuLittleEndian,
[detail] +                       SyscomSmr,
[detail] +                       SyscomVmrx,
[detail] +                       SyscomXmr,
[detail] +                       Temporary,
[detail] +                       Tomo,
[detail] +                       Unknown,
[detail] +                       Wav);
[detail] +ENUM_AS_STRING_SYNONYM("City2", CityShark2);
[detail] +ENUM_AS_STRING_DEFAULT_VALUE(Unknown);
[detail] +ENUM_AS_STRING_END
[detail]  
[detail] -SignalFileFormat SignalFileFormat::fromName(QString n)
[detail] +
[detail] +QString SignalFileFormat::name() const
[detail]  {
[detail]    TRACE;
[detail] -  if(n.length()<3) return Unknown;
[detail] -  n=n.toLower();
[detail] -  switch (n[0].unicode()) {
[detail] -  case 'a':
[detail] -    if(n.startsWith("ascii")) {
[detail] -      if(n=="ascii") return Ascii;
[detail] -      else if(n=="asciionecolumn") return AsciiOneColumn;
[detail] -      else return GeopsyCoreEngine::instance()->customFileFormats()->fromName(n);
[detail] -    } else if(n=="automatic"){
[detail] -      return SignalFileFormat::Unknown;
[detail] +  switch(_id) {
[detail] +  case Ascii:
[detail] +    if(_customFormat) {
[detail] +      return _customFormat->name();
[detail] +    } else {
[detail] +      return convertFormat(Ascii);
[detail]      }
[detail] -    break;
[detail] -  case 'c':
[detail] -    if(n=="cityshark2") return CityShark2;
[detail] -    else if(n=="city2") return CityShark2; 
[detail] -    break;
[detail] -  case 'e':
[detail] -    if(n=="efispec3d") return Efispec3D;
[detail] -    break;
[detail] -  case 'f':
[detail] -    if(n=="febushdf5") return FebusHDF5;
[detail] -    break;
[detail] -  case 'g':
[detail] -    if(n=="gse2") return Gse2;
[detail] -    else if(n=="geopsysignal") return GeopsySignal;
[detail] -    else if(n=="guralpgcf") return GuralpGcf;
[detail] -    break;
[detail] -  case 'm':
[detail] -    if(n=="multigse2") return MultiGse2;
[detail] -    else if(n=="miniseed") return MiniSeed;
[detail] -    else if(n=="minishark") return MiniShark;
[detail] -    break;
[detail] -  case 'r':
[detail] -    if(n=="rd3") return RD3;
[detail] -    else if(n=="radan") return Radan;
[detail] -    break;
[detail] -  case 's':
[detail] -    switch (n[2].unicode()) {
[detail] -    case 'f':
[detail] -      if(n=="saf") return Saf;
[detail] -      break;
[detail] -    case 'l':
[detail] -      if(n=="sulittleendian") return SuLittleEndian;
[detail] -      break;
[detail] -    case 'b':
[detail] -      if(n=="subigendian") return SuBigEndian;
[detail] -      break;
[detail] -    case 'c':
[detail] -      if(n=="saclittleendian") return SacLittleEndian;
[detail] -      else if(n=="sacbigendian") return SacBigEndian;
[detail] -      break;
[detail] -    case 'g':
[detail] -      if(n=="seg2") return Seg2;
[detail] -      else if(n=="segylittleendian") return SegYLittleEndian;
[detail] -      else if(n=="segybigendian") return SegYBigEndian;
[detail] -      break;
[detail] -    case 's':
[detail] -      if(n=="sismalp") return Sismalp;
[detail] -      else if(n=="syscomxmr") return SyscomXmr;
[detail] -      else if(n=="syscomsmr") return SyscomSmr;
[detail] -      else if(n=="syscomvmrx") return SyscomVmrx;
[detail] -      break;
[detail] -    default:
[detail] -      break;
[detail] +  case Custom:
[detail] +    if(_customFormat) {
[detail] +      return _customFormat->name();
[detail] +    } else {
[detail] +      return convertFormat(Unknown);
[detail]      }
[detail] -    break;
[detail] -  case 't':
[detail] -    if(n=="tomo") return Tomo;
[detail] -    else if(n=="temporary") return Temporary;
[detail] -    break;
[detail] -  case 'u':
[detail] -    if(n=="unknown") return Unknown;
[detail] -    break;
[detail] -  case 'w':
[detail] -    if(n=="wav") return Wav;
[detail] -    break;
[detail]    default:
[detail] -    break;
[detail] +    return convertFormat(_id);
[detail] +  }
[detail]    }
[detail] +
[detail] +
[detail] +SignalFileFormat SignalFileFormat::fromName(QString n)
[detail] +{
[detail] +  TRACE;
[detail] +  bool ok=true;
[detail] +  if(n.isEmpty()) { 
[detail] +    return Unknown;
[detail] +  } else {
[detail] +    Format f=convertFormat(n, ok);
[detail] +    if(ok) {
[detail] +      return f;
[detail] +    } else {
[detail]    return GeopsyCoreEngine::instance()->customFileFormats()->fromName(n);
[detail]  }
[detail] +  }
[detail] +}
[detail]  
[detail]  
[detail]  SignalFileFormat SignalFileFormat::fromCaptionFilter(QString cf)
[detail] @@ -516,6 +467,7 @@
[detail]    case 'n':
[detail]      if(cf.startsWith(tr("mini seed"))) return MiniSeed;
[detail]      else if(cf.startsWith(tr("minishark"))) return MiniShark;
[detail] +    else if(cf.startsWith(tr("generic hdf5"))) return GenericHDF5;
[detail]      break;
[detail]    case 'o':
[detail]      if(cf.startsWith(tr("geopsy signal"))) return GeopsySignal;
[detail] @@ -555,6 +507,7 @@
[detail]  SignalFileFormat SignalFileFormat::fromContent(QString fileName)
[detail]  {
[detail]    TRACE;
[detail] +  APP_LOG(3, tr("Begin SignalFileFormat::fromContent\n"));
[detail]    SignalFileFormat fmt;
[detail]    
[detail]    
[detail] @@ -578,6 +531,7 @@
[detail]      return Unknown;
[detail]    }
[detail]    
[detail] +  APP_LOG(3, tr("  testing GeopsySignal...\n"));
[detail]    GeopsySignalHeader h;
[detail]    QDataStream sd(&f);
[detail]    sd.readRawData(h.raw, GEOPSYSIGNAL_HEADERSIZE);
[detail] @@ -591,6 +545,7 @@
[detail]    
[detail]    QTextStream st(&f);
[detail]    QString str=st.readLine();
[detail] +  APP_LOG(3, tr("  testing Tomo, Seg2, Gse, CityShark, Saf and Wav...\n"));
[detail]    if(str.indexOf("Arrival_times_file")>-1) {
[detail]      return Tomo;
[detail]    }
[detail] @@ -613,9 +568,20 @@
[detail]      return Wav;
[detail]    }
[detail]    
[detail] +  APP_LOG(3, tr("  testing HDF5...\n"));
[detail] +  if(isGenericHDF5(fileName)) {
[detail] +    if(isFebusHDF5(fileName)) {
[detail] +      return FebusHDF5;
[detail] +    } else {
[detail] +      return GenericHDF5;
[detail] +    }
[detail] +  }
[detail] +  
[detail] +  APP_LOG(3, tr("  testing SAC...\n"));
[detail]    fmt=SACHeader::determineByteOrder(fileName);
[detail]    if(fmt.id()!=Unknown) return fmt;
[detail]    
[detail] +  APP_LOG(3, tr("  testing MiniSeed...\n"));
[detail]    if(MiniSeedVolume::isValid(fileName)) {
[detail]      return MiniSeed;
[detail]    } else {
[detail] @@ -627,8 +593,7 @@
[detail]      }
[detail]    }
[detail]    
[detail] -  if(isFebusHDF5(fileName)) return FebusHDF5;
[detail] -  
[detail] +  APP_LOG(3, tr("  testing Guralp...\n"));
[detail]    f.seek(0); 
[detail]    App::freeze(true);
[detail]    GuralpCompressedBlock b;
[detail] @@ -647,6 +612,7 @@
[detail]    App::freeze(false);
[detail]    
[detail]    
[detail] +  APP_LOG(3, tr("  testing Passcal, SegY and SU...\n"));
[detail]    fmt=PasscalSegYHeader::determineByteOrder(fileName, 1);
[detail]    if(fmt.id()!=Unknown) return fmt;
[detail]    
[detail] @@ -657,10 +623,12 @@
[detail]    if(fmt.id()!=Unknown) return fmt;
[detail]  
[detail]    
[detail] +  APP_LOG(3, tr("  Checking suffix...\n"));
[detail]    QFileInfo finfo(fileName);
[detail]    fmt=fromSuffix(finfo.suffix());
[detail]    if(fmt.id()!=Unknown) return fmt;
[detail]    
[detail] +  APP_LOG(3, tr("  Testing custom formats...\n"));
[detail]    fmt=GeopsyCoreEngine::instance()->customFileFormats()->fromContent(fileName);
[detail]    if(fmt.id()!=Unknown) return fmt;
[detail]    
[detail] @@ -707,8 +675,8 @@
[detail]        }
[detail]        break;
[detail]      case 'h':
[detail] -      if(suffix=="hd5") {
[detail] -        fmt=FebusHDF5;
[detail] +      if(suffix=="hd5" || suffix=="h5") {
[detail] +        fmt=GenericHDF5;
[detail]        }
[detail]        break;
[detail]      case 'm':
[detail] @@ -850,32 +818,30 @@
[detail]  bool SignalFileFormat::isFebusHDF5(const QString& fileName)
[detail]  {
[detail]  #ifdef HAS_HDF5
[detail] -  hid_t file, dset;
[detail] +  if(H5Fis_hdf5(fileName.toUtf8().data())>0) {
[detail] +    hid_t file;
[detail]  
[detail]    file=H5Fopen(fileName.toUtf8().data(), H5F_ACC_RDONLY, H5P_DEFAULT);
[detail]    if(file<0) {
[detail]      return false;
[detail]    }
[detail] -  dset=H5Dopen(file, "strain", H5P_DEFAULT);
[detail] -  if(dset<0) {
[detail] +    bool ret=(H5Lexists(file, "strain", H5P_DEFAULT)>0 &&
[detail] +              H5Lexists(file, "time", H5P_DEFAULT)>0 &&
[detail] +              H5Lexists(file, "distance", H5P_DEFAULT)>0);
[detail]      H5Fclose(file);
[detail] -    return false;
[detail] +    return ret;
[detail]    }
[detail] -  H5Dclose(dset);
[detail] -  dset=H5Dopen(file, "time", H5P_DEFAULT);
[detail] -  if(dset<0) {
[detail] -    H5Fclose(file);
[detail] -    return false;
[detail] -  }
[detail] -  H5Dclose(dset);
[detail] -  dset=H5Dopen(file, "distance", H5P_DEFAULT);
[detail] -  if(dset<0) {
[detail] -    H5Fclose(file);
[detail] +#else
[detail] +  Q_UNUSED(fileName)
[detail] +  App::log(1, tr("HDF5 not supported, check configuration options.\n"));
[detail] +#endif
[detail]      return false;
[detail]    }
[detail] -  H5Dclose(dset);
[detail] -  H5Fclose(file);
[detail] -  return true;
[detail] +
[detail] +bool SignalFileFormat::isGenericHDF5(const QString& fileName)
[detail] +{
[detail] +#ifdef HAS_HDF5
[detail] +  return H5Fis_hdf5(fileName.toUtf8().data())>0;
[detail]  #else
[detail]    Q_UNUSED(fileName)
[detail]    App::log(1, tr("HDF5 not supported, check configuration options.\n"));
[detail]                   src/SignalFilePool.cpp:  version-4.5.1	modified out of comments
[detail] --- src/SignalFilePool.cpp-version-4.5.1-stripped	2025-09-28 04:01:05.231504100 +0200
[detail] +++ src/SignalFilePool.cpp-HEAD-stripped	2025-09-28 04:01:05.235504119 +0200
[detail] @@ -7,6 +7,7 @@
[detail]  #include "SignalFilePool.h"
[detail]  #include "GeopsyCoreEngine.h"
[detail]  #include "SignalDatabase.h"
[detail] +#include "SignalFileSet.h"
[detail]  
[detail]  namespace GeopsyCore {
[detail]  
[detail] @@ -21,32 +22,36 @@
[detail]  {
[detail]    TRACE;
[detail]    for(const_iterator it=files.begin(); it!=files.end(); ++it) {
[detail] -    SignalFile * sigFile=*it;
[detail] +    AbstractSignalFile * sigFile=*it;
[detail]      sigFile->setDatabase(_db);
[detail]      append(sigFile);
[detail]    }
[detail]    
[detail] -  files.QList<SignalFile *>::clear();
[detail] +  files.QList<AbstractSignalFile *>::clear();
[detail]  }
[detail]  
[detail]  void SignalFilePool::clear()
[detail]  {
[detail]    TRACE;
[detail]    qDeleteAll(*this);
[detail] -  QList<SignalFile *>::clear();
[detail] +  QList<AbstractSignalFile *>::clear();
[detail]  }
[detail]  
[detail] -void SignalFilePool::remove(SignalFile * f)
[detail] +void SignalFilePool::remove(AbstractSignalFile * f)
[detail]  {
[detail]    TRACE;
[detail]    int index=indexOf(f);
[detail]    if(index!=-1) {
[detail] -    QList<SignalFile *>::removeAt(index);
[detail] +    GeopsyCoreEngine * eng=GeopsyCoreEngine::instance();
[detail] +    eng->beginRemoveFile(_db, index);
[detail] +    QList<AbstractSignalFile *>::removeAt(index);
[detail] +    eng->endRemoveFile(_db);
[detail]      delete f;
[detail]    }
[detail]  }
[detail]  
[detail] -bool SignalFilePool::load(QString name, SignalFileFormat format)
[detail] +
[detail] +bool SignalFilePool::load(QString name, SignalFileFormat format, SubSignalPool * subPool)
[detail]  {
[detail]    TRACE;
[detail]    QFileInfo f(name);
[detail] @@ -64,13 +69,60 @@
[detail]      format=SignalFileFormat::fromContent(pname);
[detail]    }
[detail]    if(format.id()!=SignalFileFormat::Unknown) {
[detail] +    QElapsedTimer chrono;
[detail]      SignalFile * newFile=new SignalFile(_db, pname, format);
[detail] -    bool ret=newFile->load();
[detail] -    if(!ret) {
[detail] -      removeAt(indexOf(newFile));
[detail] +    chrono.start();
[detail] +    if(newFile->load()) {
[detail] +      qint64 tLoad=chrono.nsecsElapsed();
[detail] +      if(subPool) {
[detail] +        subPool->addFile(newFile);
[detail] +      }
[detail] +      qint64 tSubpoolAdd=chrono.nsecsElapsed();
[detail] +      
[detail] +      for(const_iterator it=begin(); it!=end(); ++it) {
[detail] +        AbstractSignalFile * file=*it;
[detail] +        if(file!=newFile && file->isSameData(newFile)) {
[detail] +          if(file->xml_inherits(SignalFileSet::xmlSignalFileSetTag)) {
[detail] +            static_cast<SignalFileSet *>(file)->add(newFile);
[detail] +            delete newFile;
[detail] +            qint64 tMerge=chrono.nsecsElapsed();
[detail] +            APP_LOG(2, tr("  Timing: load %1, add subpool %2, merge file %3\n")
[detail] +                           .arg(Number::secondsToDuration(tLoad*1e-9))
[detail] +                           .arg(Number::secondsToDuration((tSubpoolAdd-tLoad)*1e-9))
[detail] +                           .arg(Number::secondsToDuration((tMerge-tSubpoolAdd)*1e-9)));
[detail] +            return true;
[detail] +          } else if(file->xml_inherits(SignalFile::xmlSignalFileTag)) {
[detail] +            SignalFileSet * newFileSet=new SignalFileSet(_db, format);
[detail] +            newFileSet->add(static_cast<SignalFile *>(file));
[detail] +            newFileSet->add(newFile);
[detail] +            remove(file);
[detail]        delete newFile;
[detail] +            qint64 tMerge=chrono.nsecsElapsed();
[detail] +            _db->addFile(newFileSet);
[detail] +            qint64 tDBAdd=chrono.nsecsElapsed();
[detail] +            APP_LOG(2, tr("  Timing: load %1, add subpool %2, merge file %3, add db %4\n")
[detail] +                           .arg(Number::secondsToDuration(tLoad*1e-9))
[detail] +                           .arg(Number::secondsToDuration((tSubpoolAdd-tLoad)*1e-9))
[detail] +                           .arg(Number::secondsToDuration((tMerge-tSubpoolAdd)*1e-9))
[detail] +                           .arg(Number::secondsToDuration((tDBAdd-tMerge)*1e-9)));
[detail] +            return true;
[detail] +          }
[detail] +        }
[detail] +      }
[detail] +      qint64 tMerge=chrono.nsecsElapsed();
[detail] +      
[detail] +      _db->addFile(newFile);
[detail] +      qint64 tDBAdd=chrono.nsecsElapsed();
[detail] +      APP_LOG(2, tr("  Timing: load %1, add subpool %2, merge file %3, add db %4\n")
[detail] +                     .arg(Number::secondsToDuration(tLoad*1e-9))
[detail] +                     .arg(Number::secondsToDuration((tSubpoolAdd-tLoad)*1e-9))
[detail] +                     .arg(Number::secondsToDuration((tMerge-tSubpoolAdd)*1e-9))
[detail] +                     .arg(Number::secondsToDuration((tDBAdd-tMerge)*1e-9)));
[detail] +      return true;
[detail] +    } else {
[detail] +      delete newFile;
[detail] +      return false;
[detail]      }
[detail] -    return ret;
[detail]    } else {
[detail]      Message::warning(MSG_ID, tr("Loading signal ..."),
[detail]                            tr("Unknown format for %1").arg(pname), Message::cancel(), true);
[detail] @@ -78,17 +130,4 @@
[detail]    }
[detail]  }
[detail]  
[detail] -SignalFile * SignalFilePool::find(QString fileName) const
[detail] -{
[detail] -  TRACE;
[detail] -  for(const_iterator it=begin(); it!=end(); ++it) {
[detail] -    SignalFile * sigFile=*it;
[detail] -    if(sigFile->shortName()==fileName || sigFile->name()==fileName) {
[detail] -      return sigFile;
[detail] -    }
[detail] -  }
[detail] -  return 0;
[detail] -}
[detail] -
[detail] -
[detail]  } 
[detail]                    src/SignalFileSet.cpp:  version-4.5.1	no last version available
[detail]                      src/SignalGroup.cpp:  version-4.5.1	modified out of comments
[detail] --- src/SignalGroup.cpp-version-4.5.1-stripped	2025-09-28 04:01:05.255504215 +0200
[detail] +++ src/SignalGroup.cpp-HEAD-stripped	2025-09-28 04:01:05.259504235 +0200
[detail] @@ -2,7 +2,7 @@
[detail]  
[detail]  #include "SignalGroup.h"
[detail]  #include "SignalDatabase.h"
[detail] -#include "GeoSignal.h"
[detail] +#include "SignalSegment.h"
[detail]  #include "SubSignalPool.h"
[detail]  #include "SignalGroupFactory.h"
[detail]  
[detail] @@ -45,7 +45,7 @@
[detail]    
[detail]  
[detail]    
[detail] -  void SignalGroup::removeSignal(Signal * sig)
[detail] +  void SignalGroup::removeSignal(SignalSegment * sig)
[detail]    {
[detail]      TRACE;
[detail]      int index=_signals.indexOf(sig);
[detail] @@ -94,9 +94,55 @@
[detail]    {
[detail]      TRACE;
[detail]      AbstractSignalGroup::xml_writeProperties(s, context);
[detail] +    if(_signals.isEmpty()) {
[detail] +      return;
[detail] +    }
[detail]      QString str;
[detail] -    for(SubSignalPool::const_iterator it=_signals.begin(); it!=_signals.end(); ++it) {
[detail] -      str+=QString::number((*it)->id())+" ";
[detail] +    
[detail] +    UniqueID id=_signals.first()->id();
[detail] +    UniqueID lastId=id, startId=id;
[detail] +    qint64 step;
[detail] +    int n=_signals.count();
[detail] +    for(int i=1; i<n; i++) {
[detail] +      lastId=id;
[detail] +      id=_signals.at(i)->id();
[detail] +      step=lastId.stepTo(id);
[detail] +      if(step<=0) {
[detail] +        str+=lastId.toString()+" ";
[detail] +        startId=id;
[detail] +      } else {
[detail] +        
[detail] +        for(i++; i<n; i++) {
[detail] +          lastId=id;
[detail] +          id=_signals.at(i)->id();
[detail] +          if(id.isNotAfter(lastId, step)) {
[detail] +            if(lastId.isNotAfter(startId, step)) { 
[detail] +              str+=startId.toString()+":"+QString::number(step)+":"+lastId.toString()+" ";
[detail] +              startId=id;
[detail] +              break;  
[detail] +            } else {
[detail] +              str+=startId.toString()+" ";
[detail] +              step=lastId.stepTo(id);
[detail] +              if(step<=0) {
[detail] +                str+=lastId.toString()+" ";
[detail] +                startId=id;
[detail] +                break;
[detail] +              } else {
[detail] +                startId=lastId;
[detail] +              }
[detail] +            }
[detail] +          }
[detail] +        }
[detail] +      }
[detail] +    }
[detail] +    if(startId!=id) {
[detail] +      if(id.isNotAfter(startId, step)) { 
[detail] +        str+=startId.toString()+":"+QString::number(step)+":"+id.toString();
[detail] +      } else {
[detail] +        str+=startId.toString()+" "+id.toString();
[detail] +      }
[detail] +    } else {
[detail] +      str+=id.toString();
[detail]      }
[detail]      writeProperty(s, "ids", str);
[detail]    }
[detail] @@ -114,14 +160,53 @@
[detail]      switch(memberID) {
[detail]      case 0: {
[detail]          if(!_ids) {   
[detail] -          _ids=new VectorList<int>;
[detail] +          _ids=new VectorList<UniqueID>;
[detail]          }
[detail]          static const QString sep=" \n\t\r";
[detail]          const QChar * ptr=0;
[detail]          StringSection f=content.nextField(ptr, sep, true);
[detail]          bool ok=true;
[detail] +        int step;
[detail] +        UniqueID id, beginId, endId;
[detail]          while(f.isValid()) {
[detail] -          _ids->append(f.toInt(ok));
[detail] +          if(id.fromString(f)) {
[detail] +            _ids->append(id);
[detail] +          } else {
[detail] +            ok=true;
[detail] +            QString buf=f.toStringBuffer();
[detail] +            int i1, i2;
[detail] +            i1=buf.indexOf(":");
[detail] +            if(i1>=0) {
[detail] +              i2=buf.indexOf(":", i1+1);
[detail] +              if(i2<0) {
[detail] +                return parseIdError(buf);
[detail] +              }
[detail] +              if(!beginId.fromString(buf.left(i1))) {
[detail] +                return parseIdError(buf);
[detail] +              }
[detail] +              step=buf.mid(i1+1, i2-i1-1).toInt(&ok);
[detail] +              if(!ok) {
[detail] +                return parseIdError(buf);
[detail] +              }
[detail] +              if(!endId.fromString(buf.mid(i2+1))) {
[detail] +                return parseIdError(buf);
[detail] +              }
[detail] +              UniqueID::addRange(beginId, endId, step, *_ids);
[detail] +            } else { 
[detail] +              i1=buf.indexOf("-");
[detail] +              if(i1>=0) {
[detail] +                if(!beginId.fromString(buf.left(i1))) {
[detail] +                  return parseIdError(buf);
[detail] +                }
[detail] +                if(!endId.fromString(buf.mid(i1+1))) {
[detail] +                  return parseIdError(buf);
[detail] +                }
[detail] +                UniqueID::addRange(beginId, endId, 1, *_ids);
[detail] +              } else {
[detail] +                return parseIdError(buf);
[detail] +              }
[detail] +            }
[detail] +          }
[detail]            f=content.nextField(ptr, sep, true);
[detail]          }
[detail]          return ok;
[detail] @@ -131,6 +216,12 @@
[detail]      }
[detail]    }
[detail]  
[detail] +  bool SignalGroup::parseIdError(const QString& buf)
[detail] +  {
[detail] +    App::log(tr("Error parsing group IDs: '%1'\n").arg(buf));
[detail] +    return false;
[detail] +  }
[detail] +
[detail]    
[detail]  
[detail]    
[detail] @@ -140,16 +231,20 @@
[detail]      QFile f(dbPath.absoluteFilePath(name()+".group"));
[detail]      if(f.open(QIODevice::ReadOnly)) {
[detail]        if(!_ids) {
[detail] -        _ids=new VectorList<int>;
[detail] +        _ids=new VectorList<UniqueID>;
[detail]        }
[detail]        QDataStream s(&f);
[detail]        if(dbVersion==1) {
[detail]          s.setByteOrder(QDataStream::LittleEndian); 
[detail]        }
[detail] -      int id;
[detail] +      UniqueID id;
[detail]        while(!s.atEnd()) {
[detail] -        s >> id;
[detail] -        (*_ids) << id;
[detail] +        if(id.fromStream32(s)) {
[detail] +          _ids->append(id);
[detail] +        } else {
[detail] +          App::log(tr("error reading ID from %1.group\n")
[detail] +                       .arg(dbPath.absoluteFilePath(name())));
[detail] +        }
[detail]        }
[detail]      } else {
[detail]        App::log(tr("Unable to open %1.group for reading\n")
[detail] @@ -159,34 +254,43 @@
[detail]    }
[detail]  
[detail]    
[detail] -  bool SignalGroup::convertIds(const QHash<int, Signal *>& ids)
[detail] +  bool SignalGroup::convertIds(const QHash<UniqueID, SignalSegment *>& ids)
[detail]    {
[detail]      TRACE;
[detail]      if(_ids) {
[detail]        _signals.removeAll();
[detail] -      for(VectorList<int>::iterator it=_ids->begin(); it!=_ids->end(); it++) {
[detail] -        QHash<int, Signal *>::const_iterator itHash=ids.find(*it);
[detail] +      for(VectorList<UniqueID>::iterator it=_ids->begin(); it!=_ids->end(); it++) {
[detail] +        QHash<UniqueID, SignalSegment *>::const_iterator itHash=ids.find(*it);
[detail]          if(itHash==ids.end()) {
[detail] -          App::log(tr("Group '%1': unknow signal ID %2\n").arg(pathName()).arg(*it) );
[detail] +          App::log(tr("Group '%1': unknow signal ID %2\n").arg(pathName()).arg(it->toString()));
[detail]            return false;
[detail]          } else {
[detail]            _signals.addSignal(itHash.value());
[detail]          }
[detail]        }
[detail]        delete _ids;
[detail] -      _ids=0;
[detail] +      _ids=nullptr;
[detail]        _signals.setName(name());
[detail]      }
[detail]      return AbstractSignalGroup::convertIds(ids);
[detail]    }
[detail]  
[detail] +  
[detail] +  void SignalGroup::sortByIds()
[detail] +  {
[detail] +    TRACE;
[detail] +    SortKey::clear();
[detail] +    SortKey::add(SortKey(MetaDataIndex(MetaDataFactory::ID)));
[detail] +    _signals.sort();
[detail] +  }
[detail] +
[detail]    void SignalGroup::setName(const QString& n)
[detail]    {
[detail]      AbstractSignalGroup::setName(n);
[detail]      _signals.setName(n);
[detail]    }
[detail]  
[detail] -  bool SignalGroup::directlyContains(const Signal * sig) const
[detail] +  bool SignalGroup::directlyContains(const SignalSegment * sig) const
[detail]    {
[detail]      if(sig) {
[detail]        return _signals.contains(sig);
[detail]               src/SignalGroupFactory.cpp:  version-4.5.1	not modified
[detail]                src/SignalGroupFolder.cpp:  version-4.5.1	modified out of comments
[detail] --- src/SignalGroupFolder.cpp-version-4.5.1-stripped	2025-09-28 04:01:05.287504370 +0200
[detail] +++ src/SignalGroupFolder.cpp-HEAD-stripped	2025-09-28 04:01:05.291504390 +0200
[detail] @@ -2,6 +2,7 @@
[detail]  
[detail]  #include "SignalGroupFolder.h"
[detail]  #include "SignalGroupFactory.h"
[detail] +#include "MasterSignalGroup.h"
[detail]  
[detail]  namespace GeopsyCore {
[detail]  
[detail]                src/SignalHeaderClass.cpp:  version-4.5.1	not modified
[detail]               src/SignalHeaderObject.cpp:  version-4.5.1	modified out of comments
[detail] --- src/SignalHeaderObject.cpp-version-4.5.1-stripped	2025-09-28 04:01:05.319504525 +0200
[detail] +++ src/SignalHeaderObject.cpp-HEAD-stripped	2025-09-28 04:01:05.327504564 +0200
[detail] @@ -7,7 +7,7 @@
[detail]    
[detail]  
[detail]    
[detail] -  SignalHeaderObject::SignalHeaderObject(Signal *sig, QObject * parent)
[detail] +  SignalHeaderObject::SignalHeaderObject(SignalSegment *sig, QObject * parent)
[detail]      : QObject(parent)
[detail]    {
[detail]      TRACE;
[detail] @@ -17,53 +17,55 @@
[detail]    void SignalHeaderObject::setAmplitudeUnit(const QString& v)
[detail]    {
[detail]      TRACE;
[detail] -    Signal * sig=thisSignal();
[detail] +    SignalSegment * sig=thisSignal();
[detail]      emit(beginSignalChange(sig));
[detail] -    sig->setAmplitudeUnit(Signal::standardAmplitudeUnit(v));
[detail] -    sig->setHeaderModified(true);
[detail] +    bool ok;
[detail] +    sig->metaData()->setAmplitudeUnit(SignalMetaData::standardAmplitudeUnit(v, ok));
[detail] +    sig->metaData()->setModified(true);
[detail]      emit(endSignalChange(sig));
[detail]    }
[detail]  
[detail]    void SignalHeaderObject::setComponent(const QString& v)
[detail]    {
[detail]      TRACE;
[detail] -    Signal * sig=thisSignal();
[detail] +    SignalSegment * sig=thisSignal();
[detail]      emit(beginSignalChange(sig));
[detail] -    sig->setComponent(Signal::standardComponent(v));
[detail] -    sig->setHeaderModified(true);
[detail] +    bool ok;
[detail] +    sig->metaData()->setComponent(SignalMetaData::standardComponent(v, ok));
[detail] +    sig->metaData()->setModified(true);
[detail]      emit(endSignalChange(sig));
[detail]    }
[detail]  
[detail]    void SignalHeaderObject::setCountPerVolt(double v)
[detail]    {
[detail]      TRACE;
[detail] -    Signal * sig=thisSignal();
[detail] +    SignalSegment * sig=thisSignal();
[detail]      emit(beginSignalChange(sig));
[detail] -    sig->setCountPerVolt(v);
[detail] -    sig->setHeaderModified(true);
[detail] +    sig->metaData()->setCountPerVolt(v);
[detail] +    sig->metaData()->setModified(true);
[detail]      emit(endSignalChange(sig));
[detail]    }
[detail]  
[detail]    void SignalHeaderObject::setSamplingPeriod(double v)
[detail]    {
[detail]      TRACE;
[detail] -    Signal * sig=thisSignal();
[detail] +    SignalSegment * sig=thisSignal();
[detail]      emit(beginSignalChange(sig));
[detail]      sig->setSamplingPeriod(v);
[detail] -    sig->setHeaderModified(true);
[detail] +    sig->metaData()->setModified(true);
[detail]      emit(endSignalChange(sig));
[detail]    }
[detail]  
[detail]    void SignalHeaderObject::setDuration(const QString& v)
[detail]    {
[detail]      TRACE;
[detail] -    Signal * sig=thisSignal();
[detail] +    SignalSegment * sig=thisSignal();
[detail]      bool ok=true;
[detail]      double d=Number::durationToSeconds(v, ok);
[detail]      if(ok) {
[detail]        emit(beginSignalChange(sig));
[detail] -      sig->setSamplingPeriod(d/static_cast<double>(sig->nSamples()));
[detail] -      sig->setHeaderModified(true);
[detail] +      sig->setSamplingPeriod(d/static_cast<double>(sig->size()));
[detail] +      sig->metaData()->setModified(true);
[detail]        emit(endSignalChange(sig));
[detail]      }
[detail]    }
[detail] @@ -71,13 +73,13 @@
[detail]    void SignalHeaderObject::setEndTime(const QString& v)
[detail]    {
[detail]      TRACE;
[detail] -    Signal * sig=thisSignal();
[detail] +    SignalSegment * sig=thisSignal();
[detail]      DateTime e;
[detail]      if(e.fromString(v, ScriptContext::timeFormat)) {
[detail]        emit(beginSignalChange(sig));
[detail]        e.addSeconds(-sig->duration());
[detail]        sig->setStartTime(e);
[detail] -      sig->setHeaderModified(true);
[detail] +      sig->metaData()->setModified(true);
[detail]        emit(endSignalChange(sig));
[detail]      }
[detail]    }
[detail] @@ -85,80 +87,80 @@
[detail]    void SignalHeaderObject::setName(const QString& v)
[detail]    {
[detail]      TRACE;
[detail] -    Signal * sig=thisSignal();
[detail] +    SignalSegment * sig=thisSignal();
[detail]      emit(beginSignalChange(sig));
[detail] -    sig->setName(v);
[detail] -    sig->setHeaderModified(true);
[detail] +    sig->metaData()->setName(v);
[detail] +    sig->metaData()->setModified(true);
[detail]      emit(endSignalChange(sig));
[detail]    }
[detail]  
[detail]    void SignalHeaderObject::setUtmZone(const QString& v)
[detail]    {
[detail]      TRACE;
[detail] -    Signal * sig=thisSignal();
[detail] +    SignalSegment * sig=thisSignal();
[detail]      emit(beginSignalChange(sig));
[detail]      UtmZone z;
[detail]      z.fromString(v);
[detail] -    sig->setUtmZone(z);
[detail] -    sig->setHeaderModified(true);
[detail] +    sig->metaData()->setUtmZone(z);
[detail] +    sig->metaData()->setModified(true);
[detail]      emit(endSignalChange(sig));
[detail]    }
[detail]  
[detail]    void SignalHeaderObject::setReceiverX(double v)
[detail]    {
[detail]      TRACE;
[detail] -    Signal * sig=thisSignal();
[detail] -    Point p=sig->receiver();
[detail] +    SignalSegment * sig=thisSignal();
[detail] +    Point p=sig->metaData()->receiver();
[detail]      p.setX(v);
[detail]      emit(beginSignalChange(sig));
[detail] -    sig->setReceiver(p);
[detail] -    sig->setHeaderModified(true);
[detail] +    sig->metaData()->setReceiver(p);
[detail] +    sig->metaData()->setModified(true);
[detail]      emit(endSignalChange(sig));
[detail]    }
[detail]  
[detail]    void SignalHeaderObject::setReceiverY(double v)
[detail]    {
[detail]      TRACE;
[detail] -    Signal * sig=thisSignal();
[detail] -    Point p=sig->receiver();
[detail] +    SignalSegment * sig=thisSignal();
[detail] +    Point p=sig->metaData()->receiver();
[detail]      p.setY(v);
[detail]      emit(beginSignalChange(sig));
[detail] -    sig->setReceiver(p);
[detail] -    sig->setHeaderModified(true);
[detail] +    sig->metaData()->setReceiver(p);
[detail] +    sig->metaData()->setModified(true);
[detail]      emit(endSignalChange(sig));
[detail]    }
[detail]  
[detail]    void SignalHeaderObject::setReceiverZ(double v)
[detail]    {
[detail]      TRACE;
[detail] -    Signal * sig=thisSignal();
[detail] -    Point p=sig->receiver();
[detail] +    SignalSegment * sig=thisSignal();
[detail] +    Point p=sig->metaData()->receiver();
[detail]      p.setZ(v);
[detail]      emit(beginSignalChange(sig));
[detail] -    sig->setReceiver(p);
[detail] -    sig->setHeaderModified(true);
[detail] +    sig->metaData()->setReceiver(p);
[detail] +    sig->metaData()->setModified(true);
[detail]      emit(endSignalChange(sig));
[detail]    }
[detail]  
[detail]    void SignalHeaderObject::setSamplingFrequency(double v)
[detail]    {
[detail]      TRACE;
[detail] -    Signal * sig=thisSignal();
[detail] +    SignalSegment * sig=thisSignal();
[detail]      emit(beginSignalChange(sig));
[detail]      sig->setSamplingFrequency(v);
[detail] -    sig->setHeaderModified(true);
[detail] +    sig->metaData()->setModified(true);
[detail]      emit(endSignalChange(sig));
[detail]    }
[detail]  
[detail]    void SignalHeaderObject::setStartTime(const QString& v)
[detail]    {
[detail]      TRACE;
[detail] -    Signal * sig=thisSignal();
[detail] +    SignalSegment * sig=thisSignal();
[detail]      DateTime s;
[detail]      if(s.fromString(v, ScriptContext::timeFormat)) {
[detail]        emit(beginSignalChange(sig));
[detail]        sig->setStartTime(s);
[detail] -      sig->setHeaderModified(true);
[detail] +      sig->metaData()->setModified(true);
[detail]        emit(endSignalChange(sig));
[detail]      }
[detail]    }
[detail] @@ -166,120 +168,87 @@
[detail]    void SignalHeaderObject::addSeconds(double dt)
[detail]    {
[detail]      TRACE;
[detail] -    Signal * sig=thisSignal();
[detail] +    SignalSegment * sig=thisSignal();
[detail]      DateTime s=sig->startTime();
[detail]      s.addSeconds(dt);
[detail]      emit(beginSignalChange(sig));
[detail]      sig->setStartTime(s);
[detail] -    sig->setHeaderModified(true);
[detail] +    sig->metaData()->setModified(true);
[detail]      emit(endSignalChange(sig));
[detail]    }
[detail]  
[detail]    void SignalHeaderObject::setUnitPerVolt(double v)
[detail]    {
[detail]      TRACE;
[detail] -    Signal * sig=thisSignal();
[detail] +    SignalSegment * sig=thisSignal();
[detail]      emit(beginSignalChange(sig));
[detail] -    sig->setUnitPerVolt(v);
[detail] -    sig->setHeaderModified(true);
[detail] +    sig->metaData()->setUnitPerVolt(v);
[detail] +    sig->metaData()->setModified(true);
[detail]      emit(endSignalChange(sig));
[detail]    }
[detail]  
[detail]    void SignalHeaderObject::setVoltPerCount(double v)
[detail]    {
[detail]      TRACE;
[detail] -    Signal * sig=thisSignal();
[detail] +    SignalSegment * sig=thisSignal();
[detail]      emit(beginSignalChange(sig));
[detail] -    sig->setVoltPerCount(v);
[detail] -    sig->setHeaderModified(true);
[detail] +    sig->metaData()->setVoltPerCount(v);
[detail] +    sig->metaData()->setModified(true);
[detail]      emit(endSignalChange(sig));
[detail]    }
[detail]  
[detail]    void SignalHeaderObject::setVoltPerUnit(double v)
[detail]    {
[detail]      TRACE;
[detail] -    Signal * sig=thisSignal();
[detail] +    SignalSegment * sig=thisSignal();
[detail]      emit(beginSignalChange(sig));
[detail] -    sig->setVoltPerUnit(v);
[detail] -    sig->setHeaderModified(true);
[detail] +    sig->metaData()->setVoltPerUnit(v);
[detail] +    sig->metaData()->setModified(true);
[detail]      emit(endSignalChange(sig));
[detail]    }
[detail]  
[detail] -  QString SignalHeaderObject::fileFormat() const
[detail] -  {
[detail] -    TRACE;
[detail] -    Signal * sig=thisSignal();
[detail] -    if(sig->file()) {
[detail] -      return sig->file()->format().name();
[detail] -    } else {
[detail] -      return tr("### Temporary signal ###");
[detail] -    }
[detail] -  }
[detail] -
[detail] -  QString SignalHeaderObject::fileName() const
[detail] -  {
[detail] -    TRACE;
[detail] -    Signal * sig=thisSignal();
[detail] -    if(sig->file()) {
[detail] -      return sig->file()->name();
[detail] -    } else {
[detail] -      return tr("### Temporary signal ###");
[detail] -    }
[detail] -  }
[detail] -
[detail]    quint32 SignalHeaderObject::crc32() const
[detail]    {
[detail]      TRACE;
[detail] -    Signal * sig=thisSignal();
[detail] +    SignalSegment * sig=thisSignal();
[detail]      if(sig->file()) {
[detail] -      return sig->file()->crc32();
[detail] +      return sig->fileCheckSum();
[detail]      } else {
[detail]        return 0;
[detail]      }
[detail]    }
[detail]  
[detail] -  QString SignalHeaderObject::shortFileName() const
[detail] -  {
[detail] -    TRACE;
[detail] -    Signal * sig=thisSignal();
[detail] -    if(sig->file()) {
[detail] -      return sig->file()->shortName();
[detail] -    } else {
[detail] -      return tr("### Temporary signal ###");
[detail] -    }
[detail] -  }
[detail] -
[detail]    
[detail]    
[detail]  
[detail]    void SignalHeaderObject::setComments(const QString& v)
[detail]    {
[detail]      TRACE;
[detail] -    Signal * sig=thisSignal();
[detail] +    SignalSegment * sig=thisSignal();
[detail]      emit(beginSignalChange(sig));
[detail] -    Comments& md=sig->beginModifyMetaData<Comments>();
[detail] +    Comments& md=sig->metaData()->optionalData().beginModify<Comments>();
[detail]      md.setValue(v);
[detail] -    sig->endModifyMetaData(md);
[detail] +    sig->metaData()->optionalData().endModify(md);
[detail]      emit(endSignalChange(sig));
[detail]    }
[detail]  
[detail]    void SignalHeaderObject::setTimePick(const QString& name, const QString& time)
[detail]    {
[detail]      TRACE;
[detail] -    Signal * sig=thisSignal();
[detail] +    SignalSegment * sig=thisSignal();
[detail]      DateTime dt;
[detail]      if(dt.fromString(time, ScriptContext::timeFormat)) {
[detail]        emit(beginSignalChange(sig));
[detail] -      TimePick& md=sig->beginModifyMetaData<TimePick>();
[detail] +      TimePick& md=sig->metaData()->optionalData().beginModify<TimePick>();
[detail]        md.setValue(name, dt);
[detail] -      sig->endModifyMetaData(md);
[detail] +      sig->metaData()->optionalData().endModify(md);
[detail]        emit(endSignalChange(sig));
[detail]      }
[detail]    }
[detail]  
[detail]    QString SignalHeaderObject::timePick(const QString& name) const
[detail]    {
[detail] -    return thisSignal()->metaData<TimePick>().value(name).toString(ScriptContext::timeFormat);
[detail] +    return thisSignal()->metaData()->optionalData().get<TimePick>().value(name).toString(ScriptContext::timeFormat);
[detail]    }
[detail]  
[detail]  } 
[detail]               src/SignalHeaderScript.cpp:  version-4.5.1	modified out of comments
[detail] --- src/SignalHeaderScript.cpp-version-4.5.1-stripped	2025-09-28 04:01:05.343504641 +0200
[detail] +++ src/SignalHeaderScript.cpp-HEAD-stripped	2025-09-28 04:01:05.347504661 +0200
[detail] @@ -24,11 +24,8 @@
[detail]  
[detail]  
[detail]      int n=subPool->count();
[detail] -    if(n>10) {
[detail]        _db=subPool->database();
[detail] -    } else {
[detail] -      _db=nullptr;
[detail] -    }
[detail] +
[detail]      QJSValue list, sig;
[detail]      list=_engine->newArray(n);
[detail]      _engine->globalObject().setProperty("signals", list);
[detail] @@ -36,8 +33,8 @@
[detail]        for(int i=0; i<n; i++) {
[detail]          SignalHeaderObject * obj=new SignalHeaderObject(subPool->at(i), this);
[detail]          if(n<10) {
[detail] -          connect(obj, SIGNAL(beginSignalChange(Signal*)), this, SIGNAL(beginSignalChange(Signal*)));
[detail] -          connect(obj, SIGNAL(endSignalChange(Signal*)), this, SIGNAL(endSignalChange(Signal*)));
[detail] +          connect(obj, SIGNAL(beginSignalChange(SignalSegment *)), this, SIGNAL(beginSignalChange(SignalSegment *)));
[detail] +          connect(obj, SIGNAL(endSignalChange(SignalSegment *)), this, SIGNAL(endSignalChange(SignalSegment *)));
[detail]          }
[detail]          sig=_engine->newQObject(obj);
[detail]          list.setProperty(i, sig);
[detail]                   src/SignalMetaData.cpp:  version-4.5.1	no last version available
[detail]                src/SignalMetaDataMap.cpp:  version-4.5.1	no last version available
[detail]                    src/SignalProcess.cpp:  version-4.5.1	modified out of comments
[detail] --- src/SignalProcess.cpp-version-4.5.1-stripped	2025-09-28 04:01:05.371504777 +0200
[detail] +++ src/SignalProcess.cpp-HEAD-stripped	2025-09-28 04:01:05.375504796 +0200
[detail] @@ -57,22 +57,23 @@
[detail]      
[detail]      if(!_steps.isEmpty()) {
[detail]        for(int i=_current->count()-1; i>=0; i--) {
[detail] -        Signal * sig=_current->at(i);
[detail] -        Comments& c=sig->beginModifyMetaData<Comments>();
[detail] +        SignalSegment * sig=_current->at(i);
[detail] +        Comments& c=sig->metaData()->optionalData().beginModify<Comments>();
[detail]          if(c.value().isEmpty()) { 
[detail]            if(_steps.last().count()==_current->count()) { 
[detail]              if(_steps.count()==1) {
[detail] -              Signal * originalSig=_steps.last().at(i);
[detail] +              SignalSegment * originalSig=_steps.last().at(i);
[detail]                if(originalSig->file()) {
[detail] -                c="'"+originalSig->file()->name()+"' at index "+QString::number(originalSig->numberInFile())+"\n";
[detail] +                c="'"+originalSig->fileName()+"' at index "
[detail] +                    +QString::number(originalSig->indexInFile().value())+"\n";
[detail]                }
[detail]              } else {
[detail] -              c=_steps.last().at(i)->metaData<Comments>();
[detail] +              c=_steps.last().at(i)->metaData()->optionalData().get<Comments>();
[detail]              }
[detail]            }
[detail]          }
[detail]          c+="  "+tag+"\n";
[detail] -        sig->endModifyMetaData(c);
[detail] +        sig->metaData()->optionalData().endModify(c);
[detail]        }
[detail]      }
[detail]      _steps.append(*_current);
[detail] @@ -149,6 +150,15 @@
[detail]                  .arg(value.toString()));
[detail]    }
[detail]  
[detail] +  void SignalProcess::setStartTime(int signalIndex, const DateTime& t)
[detail] +  {
[detail] +    TRACE;
[detail] +    setStartTimeCore(signalIndex, t);
[detail] +    addToHistory(QString("setStartTime(%1, \"%2\");\n")
[detail] +                     .arg(signalIndex)
[detail] +                     .arg(t.toString(ScriptContext::timeFormat)));
[detail] +  }
[detail] +
[detail]    void SignalProcess::removeTrend()
[detail]    {
[detail]      TRACE;
[detail] @@ -214,6 +224,16 @@
[detail]      addToHistory(fun+";\n");
[detail]    }
[detail]  
[detail] +  void SignalProcess::stackSignals()
[detail] +  {
[detail] +    TRACE;
[detail] +    newStep();
[detail] +    stackSignalsCore();
[detail] +    static const QString fun("stackSignals()");
[detail] +    saveStep(fun);
[detail] +    addToHistory(fun+";\n");
[detail] +  }
[detail] +
[detail]    void SignalProcess::multiply(double val)
[detail]    {
[detail]      TRACE;
[detail] @@ -231,29 +251,98 @@
[detail]      TRACE;
[detail]      newStep();
[detail]      filterCore(param);
[detail] -    static const QString funStruct("filter(\"%1\", \"%2\", %3, %4, %5)");
[detail] -    QString fun=funStruct.arg(FilterParameters::convertMethod(param.method()))
[detail] -                         .arg(FilterParameters::convertBand(param.band()))
[detail] -                         .arg(param.minimumFrequency())
[detail] -                         .arg(param.maximumFrequency());
[detail] +    QString fun;
[detail]      switch(param.method()) {
[detail] -    case FilterParameters::Butterworth:
[detail] -      fun=fun.arg(param.order());
[detail] +    case FilterParameters::Butterworth: {
[detail] +        const ButterworthParameters& sparam=param.butterworth();
[detail] +        switch(param.band()) {
[detail] +        case FilterParameters::LowPass:
[detail] +        case FilterParameters::HighPass: {
[detail] +            static const QString funStruct("filterButterworth(%1, \"%2\", %3, %4)");
[detail] +            fun=funStruct.arg(sparam.minimumFrequency())
[detail] +                         .arg(FilterParameters::convertBand(param.band()))
[detail] +                         .arg(sparam.order())
[detail] +                         .arg(sparam.causal() ? "true" : "false");
[detail] +          }
[detail]        break;
[detail] -    case FilterParameters::FrequencyWindow:
[detail] -      fun=fun.arg(param.width());
[detail] +        case FilterParameters::BandPass:
[detail] +        case FilterParameters::BandStop: {
[detail] +            static const QString funStruct("filterButterworth(%1, %2, \"%3\", %4, %5)");
[detail] +            fun=funStruct.arg(sparam.minimumFrequency())
[detail] +                         .arg(sparam.maximumFrequency())
[detail] +                         .arg(FilterParameters::convertBand(param.band()))
[detail] +                         .arg(sparam.order())
[detail] +                         .arg(sparam.causal() ? "true" : "false");
[detail] +          }
[detail] +          break;
[detail] +        }
[detail] +      }
[detail] +      break;
[detail] +    case FilterParameters::FrequencyWindow: {
[detail] +        const FrequencyWindowParameters& sparam=param.frequencyWindow();
[detail] +        switch(param.band()) {
[detail] +        case FilterParameters::LowPass:
[detail] +        case FilterParameters::HighPass: {
[detail] +            static const QString funStruct("filterFrequencyWindow(%1, \"%2\", %3, %4)");
[detail] +            fun=funStruct.arg(sparam.minimumFrequency())
[detail] +                         .arg(FilterParameters::convertBand(param.band()))
[detail] +                         .arg(sparam.width())
[detail] +                         .arg(WindowFunctionParameters::convertShape(sparam.window().shape()));
[detail] +          }
[detail] +          break;
[detail] +        case FilterParameters::BandPass:
[detail] +        case FilterParameters::BandStop: {
[detail] +            static const QString funStruct("filterFrequencyWindow(%1, %2, \"%3\", %4, %5)");
[detail] +            fun=funStruct.arg(sparam.minimumFrequency())
[detail] +                         .arg(sparam.maximumFrequency())
[detail] +                         .arg(FilterParameters::convertBand(param.band()))
[detail] +                         .arg(sparam.width())
[detail] +                         .arg(WindowFunctionParameters::convertShape(sparam.window().shape()));
[detail] +          }
[detail] +          break;
[detail] +        }
[detail] +      }
[detail] +      break;
[detail] +    case FilterParameters::ChebyshevType1: {
[detail] +        const ChebyshevParameters& sparam=param.chebyshevType1();
[detail] +        switch(param.band()) {
[detail] +        case FilterParameters::LowPass:
[detail] +        case FilterParameters::HighPass: {
[detail] +            static const QString funStruct("filterChebyshevType1(%1, %2, %3, %4, %5)");
[detail] +            fun=funStruct.arg(sparam.minimumFrequencyPass())
[detail] +                         .arg(sparam.minimumFrequencyStop())
[detail] +                         .arg(sparam.maximumLossPass())
[detail] +                         .arg(sparam.minimumAttenuationStop())
[detail] +                         .arg(sparam.maximumRipple());
[detail] +          }
[detail] +          break;
[detail] +        case FilterParameters::BandPass:
[detail] +        case FilterParameters::BandStop: {
[detail] +            static const QString funStruct("filterChebyshevType1(%1, %2, %3, %4, %5, %6, %7)");
[detail] +            fun=funStruct.arg(sparam.minimumFrequencyPass())
[detail] +                         .arg(sparam.maximumFrequencyPass())
[detail] +                         .arg(sparam.minimumFrequencyStop())
[detail] +                         .arg(sparam.maximumFrequencyStop())
[detail] +                         .arg(sparam.maximumLossPass())
[detail] +                         .arg(sparam.minimumAttenuationStop())
[detail] +                         .arg(sparam.maximumRipple());
[detail] +          }
[detail] +          break;
[detail] +        }
[detail] +      }
[detail]        break;
[detail]      }
[detail]      saveStep(fun);
[detail]      addToHistory(fun+";\n");
[detail]    }
[detail]  
[detail] -  void SignalProcess::whiten()
[detail] +  void SignalProcess::whiten(double fmin, double fmax, double apodization)
[detail]    {
[detail]      TRACE;
[detail]      newStep();
[detail] -    whitenCore();
[detail] -    static const QString fun("whiten()");
[detail] +    whitenCore(fmin, fmax, apodization);
[detail] +    static const QString funStruct("whiten(%1, %2, %3)");
[detail] +    QString fun=funStruct.arg(fmin).arg(fmax).arg(apodization);
[detail]      saveStep(fun);
[detail]      addToHistory(fun+";\n");
[detail]    }
[detail] @@ -485,6 +574,24 @@
[detail]      addToHistory(fun+";\n");
[detail]    }
[detail]  
[detail] +  void SignalProcess::derivate()
[detail] +  {
[detail] +    newStep();
[detail] +    derivateCore();
[detail] +    static const QString fun("derivate()");
[detail] +    saveStep(fun);
[detail] +    addToHistory(fun+";\n");
[detail] +  }
[detail] +
[detail] +  void SignalProcess::integrate()
[detail] +  {
[detail] +    newStep();
[detail] +    integrateCore();
[detail] +    static const QString fun("integrate()");
[detail] +    saveStep(fun);
[detail] +    addToHistory(fun+";\n");
[detail] +  }
[detail] +
[detail]    void SignalProcess::restoreStepCore(int index)
[detail]    {
[detail]      if(index < 0 || index >= _steps.count()) return;
[detail] @@ -512,7 +619,7 @@
[detail]  
[detail]    QVariant SignalProcess::header(int signalIndex, const MetaDataIndex& dataIndex)
[detail]    {
[detail] -    if(signalIndex<_current->count()) {
[detail] +    if(signalIndex>=0 && signalIndex<_current->count()) {
[detail]        if(signalIndex<0) {
[detail]          return _current->first()->header(dataIndex);
[detail]        } else {
[detail] @@ -534,6 +641,35 @@
[detail]      }
[detail]    }
[detail]  
[detail] +  QVariant SignalProcess::startTime(int signalIndex)
[detail] +  {
[detail] +    if(signalIndex>=0 && signalIndex<_current->count()) {
[detail] +      return _current->at(signalIndex)->startTime().toString(ScriptContext::timeFormat);
[detail] +    } else {
[detail] +      return QVariant();
[detail] +    }
[detail] +  }
[detail] +
[detail] +  QVariant SignalProcess::endTime(int signalIndex)
[detail] +  {
[detail] +    if(signalIndex>=0 && signalIndex<_current->count()) {
[detail] +      return _current->at(signalIndex)->endTime().toString(ScriptContext::timeFormat);
[detail] +    } else {
[detail] +      return QVariant();
[detail] +    }
[detail] +  }
[detail] +
[detail] +  void SignalProcess::setStartTimeCore(int signalIndex, const DateTime& t)
[detail] +  {
[detail] +    if(signalIndex<0) {
[detail] +      for(SubSignalPool::iterator it=_current->begin(); it!=_current->end(); it++) {
[detail] +        (*it)->setStartTime(t);
[detail] +      }
[detail] +    } else if(signalIndex<_current->count()) {
[detail] +      _current->at(signalIndex)->setStartTime(t);
[detail] +    }
[detail] +  }
[detail] +
[detail]    int SignalProcess::signalCount()
[detail]    {
[detail]      return _current->count();
[detail] @@ -639,6 +775,11 @@
[detail]      _current->signalOperationSubtract(&bySubPool);
[detail]    }
[detail]  
[detail] +  void SignalProcess::stackSignalsCore()
[detail] +  {
[detail] +    _current->stack();
[detail] +  }
[detail] +
[detail]    void SignalProcess::multiplyCore(double val)
[detail]    {
[detail]      _current->multiply(val);
[detail] @@ -654,9 +795,9 @@
[detail]      _current->agc(width);
[detail]    }
[detail]  
[detail] -  void SignalProcess::whitenCore()
[detail] +  void SignalProcess::whitenCore(double fmin, double fmax, double apodization)
[detail]    {
[detail] -    _current->whiten();
[detail] +    _current->whiten(fmin, fmax, apodization);
[detail]    }
[detail]  
[detail]    void SignalProcess::stddevClipCore(double factor)
[detail] @@ -760,4 +901,14 @@
[detail]      _current->removeInstrumentalResponse(sensor);
[detail]    }
[detail]  
[detail] +  void SignalProcess::derivateCore()
[detail] +  {
[detail] +    _current->derivate();
[detail] +  }
[detail] +
[detail] +  void SignalProcess::integrateCore()
[detail] +  {
[detail] +    _current->integrate();
[detail] +  }
[detail] +
[detail]  } 
[detail]              src/SignalProcessObject.cpp:  version-4.5.1	modified out of comments
[detail] --- src/SignalProcessObject.cpp-version-4.5.1-stripped	2025-09-28 04:01:05.395504892 +0200
[detail] +++ src/SignalProcessObject.cpp-HEAD-stripped	2025-09-28 04:01:05.399504912 +0200
[detail] @@ -98,6 +98,37 @@
[detail]      }
[detail]    }
[detail]  
[detail] +  void SignalProcessObject::setStartTime(int signalIndex, const QString& v)
[detail] +  {
[detail] +    TRACE;
[detail] +    if(_process) {
[detail] +      DateTime s;
[detail] +      if(s.fromString(v, ScriptContext::timeFormat)) {
[detail] +        _process->setStartTime(signalIndex, s);
[detail] +      }
[detail] +    }
[detail] +  }
[detail] +
[detail] +  QVariant SignalProcessObject::startTime(int signalIndex)
[detail] +  {
[detail] +    TRACE;
[detail] +    if(_process) {
[detail] +      return _process->startTime(signalIndex);
[detail] +    } else {
[detail] +      return QVariant();
[detail] +    }
[detail] +  }
[detail] +
[detail] +  QVariant SignalProcessObject::endTime(int signalIndex)
[detail] +  {
[detail] +    TRACE;
[detail] +    if(_process) {
[detail] +      return _process->endTime(signalIndex);
[detail] +    } else {
[detail] +      return QVariant();
[detail] +    }
[detail] +  }
[detail] +
[detail]    int SignalProcessObject::signalCount()
[detail]    {
[detail]      TRACE;
[detail] @@ -156,6 +187,14 @@
[detail]      }
[detail]    }
[detail]  
[detail] +  void SignalProcessObject::stackSignals()
[detail] +  {
[detail] +    TRACE;
[detail] +    if(_process) {
[detail] +      _process->stackSignals();
[detail] +    }
[detail] +  }
[detail] +
[detail]    void SignalProcessObject::multiply(double val)
[detail]    {
[detail]      TRACE;
[detail] @@ -169,33 +208,137 @@
[detail]      TRACE;
[detail]      if(_process) {
[detail]        bool ok=true;
[detail] +      FilterParameters::Method m=FilterParameters::convertMethod(method, ok);
[detail]        FilterParameters param;
[detail] -      param.setMethod(FilterParameters::convertMethod(method, ok));
[detail] +      param.setMethod(m);
[detail]        param.setBand(FilterParameters::convertBand(band, ok));
[detail] -      if(!ok) {
[detail] -        App::log(tr("Bad filter method or band."));
[detail] +      switch(m) {
[detail] +      case FilterParameters::Butterworth:
[detail] +        param.butterworth().setMinimumFrequency(fmin);
[detail] +        param.butterworth().setMaximumFrequency(fmax);
[detail] +        param.butterworth().setOrder(qRound(option));
[detail] +        param.butterworth().setCausal(option>0.0);
[detail] +        break;
[detail] +      case FilterParameters::FrequencyWindow:
[detail] +        param.frequencyWindow().setMinimumFrequency(fmin);
[detail] +        param.frequencyWindow().setMaximumFrequency(fmax);
[detail] +        param.frequencyWindow().window().setShape(WindowFunctionParameters::Cosine);
[detail] +        param.frequencyWindow().setWidth(option);
[detail] +        break;
[detail] +      default:
[detail] +        qWarning("Chebyshev type 1 not supported with filter(), use filterChebyshevType1().");
[detail]          return;
[detail]        }
[detail] -      param.setFrequencyRange(fmin, fmax);
[detail] -      switch(param.method()) {
[detail] -      case FilterParameters::Butterworth: {
[detail] -          param.setOrder(qRound(option));
[detail] +      _process->filter(param);
[detail]          }
[detail] -        break;
[detail] -      case FilterParameters::FrequencyWindow: {
[detail] -          param.setWidth(option);
[detail]          }
[detail] -        break;
[detail] +
[detail] +  void SignalProcessObject::filterButterworth(double f, QString band, int order, bool causal)
[detail] +  {
[detail] +    TRACE;
[detail] +    bool ok=true;
[detail] +    FilterParameters param;
[detail] +    param.setMethod(FilterParameters::Butterworth);
[detail] +    param.setBand(FilterParameters::convertBand(band, ok));
[detail] +    param.butterworth().setMinimumFrequency(f);
[detail] +    param.butterworth().setOrder(order);
[detail] +    param.butterworth().setCausal(causal);
[detail] +    if(ok) {
[detail] +      _process->filter(param);
[detail] +    }
[detail] +  }
[detail] +
[detail] +  void SignalProcessObject::filterButterworth(double fmin, double fmax, QString band, int order, bool causal)
[detail] +  {
[detail] +    TRACE;
[detail] +    bool ok=true;
[detail] +    FilterParameters param;
[detail] +    param.setMethod(FilterParameters::Butterworth);
[detail] +    param.setBand(FilterParameters::convertBand(band, ok));
[detail] +    param.butterworth().setMinimumFrequency(fmin);
[detail] +    param.butterworth().setMaximumFrequency(fmax);
[detail] +    param.butterworth().setOrder(order);
[detail] +    param.butterworth().setCausal(causal);
[detail] +    if(ok) {
[detail] +      _process->filter(param);
[detail] +    }
[detail] +  }
[detail] +
[detail] +  void SignalProcessObject::filterFrequencyWindow(double f, QString band, QString shape, double width)
[detail] +  {
[detail] +    TRACE;
[detail] +    bool ok=true;
[detail] +    FilterParameters param;
[detail] +    param.setMethod(FilterParameters::FrequencyWindow);
[detail] +    param.setBand(FilterParameters::convertBand(band, ok));
[detail] +    param.frequencyWindow().setMinimumFrequency(f);
[detail] +    param.frequencyWindow().window().setShape(WindowFunctionParameters::convertShape(shape, ok));
[detail] +    param.frequencyWindow().setWidth(width);
[detail] +    if(ok) {
[detail] +      _process->filter(param);
[detail] +    }
[detail] +  }
[detail] +
[detail] +  void SignalProcessObject::filterFrequencyWindow(double fmin, double fmax, QString band,
[detail] +                                                  QString shape, double width)
[detail] +  {
[detail] +    TRACE;
[detail] +    bool ok=true;
[detail] +    FilterParameters param;
[detail] +    param.setMethod(FilterParameters::FrequencyWindow);
[detail] +    param.setBand(FilterParameters::convertBand(band, ok));
[detail] +    param.frequencyWindow().setMinimumFrequency(fmin);
[detail] +    param.frequencyWindow().setMaximumFrequency(fmax);
[detail] +    param.frequencyWindow().window().setShape(WindowFunctionParameters::convertShape(shape, ok));
[detail] +    param.frequencyWindow().setWidth(width);
[detail] +    if(ok) {
[detail] +      _process->filter(param);
[detail] +    }
[detail] +  }
[detail] +
[detail] +  void SignalProcessObject::filterChebyshevType1(double wp, double ws, double gpass, double gstop,
[detail] +                                                 double rp)
[detail] +  {
[detail] +    TRACE;
[detail] +    bool ok=true;
[detail] +    FilterParameters param;
[detail] +    param.setMethod(FilterParameters::ChebyshevType1);
[detail] +    param.setBand(wp<ws ? FilterParameters::LowPass : FilterParameters::HighPass);
[detail] +    param.chebyshevType1().setMinimumFrequencyPass(wp);
[detail] +    param.chebyshevType1().setMinimumFrequencyStop(ws);
[detail] +    param.chebyshevType1().setMaximumLossPass(gpass);
[detail] +    param.chebyshevType1().setMinimumAttenuationStop(gstop);
[detail] +    param.chebyshevType1().setMaximumRipple(rp);
[detail] +    if(ok) {
[detail] +      _process->filter(param);
[detail] +    }
[detail]        }
[detail] +
[detail] +  void SignalProcessObject::filterChebyshevType1(double minWp, double maxWp, double minWs, double maxWs,
[detail] +                                                 double gpass, double gstop, double rp)
[detail] +  {
[detail] +    TRACE;
[detail] +    bool ok=true;
[detail] +    FilterParameters param;
[detail] +    param.setMethod(FilterParameters::ChebyshevType1);
[detail] +    param.setBand(minWs<minWp ? FilterParameters::BandPass : FilterParameters::BandStop);
[detail] +    param.chebyshevType1().setMinimumFrequencyPass(minWp);
[detail] +    param.chebyshevType1().setMaximumFrequencyPass(maxWp);
[detail] +    param.chebyshevType1().setMinimumFrequencyStop(minWs);
[detail] +    param.chebyshevType1().setMaximumFrequencyStop(maxWs);
[detail] +    param.chebyshevType1().setMaximumLossPass(gpass);
[detail] +    param.chebyshevType1().setMinimumAttenuationStop(gstop);
[detail] +    param.chebyshevType1().setMaximumRipple(rp);
[detail] +    if(ok) {
[detail]        _process->filter(param);
[detail]      }
[detail]    }
[detail]  
[detail] -  void SignalProcessObject::whiten()
[detail] +  void SignalProcessObject::whiten(double fmin, double fmax, double apodization)
[detail]    {
[detail]      TRACE;
[detail]      if(_process) {
[detail] -      _process->whiten();
[detail] +      _process->whiten(fmin, fmax, apodization);
[detail]      }
[detail]    }
[detail]  
[detail] @@ -361,5 +504,21 @@
[detail]      }
[detail]    }
[detail]  
[detail] +  void SignalProcessObject::derivate()
[detail] +  {
[detail] +    TRACE;
[detail] +    if(_process) {
[detail] +      _process->derivate();
[detail] +    }
[detail] +  }
[detail] +
[detail] +  void SignalProcessObject::integrate()
[detail] +  {
[detail] +    TRACE;
[detail] +    if(_process) {
[detail] +      _process->integrate();
[detail] +    }
[detail] +  }
[detail] +
[detail]  } 
[detail]  
[detail]              src/SignalProcessScript.cpp:  version-4.5.1	modified out of comments
[detail] --- src/SignalProcessScript.cpp-version-4.5.1-stripped	2025-09-28 04:01:05.415504989 +0200
[detail] +++ src/SignalProcessScript.cpp-HEAD-stripped	2025-09-28 04:01:05.419505008 +0200
[detail] @@ -31,6 +31,9 @@
[detail]    _engine->globalObject().setProperty("signalCount", extension.property("signalCount"));
[detail]    _engine->globalObject().setProperty("selectSignals", extension.property("selectSignals"));
[detail]    _engine->globalObject().setProperty("newGroup", extension.property("newGroup"));
[detail] +  _engine->globalObject().setProperty("startTime", extension.property("startTime"));
[detail] +  _engine->globalObject().setProperty("endTime", extension.property("endTime"));
[detail] +  _engine->globalObject().setProperty("setStartTime", extension.property("setStartTime"));
[detail]  
[detail]    _engine->globalObject().setProperty("removeTrend", extension.property("removeTrend"));
[detail]    _engine->globalObject().setProperty("subtractValue", extension.property("subtractValue"));
[detail] @@ -38,6 +41,9 @@
[detail]    _engine->globalObject().setProperty("subtractSignals", extension.property("subtractSignals"));
[detail]    _engine->globalObject().setProperty("multiply", extension.property("multiply"));
[detail]    _engine->globalObject().setProperty("filter", extension.property("filter"));
[detail] +  _engine->globalObject().setProperty("filterButterworth", extension.property("filterButterworth"));
[detail] +  _engine->globalObject().setProperty("filterFrequencyWindow", extension.property("filterFrequencyWindow"));
[detail] +  _engine->globalObject().setProperty("filterChebyshevType1", extension.property("filterChebyshevType1"));
[detail]    _engine->globalObject().setProperty("agc", extension.property("agc"));
[detail]    _engine->globalObject().setProperty("whiten", extension.property("whiten"));
[detail]    _engine->globalObject().setProperty("stddevClip", extension.property("stddevClip"));
[detail] @@ -50,6 +56,8 @@
[detail]    _engine->globalObject().setProperty("decimateAmplitude", extension.property("decimateAmplitude"));
[detail]    _engine->globalObject().setProperty("decimateTime", extension.property("decimateTime"));
[detail]    _engine->globalObject().setProperty("gapsFromNaN", extension.property("gapsFromNaN"));
[detail] +  _engine->globalObject().setProperty("derivate", extension.property("derivate"));
[detail] +  _engine->globalObject().setProperty("integrate", extension.property("integrate"));
[detail]  
[detail]    _engine->globalObject().setProperty("waveletTransform", extension.property("waveletTransform"));
[detail]    _engine->globalObject().setProperty("stalta", extension.property("stalta"));
[detail]             src/SignalResultsFactory.cpp:  version-4.5.1	not modified
[detail]                    src/SignalSegment.cpp:  version-4.5.1	no last version available
[detail]                   src/SignalTemplate.cpp:  version-4.5.1	not modified
[detail]                          src/SortKey.cpp:  version-4.5.1	not modified
[detail]                 src/SparseKeepSignal.cpp:  version-4.5.1	modified out of comments
[detail] --- src/SparseKeepSignal.cpp-version-4.5.1-stripped	2025-09-28 04:01:05.491505356 +0200
[detail] +++ src/SparseKeepSignal.cpp-HEAD-stripped	2025-09-28 04:01:05.495505376 +0200
[detail] @@ -71,8 +71,21 @@
[detail]      }
[detail]      if(k) {
[detail]        if(k->samplingPeriod()!=samplingPeriod) {
[detail] +        double commonPeriod=Number::greatestCommonFactor(k->samplingPeriod(), samplingPeriod);
[detail] +        
[detail] +        if(samplingPeriod/commonPeriod>100.0) {
[detail] +          App::log(tr("Sampling frequencies %1 and %2 Hz are not compatible (found common at %3 Hz)\n")
[detail] +                       .arg(1.0/k->samplingPeriod())
[detail] +                       .arg(samplingFrequency)
[detail] +                       .arg(1.0/commonPeriod));
[detail] +          return false;
[detail] +        }
[detail] +        if(!k->setSamplingPeriod(commonPeriod)) {
[detail]          return false;
[detail]        }
[detail] +        samplingPeriod=commonPeriod;
[detail] +        samplingFrequency=1.0/samplingPeriod;
[detail] +      }
[detail]        double dt=fabs(sigRange.start().secondsTo(k->startTime()));
[detail]        double dt0=qRound(dt*samplingFrequency)*samplingPeriod;
[detail]        if(fabs(dt0-dt)*samplingFrequency>0.001) { 
[detail] @@ -201,7 +214,7 @@
[detail]        iEnd=qRound(keep->startTime().secondsTo(end)*invSamplingPeriod);
[detail]        if(iEnd<0) continue;
[detail]      }
[detail] -    keep->initValues(value, iStart, iEnd-iStart+1);
[detail] +    keep->setValues(iStart, iEnd+1, value);
[detail]    }
[detail]  }
[detail]  
[detail]                  src/SparseTimeRange.cpp:  version-4.5.1	modified out of comments
[detail] --- src/SparseTimeRange.cpp-version-4.5.1-stripped	2025-09-28 04:01:05.511505453 +0200
[detail] +++ src/SparseTimeRange.cpp-HEAD-stripped	2025-09-28 04:01:05.515505472 +0200
[detail] @@ -568,7 +568,7 @@
[detail]  }
[detail]  
[detail]  
[detail] -double SparseTimeRange::totalLength() const
[detail] +double SparseTimeRange::lengthSeconds() const
[detail]  {
[detail]    TRACE;
[detail]    double sum=0.0;
[detail]                       src/StackCount.cpp:  version-4.5.1	not modified
[detail]                     src/StationGroup.cpp:  version-4.5.1	modified out of comments
[detail] --- src/StationGroup.cpp-version-4.5.1-stripped	2025-09-28 04:01:05.547505627 +0200
[detail] +++ src/StationGroup.cpp-HEAD-stripped	2025-09-28 04:01:05.551505647 +0200
[detail] @@ -28,9 +28,9 @@
[detail]      bool wrongNames=false;
[detail]      for(SubSignalPool::iterator it=sp.begin(); it!=sp.end(); it++) {
[detail]        if(n.isEmpty()) {
[detail] -        n=(*it)->name();
[detail] +        n=(*it)->metaData()->name();
[detail]        } else {
[detail] -        if(n!=(*it)->name()) {
[detail] +        if(n!=(*it)->metaData()->name()) {
[detail]            wrongNames=true;
[detail]          }
[detail]        }
[detail]                      src/StationList.cpp:  version-4.5.1	modified out of comments
[detail] --- src/StationList.cpp-version-4.5.1-stripped	2025-09-28 04:01:05.567505724 +0200
[detail] +++ src/StationList.cpp-HEAD-stripped	2025-09-28 04:01:05.571505744 +0200
[detail] @@ -10,7 +10,7 @@
[detail]  StationList::StationList()
[detail]  {
[detail]    TRACE;
[detail] -  _components=StationSignals::UndefinedComponent;
[detail] +    _components=StationSignals::UndefinedComponents;
[detail]  }
[detail]  
[detail]  
[detail] @@ -38,71 +38,73 @@
[detail]  }
[detail]  
[detail]  
[detail] -bool StationList::addSignal(Signal * sig)
[detail] +  bool StationList::addSignal(SignalSegment * sig)
[detail]  {
[detail]    TRACE;
[detail]    
[detail] +    StationSignals::Components components=StationSignals::UndefinedComponents;
[detail]    if (_components==StationSignals::AnySingleComponent) {
[detail]      
[detail]      
[detail]      for(iterator it=begin(); it!=end(); ++it) {
[detail]        StationSignals * stat=*it;
[detail] -      if(stat->component()!=sig->component()) {
[detail] +        if(stat->component()!=sig->metaData()->component()) {
[detail]          App::log(tr("Only one component type is allowed (%1<->%2).\n")
[detail] -              .arg(stat->firstValidSignal()->componentUserName())
[detail] -              .arg(sig->componentUserName()));
[detail] +                .arg(stat->firstValidSignal()->metaData()->componentUserName())
[detail] +                .arg(sig->metaData()->componentUserName()));
[detail]          return false;
[detail]        }
[detail] -      if(stat->name()==sig->name() &&
[detail] -         stat->utmZone()==sig->utmZone() &&
[detail] -         stat->coordinates().isSimilar(sig->receiver(), 0.001)) {
[detail] +        if(stat->name()==sig->metaData()->name() &&
[detail] +           stat->utmZone()==sig->metaData()->utmZone() &&
[detail] +           stat->coordinates().isSimilar(sig->metaData()->receiver(), 0.001)) {
[detail]          return stat->addSignal(sig);
[detail]        }
[detail]      }
[detail] +      components=StationSignals::AnySingleComponent;
[detail]    } else if(_components==StationSignals::AnyComponent) {
[detail]      
[detail]      for (iterator it=begin(); it!=end(); ++it) {
[detail]        StationSignals * stat=*it;
[detail] -      if(stat->name()==sig->name() &&
[detail] -         stat->coordinates().isSimilar(sig->receiver(), 0.001) &&
[detail] -         stat->utmZone()==sig->utmZone() &&
[detail] -         stat->component()==sig->component()) {
[detail] +        if(stat->name()==sig->metaData()->name() &&
[detail] +           stat->coordinates().isSimilar(sig->metaData()->receiver(), 0.001) &&
[detail] +           stat->utmZone()==sig->metaData()->utmZone() &&
[detail] +           stat->component()==sig->metaData()->component()) {
[detail]          return stat->addSignal(sig);
[detail]        }
[detail]      }
[detail] +      components=StationSignals::AnyComponent;
[detail]    } else {
[detail] -    StationSignals::Components components=_components;
[detail] -    switch (sig->component()) {
[detail] -    case Signal::Vertical:
[detail] -      components |= StationSignals::VerticalComponent;
[detail] +      switch (sig->metaData()->component()) {
[detail] +      case SignalMetaData::Vertical:
[detail] +        components=StationSignals::VerticalComponents;
[detail]        break;
[detail] -    case Signal::North:
[detail] -    case Signal::East:
[detail] -      components |= StationSignals::HorizontalComponent;
[detail] +      case SignalMetaData::North:
[detail] +      case SignalMetaData::East:
[detail] +        components=StationSignals::HorizontalComponents;
[detail] +        break;
[detail] +      case SignalMetaData::Horizontal:
[detail] +        if(sig->metaData()->amplitudeUnit()==SignalMetaData::Strain ||
[detail] +            sig->metaData()->amplitudeUnit()==SignalMetaData::StrainRate) {
[detail] +          components=StationSignals::HorizontalStrainComponents;
[detail] +        }
[detail]        break;
[detail]      default:
[detail] -      App::log(tr("Only Vertical, East or North components are allowed (%1).\n")
[detail] -                       .arg(sig->componentUserName()));
[detail] +        App::log(tr("Only Vertical, East, North or Horizontal (AmplitudeUnit=Strain) components are allowed (%1).\n")
[detail] +                     .arg(sig->metaData()->componentUserName()));
[detail]        return false;
[detail]      }
[detail] -    if(components!=_components) {
[detail] -      
[detail] -      for(iterator it=begin(); it!=end(); ++it) {
[detail] -        (*it)->setComponents(components);
[detail] -      }
[detail] -      _components=components;
[detail] -    }
[detail] +      _components=static_cast<StationSignals::Components>(_components | components);
[detail]      
[detail]      for(iterator it=begin();it!=end();++it) {
[detail]        StationSignals * stat=*it;
[detail] -      if(stat->name()==sig->name() &&
[detail] -         stat->utmZone()==sig->utmZone() &&
[detail] -         stat->coordinates().isSimilar(sig->receiver(), 0.001)) {
[detail] -        return stat->addSignal(sig);
[detail] +        if(stat->name()==sig->metaData()->name() &&
[detail] +           stat->utmZone()==sig->metaData()->utmZone() &&
[detail] +           stat->coordinates().isSimilar(sig->metaData()->receiver(), 0.001)) {
[detail] +          return stat->setComponents(components) && stat->addSignal(sig);
[detail]        }
[detail]      }
[detail]    }
[detail] -  StationSignals * stat=new StationSignals(_components);
[detail] +    StationSignals * stat=new StationSignals(components);
[detail]    append(stat);
[detail]    return stat->addSignal(sig);
[detail]  }
[detail]            src/StationProcessSignals.cpp:  version-4.5.1	modified out of comments
[detail] --- src/StationProcessSignals.cpp-version-4.5.1-stripped	2025-09-28 04:01:05.591505840 +0200
[detail] +++ src/StationProcessSignals.cpp-HEAD-stripped	2025-09-28 04:01:05.595505859 +0200
[detail] @@ -1,6 +1,7 @@
[detail]  
[detail]  
[detail]  #include "StationProcessSignals.h"
[detail] +#include "StoredSignal.h"
[detail]  
[detail]  namespace GeopsyCore {
[detail]  
[detail] @@ -66,8 +67,8 @@
[detail]          cs.filtered=new QList<DoubleSignal *>;
[detail]          DoubleSignal * sig;
[detail]          for(SubSignalPool::const_iterator it=originals.begin(); it!=originals.end();it++) {
[detail] -          Signal * origSig=*it;
[detail] -          sig=new DoubleSignal(origSig->nSamples());
[detail] +          SignalSegment * origSig=*it;
[detail] +          sig=new DoubleSignal(origSig->size());
[detail]            sig->setSamplingPeriod(dt);
[detail]            cs.filtered->append(sig);
[detail]          }
[detail] @@ -78,14 +79,15 @@
[detail]        const SubSignalPool& originals=_originals->originals(iComp);
[detail]        ComponentSignals& cs=_signals[iComp];
[detail]        FilterParameters fparam;
[detail] -      fparam.setFrequencyRange(frequency);
[detail] -      fparam.setWidth(0.1);
[detail] -      fparam.setBand(FilterParameters::HighPass);
[detail]        fparam.setMethod(FilterParameters::FrequencyWindow);
[detail] +      fparam.setBand(FilterParameters::HighPass);
[detail] +      fparam.frequencyWindow().setMinimumFrequency(frequency);
[detail] +      fparam.frequencyWindow().window().setShape(WindowFunctionParameters::Cosine);
[detail] +      fparam.frequencyWindow().setWidth(0.1);
[detail]        int n=originals.count();
[detail]        for(int i=0; i<n; i++) {
[detail] -        Signal * origSig=originals.at(i);
[detail] -        (*cs.filtered)[i]->copySamplesFrom(origSig);
[detail] +        SignalSegment * origSig=originals.at(i);
[detail] +        (*cs.filtered)[i]->copySamplesFrom(origSig->values());
[detail]          (*cs.filtered)[i]->filter(fparam);
[detail]        }
[detail]      }
[detail] @@ -119,7 +121,7 @@
[detail]    toCS.processed->setValue(0.0);
[detail]    if(fromCS.filtered) {
[detail]      for(int i=0; i<n; i++) {
[detail] -      Signal * origSig=originals.at(i);
[detail] +      SignalSegment * origSig=originals.at(i);
[detail]        DoubleSignal * sig=fromCS.filtered->at(i);
[detail]        if(!toCS.processed->copySamplesFrom(sig, origSig->startTime().secondsTo(tw.start()), 0.0, tw.lengthSeconds())) {
[detail]          return false;
[detail] @@ -127,8 +129,8 @@
[detail]      }
[detail]    } else {
[detail]      for(int i=0; i<n; i++) {
[detail] -      Signal * sig=originals.at(i);
[detail] -      if(!toCS.processed->copySamplesFrom(sig, sig->startTime().secondsTo(tw.start()), 0.0, tw.lengthSeconds())) {
[detail] +      SignalSegment * sig=originals.at(i);
[detail] +      if(!toCS.processed->copySamplesFrom(sig->values(), sig->startTime().secondsTo(tw.start()), 0.0, tw.lengthSeconds())) {
[detail]          return false;
[detail]        }
[detail]      }
[detail]                   src/StationSignals.cpp:  version-4.5.1	modified out of comments
[detail] --- src/StationSignals.cpp-version-4.5.1-stripped	2025-09-28 04:01:05.611505936 +0200
[detail] +++ src/StationSignals.cpp-HEAD-stripped	2025-09-28 04:01:05.615505956 +0200
[detail] @@ -1,11 +1,11 @@
[detail]  
[detail]  
[detail] -#include <math.h>
[detail] -
[detail]  #include <QGpCoreTools.h>
[detail] +
[detail]  #include "StationSignals.h"
[detail]  #include "SparseKeepSignal.h"
[detail]  #include "KeepSignal.h"
[detail] +#include "StoredSignal.h"
[detail]  
[detail]  namespace GeopsyCore {
[detail]  
[detail] @@ -13,7 +13,7 @@
[detail]  {
[detail]    TRACE;
[detail]    _components=c;
[detail] -  if(_components==UndefinedComponent)
[detail] +  if(_components==UndefinedComponents)
[detail]      _signals=nullptr;
[detail]    else
[detail]      _signals=new SubSignalPool[nComponents()];
[detail] @@ -40,74 +40,87 @@
[detail]  }
[detail]  
[detail]  
[detail] -void StationSignals::setComponents(Components c)
[detail] +bool StationSignals::setComponents(Components c)
[detail]  {
[detail]    TRACE;
[detail] -  if(c==_components || c==UndefinedComponent) return;
[detail] +  if(c==_components || c==UndefinedComponents) return true;
[detail]    switch(_components) {
[detail] -  case UndefinedComponent:
[detail] +  case UndefinedComponents:
[detail]      _components=c;
[detail]      _signals=new SubSignalPool[nComponents()];
[detail] -    break;
[detail] -  case VerticalComponent:
[detail] -    if(c==HorizontalComponent || c==AllComponent) {
[detail] -      _components=AllComponent;
[detail] +    return true;
[detail] +  case VerticalComponents:
[detail] +    if(c==HorizontalComponents || c==ThreeComponents) {
[detail] +      _components=ThreeComponents;
[detail]        SubSignalPool * s=new SubSignalPool[nComponents()];
[detail]        s[0]=_signals[0];
[detail]        delete [] _signals;
[detail]        _signals=s;
[detail] +      return true;
[detail]      }
[detail]      break;
[detail] -  case HorizontalComponent:
[detail] -    if(c==VerticalComponent || c==AllComponent) {
[detail] -      _components=AllComponent;
[detail] +  case HorizontalComponents:
[detail] +    if(c==VerticalComponents || c==ThreeComponents) {
[detail] +      _components=ThreeComponents;
[detail]        SubSignalPool * s=new SubSignalPool[nComponents()];
[detail]        s[1]=_signals[0];
[detail]        s[2]=_signals[1];
[detail]        delete [] _signals;
[detail]        _signals=s;
[detail] +      return true;
[detail]      }
[detail]      break;
[detail] -  case AnySingleComponent:
[detail] -  case AnyComponent:
[detail] -  case AllComponent:
[detail] +  case ThreeComponents:
[detail] +    return true;
[detail] +  default:
[detail]      break;
[detail]    }
[detail] +  App::log(tr("setComponents(%1) when components is %2, incompatible components\n")
[detail] +               .arg(convertComponents(c)).arg(convertComponents(_components)));
[detail] +  return false;
[detail]  }
[detail]  
[detail]  
[detail] -bool StationSignals::addSignal(Signal * sig)
[detail] +bool StationSignals::addSignal(SignalSegment * sig)
[detail]  {
[detail]    TRACE;
[detail]    
[detail]    int iComp;
[detail]    SAFE_UNINITIALIZED(iComp,0)
[detail]    switch(_components) {
[detail] -  case VerticalComponent:
[detail] -    if(sig->component()!=Signal::Vertical) return false;
[detail] +  case VerticalComponents:
[detail] +    if(sig->metaData()->component()!=SignalMetaData::Vertical) return false;
[detail]      iComp=0;
[detail]      break;
[detail] -  case HorizontalComponent:
[detail] -    switch(sig->component()) {
[detail] -    case Signal::North:
[detail] +  case HorizontalComponents:
[detail] +    switch(sig->metaData()->component()) {
[detail] +    case SignalMetaData::North:
[detail]        iComp=0;
[detail]        break;
[detail] -    case Signal::East:
[detail] +    case SignalMetaData::East:
[detail]        iComp=1;
[detail]        break;
[detail]      default:
[detail]        return false;
[detail]      }
[detail]      break;
[detail] -  case AllComponent:
[detail] -    switch(sig->component()) {
[detail] -    case Signal::Vertical:
[detail] +  case HorizontalStrainComponents:
[detail] +    if(sig->metaData()->component()!=SignalMetaData::Horizontal ||
[detail] +       (sig->metaData()->amplitudeUnit()!=SignalMetaData::Strain &&
[detail] +        sig->metaData()->amplitudeUnit()!=SignalMetaData::StrainRate)) {
[detail] +      return false;
[detail] +    }
[detail] +    iComp=0;
[detail] +    break;
[detail] +  case ThreeComponents:
[detail] +    switch(sig->metaData()->component()) {
[detail] +    case SignalMetaData::Vertical:
[detail]        iComp=0;
[detail]        break;
[detail] -    case Signal::North:
[detail] +    case SignalMetaData::North:
[detail]        iComp=1;
[detail]        break;
[detail] -    case Signal::East:
[detail] +    case SignalMetaData::East:
[detail]        iComp=2;
[detail]        break;
[detail]      default:
[detail] @@ -118,16 +131,18 @@
[detail]    case AnyComponent:
[detail]      iComp=0;
[detail]      break;
[detail] -  case UndefinedComponent:
[detail] +  case UndefinedComponents:
[detail] +  case StrainComponents:
[detail] +  case ThreeComponentsAndStrain:
[detail]      return false;
[detail]    }
[detail]    
[detail]    SubSignalPool& subPool=_signals[iComp];
[detail] -  sig->fastFourierTransform(Signal::Waveform);
[detail] +  sig->values()->fastFourierTransform(DoubleSignal::Waveform);
[detail]    subPool.addSignal(sig);
[detail] -  App::log(tr("Add signal id %1 to component %2 of station %3 at %4\n")
[detail] -                .arg(sig->id())
[detail] -                .arg(Signal::userName(sig->component()) )
[detail] +  APP_LOG(1, tr("Add signal id %1 to component %2 of station %3 at %4\n")
[detail] +                .arg(sig->id().toString())
[detail] +                .arg(SignalMetaData::userName(sig->metaData()->component()))
[detail]                  .arg(name())
[detail]                  .arg(coordinates().toString('f', 2)));
[detail]    return true;
[detail] @@ -141,7 +156,7 @@
[detail]    for(int iComp=0; iComp<nComp; iComp++) {
[detail]      if(_signals[iComp].isEmpty()) {
[detail]        App::log(tr("Missing %1 component for station %2.\n")
[detail] -                    .arg(Signal::userName(component( iComp, _components)))
[detail] +                    .arg(SignalMetaData::userName(component(iComp, _components)))
[detail]                      .arg(name()));
[detail]        return false;
[detail]      }
[detail] @@ -150,7 +165,7 @@
[detail]  }
[detail]  
[detail]  
[detail] -bool StationSignals::contains(const Signal * sig) const
[detail] +bool StationSignals::contains(const SignalSegment * sig) const
[detail]  {
[detail]    TRACE;
[detail]    int nComp=nComponents();
[detail] @@ -171,7 +186,7 @@
[detail]    for(int iComp=0; iComp<nComp; iComp++) {
[detail]      const SubSignalPool& subPool=_signals[iComp];
[detail]      for(SubSignalPool::const_iterator it=subPool.begin(); it!=subPool.end(); it++) {
[detail] -      Signal * sig=*it;
[detail] +      SignalSegment * sig=*it;
[detail]        if(sig->startTime()<t) t=sig->startTime();
[detail]      }
[detail]    }
[detail] @@ -187,10 +202,10 @@
[detail]    for(int iComp=0; iComp<nComp; iComp++) {
[detail]      const SubSignalPool& subPool=_signals[iComp];
[detail]      for(SubSignalPool::const_iterator it=subPool.begin(); it!=subPool.end(); it++) {
[detail] -      Signal * sig=*it;
[detail] +      SignalSegment * sig=*it;
[detail]        if(u.isNull()) {
[detail] -        u=sig->effectiveAmplitudeUnit();
[detail] -      } else if(u!=sig->effectiveAmplitudeUnit()) {
[detail] +        u=sig->metaData()->effectiveAmplitudeUnit();
[detail] +      } else if(u!=sig->metaData()->effectiveAmplitudeUnit()) {
[detail]          return "n/a";
[detail]        }
[detail]      }
[detail] @@ -207,7 +222,7 @@
[detail]    for(int iComp=0; iComp<nComp; iComp++) {
[detail]      const SubSignalPool& subPool=_signals[iComp];
[detail]      for(SubSignalPool::const_iterator it=subPool.begin(); it!=subPool.end(); it++) {
[detail] -      Signal * sig=*it;
[detail] +      SignalSegment * sig=*it;
[detail]        if(sig->endTime()>t) t=sig->endTime();
[detail]      }
[detail]    }
[detail] @@ -218,44 +233,58 @@
[detail]  {
[detail]    TRACE;
[detail]    switch (c) {
[detail] -  case VerticalComponent:
[detail] +  case VerticalComponents:
[detail]    case AnySingleComponent:
[detail]    case AnyComponent:
[detail]      return 1;
[detail] -  case HorizontalComponent:
[detail] +  case HorizontalComponents:
[detail]      return 2;
[detail] -  case AllComponent:
[detail] +  case HorizontalStrainComponents:
[detail] +    return 1;
[detail] +  case ThreeComponents:
[detail] +  case ThreeComponentsAndStrain:
[detail]      return 3;
[detail]    default:
[detail]      return 0;
[detail]    }
[detail]  }
[detail]  
[detail] -Signal::Components StationSignals::component(int index, Components c)
[detail] +SignalMetaData::Components StationSignals::component(int index, Components c)
[detail]  {
[detail]    switch (c) {
[detail] -  case VerticalComponent:
[detail] -    return Signal::Vertical;
[detail] -  case HorizontalComponent:
[detail] +  case VerticalComponents:
[detail] +    return SignalMetaData::Vertical;
[detail] +  case HorizontalComponents:
[detail]      switch (index) {
[detail] -    case 0: return Signal::North;
[detail] -    default: return Signal::East;
[detail] +    case 0: return SignalMetaData::North;
[detail] +    case 1: return SignalMetaData::East;
[detail] +    default: break;
[detail]      }
[detail] -  case AllComponent:
[detail] +    break;
[detail] +  case ThreeComponents:
[detail]      switch (index) {
[detail] -    case 0: return Signal::Vertical;
[detail] -    case 1: return Signal::North;
[detail] -    default: return Signal::East;
[detail] +    case 0: return SignalMetaData::Vertical;
[detail] +    case 1: return SignalMetaData::North;
[detail] +    case 2: return SignalMetaData::East;
[detail] +    default: break;
[detail]      }
[detail] +    break;
[detail] +  case HorizontalStrainComponents:
[detail] +    if(index==0) {
[detail] +      return SignalMetaData::Horizontal;
[detail] +    }
[detail] +    break;
[detail]    case AnySingleComponent:
[detail]    case AnyComponent:
[detail] -  case UndefinedComponent:
[detail] +  case UndefinedComponents:
[detail] +  case StrainComponents:
[detail] +  case ThreeComponentsAndStrain:
[detail]      break;
[detail]    }
[detail] -  return Signal::UndefinedComponent;
[detail] +  return SignalMetaData::UndefinedComponent;
[detail]  }
[detail]  
[detail] -Signal * StationSignals::firstValidSignal() const
[detail] +SignalSegment * StationSignals::firstValidSignal() const
[detail]  {
[detail]    TRACE;
[detail]    int nComp=nComponents();
[detail] @@ -265,7 +294,7 @@
[detail]    return nullptr;
[detail]  }
[detail]  
[detail] -Signal * StationSignals::lastValidSignal() const
[detail] +SignalSegment * StationSignals::lastValidSignal() const
[detail]  {
[detail]    TRACE;
[detail]    int nComp=nComponents();
[detail] @@ -300,7 +329,7 @@
[detail]    for(int iComp=0; iComp<nComp; iComp++) {
[detail]      const SubSignalPool& subPool=originals(iComp);
[detail]      for(SubSignalPool::const_iterator itSig=subPool.begin();itSig!=subPool.end();++itSig) {
[detail] -      const Signal * sig=*itSig;
[detail] +      const SignalSegment * sig=*itSig;
[detail]        TimeRange r=sig->timeRange().range();
[detail]        if(!keep->setSampling(r, sig->samplingPeriod())) {
[detail]          App::log(tr("Station '%1': incompatible sampling from %2 to %3 s, skipping range\n")
[detail] @@ -319,7 +348,7 @@
[detail]    for(int iComp=0; iComp<nComp; iComp++) {
[detail]      const SubSignalPool& subPool=originals(iComp);
[detail]      for(SubSignalPool::const_iterator itSig=subPool.begin();itSig!=subPool.end(); ++itSig) {
[detail] -      const Signal * sig=*itSig;
[detail] +      const SignalSegment * sig=*itSig;
[detail]        VectorList<KeepSignal *> keeps=keep->keeps(sig->timeRange().range());
[detail]        for(VectorList<KeepSignal *>::iterator itKeep=keeps.begin(); itKeep!=keeps.end(); itKeep++) {
[detail]          KeepSignal * keepSig=*itKeep;
[detail] @@ -327,8 +356,8 @@
[detail]          if(param.rawSignalAntiTrigger().enabled &&
[detail]             param.rawComponent(iComp) &&
[detail]             param.rawStation(stationIndex)) {
[detail] -          DoubleSignal * tempsig=new DoubleSignal( *sig);
[detail] -          tempsig->copySamplesFrom(sig);
[detail] +          DoubleSignal * tempsig=new DoubleSignal(*sig->values());
[detail] +          tempsig->copySamplesFrom(sig->values());
[detail]            tempsig->abs();
[detail]            tempsig->staltaToKeep(param.rawSignalAntiTrigger(), keepSig, delay);
[detail]            delete tempsig;
[detail] @@ -336,8 +365,8 @@
[detail]          if(param.filterSignalAntiTrigger().enabled &&
[detail]             param.filterComponent(iComp) &&
[detail]             param.filterStation(stationIndex)) {
[detail] -          DoubleSignal * tempsig=new DoubleSignal( *sig);
[detail] -          tempsig->copySamplesFrom(sig);
[detail] +          DoubleSignal * tempsig=new DoubleSignal(*sig->values());
[detail] +          tempsig->copySamplesFrom(sig->values());
[detail]            tempsig->filter(param.filter());
[detail]            tempsig->abs();
[detail]            tempsig->staltaToKeep(param.filterSignalAntiTrigger(), keepSig, delay);
[detail] @@ -347,10 +376,10 @@
[detail]          case WindowingParameters::NoSampleThreshold:
[detail]            break;
[detail]          case WindowingParameters::AbsoluteSampleThreshold:
[detail] -          sig->clipMaxToKeep(param.badSampleThreshold(), keepSig, delay);
[detail] +          sig->values()->clipMaxToKeep(param.badSampleThreshold(), keepSig, delay);
[detail]            break;
[detail]          case WindowingParameters::RelativeSampleThreshold:
[detail] -          sig->clipMaxToKeep(param.badSampleThreshold()*(sig->maximum()-sig->average(0, sig->nSamples())), keepSig, delay);
[detail] +          sig->values()->clipMaxToKeep(param.badSampleThreshold()*(sig->values()->maximum()-sig->values()->average(0, sig->size())), keepSig, delay);
[detail]            break;
[detail]          }
[detail]        }
[detail] @@ -358,4 +387,10 @@
[detail]    }
[detail]  }
[detail]  
[detail] +ENUM_AS_STRING_BEGIN(StationSignals, Components)
[detail] +ENUM_AS_STRING_DATA_8(AnyComponent, AnySingleComponent, HorizontalComponents, HorizontalStrainComponents,
[detail] +                      StrainComponents, ThreeComponents, UndefinedComponents, VerticalComponents);
[detail] +ENUM_AS_STRING_END
[detail] +
[detail] +
[detail]  } 
[detail]                     src/StoredSignal.cpp:  version-4.5.1	no last version available
[detail]                    src/SubSignalPool.cpp:  version-4.5.1	modified out of comments
[detail] --- src/SubSignalPool.cpp-version-4.5.1-stripped	2025-09-28 04:01:05.643506091 +0200
[detail] +++ src/SubSignalPool.cpp-HEAD-stripped	2025-09-28 04:01:05.647506111 +0200
[detail] @@ -1,23 +1,18 @@
[detail] -
[detail]  
[detail] -#include <math.h>
[detail] -
[detail] -#include <QGpCoreTools.h>
[detail]  
[detail]  #include "SubSignalPool.h"
[detail] -#include "SubSignalPoolProcess.h"
[detail] +#include "StoredSignal.h"
[detail]  #include "SignalDatabase.h"
[detail] -#include "GeopsyCoreEngine.h"
[detail] -#include "AbstractSignalGroup.h"
[detail] -#include "GeopsySignalHeader.h"
[detail] -#include "WaveHeader.h"
[detail] -#include "AbstractFileFormat.h"
[detail]  #include "DynamicSignal.h"
[detail] -#include "SEGYHeader.h"
[detail] +#include "MetaDataFieldList.h"
[detail] +#include "SubSignalPoolProcess.h"
[detail]  #include "TimePick.h"
[detail] -#include "Comments.h"
[detail] +#include "AbstractFileFormat.h"
[detail] +#include "GeopsySignalHeader.h"
[detail] +#include "SEGYHeader.h"
[detail] +#include "WaveHeader.h"
[detail]  #include "CitySignal.h"
[detail] -#include "GeopsyPreferences.h"
[detail] +#include "Comments.h"
[detail]  
[detail]  namespace GeopsyCore {
[detail]  
[detail] @@ -22,8 +17,10 @@
[detail]  namespace GeopsyCore {
[detail]  
[detail]  
[detail] +
[detail] +  
[detail]  SubSignalPool::SubSignalPool(const SubSignalPool& subPool)
[detail] -    : QList<Signal *>(subPool), _name(subPool.name())
[detail] +      : QList<SignalSegment *>(subPool), _name(subPool.name())
[detail]  {
[detail]    TRACE;
[detail]    for(iterator it=begin(); it!=end(); ++it) {
[detail] @@ -36,7 +33,7 @@
[detail]    TRACE;
[detail]    if( !isEmpty())
[detail]      removeAll();
[detail] -  QList<Signal *>::operator=(o);
[detail] +    QList<SignalSegment *>::operator=(o);
[detail]    _name=o._name;
[detail]    for(iterator it=begin(); it!=end(); ++it) {
[detail]      ( *it) ->addReference();
[detail] @@ -63,8 +60,8 @@
[detail]      SubSignalPool c;
[detail]      c._name=_name;
[detail]      for(const_iterator it=begin(); it!=end(); ++it) {
[detail] -      Signal * sig=new Signal(**it);
[detail] -      sig->copySamplesFrom( *it);
[detail] +      SignalSegment * sig=new SignalSegment(**it);
[detail] +      sig->values()->copySamplesFrom((*it)->values());
[detail]        c.addSignal(sig);
[detail]      }
[detail]      return c;
[detail] @@ -75,8 +72,8 @@
[detail]    TRACE;
[detail]    int nSamples=0;
[detail]    for(iterator it=begin(); it!=end(); ++it) {
[detail] -    Signal * sig=*it;
[detail] -    nSamples += sig->nSamples();
[detail] +      SignalSegment * sig=*it;
[detail] +      nSamples+=sig->size();
[detail]    }
[detail]    return nSamples;
[detail]  }
[detail] @@ -88,10 +85,10 @@
[detail]    _name=tr("All signals");
[detail]  }
[detail]  
[detail] -void SubSignalPool::addSignal(SignalDatabase * db, int id)
[detail] +  void SubSignalPool::addSignal(SignalDatabase * db, const UniqueID& id)
[detail]  {
[detail]    TRACE;
[detail] -  Signal * sig=db->signal(id);
[detail] +    SignalSegment * sig=db->signal(id);
[detail]    if(sig) {
[detail]      addSignal(sig);
[detail]    }
[detail] @@ -113,8 +110,8 @@
[detail]  {
[detail]    TRACE;
[detail]    for(iterator it=begin(); it!=end(); ++it) {
[detail] -    Signal * sig=* it;
[detail] -    if(point==sig->receiver())
[detail] +      SignalSegment * sig=* it;
[detail] +      if(point==sig->metaData()->receiver())
[detail]        append(sig);
[detail]    }
[detail]  }
[detail] @@ -122,28 +119,37 @@
[detail]  void SubSignalPool::addFile(SignalDatabase * db, int fileN)
[detail]  {
[detail]    TRACE;
[detail] -  SignalFile * sFile=db->filePool().at(fileN);
[detail] +    AbstractSignalFile * sFile=db->filePool().at(fileN);
[detail]    addFile(sFile);
[detail]  }
[detail]  
[detail] -void SubSignalPool::addFile(const SignalFile * sFile)
[detail] +  void SubSignalPool::addFile(const AbstractSignalFile * file)
[detail]  {
[detail]    TRACE;
[detail] -  const SubSignalPool & dbList=sFile->database()->subPool();
[detail] -  for(const_iterator it=dbList.begin(); it!=dbList.end(); ++it) {
[detail] -    Signal * sig=*it;
[detail] -    if(sig->file()==sFile) {
[detail] +    int n=file->numberOfSignals();
[detail] +    for(int i=0; i<n; i++) {
[detail] +      append(file->signalSegment(i));
[detail] +    }
[detail] +    if(!_name.isEmpty()) {
[detail] +      _name+=tr("+");
[detail] +    }
[detail] +    _name+=tr("file %1").arg(file->shortDisplayName(IndexOfFile::null));
[detail] +  }
[detail]        
[detail] -      append(sig);
[detail] +  void SubSignalPool::addFile(const SignalFileIndex& file)
[detail] +  {
[detail] +    TRACE;
[detail] +    IndexInFile n=file.file()->numberOfSignalsPerFile();
[detail] +    for(IndexInFile i; i<n; i++) {
[detail] +      append(file.file()->signalSegment(i, file.index()));
[detail]      }
[detail] +    if(!_name.isEmpty()) {
[detail] +      _name+=tr("+");
[detail]    }
[detail] -  if(_name.isEmpty())
[detail] -    _name=tr( "File %1" ).arg(sFile->shortName());
[detail] -  else
[detail] -    _name += tr( "+File %1" ).arg(sFile->shortName());
[detail] +    _name+=tr("file %1").arg(file.file()->shortName(file.index()));
[detail]  }
[detail]  
[detail] -void SubSignalPool::insertSignal(Signal * sig, Signal * refSig, bool before)
[detail] +  void SubSignalPool::insertSignal(SignalSegment * sig, SignalSegment * refSig, bool before)
[detail]  {
[detail]    TRACE;
[detail]    if( !refSig)
[detail] @@ -170,18 +176,18 @@
[detail]  void SubSignalPool::removeAt(int i)
[detail]  {
[detail]    TRACE;
[detail] -  Signal * sig=at(i);
[detail] -  QList<Signal *>::removeAt(i);
[detail] -  Signal::removeReference(sig);
[detail] +    SignalSegment * sig=at(i);
[detail] +    QList<SignalSegment *>::removeAt(i);
[detail] +    SignalSegment::removeReference(sig);
[detail]  }
[detail]  
[detail]  
[detail] -void SubSignalPool::remove(Signal * sig)
[detail] +  void SubSignalPool::remove(SignalSegment * sig)
[detail]  {
[detail]    int index=indexOf(sig);
[detail]    if(index>-1) {
[detail] -    QList<Signal *>::removeAt(index);
[detail] -    Signal::removeReference(sig);
[detail] +      QList<SignalSegment *>::removeAt(index);
[detail] +      SignalSegment::removeReference(sig);
[detail]    }
[detail]  }
[detail]  
[detail] @@ -198,20 +204,20 @@
[detail]  {
[detail]    TRACE;
[detail]    while(!isEmpty()) {
[detail] -    Signal * sig=last();
[detail] +      SignalSegment * sig=last();
[detail]      removeLast();
[detail] -    Signal::removeReference(sig);
[detail] +      SignalSegment::removeReference(sig);
[detail]    }
[detail]  }
[detail]  
[detail] -void SubSignalPool::remove(Signal::Components comp)
[detail] +  void SubSignalPool::remove(SignalMetaData::Components comp)
[detail]  {
[detail]    int i=0;
[detail]    while(i<count()) {
[detail] -    Signal * sig=at(i);
[detail] -    if(sig->component()==comp) {
[detail] -      QList<Signal *>::removeAt(i);
[detail] -      Signal::removeReference(sig);
[detail] +      SignalSegment * sig=at(i);
[detail] +      if(sig->metaData()->component()==comp) {
[detail] +        QList<SignalSegment *>::removeAt(i);
[detail] +        SignalSegment::removeReference(sig);
[detail]      } else
[detail]        i++;
[detail]    }
[detail] @@ -221,12 +227,31 @@
[detail]  void SubSignalPool::remove(const QStringList& keepSignalNames)
[detail]  {
[detail]    TRACE;
[detail] -  QMutableListIterator<Signal *> it(*this);
[detail] +    QSet<QString> selectedNames;
[detail] +    QList<QPair<QString, QString>> selectedRanges;
[detail] +    for(QStringList::const_iterator it=keepSignalNames.begin(); it!=keepSignalNames.end(); it++) {
[detail] +      int i=it->indexOf("-");
[detail] +      if(i>-1) {
[detail] +        selectedRanges.append(QPair<QString, QString>(it->left(i), it->mid(i+1)));
[detail] +      } else {
[detail] +        selectedNames.insert(*it);
[detail] +      }
[detail] +    }
[detail] +    QMutableListIterator<SignalSegment *> it(*this);
[detail]    while (it.hasNext()) {
[detail] -    Signal * sig=it.next();
[detail] -    if(!keepSignalNames.contains(sig->name())) {
[detail] +      SignalSegment * sig=it.next();
[detail] +      if(!selectedNames.contains(sig->metaData()->name())) {
[detail] +        bool toRemove=true;
[detail] +        for(QList<QPair<QString, QString>>::iterator itp=selectedRanges.begin(); itp!=selectedRanges.end(); itp++) {
[detail] +          if(sig->metaData()->name()>=itp->first &&  sig->metaData()->name()<=itp->second) {
[detail] +            toRemove=false;
[detail] +            break;
[detail] +          }
[detail] +        }
[detail] +        if(toRemove) {
[detail]        it.remove();
[detail] -      Signal::removeReference(sig);
[detail] +          SignalSegment::removeReference(sig);
[detail] +        }
[detail]      }
[detail]    }
[detail]  }
[detail] @@ -235,9 +260,9 @@
[detail]  {
[detail]    TRACE;
[detail]    for(iterator it=begin(); it!=end(); ++it) {
[detail] -    Signal * sig=* it;
[detail] -    if(!sig->warnReadOnlySamples()) {
[detail] -      sig->subtractValue(val);
[detail] +      SignalSegment * sig=* it;
[detail] +      if(!sig->metaData()->warnReadOnlySamples()) {
[detail] +        sig->values()->subtractValue(val);
[detail]      }
[detail]    }
[detail]  }
[detail] @@ -246,37 +271,37 @@
[detail]  {
[detail]    TRACE;
[detail]    for(iterator it=begin(); it!=end(); ++it) {
[detail] -    Signal * sig=* it;
[detail] -    if(!sig->warnReadOnlySamples()) {
[detail] -      App::log(1, tr("Signal '%1':\n").arg(sig->name()));
[detail] -      sig->removeTrend();
[detail] +      SignalSegment * sig=* it;
[detail] +      if(!sig->metaData()->warnReadOnlySamples()) {
[detail] +        App::log(1, tr("Signal segment '%1':\n").arg(sig->metaData()->name()));
[detail] +        sig->values()->removeTrend();
[detail]      }
[detail]    }
[detail]  }
[detail]  
[detail] -void SubSignalPool::signalOperationAdd(Signal *bysig)
[detail] +  void SubSignalPool::signalOperationAdd(SignalSegment *bysig)
[detail]  {
[detail]    TRACE;
[detail]    
[detail] -  fastFourierTransform(Signal::Waveform);
[detail] +    fastFourierTransform(DoubleSignal::Waveform);
[detail]    bool bySigIncludedInSubpool=false;
[detail]    SubSignalPoolProcess cp(*this);
[detail] -  bysig->constLockSamples();
[detail] +    bysig->values()->constLockSamples();
[detail]    for(iterator it=begin(); it!=end(); ++it) {
[detail] -    Signal * sig=* it;
[detail] +      SignalSegment * sig=* it;
[detail]      if(sig!=bysig) { 
[detail] -      if( !sig->warnReadOnlySamples()) {
[detail] -        sig->addSignal(bysig);
[detail] +        if(!sig->metaData()->warnReadOnlySamples()) {
[detail] +          sig->values()->addSignal(bysig->values());
[detail]        }
[detail]      } else {
[detail]        bySigIncludedInSubpool=true;
[detail]      }
[detail]      cp.next();
[detail]    }
[detail] -  bysig->unlockSamples();
[detail] +    bysig->values()->unlockSamples();
[detail]    if(bySigIncludedInSubpool) { 
[detail] -    if(!bysig->warnReadOnlySamples()) {
[detail] -      bysig->setValue(0.0);
[detail] +      if(!bysig->metaData()->warnReadOnlySamples()) {
[detail] +        bysig->values()->multiply(2.0);
[detail]      }
[detail]    }
[detail]  }
[detail] @@ -287,39 +312,39 @@
[detail]    if(count()!=bySubPool->count())
[detail]      return ;
[detail]    
[detail] -  fastFourierTransform(Signal::Waveform);
[detail] +    fastFourierTransform(DoubleSignal::Waveform);
[detail]    for(int i=0; i < count(); ++i) {
[detail] -    Signal * sig=at(i);
[detail] -    Signal * bysig=bySubPool->at(i);
[detail] -    if(!sig->warnReadOnlySamples()) {
[detail] -      sig->addSignal(bysig);
[detail] +      SignalSegment * sig=at(i);
[detail] +      SignalSegment * bysig=bySubPool->at(i);
[detail] +      if(!sig->metaData()->warnReadOnlySamples()) {
[detail] +        sig->values()->addSignal(bysig->values());
[detail]      }
[detail]    }
[detail]  }
[detail]  
[detail] -void SubSignalPool::signalOperationSubtract(Signal *bysig)
[detail] +  void SubSignalPool::signalOperationSubtract(SignalSegment *bysig)
[detail]  {
[detail]    TRACE;
[detail]    
[detail] -  fastFourierTransform(Signal::Waveform);
[detail] +    fastFourierTransform(DoubleSignal::Waveform);
[detail]    bool bySigIncludedInSubpool=false;
[detail]    SubSignalPoolProcess cp(*this);
[detail] -  bysig->constLockSamples();
[detail] +    bysig->values()->constLockSamples();
[detail]    for(iterator it=begin(); it!=end(); ++it) {
[detail] -    Signal * sig=* it;
[detail] +      SignalSegment * sig=* it;
[detail]      if(sig!=bysig) { 
[detail] -      if( !sig->warnReadOnlySamples()) {
[detail] -        sig->subtractSignal(bysig);
[detail] +        if( !sig->metaData()->warnReadOnlySamples()) {
[detail] +          sig->values()->subtractSignal(bysig->values());
[detail]        }
[detail]      } else {
[detail]        bySigIncludedInSubpool=true;
[detail]      }
[detail]      cp.next();
[detail]    }
[detail] -  bysig->unlockSamples();
[detail] +    bysig->values()->unlockSamples();
[detail]    if(bySigIncludedInSubpool) { 
[detail] -    if(!bysig->warnReadOnlySamples()) {
[detail] -      bysig->setValue(0.0);
[detail] +      if(!bysig->metaData()->warnReadOnlySamples()) {
[detail] +        bysig->values()->setValue(0.0);
[detail]      }
[detail]    }
[detail]  }
[detail] @@ -330,26 +355,51 @@
[detail]    if(count()!=bySubPool->count())
[detail]      return ;
[detail]    
[detail] -  fastFourierTransform(Signal::Waveform);
[detail] +    fastFourierTransform(DoubleSignal::Waveform);
[detail]    for(int i=0; i < count(); ++i) {
[detail] -    Signal * sig=at(i);
[detail] -    Signal * bysig=bySubPool->at(i);
[detail] -    if(!sig->warnReadOnlySamples()) {
[detail] -      sig->subtractSignal(bysig);
[detail] +      SignalSegment * sig=at(i);
[detail] +      SignalSegment * bysig=bySubPool->at(i);
[detail] +      if(!sig->metaData()->warnReadOnlySamples()) {
[detail] +        sig->values()->subtractSignal(bysig->values());
[detail]      }
[detail]    }
[detail]  }
[detail]  
[detail] +  void SubSignalPool::stack()
[detail] +  {
[detail] +    TRACE;
[detail] +    if(count()<2) {
[detail] +      return;
[detail] +    }
[detail] +    SignalDatabase * db=database();
[detail] +    GeopsyCoreEngine::instance()->setProgressMaximum(db, count()-1);
[detail] +    int n=at(0)->size();
[detail] +    for(int i=1; i<count(); ++i) {
[detail] +      if(n!=at(i)->size()) {
[detail] +        App::log(tr("All signals must have the same number of samples\n"));
[detail] +        return;
[detail] +      }
[detail] +    }
[detail] +    SignalSegment * stackedSig=new SignalSegment(*at(0));
[detail] +    stackedSig->values()->setValue(0.0);
[detail] +    for(int i=0; i<count(); ++i) {
[detail] +      SignalSegment * sig=at(i);
[detail] +      stackedSig->values()->add(sig->values());
[detail] +    }
[detail] +    clear();
[detail] +    append(stackedSig);
[detail] +  }
[detail] +
[detail]  void SubSignalPool::filter(const FilterParameters& param)
[detail]  {
[detail]    TRACE;
[detail]    SignalDatabase * db=database();
[detail]    GeopsyCoreEngine::instance()->setProgressMaximum(db, count()-1);
[detail]    for(int i=0; i<count(); ++i) {
[detail] -    Signal * sig=at(i);
[detail] +      SignalSegment * sig=at(i);
[detail]      GeopsyCoreEngine::instance()->setProgressValue(db, i);
[detail] -    if(!sig->warnReadOnlySamples()) {
[detail] -      sig->filter(param);
[detail] +      if(!sig->metaData()->warnReadOnlySamples()) {
[detail] +        sig->values()->filter(param);
[detail]      }
[detail]    }
[detail]  }
[detail] @@ -360,18 +410,18 @@
[detail]    SignalDatabase * db=database();
[detail]    GeopsyCoreEngine::instance()->setProgressMaximum(db, count()-1);
[detail]    for(int i=0; i<count(); ++i) {
[detail] -    Signal * sig=at(i);
[detail] +      SignalSegment * sig=at(i);
[detail]      GeopsyCoreEngine::instance()->setProgressValue(db, i);
[detail] -    if(!sig->warnReadOnlySamples()) {
[detail] -      ComplexSignal * sigComp=sig->morletWavelet(param);
[detail] +      if(!sig->metaData()->warnReadOnlySamples()) {
[detail] +        ComplexSignal * sigComp=sig->values()->morletWavelet(param);
[detail]        Curve<Point2D> cabs=sigComp->abs(1.0/sig->duration());
[detail] -      int n=sig->nSamples();
[detail] -      LOCK_SAMPLES(double, sigSamples, sig)
[detail] +        int n=sig->size();
[detail] +        LOCK_SAMPLES(double, sigSamples, sig->values())
[detail]          for(int i=0; i<n; i++) {
[detail]            sigSamples[i]=cabs.y(i);
[detail]          }
[detail] -      UNLOCK_SAMPLES(sig)
[detail] -      sig->setType(Signal::Waveform);
[detail] +        UNLOCK_SAMPLES(sig->values())
[detail] +        sig->setType(DoubleSignal::Waveform);
[detail]        delete sigComp;
[detail]      }
[detail]    }
[detail] @@ -383,9 +433,9 @@
[detail]    SignalDatabase * db=database();
[detail]    GeopsyCoreEngine::instance()->setProgressMaximum(db, count()-1);
[detail]    for(int i=0; i<count(); ++i) {
[detail] -    Signal * sig=at(i);
[detail] +      SignalSegment * sig=at(i);
[detail]      GeopsyCoreEngine::instance()->setProgressValue(db, i);
[detail] -    if(!sig->warnReadOnlySamples()) {
[detail] +      if(!sig->metaData()->warnReadOnlySamples()) {
[detail]        sig->shift(dt);
[detail]      }
[detail]    }
[detail] @@ -399,10 +449,10 @@
[detail]    SubSignalPool sampledSignals;
[detail]    sampledSignals.setName(_name);
[detail]    for(int i=0; i<count(); ++i) {
[detail] -    Signal * sig=at(i);
[detail] +      SignalSegment * sig=at(i);
[detail]      GeopsyCoreEngine::instance()->setProgressValue(db, i);
[detail] -    Signal * newsig=new Signal(*sig);
[detail] -    newsig->overSample(factor, sig);
[detail] +      SignalSegment * newsig=new SignalSegment(*sig);
[detail] +      newsig->values()->overSample(factor, sig->values());
[detail]      sampledSignals.addSignal(newsig);
[detail]    }
[detail]    *this=sampledSignals;
[detail] @@ -414,24 +464,24 @@
[detail]    SignalDatabase * db=database();
[detail]    GeopsyCoreEngine::instance()->setProgressMaximum(db, count()-1);
[detail]    for(int i=0; i<count(); ++i) {
[detail] -    Signal * sig=at(i);
[detail] +      SignalSegment * sig=at(i);
[detail]      GeopsyCoreEngine::instance()->setProgressValue(db, i);
[detail] -    if(!sig->warnReadOnlySamples()) {
[detail] -      sig->agc(width);
[detail] +      if(!sig->metaData()->warnReadOnlySamples()) {
[detail] +        sig->values()->agc(width);
[detail]      }
[detail]    }
[detail]  }
[detail]  
[detail] -void SubSignalPool::whiten()
[detail] +  void SubSignalPool::whiten(double fmin, double fmax, double apodization)
[detail]  {
[detail]    TRACE;
[detail]    SignalDatabase * db=database();
[detail]    GeopsyCoreEngine::instance()->setProgressMaximum(db, count()-1);
[detail]    for(int i=0; i<count(); ++i) {
[detail] -    Signal * sig=at(i);
[detail] +      SignalSegment * sig=at(i);
[detail]      GeopsyCoreEngine::instance()->setProgressValue(db, i);
[detail] -    if(!sig->warnReadOnlySamples()) {
[detail] -      sig->whiten();
[detail] +      if(!sig->metaData()->warnReadOnlySamples()) {
[detail] +        sig->values()->whiten(fmin, fmax, apodization);
[detail]      }
[detail]    }
[detail]  }
[detail] @@ -442,10 +492,10 @@
[detail]    SignalDatabase * db=database();
[detail]    GeopsyCoreEngine::instance()->setProgressMaximum(db, count()-1);
[detail]    for(int i=0; i<count(); ++i) {
[detail] -    Signal * sig=at(i);
[detail] +      SignalSegment * sig=at(i);
[detail]      GeopsyCoreEngine::instance()->setProgressValue(db, i);
[detail] -    if(!sig->warnReadOnlySamples()) {
[detail] -      sig->stddevClip(factor);
[detail] +      if(!sig->metaData()->warnReadOnlySamples()) {
[detail] +        sig->values()->stddevClip(factor);
[detail]      }
[detail]    }
[detail]  }
[detail] @@ -456,10 +506,10 @@
[detail]    SignalDatabase * db=database();
[detail]    GeopsyCoreEngine::instance()->setProgressMaximum(db, count()-1);
[detail]    for(int i=0; i<count(); ++i) {
[detail] -    Signal * sig=at(i);
[detail] +      SignalSegment * sig=at(i);
[detail]      GeopsyCoreEngine::instance()->setProgressValue(db, i);
[detail] -    if(!sig->warnReadOnlySamples()) {
[detail] -      sig->multiply(value);
[detail] +      if(!sig->metaData()->warnReadOnlySamples()) {
[detail] +        sig->values()->multiply(value);
[detail]      }
[detail]    }
[detail]  }
[detail] @@ -478,23 +528,25 @@
[detail]    SubSignalPool merged;
[detail]    merged.setName(_name);
[detail]    double samplingPeriod=0;
[detail] -  Signal::Components comp;
[detail] -  SAFE_UNINITIALIZED(comp, Signal::Vertical);
[detail] +    SignalMetaData::Components comp;
[detail] +    SAFE_UNINITIALIZED(comp, SignalMetaData::Vertical);
[detail]    QString stat;
[detail]    Point rec;
[detail]    for(iterator it=begin(); it!=end(); ) {
[detail] -    Signal * sig=* it;
[detail] +      SignalSegment * sig=* it;
[detail]      if(samplingPeriod==0) {
[detail] -      samplingPeriod=sig->samplingPeriod();
[detail] -      stat=sig->name();
[detail] -      rec=sig->receiver();
[detail] -      comp=sig->component();
[detail] +        samplingPeriod=sig->values()->samplingPeriod();
[detail] +        stat=sig->metaData()->name();
[detail] +        rec=sig->metaData()->receiver();
[detail] +        comp=sig->metaData()->component();
[detail]        toMerge.addSignal(sig);
[detail]        ++it;
[detail]        continue;
[detail]      }
[detail] -    if(sig->name()==stat && sig->receiver()==rec && sig->component()==comp) {
[detail] -      if(sig->samplingPeriod()!=samplingPeriod) {
[detail] +      if(sig->metaData()->name()==stat &&
[detail] +         sig->metaData()->receiver()==rec &&
[detail] +         sig->metaData()->component()==comp) {
[detail] +        if(sig->values()->samplingPeriod()!=samplingPeriod) {
[detail]          Message::warning(MSG_ID, tr( "Merging station components" ),
[detail]                               tr( "For station %1, the sampling rate is not the "
[detail]                                   "same for all parts, skiping %2 part." )
[detail] @@ -525,12 +577,12 @@
[detail]    TRACE;
[detail]    if(isEmpty()) return false;
[detail]    
[detail] -  fastFourierTransform(Signal::Waveform);
[detail] +    fastFourierTransform(DoubleSignal::Waveform);
[detail]    iterator it;
[detail] -  Signal * sig;
[detail] +    SignalSegment * sig;
[detail]    for(it=begin(); it!=end(); ++it) {
[detail]      sig=* it;
[detail] -    if(sig->type()!=Signal::Waveform) {
[detail] +      if(sig->type()!=DoubleSignal::Waveform) {
[detail]        Message::warning(MSG_ID, tr( "Merging signals ..." ),
[detail]                             tr( "Some signals are not waveforms" ),
[detail]                             Message::cancel(), true);
[detail] @@ -542,12 +594,13 @@
[detail]    
[detail]    it=begin();
[detail]    sig=* it;
[detail] -  double dT=sig->samplingPeriod();
[detail] +    double dT=sig->values()->samplingPeriod();
[detail]    double fSamp=1.0/dT;
[detail]    for( ; it!=end(); ++it) {
[detail]      double d_jump=(r.start().secondsTo(sig->startTime()))*fSamp;
[detail]      int i_jump=qRound(d_jump);
[detail] -    if(dT!=sig->samplingPeriod() && fabs(d_jump-static_cast<double>(i_jump))<0.001) {
[detail] +      if(dT!=sig->values()->samplingPeriod() &&
[detail] +          fabs(d_jump-static_cast<double>(i_jump))<0.001) {
[detail]        Message::warning(MSG_ID, tr( "Merging signals ..." ),
[detail]                             tr( "All signals must have the same sampling frequency "
[detail]                                 "and differences between t0 must be a multiple of dT." ),
[detail] @@ -556,17 +609,18 @@
[detail]      }
[detail]    }
[detail]    
[detail] -  DynamicSignal * mergedsig=new DynamicSignal(first()->database());
[detail] +    SignalSegment * mergedsig=new SignalSegment(first()->database());
[detail] +    mergedsig->setDynamic();
[detail]    mergedsig->setSamplingPeriod(first()->samplingPeriod());
[detail] -  mergedsig->setName(first()->name());
[detail] -  mergedsig->setComponent(first()->component());
[detail] +    mergedsig->metaData()->setName(first()->metaData()->name());
[detail] +    mergedsig->metaData()->setComponent(first()->metaData()->component());
[detail]    mergedsig->setStartTime(first()->startTime());
[detail]    
[detail]    for(it=begin(); it!=end(); ++it) {
[detail]      sig=*it;
[detail] -    CONST_LOCK_SAMPLES(double, samples, sig)
[detail] -      mergedsig->set(sig->startTime(), samples, sig->nSamples());
[detail] -    UNLOCK_SAMPLES(sig)
[detail] +      CONST_LOCK_SAMPLES(double, samples, sig->values())
[detail] +        mergedsig->dynamicValues()->set(sig->startTime(), samples, sig->size());
[detail] +      UNLOCK_SAMPLES(sig->values())
[detail]    }
[detail]    removeAll();
[detail]    addSignal(mergedsig);
[detail] @@ -582,13 +636,13 @@
[detail]    double fmin=std::numeric_limits<double>::infinity();
[detail]    double fmax=-std::numeric_limits<double>::infinity();
[detail]    for(const_iterator it=begin(); it!=end(); ++it) {
[detail] -    Signal * sig=* it;
[detail] -    if(sig->isSpectrum()) {
[detail] +      SignalSegment * sig=* it;
[detail] +      if(sig->values()->isSpectrum()) {
[detail]        double minsig, maxsig;
[detail] -      if(sig->isComplex()) {
[detail] +        if(sig->values()->isComplex()) {
[detail]          maxsig=0.5/sig->samplingPeriod();
[detail]        } else {
[detail] -        maxsig=sig->samplingPeriod()*sig->nSamples();
[detail] +          maxsig=sig->samplingPeriod()*sig->size();
[detail]        }
[detail]        minsig=0.1;
[detail]        if(minsig<fmin) {
[detail] @@ -599,7 +653,7 @@
[detail]        }
[detail]      } else {
[detail]        const DateTime& minsig=sig->startTime();
[detail] -      DateTime maxsig=minsig.shifted(sig->samplingPeriod()*sig->nSamples());
[detail] +        DateTime maxsig=minsig.shifted(sig->samplingPeriod()*sig->size());
[detail]        if(minsig<tmin) {
[detail]          tmin=minsig;
[detail]        }
[detail] @@ -620,13 +674,13 @@
[detail]    TRACE;
[detail]    double fmax=0.0;
[detail]    for(const_iterator it=begin(); it!=end(); ++it) {
[detail] -    Signal * sig=* it;
[detail] -    if(sig->isSpectrum()) {
[detail] +      SignalSegment * sig=* it;
[detail] +      if(sig->values()->isSpectrum()) {
[detail]        double maxsig;
[detail] -      if(sig->isComplex()) {
[detail] +        if(sig->values()->isComplex()) {
[detail]          maxsig=0.5/sig->samplingPeriod();
[detail]        } else {
[detail] -        maxsig=sig->samplingPeriod()*sig->nSamples();
[detail] +          maxsig=sig->samplingPeriod()*sig->size();
[detail]        }
[detail]        if(maxsig>fmax) {
[detail]          fmax=maxsig;
[detail] @@ -642,7 +696,7 @@
[detail]    TRACE;
[detail]    int n=0;
[detail]    for(const_iterator it=begin(); it!=end(); ++it) {
[detail] -    if((*it)->isSpectrum()) {
[detail] +      if((*it)->values()->isSpectrum()) {
[detail]        n++;
[detail]      }
[detail]    }
[detail] @@ -654,8 +708,8 @@
[detail]  {
[detail]    TRACE;
[detail]    for(iterator it=begin(); it!=end(); ++it) {
[detail] -    Signal * sig=* it;
[detail] -    if(!sig->warnReadOnlySamples()) {
[detail] +      SignalSegment * sig=* it;
[detail] +      if(!sig->metaData()->warnReadOnlySamples()) {
[detail]        TimeRange tw=range.absoluteRange(sig);
[detail]        sig->taper(tw, param);
[detail]      }
[detail] @@ -669,10 +723,10 @@
[detail]    SubSignalPool cuttedSignals;
[detail]    cuttedSignals.setName(_name);
[detail]    
[detail] -  fastFourierTransform(Signal::Waveform);
[detail] +    fastFourierTransform(DoubleSignal::Waveform);
[detail]    for(iterator it=begin(); it!=end(); ++it) {
[detail] -    Signal * sig=*it;
[detail] -    Signal * newSig=sig->cut(param.absoluteRange(sig));
[detail] +      SignalSegment * sig=*it;
[detail] +      SignalSegment * newSig=sig->cut(param.absoluteRange(sig));
[detail]      if(newSig) {
[detail]        cuttedSignals.addSignal(newSig);
[detail]      }
[detail] @@ -687,14 +741,14 @@
[detail]    SubSignalPool staltaSignals;
[detail]    staltaSignals.setName(_name);
[detail]    
[detail] -  fastFourierTransform(Signal::Waveform);
[detail] +    fastFourierTransform(DoubleSignal::Waveform);
[detail]    for(iterator it=begin(); it!=end(); ++it) {
[detail] -    Signal * sig=* it;
[detail] -    DoubleSignal * cpsig=new DoubleSignal( *sig);
[detail] -    cpsig->copySamplesFrom(sig);
[detail] +      SignalSegment * sig=* it;
[detail] +      DoubleSignal * cpsig=new DoubleSignal(*sig->values());
[detail] +      cpsig->copySamplesFrom(sig->values());
[detail]      cpsig->abs();
[detail] -    Signal * ratiosig=new Signal( *sig);
[detail] -    cpsig->stalta(tsta, tlta, ratiosig);
[detail] +      SignalSegment * ratiosig=new SignalSegment(*sig);
[detail] +      cpsig->stalta(tsta, tlta, ratiosig->values());
[detail]      delete cpsig;
[detail]      staltaSignals.addSignal(ratiosig);
[detail]    }
[detail] @@ -708,17 +762,17 @@
[detail]    if(maxRef < 0.0) {
[detail]      double invMaxCount=1.0/(double) maxCount;
[detail]      for(iterator it=begin(); it!=end(); ++it) {
[detail] -      Signal& sig=** it;
[detail] -      if(!sig.warnReadOnlySamples()) {
[detail] -        sig.decimateAmplitude(sig.maximumAmplitude() * invMaxCount);
[detail] +        SignalSegment * sig=*it;
[detail] +        if(!sig->metaData()->warnReadOnlySamples()) {
[detail] +          sig->values()->decimateAmplitude(sig->values()->maximumAmplitude()*invMaxCount);
[detail]        }
[detail]      }
[detail]    } else {
[detail]      double delta=maxRef/maxCount;
[detail]      for(iterator it=begin(); it!=end(); ++it) {
[detail] -      Signal * sig=*it;
[detail] -      if(!sig->warnReadOnlySamples()) {
[detail] -        sig->decimateAmplitude(delta);
[detail] +        SignalSegment * sig=*it;
[detail] +        if(!sig->metaData()->warnReadOnlySamples()) {
[detail] +          sig->values()->decimateAmplitude(delta);
[detail]        }
[detail]      }
[detail]    }
[detail] @@ -730,14 +784,14 @@
[detail]    SubSignalPool fftSignals;
[detail]    fftSignals.setName(_name);
[detail]    
[detail] -  fastFourierTransform(Signal::Waveform);
[detail] +    fastFourierTransform(DoubleSignal::Waveform);
[detail]  
[detail]    SignalDatabase * db=database();
[detail]    GeopsyCoreEngine::instance()->setProgressMaximum(db, count()-1);
[detail]    for(int i=0; i<count(); ++i) {
[detail] -    Signal * sig=at(i);
[detail] +      SignalSegment * sig=at(i);
[detail]      GeopsyCoreEngine::instance()->setProgressValue(db, i);
[detail] -    sig->discreteFourierTransform();
[detail] +      sig->values()->discreteFourierTransform();
[detail]    }
[detail]  }
[detail]  
[detail] @@ -748,15 +802,15 @@
[detail]    SubSignalPool decimatedSignals;
[detail]    decimatedSignals.setName(_name);
[detail]    
[detail] -  fastFourierTransform(Signal::Waveform);
[detail] +    fastFourierTransform(DoubleSignal::Waveform);
[detail]  
[detail]    SignalDatabase * db=database();
[detail]    GeopsyCoreEngine::instance()->setProgressMaximum(db, count()-1);
[detail]    for(int i=0; i<count(); ++i) {
[detail] -    Signal * sig=at(i);
[detail] +      SignalSegment * sig=at(i);
[detail]      GeopsyCoreEngine::instance()->setProgressValue(db, i);
[detail] -    Signal * newsig=new Signal(*sig);
[detail] -    newsig->decimateTime(factor, sig);
[detail] +      SignalSegment * newsig=new SignalSegment(*sig);
[detail] +      newsig->values()->decimateTime(factor, sig->values());
[detail]      decimatedSignals.addSignal(newsig);
[detail]    }
[detail]    *this=decimatedSignals;
[detail] @@ -767,7 +821,7 @@
[detail]  {
[detail]    TRACE;
[detail]    
[detail] -  fastFourierTransform(Signal::Waveform);
[detail] +    fastFourierTransform(DoubleSignal::Waveform);
[detail]  
[detail]    SignalDatabase * db=database();
[detail]    Random * myGenerator;
[detail] @@ -779,7 +833,7 @@
[detail]    }
[detail]    GeopsyCoreEngine::instance()->setProgressMaximum(db, count()-1);
[detail]    for(int i=0; i<count(); ++i) {
[detail] -    at(i)->random(maxAmplitude, generator);
[detail] +      at(i)->values()->random(maxAmplitude, generator);
[detail]      GeopsyCoreEngine::instance()->setProgressValue(db, i);
[detail]    }
[detail]    delete myGenerator;
[detail] @@ -791,11 +845,11 @@
[detail]    SignalDatabase * db=database();
[detail]    GeopsyCoreEngine::instance()->setProgressMaximum(db, count()-1);
[detail]    for(int i=0; i<count(); ++i) {
[detail] -    Signal * sig=at(i);
[detail] +      SignalSegment * sig=at(i);
[detail]      GeopsyCoreEngine::instance()->setProgressValue(db, i);
[detail] -    sig->fastFourierTransform(st);
[detail] -    sig->resetAmplitudes();
[detail] -    sig->setHeaderModified(true);
[detail] +      sig->values()->fastFourierTransform(st);
[detail] +      sig->values()->resetAmplitudes();
[detail] +      sig->metaData()->setModified(true);
[detail]    }
[detail]  }
[detail]  
[detail] @@ -854,7 +908,7 @@
[detail]    }
[detail]    
[detail]    for(iterator it=begin(); it!=end() && !s.atEnd(); ++it) {
[detail] -    Signal * sig=* it;
[detail] +      SignalSegment * sig=* it;
[detail]      str=s.readLine().trimmed();
[detail]      while(str[ 0 ]=='#' ) {
[detail]        str=s.readLine().trimmed(); 
[detail] @@ -868,7 +922,7 @@
[detail]        }
[detail]        strItem=strLine.nextField(ptr, "\t" );
[detail]      }
[detail] -    sig->setHeaderModified(true);
[detail] +      sig->metaData()->setModified(true);
[detail]    }
[detail]  }
[detail]  
[detail] @@ -889,13 +943,13 @@
[detail]            "# Lines starting with '#' are always ignored when importing.\n"
[detail]            "# The first line starting without '#' must contains the name of each variable.\n"
[detail]            "#\n");
[detail] -  MetaDataFieldList::const_iterator itvar;
[detail] +    MetaDataFieldList::iterator itvar;
[detail]    for(itvar=param.begin();itvar!=param.end();++itvar) {
[detail]      s << MetaDataFactory::instance()->name(*itvar) << "\t";
[detail]    }
[detail]    s << Qt::endl;
[detail]    for(iterator it=begin(); it!=end(); ++it) {
[detail] -    Signal * sig=*it;
[detail] +      SignalSegment * sig=*it;
[detail]      for (itvar=param.begin(); itvar!=param.end(); ++itvar) {
[detail]        switch (itvar->id()) {
[detail]        case MetaDataFactory::Duration:
[detail] @@ -915,9 +969,9 @@
[detail]  {
[detail]    TRACE;
[detail]    for(iterator it=begin(); it!=end(); ++it) {
[detail] -    Signal * sig=* it;
[detail] -    if( !sig->warnReadOnlySamples()) {
[detail] -      sig->unglitch(threshold);
[detail] +      SignalSegment * sig=* it;
[detail] +      if( !sig->metaData()->warnReadOnlySamples()) {
[detail] +        sig->values()->unglitch(threshold);
[detail]      }
[detail]    }
[detail]  }
[detail] @@ -936,8 +990,8 @@
[detail]    TRACE;
[detail]    Curve<Point> l;
[detail]    for(const_iterator it=begin(); it!=end(); ++it) {
[detail] -    Signal * sig=*it;
[detail] -    l.append(sig->receiver());
[detail] +      SignalSegment * sig=*it;
[detail] +      l.append(sig->metaData()->receiver());
[detail]    }
[detail]    return l;
[detail]  }
[detail] @@ -950,16 +1004,16 @@
[detail]    QMap<QString, NamedPoint> m;
[detail]    bool ambiguities=false;
[detail]    for(const_iterator it=begin(); it!=end(); ++it) {
[detail] -    Signal * sig=*it;
[detail] -    QMap<QString, NamedPoint>::const_iterator itm=m.find(sig->name());
[detail] +      SignalSegment * sig=*it;
[detail] +      QMap<QString, NamedPoint>::const_iterator itm=m.find(sig->metaData()->name());
[detail]      if(itm!=m.end()) {
[detail] -      if(sig->receiver()!=itm.value()) {
[detail] +        if(sig->metaData()->receiver()!=itm.value()) {
[detail]          ambiguities=true;
[detail]        }
[detail]      }
[detail] -    NamedPoint p(sig->receiver());
[detail] -    p.setName(sig->name());
[detail] -    m.insert(sig->name(), p);
[detail] +      NamedPoint p(sig->metaData()->receiver());
[detail] +      p.setName(sig->metaData()->name());
[detail] +      m.insert(sig->metaData()->name(), p);
[detail]    }
[detail]    if(ambiguities) {
[detail]      App::log(tr("Ambiguities found in station list: several coordinates for a single name.\n"));
[detail] @@ -973,7 +1027,7 @@
[detail]    TRACE;
[detail]    Curve<Point> l;
[detail]    for(const_iterator it=begin(); it!=end(); ++it) {
[detail] -    Signal * sig=*it;
[detail] +      SignalSegment * sig=*it;
[detail]      l.append(sig->source());
[detail]    }
[detail]    return l;
[detail] @@ -983,7 +1037,7 @@
[detail]  {
[detail]    TRACE;
[detail]    for(const_iterator it=begin(); it!=end(); ++it) {
[detail] -    (*it)->setHeaderModified(b);
[detail] +      (*it)->metaData()->setModified(b);
[detail]    }
[detail]  }
[detail]  
[detail] @@ -991,7 +1045,7 @@
[detail]  {
[detail]    TRACE;
[detail]    for(const_iterator it=begin(); it!=end(); ++it) {
[detail] -    if((*it)->isHeaderModified())
[detail] +      if((*it)->metaData()->isModified())
[detail]        return true;
[detail]    }
[detail]    return false;
[detail] @@ -1001,7 +1055,7 @@
[detail]  {
[detail]    TRACE;
[detail]    for(const_iterator it=begin(); it!=end(); ++it) {
[detail] -    if(( *it) ->isReadOnlySamples())
[detail] +      if((*it)->metaData()->isReadOnlySamples())
[detail]        return true;
[detail]    }
[detail]    return false;
[detail] @@ -1020,18 +1074,18 @@
[detail]    int n=s3c.count();
[detail]    SubSignalPool sh;
[detail]    for(int i=0; i<n; i++) {
[detail] -    Signal * sig=at(i);
[detail] -    switch(sig->component()) {
[detail] -    case Signal::North:
[detail] -    case Signal::East:
[detail] +      SignalSegment * sig=at(i);
[detail] +      switch(sig->metaData()->component()) {
[detail] +      case SignalMetaData::North:
[detail] +      case SignalMetaData::East:
[detail]        sh.addSignal(sig);
[detail]        break;
[detail] -    case Signal::Vertical:
[detail] -    case Signal::UndefinedComponent:
[detail] -    case Signal::All:
[detail] -    case Signal::Horizontal:
[detail] -    case Signal::Time:
[detail] -    case Signal::Ignore:
[detail] +      case SignalMetaData::Vertical:
[detail] +      case SignalMetaData::UndefinedComponent:
[detail] +      case SignalMetaData::All:
[detail] +      case SignalMetaData::Horizontal:
[detail] +      case SignalMetaData::Time:
[detail] +      case SignalMetaData::Ignore:
[detail]        break;
[detail]      }
[detail]    }
[detail] @@ -1051,18 +1105,18 @@
[detail]    int n=s3c.count();
[detail]    SubSignalPool sz;
[detail]    for(int i=0; i<n; i++) {
[detail] -    Signal * sig=at(i);
[detail] -    switch(sig->component()) {
[detail] -    case Signal::Vertical:
[detail] +      SignalSegment * sig=at(i);
[detail] +      switch(sig->metaData()->component()) {
[detail] +      case SignalMetaData::Vertical:
[detail]        sz.addSignal(sig);
[detail]        break;
[detail] -    case Signal::North:
[detail] -    case Signal::East:
[detail] -    case Signal::UndefinedComponent:
[detail] -    case Signal::All:
[detail] -    case Signal::Horizontal:
[detail] -    case Signal::Time:
[detail] -    case Signal::Ignore:
[detail] +      case SignalMetaData::North:
[detail] +      case SignalMetaData::East:
[detail] +      case SignalMetaData::UndefinedComponent:
[detail] +      case SignalMetaData::All:
[detail] +      case SignalMetaData::Horizontal:
[detail] +      case SignalMetaData::Time:
[detail] +      case SignalMetaData::Ignore:
[detail]        break;
[detail]      }
[detail]    }
[detail] @@ -1088,19 +1142,19 @@
[detail]    Point rec;
[detail]    int n=count();
[detail]    for(int i=0; i<n; ) {
[detail] -    Signal * sig=at(i);
[detail] +      SignalSegment * sig=at(i);
[detail]      if(samplingPeriod==0.0) {
[detail]        samplingPeriod=sig->samplingPeriod();
[detail]        range=sig->timeRange().range();
[detail] -      stat=sig->name();
[detail] -      rec=sig->receiver();
[detail] +        stat=sig->metaData()->name();
[detail] +        rec=sig->metaData()->receiver();
[detail]        triplet.addSignal(sig);
[detail]        i++;
[detail]        continue;
[detail]      }
[detail] -    if(sig->name()==stat &&
[detail] -       sig->receiver().isSimilar(rec, 0.001) &&
[detail] -       sig->timeRange().range().intersection(range).lengthSeconds()>0.9*range.lengthSeconds()) {
[detail] +      if(sig->metaData()->name()==stat &&
[detail] +          sig->metaData()->receiver().isSimilar(rec, 0.001) &&
[detail] +          sig->timeRange().intersection(range).lengthSeconds()>0.9*range.lengthSeconds()) {
[detail]        if(sig->samplingPeriod()!=samplingPeriod) {
[detail]          App::log(tr("Associating 3 components for station %1: "
[detail]                      "the sampling rate is not the same for all components.")
[detail] @@ -1127,16 +1181,16 @@
[detail]  {
[detail]    TRACE;
[detail]    if(triplet.count()!=3) {
[detail] -    QString stat=triplet.at(0)->name();
[detail] +      QString stat=triplet.at(0)->metaData()->name();
[detail]      App::log(tr("Associating 3 components for station %1: "
[detail]                  "at least one component is  missing.")
[detail]               .arg(stat));
[detail]      return false;
[detail]    }
[detail] -  if(triplet.at(0)->component()!=Signal::Vertical ||
[detail] -     triplet.at(1)->component()!=Signal::North ||
[detail] -     triplet.at(2)->component()!=Signal::East) {
[detail] -    QString stat=triplet.at(0) ->name();
[detail] +    if(triplet.at(0)->metaData()->component()!=SignalMetaData::Vertical ||
[detail] +        triplet.at(1)->metaData()->component()!=SignalMetaData::North ||
[detail] +        triplet.at(2)->metaData()->component()!=SignalMetaData::East) {
[detail] +      QString stat=triplet.at(0)->metaData()->name();
[detail]      App::log(tr("Associating 3 components for station %1: "
[detail]                  "cannot find the 3 components Z, N and E.")
[detail]               .arg(stat));
[detail] @@ -1154,10 +1208,10 @@
[detail]    SubSignalPool * sourceSubPool=nullptr;
[detail]    QList<const SeismicEvent *> sources;
[detail]    for(int i=count()-1; i>=0; i--) {
[detail] -    Signal * sig=at(i);
[detail] +      SignalSegment * sig=at(i);
[detail]      sources=database()->seismicEvents()->events(sig);
[detail]      if(sources.isEmpty()) {
[detail] -      App::log(tr("No source found for signal %1\n").arg(sig->nameComponent()));
[detail] +        App::log(tr("No source found for signal %1\n").arg(sig->metaData()->nameComponent()));
[detail]      }
[detail]      for(int i=sources.count()-1; i>=0; i--) {
[detail]        const SeismicEvent * source=sources.at(i);
[detail] @@ -1175,15 +1229,15 @@
[detail]    }
[detail]    
[detail]    for(it=sourceSignals.begin(); it!=sourceSignals.end(); it++) {
[detail] -    QMap<double, Signal *> distances;
[detail] +      QMap<double, SignalSegment *> distances;
[detail]      const Point& src=it.key()->position();
[detail]      SubSignalPool * subPool=it.value();
[detail]      for(int i=subPool->count()-1; i>=0; i--) {
[detail] -      distances.insert(src.distanceTo(subPool->at(i)->receiver()),
[detail] +        distances.insert(src.distanceTo(subPool->at(i)->metaData()->receiver()),
[detail]                         subPool->at(i));
[detail]      }
[detail]      subPool->removeAll();
[detail] -    QMap<double, Signal *>::iterator it;
[detail] +      QMap<double, SignalSegment *>::iterator it;
[detail]      for(it=distances.begin(); it!=distances.end(); it++) {
[detail]        subPool->addSignal(it.value());
[detail]      }
[detail] @@ -1197,32 +1251,33 @@
[detail]    if(!associate3Components()) return;
[detail]    int nSamples;
[detail]    Point p;
[detail] -  Signal * sigV, * sigN, * sigE;
[detail] +    SignalSegment * sigV, * sigN, * sigE;
[detail]    SubSignalPoolProcess cp(*this);
[detail]    for(iterator it=begin(); it!=end(); ++it) {
[detail]      sigV=*it;
[detail] -    nSamples=sigV->nSamples();
[detail] -    LOCK_SAMPLES(double, sampV, sigV)
[detail] +      nSamples=sigV->size();
[detail] +      LOCK_SAMPLES(double, sampV, sigV->values())
[detail]        ++it;
[detail]        if(it!=end()) {
[detail]          sigN=*it;
[detail] -       LOCK_SAMPLES(double, sampN, sigN)
[detail] +        LOCK_SAMPLES(double, sampN, sigN->values())
[detail]            ++it;
[detail]            if(it!=end()) {
[detail]              sigE=*it;
[detail] -            if(sigV->nSamples()!=sigN->nSamples() ||
[detail] -               sigV->nSamples()!=sigE->nSamples() ||
[detail] +          if(sigV->size()!=sigN->size() ||
[detail] +              sigV->size()!=sigE->size() ||
[detail]                 sigV->startTime()!=sigN->startTime() ||
[detail]                 sigV->startTime()!=sigE->startTime()) {
[detail]                Message::warning(MSG_ID, tr("Associating 3 components"),
[detail]                                 tr("For station %1, the components are not available on exactly "
[detail] -                                  "the same time range, skipping this stations.").arg(sigV->name()),
[detail] +                                "the same time range, skipping this stations.")
[detail] +                                 .arg(sigV->metaData()->name()),
[detail]                                 Message::cancel(), true);
[detail]              } else {
[detail] -              LOCK_SAMPLES(double, sampE, sigE)
[detail] -                if(!sigV->warnReadOnlySamples() &&
[detail] -                   !sigN->warnReadOnlySamples() &&
[detail] -                   !sigE->warnReadOnlySamples()) {
[detail] +            LOCK_SAMPLES(double, sampE, sigE->values())
[detail] +            if(!sigV->metaData()->warnReadOnlySamples() &&
[detail] +                !sigN->metaData()->warnReadOnlySamples() &&
[detail] +                !sigE->metaData()->warnReadOnlySamples()) {
[detail]                    for(int i=0; i<nSamples; i++) {
[detail]                      p.set(sampE[i], sampN[i], sampV[i]);
[detail]                      p=rotMatrix*p;
[detail] @@ -1231,12 +1286,12 @@
[detail]                      sampV[i]=p.z();
[detail]                    }
[detail]                  }
[detail] -              UNLOCK_SAMPLES(sigE)
[detail] +            UNLOCK_SAMPLES(sigE->values())
[detail]              }
[detail]            }
[detail] -        UNLOCK_SAMPLES(sigN)
[detail] +        UNLOCK_SAMPLES(sigN->values())
[detail]        }
[detail] -    UNLOCK_SAMPLES(sigV)
[detail] +      UNLOCK_SAMPLES(sigV->values())
[detail]      cp.next(3);
[detail]    }
[detail]  }
[detail] @@ -1245,8 +1300,10 @@
[detail]  {
[detail]    TRACE;
[detail]    for(iterator it=begin(); it!=end(); ++it) {
[detail] -    Signal * sig=*it;
[detail] -    qDebug("Signal %i named %s ptr %llx -> refCount=%i", sig->id(), sig->name().toLatin1().data(),
[detail] +      SignalSegment * sig=*it;
[detail] +      qDebug("Signal segment %s named %s ptr %llx -> refCount=%i",
[detail] +             sig->id().toString().toLatin1().data(),
[detail] +             sig->metaData()->name().toLatin1().data(),
[detail]             reinterpret_cast<qint64>(sig), sig->referenceCount());
[detail]    }
[detail]  }
[detail] @@ -1256,14 +1313,14 @@
[detail]    TRACE;
[detail]    int n=0;
[detail]    for(const_iterator it=begin(); it!=end(); ++it) {
[detail] -    int t=(*it)->metaData<TimePick>().count();
[detail] +      int t=(*it)->metaData()->optionalData().get<TimePick>().count();
[detail]      if(t>n) n=t;
[detail]    }
[detail]    return n;
[detail]  }
[detail]  
[detail]  
[detail] -void SubSignalPool::correlations(double maxDelay, const Signal * referenceSig)
[detail] +  void SubSignalPool::correlations(double maxDelay, const SignalSegment * referenceSig)
[detail]  {
[detail]    TRACE;
[detail]    SubSignalPool corrSubPool;
[detail] @@ -1271,21 +1328,32 @@
[detail]    int n=count();
[detail]    if(referenceSig) {
[detail]      for(int i=0; i<n; i++) {
[detail] -      Signal * sig=at(i);
[detail] +        SignalSegment * sig=at(i);
[detail]        if(sig!=referenceSig) {
[detail] -        Signal * corrSig=new Signal(sig->database());
[detail] +          
[detail] +          double md=DoubleSignal::correlationOptimumMaximumDelay(maxDelay,
[detail] +                                                                   referenceSig->size(),
[detail] +                                                                   sig->size(),
[detail] +                                                                   sig->metaData()->samplingFrequency());
[detail] +          SignalSegment * corrSig=new SignalSegment(sig->database());
[detail]          corrSig->setTemporary();
[detail] -        corrSig->correlation(referenceSig, sig, maxDelay);
[detail] +          corrSig->correlation(referenceSig, sig, md);
[detail] +          
[detail]          corrSubPool.addSignal(corrSig);
[detail]        }
[detail]      }
[detail]    } else {
[detail]      for(int i=0; i<n-1; i++) {
[detail] -      Signal * sig=at(i);
[detail] +        SignalSegment * sig=at(i);
[detail]        for(int j=i+1; j< n; j++) {
[detail] -        Signal * corrSig=new Signal(sig->database());
[detail] +          
[detail] +          double md=DoubleSignal::correlationOptimumMaximumDelay(maxDelay,
[detail] +                                                                   sig->size(),
[detail] +                                                                   at(j)->size(),
[detail] +                                                                   sig->metaData()->samplingFrequency());
[detail] +          SignalSegment * corrSig=new SignalSegment(sig->database());
[detail]          corrSig->setTemporary();
[detail] -        corrSig->correlation(sig, at(j), maxDelay);
[detail] +          corrSig->correlation(sig, at(j), md);
[detail]          corrSubPool.addSignal(corrSig);
[detail]        }
[detail]      }
[detail] @@ -1294,7 +1362,7 @@
[detail]  }
[detail]  
[detail]  
[detail] -void SubSignalPool::normalizedCorrelations(double maxDelay, const Signal * referenceSig)
[detail] +  void SubSignalPool::normalizedCorrelations(double maxDelay, const SignalSegment * referenceSig)
[detail]  {
[detail]    TRACE;
[detail]    SubSignalPool corrSubPool;
[detail] @@ -1302,9 +1370,9 @@
[detail]    int n=count();
[detail]    if(referenceSig) {
[detail]      for(int i=0; i<n; i++) {
[detail] -      Signal * sig=at(i);
[detail] +        SignalSegment * sig=at(i);
[detail]        if(sig!=referenceSig) {
[detail] -        Signal * corrSig=new Signal(sig->database());
[detail] +          SignalSegment * corrSig=new SignalSegment(sig->database());
[detail]          corrSig->setTemporary();
[detail]          corrSig->normalizedCorrelation(referenceSig, sig, maxDelay);
[detail]          corrSubPool.addSignal(corrSig);
[detail] @@ -1312,9 +1380,9 @@
[detail]      }
[detail]    } else {
[detail]      for(int i=0; i<n-1; i++) {
[detail] -      Signal * sig=at(i);
[detail] +        SignalSegment * sig=at(i);
[detail]        for(int j=i+1; j< n; j++) {
[detail] -        Signal * corrSig=new Signal(sig->database());
[detail] +          SignalSegment * corrSig=new SignalSegment(sig->database());
[detail]          corrSig->setTemporary();
[detail]          corrSig->normalizedCorrelation(sig, at(j), maxDelay);
[detail]          corrSubPool.addSignal(corrSig);
[detail] @@ -1325,18 +1393,18 @@
[detail]  }
[detail]  
[detail]  
[detail] -void SubSignalPool::convolution(const Signal * referenceSig)
[detail] +  void SubSignalPool::convolution(const SignalSegment * referenceSig)
[detail]  {
[detail]    TRACE;
[detail]    SubSignalPool convSubPool;
[detail]    convSubPool.setName(_name);
[detail]    int n=count();
[detail]    for(int i=0; i< n; i++) {
[detail] -    Signal * sig=at(i);
[detail] +      SignalSegment * sig=at(i);
[detail]      if(sig!=referenceSig) {
[detail] -      Signal * convSig=new Signal(sig->database());
[detail] +        SignalSegment * convSig=new SignalSegment(sig->database());
[detail]        convSig->setTemporary();
[detail] -      convSig->convolution(referenceSig, sig);
[detail] +        convSig->values()->convolution(referenceSig->values(), sig->values());
[detail]        convSubPool.addSignal(convSig);
[detail]      }
[detail]    }
[detail] @@ -1347,11 +1415,11 @@
[detail]  {
[detail]    int n=count();
[detail]    for(int i=0; i<n; i++) {
[detail] -    Signal * sig=at(i);
[detail] -    if(!sig->removeInstrumentalResponse(sensor)) {
[detail] +      SignalSegment * sig=at(i);
[detail] +      if(!sig->values()->removeInstrumentalResponse(sensor)) {
[detail]        return false;
[detail]      }
[detail] -    sig->setVoltPerUnit(sensor.transductionFactor());
[detail] +      sig->metaData()->setVoltPerUnit(sensor.transductionFactor());
[detail]    }
[detail]    return true;
[detail]  }
[detail] @@ -1375,13 +1443,13 @@
[detail]            QFileInfo fi(filePath);
[detail]            QString suffix;
[detail]            if(fi.isDir()) {
[detail] -            newFilePath+="/"+subPool.first()->name();
[detail] +              newFilePath+="/"+subPool.first()->metaData()->name();
[detail]            } else {
[detail] -            newFilePath=fi.baseName()+subPool.first()->name();
[detail] +              newFilePath=fi.baseName()+subPool.first()->metaData()->name();
[detail]              suffix=fi.suffix();
[detail]            }
[detail]            if(maximumSignalsPerFile==1) {
[detail] -            newFilePath+="_"+Signal::componentLetter(subPool.first()->component());
[detail] +              newFilePath+="_"+SignalMetaData::componentLetter(subPool.first()->metaData()->component());
[detail]            }
[detail]            if(suffix.isEmpty()) {
[detail]              suffix=format.suffix();
[detail] @@ -1483,7 +1551,10 @@
[detail]      break;
[detail]    case SignalFileFormat::Custom:
[detail]      if(format.customFormat()) {
[detail] -      return format.customFormat()->save(*this, filePath);
[detail] +        
[detail] +        
[detail] +        ASSERT(false);
[detail] +        return false;
[detail]      }
[detail]      break;
[detail]    case SignalFileFormat::AsciiOneColumn:
[detail] @@ -1513,16 +1584,18 @@
[detail]        return false;
[detail]      }
[detail]      const_iterator it=begin();
[detail] -    SignalFile * file=(*it)->file();
[detail] +      SignalSegment * sig=*it;
[detail] +      AbstractSignalFile * file=sig->file();
[detail]      if(!file) {
[detail]        Message::warning(MSG_ID, tr("Export %1").arg(format.caption()),
[detail]                         tr("Cannot deduce file name from temporary signals, cannot use option 'original base name'." ), Message::cancel());
[detail]        return false;
[detail]      }
[detail] -    QString fileName=file->shortName();
[detail] +      QString fileName=sig->fileShortName();
[detail]      for(it++; it!=end(); it++) {
[detail] -      file=(*it)->file();
[detail] -      if(fileName!=file->shortName()) {
[detail] +        sig=*it;
[detail] +        file=sig->file();
[detail] +        if(fileName!=sig->fileShortName()) {
[detail]          Message::warning(MSG_ID, tr("Export %1").arg(format.caption()),
[detail]                               tr("No common file name, cannot use option 'original base name'.\n\n"
[detail]                                  "A solution is probably to split the list of signals to export by setting "
[detail] @@ -1568,22 +1641,22 @@
[detail]    h.field.offset=GEOPSYSIGNAL_HEADERSIZE+h.field.nSignals*4+GEOPSYSIGNAL_TRACEHEADERSIZE;
[detail]    if(f.write(h.raw, GEOPSYSIGNAL_HEADERSIZE)!=GEOPSYSIGNAL_HEADERSIZE) return false;
[detail]    for(const_iterator it=begin(); it!=end(); ++it) {
[detail] -    qint32 nSamples=(*it)->nSamples();
[detail] +      qint32 nSamples=(*it)->size();
[detail]      if(f.write(reinterpret_cast<const char *>(&nSamples), 4)!=4) return false;
[detail]    }
[detail]    GeopsySignalTraceHeader th;
[detail]    th.field.magicFloat=GEOPSYSIGNAL_MAGICFLOAT;
[detail]    th.field.version=GEOPSYSIGNAL_VERSION;
[detail]    for(const_iterator it=begin(); it!=end(); ++it) {
[detail] -    th.field.unitPerCount=(*it)->unitPerCount();
[detail] +      th.field.unitPerCount=(*it)->metaData()->unitPerCount();
[detail]      if(f.write(th.raw, GEOPSYSIGNAL_TRACEHEADERSIZE)!=GEOPSYSIGNAL_TRACEHEADERSIZE) return false;
[detail]      qint64 nWritten=0;
[detail] -    const DoubleSignal * sig=const_cast<const Signal *>(*it)->saveType(Signal::Waveform);
[detail] +      const DoubleSignal * sig=const_cast<const StoredSignal *>((*it)->values())->saveType(DoubleSignal::Waveform);
[detail]      qint64 nToWrite=sizeof(double)*sig->nSamples();
[detail]      CONST_LOCK_SAMPLES(double, sigSamples, sig)
[detail]        nWritten=f.write(reinterpret_cast<const char *>(sigSamples), nToWrite);
[detail]      UNLOCK_SAMPLES(sig)
[detail] -    (*it)->restoreType(sig);
[detail] +      (*it)->values()->restoreType(sig);
[detail]      if(!sigSamples || nWritten!=nToWrite) {
[detail]        return false;
[detail]      }
[detail] @@ -1615,7 +1688,7 @@
[detail]      return saveSeg2Return(false, offset);
[detail]    }
[detail]    for(int i=0; i<count(); ++i) {
[detail] -    Signal * sig=at(i);
[detail] +      SignalSegment * sig=at(i);
[detail]      offset[i]=f.pos();
[detail]      if(!sig->writeSeg2(f, delay)) {
[detail]        Message::warning(MSG_ID, tr( "Saving SEG-2 ..." ),
[detail] @@ -1759,9 +1832,9 @@
[detail]      const Point& src=uniqSrcList.constAt(i);
[detail]      for(int j=count()-1; j>=0; j--) {
[detail]        if(srcList.constAt(j)==src) {
[detail] -        Signal * sig=at(j);
[detail] -        ir[nr]=recList.indexOf(sig->receiver())+1;
[detail] -        tr[nr]=sig->startTime().secondsTo(sig->metaData<TimePick>().value(pickName));
[detail] +          SignalSegment * sig=at(j);
[detail] +          ir[nr]=recList.indexOf(sig->metaData()->receiver())+1;
[detail] +          tr[nr]=sig->startTime().secondsTo(sig->metaData()->optionalData().get<TimePick>().value(pickName));
[detail]          nr++;
[detail]        }
[detail]      }
[detail] @@ -1779,11 +1852,11 @@
[detail]  {
[detail]    TRACE;
[detail]    const_iterator it=begin();
[detail] -  Signal * sig=*it;
[detail] -  int nsamples=sig->nSamples();
[detail] +    SignalSegment * sig=*it;
[detail] +    int nsamples=sig->size();
[detail]    for(++it; it!=end(); ++it) {
[detail]      sig=* it;
[detail] -    if(nsamples!=sig->nSamples()) {
[detail] +      if(nsamples!=sig->size()) {
[detail]        Message::warning(MSG_ID, tr("Saving SU ..."),
[detail]                         tr("The signals must contain the same number of samples"), Message::cancel());
[detail]        return false;
[detail] @@ -1844,25 +1917,26 @@
[detail]    GeopsyCoreEngine::instance()->setProgressMaximum(db, n-1);
[detail]    for(int i=0; i<n; i++) {
[detail]      GeopsyCoreEngine::instance()->setProgressValue(db, i);
[detail] -    Signal * sig=at(i);
[detail] +      SignalSegment * sig=at(i);
[detail]      QString completefilePath;
[detail]      if(useOriginalBaseName) {
[detail]        if(sig->file() && sig->file()->format().storage()==SignalFileFormat::Single) {
[detail] -        QString tmp=sig->file()->shortName();
[detail] +          QString tmp=sig->fileShortName();
[detail]          
[detail]          if(tmp.contains(QRegularExpression("\\.[a-zA-Z]+[0-9]*$"))) {
[detail]            QFileInfo fi(tmp);
[detail]            tmp=fi.completeBaseName();
[detail]          }
[detail] -        QString compSuffix="_"+Signal::componentLetter(sig->component());
[detail] +          QString compSuffix="_"+SignalMetaData::componentLetter(sig->metaData()->component());
[detail]          if(!tmp.endsWith(compSuffix)) {
[detail]            tmp+=compSuffix;
[detail]          }
[detail]          tmp+=".sac";
[detail]          completefilePath=File::uniqueName(tmp, filePath);
[detail] -      } else if(!sig->name().isEmpty()) {
[detail] +        } else if(!sig->metaData()->name().isEmpty()) {
[detail]          QDir d(filePath);
[detail] -        completefilePath=d.absoluteFilePath(sig->name()+"_"+Signal::componentLetter(sig->component()));
[detail] +          completefilePath=d.absoluteFilePath(sig->metaData()->name()+"_"
[detail] +                            +SignalMetaData::componentLetter(sig->metaData()->component()));
[detail]        }
[detail]      }
[detail]      if(completefilePath.isEmpty()) {
[detail] @@ -1911,11 +1985,11 @@
[detail]    GeopsyCoreEngine::instance()->setProgressMaximum(db, n-1);
[detail]    for(int i=0; i<n; i++) {
[detail]      GeopsyCoreEngine::instance()->setProgressValue(db, i);
[detail] -    Signal * sig=at(i);
[detail] +      SignalSegment * sig=at(i);
[detail]      if(!sig->writeMiniSeed(f)) {
[detail]        Message::warning(MSG_ID, tr("Saving mini seed ..."),
[detail]                            tr("Error saving signal %1 to file %2. See log for details.")
[detail] -                          .arg(sig->nameComponent()).arg(filePath), Message::cancel());
[detail] +                             .arg(sig->metaData()->nameComponent()).arg(filePath), Message::cancel());
[detail]        return false;
[detail]      }
[detail]    }
[detail] @@ -1927,13 +2001,13 @@
[detail]  {
[detail]    TRACE;
[detail]    const_iterator it=begin();
[detail] -  Signal * sig=*it;
[detail] +    SignalSegment * sig=*it;
[detail]    double samplingPeriod=sig->samplingPeriod();
[detail] -  int nSamples=sig->nSamples();
[detail] +    int nSamples=sig->size();
[detail]    DoubleSignal::SignalType type=sig->type();
[detail]    for(++it; it!=end(); ++it) {
[detail]      sig=* it;
[detail] -    if(samplingPeriod!=sig->samplingPeriod() || nSamples!=sig->nSamples() ||
[detail] +      if(samplingPeriod!=sig->samplingPeriod() || nSamples!=sig->size() ||
[detail]           type!=sig->type()) {
[detail]        Message::warning(MSG_ID, caption,
[detail]                         tr("The number of samples, the sampling frequency and the "
[detail] @@ -1950,10 +2024,10 @@
[detail]  {
[detail]    TRACE;
[detail]    for(int i=0; i<count(); i++) {
[detail] -    samples[i]=at(i)->constLockSamples();
[detail] +      samples[i]=at(i)->values()->constLockSamples();
[detail]      if(!samples[i]) {
[detail]        for(i--; i>=0; i--) {
[detail] -        at(i)->unlockSamples();
[detail] +          at(i)->values()->unlockSamples();
[detail]        }
[detail]        Message::warning(MSG_ID, caption,
[detail]                         tr("Cannot use all signals at the same time due to insuficient "
[detail] @@ -1971,7 +2045,7 @@
[detail]    TRACE;
[detail]    
[detail]    for(const_iterator it=begin(); it!=end(); ++it) {
[detail] -    (*it) ->unlockSamples();
[detail] +      (*it)->values()->unlockSamples();
[detail]    }
[detail]  }
[detail]  
[detail] @@ -1994,12 +2068,12 @@
[detail]      return false;
[detail]    }
[detail]    const_iterator it=begin();
[detail] -  Signal * sig=* it;
[detail] +    SignalSegment * sig=* it;
[detail]    double maxAll=0;
[detail]    for( ++it; it!=end(); ++it) {
[detail]      sig=* it;
[detail] -    if(sig->maximumAmplitude() > maxAll)
[detail] -    maxAll=sig->maximumAmplitude();
[detail] +      if(sig->values()->maximumAmplitude()>maxAll)
[detail] +        maxAll=sig->values()->maximumAmplitude();
[detail]    }
[detail]    double satFac=32768.0/maxAll; 
[detail]    
[detail] @@ -2012,14 +2086,14 @@
[detail]    memcpy(wavinfo.subchunk2ID, "data", 4);
[detail]    wavinfo.bitsPerSample=16;
[detail]    wavinfo.numChannels=static_cast<qint16>(count());
[detail] -  wavinfo.sampleRate=qRound(first()->samplingFrequency());
[detail] +    wavinfo.sampleRate=qRound(first()->metaData()->samplingFrequency());
[detail]    wavinfo.blockAlign=wavinfo.bitsPerSample * wavinfo.numChannels/8;
[detail]    wavinfo.byteRate=wavinfo.blockAlign * wavinfo.sampleRate;
[detail] -  wavinfo.subchunk2Size=sig->nSamples() * wavinfo.blockAlign;
[detail] +    wavinfo.subchunk2Size=sig->size() * wavinfo.blockAlign;
[detail]    wavinfo.chunkSize=wavinfo.subchunk2Size + 36;
[detail]    short val;
[detail]    int is=-1, i;
[detail] -  int nSamples=first()->nSamples();
[detail] +    int nSamples=first()->size();
[detail]    if(fwrite(&wavinfo, sizeof(WaveHeader), 1, f)==1) {
[detail]      for(is=0; is<nSamples; is++) {
[detail]        for(i=0; i<count(); i++ ) {
[detail] @@ -2073,8 +2147,8 @@
[detail]    QTextStream s(&f);
[detail]    s.setRealNumberPrecision(20);
[detail]    s.setRealNumberNotation(QTextStream::SmartNotation);
[detail] -  if(first()->isReal()) {
[detail] -    int n=first()->nSamples();
[detail] +    if(first()->values()->isReal()) {
[detail] +      int n=first()->size();
[detail]      for(int is=0; is<n; is++) {
[detail]        int iSig=0;
[detail]        s << samples[iSig][is];
[detail] @@ -2083,21 +2157,18 @@
[detail]        }
[detail]        s << "\n";
[detail]      }
[detail] -  } else if(first()->isComplex()) {
[detail] -    Signal * sig;
[detail] -    
[detail] -    int nSamples2=first()->nSamples() >> 1;
[detail] -    
[detail] +    } else if(first()->values()->isComplex()) {
[detail] +      StoredSignal * sig;
[detail] +      int nSamples2=first()->size() >> 1;
[detail]      double df=1.0/first()->duration();
[detail]      for(int is=0; is<=nSamples2; is++) {
[detail]        int iSig=0;
[detail] -      sig=at(iSig);
[detail] -      
[detail] +        sig=at(iSig)->values();
[detail]        s << df * (double) is
[detail]          << "\t" << sig->amplitude(samples[iSig], is)
[detail]          << "\t" << sig->phase(samples[iSig], is);
[detail]        for(iSig++; iSig<count(); iSig++ ) {
[detail] -        sig=at(iSig);
[detail] +          sig=at(iSig)->values();
[detail]          s << "\t" << sig->amplitude(samples[iSig], is)
[detail]            << "\t" << sig->phase(samples[iSig], is);
[detail]        }
[detail] @@ -2130,7 +2201,7 @@
[detail]    }
[detail]    QTextStream s(&f);
[detail]    
[detail] -  QString cmt=first()->metaData<Comments>().value();
[detail] +    QString cmt=first()->metaData()->optionalData().get<Comments>().value();
[detail]    QRegularExpression cmtGrep;
[detail]    QRegularExpressionMatch match;
[detail]    cmtGrep.setPattern("Station serial number *: *([0-9]+)");
[detail] @@ -2170,10 +2241,10 @@
[detail]    match=cmtGrep.match(cmt);
[detail]    int gain=match.captured(1).toInt();
[detail]    DateTime startTime=first()->startTime();
[detail] -  double countPervolt=CitySignal::conversionFactor(qRound(first()->samplingFrequency()), gain);
[detail] +    double countPervolt=CitySignal::conversionFactor(qRound(first()->metaData()->samplingFrequency()), gain);
[detail]    
[detail]    
[detail] -  s << "Original file name: " << first()->name() << "\n"
[detail] +    s << "Original file name: " << first()->metaData()->name() << "\n"
[detail]      << "Geopsy version: " << CoreApplication::instance()->version("GeopsyCore") << "\n"
[detail]      << "Station serial number: " << stationSerialNumber << "\n"
[detail]      << "Station software version: " << stationSoftwareVersion << "\n"
[detail] @@ -2182,8 +2253,8 @@
[detail]      << "Starting time: " << startTime.toString("hh:mm:ss.zzz") << "\n"
[detail]      << "Ending date: " << endingDate << "\n"
[detail]      << "Ending time: " << endingTime << "\n"
[detail] -    << "Sample rate: " << first()->samplingFrequency() << " Hz\n"
[detail] -    << "Sample number: " << first()->nSamples() << "\n"
[detail] +      << "Sample rate: " << first()->metaData()->samplingFrequency() << " Hz\n"
[detail] +      << "Sample number: " << first()->size() << "\n"
[detail]      << "Recording duration: " << duration << " mn\n"
[detail]      << "Conversion factor: " << countPervolt/gain << "\n"
[detail]      << "Gain: " << gain << "\n"
[detail] @@ -2194,8 +2265,8 @@
[detail]      << "Altitude : " << altitude << " m\n"
[detail]      << "No. satellites: " << numSatellites << "\n"
[detail]      << "Maximum amplitude: " << maxAmplitude << "\n";
[detail] -  if(first()->isReal()) {
[detail] -    int n=first()->nSamples();
[detail] +    if(first()->values()->isReal()) {
[detail] +      int n=first()->size();
[detail]      for(int is=0; is<n; is++) {
[detail]        int iSig=0;
[detail]        s << qRound(samples[iSig][is]*countPervolt);
[detail] @@ -2239,19 +2310,20 @@
[detail]      }
[detail]    }
[detail]    for(const_iterator it=begin(); it!=end(); ++it) {
[detail] -    Signal * sig=*it;
[detail] +      SignalSegment * sig=*it;
[detail]      if(samplingPeriod==0.0) {
[detail]        samplingPeriod=sig->samplingPeriod();
[detail] -      nSamp=sig->nSamples();
[detail] +        nSamp=sig->size();
[detail]        startTime=sig->startTime();
[detail] -      stat=sig->name();
[detail] -      rec=sig->receiver();
[detail] +        stat=sig->metaData()->name();
[detail] +        rec=sig->metaData()->receiver();
[detail]      }
[detail] -    if(sig->name()==stat && sig->receiver()==rec && sig->startTime()==startTime) {
[detail] -      if(sig->samplingPeriod()!=samplingPeriod || sig->nSamples()!=nSamp) {
[detail] +      if(sig->metaData()->name()==stat && sig->metaData()->receiver()==rec && sig->startTime()==startTime) {
[detail] +        if(sig->samplingPeriod()!=samplingPeriod || sig->size()!=nSamp) {
[detail]          Message::warning(MSG_ID, tr("Saving ASCII Saf ..."),
[detail]                           tr("For station %1, the sampling rate or the number of samples "
[detail] -                            "is not the same for all component, skiping %2 component." ).arg(stat).arg(sig->component()),
[detail] +                              "is not the same for all component, skiping %2 component." )
[detail] +                               .arg(stat).arg(sig->metaData()->component()),
[detail]                           Message::ok(), true);
[detail]        } else
[detail]          triplet.append(sig);
[detail] @@ -2263,10 +2335,10 @@
[detail]        }
[detail]        triplet.removeAll();
[detail]        samplingPeriod=sig->samplingPeriod();
[detail] -      nSamp=sig->nSamples();
[detail] +        nSamp=sig->size();
[detail]        startTime=sig->startTime();
[detail] -      stat=sig->name();
[detail] -      rec=sig->receiver();
[detail] +        stat=sig->metaData()->name();
[detail] +        rec=sig->metaData()->receiver();
[detail]        triplet.append(sig);
[detail]        iFile++;
[detail]      }
[detail] @@ -2288,13 +2360,14 @@
[detail]    if(count()!=3) {
[detail]      ASSERT(count()>0);
[detail]      Message::warning(MSG_ID, tr("Saving ASCII Saf ..."),
[detail] -                     tr("Missing components for station %1").arg(first()->name()), Message::cancel());
[detail] +                       tr("Missing components for station %1")
[detail] +                           .arg(first()->metaData()->name()), Message::cancel());
[detail]      return false;
[detail]    }
[detail]    TRACE_BUG;
[detail] -  const Signal * sig=at(0);
[detail] +    const SignalSegment * sig=at(0);
[detail]    TRACE_BUG_N(1);
[detail] -  int nsamp=sig->nSamples();
[detail] +    int nsamp=sig->size();
[detail]    QFile f(filePath);
[detail]    if(!f.open(QIODevice::WriteOnly)) {
[detail]      Message::warning(MSG_ID, tr("Saving ASCII Saf ..."),
[detail] @@ -2306,8 +2379,8 @@
[detail]    s << "SESAME ASCII data format (saf) v. 1\n"
[detail]         "# Noise recording\n"
[detail]         "# Original file name : geopsy Database\n"
[detail] -       "STA_CODE=" << sig->name() << "s\n"
[detail] -       "# Geographical Coordinates=" << sig->receiver().toString() << "\n"
[detail] +         "STA_CODE=" << sig->metaData()->name() << "s\n"
[detail] +                        "# Geographical Coordinates=" << sig->metaData()->receiver().toString() << "\n"
[detail]         "START_TIME=" << sig->startTime().toString("yyyy MM dd hh mm ssz") << "\n"
[detail]         "SAMP_FREQ=" << 1.0/(sig->samplingPeriod()) << "\n"
[detail]         "NDAT=" << nsamp << "\n"
[detail] @@ -2316,28 +2389,28 @@
[detail]         "# SENSOR TYPE:      \n"
[detail]         "UNITS=         \n"
[detail]         "NORTH_ROT=0\n"
[detail] -       "# DATA CONVERSION FACTOR=" << sig->countPerVolt() << "\n"
[detail] +                  "# DATA CONVERSION FACTOR=" << sig->metaData()->countPerVolt() << "\n"
[detail]         "#        from UNITS to SI units\n"
[detail]         "####-------------------------------------------\n";
[detail]    const double * data[3];
[detail]    const DoubleSignal * sigs[3];
[detail]    TRACE_BUG_N(3);
[detail] -  if(sig->component()==Signal::Vertical) {
[detail] -    sigs[0]=sig->saveType(Signal::Waveform);
[detail] +    if(sig->metaData()->component()==SignalMetaData::Vertical) {
[detail] +      sigs[0]=sig->values()->saveType(DoubleSignal::Waveform);
[detail]      data[0]=sigs[0]->constLockSamples();
[detail]    } else {
[detail]      sigs[0]=nullptr;
[detail]    }
[detail]    sig=at(1);
[detail] -  if(sig->component()==Signal::North) {
[detail] -    sigs[1]=sig->saveType(Signal::Waveform);
[detail] +    if(sig->metaData()->component()==SignalMetaData::North) {
[detail] +      sigs[1]=sig->values()->saveType(DoubleSignal::Waveform);
[detail]      data[1]=sigs[1]->constLockSamples();
[detail]    } else {
[detail]      sigs[1]=nullptr;
[detail]    }
[detail]    sig=at(2);
[detail] -  if(sig->component()==Signal::East) {
[detail] -    sigs[2]=sig->saveType(Signal::Waveform);
[detail] +    if(sig->metaData()->component()==SignalMetaData::East) {
[detail] +      sigs[2]=sig->values()->saveType(DoubleSignal::Waveform);
[detail]      data[2]=sigs[2]->constLockSamples();
[detail]    } else {
[detail]      sigs[2]=nullptr;
[detail] @@ -2346,7 +2419,7 @@
[detail]    if(data[0]==nullptr || data[1]==nullptr || data[2]==nullptr) {
[detail]      Message::warning(MSG_ID, tr("Saving ASCII Saf ..."),
[detail]                           tr("For station %1, at least one component is missing or not available")
[detail] -                         .arg(first()->name()), Message::ok(), true);
[detail] +                           .arg(first()->metaData()->name()), Message::ok(), true);
[detail]    }
[detail]    for(int i=0; i<nsamp; i++) {
[detail]      for(int iComp=0; iComp<3; iComp++) {
[detail] @@ -2362,7 +2435,7 @@
[detail]    for(int iComp=0; iComp<3; iComp++) {
[detail]      if(sigs[iComp] ) {
[detail]        sigs[iComp]->unlockSamples();
[detail] -      at(iComp)->restoreType(sigs[iComp]);
[detail] +        at(iComp)->values()->restoreType(sigs[iComp]);
[detail]      }
[detail]    }
[detail]    TRACE_BUG_N(6);
[detail] @@ -2394,7 +2467,7 @@
[detail]    TRACE;
[detail]    QStringList names;
[detail]    for(const_iterator it=begin(); it!=end(); ++it) {
[detail] -    names.append((*it)->metaData<TimePick>().names());
[detail] +      names.append((*it)->metaData()->optionalData().get<TimePick>().names());
[detail]    }
[detail]    std::sort(names.begin(), names.end());
[detail]    unique(names);
[detail] @@ -2412,14 +2485,14 @@
[detail]    }
[detail]  }
[detail]  
[detail] -bool SubSignalPool::contains(const Signal * sig) const
[detail] +  bool SubSignalPool::contains(const SignalSegment * sig) const
[detail]  {
[detail]    if(count()<10) {
[detail] -    return QList<Signal *>::contains(const_cast<Signal *>(sig));
[detail] +      return QList<SignalSegment *>::contains(const_cast<SignalSegment *>(sig));
[detail]    } else {
[detail]      if(_lookup.count()!=count()) {
[detail]        _lookup.clear();
[detail] -      for(QList<Signal *>::const_iterator it=begin(); it!=end(); it++) {
[detail] +        for(QList<SignalSegment *>::const_iterator it=begin(); it!=end(); it++) {
[detail]          _lookup.insert(*it);
[detail]        }
[detail]      }
[detail] @@ -2432,7 +2505,7 @@
[detail]  {
[detail]    QMap<QString,int> names;
[detail]    for(SubSignalPool::const_iterator it=begin(); it!=end(); it++) {
[detail] -    names.insert((*it)->nameComponent(), 0);
[detail] +      names.insert((*it)->metaData()->nameComponent(), 0);
[detail]    }
[detail]    int i=0;
[detail]    for(QMap<QString,int>::iterator it=names.begin(); it!=names.end(); it++) {
[detail] @@ -2445,8 +2518,8 @@
[detail]  {
[detail]    DateTime min=DateTime::maximumTime;
[detail]    for(SubSignalPool::const_iterator it=begin(); it!=end(); it++) {
[detail] -    const Signal * sig=*it;
[detail] -    DateTime t=sig->metaData<TimePick>().value(timePick);
[detail] +      const SignalSegment * sig=*it;
[detail] +      DateTime t=sig->metaData()->optionalData().get<TimePick>().value(timePick);
[detail]      if(t<min) {
[detail]        min=t;
[detail]      }
[detail] @@ -2458,8 +2531,8 @@
[detail]  {
[detail]    DateTime max=DateTime::minimumTime;
[detail]    for(SubSignalPool::const_iterator it=begin(); it!=end(); it++) {
[detail] -    const Signal * sig=*it;
[detail] -    DateTime t=sig->metaData<TimePick>().value(timePick);
[detail] +      const SignalSegment * sig=*it;
[detail] +      DateTime t=sig->metaData()->optionalData().get<TimePick>().value(timePick);
[detail]      if(t>max) {
[detail]        max=t;
[detail]      }
[detail] @@ -2471,7 +2544,7 @@
[detail]  {
[detail]    VectorList<const SeismicEvent *>  events;
[detail]    for(SubSignalPool::const_iterator it=begin(); it!=end(); it++) {
[detail] -    const Signal * sig=*it;
[detail] +      const SignalSegment * sig=*it;
[detail]      events.append(sig->pickEvents(param));
[detail]    }
[detail]    return events;
[detail] @@ -2480,9 +2553,26 @@
[detail]  void SubSignalPool::gapsFromNaN()
[detail]  {
[detail]    for(SubSignalPool::iterator it=begin(); it!=end(); it++) {
[detail] -    Signal * sig=*it;
[detail] +      SignalSegment * sig=*it;
[detail]      sig->gapsFromNaN();
[detail]    }
[detail]  }
[detail]  
[detail] +  void SubSignalPool::derivate()
[detail] +  {
[detail] +    for(SubSignalPool::iterator it=begin(); it!=end(); it++) {
[detail] +      SignalSegment * sig=*it;
[detail] +      sig->values()->derivate();
[detail] +    }
[detail]  } 
[detail] +
[detail] +  void SubSignalPool::integrate()
[detail] +  {
[detail] +    for(SubSignalPool::iterator it=begin(); it!=end(); it++) {
[detail] +      SignalSegment * sig=*it;
[detail] +      sig->values()->integrate();
[detail] +    }
[detail] +  }
[detail] +
[detail] +} 
[detail] +
[detail]             src/SubSignalPoolProcess.cpp:  version-4.5.1	modified out of comments
[detail] --- src/SubSignalPoolProcess.cpp-version-4.5.1-stripped	2025-09-28 04:01:05.663506188 +0200
[detail] +++ src/SubSignalPoolProcess.cpp-HEAD-stripped	2025-09-28 04:01:05.667506208 +0200
[detail] @@ -2,6 +2,8 @@
[detail]  
[detail]  #include "SubSignalPoolProcess.h"
[detail]  #include "SubSignalPool.h"
[detail] +#include "SubSignalPool.h"
[detail] +#include "StoredSignal.h"
[detail]  
[detail]  namespace GeopsyCore {
[detail]  
[detail] @@ -12,7 +14,7 @@
[detail]      : CacheProcess()
[detail]  {
[detail]    for(SubSignalPool::const_iterator it=subPool.begin(); it!=subPool.end(); it++) {
[detail] -    add(*it);
[detail] +      add((*it)->values());
[detail]    }
[detail]  }
[detail]  
[detail]                     src/SyscomHeader.cpp:  version-4.5.1	modified out of comments
[detail] --- src/SyscomHeader.cpp-version-4.5.1-stripped	2025-09-28 04:01:05.683506284 +0200
[detail] +++ src/SyscomHeader.cpp-HEAD-stripped	2025-09-28 04:01:05.687506304 +0200
[detail] @@ -26,15 +26,15 @@
[detail]  double SyscomHeader::countPerVolt(const Lsb& l)
[detail]  {
[detail]    TRACE;
[detail] -  return l.MANTISSA*pow(10.0,l.EXPONENT);
[detail] +  return l.MANTISSA*Number::exp10(l.EXPONENT);
[detail]  }
[detail]  
[detail] -Signal::Components SyscomHeader::component(int channel)
[detail] +SignalMetaData::Components SyscomHeader::component(int channel)
[detail]  {
[detail]    switch(channel) {
[detail] -  case 0: return Signal::East;
[detail] -  case 1: return Signal::North;
[detail] -  default: return Signal::Vertical;
[detail] +  case 0: return SignalMetaData::East;
[detail] +  case 1: return SignalMetaData::North;
[detail] +  default: return SignalMetaData::Vertical;
[detail]    }
[detail]  }
[detail]  
[detail]                src/SyscomSVmrxHeader.cpp:  version-4.5.1	not modified
[detail]                  src/SyscomXmrHeader.cpp:  version-4.5.1	not modified
[detail]                    src/TaperDelegate.cpp:  version-4.5.1	not modified
[detail]                         src/TimePick.cpp:  version-4.5.1	modified out of comments
[detail] --- src/TimePick.cpp-version-4.5.1-stripped	2025-09-28 04:01:05.751506613 +0200
[detail] +++ src/TimePick.cpp-HEAD-stripped	2025-09-28 04:01:05.755506632 +0200
[detail] @@ -380,7 +380,7 @@
[detail]  
[detail]    QueryFlags	TimePickClass::queryProperty(const QScriptValue & object, const QScriptString & name, QueryFlags flags, uint * id)
[detail]    {
[detail] -    qscriptvalue_cast<Signal *>(thisObject().data());
[detail] +    qscriptvalue_cast<SignalSegment *>(thisObject().data());
[detail]    }
[detail]  
[detail]    QScriptValue TimePickClass::property(const QScriptValue& object, const QScriptString& name, uint id)
[detail]                        src/TimeRange.cpp:  version-4.5.1	modified out of comments
[detail] --- src/TimeRange.cpp-version-4.5.1-stripped	2025-09-28 04:01:05.771506710 +0200
[detail] +++ src/TimeRange.cpp-HEAD-stripped	2025-09-28 04:01:05.775506728 +0200
[detail] @@ -33,4 +33,12 @@
[detail]                                      end().toString().toLatin1().data());
[detail]    }
[detail]  
[detail] +  
[detail] +  size_t qHash(const TimeRange& r)
[detail] +  {
[detail] +    size_t h1=qHash(r.start());
[detail] +    size_t h2=qHash(r.end());
[detail] +    return ((h1 << 16) | (h1 >> 16)) ^ h2;
[detail] +  }
[detail] +
[detail]  } 
[detail]                    src/TimeRangeList.cpp:  version-4.5.1	modified out of comments
[detail] --- src/TimeRangeList.cpp-version-4.5.1-stripped	2025-09-28 04:01:05.791506806 +0200
[detail] +++ src/TimeRangeList.cpp-HEAD-stripped	2025-09-28 04:01:05.795506826 +0200
[detail] @@ -103,33 +103,29 @@
[detail]      
[detail]      ASSERT((nBadTol>=0 && nBadGap==0) || (nBadTol==0 && nBadGap>=0));
[detail]  
[detail] -    int nStart=qRound(keepSig->startTime().secondsTo(r.start())*freqSamp);
[detail] +    qint64 nStart=qRound64(keepSig->startTime().secondsTo(r.start())*freqSamp);
[detail]      if(nStart>keepSig->nSamples()) {
[detail]        continue;
[detail]      } else if(nStart<0) {
[detail]        nStart=0;
[detail]      }
[detail] -    int nEnd=qRound(keepSig->startTime().secondsTo(r.end())*freqSamp);
[detail] +    qint64 nEnd=qRound64(keepSig->startTime().secondsTo(r.end())*freqSamp);
[detail]      if(nEnd<0) {
[detail]        continue;
[detail]      } else if(nEnd>keepSig->nSamples()) {
[detail]        nEnd=keepSig->nSamples();
[detail]      }
[detail]      
[detail] -    CONST_LOCK_SAMPLES(int, kSamp, keepSig)
[detail] -      int i=nStart;
[detail] -      int * badSamples=new int[nMax];
[detail] -      int nBadSample, winStart, winLength;
[detail] +    qint64 i=nStart;
[detail] +    qint64 * badSamples=new qint64[nMax];
[detail] +    int nBadSample, winLength;
[detail] +    qint64 winStart;
[detail]        bool lastSampleIsBad=false;
[detail]        while(i<nEnd && (param.maximumWindowCount()==0 || count()<param.maximumWindowCount())) {
[detail] -        int iCurrent=i;
[detail] -        while(i<nEnd && kSamp[i]==-1) { 
[detail] -          i++;
[detail] -        }
[detail] -        int acceptableSample=i;
[detail] -        while(i<nEnd && kSamp[i]==0) { 
[detail] -          i++;
[detail] -        }
[detail] +      qint64 iCurrent=i;
[detail] +      keepSig->whileAt(-1, i, nEnd);
[detail] +      qint64 acceptableSample=i;
[detail] +      keepSig->whileAt(0, i, nEnd);
[detail]          if(i>iCurrent) {
[detail]            lastSampleIsBad=true;
[detail]          }
[detail] @@ -138,15 +134,13 @@
[detail]            i=acceptableSample;
[detail]          }
[detail]          if(nBadGap>0 && lastSampleIsBad) { 
[detail] -          int n;
[detail] +        qint64 n;
[detail]            do {
[detail]              n=i+nBadGap;
[detail]              if(n>=nEnd) {
[detail]                break;
[detail]              }
[detail] -            while(i<n && kSamp[i]==1) {
[detail] -              i++;
[detail] -            }
[detail] +          keepSig->whileAt(1, i, n);
[detail]            } while(i<n);
[detail]            lastSampleIsBad=false;
[detail]          }
[detail] @@ -171,7 +165,7 @@
[detail]              nBadSample--;
[detail]              if(nBadGap>0) { 
[detail]                ASSERT(nBadSample==0 && winStart==i && winLength==0);
[detail] -              int n=i;
[detail] +            qint64 n=i;
[detail]                do {
[detail]                  if(i<n) {
[detail]                    i++;
[detail] @@ -180,9 +174,7 @@
[detail]                  if(n>=nEnd) {
[detail]                    break;
[detail]                  }
[detail] -                while(i<n && kSamp[i]==1) {
[detail] -                  i++;
[detail] -                }
[detail] +              keepSig->whileAt(1, i, n);
[detail]                } while(i<n);
[detail]                winStart=i;
[detail]                lastSampleIsBad=false;
[detail] @@ -191,11 +183,12 @@
[detail]              
[detail]            }
[detail]            while(i<nEnd && nBadSample<=nBadTol && winLength<nMax+nBadGap) {
[detail] -            if(kSamp[i]==0) {
[detail] +          int v=keepSig->at(i);
[detail] +          if(v==0) {
[detail]                badSamples[nBadSample]=i;
[detail]                nBadSample++;
[detail]                
[detail] -            } else if(kSamp[i]==-1) {
[detail] +          } else if(v==-1) {
[detail]                
[detail]                
[detail]                lastSampleIsBad=true;
[detail] @@ -204,7 +197,7 @@
[detail]              winLength++;
[detail]              i++;
[detail]            }
[detail] -          if(kSamp[i]==-1) {
[detail] +        if(i<nEnd && keepSig->at(i)==-1) {
[detail]              break;
[detail]            }
[detail]          } while(i<nEnd && winLength<nMin);
[detail] @@ -229,7 +222,7 @@
[detail]                                            .arg(newRange->end().toString())
[detail]                                            .arg(newRange->lengthSeconds(), 0, 'f', 2));
[detail]            
[detail] -          int effOverlap=nOverlap-1;
[detail] +        int effOverlap=nOverlap;
[detail]            if(effOverlap>=winLength) {
[detail]              effOverlap=winLength-1;
[detail]            }
[detail] @@ -237,7 +230,6 @@
[detail]          }
[detail]        }
[detail]        delete [] badSamples;
[detail] -    UNLOCK_SAMPLES(keepSig)
[detail]    }
[detail]  }
[detail]  
[detail]              src/TimeRangeParameters.cpp:  version-4.5.1	modified out of comments
[detail] --- src/TimeRangeParameters.cpp-version-4.5.1-stripped	2025-09-28 04:01:05.811506903 +0200
[detail] +++ src/TimeRangeParameters.cpp-HEAD-stripped	2025-09-28 04:01:05.815506923 +0200
[detail] @@ -2,7 +2,7 @@
[detail]  
[detail]  #include "TimeRangeParameters.h"
[detail]  #include "StationSignals.h"
[detail] -#include "GeoSignal.h"
[detail] +#include "SignalSegment.h"
[detail]  #include "TimePick.h"
[detail]  
[detail]  namespace GeopsyCore {
[detail] @@ -79,10 +79,15 @@
[detail]        t1=absoluteStart(sigs->firstValidSignal());
[detail]        t2=absoluteEnd(sigs->lastValidSignal());
[detail]      }
[detail] +    if(t1>=t2) {
[detail] +      App::log(tr("Starting time (%1) is after ending time (%2)\n")
[detail] +                   .arg(t1.toString(DateTime::defaultUserFormat))
[detail] +                   .arg(t2.toString(DateTime::defaultUserFormat)));
[detail] +    }
[detail]      return TimeRange(t1, t2);
[detail]    }
[detail]  
[detail] -  TimeRange TimeRangeParameters::absoluteRange(const GeopsyCore::Signal * sig) const
[detail] +  TimeRange TimeRangeParameters::absoluteRange(const SignalSegment * sig) const
[detail]    {
[detail]      return TimeRange(absoluteStart(sig), absoluteEnd(sig));
[detail]    }
[detail] @@ -149,7 +154,7 @@
[detail]      return ok;
[detail]    }
[detail]  
[detail] -  DateTime TimeRangeParameters::absoluteStart(const GeopsyCore::Signal * sig) const
[detail] +  DateTime TimeRangeParameters::absoluteStart(const SignalSegment * sig) const
[detail]    {
[detail]      TRACE;
[detail]      switch(_startType) {
[detail] @@ -166,7 +171,7 @@
[detail]        }
[detail]      case Pick:
[detail]        if(sig) {
[detail] -        return sig->metaData<TimePick>().value(_startPick);
[detail] +        return sig->metaData()->optionalData().get<TimePick>().value(_startPick);
[detail]        }
[detail]        break;
[detail]      case Absolute:
[detail] @@ -175,7 +180,7 @@
[detail]      return start();
[detail]    }
[detail]  
[detail] -  DateTime TimeRangeParameters::absoluteEnd(const GeopsyCore::Signal * sig) const
[detail] +  DateTime TimeRangeParameters::absoluteEnd(const SignalSegment * sig) const
[detail]    {
[detail]      TRACE;
[detail]      switch(_endType) {
[detail] @@ -192,7 +197,7 @@
[detail]        }
[detail]      case Pick:
[detail]        if(sig) {
[detail] -        return sig->metaData<TimePick>().value(_endPick);
[detail] +        return sig->metaData()->optionalData().get<TimePick>().value(_endPick);
[detail]        }
[detail]        break;
[detail]      case Absolute:
[detail]                       src/TimeWindow.cpp:  version-4.5.1	not modified
[detail]                   src/TimeWindowList.cpp:  version-4.5.1	not modified
[detail]                       src/WaveHeader.cpp:  version-4.5.1	not modified
[detail]              src/WindowingParameters.cpp:  version-4.5.1	modified out of comments
[detail] --- src/WindowingParameters.cpp-version-4.5.1-stripped	2025-09-28 04:01:05.875507212 +0200
[detail] +++ src/WindowingParameters.cpp-HEAD-stripped	2025-09-28 04:01:05.879507232 +0200
[detail] @@ -104,6 +104,8 @@
[detail]  
[detail]      _seismicEventTrigger=o._seismicEventTrigger;
[detail]      _seismicEventDelay=o._seismicEventDelay;
[detail] +
[detail] +    _filter=o._filter;
[detail]    }
[detail]  
[detail]    bool * WindowingParameters::copyComponentStation(bool * v, int count)
[detail] @@ -357,6 +359,8 @@
[detail]      log+=prefix+"WINDOW_LENGTH_TYPE"+suffix+"="+lengthTypeString()+"\n";
[detail]      switch (_lengthType) {
[detail]      case Exactly:
[detail] +      log+=prefix+"WINDOW_LENGTH"+suffix+"(s)="+QString::number(_minimumLength)+"\n";
[detail] +      break;
[detail]      case AtLeast:
[detail]        log+=prefix+"WINDOW_MIN_LENGTH"+suffix+"(s)="+QString::number(_minimumLength)+"\n";
[detail]        log+=prefix+"WINDOW_MAX_LENGTH"+suffix+"(s)="+QString::number(_maximumLength)+"\n";
[detail] @@ -365,6 +369,7 @@
[detail]        log+=prefix+"PERIOD_COUNT"+suffix+"="+QString::number(_periodCount)+"\n";
[detail]        break;
[detail]      }
[detail] +    log+="# Generates no more than WINDOW_MAX_COUNT windows. Leave as 0 to have no limitation.\n";
[detail]      log+=prefix+"WINDOW_MAX_COUNT"+suffix+"="+QString::number(_maximumWindowCount)+"\n";
[detail]      log+="# Length of time windows are adjusted to avoid a prime number of samples which\n"
[detail]           "# slows down the FFT computation. Usually a maximum prime of 11 in the prime factorization\n"
[detail] @@ -397,15 +402,15 @@
[detail]          }
[detail]          log+="\n";
[detail]        }
[detail] -      log+=prefix+"RAW_STA"+suffix+" (s)="+QString::number(_rawSignalAntiTrigger.shortLength)+"\n";
[detail] -      log+=prefix+"RAW_LTA"+suffix+" (s)="+QString::number(_rawSignalAntiTrigger.longLength)+"\n";
[detail] -      log+=prefix+"RAW_MIN_SLTA"+suffix+"="+QString::number(_rawSignalAntiTrigger.minimumThreshold)+"\n";
[detail] -      log+=prefix+"RAW_MAX_SLTA"+suffix+"="+QString::number(_rawSignalAntiTrigger.maximumThreshold)+"\n";
[detail] +      log+=prefix+"ANTI-TRIGGERING_RAW_STA"+suffix+" (s)="+QString::number(_rawSignalAntiTrigger.shortLength)+"\n";
[detail] +      log+=prefix+"ANTI-TRIGGERING_RAW_LTA"+suffix+" (s)="+QString::number(_rawSignalAntiTrigger.longLength)+"\n";
[detail] +      log+=prefix+"ANTI-TRIGGERING_RAW_MIN_SLTA"+suffix+"="+QString::number(_rawSignalAntiTrigger.minimumThreshold)+"\n";
[detail] +      log+=prefix+"ANTI-TRIGGERING_RAW_MAX_SLTA"+suffix+"="+QString::number(_rawSignalAntiTrigger.maximumThreshold)+"\n";
[detail]      }
[detail]      log+=prefix+"ANTI-TRIGGERING_ON_FILTERED_SIGNAL"+suffix+" (y/n)=";
[detail]      log+=_filterSignalAntiTrigger.enabled ? "y\n" : "n\n";
[detail]      if(_filterSignalAntiTrigger.enabled) {
[detail] -      log+=_filter.toString(prefix, suffix);
[detail] +      log+=_filter.toString(prefix+"ANTI-TRIGGERING_", suffix);
[detail]        if(_componentCount>0) {
[detail]          log+=prefix+"USED_FILTERED_COMPONENTS"+suffix+"=";
[detail]          log+=_filterComponent[0] ? "y" : "n";
[detail] @@ -414,10 +419,10 @@
[detail]          }
[detail]          log+="\n";
[detail]        }
[detail] -      log+=prefix+"FILTERED_STA"+suffix+" (s)="+QString::number(_filterSignalAntiTrigger.shortLength)+"\n";
[detail] -      log+=prefix+"FILTERED_LTA"+suffix+" (s)="+QString::number(_filterSignalAntiTrigger.longLength)+"\n";
[detail] -      log+=prefix+"FILTERED_MIN_SLTA"+suffix+"="+QString::number(_filterSignalAntiTrigger.minimumThreshold)+"\n";
[detail] -      log+=prefix+"FILTERED_MAX_SLTA"+suffix+"="+QString::number(_filterSignalAntiTrigger.maximumThreshold)+"\n";
[detail] +      log+=prefix+"ANTI-TRIGGERING_FILTERED_STA"+suffix+" (s)="+QString::number(_filterSignalAntiTrigger.shortLength)+"\n";
[detail] +      log+=prefix+"ANTI-TRIGGERING_FILTERED_LTA"+suffix+" (s)="+QString::number(_filterSignalAntiTrigger.longLength)+"\n";
[detail] +      log+=prefix+"ANTI-TRIGGERING_FILTERED_MIN_SLTA"+suffix+"="+QString::number(_filterSignalAntiTrigger.minimumThreshold)+"\n";
[detail] +      log+=prefix+"ANTI-TRIGGERING_FILTERED_MAX_SLTA"+suffix+"="+QString::number(_filterSignalAntiTrigger.maximumThreshold)+"\n";
[detail]      }
[detail]      log+="# Start a time window for each seismic event available inside the time range.\n";
[detail]      log+=prefix+"SEISMIC_EVENT_TRIGGER"+suffix+" (y/n)="+(_seismicEventTrigger ? "y\n" : "n\n");
[detail] @@ -434,13 +439,13 @@
[detail]  
[detail]    int WindowingParameters::keywordCount(PARAMETERS_KEYWORDCOUNT_ARGS) const
[detail]    {
[detail] -    return 30+AbstractParameters::keywordCount();
[detail] +    return 39+AbstractParameters::keywordCount();
[detail]    }
[detail]  
[detail]    int WindowingParameters::totalKeywordCount(PARAMETERS_TOTALKEYWORDCOUNT_ARGS) const
[detail]    {
[detail]      return AbstractParameters::totalKeywordCount()
[detail] -        +_filter.totalKeywordCount();
[detail] +        +2*_filter.totalKeywordCount();
[detail]    }
[detail]  
[detail]    void WindowingParameters::collectKeywords(PARAMETERS_COLLECTKEYWORDS_ARGS)
[detail] @@ -448,6 +453,7 @@
[detail]      TRACE;
[detail]      int baseIndex=AbstractParameters::keywordCount();
[detail]      keywords.add(prefix+"WINDOW_LENGTH_TYPE"+suffix, this, baseIndex);
[detail] +    keywords.add(prefix+"WINDOW_LENGTH"+suffix, this, baseIndex+30);
[detail]      keywords.add(prefix+"WINDOW_MIN_LENGTH"+suffix, this, baseIndex+1);
[detail]      keywords.add(prefix+"WINDOW_MAX_LENGTH"+suffix, this, baseIndex+2);
[detail]      keywords.add(prefix+"PERIOD_COUNT"+suffix, this, baseIndex+26);
[detail] @@ -465,19 +471,29 @@
[detail]      keywords.add(prefix+"DO_BAD_SAMPLE_THRESHOLD"+suffix, this, baseIndex+24);        
[detail]      keywords.add(prefix+"ANTI-TRIGGERING_ON_RAW_SIGNAL"+suffix, this, baseIndex+8);
[detail]      keywords.add(prefix+"USED_RAW_COMPONENTS"+suffix, this, baseIndex+9);
[detail] -    keywords.add(prefix+"RAW_STA"+suffix, this, baseIndex+10);
[detail] -    keywords.add(prefix+"RAW_LTA"+suffix, this, baseIndex+11);
[detail] -    keywords.add(prefix+"RAW_MIN_SLTA"+suffix, this, baseIndex+12);
[detail] -    keywords.add(prefix+"RAW_MAX_SLTA"+suffix, this, baseIndex+13);
[detail] +    keywords.add(prefix+"ANTI-TRIGGERING_RAW_STA"+suffix, this, baseIndex+10);
[detail] +    keywords.add(prefix+"ANTI-TRIGGERING_RAW_LTA"+suffix, this, baseIndex+11);
[detail] +    keywords.add(prefix+"ANTI-TRIGGERING_RAW_MIN_SLTA"+suffix, this, baseIndex+12);
[detail] +    keywords.add(prefix+"ANTI-TRIGGERING_RAW_MAX_SLTA"+suffix, this, baseIndex+13);
[detail]      keywords.add(prefix+"ANTI-TRIGGERING_ON_FILTERED_SIGNAL"+suffix, this, baseIndex+14);
[detail]      keywords.add(prefix+"USED_FILTERED_COMPONENTS"+suffix, this, baseIndex+15);
[detail] -    keywords.add(prefix+"FILTERED_STA"+suffix, this, baseIndex+16);
[detail] -    keywords.add(prefix+"FILTERED_LTA"+suffix, this, baseIndex+17);
[detail] -    keywords.add(prefix+"FILTERED_MIN_SLTA"+suffix, this, baseIndex+18);
[detail] -    keywords.add(prefix+"FILTERED_MAX_SLTA"+suffix, this, baseIndex+19);
[detail] +    keywords.add(prefix+"ANTI-TRIGGERING_FILTERED_STA"+suffix, this, baseIndex+16);
[detail] +    keywords.add(prefix+"ANTI-TRIGGERING_FILTERED_LTA"+suffix, this, baseIndex+17);
[detail] +    keywords.add(prefix+"ANTI-TRIGGERING_FILTERED_MIN_SLTA"+suffix, this, baseIndex+18);
[detail] +    keywords.add(prefix+"ANTI-TRIGGERING_FILTERED_MAX_SLTA"+suffix, this, baseIndex+19);
[detail]      keywords.add(prefix+"SEISMIC_EVENT_TRIGGER"+suffix, this, baseIndex+27);
[detail]      keywords.add(prefix+"SEISMIC_EVENT_DELAY"+suffix, this, baseIndex+28);
[detail] +    _filter.collectKeywords(keywords, prefix+"ANTI-TRIGGERING_", suffix);
[detail] +    keywords.add(prefix+"RAW_STA"+suffix, this, baseIndex+31);                
[detail] +    keywords.add(prefix+"RAW_LTA"+suffix, this, baseIndex+32);                
[detail] +    keywords.add(prefix+"RAW_MIN_SLTA"+suffix, this, baseIndex+33);           
[detail] +    keywords.add(prefix+"RAW_MAX_SLTA"+suffix, this, baseIndex+34);           
[detail] +    keywords.add(prefix+"FILTERED_STA"+suffix, this, baseIndex+35);           
[detail] +    keywords.add(prefix+"FILTERED_LTA"+suffix, this, baseIndex+36);           
[detail] +    keywords.add(prefix+"FILTERED_MIN_SLTA"+suffix, this, baseIndex+37);      
[detail] +    keywords.add(prefix+"FILTERED_MAX_SLTA"+suffix, this, baseIndex+38);      
[detail]      _filter.collectKeywords(keywords, prefix, suffix);
[detail] +                                                                              
[detail]    }
[detail]  
[detail]    bool WindowingParameters::setValue(PARAMETERS_SETVALUE_ARGS)
[detail] @@ -489,9 +505,20 @@
[detail]        return setLengthType(value);
[detail]      case 1:
[detail]        _minimumLength=value.toDouble(&ok);
[detail] +      if(_lengthType==Exactly) {
[detail] +        _maximumLength=_minimumLength;
[detail] +      }
[detail]        return ok;
[detail]      case 2:
[detail]        _maximumLength=value.toDouble(&ok);
[detail] +      if(_lengthType==Exactly) {
[detail] +        _minimumLength=_maximumLength;
[detail] +      }
[detail] +      return ok;
[detail] +    case 30:
[detail] +      _minimumLength=value.toDouble(&ok);
[detail] +      _maximumLength=value.toDouble(&ok);
[detail] +      _lengthType=Exactly;
[detail]        return ok;
[detail]      case 26:
[detail]        _periodCount=value.toDouble(&ok);
[detail] @@ -534,57 +561,63 @@
[detail]        }
[detail]        return true;
[detail]      case 8:
[detail] -      _rawSignalAntiTrigger.enabled=(value=="y");
[detail] -      return true;
[detail] +      _rawSignalAntiTrigger.enabled=Number::toBoolean(value, ok);
[detail] +      return ok;
[detail]      case 9: {
[detail]          LineParser p(value);
[detail]          p.setDelimiters(",");
[detail]          if(_componentCount==0) {
[detail]            setComponentCount(p.count());
[detail]          }
[detail] -        bool ok=true;
[detail]          for(int i=0; i<_componentCount; i++) {
[detail] -          _rawComponent[i]=(p.toString(i, ok).trimmed()=="y" && ok);
[detail] +          _rawComponent[i]=Number::toBoolean(value, ok);
[detail]          }
[detail]        }
[detail] -      return true;
[detail] +      return ok;
[detail]      case 10:
[detail] +    case 31:
[detail]        _rawSignalAntiTrigger.shortLength=value.toDouble(&ok);
[detail]        return ok;
[detail]      case 11:
[detail] +    case 32:
[detail]        _rawSignalAntiTrigger.longLength=value.toDouble(&ok);
[detail]        return ok;
[detail]      case 12:
[detail] +    case 33:
[detail]        _rawSignalAntiTrigger.minimumThreshold=value.toDouble(&ok);
[detail]        return ok;
[detail]      case 13:
[detail] +    case 34:
[detail]        _rawSignalAntiTrigger.maximumThreshold=value.toDouble(&ok);
[detail]        return ok;
[detail]      case 14:
[detail] -      _filterSignalAntiTrigger.enabled=(value=="y");
[detail] -      return true;
[detail] +      _filterSignalAntiTrigger.enabled=Number::toBoolean(value, ok);
[detail] +      return ok;
[detail]      case 15: {
[detail]          LineParser p(value);
[detail]          p.setDelimiters(",");
[detail]          if(_componentCount==0) {
[detail]            setComponentCount(p.count());
[detail]          }
[detail] -        bool ok=true;
[detail]          for(int i=0; i<_componentCount; i++) {
[detail] -          _filterComponent[i]=(p.toString(i, ok).trimmed()=="y" && ok);
[detail] +          _filterComponent[i]=Number::toBoolean(value, ok);
[detail]          }
[detail]        }
[detail] -      return true;
[detail] +      return ok;
[detail]      case 16:
[detail] +    case 35:
[detail]        _filterSignalAntiTrigger.shortLength=value.toDouble(&ok);
[detail]        return ok;
[detail]      case 17:
[detail] +    case 36:
[detail]        _filterSignalAntiTrigger.longLength=value.toDouble(&ok);
[detail]        return ok;
[detail]      case 18:
[detail] +    case 37:
[detail]        _filterSignalAntiTrigger.minimumThreshold=value.toDouble(&ok);
[detail]        return ok;
[detail]      case 19:
[detail] +    case 38:
[detail]        _filterSignalAntiTrigger.maximumThreshold=value.toDouble(&ok);
[detail]        return ok;
[detail]      case 20:
[detail] @@ -594,13 +627,13 @@
[detail]        _maximumWindowCount=value.toInt(&ok);
[detail]        return ok;
[detail]      case 22:                     
[detail] -      if(value=="y") {
[detail] +      if(Number::toBoolean(value, ok)) {
[detail]          _maximumPrimeFactor=2;
[detail]        }
[detail] -      return true;
[detail] +      return ok;
[detail]      case 27:
[detail] -      _seismicEventTrigger=(value=="y");
[detail] -      return true;
[detail] +      _seismicEventTrigger=Number::toBoolean(value, ok);
[detail] +      return ok;
[detail]      case 28:
[detail]        _seismicEventDelay=value.toDouble(&ok);
[detail]        return ok;
[detail]                        src/XMLSignal.cpp:  version-4.5.1	modified out of comments
[detail] --- src/XMLSignal.cpp-version-4.5.1-stripped	2025-09-28 04:01:05.895507309 +0200
[detail] +++ src/XMLSignal.cpp-HEAD-stripped	2025-09-28 04:01:05.899507329 +0200
[detail] @@ -2,6 +2,7 @@
[detail]  
[detail]  #include "XMLSignal.h"
[detail]  #include "SignalDatabase.h"
[detail] +#include "StoredSignal.h"
[detail]  
[detail]  namespace GeopsyCore {
[detail]  
[detail] @@ -12,17 +13,16 @@
[detail]  XMLSignal::XMLSignal()
[detail]  {
[detail]    TRACE;
[detail] -  _sig=0;
[detail] -  _database=0;
[detail] -  _id=0;
[detail] +    _sig=nullptr;
[detail] +    _db=nullptr;
[detail]  }
[detail]  
[detail] -XMLSignal::XMLSignal(Signal * sig)
[detail] +  XMLSignal::XMLSignal(SignalSegment * sig)
[detail]  {
[detail]    TRACE;
[detail]    _sig=sig;
[detail] -  _database=sig->database();
[detail] -  _id=0;
[detail] +    _id=sig->id();
[detail] +    _db=sig->database();
[detail]  }
[detail]  
[detail]  void XMLSignal::xml_writeProperties(XML_WRITEPROPERTIES_ARGS) const
[detail] @@ -32,11 +32,15 @@
[detail]    if(_sig->file() && _sig->file()->format().id()!=SignalFileFormat::Temporary &&
[detail]         _sig->database()->exists() && !_sig->database()->isModified()) {
[detail]      writeProperty(s, "database", _sig->database()->name());
[detail] -    writeProperty(s, "id", _sig->id());
[detail] +      writeProperty(s, "id", _sig->id().toString());
[detail]    } else {
[detail]      _sig->xml_writeProperties(s, context);
[detail]      writeBinaryData(s, context);
[detail]    }
[detail] +     
[detail] +    writeProperty(s, "samplingPeriod", _sig->samplingPeriod());
[detail] +    writeProperty(s, "name", _sig->metaData()->name());
[detail] +    writeProperty(s, "component", _sig->metaData()->componentStandardName());
[detail]  }
[detail]  
[detail]  void XMLSignal::xml_writeBinaryData(XML_WRITEBINARYDATA_ARGS) const
[detail] @@ -45,21 +49,31 @@
[detail]    Q_UNUSED(context)
[detail]    if(!_sig) return;
[detail]    if( !_sig->file() || !_sig->database()->exists() || _sig->database()->isModified()) {
[detail] -    CONST_LOCK_SAMPLES(double, samples, _sig)
[detail] -    s.writeRawData(( const char * ) samples, sizeof(double) * _sig->nSamples());
[detail] -    UNLOCK_SAMPLES(_sig)
[detail] +      CONST_LOCK_SAMPLES(double, samples, _sig->values())
[detail] +      s.writeRawData(( const char * ) samples, sizeof(double) * _sig->size());
[detail] +      UNLOCK_SAMPLES(_sig->values())
[detail]    }
[detail]  }
[detail]  
[detail] +  bool XMLSignal::xml_setAttributes(XML_SETATTRIBUTES_ARGS)
[detail] +  {
[detail] +    TRACE;
[detail] +    if(!_sig) {
[detail] +      _sig=new SignalSegment(GeopsyCoreEngine::instance()->defaultDatabase());
[detail] +      
[detail] +    }
[detail] +    return _sig->xml_setAttributes(attributes, context);
[detail] +  }
[detail] +
[detail]  bool XMLSignal::xml_setBinaryData(XML_SETBINARYDATA_ARGS)
[detail]  {
[detail]    TRACE;
[detail]    Q_UNUSED(context)
[detail] -  if(!_database) {
[detail] -    if(_sig->nSamples()>0) {
[detail] -      LOCK_SAMPLES(double, samples, _sig)
[detail] -      s.readRawData((char *) samples, sizeof(double) * _sig->nSamples());
[detail] -      UNLOCK_SAMPLES(_sig)
[detail] +    if(!_db) {
[detail] +      if(_sig->size()>0) {
[detail] +        LOCK_SAMPLES(double, samples, _sig->values())
[detail] +        s.readRawData((char *) samples, sizeof(double) * _sig->size());
[detail] +        UNLOCK_SAMPLES(_sig->values())
[detail]      }
[detail]    }
[detail]    return true;
[detail] @@ -71,9 +85,14 @@
[detail]    Q_UNUSED(attributes)
[detail]    if(tag=="database") return XMLMember(0);
[detail]    else if(tag=="id") return XMLMember(1);
[detail] +    else if(tag=="samplingPeriod") return XMLMember(2);
[detail] +    else if(tag=="name") return XMLMember(3);
[detail] +    else if(tag=="componen") return XMLMember(4);
[detail]    else {
[detail] -    if(!_sig) _sig=new Signal(GeopsyCoreEngine::instance()->defaultDatabase());
[detail] -    return _sig->xml_member(tag, attributes, context)+4;
[detail] +      if(!_sig) {
[detail] +        _sig=new SignalSegment(GeopsyCoreEngine::instance()->defaultDatabase());
[detail] +      }
[detail] +      return _sig->xml_member(tag, attributes, context)+5;
[detail]    }
[detail]  }
[detail]  
[detail] @@ -84,24 +103,32 @@
[detail]    bool ok=true;
[detail]    switch(memberID) {
[detail]    case 0:
[detail] -    _database=GeopsyCoreEngine::instance()->database(content.toStringBuffer());
[detail] -    if(_database) return true; else return false;
[detail] +      _db=GeopsyCoreEngine::instance()->database(content.toStringBuffer());
[detail] +      if(_db) return true; else return false;
[detail]    case 1:
[detail] -    _id=content.toInt(ok);
[detail] +      return _id.fromString(content, _db->signalIdGenerator());
[detail] +    case 2:
[detail] +      _sig->setSamplingPeriod(content.toDouble(ok));
[detail] +      return ok;
[detail] +    case 3:
[detail] +      _sig->metaData()->setName(content.toStringBuffer());
[detail] +      return true;
[detail] +    case 4:
[detail] +      _sig->metaData()->setComponent(SignalMetaData::standardComponent(content.toStringBuffer(), ok));
[detail]      return ok;
[detail]    default:
[detail]      if(_sig) {
[detail] -      return _sig->xml_setProperty(memberID-4, tag, attributes, content, context);
[detail] +        return _sig->xml_setProperty(memberID-5, tag, attributes, content, context);
[detail]      }
[detail]      return false;
[detail]    }
[detail]  }
[detail]  
[detail] -Signal * XMLSignal::signal() const
[detail] +  SignalSegment * XMLSignal::signal() const
[detail]  {
[detail]    TRACE;
[detail] -  if(_database) {
[detail] -    return _database->signal(_id);
[detail] +    if(_db) {
[detail] +      return _db->signal(_id);
[detail]    } else {
[detail]      return _sig;
[detail]    }
[detail]                 src/XMLSubSignalPool.cpp:  version-4.5.1	modified out of comments
[detail] --- src/XMLSubSignalPool.cpp-version-4.5.1-stripped	2025-09-28 04:01:05.915507405 +0200
[detail] +++ src/XMLSubSignalPool.cpp-HEAD-stripped	2025-09-28 04:01:05.919507425 +0200
[detail] @@ -16,7 +16,7 @@
[detail]    TRACE;
[detail]    int n=subPool.count();
[detail]    for(int i=0; i< n ; i++) {
[detail] -    Signal * sig=subPool.at(i);
[detail] +    SignalSegment * sig=subPool.at(i);
[detail]      _signals.append(new XMLSignal(sig));
[detail]    }
[detail]  }
[detail] @@ -42,13 +42,11 @@
[detail]  void XMLSubSignalPool::xml_writeChildren(XML_WRITECHILDREN_ARGS) const
[detail]  {
[detail]    TRACE;
[detail] -  static const QString key("index");
[detail]    XMLSaveAttributes att;
[detail] -  QString& value=att.add(key);
[detail]    int n=_signals.count();
[detail]    for(int i=0; i< n ; i++ ) {
[detail]      XMLSignal * sig=_signals.at(i);
[detail] -    value=QString::number(i);
[detail] +    sig->signal()->xml_attributes(att, context);
[detail]      sig->xml_save(s, context, att);
[detail]    }
[detail]  }
[detail]                 src/AbstractFileFormat.h:  version-4.5.1	modified out of comments
[detail] --- src/AbstractFileFormat.h-version-4.5.1-stripped	2025-09-28 04:01:05.935507502 +0200
[detail] +++ src/AbstractFileFormat.h-HEAD-stripped	2025-09-28 04:01:05.939507521 +0200
[detail] @@ -11,7 +11,8 @@
[detail]  namespace GeopsyCore {
[detail]  
[detail]    class SignalFile;
[detail] -  class Signal;
[detail] +  class SignalSegment;
[detail] +  class SignalSegment;
[detail]    class SubSignalPool;
[detail]  
[detail]    class GEOPSYCORE_EXPORT AbstractFileFormat: public XMLClass, public SharedObject
[detail] @@ -45,12 +46,12 @@
[detail]      virtual SignalFileFormat::Storage storage() const {return SignalFileFormat::Multi;}
[detail]  
[detail]      virtual bool load(SignalFile * file) const;
[detail] -    virtual bool load(const Signal * sig, double * samples) const;
[detail] +    virtual bool load(const SignalSegment * sig, double * samples) const;
[detail]      virtual bool save(const SubSignalPool& subpool, const QString& filePath) const;
[detail]    protected:
[detail] -    virtual void xml_writeProperties(XML_WRITEPROPERTIES_ARGS) const;
[detail] -    virtual XMLMember xml_member(XML_MEMBER_ARGS);
[detail] -    virtual bool xml_setProperty(XML_SETPROPERTY_ARGS);
[detail] +    void xml_writeProperties(XML_WRITEPROPERTIES_ARGS) const;
[detail] +    XMLMember xml_member(XML_MEMBER_ARGS);
[detail] +    bool xml_setProperty(XML_SETPROPERTY_ARGS);
[detail]    private:
[detail]      QString _name;
[detail]      QString _caption;
[detail]                 src/AbstractSignalFile.h:  version-4.5.1	no last version available
[detail]                src/AbstractSignalGroup.h:  version-4.5.1	modified out of comments
[detail] --- src/AbstractSignalGroup.h-version-4.5.1-stripped	2025-09-28 04:01:05.959507618 +0200
[detail] +++ src/AbstractSignalGroup.h-HEAD-stripped	2025-09-28 04:01:05.963507638 +0200
[detail] @@ -12,7 +12,7 @@
[detail]  
[detail]  namespace GeopsyCore {
[detail]  
[detail] -  class Signal;
[detail] +  class SignalSegment;
[detail]    class SignalDatabase;
[detail]    class SubSignalPool;
[detail]    class MasterSignalGroup;
[detail] @@ -35,8 +35,8 @@
[detail]      QString comments() const {return _comments;}
[detail]      void setComments(const QString& c);
[detail]  
[detail] -    int id() const {return _id;}
[detail] -    void setId(int id);
[detail] +    const UniqueID& id() const {return _id;}
[detail] +    void setId(const UniqueID& id) {_id=id;}
[detail]  
[detail]      bool isModified() const;
[detail]      void setModified(bool m);
[detail] @@ -48,13 +48,13 @@
[detail]      void setTimeRange(const TimeRange& r) {_timeRange=r;}
[detail]  
[detail]      const AbstractSignalGroup * find(QString name) const;
[detail] -    const AbstractSignalGroup * find(int id) const;
[detail] +    const AbstractSignalGroup * find(const UniqueID& id) const;
[detail]      QList<const AbstractSignalGroup *> find(const QRegularExpression& name) const;
[detail]      AbstractSignalGroup * find(QString name);
[detail] -    AbstractSignalGroup * find(int id);
[detail] +    AbstractSignalGroup * find(const UniqueID& id);
[detail]      QList<AbstractSignalGroup *> find(const QRegularExpression& name);
[detail]  
[detail] -    QList<const AbstractSignalGroup *> find(const Signal * sig) const;
[detail] +    QList<const AbstractSignalGroup *> find(const SignalSegment * sig) const;
[detail]      QList<const AbstractSignalGroup *> list() const;
[detail]  
[detail]      virtual bool readOnly() const {return false;}
[detail] @@ -62,13 +62,13 @@
[detail]      virtual bool stored() const {return true;}
[detail]      virtual int signalCount() const;
[detail]      virtual bool hasOwnSignal() const {return false;}
[detail] -    bool contains(const Signal * sig) const;
[detail] -    virtual bool directlyContains(const Signal * sig) const;
[detail] +    bool contains(const SignalSegment * sig) const;
[detail] +    virtual bool directlyContains(const SignalSegment * sig) const;
[detail]      virtual SubSignalPool subPool() const;
[detail]  
[detail] -    virtual bool convertIds(const QHash<int, Signal *>& ids);
[detail] +    virtual bool convertIds(const QHash<UniqueID, SignalSegment *>& ids);
[detail]  
[detail] -    virtual void removeSignal(Signal * sig);
[detail] +    virtual void removeSignal(SignalSegment * sig);
[detail]      virtual void removeAllSignals();
[detail]  
[detail]      virtual const QIcon * icon() const;
[detail] @@ -93,18 +93,16 @@
[detail]      virtual void reportParentAboutToBeChanged(AbstractSignalGroup * g, AbstractSignalGroup * newParent) const;
[detail]      virtual void reportParentChanged(AbstractSignalGroup * g, AbstractSignalGroup * oldParent) const;
[detail]      virtual void reportDataChanged(AbstractSignalGroup * g) const;
[detail] -
[detail] -    int countId(int id, int& newId) const;
[detail]    private:
[detail]      void groupPath(QString& name, QString& subName) const;
[detail]      QString pathNameHelper() const;
[detail]      bool isSameMaster(const AbstractSignalGroup * o) const;
[detail]      void resetModified();
[detail] -    void find(QList<const AbstractSignalGroup *>& groups, const Signal * sig) const;
[detail] +    void find(QList<const AbstractSignalGroup *>& groups, const SignalSegment * sig) const;
[detail]  
[detail]      QString _name;
[detail]      QString _comments;
[detail] -    int _id;
[detail] +    UniqueID _id;
[detail]      bool _modified;
[detail]      TimeRange _timeRange;
[detail]      QString _script;
[detail]              src/AbstractSignalResults.h:  version-4.5.1	not modified
[detail]                       src/AbstractTool.h:  version-4.5.1	not modified
[detail]                  src/AsciiSignalFormat.h:  version-4.5.1	modified out of comments
[detail] --- src/AsciiSignalFormat.h-version-4.5.1-stripped	2025-09-28 04:01:06.011507869 +0200
[detail] +++ src/AsciiSignalFormat.h-HEAD-stripped	2025-09-28 04:01:06.015507889 +0200
[detail] @@ -69,7 +69,7 @@
[detail]    bool parseHeader(const QString& headerText, QAtomicInt * terminate=nullptr);
[detail]    bool readTimeColumn(QByteArray &buffer, int columnCount, int lineNumber);
[detail]    DateTime startTime() const;
[detail] -  void assign(Signal * sig);
[detail] +  void assign(SignalSegment * sig);
[detail]    bool isIgnored(int columnIndex) const;
[detail]  
[detail]    virtual SignalFileFormat::Format format() const {return SignalFileFormat::Ascii;}
[detail]         src/AsciiSignalFormatComponent.h:  version-4.5.1	modified out of comments
[detail] --- src/AsciiSignalFormatComponent.h-version-4.5.1-stripped	2025-09-28 04:01:06.027507947 +0200
[detail] +++ src/AsciiSignalFormatComponent.h-HEAD-stripped	2025-09-28 04:01:06.035507985 +0200
[detail] @@ -5,7 +5,7 @@
[detail]  
[detail]  #include <QtCore>
[detail]  
[detail] -#include "GeoSignal.h"
[detail] +#include "SignalSegment.h"
[detail]  #include "GeopsyCoreDLLExport.h"
[detail]  
[detail]  namespace GeopsyCore {
[detail] @@ -21,15 +21,15 @@
[detail]    const QString& pattern() const {return _pattern;}
[detail]    void setPattern(const QString& p) {_pattern=p;}
[detail]  
[detail] -  Signal::Components component() const {return _component;}
[detail] -  void setComponent(Signal::Components c) {_component=c;}
[detail] +  SignalMetaData::Components component() const {return _component;}
[detail] +  void setComponent(SignalMetaData::Components c) {_component=c;}
[detail]  protected:
[detail]    void xml_writeProperties(XML_WRITEPROPERTIES_ARGS) const;
[detail]    XMLMember xml_member(XML_MEMBER_ARGS);
[detail]    bool xml_setProperty(XML_SETPROPERTY_ARGS);
[detail]  private:
[detail]    QString _pattern;
[detail] -  Signal::Components _component;
[detail] +  SignalMetaData::Components _component;
[detail]  };
[detail]  
[detail]  } 
[detail]            src/AsciiSignalFormatReader.h:  version-4.5.1	not modified
[detail]              src/AsciiSignalFormatRule.h:  version-4.5.1	modified out of comments
[detail] --- src/AsciiSignalFormatRule.h-version-4.5.1-stripped	2025-09-28 04:01:06.067508140 +0200
[detail] +++ src/AsciiSignalFormatRule.h-HEAD-stripped	2025-09-28 04:01:06.071508160 +0200
[detail] @@ -5,7 +5,7 @@
[detail]  
[detail]  #include <QGpCoreTools.h>
[detail]  
[detail] -#include "GeoSignal.h"
[detail] +#include "SignalSegment.h"
[detail]  #include "GeopsyCoreDLLExport.h"
[detail]  
[detail]  namespace GeopsyCore {
[detail]                src/ChebyshevType1Cache.h:  version-4.5.1	no last version available
[detail]                        src/CityScanner.h:  version-4.5.1	not modified
[detail]                         src/CitySignal.h:  version-4.5.1	not modified
[detail]                           src/Comments.h:  version-4.5.1	modified out of comments
[detail] --- src/Comments.h-version-4.5.1-stripped	2025-09-28 04:01:06.127508430 +0200
[detail] +++ src/Comments.h-HEAD-stripped	2025-09-28 04:01:06.131508450 +0200
[detail] @@ -19,6 +19,8 @@
[detail]      QString name(int, const QString&) const;
[detail]      QString baseName(int) const;
[detail]      QString title(int, const QString&) const;
[detail] +
[detail] +    bool isMultiLine(int) const {return true;}
[detail]    };
[detail]  
[detail]  } 
[detail]         src/CompatibilityTimeReference.h:  version-4.5.1	modified out of comments
[detail] --- src/CompatibilityTimeReference.h-version-4.5.1-stripped	2025-09-28 04:01:06.147508526 +0200
[detail] +++ src/CompatibilityTimeReference.h-HEAD-stripped	2025-09-28 04:01:06.151508546 +0200
[detail] @@ -17,9 +17,9 @@
[detail]      CompatibilityTimeReference(const DateTime& t) {_timeReference=t; _t0=0.0;}
[detail]      CompatibilityTimeReference(double t) {_t0=t;}
[detail]  
[detail] -    virtual bool operator==(const MetaData& o) const;
[detail] -    virtual void operator=(const MetaData& o);
[detail] -    virtual int compare(int, const QString&, const MetaData&) const {return 0;}
[detail] +    bool operator==(const MetaData& o) const;
[detail] +    void operator=(const MetaData& o);
[detail] +    int compare(int, const QString&, const MetaData&) const {return 0;}
[detail]  
[detail]      void setTimeReference(const DateTime& t) {_timeReference=t;}
[detail]      const DateTime& timeReference() const {return _timeReference;}
[detail] @@ -29,10 +29,12 @@
[detail]  
[detail]      DateTime startTime() const;
[detail]  
[detail] -    virtual QStringList subNames() const;
[detail] -    virtual QString name(int, const QString&) const;
[detail] -    virtual QString baseName(int) const;
[detail] -    virtual QString title(int, const QString&) const;
[detail] +    QStringList subNames() const;
[detail] +    QString name(int, const QString&) const;
[detail] +    QString baseName(int) const;
[detail] +    QString title(int, const QString&) const;
[detail] +
[detail] +    size_t hash() const {return qHash(_timeReference)+::qHash(_t0);}
[detail]    private:
[detail]      DateTime _timeReference;
[detail]      double _t0;
[detail]                      src/ComplexSignal.h:  version-4.5.1	not modified
[detail]                  src/CoreToolInterface.h:  version-4.5.1	modified out of comments
[detail] --- src/CoreToolInterface.h-version-4.5.1-stripped	2025-09-28 04:01:06.179508681 +0200
[detail] +++ src/CoreToolInterface.h-HEAD-stripped	2025-09-28 04:01:06.183508701 +0200
[detail] @@ -35,7 +35,7 @@
[detail]      static void setTool(AbstractTool * tool) {_tool=tool;}
[detail]    private:
[detail]      bool fixDatabasePaths(QString databaseFileName);
[detail] -    bool setUtmCoordinates(const QString& utmCoordinateFile);
[detail] +    bool setUtmCoordinates(const QStringList& utmCoordinateFiles);
[detail]      static void showProgress(int);
[detail]      static void stopAndSave(int);
[detail]  
[detail] @@ -44,7 +44,7 @@
[detail]      QString _outputBaseName;
[detail]      QStringList _stationList;
[detail]      static AbstractTool * _tool;
[detail] -    bool _overwrite;
[detail] +    bool _overwrite, _oneProcess;
[detail]    };
[detail]  
[detail]  } 
[detail]                  src/CustomFileFormats.h:  version-4.5.1	not modified
[detail]                 src/DefaultSignalGroup.h:  version-4.5.1	modified out of comments
[detail] --- src/DefaultSignalGroup.h-version-4.5.1-stripped	2025-09-28 04:01:06.219508875 +0200
[detail] +++ src/DefaultSignalGroup.h-HEAD-stripped	2025-09-28 04:01:06.223508894 +0200
[detail] @@ -23,8 +23,8 @@
[detail]      virtual bool hasOwnSignal() const {return true;}
[detail]      virtual bool stored() const {return false;}
[detail]      virtual bool contains(int) const {return false;}
[detail] -    virtual bool convertIds(const QHash<int, Signal *>&) {return true;}
[detail] -    virtual void removeSignal(Signal *) {}
[detail] +    virtual bool convertIds(const QHash<int, SignalSegment *>&) {return true;}
[detail] +    virtual void removeSignal(SignalSegment *) {}
[detail]    protected:
[detail]      void xml_writeProperties(XML_WRITEPROPERTIES_ARGS) const;
[detail]      void xml_writeChildren(XML_WRITECHILDREN_ARGS) const;
[detail]                  src/DeviceCardScanner.h:  version-4.5.1	not modified
[detail]                       src/DoubleSignal.h:  version-4.5.1	modified out of comments
[detail] --- src/DoubleSignal.h-version-4.5.1-stripped	2025-09-28 04:01:06.255509048 +0200
[detail] +++ src/DoubleSignal.h-HEAD-stripped	2025-09-28 04:01:06.259509068 +0200
[detail] @@ -27,10 +27,6 @@
[detail]      DoubleSignal(int n);
[detail]      DoubleSignal(const DoubleSignal& o);
[detail]  
[detail] -    void lockProperties() const {_propertiesMutex.lockForWrite();}
[detail] -    void constLockProperties() const {_propertiesMutex.lockForRead();}
[detail] -    void unlockProperies() const {_propertiesMutex.unlock();}
[detail] -
[detail]      
[detail]      double samplingPeriod() const {return _samplingPeriod;}
[detail]      virtual void setSamplingPeriod(double newval) {_samplingPeriod=newval;}
[detail] @@ -51,7 +47,8 @@
[detail]      Curve<Point2D> spectrumAmplitudeCurve() const;
[detail]      int add(const DoubleSignal * sig, double sigStart, double thisStart,
[detail]              double tToCopy, bool checkInvalid=false, double invalidValue=std::numeric_limits<double>::infinity());
[detail] -    int add(const DoubleSignal * sig);
[detail] +    void add(const DoubleSignal * sig);
[detail] +    void add(const DoubleSignal * sig, double factor);
[detail]  
[detail]      
[detail]      void fastFourierTransform(SignalType st);
[detail] @@ -63,7 +60,7 @@
[detail]  
[detail]      bool subtractValue(double val=0.0);
[detail]      bool filter(const FilterParameters& param);
[detail] -    bool whiten();
[detail] +    bool whiten(double fmin, double fmax, double apodization);
[detail]      bool stddevClip(double factor);
[detail]      bool agc(double width);
[detail]      bool taper(double start, double end, const WindowFunctionParameters& param);
[detail] @@ -80,6 +77,8 @@
[detail]      bool multiply(double value) {return SignalTemplate<double>::multiply(value);}
[detail]      bool multiply(const Complex& value);
[detail]      bool random(double maxAmplitude, Random * generator=nullptr);
[detail] +    bool derivate();
[detail] +    bool integrate();
[detail]  
[detail]      bool discreteFourierTransform();
[detail]      Complex discreteFourierTransform(const FourierPlan& plan) const;
[detail] @@ -95,9 +94,13 @@
[detail]      void stalta(double tsta, double tlta, DoubleSignal * ratio) const;
[detail]      void staltaToKeep(const WindowingParameters::ShortLongTermAverage& param, KeepSignal * keep, double delay) const;
[detail]      void clipMaxToKeep(double value, KeepSignal * keep, double delay) const;
[detail] +    static double correlationOptimumMaximumDelay(double maximumDelay, int n1, int n2,
[detail] +                                                 double sampFreq, int maxPrimeFactor=11);
[detail]      bool correlation(const DoubleSignal * s1, const DoubleSignal * s2, double maxDelay);
[detail]      bool normalizedCorrelation(const DoubleSignal * s1, const DoubleSignal * s2, double maxDelay);
[detail] +    bool normalizeCorrelation(const DoubleSignal * s1, const DoubleSignal * s2);
[detail]      bool timeCorrelation(const DoubleSignal * s1, const DoubleSignal * s2, double maxDelay);
[detail] +    bool correlation(const DoubleSignal * s1, const DoubleSignal * s2);
[detail]      double correlation(const DoubleSignal * sig, double sigStart, double thisStart, double length) const;
[detail]      bool convolution(const DoubleSignal * s1, const DoubleSignal * s2);
[detail]      bool removeInstrumentalResponse(const InstrumentalResponse& sensor);
[detail] @@ -128,14 +131,11 @@
[detail]      void debugPrint() const;
[detail]      void debugSave(const QString& fileName) const;
[detail]    protected:
[detail] -    mutable ReadWriteLock _propertiesMutex;
[detail]      double _samplingPeriod;
[detail]      SignalType _type;
[detail]      int _nyquistIndex;
[detail]    private:
[detail]      bool correlationCheck(const DoubleSignal * s1, const DoubleSignal * s2, double& maxDelay);
[detail] -    bool correlationProcess(const DoubleSignal * s1, const DoubleSignal * s2,
[detail] -                            DoubleSignal * s1t, DoubleSignal * s2t);
[detail]      bool correlationNormalization(const DoubleSignal * s, DoubleSignal * norm) const;
[detail]  
[detail]      static void filb3(double fc, int ak, double pas, double *a, double *b);
[detail]                      src/DuplicateRays.h:  version-4.5.1	modified out of comments
[detail] --- src/DuplicateRays.h-version-4.5.1-stripped	2025-09-28 04:01:06.275509145 +0200
[detail] +++ src/DuplicateRays.h-HEAD-stripped	2025-09-28 04:01:06.279509164 +0200
[detail] @@ -16,26 +16,28 @@
[detail]    DuplicateRays() {_rays=0;}
[detail]    ~DuplicateRays() {delete _rays;}
[detail]  
[detail] -  virtual bool operator==(const MetaData& o) const;
[detail] -  virtual void operator=(const MetaData&) {}
[detail] +  bool operator==(const MetaData& o) const;
[detail] +  void operator=(const MetaData&) {}
[detail]  
[detail] -  void addRay(Signal * sig);
[detail] +  void addRay(SignalSegment * sig);
[detail]    const SubSignalPool& rays() const {return *_rays;}
[detail]  
[detail] -  virtual bool isStored() const {return false;}
[detail] -  virtual bool isReadOnly(int) const {return true;}
[detail] +  bool isStored() const {return false;}
[detail] +  bool isReadOnly(int) const {return true;}
[detail]  
[detail] -  virtual QStringList subNames() const;
[detail] -  virtual QStringList indexList(int subId) const;
[detail] -  virtual bool isArray(int subId) const;
[detail] -  virtual int count(int subId) const;
[detail] -  virtual bool hasIndex(int subId) const;
[detail] -  virtual bool hasIndex(int subId, const QString& index) const;
[detail] -  virtual QString name(int subId, const QString& index) const;
[detail] -  virtual QString baseName(int subId) const;
[detail] -  virtual QString title(int subId, const QString& index) const;
[detail] -  virtual QVariant data(int subId, const QString& index) const;
[detail] -  virtual int compare(int subId, const QString& index, const MetaData& o) const;
[detail] +  QStringList subNames() const;
[detail] +  QStringList indexList(int subId) const;
[detail] +  bool isArray(int subId) const;
[detail] +  int count(int subId) const;
[detail] +  bool hasIndex(int subId) const;
[detail] +  bool hasIndex(int subId, const QString& index) const;
[detail] +  QString name(int subId, const QString& index) const;
[detail] +  QString baseName(int subId) const;
[detail] +  QString title(int subId, const QString& index) const;
[detail] +  QVariant data(int subId, const QString& index) const;
[detail] +  int compare(int subId, const QString& index, const MetaData& o) const;
[detail] +
[detail] +  size_t hash() const {return 0;}
[detail]  private:
[detail]    DateTime average(const QString& name) const;
[detail]    double standardDeviation(const QString& name) const;
[detail]                      src/DynamicSignal.h:  version-4.5.1	modified out of comments
[detail] --- src/DynamicSignal.h-version-4.5.1-stripped	2025-09-28 04:01:06.299509261 +0200
[detail] +++ src/DynamicSignal.h-HEAD-stripped	2025-09-28 04:01:06.303509281 +0200
[detail] @@ -3,27 +3,27 @@
[detail]  #ifndef DYNAMICSIGNAL_H
[detail]  #define DYNAMICSIGNAL_H
[detail]  
[detail] -#include "GeoSignal.h"
[detail] +#include "StoredSignal.h"
[detail]  #include "GeopsyCoreDLLExport.h"
[detail]  
[detail]  namespace GeopsyCore {
[detail]  
[detail] -class GEOPSYCORE_EXPORT DynamicSignal : public Signal
[detail] +class GEOPSYCORE_EXPORT DynamicSignal : public StoredSignal
[detail]  {
[detail]    TRANSLATIONS("DynamicSignal")
[detail]  public:
[detail] -  DynamicSignal(SignalDatabase * db) : Signal(db) {_maxNSamples=0; _startTimeShift=0;}
[detail] +  DynamicSignal(SignalSegment * segment);
[detail]    ~DynamicSignal();
[detail]  
[detail]    void shiftStartTime(int nSamples);
[detail]  
[detail]    void set(const DateTime& t, const int * samples, int nSamples);
[detail]    void set(const DateTime& t, const double * samples, int nSamples);
[detail] -  virtual qint64 dataSize() const {return _maxNSamples*static_cast<qint64>(sizeof(double));}
[detail] -  virtual void setNSamples(int n);
[detail] +
[detail] +  qint64 dataSize() const {return _maxNSamples*static_cast<qint64>(sizeof(double));}
[detail]  private:
[detail] -  virtual bool allocate() const;
[detail] -  virtual void free() const;
[detail] +  bool allocate() const;
[detail] +  void free() const;
[detail]    template <class sampleType> inline void set(const DateTime& t, const sampleType * samples, int nSamples);
[detail]  private:
[detail]    int _maxNSamples;
[detail]                          src/FFTWCache.h:  version-4.5.1	modified out of comments
[detail] --- src/FFTWCache.h-version-4.5.1-stripped	2025-09-28 04:01:06.319509358 +0200
[detail] +++ src/FFTWCache.h-HEAD-stripped	2025-09-28 04:01:06.323509378 +0200
[detail] @@ -15,26 +15,27 @@
[detail]    {
[detail]      DECLARE_NUMERICALKEY(FFTWKey)
[detail]    public:
[detail] -    enum Direction{R2HC=1, HC2R=2};
[detail] +    enum Type {RealToHalfComplex, HalfComplexToReal, ForwardComplex, BackwardComplex};
[detail] +    ENUM_AS_STRING_DECL(Type)
[detail]  
[detail] -    FFTWKey(int nSamples, Direction direction) {
[detail] +    FFTWKey(int nSamples, Type type) {
[detail]        _nSamples=nSamples;
[detail] -      _direction=direction;
[detail] +      _type=type;
[detail]      }
[detail]  
[detail] -    virtual bool operator==(const AbstractNumericalKey& o) {
[detail] +    bool operator==(const AbstractNumericalKey& o) {
[detail]        const FFTWKey& fo=static_cast<const FFTWKey&>(o);
[detail] -      return _nSamples==fo._nSamples;
[detail] +      return _nSamples==fo._nSamples && _type==fo._type;
[detail]      }
[detail] -    virtual int hash() const {return 2*_nSamples+(_direction-1);}
[detail] -    inline virtual AbstractNumericalCache * createCache();
[detail] +    size_t hash() const {return (_nSamples << 2)+_type;}
[detail] +    inline AbstractNumericalCache * createCache();
[detail]  
[detail]      int nSamples() const {return _nSamples;}
[detail] -    Direction direction() const {return _direction;}
[detail] +    Type type() const {return _type;}
[detail]    private:
[detail]      Thread * _thread;
[detail]      int _nSamples;
[detail] -    Direction _direction;
[detail] +    Type _type;
[detail]    };
[detail]  
[detail]    class GEOPSYCORE_EXPORT FFTWCache : public AbstractNumericalCache
[detail] @@ -43,21 +44,26 @@
[detail]      FFTWCache(FFTWKey * key);
[detail]      ~FFTWCache();
[detail]  
[detail] -    static inline const FFTWCache * begin(int nSamples, FFTWKey::Direction direction);
[detail] -    virtual void init();
[detail] -    virtual bool inherits(const char * className);
[detail] +    static inline const FFTWCache * begin(int nSamples, FFTWKey::Type type);
[detail] +    void init();
[detail] +    bool inherits(const char * className);
[detail]  
[detail]      void execute(double * samples) const;
[detail] +    void execute(Complex * samples) const;
[detail]    private:
[detail] -    mutable DoubleSignal _fft;
[detail] +    FFTWKey::Type _type;
[detail] +    union {
[detail] +      DoubleSignal * _fftReal;
[detail] +      ComplexSignal * _fftComplex;
[detail] +    };
[detail]      fftw_plan _plan;
[detail]      static Mutex _plannerMutex;
[detail]    };
[detail]  
[detail] -  inline const FFTWCache * FFTWCache::begin(int nSamples, FFTWKey::Direction direction)
[detail] +  inline const FFTWCache * FFTWCache::begin(int nSamples, FFTWKey::Type type)
[detail]    {
[detail]      return static_cast<const FFTWCache *>(
[detail] -        AbstractNumericalCache::begin(new FFTWKey(nSamples, direction)));
[detail] +        AbstractNumericalCache::begin(new FFTWKey(nSamples, type)));
[detail]    }
[detail]  
[detail]    inline AbstractNumericalCache * FFTWKey::createCache()
[detail]        src/FastPartialFourierTransform.h:  version-4.5.1	modified out of comments
[detail] --- src/FastPartialFourierTransform.h-version-4.5.1-stripped	2025-09-28 04:01:06.339509454 +0200
[detail] +++ src/FastPartialFourierTransform.h-HEAD-stripped	2025-09-28 04:01:06.343509474 +0200
[detail] @@ -31,7 +31,7 @@
[detail]             _startIndex==mo._startIndex &&
[detail]             _direction==mo._direction;
[detail]    }
[detail] -  virtual int hash() const {return (int)floor(1.0/_deltaT)+_nInSamples+_mOutSamples+_startIndex+_direction;}
[detail] +  size_t hash() const {return qFloor(1.0/_deltaT)+_nInSamples+_mOutSamples+_startIndex+_direction;}
[detail]    inline virtual AbstractNumericalCache * createCache();
[detail]    inline virtual int byteCount() const;
[detail]  
[detail]                   src/FilterParameters.h:  version-4.5.1	modified out of comments
[detail] --- src/FilterParameters.h-version-4.5.1-stripped	2025-09-28 04:01:06.359509551 +0200
[detail] +++ src/FilterParameters.h-HEAD-stripped	2025-09-28 04:01:06.363509570 +0200
[detail] @@ -9,44 +9,150 @@
[detail]  
[detail]  namespace GeopsyCore {
[detail]  
[detail] +  class GEOPSYCORE_EXPORT ButterworthParameters: public AbstractParameters
[detail] +  {
[detail] +  public:
[detail] +    ButterworthParameters();
[detail] +    ButterworthParameters(const ButterworthParameters& o);
[detail] +
[detail] +    void operator=(const ButterworthParameters& o);
[detail] +    AbstractParameters * clone() const {return new ButterworthParameters(*this);}
[detail] +
[detail] +    void setMinimumFrequency(double f) {_fmin=f;}
[detail] +    double minimumFrequency() const {return _fmin;}
[detail] +
[detail] +    void setMaximumFrequency(double f) {_fmax=f;}
[detail] +    double maximumFrequency() const {return _fmax;}
[detail] +
[detail] +    void setOrder(int o) {_order=causal() ? abs(o) : -abs(o);}
[detail] +    int order() const {return _order;}
[detail] +
[detail] +    void setCausal(bool c) {_order=c ? abs(_order) : -abs(_order);}
[detail] +    bool causal() const {return _order>0;}
[detail] +
[detail] +    QString toString(PARAMETERS_TOSTRING_ARGS_DECL) const;
[detail] +    void collectKeywords(PARAMETERS_COLLECTKEYWORDS_ARGS);
[detail] +    int totalKeywordCount(PARAMETERS_TOTALKEYWORDCOUNT_ARGS) const;
[detail] +  protected:
[detail] +    int keywordCount(PARAMETERS_KEYWORDCOUNT_ARGS) const;
[detail] +    bool setValue(PARAMETERS_SETVALUE_ARGS);
[detail] +  private:
[detail] +    int _order;
[detail] +    double _fmin, _fmax;
[detail] +  };
[detail] +
[detail] +
[detail] +  class GEOPSYCORE_EXPORT FrequencyWindowParameters: public AbstractParameters
[detail] +  {
[detail] +  public:
[detail] +    FrequencyWindowParameters();
[detail] +    FrequencyWindowParameters(const FrequencyWindowParameters& o);
[detail] +
[detail] +    void operator=(const FrequencyWindowParameters& o);
[detail] +    AbstractParameters * clone() const {return new FrequencyWindowParameters(*this);}
[detail] +
[detail] +    void setMinimumFrequency(double f) {_fmin=f;}
[detail] +    double minimumFrequency() const {return _fmin;}
[detail] +
[detail] +    void setMaximumFrequency(double f) {_fmax=f;}
[detail] +    double maximumFrequency() const {return _fmax;}
[detail] +
[detail] +    WindowFunctionParameters& window() {return _window;}
[detail] +    const WindowFunctionParameters& window() const {return _window;}
[detail] +
[detail] +    void setWidth(double w) {_width=w;}
[detail] +    double width() const {return _width;}
[detail] +
[detail] +    QString toString(PARAMETERS_TOSTRING_ARGS_DECL) const;
[detail] +    void setVersion(PARAMETERS_SETVERSION_ARGS);
[detail] +    void collectKeywords(PARAMETERS_COLLECTKEYWORDS_ARGS);
[detail] +    int totalKeywordCount(PARAMETERS_TOTALKEYWORDCOUNT_ARGS) const;
[detail] +  protected:
[detail] +    int keywordCount(PARAMETERS_KEYWORDCOUNT_ARGS) const;
[detail] +    bool setValue(PARAMETERS_SETVALUE_ARGS);
[detail] +  private:
[detail] +    WindowFunctionParameters _window;
[detail] +    double _width;
[detail] +    double _fmin, _fmax;
[detail] +  };
[detail] +
[detail] +  class GEOPSYCORE_EXPORT ChebyshevParameters: public AbstractParameters
[detail] +  {
[detail] +  public:
[detail] +    ChebyshevParameters();
[detail] +    ChebyshevParameters(const ChebyshevParameters& o);
[detail] +
[detail] +    void operator=(const ChebyshevParameters& o);
[detail] +    AbstractParameters * clone() const {return new ChebyshevParameters(*this);}
[detail] +
[detail] +    void setMinimumFrequencyPass(double f) {_fminPass=f;}
[detail] +    double minimumFrequencyPass() const {return _fminPass;}
[detail] +
[detail] +    void setMaximumFrequencyPass(double f) {_fmaxPass=f;}
[detail] +    double maximumFrequencyPass() const {return _fmaxPass;}
[detail] +
[detail] +    void setMinimumFrequencyStop(double f) {_fminStop=f;}
[detail] +    double minimumFrequencyStop() const {return _fminStop;}
[detail] +
[detail] +    void setMaximumFrequencyStop(double f) {_fmaxStop=f;}
[detail] +    double maximumFrequencyStop() const {return _fmaxStop;}
[detail] +
[detail] +    void setMaximumLossPass(double l) {_maxLossPass=l;}
[detail] +    double maximumLossPass() const {return _maxLossPass;}
[detail] +
[detail] +    void setMinimumAttenuationStop(double a) {_minAttenuationStop=a;}
[detail] +    double minimumAttenuationStop() const {return _minAttenuationStop;}
[detail] +
[detail] +    void setMaximumRipple(double r) {_maxRipple=r;}
[detail] +    double maximumRipple() const {return _maxRipple;}
[detail] +
[detail] +    bool operator==(const ChebyshevParameters& o) const;
[detail] +    size_t hash() const;
[detail] +
[detail] +    QString toString(PARAMETERS_TOSTRING_ARGS_DECL) const;
[detail] +    void collectKeywords(PARAMETERS_COLLECTKEYWORDS_ARGS);
[detail] +  protected:
[detail] +    int keywordCount(PARAMETERS_KEYWORDCOUNT_ARGS) const;
[detail] +    bool setValue(PARAMETERS_SETVALUE_ARGS);
[detail] +  private:
[detail] +    double _fminPass, _fmaxPass, _fminStop, _fmaxStop;
[detail] +    double _maxLossPass, _minAttenuationStop;
[detail] +    double _maxRipple;
[detail] +  };
[detail] +
[detail] +
[detail]  class GEOPSYCORE_EXPORT FilterParameters: public AbstractParameters
[detail]  {
[detail]  public:
[detail]    FilterParameters();
[detail]    FilterParameters(const FilterParameters& o);
[detail] +    ~FilterParameters();
[detail]  
[detail]    void operator=(const FilterParameters& o);
[detail]    AbstractParameters * clone() const {return new FilterParameters(*this);}
[detail]  
[detail] -  enum Band {LowPass, HighPass, BandPass, BandReject};
[detail] -  enum Method {Butterworth, FrequencyWindow};
[detail] +    enum Band {LowPass, HighPass, BandPass, BandStop};
[detail] +    enum Method {Butterworth, ChebyshevType1, FrequencyWindow};
[detail]    ENUM_AS_STRING_DECL(Band)
[detail]    ENUM_AS_STRING_DECL(Method)
[detail]  
[detail] -  void setFrequencyRange(double min, double max=0.0);
[detail] -  double minimumFrequency() const {return _fmin;}
[detail] -  double maximumFrequency() const {return _fmax;}
[detail] -
[detail]    Band band() const {return _band;}
[detail]    void setBand(Band b);
[detail]  
[detail]    Method method() const {return _method;}
[detail] -  void setMethod(Method m) {_method=m;}
[detail] +    void setMethod(Method m);
[detail]  
[detail] -  int order() const {return _order;}
[detail] -  void setOrder(int o) {if(::abs(o)<16777216) _order=o;}
[detail] -
[detail] -  double rippleFactor() const {return _rippleFactor;}
[detail] -  void setRippleFactor(double rf) {_rippleFactor=rf;}
[detail] +    ButterworthParameters& butterworth() {return _butterworth;}
[detail] +    const ButterworthParameters& butterworth() const {return _butterworth;}
[detail]  
[detail] -  bool causal() const {return _order>0;}
[detail] -  void setCausal(bool s) {_order=(s ? ::abs(_order) : -::abs(_order));}
[detail] +    FrequencyWindowParameters& frequencyWindow() {return _frequencyWindow;}
[detail] +    const FrequencyWindowParameters& frequencyWindow() const {return _frequencyWindow;}
[detail]  
[detail] -  const WindowFunctionParameters& frequencyWindow() const {return _window;}
[detail] -  WindowFunctionParameters& frequencyWindow() {return _window;}
[detail] +    ChebyshevParameters& chebyshevType1() {return _chebyshev;}
[detail] +    const ChebyshevParameters& chebyshevType1() const {return _chebyshev;}
[detail]  
[detail] -  double width() const {return _width;}
[detail] -  void setWidth(double w) {_width=w;}
[detail] +    double minimumFrequency() const;
[detail] +    double maximumFrequency() const;
[detail]  
[detail]    QString toString(PARAMETERS_TOSTRING_ARGS_DECL) const;
[detail]    void setVersion(PARAMETERS_SETVERSION_ARGS);
[detail] @@ -58,11 +164,10 @@
[detail]  private:
[detail]    Band _band;
[detail]    Method _method;
[detail] -  WindowFunctionParameters _window; 
[detail] -  int _order;                       
[detail] -  double _rippleFactor;             
[detail] -  double _width;
[detail] -  double _fmin, _fmax;
[detail] +
[detail] +    ButterworthParameters _butterworth;
[detail] +    FrequencyWindowParameters _frequencyWindow;
[detail] +    ChebyshevParameters _chebyshev;
[detail]  };
[detail]  
[detail]  } 
[detail]                        src/FourierPlan.h:  version-4.5.1	modified out of comments
[detail] --- src/FourierPlan.h-version-4.5.1-stripped	2025-09-28 04:01:06.379509647 +0200
[detail] +++ src/FourierPlan.h-HEAD-stripped	2025-09-28 04:01:06.383509667 +0200
[detail] @@ -15,12 +15,13 @@
[detail]      FourierPlan(int n, double samplingPeriod, double frequency);
[detail]  
[detail]      int count() const {return _n;}
[detail] +    double samplingPeriod() const {return _samplingPeriod;}
[detail]      double frequency() const {return _frequency;}
[detail]      inline Complex dtft(const double * samples) const;
[detail] -    bool test(double samplingPeriod);
[detail] +    bool test();
[detail]    private:
[detail]      int _n;
[detail] -    double _frequency;
[detail] +    double _samplingPeriod, _frequency;
[detail]      TwiddleFactors _base;
[detail]    };
[detail]  
[detail]                   src/GeopsyCoreEngine.h:  version-4.5.1	modified out of comments
[detail] --- src/GeopsyCoreEngine.h-version-4.5.1-stripped	2025-09-28 04:01:06.403509763 +0200
[detail] +++ src/GeopsyCoreEngine.h-HEAD-stripped	2025-09-28 04:01:06.407509783 +0200
[detail] @@ -16,6 +16,7 @@
[detail]    class GeopsyPreferences;
[detail]    class CustomFileFormats;
[detail]    class SubSignalPool;
[detail] +  class SignalSegment;
[detail]  
[detail]    class GEOPSYCORE_EXPORT GeopsyCoreEngine : public GlobalObject
[detail]    {
[detail] @@ -29,8 +30,11 @@
[detail]      virtual void beginAddFile(SignalDatabase * db) {Q_UNUSED(db)}
[detail]      virtual void endAddFile(SignalDatabase * db) {Q_UNUSED(db)}
[detail]  
[detail] -    virtual void beginSignalChange(Signal * sig) {Q_UNUSED(sig)}
[detail] -    virtual void endSignalChange(Signal * sig) {Q_UNUSED(sig)}
[detail] +    virtual void beginRemoveFile(SignalDatabase * db, int index) {Q_UNUSED(db); Q_UNUSED(index)}
[detail] +    virtual void endRemoveFile(SignalDatabase * db) {Q_UNUSED(db)}
[detail] +
[detail] +    virtual void beginSignalChange(SignalSegment * sig) {Q_UNUSED(sig)}
[detail] +    virtual void endSignalChange(SignalSegment * sig) {Q_UNUSED(sig)}
[detail]  
[detail]      virtual void beginSignalChange(SignalDatabase * db) {Q_UNUSED(db)}
[detail]      virtual void endSignalChange(SignalDatabase * db) {Q_UNUSED(db)}
[detail] @@ -47,11 +51,13 @@
[detail]  
[detail]      void setConsoleProgress(bool s);
[detail]      virtual bool useProgress() {return _progress;}
[detail] +    virtual void setProgressCaption(SignalDatabase * db, const QString& caption);
[detail]      virtual void setProgressMaximum(SignalDatabase *, int val);
[detail]      virtual int progressMaximum(SignalDatabase *) {if(_progress) return _progress->maximum(); else return 0;}
[detail]      virtual void setProgressValue(SignalDatabase *, int val) {if(_progress) _progress->setValue(val);}
[detail]      virtual int progressValue(SignalDatabase *) {if(_progress) return _progress->value(); else return 0;}
[detail]      virtual void increaseProgressValue(SignalDatabase *, int val=1) {if(_progress) _progress->increaseValue(val);}
[detail] +    virtual void progressEnd(SignalDatabase *, int val) {if(_progress) _progress->end(val);}
[detail]      virtual void showMessage(SignalDatabase *, QString s);
[detail]  
[detail]      virtual void newSignalViewer(const SubSignalPool& subPool, bool force);
[detail]                src/GeopsyCoreInterface.h:  version-4.5.1	not modified
[detail]               src/GeopsyPluginSettings.h:  version-4.5.1	not modified
[detail]                      src/GeopsyPlugins.h:  version-4.5.1	not modified
[detail]                  src/GeopsyPreferences.h:  version-4.5.1	not modified
[detail]                 src/GeopsySignalHeader.h:  version-4.5.1	not modified
[detail]                                src/Gse.h:  version-4.5.1	not modified
[detail]              src/GuralpCompressedBlock.h:  version-4.5.1	modified out of comments
[detail] --- src/GuralpCompressedBlock.h-version-4.5.1-stripped	2025-09-28 04:01:06.515510306 +0200
[detail] +++ src/GuralpCompressedBlock.h-HEAD-stripped	2025-09-28 04:01:06.519510324 +0200
[detail] @@ -7,7 +7,7 @@
[detail]  
[detail]  #include "GeopsyCoreDLLExport.h"
[detail]  #include "TimeRange.h"
[detail] -#include "GeoSignal.h"
[detail] +#include "SignalMetaData.h"
[detail]  
[detail]  namespace GeopsyCore {
[detail]  
[detail] @@ -38,7 +38,7 @@
[detail]      QString name() const {return _device;}
[detail]      DateTime startTime() const {return _startTime;}
[detail]      TimeRange timeRange() const;
[detail] -    Signal::Components component() const;
[detail] +    SignalMetaData::Components component() const;
[detail]      bool isData() const {return _component!='0' && _component!='I';}
[detail]      int compressionCode() {return _compressionCode;}
[detail]      int sample(int index) const {return _samples[index];}
[detail]                      src/GuralpRecords.h:  version-4.5.1	modified out of comments
[detail] --- src/GuralpRecords.h-version-4.5.1-stripped	2025-09-28 04:01:06.535510402 +0200
[detail] +++ src/GuralpRecords.h-HEAD-stripped	2025-09-28 04:01:06.539510421 +0200
[detail] @@ -14,23 +14,24 @@
[detail]    public:
[detail]      GuralpRecords() {}
[detail]  
[detail] -    virtual bool operator==(const MetaData& o) const {
[detail] +    bool operator==(const MetaData& o) const {
[detail]        return _records==reinterpret_cast<const GuralpRecords&>(o)._records;
[detail]      }
[detail] -    virtual int compare(int, const QString&, const MetaData&) const {return 0;}
[detail] -    virtual void operator=(const MetaData&) {}
[detail] +    int compare(int, const QString&, const MetaData&) const {return 0;}
[detail] +    void operator=(const MetaData& o);
[detail]  
[detail] -    virtual bool copyAllowed() const {return false;}
[detail] -    virtual bool isArray(int) const {return false;}
[detail] +    bool isArray(int) const {return false;}
[detail]  
[detail] -    virtual QString toString(const QString&) const;
[detail] -    virtual bool fromString(const QString& , QString string);
[detail] +    QString toString(const QString&) const;
[detail] +    bool fromString(const QString& , QString string);
[detail]  
[detail]      void add(quint64 pos) {_records.append(pos);}
[detail]  
[detail]      quint64 pos(int index) const {return _records[index];}
[detail]      bool isArray(int) {return true;}
[detail]      int count(int) const {return _records.count();}
[detail] +
[detail] +    size_t hash() const {return qHash(_records);}
[detail]    private:
[detail]      VectorList<quint64> _records;
[detail]    };
[detail]                       src/GuralpSignal.h:  version-4.5.1	modified out of comments
[detail] --- src/GuralpSignal.h-version-4.5.1-stripped	2025-09-28 04:01:06.555510498 +0200
[detail] +++ src/GuralpSignal.h-HEAD-stripped	2025-09-28 04:01:06.559510518 +0200
[detail] @@ -20,7 +20,7 @@
[detail]      const SparseTimeRange& timeRange() const {return _timeRange;}
[detail]      double samplingFrequency() const {return _firstBlock.samplingFrequency();}
[detail]      QString name() const {return _firstBlock.name();}
[detail] -    Signal::Components component() const {return _firstBlock.component();}
[detail] +    SignalMetaData::Components component() const {return _firstBlock.component();}
[detail]      int nSamples() const {return _nSamples;}
[detail]      const GuralpRecords& records() const {return _records;}
[detail]    private:
[detail]                           src/HDF5File.h:  version-4.5.1	no last version available
[detail]               src/InstrumentalResponse.h:  version-4.5.1	modified out of comments
[detail] --- src/InstrumentalResponse.h-version-4.5.1-stripped	2025-09-28 04:01:06.583510633 +0200
[detail] +++ src/InstrumentalResponse.h-HEAD-stripped	2025-09-28 04:01:06.583510633 +0200
[detail] @@ -9,15 +9,21 @@
[detail]  
[detail]  namespace GeopsyCore {
[detail]  
[detail] +  class InstrumentalResponseFunction;
[detail] +
[detail]    class GEOPSYCORE_EXPORT InstrumentalResponse: public XMLClass
[detail]    {
[detail]    public:
[detail]      InstrumentalResponse();
[detail]      ~InstrumentalResponse();
[detail]  
[detail] -    virtual const QString& xml_tagName() const {return xmlInstrumentalResponseTag;}
[detail] +    const QString& xml_tagName() const {return xmlInstrumentalResponseTag;}
[detail]      static const QString xmlInstrumentalResponseTag;
[detail]  
[detail] +    bool operator==(const InstrumentalResponse& o) const;
[detail] +    int compare(const InstrumentalResponse& o) const;
[detail] +    size_t hash() const;
[detail] +
[detail]      const QString& name() const {return _name;}
[detail]      void setName(const QString& n) {_name=n;}
[detail]  
[detail] @@ -31,31 +37,38 @@
[detail]      void addZero(const Complex& z) {_zeros.append(z);}
[detail]      void clearZeros() {_zeros.clear();}
[detail]  
[detail] -    double noiseLevel() const {return _noiseLevel;}
[detail] -    void setNoiseLevel(double n) {_noiseLevel=n;}
[detail] -
[detail]      double transductionFactor() const {return _transductionFactor;}
[detail]      void setTransductionFactor(double f) {_transductionFactor=f;}
[detail]  
[detail]      double normalizationFactor() const {return _normalizationFactor;}
[detail]      void setNormalizationFactor(double f) {_normalizationFactor=f;}
[detail]  
[detail] +    double filterFrequency(int index) {return _filterFrequencies[index];}
[detail] +    void setFilterFrequency(int index, double f) {_filterFrequencies[index]=f;}
[detail] +    bool setFilterFrequencies(const StringSection& s);
[detail] +    QString filterFrequencies() const;
[detail] +    bool isValidFilter() const;
[detail] +    double filter(double frequency) const;
[detail] +
[detail]      double frequencyFactor() const {return _frequencyFactor;}
[detail]      void setFrequencyFactor(double f) {_frequencyFactor=f;}
[detail]  
[detail] -    Complex deconvolution(double frequency, const Complex& sample=Complex(1.0)) const;
[detail] +    void deconvolution(double frequency, Complex& sample) const;
[detail]      Complex value(double frequency) const;
[detail] +    Complex inverseValue(double frequency) const;
[detail] +    InstrumentalResponseFunction * deconvolutionFunction(int n, double samplingPeriod) const;
[detail]  
[detail]      QString arguments() const;
[detail]  
[detail] -    virtual void xml_writeProperties(XML_WRITEPROPERTIES_ARGS) const;
[detail] -    virtual bool xml_setProperty(XML_SETPROPERTY_ARGS);
[detail] -    virtual XMLMember xml_member(XML_MEMBER_ARGS);
[detail] +    void xml_writeProperties(XML_WRITEPROPERTIES_ARGS) const;
[detail] +    bool xml_setProperty(XML_SETPROPERTY_ARGS);
[detail] +    XMLMember xml_member(XML_MEMBER_ARGS);
[detail]    private:
[detail] +
[detail]      QString _name;
[detail]      VectorList<Complex> _poles;
[detail]      VectorList<Complex> _zeros;
[detail] -    double _noiseLevel;
[detail] +    double _filterFrequencies[4];
[detail]      double _transductionFactor;
[detail]      double _normalizationFactor;
[detail]      double _frequencyFactor;
[detail]       src/InstrumentalResponseFunction.h:  version-4.5.1	no last version available
[detail]       src/InstrumentalResponseMetaData.h:  version-4.5.1	no last version available
[detail]                         src/KeepSignal.h:  version-4.5.1	modified out of comments
[detail] --- src/KeepSignal.h-version-4.5.1-stripped	2025-09-28 04:01:06.611510769 +0200
[detail] +++ src/KeepSignal.h-HEAD-stripped	2025-09-28 04:01:06.615510788 +0200
[detail] @@ -3,43 +3,66 @@
[detail]  #ifndef KEEPSIGNAL_H
[detail]  #define KEEPSIGNAL_H
[detail]  
[detail] -#include "SignalTemplate.h"
[detail]  #include "TimeRange.h"
[detail]  #include "GeopsyCoreDLLExport.h"
[detail]  
[detail]  namespace GeopsyCore {
[detail]  
[detail] -  class Signal;
[detail] -
[detail] -  class GEOPSYCORE_EXPORT KeepSignal : public SignalTemplate<int>
[detail] +  class GEOPSYCORE_EXPORT KeepSignal
[detail]    {
[detail]    public:
[detail]      KeepSignal();
[detail] -    KeepSignal(int n);
[detail] -    KeepSignal(const KeepSignal& o);
[detail] +    KeepSignal(qint64 n);
[detail]  
[detail]      
[detail]      double samplingPeriod() const {return _samplingPeriod;}
[detail] -    void setSamplingPeriod(double newval) {_samplingPeriod=newval;}
[detail]      double samplingFrequency() const {return 1.0/_samplingPeriod;}
[detail] -    double duration() const {return _samplingPeriod*_nSamples;}
[detail] +    bool setSamplingPeriod(double newval);
[detail] +    qint64 nSamples() const {return _sections.last().end;}
[detail] +    double duration() const {return _samplingPeriod*nSamples();}
[detail]      const DateTime& startTime() const {return _startTime;}
[detail]      void setStartTime(const DateTime& t) {_startTime=t;}
[detail]      DateTime endTime() const {return _startTime+duration();}
[detail]      TimeRange timeRange() const {return TimeRange(_startTime, duration());}
[detail]  
[detail] +    int at(qint64 index) const;
[detail] +    int sectionAt(qint64 index) const;
[detail] +    void whileAt(int value, qint64& index, qint64 maxIndex) const;
[detail] +    void setValue(qint64 index, int value) {setValues(index, index+1, value);}
[detail] +    void setValues(qint64 index, qint64 end, int value);
[detail] +
[detail] +    void copySamplesFrom(const KeepSignal * sig);
[detail] +    void copySamplesFrom(const KeepSignal * sig,
[detail] +                         qint64 sigStart, qint64 thisStart, qint64 nToCopy);
[detail] +
[detail]      void debugPrint() const;
[detail] +    double dataSizekb() const {return _sections.count()/1024.0*sizeof(Section);}
[detail] +    static void test();
[detail] +    bool checkSections() const;
[detail]    protected:
[detail] -    virtual inline QString debugName() const;
[detail] +    QString debugName() const;
[detail] +    void adjustLimits(const KeepSignal * sig,
[detail] +                      qint64& sigStart, qint64& thisStart, qint64& nToCopy) const;
[detail]    private:
[detail] +    int indexOf(qint64 index) const;
[detail] +    inline void updatePowerOfTwo();
[detail] +    void extend(int i, qint64 end, int value);
[detail] +
[detail]      double _samplingPeriod;
[detail]      DateTime _startTime;
[detail] -  };
[detail]  
[detail] -  inline QString KeepSignal::debugName() const
[detail] +    class Section
[detail]    {
[detail] -    return QString("keep_%1").arg(reinterpret_cast<qint64>(this), 0, 16);
[detail] -  }
[detail] +    public:
[detail] +      Section(qint64 e, int v) : end(e), value(v) {}
[detail] +
[detail] +      qint64 end;
[detail] +      int value;
[detail] +    };
[detail] +
[detail] +    int _nSections2;
[detail] +    QList<Section> _sections;
[detail] +  };
[detail]  
[detail]  } 
[detail]  
[detail]                  src/MasterSignalGroup.h:  version-4.5.1	modified out of comments
[detail] --- src/MasterSignalGroup.h-version-4.5.1-stripped	2025-09-28 04:01:06.631510866 +0200
[detail] +++ src/MasterSignalGroup.h-HEAD-stripped	2025-09-28 04:01:06.639510904 +0200
[detail] @@ -10,8 +10,7 @@
[detail]  
[detail]  namespace GeopsyCore {
[detail]  
[detail] -  class GEOPSYCORE_EXPORT MasterSignalGroup : public QObject, public AbstractSignalGroup,
[detail] -      public UniqueID
[detail] +  class GEOPSYCORE_EXPORT MasterSignalGroup : public QObject, public AbstractSignalGroup
[detail]    {
[detail]      Q_OBJECT
[detail]    public:
[detail] @@ -23,6 +22,8 @@
[detail]  
[detail]      void clear();
[detail]      bool readOnly() const {return true;}
[detail] +
[detail] +    UniqueIDGenerator * idGenerator() {return &_idGenerator;}
[detail]    protected:
[detail]      void xml_writeProperties(XML_WRITEPROPERTIES_ARGS) const;
[detail]      XMLMember xml_member(XML_MEMBER_ARGS);
[detail] @@ -30,12 +31,12 @@
[detail]      void reportParentAboutToBeChanged(AbstractSignalGroup * g, AbstractSignalGroup * newParent) const;
[detail]      void reportParentChanged(AbstractSignalGroup * g, AbstractSignalGroup * oldParent) const;
[detail]      void reportDataChanged(AbstractSignalGroup * g) const;
[detail] -
[detail] -    int countId(int id, int& newId) const;
[detail]    signals:
[detail]      void dataChanged(AbstractSignalGroup * g) const;
[detail]      void parentAboutToBeChanged(AbstractSignalGroup * g, AbstractSignalGroup * newParent) const;
[detail]      void parentChanged(AbstractSignalGroup * g, AbstractSignalGroup * oldParent) const;
[detail] +  private:
[detail] +    UniqueIDGenerator _idGenerator;
[detail]    };
[detail]  
[detail]  } 
[detail]                           src/MetaData.h:  version-4.5.1	modified out of comments
[detail] --- src/MetaData.h-version-4.5.1-stripped	2025-09-28 04:01:06.655510981 +0200
[detail] +++ src/MetaData.h-HEAD-stripped	2025-09-28 04:01:06.659511001 +0200
[detail] @@ -30,13 +30,13 @@
[detail]  
[detail]  
[detail]    class SignalHeaderObject;
[detail] -  class Signal;
[detail] +  class SignalSegment;
[detail]  
[detail]    class GEOPSYCORE_EXPORT MetaData: public XMLClass, public SharedObject
[detail]    {
[detail]    public:
[detail]      MetaData() {}
[detail] -    MetaData(const MetaData& o) : XMLClass(o), SharedObject(o) {}
[detail] +    MetaData(const MetaData& o) : XMLClass(), SharedObject(o) {}
[detail]      virtual ~MetaData() {}
[detail]  
[detail]      virtual MetaData * clone() const=0;
[detail] @@ -61,11 +61,11 @@
[detail]      virtual QVariant data(int subId, const QString& index) const {Q_UNUSED(subId) Q_UNUSED(index) return QVariant();}
[detail]      virtual bool setData(int subId, const QString& index, const QVariant& val) {Q_UNUSED(subId) Q_UNUSED(index) Q_UNUSED(val) return true;}
[detail]      virtual int compare(int subId, const QString& index, const MetaData& o) const=0;
[detail] +    virtual bool isMultiLine(int subId) const {Q_UNUSED(subId) return false;}
[detail]  
[detail]      virtual QString toString(const QString& index) const {Q_UNUSED(index) return QString();}
[detail]      virtual bool fromString(const QString& index, QString string) {Q_UNUSED(index) Q_UNUSED(string)return true;}
[detail]  
[detail] -    virtual bool copyAllowed() const {return true;}
[detail]      virtual bool isStored() const {return true;}
[detail]      virtual bool storeAsProperty() const {return true;}
[detail]      virtual void writeProperties(XMLStream& s, const XMLSaveAttributes& attributes) const;
[detail] @@ -74,6 +74,9 @@
[detail]  
[detail]      virtual void registerScriptTypes(QScriptEngine * engine) {Q_UNUSED(engine)}
[detail]      virtual void addScriptProperties(SignalHeaderObject * sig) {Q_UNUSED(sig)}
[detail] +
[detail] +    
[detail] +    virtual size_t hash() const=0;
[detail]    private:
[detail]      int _sharedId;
[detail]    };
[detail] @@ -84,40 +87,68 @@
[detail]      MetaInteger() {_value=0;}
[detail]      MetaInteger(int val) : MetaData() {_value=val;}
[detail]  
[detail] -    virtual bool operator==(const MetaData& o) const {return _value==reinterpret_cast<const MetaInteger&>(o)._value;}
[detail] -    virtual void operator=(const MetaData& o) {_value=reinterpret_cast<const MetaInteger&>(o)._value;}
[detail] +    bool operator==(const MetaData& o) const {return _value==reinterpret_cast<const MetaInteger&>(o)._value;}
[detail] +    void operator=(const MetaData& o) {_value=reinterpret_cast<const MetaInteger&>(o)._value;}
[detail]  
[detail]      int value() const {return _value;}
[detail]      void setValue(int v) {_value=v;}
[detail]  
[detail] -    virtual QVariant data(int subId, const QString& index) const {Q_UNUSED(subId) Q_UNUSED(index) return _value;}
[detail] -    virtual bool setData(int subId, const QString& index, const QVariant& val);
[detail] -    virtual int compare(int subId, const QString& index, const MetaData& o) const;
[detail] +    QVariant data(int subId, const QString& index) const {Q_UNUSED(subId) Q_UNUSED(index) return _value;}
[detail] +    bool setData(int subId, const QString& index, const QVariant& val);
[detail] +    int compare(int subId, const QString& index, const MetaData& o) const;
[detail]  
[detail] -    virtual QString toString(const QString&) const {return QString::number(_value);}
[detail] -    virtual bool fromString(const QString& , QString string) {bool ok; setValue(string.toInt(&ok)); return ok;}
[detail] +    QString toString(const QString&) const {return QString::number(_value);}
[detail] +    bool fromString(const QString& , QString string) {bool ok; setValue(string.toInt(&ok)); return ok;}
[detail] +
[detail] +    size_t hash() const {return ::qHash(_value);}
[detail]    private:
[detail]      int _value;
[detail]    };
[detail]  
[detail] +  class GEOPSYCORE_EXPORT MetaInteger64: public MetaData
[detail] +  {
[detail] +  public:
[detail] +    MetaInteger64() {_value=0;}
[detail] +    MetaInteger64(qint64 val) : MetaData() {_value=val;}
[detail] +
[detail] +    bool operator==(const MetaData& o) const {return _value==reinterpret_cast<const MetaInteger64&>(o)._value;}
[detail] +    void operator=(const MetaData& o) {_value=reinterpret_cast<const MetaInteger64&>(o)._value;}
[detail] +
[detail] +    qint64 value() const {return _value;}
[detail] +    void setValue(qint64 v) {_value=v;}
[detail] +
[detail] +    QVariant data(int subId, const QString& index) const {Q_UNUSED(subId) Q_UNUSED(index) return _value;}
[detail] +    bool setData(int subId, const QString& index, const QVariant& val);
[detail] +    int compare(int subId, const QString& index, const MetaData& o) const;
[detail] +
[detail] +    QString toString(const QString&) const {return QString::number(_value);}
[detail] +    bool fromString(const QString& , QString string) {bool ok; setValue(string.toInt(&ok)); return ok;}
[detail] +
[detail] +    size_t hash() const {return ::qHash(_value);}
[detail] +  private:
[detail] +    qint64 _value;
[detail] +  };
[detail] +
[detail]    class GEOPSYCORE_EXPORT MetaDouble: public MetaData
[detail]    {
[detail]    public:
[detail]      MetaDouble() {_value=0;}
[detail]      MetaDouble(double val) : MetaData() {_value=val;}
[detail]  
[detail] -    virtual bool operator==(const MetaData& o) const {return _value==reinterpret_cast<const MetaDouble&>(o)._value;}
[detail] -    virtual void operator=(const MetaData& o) {_value=reinterpret_cast<const MetaDouble&>(o)._value;}
[detail] +    bool operator==(const MetaData& o) const {return _value==reinterpret_cast<const MetaDouble&>(o)._value;}
[detail] +    void operator=(const MetaData& o) {_value=reinterpret_cast<const MetaDouble&>(o)._value;}
[detail]  
[detail]      double value() const {return _value;}
[detail]      void setValue(double v) {_value=v;}
[detail]  
[detail] -    virtual QVariant data(int subId, const QString& index) const {Q_UNUSED(subId) Q_UNUSED(index) return _value;}
[detail] -    virtual bool setData(int subId, const QString& index, const QVariant& val);
[detail] -    virtual int compare(int subId, const QString& index, const MetaData &o) const;
[detail] +    QVariant data(int subId, const QString& index) const {Q_UNUSED(subId) Q_UNUSED(index) return _value;}
[detail] +    bool setData(int subId, const QString& index, const QVariant& val);
[detail] +    int compare(int subId, const QString& index, const MetaData &o) const;
[detail]  
[detail] -    virtual QString toString(const QString&) const {return QString::number(_value, 'g', 20);}
[detail] -    virtual bool fromString(const QString& , QString string) {bool ok; setValue(string.toDouble(&ok)); return ok;}
[detail] +    QString toString(const QString&) const {return QString::number(_value, 'g', 20);}
[detail] +    bool fromString(const QString& , QString string) {bool ok; setValue(string.toDouble(&ok)); return ok;}
[detail] +
[detail] +    size_t hash() const {return ::qHash(_value);}
[detail]    private:
[detail]      double _value;
[detail]    };
[detail] @@ -128,18 +159,20 @@
[detail]      MetaArray() {_count=0;_values=nullptr;}
[detail]      ~MetaArray() {delete [] _values;}
[detail]  
[detail] -    virtual bool operator==(const MetaData& o) const;
[detail] -    virtual void operator=(const MetaData& o);
[detail] +    bool operator==(const MetaData& o) const;
[detail] +    void operator=(const MetaData& o);
[detail]  
[detail]      valueType value(int index) const {return index<_count ? _values[index] : 0;}
[detail]      void setValue(int index, valueType v) {if(index>=_count) enlarge(index); _values[index]=v;}
[detail]  
[detail] -    virtual bool isArray(int subId) const {Q_UNUSED(subId) return true;}
[detail] -    virtual int count(int subId) const {Q_UNUSED(subId) return _count;}
[detail] -    virtual bool hasIndex(int subId, const QString& index) const;
[detail] -    virtual QVariant data(int subId, const QString& index) const;
[detail] +    bool isArray(int subId) const {Q_UNUSED(subId) return true;}
[detail] +    int count(int subId) const {Q_UNUSED(subId) return _count;}
[detail] +    bool hasIndex(int subId, const QString& index) const;
[detail] +    QVariant data(int subId, const QString& index) const;
[detail]  
[detail] -    virtual void writeProperties(XMLStream& s, const XMLSaveAttributes& attributes) const;
[detail] +    void writeProperties(XMLStream& s, const XMLSaveAttributes& attributes) const;
[detail] +
[detail] +    size_t hash() const;
[detail]    private:
[detail]      int _count;
[detail]      valueType * _values;
[detail] @@ -226,6 +259,16 @@
[detail]      }
[detail]    }
[detail]  
[detail] +  template <class valueType>
[detail] +  size_t MetaArray<valueType>::hash() const
[detail] +  {
[detail] +    QList<valueType> list(_count);
[detail] +    for(int i=0; i<_count; i++) {
[detail] +      list[i]=_values[i];
[detail] +    }
[detail] +    return ::qHash(list);
[detail] +  }
[detail] +
[detail]    class GEOPSYCORE_EXPORT MetaArrayInteger: public MetaArray<int>
[detail]    {
[detail]    public:
[detail] @@ -257,19 +300,21 @@
[detail]      MetaString() {}
[detail]      MetaString(const QString& str) : MetaData() {setValue(str);}
[detail]  
[detail] -    virtual bool operator==(const MetaData& o) const {return _value==reinterpret_cast<const MetaString&>(o)._value;}
[detail] -    virtual void operator=(const MetaData& o) {_value=reinterpret_cast<const MetaString&>(o)._value;}
[detail] +    bool operator==(const MetaData& o) const {return _value==reinterpret_cast<const MetaString&>(o)._value;}
[detail] +    void operator=(const MetaData& o) {_value=reinterpret_cast<const MetaString&>(o)._value;}
[detail]  
[detail] -    virtual QVariant data(int subId, const QString& index) const {Q_UNUSED(subId) Q_UNUSED(index) return _value;}
[detail] -    virtual bool setData(int subId, const QString& index, const QVariant& val);
[detail] -    virtual int compare(int subId, const QString& index, const MetaData& o) const;
[detail] +    QVariant data(int subId, const QString& index) const {Q_UNUSED(subId) Q_UNUSED(index) return _value;}
[detail] +    bool setData(int subId, const QString& index, const QVariant& val);
[detail] +    int compare(int subId, const QString& index, const MetaData& o) const;
[detail]  
[detail]      const QString& value() const {return _value;}
[detail]      void setValue(const QString& v) {_value=v;}
[detail]      void operator+=(const QString& s) {_value+=s;}
[detail]  
[detail] -    virtual QString toString(const QString& ) const {return value();}
[detail] -    virtual bool fromString(const QString& , QString string) {setValue(string); return true;}
[detail] +    QString toString(const QString& ) const {return value();}
[detail] +    bool fromString(const QString& , QString string) {setValue(string); return true;}
[detail] +
[detail] +    size_t hash() const {return ::qHash(_value);}
[detail]    private:
[detail]      QString _value;
[detail]    };
[detail]                    src/MetaDataFactory.h:  version-4.5.1	modified out of comments
[detail] --- src/MetaDataFactory.h-version-4.5.1-stripped	2025-09-28 04:01:06.675511079 +0200
[detail] +++ src/MetaDataFactory.h-HEAD-stripped	2025-09-28 04:01:06.679511097 +0200
[detail] @@ -18,7 +18,7 @@
[detail]      case MetaDataFactory::NSamples: \
[detail]      case MetaDataFactory::Type: \
[detail]      case MetaDataFactory::FileNumber: \
[detail] -    case MetaDataFactory::NumberInFile: \
[detail] +    case MetaDataFactory::IndexInFile: \
[detail]      case MetaDataFactory::FileName: \
[detail]      case MetaDataFactory::FileFormat: \
[detail]      case MetaDataFactory::MaximumAmplitude: \
[detail] @@ -58,7 +58,7 @@
[detail]        Name,
[detail]        Type,
[detail]        FileNumber,
[detail] -      NumberInFile,
[detail] +      IndexInFile,
[detail]        FileName,
[detail]        Duration,
[detail]        EndTime,
[detail]                      src/MetaDataField.h:  version-4.5.1	not modified
[detail]                  src/MetaDataFieldList.h:  version-4.5.1	modified out of comments
[detail] --- src/MetaDataFieldList.h-version-4.5.1-stripped	2025-09-28 04:01:06.711511252 +0200
[detail] +++ src/MetaDataFieldList.h-HEAD-stripped	2025-09-28 04:01:06.715511272 +0200
[detail] @@ -11,10 +11,9 @@
[detail]  class GEOPSYCORE_EXPORT MetaDataFieldList : private QList<MetaDataField>
[detail]  {
[detail]  public:
[detail] -  typedef QList<MetaDataField>::iterator iterator;
[detail] -  iterator begin() {return QList<MetaDataField>::begin();}
[detail] -  iterator end() {return QList<MetaDataField>::end();}
[detail] -  typedef QList<MetaDataField>::const_iterator const_iterator;
[detail] +  MetaDataFieldList();
[detail] +
[detail] +  typedef QList<MetaDataField>::const_iterator iterator;
[detail]    const_iterator begin() const {return QList<MetaDataField>::begin();}
[detail]    const_iterator end() const {return QList<MetaDataField>::end();}
[detail]  
[detail] @@ -24,10 +23,13 @@
[detail]    void setDefaults();
[detail]    void setAll();
[detail]  
[detail] -  void clear() {QList<MetaDataField>::clear();}
[detail] -  void add (const MetaDataField& d) {append(d);}
[detail] +  void clear();
[detail] +  void add (const MetaDataField& d);
[detail]    const MetaDataField& at(int index) const {return QList<MetaDataField>::at(index);}
[detail]    int count() const {return QList<MetaDataField>::count();}
[detail] +  bool isMultiLine() const {return _multiLine;}
[detail] +private:
[detail] +  bool _multiLine;
[detail]  };
[detail]  
[detail]  } 
[detail]                      src/MetaDataIndex.h:  version-4.5.1	not modified
[detail]                        src/MetaDataMap.h:  version-4.5.1	modified out of comments
[detail] --- src/MetaDataMap.h-version-4.5.1-stripped	2025-09-28 04:01:06.751511445 +0200
[detail] +++ src/MetaDataMap.h-HEAD-stripped	2025-09-28 04:01:06.755511465 +0200
[detail] @@ -17,8 +17,10 @@
[detail]      ~MetaDataMap();
[detail]  
[detail]      void operator=(const MetaDataMap& o);
[detail] +    bool operator==(const MetaDataMap& o) const;
[detail]  
[detail] -    int count() const {return SortedVector<int, MetaData>::count();}
[detail] +    int isEmpty() const {return SortedVector<int, MetaData>::isEmpty();}
[detail] +    int size() const {return SortedVector<int, MetaData>::size();}
[detail]      void clear();
[detail]      void reserve(int size) {SortedVector<int, MetaData>::reserve(size);}
[detail]  
[detail] @@ -28,11 +30,42 @@
[detail]      MetaData * data(int id);
[detail]      const MetaData * data(int id) const;
[detail]      const SortedVector<int, MetaData>& vector() const {return *this;}
[detail] +
[detail] +    template <class MetaDataClass> const MetaDataClass& get() const;
[detail] +    template <class MetaDataClass> void set(const MetaDataClass& d);
[detail] +    template <class MetaDataClass> MetaDataClass& beginModify();
[detail] +    template <class MetaDataClass> void endModify(const MetaDataClass& d);
[detail]    private:
[detail]      friend class SignalDatabase;
[detail]      void add(const MetaDataMap& o);
[detail]    };
[detail]  
[detail] +  template <class MetaDataClass> const MetaDataClass& MetaDataMap::get() const
[detail] +  {
[detail] +    return *static_cast<const MetaDataClass *>(data(MetaDataClass::staticId()));
[detail] +  }
[detail] +
[detail] +  template <class MetaDataClass> void MetaDataMap::set(const MetaDataClass& d)
[detail] +  {
[detail] +    if(d==MetaDataClass::staticDefaultValue()) {
[detail] +      remove(MetaDataClass::staticId());
[detail] +    } else {
[detail] +      static_cast<MetaDataClass&>(*data(MetaDataClass::staticId()))=d;
[detail] +    }
[detail] +  }
[detail] +
[detail] +  template <class MetaDataClass> MetaDataClass& MetaDataMap::beginModify()
[detail] +  {
[detail] +    return static_cast<MetaDataClass&>(*data(MetaDataClass::staticId()));
[detail] +  }
[detail] +
[detail] +  template <class MetaDataClass> void MetaDataMap::endModify(const MetaDataClass& d)
[detail] +  {
[detail] +    if(d==MetaDataClass::staticDefaultValue()) {
[detail] +      remove(MetaDataClass::staticId());
[detail] +    }
[detail] +  }
[detail] +
[detail]  } 
[detail]  
[detail]  #endif 
[detail]                     src/MiniSeedReader.h:  version-4.5.1	not modified
[detail]                    src/MiniSeedRecords.h:  version-4.5.1	modified out of comments
[detail] --- src/MiniSeedRecords.h-version-4.5.1-stripped	2025-09-28 04:01:06.787511619 +0200
[detail] +++ src/MiniSeedRecords.h-HEAD-stripped	2025-09-28 04:01:06.791511639 +0200
[detail] @@ -18,9 +18,8 @@
[detail]        return _records==reinterpret_cast<const MiniSeedRecords&>(o)._records;
[detail]      }
[detail]      int compare(int, const QString&, const MetaData&) const {return 0;}
[detail] -    void operator=(const MetaData&) {}
[detail] +    void operator=(const MetaData& o);
[detail]  
[detail] -    bool copyAllowed() const {return false;}
[detail]      bool storeAsProperty() const {return false;}
[detail]      bool fromString(const QString& , QString string); 
[detail]  
[detail] @@ -29,6 +28,8 @@
[detail]      int sequenceCount() const {return _records.count();}
[detail]      int recordCount(int sequenceIndex) const {return _records.at(sequenceIndex).count();}
[detail]      bool record(int sequenceIndex, int recordIndex, off_t& pos, quint32& byteLength) const;
[detail] +
[detail] +    size_t hash() const {return ::qHash(_records);}
[detail]    protected:
[detail]      void xml_writeChildren(XML_WRITECHILDREN_ARGS) const;
[detail]      XMLMember xml_member(XML_MEMBER_ARGS);
[detail]                   src/MiniSeedSequence.h:  version-4.5.1	modified out of comments
[detail] --- src/MiniSeedSequence.h-version-4.5.1-stripped	2025-09-28 04:01:06.807511716 +0200
[detail] +++ src/MiniSeedSequence.h-HEAD-stripped	2025-09-28 04:01:06.811511736 +0200
[detail] @@ -29,8 +29,8 @@
[detail]  
[detail]      void xml_attributes(XML_ATTRIBUTES_ARGS) const;
[detail]      bool xml_setAttributes(XML_SETATTRIBUTES_ARGS);
[detail] -  protected:
[detail]  
[detail] +    size_t hash() const;
[detail]    private:
[detail]      off_t _firstPos;
[detail]      off_t _increment;
[detail] @@ -38,6 +38,8 @@
[detail]      int _count;
[detail]    };
[detail]  
[detail] +  GEOPSYCORE_EXPORT size_t qHash(const MiniSeedSequence& s);
[detail] +
[detail]  } 
[detail]  
[detail]  #endif 
[detail]                      src/MiniSeedTrace.h:  version-4.5.1	not modified
[detail]                     src/MiniSeedVolume.h:  version-4.5.1	not modified
[detail]                   src/MorletParameters.h:  version-4.5.1	not modified
[detail]            src/NormalizationParameters.h:  version-4.5.1	not modified
[detail]                   src/OriginalFileName.h:  version-4.5.1	not modified
[detail]             src/OriginalSamplingPeriod.h:  version-4.5.1	no last version available
[detail]                  src/PasscalSegYHeader.h:  version-4.5.1	modified out of comments
[detail] --- src/PasscalSegYHeader.h-version-4.5.1-stripped	2025-09-28 04:01:06.903512180 +0200
[detail] +++ src/PasscalSegYHeader.h-HEAD-stripped	2025-09-28 04:01:06.907512200 +0200
[detail] @@ -6,7 +6,7 @@
[detail]  #include <QGpCoreTools.h>
[detail]  
[detail]  #include "SignalFileFormat.h"
[detail] -#include "GeoSignal.h"
[detail] +#include "SignalMetaData.h"
[detail]  #include "GeopsyCoreDLLExport.h"
[detail]  
[detail]  namespace GeopsyCore {
[detail] @@ -29,7 +29,7 @@
[detail]    int nSamples() const {return field.sampleNumber16==32767 ? field.sampleNumber32 : field.sampleNumber16;}
[detail]    DateTime startTime() const;
[detail]    DateTime timePick() const;
[detail] -  Signal::Components component() const;
[detail] +  SignalMetaData::Components component() const;
[detail]  
[detail]    union {
[detail]      struct {
[detail]                     src/PickParameters.h:  version-4.5.1	not modified
[detail]                   src/RotateParameters.h:  version-4.5.1	not modified
[detail]                          src/SACHeader.h:  version-4.5.1	not modified
[detail]                         src/SEGDHeader.h:  version-4.5.1	not modified
[detail]                         src/SEGYHeader.h:  version-4.5.1	not modified
[detail]                    src/SEGYTraceHeader.h:  version-4.5.1	not modified
[detail]                       src/SeismicEvent.h:  version-4.5.1	not modified
[detail]                  src/SeismicEventTable.h:  version-4.5.1	modified out of comments
[detail] --- src/SeismicEventTable.h-version-4.5.1-stripped	2025-09-28 04:01:07.035512818 +0200
[detail] +++ src/SeismicEventTable.h-HEAD-stripped	2025-09-28 04:01:07.039512837 +0200
[detail] @@ -6,7 +6,7 @@
[detail]  #include <QGpCoreTools.h>
[detail]  
[detail]  #include "SeismicEvent.h"
[detail] -#include "GeoSignal.h"
[detail] +#include "SignalSegment.h"
[detail]  #include "GeopsyCoreDLLExport.h"
[detail]  
[detail]  namespace GeopsyCore {
[detail] @@ -21,7 +21,7 @@
[detail]      virtual const QString& xml_tagName() const {return xmlSeismicEventTableTag;}
[detail]      static const QString xmlSeismicEventTableTag;
[detail]  
[detail] -    int count() const {return SortedVector<DateTime, SeismicEvent>::count();}
[detail] +    int size() const {return SortedVector<DateTime, SeismicEvent>::size();}
[detail]      SeismicEvent * at(int index) {return SortedVector<DateTime, SeismicEvent>::at(index);}
[detail]  
[detail]      bool contains(const SeismicEvent& e) const;
[detail] @@ -31,7 +31,7 @@
[detail]      void clear();
[detail]      void sort() {SortedVector<DateTime, SeismicEvent>::sort();}
[detail]  
[detail] -    ::QList<const SeismicEvent *> events(const Signal * sig,
[detail] +    ::QList<const SeismicEvent *> events(const SignalSegment * sig,
[detail]                                           double minimumSlowness=0.0, double maximumSlowness=0.0) const;
[detail]      ::QList<const SeismicEvent *> events(const SparseTimeRange& r) const;
[detail]      ::QList<const SeismicEvent *> events(const TimeRange& r) const;
[detail]                     src/SharedMetaData.h:  version-4.5.1	modified out of comments
[detail] --- src/SharedMetaData.h-version-4.5.1-stripped	2025-09-28 04:01:07.055512915 +0200
[detail] +++ src/SharedMetaData.h-HEAD-stripped	2025-09-28 04:01:07.059512934 +0200
[detail] @@ -10,7 +10,7 @@
[detail]  namespace GeopsyCore {
[detail]  
[detail]  class MetaData;
[detail] -class Signal;
[detail] +  class SignalSegment;
[detail]  
[detail]  class GEOPSYCORE_EXPORT SharedMetaData : public XMLClass, public VectorList<MetaData *>
[detail]  {
[detail] @@ -23,7 +23,7 @@
[detail]    static const QString xmlSharedMetaDataTag;
[detail]  
[detail]    void add(MetaData * d) {VectorList<MetaData *>::append(d);}
[detail] -  void add(Signal * sig);
[detail] +    void add(SignalSegment * sig);
[detail]  
[detail]    void setIds();
[detail]    void xml_writeLinks(XMLStream& s) const;
[detail]                        src/SharkHeader.h:  version-4.5.1	not modified
[detail]                     src/SignalDatabase.h:  version-4.5.1	modified out of comments
[detail] --- src/SignalDatabase.h-version-4.5.1-stripped	2025-09-28 04:01:07.091513088 +0200
[detail] +++ src/SignalDatabase.h-HEAD-stripped	2025-09-28 04:01:07.095513108 +0200
[detail] @@ -11,23 +11,25 @@
[detail]  #include "SharedMetaData.h"
[detail]  #include "GeopsyCoreDLLExport.h"
[detail]  #include "SeismicEventTable.h"
[detail] +#include "SignalSegment.h"
[detail]  
[detail]  namespace GeopsyCore {
[detail]  
[detail] -#define SIGNAL_DATABASE_CURRENT_VERSION 8
[detail] +#define SIGNAL_DATABASE_CURRENT_VERSION 9
[detail]  
[detail]  class SubSignalPool;
[detail]  class SignalGroup;
[detail] +  class SignalMetaDataMap;
[detail]  
[detail]  class GEOPSYCORE_EXPORT SignalDatabase : private SubSignalPool, public XMLClass,
[detail] -    public XMLContext, public UniqueID
[detail] +      public XMLContext
[detail]  {
[detail]    TRANSLATIONS("SignalDatabase")
[detail]  public:
[detail]    SignalDatabase();
[detail]    ~SignalDatabase();
[detail]  
[detail] -  virtual const QString& xml_tagName() const {return xmlSignalDatabaseTag;}
[detail] +    const QString& xml_tagName() const {return xmlSignalDatabaseTag;}
[detail]    static const QString xmlSignalDatabaseTag;
[detail]  
[detail]    static QString askSaveAs();
[detail] @@ -43,10 +45,10 @@
[detail]    void setName(const QString& n) {SubSignalPool::setName(n);}
[detail]    int version() const {return _version;}
[detail]  
[detail] -  bool contains(Signal * sig) const {return SubSignalPool::contains(sig);}
[detail] -  Signal * signal(int id) const;
[detail] -  void addSignal(Signal * sig);
[detail] -  void addFile(SignalFile * file);
[detail] +    bool contains(SignalSegment * sig) const {return SubSignalPool::contains(sig);}
[detail] +    SignalSegment * signal(const UniqueID& id) const;
[detail] +    void addSignal(SignalSegment * sig);
[detail] +    void addFile(AbstractSignalFile * file);
[detail]    SignalFilePool& filePool() {return _files;}
[detail]    const SubSignalPool& subPool() const {return *this;}
[detail]  
[detail] @@ -54,52 +56,59 @@
[detail]    const MasterSignalGroup * masterGroup() const {return _masterGroup;}
[detail]  
[detail]    const AbstractSignalGroup * findGroup(QString name) const {return _masterGroup->find(name);}
[detail] -  const AbstractSignalGroup * findGroup(int id) const {return _masterGroup->find(id);}
[detail] +    const AbstractSignalGroup * findGroup(const UniqueID& id) const {return _masterGroup->find(id);}
[detail]    QList<const AbstractSignalGroup *> findGroups(const QRegularExpression& name) const {return const_cast<const MasterSignalGroup *>(_masterGroup)->find(name);}
[detail]    AbstractSignalGroup * findGroup(QString name) {return _masterGroup->find(name);}
[detail] -  AbstractSignalGroup * findGroup(int id) {return _masterGroup->find(id);}
[detail] +    AbstractSignalGroup * findGroup(const UniqueID& id) {return _masterGroup->find(id);}
[detail]    QList<AbstractSignalGroup *> findGroups(const QRegularExpression& name) {return _masterGroup->find(name);}
[detail]  
[detail]    SeismicEventTable * seismicEvents() {return _seismicEvents;}
[detail]    const SeismicEventTable * seismicEvents() const {return _seismicEvents;}
[detail]  
[detail]    bool isModified();
[detail] -  void removeFile(SignalFile * f);
[detail] -  void removeSignal(Signal * sig) {SubSignalPool::remove(sig);}
[detail] -  void signalDeleted(Signal * sig);
[detail] +    void removeFile(AbstractSignalFile * file);
[detail] +    void removeSignal(SignalSegment * sig) {SubSignalPool::remove(sig);}
[detail] +    void signalDeleted(SignalSegment * sig);
[detail]  
[detail]    int count() const {return SubSignalPool::count();}
[detail]    int isEmpty() const {return SubSignalPool::isEmpty();}
[detail] -  Signal * at(int index) const {return SubSignalPool::at(index);}
[detail] +    SignalSegment * at(int index) const {return SubSignalPool::at(index);}
[detail]  
[detail] -  void addMetaData(MetaData * d) {_permanentSharedMetaData.add(d);}
[detail] -  void removeMetaData(int id) {_permanentSharedMetaData.remove(id);}
[detail] -  MetaData * metaData(int id) {return _permanentSharedMetaData.data(id);}
[detail] -  const MetaData * metaData(int id) const {return _permanentSharedMetaData.data(id);}
[detail] -  MetaData * resolveMetaData(int index);
[detail] +    void addSharedMetaData(MetaData * d) {_permanentSharedMetaData.add(d);}
[detail] +    void removeSharedMetaData(int id) {_permanentSharedMetaData.remove(id);}
[detail] +    MetaData * sharedMetaData(int id) {return _permanentSharedMetaData.data(id);}
[detail] +    const MetaData * sharedMetaData(int id) const {return _permanentSharedMetaData.data(id);}
[detail] +    MetaData * resolveSharedMetaData(int index);
[detail]  
[detail]    SubSignalPool load(QString fileName, SignalFileFormat format=SignalFileFormat::Unknown, bool viewFile=false);
[detail]    SubSignalPool load(QStringList fileNames, SignalFileFormat format=SignalFileFormat::Unknown, bool viewFiles=false);
[detail]    SubSignalPool load(QString dbFile, QString groupName,
[detail]                       const QStringList& fileNames, QString format,
[detail]                       bool viewFiles);
[detail] +    void stopLoad() {_loadTerminated.setValue(true);}
[detail] +    SignalMetaDataMap * createMetaDataMap() const;
[detail] +    void metaDataDetached() {_hasDetachedMetaData=true;}
[detail] +
[detail] +
[detail]    void showSignal(const DoubleSignal * sig, const QString& name=QString(), const QString& comments=QString());
[detail]    void showSignal(const KeepSignal * sig, const QString& name=QString(), const QString& comments=QString());
[detail] +
[detail] +    UniqueIDGenerator * signalIdGenerator() {return &_signalIdGenerator;}
[detail] +    UniqueIDGenerator * metaDataIdGenerator() {return &_metaDataIdGenerator;}
[detail]  protected:
[detail] -  virtual void xml_writeProperties(XML_WRITEPROPERTIES_ARGS) const;
[detail] -  virtual void xml_writeChildren(XML_WRITECHILDREN_ARGS) const;
[detail] -  virtual bool xml_setProperty(XML_SETPROPERTY_ARGS);
[detail] -  virtual XMLMember xml_member(XML_MEMBER_ARGS);
[detail] +    void xml_writeProperties(XML_WRITEPROPERTIES_ARGS) const;
[detail] +    void xml_writeChildren(XML_WRITECHILDREN_ARGS) const;
[detail] +    bool xml_setProperty(XML_SETPROPERTY_ARGS);
[detail] +    XMLMember xml_member(XML_MEMBER_ARGS);
[detail]    bool xml_polish(XML_POLISH_ARGS);
[detail]  private:
[detail]    bool add(SignalDatabase * o);
[detail]    QMap<const AbstractSignalGroup *, SubSignalPool> temporarySignals(QString& tempSignalList, int& tempSignalToSave) const;
[detail]    bool saveTemporaryFiles();
[detail]    bool saveTemporarySignals();
[detail] -  virtual int countId(int id, int& newId) const;
[detail] -  void createAllSharedMetaData();
[detail] -  void collectAllSharedMetaData();
[detail] -  void releaseAllSharedMetaData();
[detail] +    void createAllMetaData();
[detail] +    void collectAllMetaData();
[detail] +    void releaseAllMetaData();
[detail]    bool openDBFileV12(QString fileName);
[detail]    bool openDBFileV2(FILE * f);
[detail]    void openGroupsV12();
[detail] @@ -108,8 +117,14 @@
[detail]    MasterSignalGroup * _masterGroup;
[detail]    SeismicEventTable * _seismicEvents;
[detail]    int _version;
[detail] +    mutable bool _hasDetachedMetaData;
[detail]    MetaDataMap _permanentSharedMetaData;
[detail]    SharedMetaData * _allSharedMetaData;
[detail] +    QList<SignalMetaData *> * _signalMetaDataList;
[detail] +    AtomicBoolean _loadTerminated;
[detail] +
[detail] +    UniqueIDGenerator _signalIdGenerator;
[detail] +    UniqueIDGenerator _metaDataIdGenerator;
[detail]  };
[detail]  
[detail]  } 
[detail]                   src/SignalExpression.h:  version-4.5.1	modified out of comments
[detail] --- src/SignalExpression.h-version-4.5.1-stripped	2025-09-28 04:01:07.111513185 +0200
[detail] +++ src/SignalExpression.h-HEAD-stripped	2025-09-28 04:01:07.119513224 +0200
[detail] @@ -5,7 +5,7 @@
[detail]  
[detail]  #include <QGpCoreTools.h>
[detail]  
[detail] -#include "GeoSignal.h"
[detail] +#include "SignalMetaData.h"
[detail]  #include "GeopsyCoreDLLExport.h"
[detail]  
[detail]  namespace GeopsyCore {
[detail]            src/SignalExpressionContext.h:  version-4.5.1	modified out of comments
[detail] --- src/SignalExpressionContext.h-version-4.5.1-stripped	2025-09-28 04:01:07.135513301 +0200
[detail] +++ src/SignalExpressionContext.h-HEAD-stripped	2025-09-28 04:01:07.139513321 +0200
[detail] @@ -8,17 +8,17 @@
[detail]  
[detail]  namespace GeopsyCore {
[detail]  
[detail] -class Signal;
[detail] +  class SignalSegment;
[detail]  
[detail]  class GEOPSYCORE_EXPORT SignalExpressionContext : public ExpressionContext
[detail]  {
[detail]  public:
[detail]    SignalExpressionContext();
[detail]  
[detail] -  void setSignal(Signal * sig) {_sig=sig;}
[detail] -  Signal * signal() const {return _sig;}
[detail] +    void setSignal(SignalSegment * sig) {_sig=sig;}
[detail] +    SignalSegment * signal() const {return _sig;}
[detail]  private:
[detail] -  Signal * _sig;
[detail] +    SignalSegment * _sig;
[detail]  };
[detail]  
[detail]  } 
[detail]                         src/SignalFile.h:  version-4.5.1	modified out of comments
[detail] --- src/SignalFile.h-version-4.5.1-stripped	2025-09-28 04:01:07.155513397 +0200
[detail] +++ src/SignalFile.h-HEAD-stripped	2025-09-28 04:01:07.159513417 +0200
[detail] @@ -5,75 +5,65 @@
[detail]  #include <QGpCoreTools.h>
[detail]  
[detail]  #include "GeopsyCoreDLLExport.h"
[detail] -#include "SignalFileFormat.h"
[detail] +#include "AbstractSignalFile.h"
[detail]  
[detail]  namespace GeopsyCore {
[detail]  
[detail] -class Signal;
[detail] -class SignalDatabase;
[detail] +  class SignalSegment;
[detail]  class SubSignalPool;
[detail]  class GeopsySignalHeader;
[detail]  class SignalFileFormat;
[detail]  
[detail] -class GEOPSYCORE_EXPORT SignalFile : public XMLClass
[detail] +  class GEOPSYCORE_EXPORT SignalFile : public AbstractSignalFile
[detail]  {
[detail]    TRANSLATIONS("SignalFile")
[detail]  public:
[detail]    SignalFile(SignalDatabase * db,
[detail]               QString fileName=QString(),
[detail]               const SignalFileFormat& format=SignalFileFormat::Unknown);
[detail] -  SignalFile(SignalDatabase * db, SignalFile& f, QDir& d);
[detail] +    SignalFile(SignalDatabase * db, const SignalFile& f, const QDir& d);
[detail]    ~SignalFile();
[detail]  
[detail] -  virtual const QString& xml_tagName() const {return xmlSignalFileTag;}
[detail] +    const QString& xml_tagName() const {return xmlSignalFileTag;}
[detail] +    bool xml_inherits(const QString& tagName) const {return tagName==xmlSignalFileTag;}
[detail]    static const QString xmlSignalFileTag;
[detail]  
[detail]    SignalFile& operator=(const SignalFile& p);
[detail] -  QString name(int len) const;
[detail] -  QString shortName() const;
[detail]    
[detail] -  QString name() const {return _name;}
[detail] -  void setName(QString n) {_name=n;}
[detail] +    IndexInFile indexInFile(IndexInFileSet index) const {IndexInFile i;i.setValue(index.value()); return i;}
[detail] +    IndexOfFile indexOfFile(IndexInFileSet) const {return IndexOfFile::first;}
[detail] +    inline SignalSegment * signalSegment(int sig) const;
[detail] +    inline SignalSegment * signalSegment(IndexInFile sig, IndexOfFile) const;
[detail]  
[detail] -  qint64 size() const {return _size;}
[detail] -  quint32 crc32() const {return _crc32;}
[detail] -  QString keyName() const;
[detail] +    QString displayName(IndexOfFile index) const {return name(index);}
[detail] +    QString shortDisplayName(IndexOfFile index) const {return shortName(index);}
[detail]  
[detail] -  const SignalFileFormat& format() const {return _format;}
[detail] -  void setFormat(const SignalFileFormat& f) {_format=f;}
[detail] -  void setFormat(QString f) {_format=SignalFileFormat::fromName(f);}
[detail] +    QString name(IndexOfFile) const {return _name;}
[detail] +    void setName(const QString& n) {_name=n;}
[detail]  
[detail] -  bool isOriginalFile() {return _isOriginalFile;}
[detail] -  void setOriginalFile(bool b) {_isOriginalFile=b;}
[detail] +    qint64 size(IndexOfFile) const {return _size;}
[detail] +    quint32 crc32(IndexOfFile) const {return _crc32;}
[detail]  
[detail] -  bool isPathModified() {return _pathModified;}
[detail] -  void setPathModified(bool b) {_pathModified=b;}
[detail] -
[detail] -  SignalDatabase * database() const {return _db;}
[detail] -  void setDatabase(SignalDatabase * db) {_db=db;}
[detail] +    bool isSameData(const SignalFile * o) const;
[detail]  
[detail]    bool hasValidContent(const QString& fileName) const;
[detail] -  void removeFile();
[detail] +    void hardRemove();
[detail]    bool load();
[detail]    bool loadGeopsySignal(const SubSignalPool& subPool);
[detail] +    bool save(const QDir& d);
[detail]  
[detail] -  static void setSignalName(Signal * sig, QString stationName, QString sufix,
[detail] +    static void setSignalName(SignalSegment * sig, QString stationName, QString sufix,
[detail]                               int recNum, QString fileName);
[detail] -  bool save(const QDir& d);
[detail] -protected:
[detail] -  virtual void xml_writeProperties(XML_WRITEPROPERTIES_ARGS) const;
[detail] -  virtual void xml_writeChildren(XML_WRITECHILDREN_ARGS) const;
[detail] -  virtual bool xml_setProperty(XML_SETPROPERTY_ARGS);
[detail] -  virtual XMLMember xml_member(XML_MEMBER_ARGS);
[detail] -  virtual bool xml_polish(XML_POLISH_ARGS);
[detail] +
[detail] +    void xml_attributes(XML_ATTRIBUTES_ARGS) const;
[detail] +    bool xml_setAttribute(XML_SETATTRIBUTE_ARGS);
[detail] +    bool xml_setProperty(XML_SETPROPERTY_ARGS);
[detail] +    XMLMember xml_member(XML_MEMBER_ARGS);
[detail] +    bool xml_polish(XML_POLISH_ARGS);
[detail]  private:
[detail] -  SignalFileFormat _format;
[detail]    QString _name;
[detail] -  bool _isOriginalFile;
[detail] -  bool _pathModified;
[detail] -  quint32 _crc32;
[detail]    qint64 _size;
[detail] -  SignalDatabase * _db;
[detail] +    quint32 _crc32;
[detail]  
[detail]    bool setContentKey();
[detail]    bool loadGeopsySignal();
[detail] @@ -100,10 +90,21 @@
[detail]    bool loadMiniSeed();
[detail]    bool loadEfispec3D();
[detail]    bool loadFebusHDF5();
[detail] +    bool loadGenericHDF5();
[detail]  
[detail]    void warnAsciiHeader();
[detail]  };
[detail]  
[detail] +  inline SignalSegment * SignalFile::signalSegment(int sig) const
[detail] +  {
[detail] +    return _signalSegments.at(sig);
[detail] +  }
[detail] +
[detail] +  inline SignalSegment * SignalFile::signalSegment(IndexInFile sig, IndexOfFile) const
[detail] +  {
[detail] +    return _signalSegments.at(sig.value());
[detail] +  }
[detail] +
[detail]  } 
[detail]  
[detail]  #endif 
[detail]                   src/SignalFileFormat.h:  version-4.5.1	modified out of comments
[detail] --- src/SignalFileFormat.h-version-4.5.1-stripped	2025-09-28 04:01:07.175513494 +0200
[detail] +++ src/SignalFileFormat.h-HEAD-stripped	2025-09-28 04:01:07.179513514 +0200
[detail] @@ -53,8 +53,11 @@
[detail]      Fourier,
[detail]      Efispec3D,
[detail]      FebusHDF5,
[detail] +    GenericHDF5,
[detail]      FormatCount  
[detail]    };
[detail] +  ENUM_AS_STRING_DECL(Format)
[detail] +
[detail]    enum Storage {Single, Multi};
[detail]  
[detail]    SignalFileFormat(Format f=Unknown, AbstractFileFormat * customFormat=nullptr);
[detail] @@ -63,6 +66,7 @@
[detail]  
[detail]    void operator=(const SignalFileFormat& o);
[detail]    bool operator==(const SignalFileFormat& o) const;
[detail] +  bool operator!=(const SignalFileFormat& o) const;
[detail]    bool operator<(const SignalFileFormat& o) const;
[detail]  
[detail]    Format id() const {return _id;}
[detail] @@ -84,9 +88,10 @@
[detail]    static QList< QPair<QString, SignalFileFormat> > exportList();
[detail]  
[detail]    static bool isFebusHDF5(const QString& fileName);
[detail] +  static bool isGenericHDF5(const QString& fileName);
[detail]  private:
[detail] -  Format _id;
[detail]    AbstractFileFormat * _customFormat;
[detail] +  Format _id;
[detail]  };
[detail]  
[detail]  #define SIGNALFILEFORMAT_READONLY \
[detail] @@ -106,6 +111,7 @@
[detail]    case SignalFileFormat::FormatCount: \
[detail]    case SignalFileFormat::Efispec3D: \
[detail]    case SignalFileFormat::FebusHDF5: \
[detail] +  case SignalFileFormat::GenericHDF5: \
[detail]    case SignalFileFormat::Unknown:
[detail]  
[detail]  } 
[detail]                     src/SignalFilePool.h:  version-4.5.1	modified out of comments
[detail] --- src/SignalFilePool.h-version-4.5.1-stripped	2025-09-28 04:01:07.195513592 +0200
[detail] +++ src/SignalFilePool.h-HEAD-stripped	2025-09-28 04:01:07.199513610 +0200
[detail] @@ -5,41 +5,42 @@
[detail]  
[detail]  #include <QGpCoreTools.h>
[detail]  #include "GeopsyCoreDLLExport.h"
[detail] -#include "SignalFile.h"
[detail] +#include "AbstractSignalFile.h"
[detail]  #include "SignalFileFormat.h"
[detail]  
[detail]  namespace GeopsyCore {
[detail]  
[detail]  class SignalDatabase;
[detail] +class SubSignalPool;
[detail]  
[detail] -class GEOPSYCORE_EXPORT SignalFilePool : private QList<SignalFile *>
[detail] +class GEOPSYCORE_EXPORT SignalFilePool : private QList<AbstractSignalFile *>
[detail]  {
[detail]    TRANSLATIONS("SignalFilePool")
[detail]  public:
[detail]    SignalFilePool(SignalDatabase * db) {_db=db;}
[detail]    ~SignalFilePool();
[detail]  
[detail] -  typedef QList<SignalFile *>::iterator iterator;
[detail] -  typedef QList<SignalFile *>::const_iterator const_iterator;
[detail] -  SignalFile * last() const {return QList<SignalFile *>::last();}
[detail] -  SignalFile * at(int index) const {return QList<SignalFile *>::at(index);}
[detail] -  int indexOf(SignalFile * f) const {return QList<SignalFile *>::indexOf(f);}
[detail] -  int count() const {return QList<SignalFile *>::count();}
[detail] -  const_iterator begin() const {return QList<SignalFile *>::begin();}
[detail] -  const_iterator end() const {return QList<SignalFile *>::end();}
[detail] -  iterator begin() {return QList<SignalFile *>::begin();}
[detail] -  iterator end() {return QList<SignalFile *>::end();}
[detail] +  typedef QList<AbstractSignalFile *>::iterator iterator;
[detail] +  typedef QList<AbstractSignalFile *>::const_iterator const_iterator;
[detail] +  AbstractSignalFile * last() const {return QList<AbstractSignalFile *>::last();}
[detail] +  AbstractSignalFile * at(int index) const {return QList<AbstractSignalFile *>::at(index);}
[detail] +  int indexOf(AbstractSignalFile * f) const {return QList<AbstractSignalFile *>::indexOf(f);}
[detail] +  int count() const {return QList<AbstractSignalFile *>::count();}
[detail] +  const_iterator begin() const {return QList<AbstractSignalFile *>::begin();}
[detail] +  const_iterator end() const {return QList<AbstractSignalFile *>::end();}
[detail] +  iterator begin() {return QList<AbstractSignalFile *>::begin();}
[detail] +  iterator end() {return QList<AbstractSignalFile *>::end();}
[detail]    void add(SignalFilePool& files);
[detail]  
[detail] -  SignalFile * find(QString fileName) const;
[detail] -  bool load(QString name, SignalFileFormat format=SignalFileFormat::Unknown);
[detail] +  bool load(QString name, SignalFileFormat format=SignalFileFormat::Unknown, SubSignalPool * subPool=nullptr);
[detail]  private:
[detail]    friend class SignalDatabase;
[detail]    void clear();
[detail] -  void remove (SignalFile * f);
[detail] -  void insert(int before, SignalFile * f) {QList<SignalFile *>::insert(before, f);}
[detail] -  void move(int from, int to) {QList<SignalFile *>::move(from, to);}
[detail] -  void append(SignalFile * f) {QList<SignalFile *>::append(f);}
[detail] +  void remove (AbstractSignalFile * f);
[detail] +  void insert(int before, AbstractSignalFile * f) {QList<AbstractSignalFile *>::insert(before, f);}
[detail] +  void move(int from, int to) {QList<AbstractSignalFile *>::move(from, to);}
[detail] +  void append(AbstractSignalFile * f) {QList<AbstractSignalFile *>::append(f);}
[detail] +
[detail]    SignalDatabase * _db;
[detail]  };
[detail]  
[detail]                      src/SignalFileSet.h:  version-4.5.1	no last version available
[detail]                        src/SignalGroup.h:  version-4.5.1	modified out of comments
[detail] --- src/SignalGroup.h-version-4.5.1-stripped	2025-09-28 04:01:07.223513726 +0200
[detail] +++ src/SignalGroup.h-HEAD-stripped	2025-09-28 04:01:07.227513746 +0200
[detail] @@ -25,13 +25,14 @@
[detail]      void setName(const QString &n);
[detail]      int signalCount() const {return _signals.count();}
[detail]      bool hasOwnSignal() const {return true;}
[detail] -    bool directlyContains(const Signal * sig) const;
[detail] +    bool directlyContains(const SignalSegment * sig) const;
[detail]      SubSignalPool subPool() const {return _signals;}
[detail]  
[detail] -    virtual bool convertIds(const QHash<int, Signal *>& ids);
[detail] +    virtual bool convertIds(const QHash<UniqueID, SignalSegment *>& ids);
[detail]      bool hasIds() const {return _ids;}
[detail] +    void sortByIds();
[detail]  
[detail] -    void removeSignal(Signal * sig);
[detail] +    void removeSignal(SignalSegment * sig);
[detail]      void removeAllSignals();
[detail]      virtual void setSignals(const SubSignalPool& subPool);
[detail]      virtual void addSignals(const SubSignalPool& subPool);
[detail] @@ -43,7 +44,9 @@
[detail]      XMLMember xml_member(XML_MEMBER_ARGS);
[detail]    private:
[detail]      SubSignalPool _signals;
[detail] -    VectorList<int> * _ids;
[detail] +    VectorList<UniqueID> * _ids;
[detail] +
[detail] +    static bool parseIdError(const QString& buf);
[detail]    };
[detail]  
[detail]  } 
[detail]                 src/SignalGroupFactory.h:  version-4.5.1	not modified
[detail]                  src/SignalGroupFolder.h:  version-4.5.1	not modified
[detail]                  src/SignalHeaderClass.h:  version-4.5.1	not modified
[detail]                 src/SignalHeaderObject.h:  version-4.5.1	modified out of comments
[detail] --- src/SignalHeaderObject.h-version-4.5.1-stripped	2025-09-28 04:01:07.283514016 +0200
[detail] +++ src/SignalHeaderObject.h-HEAD-stripped	2025-09-28 04:01:07.287514036 +0200
[detail] @@ -3,7 +3,8 @@
[detail]  #ifndef SIGNALHEADEROBJECT_H
[detail]  #define SIGNALHEADEROBJECT_H
[detail]  
[detail] -#include "GeoSignal.h"
[detail] +#include "SignalSegment.h"
[detail] +#include "StoredSignal.h"
[detail]  #include "Comments.h"
[detail]  #include "TimePick.h"
[detail]  
[detail] @@ -23,19 +24,19 @@
[detail]      Q_PROPERTY(QString fileFormat READ fileFormat)
[detail]      Q_PROPERTY(QString fileName READ fileName)
[detail]      Q_PROPERTY(bool headerModified READ headerModified)
[detail] -    Q_PROPERTY(int id READ id)
[detail] +    Q_PROPERTY(QString id READ idToString)
[detail]      Q_PROPERTY(bool isOriginalFile READ isOriginalFile)
[detail]      Q_PROPERTY(double maximumAmplitude READ maximumAmplitude)
[detail]      Q_PROPERTY(QString name READ name WRITE setName)
[detail]      Q_PROPERTY(int nSamples READ nSamples)
[detail] -    Q_PROPERTY(int numberInFile READ numberInFile)
[detail] +    Q_PROPERTY(int indexInFile READ indexInFile)
[detail]      Q_PROPERTY(QString pointer READ pointer)
[detail]      Q_PROPERTY(QString utmZone READ utmZone WRITE setUtmZone)
[detail]      Q_PROPERTY(double receiverX READ receiverX WRITE setReceiverX)
[detail]      Q_PROPERTY(double receiverY READ receiverY WRITE setReceiverY)
[detail]      Q_PROPERTY(double receiverZ READ receiverZ WRITE setReceiverZ)
[detail]      Q_PROPERTY(double samplingFrequency READ samplingFrequency WRITE setSamplingFrequency)
[detail] -    Q_PROPERTY(int sampleSize READ sampleSize)
[detail] +    Q_PROPERTY(QString sampleSize READ sampleSize)
[detail]      Q_PROPERTY(QString shortFileName READ shortFileName)
[detail]      Q_PROPERTY(QString startTime READ startTime WRITE setStartTime)
[detail]      Q_PROPERTY(QString type READ type)
[detail] @@ -46,7 +47,7 @@
[detail]  
[detail]      Q_PROPERTY(QString comments READ comments WRITE setComments)
[detail]    public:
[detail] -    SignalHeaderObject(Signal * sig, QObject * parent=nullptr);
[detail] +    SignalHeaderObject(SignalSegment * sig, QObject * parent=nullptr);
[detail]  
[detail]      void setAmplitudeUnit(const QString& v);
[detail]      void setComponent(const QString& v);
[detail] @@ -67,62 +68,68 @@
[detail]  
[detail]      void setComments(const QString& v);
[detail]  
[detail] -    QString amplitudeUnit() const {return thisSignal()->amplitudeUnitStandardName();}
[detail] -    double averageAmplitude() const {return thisSignal()->averageAmplitude();}
[detail] -    QString component() const {return thisSignal()->componentStandardName();}
[detail] -    double countPerUnit() const {return thisSignal()->countPerUnit();}
[detail] -    double countPerVolt() const {return thisSignal()->countPerVolt();}
[detail] +    QString amplitudeUnit() const {return thisMetaData()->amplitudeUnitStandardName();}
[detail] +    double averageAmplitude() const {return thisSignal()->values()->averageAmplitude();}
[detail] +    QString component() const {return thisMetaData()->componentStandardName();}
[detail] +    double countPerUnit() const {return thisMetaData()->countPerUnit();}
[detail] +    double countPerVolt() const {return thisMetaData()->countPerVolt();}
[detail]      double samplingPeriod() const {return thisSignal()->samplingPeriod();}
[detail]      QString duration() const {return QString::number(thisSignal()->duration(), 'g', 20);}
[detail]      QString endTime() const {return thisSignal()->endTime().toString(ScriptContext::timeFormat);}
[detail] -    QString fileFormat() const;
[detail] -    QString fileName() const;
[detail] +    QString fileFormat() const {return thisSignal()->displayFileFormat();}
[detail] +    QString fileName() const {return thisSignal()->displayFileName();}
[detail]      quint32 crc32() const;
[detail] -    bool headerModified() const {return thisSignal()->isHeaderModified();}
[detail] -    int id() const {return thisSignal()->id();}
[detail] +    bool headerModified() const {return thisMetaData()->isModified();}
[detail] +    QString idToString() const {return thisSignal()->id().toString();}
[detail]      bool isOriginalFile() const {return thisSignal()->isOriginalFile();}
[detail] -    double maximumAmplitude() const {return thisSignal()->maximumAmplitude();}
[detail] -    QString name() const {return thisSignal()->name();}
[detail] -    int nSamples() const {return thisSignal()->nSamples();}
[detail] -    int numberInFile() const {return thisSignal()->numberInFile();}
[detail] +    double maximumAmplitude() const {return thisSignal()->values()->maximumAmplitude();}
[detail] +    QString name() const {return thisMetaData()->name();}
[detail] +    int nSamples() const {return thisSignal()->size();}
[detail] +    int indexInFile() const {return thisSignal()->indexInFile().value();}
[detail]      QString pointer() const {return QString::number(reinterpret_cast<qint64>(thisSignal()), 16);}
[detail] -    QString utmZone() const {return thisSignal()->utmZone().toString();}
[detail] -    double receiverX() const {return thisSignal()->receiver().x();}
[detail] -    double receiverY() const {return thisSignal()->receiver().y();}
[detail] -    double receiverZ() const {return thisSignal()->receiver().z();}
[detail] +    QString utmZone() const {return thisMetaData()->utmZone().toString();}
[detail] +    double receiverX() const {return thisMetaData()->receiver().x();}
[detail] +    double receiverY() const {return thisMetaData()->receiver().y();}
[detail] +    double receiverZ() const {return thisMetaData()->receiver().z();}
[detail]      double samplingFrequency() const {return thisSignal()->samplingFrequency();}
[detail] -    int sampleSize() const {return qRound(thisSignal()->dataSizeMb());}
[detail] -    QString shortFileName() const;
[detail] +    QString sampleSize() const {return Number::bytesToString(thisSignal()->dataSize());}
[detail] +    QString shortFileName() const  {return thisSignal()->displayFileShortName();}
[detail]      QString startTime() const {return thisSignal()->startTime().toString(ScriptContext::timeFormat);}
[detail] -    QString type() const {return Signal::convertSignalType(thisSignal()->type());}
[detail] -    double unitPerCount() const {return thisSignal()->unitPerCount();}
[detail] -    double unitPerVolt() const {return thisSignal()->unitPerVolt();}
[detail] -    double voltPerCount() const {return thisSignal()->voltPerCount();}
[detail] -    double voltPerUnit() const {return thisSignal()->voltPerUnit();}
[detail] +    QString type() const {return DoubleSignal::convertSignalType(thisSignal()->type());}
[detail] +    double unitPerCount() const {return thisMetaData()->unitPerCount();}
[detail] +    double unitPerVolt() const {return thisMetaData()->unitPerVolt();}
[detail] +    double voltPerCount() const {return thisMetaData()->voltPerCount();}
[detail] +    double voltPerUnit() const {return thisMetaData()->voltPerUnit();}
[detail]  
[detail] -    QString comments() const {return thisSignal()->metaData<Comments>().value();}
[detail] +    QString comments() const {return thisMetaData()->optionalData().get<Comments>().value();}
[detail]    public slots:
[detail]      QString timePick(const QString& name) const;
[detail]      void setTimePick(const QString& name, const QString& time);
[detail]  
[detail]      void addSeconds(double dt);
[detail]    signals:
[detail] -    void beginSignalChange(Signal * sig);
[detail] -    void endSignalChange(Signal * sig);
[detail] +    void beginSignalChange(SignalSegment * sig);
[detail] +    void endSignalChange(SignalSegment * sig);
[detail]    private:
[detail] -    inline Signal * thisSignal() const;
[detail] +    inline SignalSegment * thisSignal() const;
[detail] +    inline SignalMetaData * thisMetaData() const;
[detail]  
[detail] -    Signal * _signal;
[detail] +    SignalSegment * _signal;
[detail]    };
[detail]  
[detail] -  inline Signal * SignalHeaderObject::thisSignal() const
[detail] +  inline SignalSegment * SignalHeaderObject::thisSignal() const
[detail]    {
[detail]      
[detail]      return _signal;
[detail]    }
[detail]  
[detail] +  inline SignalMetaData * SignalHeaderObject::thisMetaData() const
[detail] +  {
[detail] +    return _signal->metaData();
[detail] +  }
[detail] +
[detail]  } 
[detail]  
[detail] -Q_DECLARE_METATYPE(GeopsyCore::Signal *)
[detail] +Q_DECLARE_METATYPE(GeopsyCore::SignalSegment *)
[detail]  
[detail]  #endif 
[detail]                 src/SignalHeaderScript.h:  version-4.5.1	modified out of comments
[detail] --- src/SignalHeaderScript.h-version-4.5.1-stripped	2025-09-28 04:01:07.307514132 +0200
[detail] +++ src/SignalHeaderScript.h-HEAD-stripped	2025-09-28 04:01:07.307514132 +0200
[detail] @@ -22,8 +22,8 @@
[detail]    signals:
[detail]      void beginSignalChange(SignalDatabase * db);
[detail]      void endSignalChange(SignalDatabase * db);
[detail] -    void beginSignalChange(Signal * sig);
[detail] -    void endSignalChange(Signal * sig);
[detail] +    void beginSignalChange(SignalSegment * sig);
[detail] +    void endSignalChange(SignalSegment * sig);
[detail]    private:
[detail]      SignalDatabase * _db;
[detail]      QJSEngine * _engine;
[detail]                     src/SignalMetaData.h:  version-4.5.1	no last version available
[detail]                  src/SignalMetaDataMap.h:  version-4.5.1	no last version available
[detail]                      src/SignalProcess.h:  version-4.5.1	modified out of comments
[detail] --- src/SignalProcess.h-version-4.5.1-stripped	2025-09-28 04:01:07.335514267 +0200
[detail] +++ src/SignalProcess.h-HEAD-stripped	2025-09-28 04:01:07.339514287 +0200
[detail] @@ -42,6 +42,9 @@
[detail]      int signalCount();
[detail]      void selectSignals(int startIndex, int endIndex, QString tag=QString());
[detail]      void newGroup(const QString& path, const QString& name, int startIndex, int endIndex);
[detail] +    void setStartTime(int startIndex, const DateTime& t);
[detail] +    QVariant startTime(int startIndex);
[detail] +    QVariant endTime(int startIndex);
[detail]  
[detail]      void removeTrend();
[detail]      void subtractValue(double val);
[detail] @@ -49,9 +52,10 @@
[detail]      void addSignals(const QString& groupName);
[detail]      void subtractSignal(int index);
[detail]      void subtractSignals(const QString& groupName);
[detail] +    void stackSignals();
[detail]      void multiply(double val);
[detail]      void filter(const FilterParameters& param);
[detail] -    void whiten();
[detail] +    void whiten(double fmin, double fmax, double apodization);
[detail]      void agc(double width);
[detail]      void stddevClip(double factor);
[detail]      void shift(double dt);
[detail] @@ -71,6 +75,8 @@
[detail]      void normalizedCorrelations(double maxDelay, int referenceIndex=-1);
[detail]      void convolution(int referenceIndex);
[detail]      void removeInstrumentalResponse(const InstrumentalResponse& sensor);
[detail] +    void derivate();
[detail] +    void integrate();
[detail]    private:
[detail]      void newStep();
[detail]      void restoreStepCore(int index);
[detail] @@ -81,6 +87,7 @@
[detail]                          const QString& pickName);
[detail]      bool saveDatabaseCore(const QString& filePath);
[detail]      void setHeaderCore(int signalIndex, const MetaDataIndex& dataIndex, const QVariant& value);
[detail] +    void setStartTimeCore(int startIndex, const DateTime& t);
[detail]  
[detail]      void removeTrendCore();
[detail]      void subtractValueCore(double val);
[detail] @@ -88,9 +95,10 @@
[detail]      void addSignalsCore(const QString& groupName);
[detail]      void subtractSignalCore(int index);
[detail]      void subtractSignalsCore(const QString& groupName);
[detail] +    void stackSignalsCore();
[detail]      void multiplyCore(double val);
[detail]      void filterCore(const FilterParameters& param);
[detail] -    void whitenCore();
[detail] +    void whitenCore(double fmin, double fmax, double apodization);
[detail]      void agcCore(double width);
[detail]      void stddevClipCore(double factor);
[detail]      void shiftCore(double dt);
[detail] @@ -110,6 +118,8 @@
[detail]      void normalizedCorrelationsCore(double maxDelay, int referenceIndex);
[detail]      void convolutionCore(int referenceIndex);
[detail]      void removeInstrumentalResponseCore(const InstrumentalResponse& sensor);
[detail] +    void derivateCore();
[detail] +    void integrateCore();
[detail]  
[detail]      SubSignalPool * _current;
[detail]      SubSignalPool * _selected;
[detail]                src/SignalProcessObject.h:  version-4.5.1	modified out of comments
[detail] --- src/SignalProcessObject.h-version-4.5.1-stripped	2025-09-28 04:01:07.359514384 +0200
[detail] +++ src/SignalProcessObject.h-HEAD-stripped	2025-09-28 04:01:07.363514403 +0200
[detail] @@ -25,6 +25,9 @@
[detail]      Q_INVOKABLE bool saveDatabase(QString filePath);
[detail]      Q_INVOKABLE QVariant header(int signalIndex, QString dataIndex);
[detail]      Q_INVOKABLE void setHeader(int signalIndex, QString dataIndex, QVariant value);
[detail] +    Q_INVOKABLE void setStartTime(int signalIndex, const QString& v);
[detail] +    Q_INVOKABLE QVariant startTime(int signalIndex);
[detail] +    Q_INVOKABLE QVariant endTime(int signalIndex);
[detail]  
[detail]      Q_INVOKABLE int signalCount();
[detail]      Q_INVOKABLE void selectSignals(int startIndex=-1, int endIndex=-1, QString tag=QString());
[detail] @@ -34,9 +37,17 @@
[detail]      Q_INVOKABLE void subtractValue(double val);
[detail]      Q_INVOKABLE void subtractSignal(int index);
[detail]      Q_INVOKABLE void subtractSignals(QString groupName);
[detail] +    Q_INVOKABLE void stackSignals();
[detail]      Q_INVOKABLE void multiply(double val);
[detail]      Q_INVOKABLE void filter(QString method, QString band, double fmin, double fmax, double param);
[detail] -    Q_INVOKABLE void whiten();
[detail] +    Q_INVOKABLE void filterButterworth(double f, QString band, int order, bool causal);
[detail] +    Q_INVOKABLE void filterButterworth(double fmin, double fmax, QString band, int order, bool causal);
[detail] +    Q_INVOKABLE void filterFrequencyWindow(double f, QString band, QString shape, double width);
[detail] +    Q_INVOKABLE void filterFrequencyWindow(double fmin, double fmax, QString band, QString shape, double width);
[detail] +    Q_INVOKABLE void filterChebyshevType1(double wp, double ws, double gpass, double gstop, double rp);
[detail] +    Q_INVOKABLE void filterChebyshevType1(double minWp, double maxWp, double minWs, double maxWs,
[detail] +                                          double gpass, double gstop, double rp);
[detail] +    Q_INVOKABLE void whiten(double fmin, double fmax, double apodization);
[detail]      Q_INVOKABLE void agc(double width);
[detail]      Q_INVOKABLE void stddevClip(double factor);
[detail]      Q_INVOKABLE void shift(double dt);
[detail] @@ -55,6 +66,8 @@
[detail]      Q_INVOKABLE void normalizedCorrelations(double maxDelay, int referenceIndex=-1);
[detail]      Q_INVOKABLE void convolution(int referenceIndex);
[detail]      Q_INVOKABLE void removeInstrumentalResponse(const InstrumentalResponse& sensor);
[detail] +    Q_INVOKABLE void derivate();
[detail] +    Q_INVOKABLE void integrate();
[detail]    private:
[detail]      SignalProcess * _process;
[detail]    };
[detail]                src/SignalProcessScript.h:  version-4.5.1	not modified
[detail]               src/SignalResultsFactory.h:  version-4.5.1	not modified
[detail]                      src/SignalSegment.h:  version-4.5.1	no last version available
[detail]                     src/SignalTemplate.h:  version-4.5.1	modified out of comments
[detail] --- src/SignalTemplate.h-version-4.5.1-stripped	2025-09-28 04:01:07.419514673 +0200
[detail] +++ src/SignalTemplate.h-HEAD-stripped	2025-09-28 04:01:07.423514693 +0200
[detail] @@ -28,6 +28,7 @@
[detail]  
[detail]    virtual sampleType * lockSamples();
[detail]    virtual const sampleType * constLockSamples() const;
[detail] +  virtual const sampleType * tryConstLockSamples() const;
[detail]    virtual inline void unlockSamples() const;
[detail]    void freeSamples();
[detail]    
[detail] @@ -48,23 +49,25 @@
[detail]    bool copySamplesFrom(const SignalTemplate<sampleType> * sig,
[detail]                          int sigStart, int thisStart, int nToCopy);
[detail]    int add(const SignalTemplate<sampleType> * sig,
[detail] -          int sigStart=0, int thisStart=0, int nToCopy=-1,
[detail] +          int sigStart, int thisStart, int nToCopy=-1,
[detail]            bool checkInvalid=false, sampleType invalidValue=0);
[detail] +  void add(const SignalTemplate<sampleType> * sig);
[detail] +  void add(const SignalTemplate<sampleType> * sig, double factor);
[detail]    void initValues(sampleType value, int startAt, int nSamples);
[detail]    int findValue(sampleType value, int from, bool whileNotFound=false) const;
[detail]  
[detail] -  double dataSizeMb() const {return static_cast<double>(dataSize())/(1024.0*1024.0);}
[detail] -protected:
[detail] -  int _nSamples;
[detail] +  qint64 dataSize() const {return _nSamples*sizeof(sampleType);}
[detail]  
[detail]    
[detail]    sampleType * samples() const {return _samples;}
[detail]    void setSamples(sampleType * s) const {_samples=s;}
[detail] +  virtual bool isAllocated() const {return _samples;}
[detail] +protected:
[detail] +  int _nSamples;
[detail] +
[detail]  
[detail]    void adjustLimits(const SignalTemplate<sampleType> * sig,
[detail]                       int& sigStart, int& thisStart, int& nToCopy) const;
[detail] -  virtual bool isAllocated() const {return _samples;}
[detail] -  virtual qint64 dataSize() const {return _nSamples*sizeof(sampleType);}
[detail]  private:
[detail]    mutable sampleType *_samples;
[detail]    
[detail] @@ -107,6 +109,22 @@
[detail]  
[detail]  
[detail]  template <class sampleType>
[detail] +const sampleType * SignalTemplate<sampleType>::tryConstLockSamples() const
[detail] +{
[detail] +  if(tryLockAdmin()) {
[detail] +    if(isAllocated() || GeopsyCoreEngine::instance()->cache()->makeAvailable(this)) {
[detail] +      constLockData();
[detail] +      unlockAdmin();
[detail] +      return _samples;
[detail] +    } else {
[detail] +      unlockAdmin();
[detail] +    }
[detail] +  }
[detail] +  return nullptr;
[detail] +}
[detail] +
[detail] +
[detail] +template <class sampleType>
[detail]  inline void SignalTemplate<sampleType>::unlockSamples() const
[detail]  {
[detail]    unlockData();
[detail] @@ -150,6 +168,9 @@
[detail]  #define CONST_LOCK_SAMPLES(type,samp,sig) \
[detail]    const type * samp=(sig)->constLockSamples(); \
[detail]    if(samp) {
[detail] +#define TRY_CONST_LOCK_SAMPLES(type,samp,sig) \
[detail] +  const type * samp=(sig)->tryConstLockSamples(); \
[detail] +  if(samp) {
[detail]  #define UNLOCK_SAMPLES(sig) \
[detail]      (sig)->unlockSamples(); \
[detail]    }
[detail] @@ -228,8 +249,15 @@
[detail]    QFile f(d.absoluteFilePath(swapFileName()) );
[detail]    if(f.open(QIODevice::WriteOnly) ) {
[detail]      qint64 n=dataSize();
[detail] -    if(f.write(( const char * ) _samples, n)!=n) {
[detail] -      App::log(tr("Cannot write all bytes to temporary file '%1'\n").arg(f.fileName()));
[detail] +    int nWritten=f.write((const char *) _samples, n);
[detail] +    if(nWritten!=n) {
[detail] +      if(nWritten<0) {
[detail] +        App::log(tr("Cannot write to temporary file '%1': %2\n")
[detail] +                     .arg(f.fileName()).arg(f.errorString()));
[detail] +      } else {
[detail] +        App::log(tr("Cannot write all bytes to temporary file '%1' (stop at %2/%3)\n")
[detail] +                     .arg(f.fileName()).arg(nWritten).arg(n));
[detail] +      }
[detail]        return false;
[detail]      } else {
[detail]        return true;
[detail] @@ -248,8 +276,15 @@
[detail]    QFile f(d.absoluteFilePath(swapFileName()) );
[detail]    if(f.open(QIODevice::ReadOnly) ) {
[detail]      qint64 n=dataSize();
[detail] -    if(f.read((char *)_samples, n)!=n) {
[detail] -      App::log(tr("Cannot load all bytes from temporary file '%1'\n").arg(f.fileName()));
[detail] +    int nRead=f.read((char *)_samples, n);
[detail] +    if(nRead!=n) {
[detail] +      if(nRead<0) {
[detail] +        App::log(tr("Cannot read temporary file '%1': %2\n")
[detail] +                     .arg(f.fileName()).arg(f.errorString()));
[detail] +      } else {
[detail] +        App::log(tr("Cannot load all bytes from temporary file '%1' (stop at %2/%3)\n")
[detail] +                     .arg(f.fileName()).arg(nRead).arg(n));
[detail] +      }
[detail]        return false;
[detail]      } else {
[detail]        return true;
[detail] @@ -444,6 +479,38 @@
[detail]  }
[detail]  
[detail]  template <class sampleType>
[detail] +void SignalTemplate<sampleType>::add(const SignalTemplate<sampleType> * sig)
[detail] +{
[detail] +  TRACE;
[detail] +  ASSERT(_nSamples==sig->_nSamples);
[detail] +  CacheProcess cp;
[detail] +  cp << this << sig;
[detail] +  LOCK_SAMPLES(sampleType, thisSamples, this)
[detail] +  CONST_LOCK_SAMPLES(sampleType, sigSamples, sig)
[detail] +  for(int i=0; i<_nSamples; i++) {
[detail] +    thisSamples[i]+=sigSamples[i];
[detail] +  }
[detail] +  UNLOCK_SAMPLES(sig)
[detail] +  UNLOCK_SAMPLES(this)
[detail] +}
[detail] +
[detail] +template <class sampleType>
[detail] +void SignalTemplate<sampleType>::add(const SignalTemplate<sampleType> * sig, double factor)
[detail] +{
[detail] +  TRACE;
[detail] +  ASSERT(_nSamples==sig->_nSamples);
[detail] +  CacheProcess cp;
[detail] +  cp << this << sig;
[detail] +  LOCK_SAMPLES(sampleType, thisSamples, this)
[detail] +  CONST_LOCK_SAMPLES(sampleType, sigSamples, sig)
[detail] +  for(int i=0; i<_nSamples; i++) {
[detail] +    thisSamples[i]+=sigSamples[i]*factor;
[detail] +  }
[detail] +  UNLOCK_SAMPLES(sig)
[detail] +  UNLOCK_SAMPLES(this)
[detail] +}
[detail] +
[detail] +template <class sampleType>
[detail]  sampleType SignalTemplate<sampleType>::value(int index) const
[detail]  {
[detail]    TRACE;
[detail]                            src/SortKey.h:  version-4.5.1	modified out of comments
[detail] --- src/SortKey.h-version-4.5.1-stripped	2025-09-28 04:01:07.439514771 +0200
[detail] +++ src/SortKey.h-HEAD-stripped	2025-09-28 04:01:07.443514789 +0200
[detail] @@ -6,7 +6,7 @@
[detail]  #include <QtCore>
[detail]  
[detail]  #include "MetaDataIndex.h"
[detail] -#include "GeoSignal.h"
[detail] +#include "SignalSegment.h"
[detail]  #include "GeopsyCoreDLLExport.h"
[detail]  
[detail]  namespace GeopsyCore {
[detail] @@ -20,7 +20,7 @@
[detail]      bool reversed() const {return _reversed;}
[detail]      void setReversed(bool r) {_reversed=r;}
[detail]  
[detail] -    static inline bool lessThan(const Signal * sig1, const Signal * sig2);
[detail] +    static inline bool lessThan(const SignalSegment * sig1, const SignalSegment * sig2);
[detail]      static void clear() {_keys.clear();}
[detail]      static void add(const SortKey& k) {_keys.append(k);}
[detail]      static void remove(int index) {_keys.removeAt(index);}
[detail] @@ -34,7 +34,7 @@
[detail]      static QList<SortKey> _keys;
[detail]    };
[detail]  
[detail] -  inline bool SortKey::lessThan(const Signal * sig1, const Signal * sig2)
[detail] +  inline bool SortKey::lessThan(const SignalSegment * sig1, const SignalSegment * sig2)
[detail]    {
[detail]      return *sig1<*sig2;
[detail]    }
[detail]                   src/SparseKeepSignal.h:  version-4.5.1	modified out of comments
[detail] --- src/SparseKeepSignal.h-version-4.5.1-stripped	2025-09-28 04:01:07.463514886 +0200
[detail] +++ src/SparseKeepSignal.h-HEAD-stripped	2025-09-28 04:01:07.467514906 +0200
[detail] @@ -20,7 +20,7 @@
[detail]    SparseKeepSignal(const SparseKeepSignal& o);
[detail]    ~SparseKeepSignal();
[detail]  
[detail] -  bool setSampling(const TimeRange& sigRange, double deltaT);
[detail] +  bool setSampling(const TimeRange& sigRange, double samplingPeriod);
[detail]    void removeNullSignals();
[detail]    void initValues(int value, const DateTime& start=DateTime::minimumTime,
[detail]                    const DateTime& end=DateTime::maximumTime);
[detail]                    src/SparseTimeRange.h:  version-4.5.1	modified out of comments
[detail] --- src/SparseTimeRange.h-version-4.5.1-stripped	2025-09-28 04:01:07.483514982 +0200
[detail] +++ src/SparseTimeRange.h-HEAD-stripped	2025-09-28 04:01:07.487515002 +0200
[detail] @@ -42,7 +42,8 @@
[detail]    bool isNull() const {return VectorList<TimeRange>::isEmpty();}
[detail]    const VectorList<TimeRange>& ranges() const {return *this;}
[detail]    inline TimeRange range() const;
[detail] -  double totalLength() const;
[detail] +  double lengthSamples(double samplingFrequency) const {return qRound(lengthSeconds()*samplingFrequency);}
[detail] +  double lengthSeconds() const;
[detail]  
[detail]    void testIndex() const;
[detail]    static void testIndex(int maxCount);
[detail] @@ -51,6 +52,8 @@
[detail]    QString toString() const;
[detail]    bool fromString(const QString& s);
[detail]    bool fromString(const DateTime& ref, const QString& s);
[detail] +
[detail] +  size_t hash() const {return qHash(*this);}
[detail]  protected:
[detail]    int index(const DateTime& t) const;
[detail]    SparseTimeRange intersection(int index, const TimeRange& r) const;
[detail]                         src/StackCount.h:  version-4.5.1	not modified
[detail]                       src/StationGroup.h:  version-4.5.1	not modified
[detail]                        src/StationList.h:  version-4.5.1	modified out of comments
[detail] --- src/StationList.h-version-4.5.1-stripped	2025-09-28 04:01:07.535515234 +0200
[detail] +++ src/StationList.h-HEAD-stripped	2025-09-28 04:01:07.543515273 +0200
[detail] @@ -17,7 +17,7 @@
[detail]    StationList();
[detail]    ~StationList();
[detail]  
[detail] -  bool addSignal(Signal * sig);
[detail] +  bool addSignal(SignalSegment * sig);
[detail]    bool addSignals(SubSignalPool * subPool);
[detail]  
[detail]    void setComponents(StationSignals::Components c);
[detail] @@ -25,7 +25,7 @@
[detail]  
[detail]    StationSignals::Components components() const {return _components;}
[detail]    int nComponents() const {return StationSignals::nComponents(_components);}
[detail] -  Signal::Components component(int index) const {return StationSignals::component(index, _components);}
[detail] +  SignalMetaData::Components component(int index) const {return StationSignals::component(index, _components);}
[detail]  
[detail]    QList<NamedPoint> pointList() const;
[detail]  private:
[detail]              src/StationProcessSignals.h:  version-4.5.1	not modified
[detail]                     src/StationSignals.h:  version-4.5.1	modified out of comments
[detail] --- src/StationSignals.h-version-4.5.1-stripped	2025-09-28 04:01:07.571515408 +0200
[detail] +++ src/StationSignals.h-HEAD-stripped	2025-09-28 04:01:07.575515428 +0200
[detail] @@ -16,23 +16,23 @@
[detail]  {
[detail]    TRANSLATIONS("StationSignals")
[detail]  public:
[detail] -  enum Component {UndefinedComponent = 0, VerticalComponent=1, HorizontalComponent=2, AllComponent=3,
[detail] -                  AnySingleComponent=7, AnyComponent=11};
[detail] -  Q_DECLARE_FLAGS(Components, Component)
[detail] +    enum Components {UndefinedComponents = 0, VerticalComponents=1, HorizontalComponents=2, ThreeComponents=3,
[detail] +                     AnySingleComponent=7, AnyComponent=11, StrainComponents=16,
[detail] +                     HorizontalStrainComponents=18, ThreeComponentsAndStrain=19};
[detail] +    ENUM_AS_STRING_DECL(Components)
[detail]  
[detail] -  StationSignals(Components c=UndefinedComponent);
[detail] +    StationSignals(Components c=UndefinedComponents);
[detail]    virtual ~StationSignals();
[detail]  
[detail] -  void setComponents(Components c);
[detail] -
[detail] +    bool setComponents(Components c);
[detail]    Components components() const {return _components;}
[detail]    int nComponents() const {return nComponents(_components);}
[detail]    static int nComponents(Components c);
[detail] -  static Signal::Components component(int index, Components c);
[detail] +    static SignalMetaData::Components component(int index, Components c);
[detail]  
[detail] -  bool addSignal(Signal * sig);
[detail] +    bool addSignal(SignalSegment * sig);
[detail]    bool hasAllComponents() const;
[detail] -  bool contains(const Signal * sig) const;
[detail] +    bool contains(const SignalSegment * sig) const;
[detail]    static void organizeSubPool(SubSignalPool * subPool);
[detail]  
[detail]    const SubSignalPool& originals(int iComp) const {return _signals[iComp];}
[detail] @@ -42,14 +42,14 @@
[detail]    QString unit() const;
[detail]  
[detail]    
[detail] -  Signal * firstValidSignal() const;
[detail] -  Signal * lastValidSignal() const;
[detail] +    SignalSegment * firstValidSignal() const;
[detail] +    SignalSegment * lastValidSignal() const;
[detail]    inline double samplingPeriod() const;
[detail]    inline double samplingFrequency() const;
[detail]    inline DateTime startTime() const;
[detail]    inline QString name() const;
[detail]    inline QString nameComponent() const;
[detail] -  inline Signal::Components component() const;
[detail] +    inline SignalMetaData::Components component() const;
[detail]    inline const Point& coordinates() const;
[detail]    inline const UtmZone& utmZone() const;
[detail]  
[detail] @@ -65,61 +65,59 @@
[detail]  inline double StationSignals::samplingPeriod() const
[detail]  {
[detail]    TRACE;
[detail] -  Signal * sig=firstValidSignal();
[detail] +    SignalSegment * sig=firstValidSignal();
[detail]    return sig ? sig->samplingPeriod() : 0.0;
[detail]  }
[detail]  
[detail]  inline double StationSignals::samplingFrequency() const
[detail]  {
[detail]    TRACE;
[detail] -  Signal * sig=firstValidSignal();
[detail] +    SignalSegment * sig=firstValidSignal();
[detail]    return sig ? sig->samplingFrequency() : 0.0;
[detail]  }
[detail]  
[detail]  inline DateTime StationSignals::startTime() const
[detail]  {
[detail]    TRACE;
[detail] -  Signal * sig=firstValidSignal();
[detail] +    SignalSegment * sig=firstValidSignal();
[detail]    return sig ? sig->startTime() : DateTime();
[detail]  }
[detail]  
[detail]  inline QString StationSignals::name() const
[detail]  {
[detail]    TRACE;
[detail] -  Signal * sig=firstValidSignal();
[detail] -  return sig ? sig->name() : QString();
[detail] +    SignalSegment * sig=firstValidSignal();
[detail] +    return sig ? sig->metaData()->name() : QString();
[detail]  }
[detail]  
[detail]  inline QString StationSignals::nameComponent() const
[detail]  {
[detail]    TRACE;
[detail] -  Signal * sig=firstValidSignal();
[detail] -  return sig ? sig->nameComponent() : QString();
[detail] +    SignalSegment * sig=firstValidSignal();
[detail] +    return sig ? sig->metaData()->nameComponent() : QString();
[detail]  }
[detail]  
[detail] -inline Signal::Components StationSignals::component() const
[detail] +  inline SignalMetaData::Components StationSignals::component() const
[detail]  {
[detail]    TRACE;
[detail] -  Signal * sig=firstValidSignal();
[detail] -  return sig ? sig->component() : Signal::UndefinedComponent;
[detail] +    SignalSegment * sig=firstValidSignal();
[detail] +    return sig ? sig->metaData()->component() : SignalMetaData::UndefinedComponent;
[detail]  }
[detail]  
[detail]  inline const Point& StationSignals::coordinates() const
[detail]  {
[detail]    static Point dummy;
[detail] -  Signal * sig=firstValidSignal();
[detail] -  return sig ? sig->receiver() : dummy;
[detail] +    SignalSegment * sig=firstValidSignal();
[detail] +    return sig ? sig->metaData()->receiver() : dummy;
[detail]  }
[detail]  
[detail]  inline const UtmZone& StationSignals::utmZone() const
[detail]  {
[detail]    static UtmZone dummy;
[detail] -  Signal * sig=firstValidSignal();
[detail] -  return sig ? sig->utmZone() : dummy;
[detail] +    SignalSegment * sig=firstValidSignal();
[detail] +    return sig ? sig->metaData()->utmZone() : dummy;
[detail]  }
[detail]  
[detail]  } 
[detail]  
[detail] -Q_DECLARE_OPERATORS_FOR_FLAGS(GeopsyCore::StationSignals::Components)
[detail] -
[detail]  #endif 
[detail]                       src/StoredSignal.h:  version-4.5.1	no last version available
[detail]                      src/SubSignalPool.h:  version-4.5.1	modified out of comments
[detail] --- src/SubSignalPool.h-version-4.5.1-stripped	2025-09-28 04:01:07.603515563 +0200
[detail] +++ src/SubSignalPool.h-HEAD-stripped	2025-09-28 04:01:07.607515583 +0200
[detail] @@ -3,10 +3,8 @@
[detail]  #ifndef SUBSIGNALPOOL_H
[detail]  #define SUBSIGNALPOOL_H
[detail]  
[detail] -#include <QGpCoreTools.h>
[detail] -
[detail]  #include "GeopsyCoreDLLExport.h"
[detail] -#include "GeoSignal.h"
[detail] +#include "SignalSegment.h"
[detail]  #include "SortKey.h"
[detail]  #include "TimeRangeParameters.h"
[detail]  #include "PickParameters.h"
[detail] @@ -17,35 +15,33 @@
[detail]    class MetaDataFieldList;
[detail]    class SeismicEvent;
[detail]  
[detail] -  extern const char * SignalKeyName [];
[detail] -
[detail] -  class GEOPSYCORE_EXPORT SubSignalPool: protected QList<Signal *>
[detail] +  class GEOPSYCORE_EXPORT SubSignalPool : protected QList<SignalSegment *>
[detail]    {
[detail] -    TRANSLATIONS( "SubPoolWindow" )
[detail] +    TRANSLATIONS("SubSignalPool")
[detail]    public:
[detail]      SubSignalPool() {}
[detail]      SubSignalPool(const SubSignalPool& subPool);
[detail]      ~SubSignalPool() {removeAll();}
[detail]  
[detail]      
[detail] -    typedef QList<Signal *>::iterator iterator;
[detail] -    typedef QList<Signal *>::const_iterator const_iterator;
[detail] -    iterator begin() {return QList<Signal *>::begin();}
[detail] -    iterator end() {return QList<Signal *>::end();}
[detail] -    const_iterator begin() const {return QList<Signal *>::begin();}
[detail] -    const_iterator end() const {return QList<Signal *>::end();}
[detail] +    typedef QList<SignalSegment *>::iterator iterator;
[detail] +    typedef QList<SignalSegment *>::const_iterator const_iterator;
[detail] +    iterator begin() {return QList<SignalSegment *>::begin();}
[detail] +    iterator end() {return QList<SignalSegment *>::end();}
[detail] +    const_iterator begin() const {return QList<SignalSegment *>::begin();}
[detail] +    const_iterator end() const {return QList<SignalSegment *>::end();}
[detail]      SubSignalPool& operator=(const SubSignalPool& o);
[detail]      bool operator==(const SubSignalPool& o) const;
[detail]      bool operator!=(const SubSignalPool& o) const {return !operator==(o);}
[detail]      SubSignalPool copy() const;
[detail] -    int count() const {return QList<Signal *>::count();}
[detail] +    int count() const {return QList<SignalSegment *>::count();}
[detail]      int samplesCount();
[detail] -    bool isEmpty() const {return QList<Signal *>::isEmpty();}
[detail] -    Signal * at(int index) const {return QList<Signal *>::at(index);}
[detail] -    Signal * first() const {return QList<Signal *>::first();}
[detail] -    Signal * last() const {return QList<Signal *>::last();}
[detail] -    int indexOf(const Signal * sig) const {return QList<Signal *>::indexOf(const_cast<Signal *>(sig));}
[detail] -    bool contains(const Signal * sig) const;
[detail] +    bool isEmpty() const {return QList<SignalSegment *>::isEmpty();}
[detail] +    SignalSegment * at(int index) const {return QList<SignalSegment *>::at(index);}
[detail] +    SignalSegment * first() const {return QList<SignalSegment *>::first();}
[detail] +    SignalSegment * last() const {return QList<SignalSegment *>::last();}
[detail] +    int indexOf(const SignalSegment * sig) const {return QList<SignalSegment *>::indexOf(const_cast<SignalSegment *>(sig));}
[detail] +    bool contains(const SignalSegment * sig) const;
[detail]      QMap<QString,int> signalNames() const;
[detail]      int spectraCount() const;
[detail]  
[detail] @@ -69,17 +65,18 @@
[detail]      void addAll(SignalDatabase * db);
[detail]      void addSubPool(const SubSignalPool& subPool);
[detail]      void addReceiver(Point point);
[detail] -    void addSignal(Signal * sig) {append(sig);}
[detail] -    void addSignal(SignalDatabase * db, int id);
[detail] +    void addSignal(SignalSegment * sig) {append(sig);}
[detail] +    void addSignal(SignalDatabase * db, const UniqueID& id);
[detail]      void addFile(SignalDatabase * db, int fileN);
[detail] -    void addFile(const SignalFile * sf);
[detail] +    void addFile(const AbstractSignalFile * file);
[detail] +    void addFile(const SignalFileIndex& file);
[detail]      void addGroup(const AbstractSignalGroup * g);
[detail]      void addList(QString signalList);
[detail] -    void insertSignal(Signal * sig, Signal * refSig=nullptr, bool before=true);
[detail] -    void remove(Signal * sig);
[detail] +    void insertSignal(SignalSegment * sig, SignalSegment * refSig=nullptr, bool before=true);
[detail] +    void remove(SignalSegment * sig);
[detail]      void remove(const SubSignalPool& subPool);
[detail]      void removeAt(int i);
[detail] -    void remove(Signal::Components comp);
[detail] +    void remove(SignalMetaData::Components comp);
[detail]      void remove(const QStringList& keepSignalNames);
[detail]      void removeAll();
[detail]      void debugSignalSharing();
[detail] @@ -93,15 +90,16 @@
[detail]      
[detail]      void subtractValue(double val=0.0);
[detail]      void removeTrend();
[detail] -    void signalOperationAdd(Signal * bysig);
[detail] +    void signalOperationAdd(SignalSegment * bysig);
[detail]      void signalOperationAdd(SubSignalPool * bySubPool);
[detail] -    void signalOperationSubtract(Signal * bysig);
[detail] +    void signalOperationSubtract(SignalSegment * bysig);
[detail]      void signalOperationSubtract(SubSignalPool * bySubPool);
[detail] +    void stack();
[detail]      void filter(const FilterParameters& param);
[detail]      void waveletTransform(const MorletParameters& param);
[detail]      void shift(double dt);
[detail]      void overSample(double factor);
[detail] -    void whiten();
[detail] +    void whiten(double fmin, double fmax, double apodization);
[detail]      void agc(double width);
[detail]      void stddevClip(double factor);
[detail]      void multiply(double value);
[detail] @@ -110,12 +108,14 @@
[detail]      void stalta(double tsta, double tlta);
[detail]      void taper(const TimeRangeParameters& range, const WindowFunctionParameters& param);
[detail]      void cut(const TimeRangeParameters& param);
[detail] -    void correlations(double maxDelay, const Signal * referenceSig=nullptr);
[detail] -    void normalizedCorrelations(double maxDelay, const Signal * referenceSig=nullptr);
[detail] -    void convolution(const Signal * referenceSig);
[detail] +    void correlations(double maxDelay, const SignalSegment * referenceSig=nullptr);
[detail] +    void normalizedCorrelations(double maxDelay, const SignalSegment * referenceSig=nullptr);
[detail] +    void convolution(const SignalSegment * referenceSig);
[detail]      bool removeInstrumentalResponse(const InstrumentalResponse& sensor);
[detail]      void decimateAmplitude(int maxCount, double maxRef);
[detail]      void decimateTime(int factor);
[detail] +    void derivate();
[detail] +    void integrate();
[detail]      void random(double maxAmplitude, Random * generator=nullptr);
[detail]      void fastFourierTransform(DoubleSignal::SignalType st);
[detail]      void discreteFourierTransform();
[detail] @@ -144,8 +144,8 @@
[detail]    private:
[detail]      bool exportFilePath(QString& filePath, bool useOriginalBaseName, const SignalFileFormat& f) const;
[detail]      bool check3ComponentTriplet(SubSignalPool& triplet);
[detail] -    inline void prepend(Signal * sig);
[detail] -    inline void append(Signal * sig);
[detail] +    inline void prepend(SignalSegment * sig);
[detail] +    inline void append(SignalSegment * sig);
[detail]  
[detail]      bool saveSeg2(QString filePath) const;
[detail]      bool saveSeg2Return(bool ret, qint32 * offset) const;
[detail] @@ -169,24 +169,24 @@
[detail]      bool saveGse2(QString filePath) const;
[detail]      bool saveMiniSeed(QString filePath) const;
[detail]  
[detail] -    mutable QSet<const Signal *> _lookup;
[detail] +    mutable QSet<const SignalSegment *> _lookup;
[detail]    };
[detail]  
[detail] -  inline void SubSignalPool::append(Signal * sig)
[detail] +  inline void SubSignalPool::append(SignalSegment * sig)
[detail]    {
[detail]      TRACE;
[detail]      if(sig) {
[detail]        sig->addReference();
[detail] -      QList<Signal *>::append(sig);
[detail] +      QList<SignalSegment *>::append(sig);
[detail]      }
[detail]    }
[detail]  
[detail] -  inline void SubSignalPool::prepend(Signal * sig)
[detail] +  inline void SubSignalPool::prepend(SignalSegment * sig)
[detail]    {
[detail]      TRACE;
[detail]      if(sig) {
[detail]        sig->addReference();
[detail] -      QList<Signal *>::prepend(sig);
[detail] +      QList<SignalSegment *>::prepend(sig);
[detail]      }
[detail]    }
[detail]  
[detail]               src/SubSignalPoolProcess.h:  version-4.5.1	not modified
[detail]                       src/SyscomHeader.h:  version-4.5.1	modified out of comments
[detail] --- src/SyscomHeader.h-version-4.5.1-stripped	2025-09-28 04:01:07.647515776 +0200
[detail] +++ src/SyscomHeader.h-HEAD-stripped	2025-09-28 04:01:07.651515796 +0200
[detail] @@ -3,7 +3,7 @@
[detail]  #ifndef SYSCOMHEADER_H
[detail]  #define SYSCOMHEADER_H
[detail]  
[detail] -#include "GeoSignal.h"
[detail] +#include "SignalMetaData.h"
[detail]  #include "GeopsyCoreDLLExport.h"
[detail]  
[detail]  namespace GeopsyCore {
[detail] @@ -13,7 +13,7 @@
[detail]  class GEOPSYCORE_EXPORT SyscomHeader
[detail]  {
[detail]  public:
[detail] -  static Signal::Components component(int channel);
[detail] +  static SignalMetaData::Components component(int channel);
[detail]  protected:
[detail]    struct Time {
[detail]      uchar SECOND;
[detail]                  src/SyscomSVmrxHeader.h:  version-4.5.1	not modified
[detail]                    src/SyscomXmrHeader.h:  version-4.5.1	not modified
[detail]                      src/TaperDelegate.h:  version-4.5.1	modified out of comments
[detail] --- src/TaperDelegate.h-version-4.5.1-stripped	2025-09-28 04:01:07.695516007 +0200
[detail] +++ src/TaperDelegate.h-HEAD-stripped	2025-09-28 04:01:07.703516047 +0200
[detail] @@ -6,7 +6,6 @@
[detail]  #include <QGpCoreMath.h>
[detail]  
[detail]  #include "GeopsyCoreDLLExport.h"
[detail] -#include "TimeRange.h"
[detail]  
[detail]  namespace GeopsyCore {
[detail]  
[detail]                           src/TimePick.h:  version-4.5.1	modified out of comments
[detail] --- src/TimePick.h-version-4.5.1-stripped	2025-09-28 04:01:07.715516105 +0200
[detail] +++ src/TimePick.h-HEAD-stripped	2025-09-28 04:01:07.719516123 +0200
[detail] @@ -17,31 +17,31 @@
[detail]      TimePick() {}
[detail]      TimePick(const TimePick& o) : MetaData(), _values(o._values) {}
[detail]  
[detail] -    virtual bool operator==(const MetaData& o) const;
[detail] -    virtual void operator=(const MetaData& o);
[detail] +    bool operator==(const MetaData& o) const;
[detail] +    void operator=(const MetaData& o);
[detail]  
[detail] -    virtual QStringList subNames() const;
[detail] -    virtual QStringList indexList(int) const {return registeredNames();}
[detail] -    virtual QString name(int, const QString& index) const;
[detail] -    virtual QString baseName(int) const;
[detail] -    virtual QString title(int, const QString& index) const;
[detail] +    QStringList subNames() const;
[detail] +    QStringList indexList(int) const {return registeredNames();}
[detail] +    QString name(int, const QString& index) const;
[detail] +    QString baseName(int) const;
[detail] +    QString title(int, const QString& index) const;
[detail]  
[detail] -    virtual QString toString(const QString& index) const;
[detail] -    virtual bool fromString(const QString& index, QString string);
[detail] +    QString toString(const QString& index) const;
[detail] +    bool fromString(const QString& index, QString string);
[detail]  
[detail]      DateTime value(const QString& name) const;
[detail]      void removeValue(const QString& name);
[detail]      void setValue(const QString& name, DateTime t);
[detail]      QStringList names() const;
[detail]  
[detail] -    virtual bool isArray(int) const {return true;}
[detail] +    bool isArray(int) const {return true;}
[detail]      int count() const {return _names.count();}
[detail] -    virtual int count(int) const {return _names.count();}
[detail] -    virtual bool hasIndex(int) const {return true;}
[detail] -    virtual bool hasIndex(int, const QString& index) const;
[detail] -    virtual QVariant data(int, const QString& index) const;
[detail] -    virtual bool setData(int, const QString& index, const QVariant& val);
[detail] -    virtual int compare(int, const QString& index, const MetaData& o) const;
[detail] +    int count(int) const {return _names.count();}
[detail] +    bool hasIndex(int) const {return true;}
[detail] +    bool hasIndex(int, const QString& index) const;
[detail] +    QVariant data(int, const QString& index) const;
[detail] +    bool setData(int, const QString& index, const QVariant& val);
[detail] +    int compare(int, const QString& index, const MetaData& o) const;
[detail]  
[detail]      static bool registered(const QString& name) {return _name2index.contains(name);}
[detail]      static QStringList registeredNames() {return _name2index.keys();}
[detail] @@ -52,7 +52,9 @@
[detail]      static QString nextUnlockedPick(const QString& name);
[detail]      static QString previousUnlockedPick(const QString& name);
[detail]  
[detail] -    virtual void writeProperties(XMLStream& s, const XMLSaveAttributes& attributes) const;
[detail] +    void writeProperties(XMLStream& s, const XMLSaveAttributes& attributes) const;
[detail] +
[detail] +    size_t hash() const {return ::qHash(_values.keys())+::qHash(_values.values());}
[detail]    private:
[detail]      class Name
[detail]      {
[detail]                          src/TimeRange.h:  version-4.5.1	modified out of comments
[detail] --- src/TimeRange.h-version-4.5.1-stripped	2025-09-28 04:01:07.731516181 +0200
[detail] +++ src/TimeRange.h-HEAD-stripped	2025-09-28 04:01:07.735516201 +0200
[detail] @@ -33,16 +33,19 @@
[detail]      inline void shift(double s);
[detail]      inline void round(const DateTime& rt, double period) {round(rt, period, 1.0/period);}
[detail]      inline void round(const DateTime& rt, double period, double frequency);
[detail] +    inline void roundStart(const DateTime& rt, double period) {roundStart(rt, period, 1.0/period);}
[detail] +    inline void roundStart(const DateTime& rt, double period, double frequency);
[detail]      inline TimeRange shifted(double s) const;
[detail]      inline void scale(const DateTime& center, double factor);
[detail]      inline void truncate(double s);
[detail]      inline TimeRange truncated(double s) const;
[detail]  
[detail] -    int lengthSamples(double samplingFrequency) const {return qRound(lengthSeconds()*samplingFrequency);}
[detail] +    int lengthSamples(double samplingFrequency) const {return qFloor(lengthSeconds()*samplingFrequency);}
[detail]      double lengthSeconds() const {return _start.secondsTo(_end);}
[detail]  
[detail]      inline TimeRange intersection(const TimeRange& tw) const;
[detail]      inline bool intersects(const TimeRange& tw) const;
[detail] +    inline bool intersects(const TimeRange& tw, double precision) const;
[detail]      bool contains(const DateTime& t) const {return _start<=t && t<=_end;}
[detail]  
[detail]      QString toString() const;
[detail] @@ -53,6 +56,8 @@
[detail]      DateTime _end;
[detail]    };
[detail]  
[detail] +  GEOPSYCORE_EXPORT size_t qHash(const TimeRange& r);
[detail] +
[detail]    inline TimeRange::TimeRange(const DateTime& start, const DateTime& end)
[detail]    {
[detail]      if(start>end) {
[detail] @@ -105,6 +110,16 @@
[detail]      _end+=s;
[detail]    }
[detail]  
[detail] +  inline void TimeRange::roundStart(const DateTime& rt, double period, double frequency)
[detail] +  {
[detail] +    double s=qCeil(rt.secondsTo(_start)*frequency)*period;
[detail] +    double l=lengthSeconds();
[detail] +    _start=rt;
[detail] +    _start+=s;
[detail] +    _end=_start;
[detail] +    _end+=l;
[detail] +  }
[detail] +
[detail]    inline void TimeRange::truncate(double s)
[detail]    {
[detail]      if(lengthSeconds()>s) {
[detail] @@ -156,10 +171,21 @@
[detail]  
[detail]    inline bool TimeRange::intersects(const TimeRange& tw) const
[detail]    {
[detail] -    if(tw._end < _start || tw._start > _end)
[detail] +    if(tw._end<=_start || tw._start>=_end) {
[detail]        return false;
[detail] +    } else {
[detail]      return true;
[detail]    }
[detail] +  }
[detail] +
[detail] +  inline bool TimeRange::intersects(const TimeRange& tw, double precision) const
[detail] +  {
[detail] +    if(tw._end.compare(_start, precision)<=0 || tw._start.compare(_end, precision)>=0) {
[detail] +      return false;
[detail] +    } else {
[detail] +      return true;
[detail] +    }
[detail] +  }
[detail]  
[detail]  } 
[detail]  
[detail]                      src/TimeRangeList.h:  version-4.5.1	not modified
[detail]                src/TimeRangeParameters.h:  version-4.5.1	modified out of comments
[detail] --- src/TimeRangeParameters.h-version-4.5.1-stripped	2025-09-28 04:01:07.771516375 +0200
[detail] +++ src/TimeRangeParameters.h-HEAD-stripped	2025-09-28 04:01:07.775516394 +0200
[detail] @@ -10,7 +10,8 @@
[detail]  
[detail]  namespace GeopsyCore {
[detail]  
[detail] -  class Signal;
[detail] +  class SignalSegment;
[detail] +  class SignalSegment;
[detail]    class SubSignalPool;
[detail]    class StationSignals;
[detail]  
[detail] @@ -47,7 +48,7 @@
[detail]      const QString& reference() const {return _reference;}
[detail]      void setReference(const QString& ref) {_reference=ref;}
[detail]  
[detail] -    TimeRange absoluteRange(const GeopsyCore::Signal * sig) const;
[detail] +    TimeRange absoluteRange(const SignalSegment * sig) const;
[detail]      TimeRange absoluteRange(const SubSignalPool * subPool) const;
[detail]      TimeRange absoluteRange(const StationSignals * sigs) const;
[detail]  
[detail] @@ -69,8 +70,8 @@
[detail]      static QString type2String(Type t);
[detail]      static Type string2Type(QString t);
[detail]  
[detail] -    DateTime absoluteStart(const GeopsyCore::Signal * sig) const;
[detail] -    DateTime absoluteEnd(const GeopsyCore::Signal * sig) const;
[detail] +    DateTime absoluteStart(const SignalSegment * sig) const;
[detail] +    DateTime absoluteEnd(const SignalSegment * sig) const;
[detail]      DateTime absoluteStart(const SubSignalPool * subPool) const;
[detail]      DateTime absoluteEnd(const SubSignalPool * subPool) const;
[detail]  
[detail]                         src/TimeWindow.h:  version-4.5.1	not modified
[detail]                     src/TimeWindowList.h:  version-4.5.1	not modified
[detail]                         src/WaveHeader.h:  version-4.5.1	not modified
[detail]                src/WindowingParameters.h:  version-4.5.1	not modified
[detail]                          src/XMLSignal.h:  version-4.5.1	modified out of comments
[detail] --- src/XMLSignal.h-version-4.5.1-stripped	2025-09-28 04:01:07.851516762 +0200
[detail] +++ src/XMLSignal.h-HEAD-stripped	2025-09-28 04:01:07.855516780 +0200
[detail] @@ -5,7 +5,7 @@
[detail]  
[detail]  #include <QGpCoreTools.h>
[detail]  
[detail] -#include "GeoSignal.h"
[detail] +#include "SignalSegment.h"
[detail]  #include "GeopsyCoreDLLExport.h"
[detail]  
[detail]  namespace GeopsyCore {
[detail] @@ -14,23 +14,24 @@
[detail]  {
[detail]  public:
[detail]    XMLSignal();
[detail] -  XMLSignal(Signal * sig);
[detail] +    XMLSignal(SignalSegment * sig);
[detail]    ~XMLSignal() {}
[detail]  
[detail] -  virtual const QString& xml_tagName() const {return xmlSignalTag;}
[detail] +    const QString& xml_tagName() const {return xmlSignalTag;}
[detail]    static const QString xmlSignalTag;
[detail]  
[detail] -  Signal * signal() const;
[detail] +    SignalSegment * signal() const;
[detail]  protected:
[detail] -  virtual void xml_writeProperties(XML_WRITEPROPERTIES_ARGS) const;
[detail] -  virtual void xml_writeBinaryData(XML_WRITEBINARYDATA_ARGS) const;
[detail] -  virtual bool xml_setBinaryData(XML_SETBINARYDATA_ARGS);
[detail] -  virtual bool xml_setProperty(XML_SETPROPERTY_ARGS);
[detail] -  virtual XMLMember xml_member(XML_MEMBER_ARGS);
[detail] +    void xml_writeProperties(XML_WRITEPROPERTIES_ARGS) const;
[detail] +    void xml_writeBinaryData(XML_WRITEBINARYDATA_ARGS) const;
[detail] +    bool xml_setAttributes(XML_SETATTRIBUTES_ARGS);
[detail] +    bool xml_setBinaryData(XML_SETBINARYDATA_ARGS);
[detail] +    bool xml_setProperty(XML_SETPROPERTY_ARGS);
[detail] +    XMLMember xml_member(XML_MEMBER_ARGS);
[detail]  private:
[detail] -  Signal * _sig;
[detail] -  SignalDatabase * _database;
[detail] -  int _id;
[detail] +    SignalSegment * _sig;
[detail] +    SignalDatabase * _db;
[detail] +    UniqueID _id;
[detail]  };
[detail]  
[detail]  } 
[detail]                   src/XMLSubSignalPool.h:  version-4.5.1	not modified
[summary] Total differences: 13647 lines
[summary] Modification level is B
OLD_DIR=$(pwd)
echo "GeopsyCore"
cd $(find . -name "GeopsyCore" | tail -n 1) || exit 2
pwd
dpversion B  || exit 2
cd $OLD_DIR || exit 2
################## GeopsyGui
[detail]            src/AbstractGraphicWindow.cpp:  version-3.5.0	not modified
[detail]               src/AbstractToolWidget.cpp:  version-3.5.0	modified out of comments
[detail] --- src/AbstractToolWidget.cpp-version-3.5.0-stripped	2025-09-28 04:01:07.955517264 +0200
[detail] +++ src/AbstractToolWidget.cpp-HEAD-stripped	2025-09-28 04:01:07.959517283 +0200
[detail] @@ -57,16 +57,15 @@
[detail]    TRACE;
[detail]    bool ret;
[detail]    
[detail] +  emit beginUpdateSubPool();
[detail]    if(_tool) {
[detail]      ret=_tool->setSubPool(subPool);
[detail]    } else {
[detail]      
[detail]      ret=initStations(subPool);
[detail]    }
[detail] -  if(ret) {
[detail]      
[detail] -    emit updateSubPool();
[detail] -  }
[detail] +  emit endUpdateSubPool();
[detail]    return ret;
[detail]  }
[detail]  
[detail] @@ -148,7 +147,7 @@
[detail]    TRACE;
[detail]    if(fileName.isEmpty()) {
[detail]      fileName=Message::getOpenFileName(tr("Loading parameters"),
[detail] -                                          tr("Log file (*.log);"
[detail] +                                          tr("Log file (*.log);;"
[detail]                                               "Parameter file (*.param)"));
[detail]    }
[detail]    if(fileName.length()>0) {
[detail] @@ -166,6 +165,10 @@
[detail]      if(_tool->parameters()->load(s, beginPatterns, endPatterns)) {
[detail]        parametersToGui();
[detail]        return true;
[detail] +    } else {
[detail] +      Message::warning(MSG_ID, tr("Loading parameters"),
[detail] +                       tr("Error parsing file, see general log for details."), Message::cancel());
[detail] +      return false;
[detail]      }
[detail]    }
[detail]    return false;
[detail]                  src/ArrayDefinition.cpp:  version-3.5.0	modified out of comments
[detail] --- src/ArrayDefinition.cpp-version-3.5.0-stripped	2025-09-28 04:01:07.975517361 +0200
[detail] +++ src/ArrayDefinition.cpp-HEAD-stripped	2025-09-28 04:01:07.979517381 +0200
[detail] @@ -2,15 +2,18 @@
[detail]  
[detail]  #include <GeopsyCore.h>
[detail]  #include <QGpGuiTools.h>
[detail] +
[detail]  #include "ArrayDefinition.h"
[detail] +#include "ui_ArrayDefinition.h"
[detail]  
[detail]  namespace GeopsyGui {
[detail]  
[detail]  ArrayDefinition::ArrayDefinition(QWidget * parent)
[detail] -    : Dialog(parent)
[detail] +      : Dialog(parent),
[detail] +        _ui(new Ui::ArrayDefinition)
[detail]  {
[detail]    TRACE;
[detail] -  setupUi(this);
[detail] +    _ui->setupUi(this);
[detail]    
[detail]    QTreeWidgetItem * headers=new QTreeWidgetItem;
[detail]    headers->setText(0, tr( "Group name"));
[detail] @@ -21,7 +24,7 @@
[detail]    headers->setText(5, tr( "Rec x"));
[detail]    headers->setText(6, tr( "Rec y"));
[detail]    headers->setText(7, tr( "Rec y"));
[detail] -  groupList->setHeaderItem(headers);
[detail] +    _ui->groupList->setHeaderItem(headers);
[detail]    
[detail]    
[detail]  }
[detail] @@ -34,15 +37,15 @@
[detail]  {
[detail]    TRACE;
[detail]    QString str=Message::getOpenFileName(tr("Choose CAP Settings file"), tr("settings file (*)"));
[detail] -  if(str.length() > 0) capSettings->setText(str);
[detail] +    if(str.length() > 0) _ui->capSettings->setText(str);
[detail]  }
[detail]  
[detail]  
[detail]  void ArrayDefinition::setCurrentGroup(QString groupName)
[detail]  {
[detail]    TRACE;
[detail] -  QList<QTreeWidgetItem *> items=groupList->findItems (groupName, Qt::MatchExactly, 0);
[detail] -  groupList->setCurrentItem(items.first());
[detail] +    QList<QTreeWidgetItem *> items=_ui->groupList->findItems (groupName, Qt::MatchExactly, 0);
[detail] +    _ui->groupList->setCurrentItem(items.first());
[detail]  }
[detail]  
[detail]  void ArrayDefinition::setStartTime(QString t)
[detail] @@ -51,13 +54,13 @@
[detail]    QDate dt(t.mid(0, 4).toInt(), t.mid(4, 2).toInt(), t.mid(6, 2).toInt());
[detail]    QTime tm(t.mid(8, 2).toInt(), t.mid(10, 2).toInt(), t.mid(12, 2).toInt(), t.mid(15, 3).toInt());
[detail]    QDateTime dttm(dt, tm);
[detail] -  startTime->setDateTime(dttm);
[detail] +    _ui->startTime->setDateTime(dttm);
[detail]  }
[detail]  
[detail]  QString ArrayDefinition::getStartTime()
[detail]  {
[detail]    TRACE;
[detail] -  QString str=startTime->dateTime().toString("yyyyMMddhhmmss.zzz");
[detail] +    QString str=_ui->startTime->dateTime().toString("yyyyMMddhhmmss.zzz");
[detail]    return str;
[detail]  }
[detail]  
[detail] @@ -67,13 +70,13 @@
[detail]    QDate dt(t.mid(0, 4).toInt(), t.mid(4, 2).toInt(), t.mid(6, 2).toInt());
[detail]    QTime tm(t.mid(8, 2).toInt(), t.mid(10, 2).toInt(), t.mid(12, 2).toInt(), t.mid(15, 3).toInt());
[detail]    QDateTime dttm(dt, tm);
[detail] -  endTime->setDateTime(dttm);
[detail] +    _ui->endTime->setDateTime(dttm);
[detail]  }
[detail]  
[detail]  QString ArrayDefinition::getEndTime()
[detail]  {
[detail]    TRACE;
[detail] -  QString str=endTime->dateTime().toString("yyyyMMddhhmmss.zzz");
[detail] +    QString str=_ui->endTime->dateTime().toString("yyyyMMddhhmmss.zzz");
[detail]    return str;
[detail]  }
[detail]  
[detail] @@ -81,10 +84,10 @@
[detail]  {
[detail]    TRACE;
[detail]    if(current->type()==0)    
[detail] -    selectedGroup->setText(current->text(0) );
[detail] +      _ui->selectedGroup->setText(current->text(0) );
[detail]    else {
[detail]      QString groupName=current->parent() ->text(0);
[detail] -    selectedGroup->setText(groupName);
[detail] +      _ui->selectedGroup->setText(groupName);
[detail]      SubSignalPool subPool;
[detail]      
[detail]      
[detail] @@ -94,8 +97,8 @@
[detail]  void ArrayDefinition::on_wdBrowse_clicked()
[detail]  {
[detail]    TRACE;
[detail] -  QString s=Message::getExistingDirectory(tr( "Cap working directory" ), wd->text());
[detail] -  if(s.length() > 0) wd->setText(s);
[detail] +    QString s=Message::getExistingDirectory(tr( "Cap working directory" ), _ui->wd->text());
[detail] +    if(s.length() > 0) _ui->wd->setText(s);
[detail]  }
[detail]  
[detail]  } 
[detail]                         src/ArrayMap.cpp:  version-3.5.0	not modified
[detail]      src/AsciiSignalComponentsWidget.cpp:  version-3.5.0	modified out of comments
[detail] --- src/AsciiSignalComponentsWidget.cpp-version-3.5.0-stripped	2025-09-28 04:01:08.007517515 +0200
[detail] +++ src/AsciiSignalComponentsWidget.cpp-HEAD-stripped	2025-09-28 04:01:08.011517535 +0200
[detail] @@ -59,7 +59,7 @@
[detail]      if(index.column()==0) {
[detail]        return _format->component(index.row()).pattern();
[detail]      } else {
[detail] -      return Signal::userName(_format->component(index.row()).component());
[detail] +      return SignalMetaData::userName(_format->component(index.row()).component());
[detail]      }
[detail]    default:
[detail]      return QVariant();
[detail] @@ -91,7 +91,7 @@
[detail]      if(index.column()==0) {
[detail]        _format->component(index.row()).setPattern(value.toString());
[detail]      } else {
[detail] -      _format->component(index.row()).setComponent(Signal::userComponent(value.toString()));
[detail] +      _format->component(index.row()).setComponent(SignalMetaData::userComponent(value.toString()));
[detail]      }
[detail]      return true;
[detail]    default:
[detail]          src/AsciiSignalFormatEditor.cpp:  version-3.5.0	modified out of comments
[detail] --- src/AsciiSignalFormatEditor.cpp-version-3.5.0-stripped	2025-09-28 04:01:08.031517632 +0200
[detail] +++ src/AsciiSignalFormatEditor.cpp-HEAD-stripped	2025-09-28 04:01:08.035517650 +0200
[detail] @@ -247,7 +247,7 @@
[detail]    } else {
[detail]      App::log(tr("Error while loading file, see above log.\n") );
[detail]    }
[detail] -  db->removeFile(f);
[detail] +  delete f;
[detail]    _format.removeReference();
[detail]    AsciiSignalFormat::setVerbose(false);
[detail]  }
[detail]           src/AsciiSignalRulesWidget.cpp:  version-3.5.0	not modified
[detail]                  src/ChronogramLayer.cpp:  version-3.5.0	modified out of comments
[detail] --- src/ChronogramLayer.cpp-version-3.5.0-stripped	2025-09-28 04:01:08.071517825 +0200
[detail] +++ src/ChronogramLayer.cpp-HEAD-stripped	2025-09-28 04:01:08.075517845 +0200
[detail] @@ -74,14 +74,18 @@
[detail]        StationRange ranges;
[detail]        
[detail]        int nSigs=subPool.count();
[detail] -      for (int iSig=0; iSig<nSigs; iSig++) {
[detail] -        ranges._available.add(subPool.at(iSig)->timeRange(), false);
[detail] -      }
[detail] -      
[detail] +      if(nSigs>0) {
[detail] +        SparseTimeRange * r0=new SparseTimeRange(subPool.at(0)->timeRange());
[detail] +        SparseTimeRange * r1=nullptr;
[detail] +        ranges._available.add(*r0, false);
[detail]        for (int iSig=1; iSig<nSigs; iSig++) {
[detail] -        Signal * sig0=subPool.at(iSig-1);
[detail] -        Signal * sig1=subPool.at(iSig);
[detail] -        ranges._overlap.add(sig0->timeRange().intersection(sig1->timeRange()));
[detail] +          r1=new SparseTimeRange(subPool.at(iSig)->timeRange());
[detail] +          ranges._available.add(*r1, false);
[detail] +          ranges._overlap.add(r0->intersection(*r1));
[detail] +          qSwap(r0, r1);
[detail] +        }
[detail] +        delete r0;
[detail] +        delete r1;
[detail]        }
[detail]        _ranges.append(ranges);
[detail]      }
[detail] @@ -92,10 +96,14 @@
[detail]  {
[detail]    TRACE;
[detail]    int nComp=_stations.nComponents();
[detail] +  if(nComp>0) {
[detail]    int iStat=index/nComp;
[detail]    int iComp=index-iStat*nComp;
[detail] -  QString compString=Signal::componentLetter(_stations.component(iComp));
[detail] +    QString compString=SignalMetaData::componentLetter(_stations.component(iComp));
[detail]    return _stations.at(iStat)->name()+" "+compString;
[detail] +  } else {
[detail] +    return tr("###");
[detail] +  }
[detail]  }
[detail]  
[detail]  Rect ChronogramLayer::boundingRect() const
[detail] @@ -144,7 +152,7 @@
[detail]      for(int iComp=0;iComp<nComp;iComp++) {
[detail]        const SubSignalPool& subPool=stat->originals(iComp);
[detail]        if(!subPool.isEmpty()) {
[detail] -        s << tr("  Component %1").arg(subPool.first()->componentUserName()) << Qt::endl;
[detail] +        s << tr("  Component %1").arg(subPool.first()->metaData()->componentUserName()) << Qt::endl;
[detail]        }
[detail]        
[detail]        SparseTimeRange compRange;
[detail] @@ -365,7 +373,7 @@
[detail]        
[detail]        int nSigs=subPool.count();
[detail]        for (int iSig=0; iSig<nSigs; iSig++) {
[detail] -        Signal * sig=subPool.at(iSig);
[detail] +        SignalSegment * sig=subPool.at(iSig);
[detail]          if(r._selected.intersects(sig->timeRange())) {
[detail]            sel.addSignal(sig);
[detail]          }
[detail]             src/ChronogramProperties.cpp:  version-3.5.0	not modified
[detail]                       src/CityLoader.cpp:  version-3.5.0	not modified
[detail]                   src/CitySignalItem.cpp:  version-3.5.0	not modified
[detail]                 src/DirectoryMonitor.cpp:  version-3.5.0	modified out of comments
[detail] --- src/DirectoryMonitor.cpp-version-3.5.0-stripped	2025-09-28 04:01:08.139518154 +0200
[detail] +++ src/DirectoryMonitor.cpp-HEAD-stripped	2025-09-28 04:01:08.143518172 +0200
[detail] @@ -38,16 +38,28 @@
[detail]  
[detail]  void DirectoryMonitor::removeAllFiles()
[detail]  {
[detail] -  _fileMap.clear();
[detail] +  _files.clear();
[detail]    _loadedCount=0;
[detail]    showStatus();
[detail]  }
[detail]  
[detail]  
[detail] -void DirectoryMonitor::removeFile(QString path)
[detail] +void DirectoryMonitor::removeFile(const SignalFileIndex& file)
[detail]  {
[detail] -  if(_fileMap.contains(path)) {
[detail] -    _fileMap.remove(path);
[detail] +  if(file.file()->numberOfFiles().value()>1 && !file.index().isValid()) {
[detail] +    IndexOfFile n=file.file()->numberOfFiles();
[detail] +    for(IndexOfFile i; i<n; i++) {
[detail] +      removeFile(file.file()->name(i));
[detail] +    }
[detail] +  } else {
[detail] +    removeFile(file.file()->name(file.index()));
[detail] +  }
[detail] +}
[detail] +
[detail] +void DirectoryMonitor::removeFile(const QString& file)
[detail] +{
[detail] +  if(_files.contains(file)) {
[detail] +    _files.remove(file);
[detail]      _loadedCount--;
[detail]      showStatus();
[detail]    }
[detail] @@ -56,7 +68,7 @@
[detail]  void DirectoryMonitor::showStatus()
[detail]  {
[detail]    if(_timer.isActive())
[detail] -    status->setText(tr("Active: %1/%2 files loaded").arg(_loadedCount).arg(_fileMap.count()));
[detail] +    status->setText(tr("Active: %1/%2 files loaded").arg(_loadedCount).arg(_files.count()));
[detail]    else
[detail]      status->setText(tr("Not active"));
[detail]  }
[detail] @@ -80,7 +92,7 @@
[detail]    if(d!=_dir) {
[detail]      _dir=d;
[detail]      _loadedCount=0;
[detail] -    _fileMap.clear();
[detail] +    _files.clear();
[detail]    }
[detail]    
[detail]    _startTime=QDateTime::currentDateTime().addSecs(-_delay);
[detail] @@ -111,21 +123,22 @@
[detail]          const QString& fileName=*it;
[detail]          if(!fileName.isEmpty() && fileName[0]=='.') continue;
[detail]          QString filePath=_dir.absoluteFilePath(fileName);
[detail] -        QMap<QString, SignalFile *>::iterator itmap=_fileMap.find(filePath);
[detail] +        QMap<QString, SignalFileIndex>::const_iterator itmap=_files.find(filePath);
[detail]          QFileInfo fi(filePath);
[detail]          if(fi.lastModified()>_startTime) {
[detail] -          if(itmap==_fileMap.end() || itmap.value()==0) {
[detail] +          if(itmap==_files.end() || itmap.value().file()==nullptr) {
[detail]              SubSignalPool subPool=_db->load(filePath);
[detail]              if(subPool.isEmpty()) {
[detail] -              _fileMap.insert(filePath,0);
[detail] +              _files.insert(filePath, SignalFileIndex(nullptr, IndexOfFile::null));
[detail]              } else {
[detail] -              _fileMap.insert(filePath, subPool.first()->file());
[detail] +              SignalSegment * sig=subPool.first();
[detail] +              _files.insert(filePath, SignalFileIndex(sig));
[detail]                GeopsyCoreEngine::instance()->newSignalViewer(subPool, false);
[detail]                _loadedCount++;
[detail]              }
[detail]            }
[detail]          } else {
[detail] -          _fileMap.insert(filePath,0);
[detail] +          _files.insert(filePath, SignalFileIndex(nullptr, IndexOfFile::null));
[detail]          }
[detail]        }
[detail]        _lastCheckTime=dirInfo.lastModified();
[detail]            src/FilterParameterWidget.cpp:  version-3.5.0	modified out of comments
[detail] --- src/FilterParameterWidget.cpp-version-3.5.0-stripped	2025-09-28 04:01:08.159518250 +0200
[detail] +++ src/FilterParameterWidget.cpp-HEAD-stripped	2025-09-28 04:01:08.163518269 +0200
[detail] @@ -1,23 +1,29 @@
[detail]  
[detail]  
[detail]  #include "FilterParameterWidget.h"
[detail] +#include "ui_FilterParameterWidget.h"
[detail]  
[detail]  namespace GeopsyGui {
[detail]  
[detail]    
[detail]    FilterParameterWidget::FilterParameterWidget(QWidget *parent, Qt::WindowFlags f)
[detail] -      : QWidget(parent, f)
[detail] +      : QWidget(parent, f),
[detail] +        _ui(new Ui::FilterParameterWidget)
[detail]    {
[detail]      TRACE;
[detail] -    setupUi(this);
[detail] +    _ui->setupUi(this);
[detail]  
[detail]      
[detail] -    connect(causalEdit, SIGNAL(toggled(bool)), this, SIGNAL(parametersChanged()));
[detail] -    connect(filtFromFreq, SIGNAL(valueChanged(double)), this, SIGNAL(parametersChanged()));
[detail] -    connect(filtToFreq, SIGNAL(valueChanged(double)), this, SIGNAL(parametersChanged()));
[detail] -    connect(orderEdit, SIGNAL(valueChanged(int)), this, SIGNAL(parametersChanged()));
[detail] -    connect(windowEdit, SIGNAL(parametersChanged()), this, SIGNAL(parametersChanged()));
[detail] -    connect(windowWidthEdit, SIGNAL(valueChanged(double)), this, SIGNAL(parametersChanged()));
[detail] +    connect(_ui->butterworthCausal, SIGNAL(toggled(bool)), this, SIGNAL(parametersChanged()));
[detail] +    connect(_ui->filtFromFreq, SIGNAL(valueChanged(double)), this, SIGNAL(parametersChanged()));
[detail] +    connect(_ui->filtToFreq, SIGNAL(valueChanged(double)), this, SIGNAL(parametersChanged()));
[detail] +    connect(_ui->butterworthOrder, SIGNAL(valueChanged(int)), this, SIGNAL(parametersChanged()));
[detail] +    connect(_ui->windowEdit, SIGNAL(parametersChanged()), this, SIGNAL(parametersChanged()));
[detail] +    connect(_ui->frequencyWindowWidth, SIGNAL(valueChanged(double)), this, SIGNAL(parametersChanged()));
[detail] +    connect(_ui->chebyshevType1TransitionWidth, SIGNAL(valueChanged(double)), this, SIGNAL(parametersChanged()));
[detail] +    connect(_ui->chebyshevType1MaxLossPass, SIGNAL(valueChanged(double)), this, SIGNAL(parametersChanged()));
[detail] +    connect(_ui->chebyshevType1MinAttenuationStop, SIGNAL(valueChanged(double)), this, SIGNAL(parametersChanged()));
[detail] +    connect(_ui->chebyshevType1MaxRipple, SIGNAL(valueChanged(double)), this, SIGNAL(parametersChanged()));
[detail]  
[detail]      setDefaultWindow();
[detail]    }
[detail] @@ -28,7 +34,8 @@
[detail]      on_filterType_currentIndexChanged(0);
[detail]      on_butterworthButton_toggled(true);
[detail]      on_frequencyWindowButton_toggled(true);
[detail] -    windowEdit->updateAllFields();
[detail] +    on_chebyshevType1Button_toggled(true);
[detail] +    _ui->windowEdit->updateAllFields();
[detail]    }
[detail]  
[detail]    void FilterParameterWidget::on_filterType_activated(int)
[detail] @@ -40,68 +47,89 @@
[detail]    void FilterParameterWidget::on_filterType_currentIndexChanged(int)
[detail]    {
[detail]      TRACE;
[detail] -    if(filterType->currentIndex()>1) {
[detail] -      filtToFreq->show();
[detail] -      toFreqLabel->show();
[detail] -      fromFreqLabel->setText("From");
[detail] -      windowWidthLabel->hide();
[detail] -      windowWidthEdit->hide();
[detail] +    if(_ui->filterType->currentIndex()>1) {
[detail] +      _ui->filtToFreq->show();
[detail] +      _ui->toFreqLabel->show();
[detail] +      _ui->fromFreqLabel->setText("From");
[detail] +      _ui->frequencyWindowWidthLabel->hide();
[detail] +      _ui->frequencyWindowWidth->hide();
[detail]      } else {
[detail] -      fromFreqLabel->setText("Value");
[detail] -      filtToFreq->hide();
[detail] -      toFreqLabel->hide();
[detail] -      windowWidthLabel->show();
[detail] -      windowWidthEdit->show();
[detail] +      _ui->fromFreqLabel->setText("Value");
[detail] +      _ui->filtToFreq->hide();
[detail] +      _ui->toFreqLabel->hide();
[detail] +      _ui->frequencyWindowWidthLabel->show();
[detail] +      _ui->frequencyWindowWidth->show();
[detail]      }
[detail]      emit parametersChanged();
[detail]    }
[detail]  
[detail] -  void FilterParameterWidget::on_butterworthButton_toggled(bool)
[detail] -  {
[detail] -    TRACE;
[detail] -    bool b=butterworthButton->isChecked();
[detail] -    causalEdit->setEnabled(b);
[detail] -    orderEdit->setEnabled(b);
[detail] -    orderLabel->setEnabled(b);
[detail] -    emit parametersChanged();
[detail] -  }
[detail] -
[detail]    void FilterParameterWidget::setDefaultWindow()
[detail]    {
[detail]      TRACE;
[detail] -    if(filterType->currentIndex()>=2) {  
[detail] +    if(_ui->filterType->currentIndex()>=2) {  
[detail]        WindowFunctionParameters param;
[detail] -      windowEdit->getParameters(param);
[detail] +      _ui->windowEdit->getParameters(param);
[detail]        param.setShape(WindowFunctionParameters::Tukey);
[detail] -      windowEdit->setParameters(param);
[detail] -      windowWidthLabel->setEnabled(false);
[detail] -      windowWidthEdit->setEnabled(false);
[detail] +      _ui->windowEdit->setParameters(param);
[detail] +      _ui->frequencyWindowWidthLabel->setEnabled(false);
[detail] +      _ui->frequencyWindowWidth->setEnabled(false);
[detail]      } else {
[detail]        WindowFunctionParameters param;
[detail] -      windowEdit->getParameters(param);
[detail] +      _ui->windowEdit->getParameters(param);
[detail]        param.setShape(WindowFunctionParameters::Cosine);
[detail] -      windowEdit->setParameters(param);
[detail] -      windowWidthLabel->setEnabled(true);
[detail] -      windowWidthEdit->setEnabled(true);
[detail] +      _ui->windowEdit->setParameters(param);
[detail] +      _ui->frequencyWindowWidthLabel->setEnabled(true);
[detail] +      _ui->frequencyWindowWidth->setEnabled(true);
[detail]      }
[detail] -    windowEdit->updateAllFields();
[detail] +    _ui->windowEdit->updateAllFields();
[detail] +  }
[detail] +
[detail] +  void FilterParameterWidget::on_butterworthButton_toggled(bool)
[detail] +  {
[detail] +    TRACE;
[detail] +    bool b=_ui->butterworthButton->isChecked();
[detail] +    _ui->butterworthCausal->setEnabled(b);
[detail] +    _ui->butterworthOrder->setEnabled(b);
[detail] +    _ui->butterworthOrderLabel->setEnabled(b);
[detail] +    emit parametersChanged();
[detail]    }
[detail]  
[detail]    void FilterParameterWidget::on_frequencyWindowButton_toggled(bool)
[detail]    {
[detail]      TRACE;
[detail] -    bool b=frequencyWindowButton->isChecked();
[detail] -    if(b && !windowEdit->isEnabled()) {
[detail] +    bool b=_ui->frequencyWindowButton->isChecked();
[detail] +    if(b && !_ui->windowEdit->isEnabled()) {
[detail]        setDefaultWindow();
[detail]      }
[detail] -    windowEdit->setEnabled(b);
[detail] +    _ui->frequencyWindowWidth->setEnabled(b);
[detail] +    _ui->frequencyWindowWidthLabel->setEnabled(b);
[detail] +    _ui->windowEdit->setEnabled(b);
[detail] +    _ui->windowEdit->setEnabled(b);
[detail] +    emit parametersChanged();
[detail] +  }
[detail] +
[detail] +  void FilterParameterWidget::on_chebyshevType1Button_toggled(bool)
[detail] +  {
[detail] +    TRACE;
[detail] +    bool b=_ui->chebyshevType1Button->isChecked();
[detail] +    _ui->chebyshevType1TransitionWidth->setEnabled(b);
[detail] +    _ui->chebyshevType1MaxLossPass->setEnabled(b);
[detail] +    _ui->chebyshevType1MinAttenuationStop->setEnabled(b);
[detail] +    _ui->chebyshevType1MaxRipple->setEnabled(b);
[detail] +    _ui->chebyshevType1TransitionWidthLabel->setEnabled(b);
[detail] +    _ui->chebyshevType1MaxLossPassLabel->setEnabled(b);
[detail] +    _ui->chebyshevType1MinAttenuationStopLabel->setEnabled(b);
[detail] +    _ui->chebyshevType1MaxRippleLabel->setEnabled(b);
[detail]      emit parametersChanged();
[detail]    }
[detail]  
[detail]    void FilterParameterWidget::getParameters(FilterParameters& param) const
[detail]    {
[detail]      TRACE;
[detail] -    switch (filterType->currentIndex()) {
[detail] +    switch (_ui->filterType->currentIndex()) {
[detail] +    case 0:
[detail] +      param.setBand(FilterParameters::LowPass);
[detail] +      break;
[detail]      case 1:
[detail]        param.setBand(FilterParameters::HighPass);
[detail]        break;
[detail] @@ -109,21 +137,49 @@
[detail]        param.setBand(FilterParameters::BandPass);
[detail]        break;
[detail]      case 3:
[detail] -      param.setBand(FilterParameters::BandReject);
[detail] -      break;
[detail] -    default:
[detail] -      param.setBand(FilterParameters::LowPass);
[detail] +      param.setBand(FilterParameters::BandStop);
[detail]        break;
[detail]      }
[detail] -    param.setFrequencyRange(filtFromFreq->value(), filtToFreq->value());
[detail] -    if(butterworthButton->isChecked()) {
[detail] -      param.setOrder(orderEdit->value());
[detail] -      param.setCausal(causalEdit->isChecked());
[detail] +    if(_ui->butterworthButton->isChecked()) {
[detail]        param.setMethod(FilterParameters::Butterworth);
[detail] -    } else {
[detail] -      windowEdit->getParameters(param.frequencyWindow());
[detail] +      param.butterworth().setMinimumFrequency(_ui->filtFromFreq->value());
[detail] +      param.butterworth().setMaximumFrequency(_ui->filtToFreq->value());
[detail] +      param.butterworth().setOrder(_ui->butterworthOrder->value());
[detail] +      param.butterworth().setCausal(_ui->butterworthCausal->isChecked());
[detail] +    } else if(_ui->frequencyWindowButton->isChecked()) {
[detail]        param.setMethod(FilterParameters::FrequencyWindow);
[detail] -      param.setWidth(windowWidthEdit->value()*0.01);
[detail] +      param.frequencyWindow().setMinimumFrequency(_ui->filtFromFreq->value());
[detail] +      param.frequencyWindow().setMaximumFrequency(_ui->filtToFreq->value());
[detail] +      _ui->windowEdit->getParameters(param.frequencyWindow().window());
[detail] +      param.frequencyWindow().setWidth(_ui->frequencyWindowWidth->value()*0.01);
[detail] +    } else if(_ui->chebyshevType1Button->isChecked()) {
[detail] +      param.setMethod(FilterParameters::ChebyshevType1);
[detail] +      double width=_ui->chebyshevType1TransitionWidth->value()*0.01;
[detail] +      param.chebyshevType1().setMaximumLossPass(_ui->chebyshevType1MaxLossPass->value());
[detail] +      param.chebyshevType1().setMinimumAttenuationStop(_ui->chebyshevType1MinAttenuationStop->value());
[detail] +      param.chebyshevType1().setMaximumRipple(_ui->chebyshevType1MaxRipple->value());
[detail] +      switch (param.band()) {
[detail] +      case FilterParameters::LowPass:
[detail] +        param.chebyshevType1().setMinimumFrequencyPass(_ui->filtFromFreq->value()*(1.0-width));
[detail] +        param.chebyshevType1().setMinimumFrequencyStop(_ui->filtFromFreq->value());
[detail] +        break;
[detail] +      case FilterParameters::HighPass:
[detail] +        param.chebyshevType1().setMinimumFrequencyPass(_ui->filtFromFreq->value());
[detail] +        param.chebyshevType1().setMinimumFrequencyStop(_ui->filtFromFreq->value()*(1.0+width));
[detail] +        break;
[detail] +      case FilterParameters::BandPass:
[detail] +        param.chebyshevType1().setMinimumFrequencyPass(_ui->filtFromFreq->value());
[detail] +        param.chebyshevType1().setMaximumFrequencyPass(_ui->filtFromFreq->value()*(1.0+width));
[detail] +        param.chebyshevType1().setMinimumFrequencyStop(_ui->filtToFreq->value()*(1.0-width));
[detail] +        param.chebyshevType1().setMaximumFrequencyStop(_ui->filtToFreq->value());
[detail] +        break;
[detail] +      case FilterParameters::BandStop:
[detail] +        param.chebyshevType1().setMinimumFrequencyPass(_ui->filtFromFreq->value()*(1.0-width));
[detail] +        param.chebyshevType1().setMaximumFrequencyPass(_ui->filtFromFreq->value());
[detail] +        param.chebyshevType1().setMinimumFrequencyStop(_ui->filtToFreq->value());
[detail] +        param.chebyshevType1().setMaximumFrequencyStop(_ui->filtToFreq->value()*(1.0+width));
[detail] +        break;
[detail] +      }
[detail]      }
[detail]    }
[detail]  
[detail] @@ -132,28 +188,69 @@
[detail]      TRACE;
[detail]      switch (param.band()) {
[detail]      case FilterParameters::LowPass:
[detail] -      filterType->setCurrentIndex(0);
[detail] +      _ui->filterType->setCurrentIndex(0);
[detail]        break;
[detail]      case FilterParameters::HighPass:
[detail] -      filterType->setCurrentIndex(1);
[detail] +      _ui->filterType->setCurrentIndex(1);
[detail]        break;
[detail]      case FilterParameters::BandPass:
[detail] -      filterType->setCurrentIndex(2);
[detail] +      _ui->filterType->setCurrentIndex(2);
[detail]        break;
[detail] -    case FilterParameters::BandReject:
[detail] -      filterType->setCurrentIndex(3);
[detail] +    case FilterParameters::BandStop:
[detail] +      _ui->filterType->setCurrentIndex(3);
[detail]        break;
[detail]      }
[detail] -    filtFromFreq->setValue(param.minimumFrequency());
[detail] -    filtToFreq->setValue(param.maximumFrequency());
[detail]      switch(param.method()) {
[detail] -    case FilterParameters::Butterworth:
[detail] -      orderEdit->setValue(param.order());
[detail] -      causalEdit->setChecked(param.causal());
[detail] -      break;
[detail] -    case FilterParameters::FrequencyWindow:
[detail] -      windowEdit->setParameters(param.frequencyWindow());
[detail] -      windowWidthEdit->setValue(param.width()*100.0);
[detail] +    case FilterParameters::Butterworth: {
[detail] +        const ButterworthParameters& sparam=param.butterworth();
[detail] +        _ui->butterworthOrder->setValue(sparam.order());
[detail] +        _ui->butterworthCausal->setChecked(sparam.causal());
[detail] +        _ui->butterworthButton->setChecked(true);
[detail] +      }
[detail] +      break;
[detail] +    case FilterParameters::FrequencyWindow: {
[detail] +        const FrequencyWindowParameters& sparam=param.frequencyWindow();
[detail] +        _ui->windowEdit->setParameters(sparam.window());
[detail] +        _ui->frequencyWindowWidth->setValue(sparam.width()*100.0);
[detail] +        _ui->frequencyWindowButton->setChecked(true);
[detail] +      }
[detail] +      break;
[detail] +    case FilterParameters::ChebyshevType1: {
[detail] +        const ChebyshevParameters& sparam=param.chebyshevType1();
[detail] +        double width1, width2;
[detail] +        switch (param.band()) {
[detail] +        case FilterParameters::LowPass:
[detail] +          width1=1.0-sparam.minimumFrequencyPass()/sparam.minimumFrequencyStop();
[detail] +          width2=width1;
[detail] +          _ui->filtFromFreq->setValue(sparam.minimumFrequencyStop());
[detail] +          break;
[detail] +        case FilterParameters::HighPass:
[detail] +          width1=sparam.minimumFrequencyStop()/sparam.minimumFrequencyPass()-1.0;
[detail] +          width2=width1;
[detail] +          _ui->filtFromFreq->setValue(sparam.minimumFrequencyPass());
[detail] +          break;
[detail] +        case FilterParameters::BandPass:
[detail] +          width1=sparam.maximumFrequencyPass()/sparam.minimumFrequencyPass()-1.0;
[detail] +          width2=1.0-sparam.minimumFrequencyStop()/sparam.maximumFrequencyStop();
[detail] +          _ui->filtFromFreq->setValue(sparam.minimumFrequencyPass());
[detail] +          _ui->filtToFreq->setValue(sparam.maximumFrequencyStop());
[detail] +          break;
[detail] +        case FilterParameters::BandStop:
[detail] +          width1=1.0-sparam.minimumFrequencyPass()/sparam.maximumFrequencyPass();
[detail] +          width2=sparam.maximumFrequencyStop()/sparam.minimumFrequencyStop()-1.0;
[detail] +          _ui->filtFromFreq->setValue(sparam.maximumFrequencyPass());
[detail] +          _ui->filtToFreq->setValue(sparam.minimumFrequencyStop());
[detail] +          break;
[detail] +        }
[detail] +        if(fabs(width1-width2)>0.01) {
[detail] +          App::log(tr("Relative widths of transistion bands differ by more than 5%\n"));
[detail] +        }
[detail] +        _ui->chebyshevType1TransitionWidth->setValue(0.5*(width1+width2)*100.0);
[detail] +        _ui->chebyshevType1MaxLossPass->setValue(sparam.maximumLossPass());
[detail] +        _ui->chebyshevType1MinAttenuationStop->setValue(sparam.minimumAttenuationStop());
[detail] +        _ui->chebyshevType1MaxRipple->setValue(sparam.maximumRipple());
[detail] +        _ui->chebyshevType1Button->setChecked(true);
[detail] +      }
[detail]        break;
[detail]      }
[detail]    }
[detail]                        src/GeopsyGui.cpp:  version-3.5.0	not modified
[detail]                  src/GeopsyGuiEngine.cpp:  version-3.5.0	not modified
[detail]               src/GeopsyGuiInterface.cpp:  version-3.5.0	not modified
[detail]                     src/HeaderWidget.cpp:  version-3.5.0	modified out of comments
[detail] --- src/HeaderWidget.cpp-version-3.5.0-stripped	2025-09-28 04:01:08.231518598 +0200
[detail] +++ src/HeaderWidget.cpp-HEAD-stripped	2025-09-28 04:01:08.235518617 +0200
[detail] @@ -32,8 +32,8 @@
[detail]      SignalHeaderScript script(_subPool);
[detail]      connect(&script, SIGNAL(beginSignalChange(SignalDatabase *)), this, SLOT(beginSignalChange(SignalDatabase *)));
[detail]      connect(&script, SIGNAL(endSignalChange(SignalDatabase *)), this, SLOT(endSignalChange(SignalDatabase *)));
[detail] -    connect(&script, SIGNAL(beginSignalChange(Signal *)), this, SLOT(beginSignalChange(Signal *)));
[detail] -    connect(&script, SIGNAL(endSignalChange(Signal *)), this, SLOT(endSignalChange(Signal *)));
[detail] +    connect(&script, SIGNAL(beginSignalChange(SignalSegment *)), this, SLOT(beginSignalChange(SignalSegment *)));
[detail] +    connect(&script, SIGNAL(endSignalChange(SignalSegment *)), this, SLOT(endSignalChange(SignalSegment *)));
[detail]      App::setPrefix(tr("[Header] "));
[detail]      script.run(codeEditor->toPlainText());
[detail]      App::setPrefix(QString());
[detail] @@ -46,13 +46,13 @@
[detail]      SignalHeaderScript script(_subPool);
[detail]    }
[detail]  
[detail] -  void HeaderWidget::beginSignalChange(Signal * sig)
[detail] +  void HeaderWidget::beginSignalChange(SignalSegment * sig)
[detail]    {
[detail]      TRACE;
[detail]      GeopsyGuiEngine::instance()->beginSignalChange(sig);
[detail]    }
[detail]  
[detail] -  void HeaderWidget::endSignalChange(Signal * sig)
[detail] +  void HeaderWidget::endSignalChange(SignalSegment * sig)
[detail]    {
[detail]      TRACE;
[detail]      GeopsyGuiEngine::instance()->endSignalChange(sig);
[detail]                       src/LoadFormat.cpp:  version-3.5.0	not modified
[detail]            src/MorletParameterWidget.cpp:  version-3.5.0	not modified
[detail]     src/NormalizationParameterWidget.cpp:  version-3.5.0	not modified
[detail]                       src/PickFormat.cpp:  version-3.5.0	modified out of comments
[detail] --- src/PickFormat.cpp-version-3.5.0-stripped	2025-09-28 04:01:08.299518926 +0200
[detail] +++ src/PickFormat.cpp-HEAD-stripped	2025-09-28 04:01:08.303518946 +0200
[detail] @@ -88,7 +88,11 @@
[detail]      }
[detail]      it=attributes.find(keys[1]);
[detail]      if(it!=attributes.end()) {
[detail] +#if(QT_VERSION>=QT_VERSION_CHECK(6, 4, 0))
[detail] +      format.color=QColor::fromString(it.value().toStringBuffer());
[detail] +#else
[detail]        format.color.setNamedColor(it.value().toStringBuffer());
[detail] +#endif
[detail]      } else {
[detail]        format.color=Qt::blue;
[detail]      }
[detail]                         src/PickItem.cpp:  version-3.5.0	not modified
[detail]                        src/PickLayer.cpp:  version-3.5.0	modified out of comments
[detail] --- src/PickLayer.cpp-version-3.5.0-stripped	2025-09-28 04:01:08.331519081 +0200
[detail] +++ src/PickLayer.cpp-HEAD-stripped	2025-09-28 04:01:08.335519100 +0200
[detail] @@ -75,9 +75,9 @@
[detail]      SAFE_UNINITIALIZED(isigmax, 0);
[detail]      _sig->visibleIndexRange(gc, isigmin, isigmax);
[detail]      for(int iSig=isigmin; iSig<isigmax; ++iSig) {
[detail] -      const Signal * sig=_sig->subPool()->at(iSig);
[detail] -      if(!sig->isSpectrum()) {
[detail] -        const DateTime& tref=_sig->timeReference(sig);
[detail] +      const SignalSegment * sig=_sig->subPool()->at(iSig);
[detail] +      if(!sig->values()->isSpectrum()) {
[detail] +        DateTime tref=_sig->timeReference(sig);
[detail]          
[detail]          if(_format.isVisible("events")) {
[detail]            QList<const SeismicEvent *> events=sig->database()->seismicEvents()->events(sig);
[detail] @@ -131,23 +131,23 @@
[detail]      }
[detail]      double pickSize;
[detail]      if(_sig->subPool()->count()==1) {
[detail] -      pickSize=0.75*_sig->subPool()->at(0)->maximumAmplitude();
[detail] +      pickSize=0.75*_sig->subPool()->at(0)->values()->maximumAmplitude();
[detail]      } else {
[detail]        pickSize=0.375;
[detail]      }
[detail]      for(int iSig=isigmin; iSig<isigmax; ++iSig) {
[detail]        if(lp.terminated()) return;
[detail] -      const Signal * sig=_sig->subPool()->at(iSig);
[detail] -      if(!sig->isSpectrum()) {
[detail] -        const DateTime& tref=_sig->timeReference(sig);
[detail] +      const SignalSegment * sig=_sig->subPool()->at(iSig);
[detail] +      if(!sig->values()->isSpectrum()) {
[detail] +        DateTime tref=_sig->timeReference(sig);
[detail]          double y0=_sig->signalY(iSig);
[detail]          
[detail] -        QStringList picks=sig->metaData<TimePick>().names();
[detail] +        QStringList picks=sig->metaData()->optionalData().get<TimePick>().names();
[detail]          for(QStringList::iterator it=picks.begin(); it!=picks.end(); it++) {
[detail]            QString pn=*it;
[detail]            if(_format.isVisible(pn)) {
[detail]              p.setPen(QPen(_format.color(pn), 2));
[detail] -            double t=tref.secondsTo(sig->metaData<TimePick>().value(pn));
[detail] +            double t=tref.secondsTo(sig->metaData()->optionalData().get<TimePick>().value(pn));
[detail]              if(t>gc.xVisMin() && t<gc.xVisMax()) {
[detail]                QPoint p1=gc.r2s(t, y0-pickSize);
[detail]                QPoint p2(p1.x(), 0);
[detail] @@ -253,21 +253,21 @@
[detail]      Rect r(rx1, ry1, rx2, ry2);
[detail]      const SubSignalPool * subPool=_sig->subPool();
[detail]      for(int iSig=subPool->count()-1; iSig>=0; --iSig) {
[detail] -      Signal * sig=_sig->subPool()->at(iSig);
[detail] -      if(!sig->isSpectrum()) {
[detail] -        const DateTime& tref=_sig->timeReference(sig);
[detail] +      SignalSegment * sig=_sig->subPool()->at(iSig);
[detail] +      if(!sig->values()->isSpectrum()) {
[detail] +        DateTime tref=_sig->timeReference(sig);
[detail]          double y0=_sig->signalY(iSig);
[detail] -        QStringList picks=sig->metaData<TimePick>().names();
[detail] +        QStringList picks=sig->metaData()->optionalData().get<TimePick>().names();
[detail]          for(QStringList::iterator it=picks.begin(); it!=picks.end(); it++) {
[detail]            QString pn=*it;
[detail]            if(_format.isVisible(pn) && !TimePick::pickLocked(pn)) {
[detail] -            double t=tref.secondsTo(sig->metaData<TimePick>().value(pn));
[detail] +            double t=tref.secondsTo(sig->metaData()->optionalData().get<TimePick>().value(pn));
[detail]              if(r.includes(Point2D(t, y0))) {
[detail]                App::log(1, tr("Deleting time pick '%1' for signal %2 (ID=%3)\n")
[detail] -                                .arg(pn).arg(sig->nameComponent()).arg(sig->id()));
[detail] -              TimePick& tp=sig->beginModifyMetaData<TimePick>();
[detail] +                              .arg(pn).arg(sig->metaData()->nameComponent()).arg(sig->id().toString()));
[detail] +              TimePick& tp=sig->metaData()->optionalData().beginModify<TimePick>();
[detail]                tp.removeValue(pn);
[detail] -              sig->endModifyMetaData(tp);
[detail] +              sig->metaData()->optionalData().endModify(tp);
[detail]                emit pickChanged(sig, pn);
[detail]              }
[detail]            }
[detail] @@ -352,7 +352,7 @@
[detail]      deepUpdate();
[detail]      double m=gc.xs2r(pt.x());
[detail]      if(_iSigPick>-1) {
[detail] -      Signal * sig=_sig->subPool()->at(_iSigPick);
[detail] +      SignalSegment * sig=_sig->subPool()->at(_iSigPick);
[detail]        if(buttons & Qt::LeftButton &&  modifiers & Qt::ShiftModifier) {  
[detail]          double d;
[detail]          int newISigPick=_sig->signalAt(pt.y(), d);
[detail] @@ -365,10 +365,10 @@
[detail]            setPick(pt.x());
[detail]          }
[detail]        }
[detail] -      if(sig->isSpectrum()) {
[detail] +      if(sig->values()->isSpectrum()) {
[detail]          GeopsyCoreEngine::instance()->showMessage(sig->database(), tr("f=%1 Hz, Amplitude=%2")
[detail]                                                    .arg(m, 0, 'f', 4)
[detail] -                                                  .arg(sig->DoubleSignal::amplitudeAt(m), 0, 'g', 4));
[detail] +                                                  .arg(sig->amplitudeAt(m), 0, 'g', 4));
[detail]        } else {
[detail]          const DateTime& tref=graph()->xAxis()->timeReference();
[detail]          DateTime t=tref.shifted(m);
[detail] @@ -398,12 +398,12 @@
[detail]        for(int i=process->stepCount()-1; i>=0; i--) {
[detail]          const SubSignalPool * subPool=process->step(i);
[detail]          if(subPool->count()==n) {
[detail] -          Signal * sig=subPool->at(_iSigPick);
[detail] -          TimePick& tp=sig->beginModifyMetaData<TimePick>();
[detail] +          SignalSegment * sig=subPool->at(_iSigPick);
[detail] +          TimePick& tp=sig->metaData()->optionalData().beginModify<TimePick>();
[detail]            DateTime refTime=_sig->timeReference(sig);
[detail]            tp.setValue(_pickName, refTime.shifted(gc.xs2r(t)));
[detail] -          sig->endModifyMetaData(tp);
[detail] -          sig->setHeaderModified(true);
[detail] +          sig->metaData()->optionalData().endModify(tp);
[detail] +          sig->metaData()->setModified(true);
[detail]            emit pickChanged(sig, _pickName);
[detail]          } else {
[detail]            App::log(tr("Number of signals changed during processing, signals cannot be traced back to the original.\n"
[detail] @@ -416,12 +416,12 @@
[detail]      }
[detail]    }
[detail]    
[detail] -  Signal * sig=_sig->subPool()->at(_iSigPick);
[detail] -  TimePick& tp=sig->beginModifyMetaData<TimePick>();
[detail] +  SignalSegment * sig=_sig->subPool()->at(_iSigPick);
[detail] +  TimePick& tp=sig->metaData()->optionalData().beginModify<TimePick>();
[detail]    DateTime refTime=_sig->timeReference(sig);
[detail]    tp.setValue(_pickName, refTime.shifted(gc.xs2r(t)));
[detail] -  sig->endModifyMetaData(tp);
[detail] -  sig->setHeaderModified(true);
[detail] +  sig->metaData()->optionalData().endModify(tp);
[detail] +  sig->metaData()->setModified(true);
[detail]    emit pickChanged(sig, _pickName);
[detail]  }
[detail]  
[detail]              src/PickParameterwidget.cpp:  version-3.5.0	not modified
[detail]                       src/PickToPick.cpp:  version-3.5.0	not modified
[detail]                  src/PicksProperties.cpp:  version-3.5.0	modified out of comments
[detail] --- src/PicksProperties.cpp-version-3.5.0-stripped	2025-09-28 04:01:08.383519333 +0200
[detail] +++ src/PicksProperties.cpp-HEAD-stripped	2025-09-28 04:01:08.387519351 +0200
[detail] @@ -46,7 +46,7 @@
[detail]    TRACE;
[detail]    int n=picks->model()->rowCount();
[detail]    ColorPalette pal;
[detail] -  pal.generate(0, n-1, ColorPalette::defaultSequential);
[detail] +  pal.generate(0, n-1, 1, ColorPalette::defaultSequential);
[detail]    QColor c;
[detail]    for(int i=0; i<n; i++) {
[detail]      guiColor(pal.color(i), c);
[detail]                  src/RD3LogParameter.cpp:  version-3.5.0	not modified
[detail]                src/RelativePositions.cpp:  version-3.5.0	not modified
[detail]                 src/SeismicEventItem.cpp:  version-3.5.0	modified out of comments
[detail] --- src/SeismicEventItem.cpp-version-3.5.0-stripped	2025-09-28 04:01:08.435519584 +0200
[detail] +++ src/SeismicEventItem.cpp-HEAD-stripped	2025-09-28 04:01:08.439519603 +0200
[detail] @@ -32,9 +32,9 @@
[detail]        SeismicEventTable * t=_db->seismicEvents();
[detail]        connect(t, SIGNAL(destroyed()), this, SLOT(databaseDestroyed()));
[detail]        connect(t, SIGNAL(eventAdded(SeismicEvent *)),
[detail] -              this, SLOT(add(SeismicEvent *)), Qt::QueuedConnection);
[detail] +              this, SLOT(add(SeismicEvent *)));
[detail]        connect(t, SIGNAL(eventRemoved(SeismicEvent *)),
[detail] -              this, SLOT(remove(SeismicEvent *)), Qt::QueuedConnection);
[detail] +              this, SLOT(remove(SeismicEvent *)));
[detail]      }
[detail]      endResetModel();
[detail]    }
[detail]                   src/SignalFileItem.cpp:  version-3.5.0	modified out of comments
[detail] --- src/SignalFileItem.cpp-version-3.5.0-stripped	2025-09-28 04:01:08.459519699 +0200
[detail] +++ src/SignalFileItem.cpp-HEAD-stripped	2025-09-28 04:01:08.463519719 +0200
[detail] @@ -9,14 +9,22 @@
[detail]  
[detail]  
[detail]  
[detail] -SignalFileItem::SignalFileItem(SignalDatabase * db, QObject * parent)
[detail] +  SignalFileItem::SignalFileItem(QObject * parent)
[detail]      : QAbstractItemModel(parent)
[detail]  {
[detail]    TRACE;
[detail] -  _db=db;
[detail] +    _db=nullptr;
[detail]  }
[detail]  
[detail] -
[detail] +  void SignalFileItem::setDatabase(SignalDatabase * db)
[detail] +  {
[detail] +    TRACE;
[detail] +    if(_db!=db) {
[detail] +      beginResetModel();
[detail] +      _db=db;
[detail] +      endResetModel();
[detail] +    }
[detail] +  }
[detail]  
[detail]  void SignalFileItem::beginReset()
[detail]  {
[detail] @@ -43,111 +51,174 @@
[detail]    endInsertRows();
[detail]  }
[detail]  
[detail] +  void SignalFileItem::beginRemoveFile(int index)
[detail] +  {
[detail] +    TRACE;
[detail] +    beginRemoveRows(QModelIndex(), index, index);
[detail] +  }
[detail] +
[detail] +  void SignalFileItem::beginRemoveFile(const SignalFileIndex& index)
[detail] +  {
[detail] +    TRACE;
[detail] +    int iFile=_db->filePool().indexOf(index.file());
[detail] +    beginRemoveRows(createIndex(iFile, 0), index.index().value(), index.index().value());
[detail] +  }
[detail] +
[detail] +  void SignalFileItem::endRemoveFile()
[detail] +  {
[detail] +    TRACE;
[detail] +    endRemoveRows();
[detail] +  }
[detail] +
[detail]  int SignalFileItem::rowCount(const QModelIndex & parent) const
[detail]  {
[detail]    TRACE;
[detail] -  if(!parent.isValid()) {
[detail] -    return _db->filePool().count();
[detail] +    if(parent.isValid()) {
[detail] +      if(parent.internalId()==0) {
[detail] +        int n=_db->filePool().at(parent.row())->numberOfFiles().value();
[detail] +        if(n==1) {
[detail] +          return 0;
[detail] +        } else {
[detail] +          return n;
[detail] +        }
[detail]    } else {
[detail]      return 0;
[detail]    }
[detail] +    } else {
[detail] +      return _db->filePool().count();
[detail] +    }
[detail]  }
[detail]  
[detail]  
[detail]  int SignalFileItem::columnCount(const QModelIndex &) const
[detail]  {
[detail]    TRACE;
[detail] -  return 2;
[detail] +    return 5;
[detail] +  }
[detail] +
[detail] +  SignalFileIndex SignalFileItem::fileIndex(const QModelIndex& index) const
[detail] +  {
[detail] +    SignalFilePool& filePool=_db->filePool();
[detail] +    if(index.internalId()==0) {
[detail] +      return SignalFileIndex(filePool.at(index.row()), IndexOfFile::null);
[detail] +    } else {
[detail] +      IndexOfFile i;
[detail] +      i.setValue(index.row());
[detail] +      return SignalFileIndex(filePool.at(index.internalId()-1), i);
[detail] +    }
[detail]  }
[detail]  
[detail]  QVariant SignalFileItem::data(const QModelIndex &index, int role) const
[detail]  {
[detail]    TRACE;
[detail] -  if(!index.isValid()) return QVariant();
[detail] -  SignalFile * f=file(index);
[detail] +    if(!index.isValid()) {
[detail] +      return QVariant();
[detail] +    }
[detail] +    SignalFileIndex fi=fileIndex(index);
[detail]    switch (role) {
[detail]    case Qt::DisplayRole:
[detail] -    if(index.column()==0) {
[detail] -      return f->shortName();
[detail] +      switch(index.column()) {
[detail] +      case 0:
[detail] +        return fi.file()->shortDisplayName(fi.index());
[detail] +      case 1: {
[detail] +          QFileInfo info;
[detail] +          if(fi.index().isValid()) {
[detail] +            info.setFile(fi.file()->name(fi.index()));
[detail] +          } else if(fi.file()->numberOfFiles().value()==1) {
[detail] +            info.setFile(fi.file()->name(IndexOfFile::first));
[detail]      } else {
[detail] -      return f->name();
[detail] +            return QVariant();
[detail] +          }
[detail] +          return Number::bytesToString(info.size());
[detail] +        }
[detail] +      case 2:
[detail] +        if(fi.index().isValid()) {
[detail] +          return fi.file()->numberOfSignalsPerFile().value();
[detail] +        } else {
[detail] +          return fi.file()->numberOfSignals();
[detail] +        }
[detail] +      case 3:
[detail] +        return fi.file()->format().name();
[detail] +      case 4:
[detail] +        return fi.file()->displayName(fi.index());
[detail] +      default:
[detail] +        return QVariant();
[detail]      }
[detail]    case Qt::ToolTipRole:
[detail] -    return f->name();
[detail] +      return fi.file()->displayName(fi.index());
[detail]    default:
[detail]      return QVariant();
[detail]    }
[detail]  }
[detail]  
[detail] -QModelIndex SignalFileItem::parent (const QModelIndex & ) const
[detail] +  QVariant SignalFileItem::headerData(int section, Qt::Orientation orientation, int role) const
[detail]  {
[detail]    TRACE;
[detail] -  return QModelIndex();
[detail] +    if(role!=Qt::DisplayRole) return QVariant();
[detail] +    if(orientation==Qt::Horizontal) {
[detail] +      switch(section) {
[detail] +      case 0:
[detail] +        return tr("File name");
[detail] +      case 1:
[detail] +        return tr("Size");
[detail] +      case 2:
[detail] +        return tr("N signals");
[detail] +      case 3:
[detail] +        return tr("Format");
[detail] +      case 4:
[detail] +        return tr("Absolute file path");
[detail] +      default:
[detail] +        return QVariant();
[detail]  }
[detail] -
[detail] -QModelIndex SignalFileItem::index (int row, int column, const QModelIndex &) const
[detail] -{
[detail] -  TRACE;
[detail] -  
[detail] -  
[detail] -  
[detail] -  
[detail] -  
[detail] -  
[detail] -  SignalFilePool& files=_db->filePool();
[detail] -  if(row<files.count()) {
[detail] -   return createIndex(row, column, files.at(row));
[detail]    } else {
[detail] -    return QModelIndex();
[detail] +      return section+1;
[detail]    }
[detail]  }
[detail]  
[detail] -SignalFile * SignalFileItem::file(const QModelIndex& index)
[detail] +  QModelIndex SignalFileItem::parent(const QModelIndex& index) const
[detail]  {
[detail]    TRACE;
[detail] -  return static_cast<SignalFile *>(index.internalPointer());
[detail] +    if(index.internalId()==0) {
[detail] +      return QModelIndex();
[detail] +    } else {
[detail] +      return createIndex(index.internalId()-1, 0);
[detail] +    }
[detail]  }
[detail]  
[detail] -QModelIndex SignalFileItem::index(SignalFile * f)
[detail] +  QModelIndex SignalFileItem::index(int row, int column, const QModelIndex & parent) const
[detail]  {
[detail]    TRACE;
[detail] -  if(f) {
[detail] -    int i=_db->filePool().indexOf(f);
[detail] -    if(i>-1) return createIndex(i, 0, f);
[detail] +    if(parent.isValid()) {
[detail] +      return createIndex(row, column, parent.row()+1);
[detail] +    } else {
[detail] +      return createIndex(row, column);
[detail]    }
[detail] -  return QModelIndex();
[detail]  }
[detail]  
[detail]  
[detail]  void SignalFileItem::getSelection(SubSignalPool& sel, const QItemSelectionModel& sm)
[detail]  {
[detail]    TRACE;
[detail] -  static const QModelIndex parent;
[detail] -  int nFiles=_db->filePool().count();
[detail] -  for(int i=0;i<nFiles;i++) {
[detail] -    if(sm.isRowSelected(i, parent)) {
[detail] -      sel.addFile(_db->filePool().at(i));
[detail] +    QModelIndexList list=sm.selectedRows();
[detail] +    SignalFilePool& filePool=_db->filePool();
[detail] +    for(QModelIndexList::iterator it=list.begin(); it!=list.end(); it++) {
[detail] +      QModelIndex& index=*it;
[detail] +      if(index.internalId()==0) {
[detail] +        sel.addFile(filePool.at(index.row()));
[detail] +      } else {
[detail] +        IndexOfFile i;
[detail] +        i.setValue(index.row());
[detail] +        sel.addFile(SignalFileIndex(filePool.at(index.internalId()-1), i));
[detail]      }
[detail]    }
[detail]  }
[detail]  
[detail] -void SignalFileItem::getSelection(QList<SignalFile *>& sel, const QItemSelectionModel& sm)
[detail] +  void SignalFileItem::getSelection(QList<SignalFileIndex>& sel, const QItemSelectionModel& sm)
[detail]  {
[detail]    TRACE;
[detail]    QModelIndexList l=sm.selectedRows();
[detail] -  for(QModelIndexList::iterator it=l.begin(); it !=l.end(); it++) {
[detail] -    sel << _db->filePool().at(it->row());
[detail] -  }
[detail] -}
[detail] -
[detail] -void SignalFileItem::remove(const QList<SignalFile *>& sel)
[detail] -{
[detail] -  TRACE;
[detail] -  for(QList<SignalFile *>::const_iterator it=sel.begin();it!=sel.end();++it) {
[detail] -    QModelIndex i=index(*it);
[detail] -    beginRemoveRows(QModelIndex(), i.row(), i.row());
[detail] -    _db->removeFile( *it);
[detail] -    endRemoveRows();
[detail] +    for(QModelIndexList::const_iterator it=l.begin(); it !=l.end(); it++) {
[detail] +      sel << fileIndex(*it);
[detail]    }
[detail]  }
[detail]  
[detail]                  src/SignalGroupItem.cpp:  version-3.5.0	modified out of comments
[detail] --- src/SignalGroupItem.cpp-version-3.5.0-stripped	2025-09-28 04:01:08.479519796 +0200
[detail] +++ src/SignalGroupItem.cpp-HEAD-stripped	2025-09-28 04:01:08.483519815 +0200
[detail] @@ -341,4 +341,14 @@
[detail]    }
[detail]  }
[detail]  
[detail] +  void SignalGroupItem::beginResetModel()
[detail] +  {
[detail] +    QAbstractItemModel::beginResetModel();
[detail] +  }
[detail] +
[detail] +  void SignalGroupItem::endResetModel()
[detail] +  {
[detail] +    QAbstractItemModel::endResetModel();
[detail] +  }
[detail] +
[detail]  } 
[detail]                      src/SignalLayer.cpp:  version-3.5.0	modified out of comments
[detail] --- src/SignalLayer.cpp-version-3.5.0-stripped	2025-09-28 04:01:08.499519893 +0200
[detail] +++ src/SignalLayer.cpp-HEAD-stripped	2025-09-28 04:01:08.503519912 +0200
[detail] @@ -39,7 +39,7 @@
[detail]    setAutoAdjust(false);
[detail]    setSmooth(false);
[detail]    ColorMap& map=beginColorMapChange();
[detail] -  map.generate(0, 48, ColorPalette::defaultDiverging, ColorPalette::Continuous);
[detail] +    map.generate(0, 48, 1, ColorPalette::defaultDiverging, ColorPalette::Continuous);
[detail]    map.setValues(-1.0, 1.0, SamplingParameters::Linear);
[detail]    endColorMapChange();
[detail]  
[detail] @@ -58,6 +58,8 @@
[detail]    _timeRange=AvailableRange;
[detail]    _beforePickDelay=0.02;
[detail]    _afterPickDelay=0.02;
[detail] +
[detail] +    _signalIndexColors=nullptr;
[detail]  }
[detail]  
[detail]  SignalLayer::~SignalLayer ()
[detail] @@ -115,8 +117,12 @@
[detail]      }
[detail]    } else {
[detail]      switch(_yAxis) {
[detail] -    case Receiver:
[detail] -      _signalY=_subPool->receivers().project();
[detail] +      case Receiver: {
[detail] +          double a, b;
[detail] +          Curve<Point> r=_subPool->receivers();
[detail] +          r.leastSquare(a, b);
[detail] +          _signalY=r.project(a, b);
[detail] +        }
[detail]        break;
[detail]      case ViewerIndex:
[detail]        for(int i=_subPool->count()-1; i>=0; i--) {
[detail] @@ -126,7 +132,7 @@
[detail]      case SignalName: {
[detail]          QMap<QString,int> names=_subPool->signalNames();
[detail]          for(int i=_subPool->count()-1; i>=0; i--) {
[detail] -          _signalY[i]=names[_subPool->at(i)->nameComponent()]+1;
[detail] +          _signalY[i]=names[_subPool->at(i)->metaData()->nameComponent()]+1;
[detail]          }
[detail]        }
[detail]        break;
[detail] @@ -156,11 +162,11 @@
[detail]      double mini, maxi;
[detail]      SAFE_UNINITIALIZED(mini, 0.0)
[detail]      for(int i=0; i<n; i++) {
[detail] -      Signal * sig=_subPool->at(i);
[detail] -      maxi=sig->maximumAmplitude();
[detail] +        SignalSegment * sig=_subPool->at(i);
[detail] +        maxi=sig->values()->maximumAmplitude();
[detail]        switch (sig->type()) {
[detail] -      case Signal::UndefinedSignalType:
[detail] -      case Signal::Waveform:
[detail] +        case DoubleSignal::UndefinedSignalType:
[detail] +        case DoubleSignal::Waveform:
[detail]          
[detail]          switch(_offset) {
[detail]          case NoOffset:
[detail] @@ -168,17 +174,17 @@
[detail]            break;
[detail]          case GlobalOffset:
[detail]          case VisibleOffset: { 
[detail] -            double a=sig->averageAmplitude();
[detail] +            double a=sig->values()->averageAmplitude();
[detail]              mini=fabs(a)-maxi;
[detail]              maxi=-mini;
[detail]            }
[detail]            break;
[detail]          }
[detail]          break;
[detail] -      case Signal::Spectrum:
[detail] +        case DoubleSignal::Spectrum:
[detail]          mini=0;
[detail]          break;
[detail] -      case Signal::Phase:
[detail] +        case DoubleSignal::Phase:
[detail]          mini=-M_PI;
[detail]          maxi=M_PI;
[detail]          break;
[detail] @@ -232,7 +238,7 @@
[detail]  }
[detail]  
[detail]  
[detail] -void SignalLayer::drawingAmplitude(const Signal * sig, int itmin, int itmax, double& valClip, double& affMax) const
[detail] +  void SignalLayer::drawingAmplitude(const SignalSegment * sig, int itmin, int itmax, double& valClip, double& affMax) const
[detail]  {
[detail]    TRACE;
[detail]    double vmax;
[detail] @@ -244,12 +250,12 @@
[detail]      case NormalizeOne:
[detail]      case NormalizeValue:
[detail]        switch (sig->type()) {
[detail] -      case Signal::Waveform:
[detail] -      case Signal::UndefinedSignalType:
[detail] -      case Signal::Spectrum:
[detail] -        vmax=sig->maximumAmplitude();
[detail] +        case DoubleSignal::Waveform:
[detail] +        case DoubleSignal::UndefinedSignalType:
[detail] +        case DoubleSignal::Spectrum:
[detail] +          vmax=sig->values()->maximumAmplitude();
[detail]          break;
[detail] -      case Signal::Phase:
[detail] +        case DoubleSignal::Phase:
[detail]          vmax=M_PI;
[detail]          break;
[detail]        }
[detail] @@ -257,12 +263,12 @@
[detail]      case NormalizeVisibleAll:
[detail]      case NormalizeVisibleOne: {
[detail]          switch (sig->type()) {
[detail] -        case Signal::Waveform:
[detail] -        case Signal::UndefinedSignalType:
[detail] -        case Signal::Spectrum:
[detail] -          vmax=sig->maximumAmplitude(itmin, itmax);
[detail] +          case DoubleSignal::Waveform:
[detail] +          case DoubleSignal::UndefinedSignalType:
[detail] +          case DoubleSignal::Spectrum:
[detail] +          vmax=sig->values()->maximumAmplitude(itmin, itmax);
[detail]            break;
[detail] -        case Signal::Phase:
[detail] +          case DoubleSignal::Phase:
[detail]            vmax=M_PI;
[detail]            break;
[detail]          }
[detail] @@ -277,65 +283,65 @@
[detail]      }
[detail]    } else {
[detail]      switch (sig->type()) {
[detail] -    case Signal::Waveform:
[detail] +      case DoubleSignal::Waveform:
[detail]        switch (_normalize) {
[detail]        case NormalizeAll:
[detail] -        vmax=sig->maximumAmplitude();
[detail] +          vmax=sig->values()->maximumAmplitude();
[detail]          break;
[detail]        case NormalizeVisibleAll:
[detail] -        vmax=sig->maximumAmplitude(itmin, itmax);
[detail] +          vmax=sig->values()->maximumAmplitude(itmin, itmax);
[detail]          break;
[detail]        case NormalizeOne:
[detail] -        vmax=sig->maximumAmplitude();
[detail] -        if(vmax==0. ) vmax=1.;
[detail] +          vmax=sig->values()->maximumAmplitude();
[detail] +          if(vmax==0.0) vmax=1.;
[detail]          affMax=0.5/vmax;
[detail]          break;
[detail]        case NormalizeVisibleOne:
[detail] -        vmax=sig->maximumAmplitude(itmin, itmax);
[detail] -        if(vmax==0. ) vmax=1.;
[detail] +          vmax=sig->values()->maximumAmplitude(itmin, itmax);
[detail] +          if(vmax==0.0) vmax=1.0;
[detail]          affMax=0.5/vmax;
[detail]          break;
[detail]        case NormalizeValue:
[detail] -        vmax=sig->maximumAmplitude();
[detail] +          vmax=sig->values()->maximumAmplitude();
[detail]          affMax=0.5/_normalizeValue;
[detail]          break;
[detail]        }
[detail]        break;
[detail] -    case Signal::Spectrum:
[detail] +      case DoubleSignal::Spectrum:
[detail]        switch (_normalize) {
[detail]        case NormalizeAll:
[detail] -        vmax=sig->maximumAmplitude();
[detail] +          vmax=sig->values()->maximumAmplitude();
[detail]          break;
[detail]        case NormalizeVisibleAll:
[detail] -        vmax=sig->maximumAmplitude(itmin, itmax);
[detail] +          vmax=sig->values()->maximumAmplitude(itmin, itmax);
[detail]          break;
[detail]        case NormalizeOne:
[detail] -        vmax=sig->maximumAmplitude();
[detail] -        if(vmax==0. ) vmax=1.;
[detail] +          vmax=sig->values()->maximumAmplitude();
[detail] +          if(vmax==0.0) vmax=1.0;
[detail]          affMax=1.0/vmax;
[detail]          break;
[detail]        case NormalizeVisibleOne:
[detail] -        vmax=sig->maximumAmplitude(itmin, itmax);
[detail] -        if(vmax==0. ) vmax=1.;
[detail] +          vmax=sig->values()->maximumAmplitude(itmin, itmax);
[detail] +          if(vmax==0.0) vmax=1.0;
[detail]          affMax=1.0/vmax;
[detail]          break;
[detail]        case NormalizeValue:
[detail] -        vmax=sig->maximumAmplitude();
[detail] +          vmax=sig->values()->maximumAmplitude();
[detail]          affMax=1.0/_normalizeValue;
[detail]          break;
[detail]        }
[detail]        break;
[detail] -    case Signal::Phase:
[detail] +      case DoubleSignal::Phase:
[detail]        affMax=0.5/M_PI * _overlap;
[detail]        valClip=M_PI;
[detail]        return;
[detail] -    case Signal::UndefinedSignalType:
[detail] +      case DoubleSignal::UndefinedSignalType:
[detail]        affMax=0.5 * _overlap;
[detail]        valClip=1.0;
[detail]        return;
[detail]      }
[detail]      affMax *= _overlap;
[detail] -    QMap<const Signal *, double>::const_iterator it=_signalOverlaps.find(sig);
[detail] +      QMap<const SignalSegment *, double>::const_iterator it=_signalOverlaps.find(sig);
[detail]      if(it!=_signalOverlaps.end()) {
[detail]        affMax *= it.value();
[detail]      }
[detail] @@ -348,7 +354,7 @@
[detail]    }
[detail]  }
[detail]  
[detail] -const DateTime& SignalLayer::timeReference(const Signal * sig) const
[detail] +  DateTime SignalLayer::timeReference(const SignalSegment * sig) const
[detail]  {
[detail]    TRACE;
[detail]    switch(_timeScale) {
[detail] @@ -356,18 +362,20 @@
[detail]      break;
[detail]    case RelativeToStartTime:
[detail]      return sig->startTime();
[detail] +    case Correlation:
[detail] +      return sig->startTime().shifted(sig->duration()*0.5);
[detail]    }
[detail]    return graph()->xAxis()->timeReference();
[detail]  }
[detail]  
[detail]  
[detail] -bool SignalLayer::visibleSamples(const GraphContentsOptions& gc, const Signal * sig,
[detail] +  bool SignalLayer::visibleSamples(const GraphContentsOptions& gc, const SignalSegment * sig,
[detail]                                   int& itmin, int& itmax, double& x0, double& dx) const
[detail]  {
[detail]    TRACE;
[detail] -  const DateTime& tref=timeReference(sig);
[detail] +    DateTime tref=timeReference(sig);
[detail]    switch (sig->type()) {
[detail] -  case Signal::Waveform: {
[detail] +    case DoubleSignal::Waveform: {
[detail]        dx=sig->samplingPeriod();
[detail]        ::TimeRange tw;
[detail]        switch(_timeRange) {
[detail] @@ -376,7 +384,7 @@
[detail]          tw.setEnd(tref.shifted(gc.xVisMax()));
[detail]          break;
[detail]        case AroundPickRange: {
[detail] -          DateTime t=sig->metaData<TimePick>().value(_aroundPickName);
[detail] +            DateTime t=sig->metaData()->optionalData().get<TimePick>().value(_aroundPickName);
[detail]            tw.setStart(t.shifted(-_beforePickDelay));
[detail]            tw.setEnd(t.shifted(_afterPickDelay));
[detail]          }
[detail] @@ -390,8 +398,8 @@
[detail]        if(itmin<0) {
[detail]          itmin=0;
[detail]        }
[detail] -      if(itmax>sig->nSamples()-1) {
[detail] -        itmax=sig->nSamples()-1;
[detail] +        if(itmax>sig->size()-1) {
[detail] +          itmax=sig->size()-1;
[detail]        }
[detail]        x0=tref.secondsTo(sig->startTime())+itmin*dx;
[detail]        if(fabs(gc.ax()*dx)<1.0) {
[detail] @@ -400,9 +408,9 @@
[detail]          return true;
[detail]        }
[detail]      }
[detail] -  case Signal::Spectrum:
[detail] -  case Signal::Phase: {
[detail] -      int nSamples2=sig->nSamples()/2;
[detail] +    case DoubleSignal::Spectrum:
[detail] +    case DoubleSignal::Phase: {
[detail] +        int nSamples2=sig->size()/2;
[detail]        dx=1.0/sig->duration();
[detail]        itmin=qFloor(gc.xVisMin()/dx)-1;
[detail]        if(itmin<1) itmin=1; 
[detail] @@ -417,7 +425,7 @@
[detail]          return true;
[detail]        }
[detail]      }
[detail] -  case Signal::UndefinedSignalType:
[detail] +    case DoubleSignal::UndefinedSignalType:
[detail]      return false;
[detail]    }
[detail]    return false;
[detail] @@ -425,7 +433,7 @@
[detail]  
[detail]  
[detail]  
[detail] -void SignalLayer::drawSignal(const GraphContentsOptions& gc, QPainter& p, const Signal * sig, int iSig,
[detail] +  void SignalLayer::drawSignal(const GraphContentsOptions& gc, QPainter& p, const SignalSegment * sig, int iSig,
[detail]                               int itmin, int itmax, double x0, double dx,
[detail]                               bool allSamplesVisible, double affMax, int pixelWidth,
[detail]                               bool variableArea, bool wiggleTrace) const
[detail] @@ -435,7 +443,7 @@
[detail]    
[detail]    
[detail]    double valClip;
[detail] -  if((_normalize==NormalizeAll) && sig->type()==Signal::Spectrum) {
[detail] +    if((_normalize==NormalizeAll) && sig->type()==DoubleSignal::Spectrum) {
[detail]      affMax*=2;
[detail]    }
[detail]    drawingAmplitude(sig, itmin, itmax, valClip, affMax);
[detail] @@ -449,28 +457,29 @@
[detail]    double y0;
[detail]    SAFE_UNINITIALIZED(y0,0);
[detail]    
[detail] -  if(sig->isSpectrum()) {
[detail] +    if(sig->values()->isSpectrum()) {
[detail]      y0=_signalY[ iSig ];
[detail]    } else {
[detail]      switch(_offset) {
[detail]      case NoOffset: y0=_signalY[ iSig ]; break;
[detail] -    case GlobalOffset: y0=_signalY[iSig]-sig->averageAmplitude()*affMax; break;
[detail] -    case VisibleOffset: y0=_signalY[iSig]-sig->averageAmplitude(itmin, itmax)*affMax; break;
[detail] +      case GlobalOffset: y0=_signalY[iSig]-sig->values()->averageAmplitude()*affMax; break;
[detail] +      case VisibleOffset: y0=_signalY[iSig]-sig->values()->averageAmplitude(itmin, itmax)*affMax; break;
[detail]      }
[detail]    }
[detail]    
[detail]    
[detail]    
[detail] +    const StoredSignal * values=sig->values();
[detail]    double globalMaxSpec;
[detail]    SAFE_UNINITIALIZED(globalMaxSpec,0);
[detail]    switch (sig->type()) {
[detail] -  case Signal::Phase:
[detail] -    globalMaxSpec=sig->maximumAmplitude();
[detail] +    case DoubleSignal::Phase:
[detail] +      globalMaxSpec=values->maximumAmplitude();
[detail]      break;
[detail]    default:
[detail]      break;
[detail]    }
[detail] -  CONST_LOCK_SAMPLES(double, samples, sig)
[detail] +    CONST_LOCK_SAMPLES(double, samples, values)
[detail]      
[detail]      
[detail]      if(!allSamplesVisible && (wiggleTrace || variableArea)) {
[detail] @@ -480,7 +489,7 @@
[detail]        int ix=gc.xr2s(x0);
[detail]        int iy1, iy2, iy1n, iy2n;
[detail]        switch (sig->type()) {
[detail] -      case Signal::Waveform:
[detail] +        case DoubleSignal::Waveform:
[detail]          maxVal=samples[i];
[detail]          if(maxVal>valClip) maxVal=valClip;
[detail]          else if(maxVal<-valClip) maxVal=-valClip;
[detail] @@ -516,17 +525,17 @@
[detail]            }
[detail]          }
[detail]          break;
[detail] -      case Signal::Spectrum:
[detail] -        maxVal=sig->amplitude(samples, i);
[detail] +        case DoubleSignal::Spectrum:
[detail] +          maxVal=values->amplitude(samples, i);
[detail]          if(maxVal > valClip) maxVal=valClip;
[detail]          iy1=gc.yr2s(y0 + maxVal * affMax);
[detail]          iy2=iy1;
[detail]          for( ;ix < pixelWidth && i < itmax;ix++ ) {
[detail]            x_step=gc.xs2r(ix);
[detail] -          minVal=sig->amplitude(samples, i);
[detail] +            minVal=sig->values()->amplitude(samples, i);
[detail]            maxVal=minVal;
[detail]            while(x < x_step && i < itmax) {
[detail] -            val=sig->amplitude(samples, i);
[detail] +              val=sig->values()->amplitude(samples, i);
[detail]              if(val < minVal) minVal=val;
[detail]              else if(val > maxVal) maxVal=val;
[detail]              i++;
[detail] @@ -551,20 +560,20 @@
[detail]            }
[detail]          }
[detail]          break;
[detail] -      case Signal::Phase: {
[detail] -          maxVal=sig->phase(samples, i);
[detail] +        case DoubleSignal::Phase: {
[detail] +            maxVal=values->phase(samples, i);
[detail]            if(maxVal > valClip) maxVal=valClip;
[detail]            else if(maxVal < -valClip) maxVal=-valClip;
[detail]            iy1=gc.yr2s(y0 + maxVal * affMax);
[detail]            iy2=iy1;
[detail]            for( ;ix < pixelWidth && i < itmax;ix++ ) {
[detail]              x_step=gc.xs2r(ix);
[detail] -            minVal=sig->phase(samples, i);
[detail] +              minVal=values->phase(samples, i);
[detail]              maxVal=minVal;
[detail]              double maxSpec=0, valSpec;
[detail]              while(x < x_step && i < itmax) {
[detail] -              val=sig->phase(samples, i);
[detail] -              valSpec=sig->amplitude(samples, i);
[detail] +                val=values->phase(samples, i);
[detail] +                valSpec=values->amplitude(samples, i);
[detail]                if(valSpec > maxSpec) maxSpec=valSpec;
[detail]                if(val < minVal) minVal=val;
[detail]                else if(val > maxVal) maxVal=val;
[detail] @@ -588,13 +597,13 @@
[detail]            }
[detail]          }
[detail]          break;
[detail] -      case Signal::UndefinedSignalType:
[detail] +        case DoubleSignal::UndefinedSignalType:
[detail]          break;
[detail]        }
[detail]      } else {
[detail]        if(wiggleTrace) {
[detail]          switch (sig->type()) {
[detail] -        case Signal::Waveform: {
[detail] +          case DoubleSignal::Waveform: {
[detail]              double val=samples[ itmin ];
[detail]              if(val > valClip) val=valClip;
[detail]              else if(val < -valClip) val=-valClip;
[detail] @@ -611,14 +620,14 @@
[detail]              }
[detail]            }
[detail]            break;
[detail] -        case Signal::Spectrum: {
[detail] -            double val=sig->amplitude(samples, itmin);
[detail] +          case DoubleSignal::Spectrum: {
[detail] +              double val=values->amplitude(samples, itmin);
[detail]              if(val > valClip) val=valClip;
[detail]              double x=x0;
[detail]              QPoint p1=gc.r2s(x, y0 + val * affMax);
[detail]              x += dx;
[detail]              for(int i=itmin + 1; i <= itmax; i++, x += dx) {
[detail] -              val=sig->amplitude(samples, i);
[detail] +                val=values->amplitude(samples, i);
[detail]                if(val > valClip) val=valClip;
[detail]                QPoint p2=gc.r2s(x, y0 + val * affMax);
[detail]                p.drawLine(p1, p2);
[detail] @@ -626,26 +635,26 @@
[detail]              }
[detail]            }
[detail]            break;
[detail] -        case Signal::Phase: {
[detail] -            double val=sig->phase(samples, itmin);
[detail] +          case DoubleSignal::Phase: {
[detail] +              double val=values->phase(samples, itmin);
[detail]              if(val > valClip) val=valClip;
[detail]              else if(val < -valClip) val=-valClip;
[detail]              double x=x0;
[detail]              QPoint p1=gc.r2s(x, y0 + val * affMax);
[detail]              x += dx;
[detail]              for(int i=itmin + 1; i <= itmax; i++, x += dx) {
[detail] -              val=sig->phase(samples, i);
[detail] +                val=values->phase(samples, i);
[detail]                if(val > valClip) val=valClip;
[detail]                else if(val < -valClip) val=-valClip;
[detail]                QPoint p2=gc.r2s(x, y0 + val * affMax);
[detail] -              int specColor=qRound(255.0*(1.0-sig->amplitude(samples, i)/globalMaxSpec));
[detail] +                int specColor=qRound(255.0*(1.0-values->amplitude(samples, i)/globalMaxSpec));
[detail]                p.setPen(QColor( specColor, specColor, specColor) );
[detail]                p.drawLine(p1, p2);
[detail]                p1=p2;
[detail]              }
[detail]            }
[detail]            break;
[detail] -        case Signal::UndefinedSignalType:
[detail] +          case DoubleSignal::UndefinedSignalType:
[detail]            break;
[detail]          }
[detail]        }
[detail] @@ -655,14 +664,14 @@
[detail]          int n;
[detail]          double val;
[detail]          switch (sig->type()) {
[detail] -        case Signal::Waveform: {
[detail] +          case DoubleSignal::Waveform: {
[detail]              n=0;
[detail]              double x=x0;
[detail]              for(int i=itmin; i <= itmax; i++, x += dx) {
[detail]                val=samples[ i ];
[detail]                if(val > valClip) val=valClip;
[detail]                else if(val < -valClip) val=-valClip;
[detail] -              if(val >= 0. ) {
[detail] +                if(val>=0.0) {
[detail]                  if( !n) {
[detail]                    if(i==itmin) {
[detail]                      pSeq[ n ]=gc.r2s(x, y0);
[detail] @@ -701,12 +710,12 @@
[detail]              }
[detail]            }
[detail]            break;
[detail] -        case Signal::Spectrum: {
[detail] +          case DoubleSignal::Spectrum: {
[detail]              double x=x0;
[detail]              pSeq[ 0 ]=gc.r2s(x, y0);
[detail]              n=1;
[detail]              for(int i=itmin; i <= itmax; i++, x += dx) {
[detail] -              val=sig->amplitude(samples, i);
[detail] +                val=values->amplitude(samples, i);
[detail]                if(val > valClip) val=valClip;
[detail]                pSeq[ n ]=gc.r2s(x, y0 + val * affMax);
[detail]                n++;
[detail] @@ -727,23 +736,23 @@
[detail]              }
[detail]            }
[detail]            break;
[detail] -        case Signal::Phase: {
[detail] +          case DoubleSignal::Phase: {
[detail]              n=0;
[detail]              double x=x0;
[detail]              for(int i=itmin; i <= itmax; i++, x += dx) {
[detail] -              int specColor=qRound(255.0*(1.0-sig->amplitude(samples, i)/globalMaxSpec));
[detail] +                int specColor=qRound(255.0*(1.0-values->amplitude(samples, i)/globalMaxSpec));
[detail]                p.setPen(QColor( specColor, specColor, specColor) );
[detail] -              val=sig->phase(samples, i);
[detail] +                val=values->phase(samples, i);
[detail]                if(val > valClip) val=valClip;
[detail]                else if(val < -valClip) val=-valClip;
[detail] -              if(val >= 0. ) {
[detail] +                if(val>=0.0) {
[detail]                  if( !n) {
[detail]                    if(i==itmin) {
[detail]                      pSeq[ n ]=gc.r2s(x, y0);
[detail]                      n++;
[detail]                    } else {
[detail] -                    val=sig->phase(samples, i); 
[detail] -                    double inter=val/(val - sig->phase(samples, i - 1) );
[detail] +                      val=values->phase(samples, i); 
[detail] +                      double inter=val/(val-values->phase(samples, i-1));
[detail]                      pSeq[ n ]=gc.r2s(x - inter * dx, y0);
[detail]                      n++;
[detail]                    }
[detail] @@ -760,8 +769,8 @@
[detail]                  }
[detail]                } else {
[detail]                  if(n) {
[detail] -                  val=sig->phase(samples, i); 
[detail] -                  double inter=val/(sig->phase(samples, i - 1) - val);
[detail] +                    val=values->phase(samples, i); 
[detail] +                    double inter=val/(values->phase(samples, i - 1) - val);
[detail]                    pSeq[ n ]=gc.r2s(x + inter * dx, y0);
[detail]                    n++;
[detail]                    p.drawPolygon(pSeq, n);
[detail] @@ -777,12 +786,12 @@
[detail]              }
[detail]            }
[detail]            break;
[detail] -        case Signal::UndefinedSignalType:
[detail] +          case DoubleSignal::UndefinedSignalType:
[detail]            break;
[detail]          }
[detail]        }
[detail]      }
[detail] -  UNLOCK_SAMPLES(sig);
[detail] +    UNLOCK_SAMPLES(values);
[detail]  }
[detail]  
[detail]  void SignalLayer::paintData(const LayerPainterRequest& lp, QPainter& p, double dotpercm) const
[detail] @@ -805,16 +814,16 @@
[detail]      double x0, dx;
[detail]      CacheProcess cp;
[detail]      for(int iSig=isigmin; iSig<isigmax; ++iSig) {
[detail] -      const Signal * sig=_subPool->at(iSig);
[detail] +        const SignalSegment * sig=_subPool->at(iSig);
[detail]        visibleSamples(gc, sig, itmin, itmax, x0, dx);
[detail] -      cp.add(_subPool->at(iSig));
[detail] +        cp.add(_subPool->at(iSig)->values());
[detail]      }
[detail]      
[detail]      for(int iSig=isigmin; iSig<isigmax; ++iSig) {
[detail]        if(lp.terminated()) {
[detail]          return;
[detail]        }
[detail] -      const Signal * sig=_subPool->at(iSig);
[detail] +        const SignalSegment * sig=_subPool->at(iSig);
[detail]        lp.graphContents()->setProgressValue(iSig-isigmin);
[detail]        bool allSamplesVisible=visibleSamples(gc, sig, itmin, itmax, x0, dx);
[detail]        const QColor& c=signalColor(sig);
[detail] @@ -849,13 +858,12 @@
[detail]    height=gc.yr2s(_signalY[iSig]+rh)-top;
[detail]  }
[detail]  
[detail] -void SignalLayer::drawGaps(const GraphContentsOptions& gc, QPainter& p, const Signal * sig, int iSig) const
[detail] +  void SignalLayer::drawGaps(const GraphContentsOptions& gc, QPainter& p, const SignalSegment * sig, int iSig) const
[detail]  {
[detail] -  const SparseTimeRange& signalRange=sig->timeRange();
[detail] -  const DateTime& tref=timeReference(sig);
[detail] +    DateTime tref=timeReference(sig);
[detail]    ::TimeRange gcLimits(tref.shifted(gc.xVisMin()), tref.shifted(gc.xVisMax()));
[detail]    ::TimeRange sigLimits(sig->startTime(), sig->endTime());
[detail] -  SparseTimeRange gaps=signalRange.invert(true); 
[detail] +    SparseTimeRange gaps=sig->timeRange().invert(true); 
[detail]    gaps=gaps.intersection(gcLimits).intersection(sigLimits);
[detail]    const VectorList< ::TimeRange >& g=gaps.ranges();
[detail]    int n=g.count();
[detail] @@ -907,6 +915,7 @@
[detail]          }
[detail]          break;
[detail]        case RelativeToStartTime:
[detail] +        case Correlation: {
[detail]          double ll=0.0;
[detail]          
[detail]          for(SubSignalPool::const_iterator it=_subPool->begin(); it!=_subPool->end(); it++) {
[detail] @@ -915,11 +924,17 @@
[detail]              ll=l;
[detail]            }
[detail]          }
[detail] +            if(_timeScale==Correlation) {
[detail] +              ll*=0.5;
[detail] +              r.setLimits(-ll, ymin, ll, ymax);
[detail] +            } else {
[detail]          r.setLimits(0.0, ymin, ll, ymax);
[detail] +            }
[detail]          break;
[detail]        }
[detail]      }
[detail]    }
[detail] +    }
[detail]    return r;
[detail]  }
[detail]  
[detail] @@ -955,8 +970,8 @@
[detail]    switch(_normalize) {
[detail]    case NormalizeAll:
[detail]      for(int i=0;i < n;i++ ) {
[detail] -      const Signal * sig=_subPool->at(i);
[detail] -      double val=sig->maximumAmplitude();
[detail] +        const SignalSegment * sig=_subPool->at(i);
[detail] +        double val=sig->values()->maximumAmplitude();
[detail]        if(val>vmax) vmax=val;
[detail]        GeopsyCoreEngine::instance()->setProgressValue(db, i);
[detail]      }
[detail] @@ -964,9 +979,9 @@
[detail]    case NormalizeVisibleAll:
[detail]      int iMin, iMax;
[detail]      for(int i=0;i < n;i++ ) {
[detail] -      const Signal * sig=_subPool->at(i);
[detail] +        const SignalSegment * sig=_subPool->at(i);
[detail]        visibleSamples(gc, sig, iMin, iMax);
[detail] -      double val=sig->maximumAmplitude(iMin, iMax);
[detail] +        double val=sig->values()->maximumAmplitude(iMin, iMax);
[detail]        if(val>vmax) vmax=val;
[detail]        GeopsyCoreEngine::instance()->setProgressValue(db, i);
[detail]      }
[detail] @@ -988,31 +1003,6 @@
[detail]    bound.setBottom(graphContents()->options().yr2s(_signalY[index]-h));
[detail]  }
[detail]  
[detail] -ENUM_AS_STRING_BEGIN(SignalLayer, Normalize)
[detail] -ENUM_AS_STRING_DATA_5(NormalizeAll, NormalizeOne,
[detail] -                      NormalizeValue, NormalizeVisibleAll, NormalizeVisibleOne);
[detail] -ENUM_AS_STRING_END
[detail] -
[detail] -ENUM_AS_STRING_BEGIN(SignalLayer, Offset)
[detail] -ENUM_AS_STRING_DATA_3(GlobalOffset, NoOffset, VisibleOffset);
[detail] -ENUM_AS_STRING_END
[detail] -
[detail] -ENUM_AS_STRING_BEGIN(SignalLayer, Clip)
[detail] -ENUM_AS_STRING_DATA_4(ClipOverlap, ClipPercentage, ClipValue,NoClip);
[detail] -ENUM_AS_STRING_END
[detail] -
[detail] -ENUM_AS_STRING_BEGIN(SignalLayer, YAxis)
[detail] -ENUM_AS_STRING_DATA_4(Overlay, Receiver, SignalName, ViewerIndex);
[detail] -ENUM_AS_STRING_END
[detail] -
[detail] -ENUM_AS_STRING_BEGIN(SignalLayer, TimeRange)
[detail] -ENUM_AS_STRING_DATA_3(AroundPickRange, AvailableRange, CustomRange);
[detail] -ENUM_AS_STRING_END
[detail] -
[detail] -ENUM_AS_STRING_BEGIN(SignalLayer, TimeScale)
[detail] -ENUM_AS_STRING_DATA_2(AbsoluteTime, RelativeToStartTime);
[detail] -ENUM_AS_STRING_END
[detail] -
[detail]  QString SignalLayer::offsetString() const
[detail]  {
[detail]    return convertOffset(offset());
[detail] @@ -1105,11 +1095,11 @@
[detail]    if(scifigsContext->makeUp()) {
[detail]      XMLSaveAttributes att;
[detail]      QString& value=att.add(indexTag);
[detail] -    for(QMap<const Signal *,QColor>::const_iterator it=_signalColors.begin(); it!=_signalColors.end(); it++ ) {
[detail] +      for(QMap<const SignalSegment *,QColor>::const_iterator it=_signalColors.begin(); it!=_signalColors.end(); it++ ) {
[detail]        value=QString::number(_subPool->indexOf(it.key()) );
[detail]        writeProperty(s, signalColorTag, att, it.value().name());
[detail]      }
[detail] -    for(QMap<const Signal *,double>::const_iterator it=_signalOverlaps.begin(); it!=_signalOverlaps.end(); it++ ) {
[detail] +      for(QMap<const SignalSegment *,double>::const_iterator it=_signalOverlaps.begin(); it!=_signalOverlaps.end(); it++ ) {
[detail]        value=QString::number(_subPool->indexOf(it.key()) );
[detail]        writeProperty(s, signalOverlapTag, att, it.value());
[detail]      }
[detail] @@ -1162,13 +1152,18 @@
[detail]        XMLRestoreAttributeIterator it=attributes.find(indexTag);
[detail]        if(it!=attributes.end()) {
[detail]          int index=it.value().toInt(ok);
[detail] -        if(ok && index>=0 && _subPool && index<_subPool->count()) {
[detail] -          setSignalColor(_subPool->at(index), QColor(content.toStringView()));
[detail] +          if(ok && index>=0) {
[detail] +            if(!_signalIndexColors) {
[detail] +              _signalIndexColors=new QMap<int, QColor>;
[detail] +            }
[detail] +            _signalIndexColors->insert(index, QColor(content.toStringView()));
[detail]          } else {
[detail] -          App::log(tr("Index '%1' out of range for 'signalColor' property.\n").arg(it.value().toStringView()));
[detail] +            App::log(tr("Bad index '%1' for 'signalColor' property.\n").arg(it.value().toStringView()));
[detail] +            return false;
[detail]          }
[detail]        } else {
[detail]          App::log(tr("No 'index' for 'signalColor' property.\n") );
[detail] +          return false;
[detail]        }
[detail]      }
[detail]      return true;
[detail] @@ -1177,16 +1172,19 @@
[detail]        if(it!=attributes.end()) {
[detail]          int index=it.value().toInt(ok);
[detail]          if(index>=0 && _subPool && index<_subPool->count()) {
[detail] -          Signal * sig=_subPool->at(index);
[detail] +            SignalSegment * sig=_subPool->at(index);
[detail]            _signalOverlaps.insert(sig, content.toDouble(ok));
[detail]            if(!ok) {
[detail]            App::log(tr("Bad signal overlap value:'%1'.\n").arg(content.toStringView()));
[detail] +              return false;
[detail]            }
[detail]          } else {
[detail]            App::log(tr("Index '%1' out of range for 'signalOverlap' property.\n").arg(it.value().toStringView()));
[detail] +            return false;
[detail]          }
[detail]        } else {
[detail]          App::log(tr("No 'index' for 'signalOverlap' property.\n"));
[detail] +          return false;
[detail]        }
[detail]      }
[detail]      return true;
[detail] @@ -1220,6 +1218,23 @@
[detail]  {
[detail]    TRACE;
[detail]    Q_UNUSED(context)
[detail] +
[detail] +    if(_signalIndexColors) {
[detail] +      if(_subPool) {
[detail] +        QMap<int, QColor>::iterator it;
[detail] +        for(it=_signalIndexColors->begin(); it!=_signalIndexColors->end(); it++) {
[detail] +          int index=it.key();
[detail] +          if(index<_subPool->count()) {
[detail] +            setSignalColor(_subPool->at(index), it.value());
[detail] +          } else {
[detail] +            App::log(tr("Index '%1' out of range for 'signalColor' property.\n").arg(index));
[detail] +          }
[detail] +        }
[detail] +      }
[detail] +      delete _signalIndexColors;
[detail] +      _signalIndexColors=nullptr;
[detail] +    }
[detail] +
[detail]    subPoolUpdate();
[detail]    return true;
[detail]  }
[detail] @@ -1229,13 +1244,13 @@
[detail]    TRACE;
[detail]    if(iSig<isigmin) return ;
[detail]    if(iSig>=isigmax) return ;
[detail] -  Signal * sig=_subPool->at(iSig);
[detail] +    SignalSegment * sig=_subPool->at(iSig);
[detail]    p.setPen(QPen(Qt::red, 1));
[detail]    int itmin, itmax;
[detail]    double x0, dx;
[detail]    
[detail]    double affMax=0.5/maxAmplitude(gc);
[detail] -  if(sig->type()==Signal::Spectrum) {
[detail] +    if(sig->type()==DoubleSignal::Spectrum) {
[detail]      affMax*=2;
[detail]    }
[detail]    bool allSamplesVisible=visibleSamples(gc, sig, itmin, itmax, x0, dx);
[detail] @@ -1287,8 +1302,8 @@
[detail]        double dBase;
[detail]        int iSig=signalAt(y, dBase);
[detail]        if(iSig<0) return;
[detail] -      Signal * sig=_subPool->at(iSig);
[detail] -      QMap<const Signal *, double>::iterator it=_signalOverlaps.find(sig);
[detail] +        SignalSegment * sig=_subPool->at(iSig);
[detail] +        QMap<const SignalSegment *, double>::iterator it=_signalOverlaps.find(sig);
[detail]        if(it==_signalOverlaps.end()) {
[detail]          it=_signalOverlaps.insert(sig, 1.0);
[detail]        }
[detail] @@ -1305,9 +1320,9 @@
[detail]  }
[detail]  
[detail]  
[detail] -const QColor& SignalLayer::signalColor(const Signal * sig) const
[detail] +  const QColor& SignalLayer::signalColor(const SignalSegment * sig) const
[detail]  {
[detail] -  QMap<const Signal *, QColor>::const_iterator it=_signalColors.find(sig);
[detail] +    QMap<const SignalSegment *, QColor>::const_iterator it=_signalColors.find(sig);
[detail]    if(it!=_signalColors.end()) {
[detail]      return it.value();
[detail]    } else {
[detail] @@ -1317,11 +1332,11 @@
[detail]  }
[detail]  
[detail]  
[detail] -void SignalLayer::setSignalColor(const Signal * sig, const QColor& c)
[detail] +  void SignalLayer::setSignalColor(const SignalSegment * sig, const QColor& c)
[detail]  {
[detail]    TRACE;
[detail]    LayerLocker ll(this);
[detail] -  QMap<const Signal *, QColor>::iterator it=_signalColors.find(sig);
[detail] +    QMap<const SignalSegment *, QColor>::iterator it=_signalColors.find(sig);
[detail]    if(c==Qt::black) {
[detail]      if(it!=_signalColors.end()) {
[detail]        _signalColors.remove(sig);
[detail] @@ -1347,8 +1362,8 @@
[detail]    TRACE;
[detail]    Legend l(_subPool->count());
[detail]    for(int i=_subPool->count()-1; i>=0; i--) {
[detail] -    const Signal * sig=_subPool->at(i);
[detail] -    l.setText(i, QString("%1: %2").arg(sig->id()).arg(sig->nameComponent()));
[detail] +      const SignalSegment * sig=_subPool->at(i);
[detail] +      l.setText(i, QString("%1: %2").arg(sig->id().toString()).arg(sig->metaData()->nameComponent()));
[detail]      l.setPen(i, Pen(signalColor(sig)));
[detail]    }
[detail]    return l;
[detail] @@ -1359,7 +1374,7 @@
[detail]    TRACE;
[detail]    ASSERT(l.count()==_subPool->count());
[detail]    for(int i=_subPool->count()-1; i>=0; i--) {
[detail] -    const Signal * sig=_subPool->at(i);
[detail] +      const SignalSegment * sig=_subPool->at(i);
[detail]      setSignalColor(sig, l.pen(i).color());
[detail]    }
[detail]  }
[detail] @@ -1394,8 +1409,9 @@
[detail]    TRACE;
[detail]    if(w->id()==_tab) {
[detail]      w->setValue(SignalsProperties::ColoredSection, _coloredGrid);
[detail] -    if(_subPool && !_subPool->isEmpty())
[detail] -      w->setValue(SignalsProperties::IsSpectrum, _subPool->first()->isSpectrum());
[detail] +      if(_subPool && !_subPool->isEmpty()) {
[detail] +        w->setValue(SignalsProperties::IsSpectrum, _subPool->first()->values()->isSpectrum());
[detail] +      }
[detail]      w->setValue(SignalsProperties::Wiggle, _wiggleTrace);
[detail]      w->setValue(SignalsProperties::VariableArea, _variableArea);
[detail]      w->setValue(SignalsProperties::Normalize, SignalsProperties::normalize2item(_normalize));
[detail] @@ -1523,13 +1539,13 @@
[detail]    }
[detail]  }
[detail]  
[detail] -QList<Signal *> SignalLayer::hitSignals(double ry1, double ry2) const
[detail] +  QList<SignalSegment *> SignalLayer::hitSignals(double ry1, double ry2) const
[detail]  {
[detail] -  QList<Signal *> sigs;
[detail] +    QList<SignalSegment *> sigs;
[detail]    TRACE;
[detail]    for(int iSig=_subPool->count()-1; iSig>=0; --iSig) {
[detail] -    Signal * sig=_subPool->at(iSig);
[detail] -    if(!sig->isSpectrum()) {
[detail] +      SignalSegment * sig=_subPool->at(iSig);
[detail] +      if(!sig->values()->isSpectrum()) {
[detail]        double y0=signalY(iSig);
[detail]        if(y0>ry1 && y0<ry2) {
[detail]          sigs.append(sig);
[detail] @@ -1544,32 +1560,28 @@
[detail]  {
[detail]    TRACE;
[detail]    LayerLocker ll(this);
[detail] -  QList<Signal *> sigs=hitSignals(ry1, ry2);
[detail] +    QList<SignalSegment *> sigs=hitSignals(ry1, ry2);
[detail]    switch(id) {
[detail]    case AddGaps:
[detail]      for(int i=sigs.count()-1; i>=0; --i) {
[detail] -      Signal * sig=sigs.at(i);
[detail] +        SignalSegment * sig=sigs.at(i);
[detail]        const DateTime& tref=timeReference(sig);
[detail]        GeopsyCore::TimeRange r(tref.shifted(rx1), tref.shifted(rx2));
[detail] -      SparseTimeRange sr=sig->timeRange();
[detail] -      sr.remove(r);
[detail]        GeopsyGuiEngine::instance()->beginSignalChange(sig);
[detail] -      sig->setTimeRange(sr);
[detail] -      sig->setHeaderModified(true);
[detail] +        sig->removeTimeRange(r);
[detail] +        sig->metaData()->setModified(true);
[detail]        GeopsyGuiEngine::instance()->endSignalChange(sig);
[detail]      }
[detail]      deepUpdate();
[detail]      return true;
[detail]    case RemoveGaps:
[detail]      for(int i=sigs.count()-1; i>=0; --i) {
[detail] -      Signal * sig=sigs.at(i);
[detail] +        SignalSegment * sig=sigs.at(i);
[detail]        const DateTime& tref=timeReference(sig);
[detail]        GeopsyCore::TimeRange r(tref.shifted(rx1), tref.shifted(rx2));
[detail] -      SparseTimeRange sr=sig->timeRange();
[detail] -      sr.add(r, true);
[detail]        GeopsyGuiEngine::instance()->beginSignalChange(sig);
[detail] -      sig->setTimeRange(sr); 
[detail] -      sig->setHeaderModified(true);
[detail] +        sig->addTimeRange(r);
[detail] +        sig->metaData()->setModified(true);
[detail]        GeopsyGuiEngine::instance()->endSignalChange(sig);
[detail]      }
[detail]      deepUpdate();
[detail] @@ -1609,18 +1621,19 @@
[detail]      y=grid->y(iyGrid);
[detail]      int iSig=signalAt(gc.yr2s(y), d); 
[detail]                                        
[detail] -    Signal * sig=_subPool->at(iSig);
[detail] +      SignalSegment * sig=_subPool->at(iSig);
[detail]      double t0=timeReference(sig).secondsTo(sig->startTime());
[detail]      visibleSamples(graphContents()->options(), sig, imin, imax);
[detail] -    CONST_LOCK_SAMPLES(double, samples, sig)
[detail] +      StoredSignal * values=sig->values();
[detail] +      CONST_LOCK_SAMPLES(double, samples, values)
[detail]        
[detail]        
[detail]        switch(sig->type()) {
[detail] -      case Signal::Waveform:
[detail] +        case DoubleSignal::Waveform:
[detail]          if(_normalize==NormalizeAll) affMax=affMax0;
[detail]          drawingAmplitude(sig, imin, imax, valClip, affMax);
[detail]          for(ixGrid+=it._dixGrid; ixGrid!=it._ixEndGrid; ixGrid+=it._dixGrid) {
[detail] -          sig->valueRange(samples, grid->x(ixGrid-it._dixGrid)-t0, grid->x(ixGrid)-t0,
[detail] +            values->valueRange(samples, grid->x(ixGrid-it._dixGrid)-t0, grid->x(ixGrid)-t0,
[detail]                            minVal, maxVal);
[detail]            if(minVal<0.0) {
[detail]              if(maxVal>0.0) {
[detail] @@ -1636,30 +1649,55 @@
[detail]            grid->setValue(ixGrid, iyGrid, val*affMax);
[detail]          }
[detail]          break;
[detail] -      case Signal::Spectrum:
[detail] +        case DoubleSignal::Spectrum:
[detail]          if(_normalize==NormalizeAll) affMax=2.0*affMax0;
[detail]          drawingAmplitude(sig, imin, imax, valClip, affMax);
[detail]          for(; ixGrid!=it._ixEndGrid; ixGrid+=it._dixGrid) {
[detail] -          val=sig->DoubleSignal::complexAt(samples, grid->x(ixGrid)-t0).abs();
[detail] +            val=values->complexAt(samples, grid->x(ixGrid)-t0).abs();
[detail]            if(val>valClip) val=valClip;
[detail]            grid->setValue(ixGrid, iyGrid, val*affMax);
[detail]          }
[detail]          break;
[detail] -      case Signal::Phase:
[detail] +        case DoubleSignal::Phase:
[detail]          if(_normalize==NormalizeAll) affMax=affMax0;
[detail]          drawingAmplitude(sig, imin, imax, valClip, affMax);
[detail]          for(; ixGrid!=it._ixEndGrid; ixGrid+=it._dixGrid) {
[detail] -          val=sig->DoubleSignal::complexAt(samples, grid->x(ixGrid)-t0).phase();
[detail] +            val=values->complexAt(samples, grid->x(ixGrid)-t0).phase();
[detail]            if(val>valClip) val=valClip;
[detail]            grid->setValue(ixGrid, iyGrid, val*affMax);
[detail]          }
[detail]          break;
[detail] -      case Signal::UndefinedSignalType:
[detail] +        case DoubleSignal::UndefinedSignalType:
[detail]          break;
[detail]        }
[detail] -    UNLOCK_SAMPLES(sig)
[detail] +      UNLOCK_SAMPLES(values)
[detail]    }
[detail]    return grid;
[detail]  }
[detail]  
[detail] +  ENUM_AS_STRING_BEGIN(SignalLayer, Normalize)
[detail] +  ENUM_AS_STRING_DATA_5(NormalizeAll, NormalizeOne,
[detail] +                        NormalizeValue, NormalizeVisibleAll, NormalizeVisibleOne);
[detail] +  ENUM_AS_STRING_END
[detail] +
[detail] +  ENUM_AS_STRING_BEGIN(SignalLayer, Offset)
[detail] +  ENUM_AS_STRING_DATA_3(GlobalOffset, NoOffset, VisibleOffset);
[detail] +  ENUM_AS_STRING_END
[detail] +
[detail] +  ENUM_AS_STRING_BEGIN(SignalLayer, Clip)
[detail] +  ENUM_AS_STRING_DATA_4(ClipOverlap, ClipPercentage, ClipValue,NoClip);
[detail] +  ENUM_AS_STRING_END
[detail] +
[detail] +  ENUM_AS_STRING_BEGIN(SignalLayer, YAxis)
[detail] +  ENUM_AS_STRING_DATA_4(Overlay, Receiver, SignalName, ViewerIndex);
[detail] +  ENUM_AS_STRING_END
[detail] +
[detail] +  ENUM_AS_STRING_BEGIN(SignalLayer, TimeRange)
[detail] +  ENUM_AS_STRING_DATA_3(AroundPickRange, AvailableRange, CustomRange);
[detail] +  ENUM_AS_STRING_END
[detail] +
[detail] +  ENUM_AS_STRING_BEGIN(SignalLayer, TimeScale)
[detail] +  ENUM_AS_STRING_DATA_3(AbsoluteTime, Correlation, RelativeToStartTime);
[detail] +  ENUM_AS_STRING_END
[detail] +
[detail]  } 
[detail]              src/SignalLayerControls.cpp:  version-3.5.0	modified out of comments
[detail] --- src/SignalLayerControls.cpp-version-3.5.0-stripped	2025-09-28 04:01:08.519519990 +0200
[detail] +++ src/SignalLayerControls.cpp-HEAD-stripped	2025-09-28 04:01:08.523520009 +0200
[detail] @@ -89,7 +89,7 @@
[detail]      if(newTimeRange<currentTimeRange) {
[detail]        double newVisibleMinimum=w->xAxis()->visibleMinimum()+(currentTimeRange-newTimeRange)/2;
[detail]        w->zoomIn(newVisibleMinimum, w->yAxis()->visibleMinimum(),
[detail] -                newVisibleMinimum+newTimeRange, w->yAxis()->visibleMaximum());
[detail] +                newVisibleMinimum+newTimeRange, w->yAxis()->visibleMaximum(), true);
[detail]      } else {
[detail]        w->zoomOut();
[detail]        if(newTimeRange<w->xAxis()->maximum()-w->xAxis()->minimum()) {
[detail]                src/SignalsProperties.cpp:  version-3.5.0	modified out of comments
[detail] --- src/SignalsProperties.cpp-version-3.5.0-stripped	2025-09-28 04:01:08.539520087 +0200
[detail] +++ src/SignalsProperties.cpp-HEAD-stripped	2025-09-28 04:01:08.543520105 +0200
[detail] @@ -334,6 +334,8 @@
[detail]      return 0;
[detail]    case SignalLayer::RelativeToStartTime:
[detail]      return 1;
[detail] +  case SignalLayer::Correlation:
[detail] +    return 2;
[detail]    }
[detail]    return 0;
[detail]  }
[detail] @@ -344,6 +346,8 @@
[detail]    switch (index) {
[detail]    case 1:
[detail]      return SignalLayer::RelativeToStartTime;
[detail] +  case 2:
[detail] +    return SignalLayer::Correlation;
[detail]    default:
[detail]      return SignalLayer::AbsoluteTime;
[detail]    }
[detail]             src/SparseTimeRangeModel.cpp:  version-3.5.0	not modified
[detail]           src/StationCoordinatesItem.cpp:  version-3.5.0	not modified
[detail]                    src/SubPoolWindow.cpp:  version-3.5.0	modified out of comments
[detail] --- src/SubPoolWindow.cpp-version-3.5.0-stripped	2025-09-28 04:01:08.595520357 +0200
[detail] +++ src/SubPoolWindow.cpp-HEAD-stripped	2025-09-28 04:01:08.599520376 +0200
[detail] @@ -31,8 +31,9 @@
[detail]  void SubPoolWindow::setSubPool(const SubSignalPool& subPool)
[detail]  {
[detail]    TRACE;
[detail] +  beginSubPoolUpdate();
[detail]    _subPool=subPool;
[detail] -  subPoolUpdate();
[detail] +  endSubPoolUpdate();
[detail]  }
[detail]  
[detail]  void SubPoolWindow::setHeaderWidget(HeaderWidget * w)
[detail] @@ -87,17 +88,20 @@
[detail]                           "To process all of them create a new window and start your "
[detail]                           "interpretation tool."), Message::ok());
[detail]    }
[detail] +  beginSubPoolUpdate();
[detail]    if(_subPool.isEmpty())
[detail]      _subPool=sel;
[detail]    else
[detail]      _subPool.addSubPool(sel);
[detail] -  subPoolUpdate();
[detail] +  endSubPoolUpdate();
[detail]  }
[detail]  
[detail]  
[detail]  
[detail]  
[detail] -void SubPoolWindow::beginSignalChange(Signal * sig)
[detail] +
[detail] +
[detail] +void SubPoolWindow::beginSignalChange(SignalSegment * sig)
[detail]  {
[detail]    if(_tool) {
[detail]      _tool->beginSignalChange(sig);
[detail] @@ -105,7 +109,7 @@
[detail]  }
[detail]  
[detail]  
[detail] -void SubPoolWindow::endSignalChange(Signal * sig)
[detail] +void SubPoolWindow::endSignalChange(SignalSegment * sig)
[detail]  {
[detail]    TRACE;
[detail]    if(_tool) {
[detail] @@ -115,36 +119,6 @@
[detail]    emit signalTypeChanged(st);
[detail]  }
[detail]  
[detail] -void SubPoolWindow::addFile(SignalDatabase * db, QString fileName)
[detail] -{
[detail] -  TRACE;
[detail] -  SignalFile * f=db->filePool().find(fileName);
[detail] -  if(f) {
[detail] -    SubSignalPool sp;
[detail] -    sp.addFile(f);
[detail] -    addSignals(sp);
[detail] -  }
[detail] -}
[detail] -
[detail] -void SubPoolWindow::addSignal(SignalDatabase * db, int id)
[detail] -{
[detail] -  TRACE;
[detail] -  SubSignalPool sp;
[detail] -  sp.addSignal(db, id);
[detail] -  addSignals(sp);
[detail] -}
[detail] -
[detail] -void SubPoolWindow::addSignal(SubPoolWindow * viewer, int index)
[detail] -{
[detail] -  TRACE;
[detail] -  if(!viewer) return;
[detail] -  const SubSignalPool& sp=viewer->subPool();
[detail] -  if(index >= sp.count()) return;
[detail] -  SubSignalPool sel;
[detail] -  sel.addSignal(sp.at(index) );
[detail] -  addSignals(sp);
[detail] -}
[detail] -
[detail]  
[detail]  void SubPoolWindow::lock()
[detail]  {
[detail]                       src/TimePicker.cpp:  version-3.5.0	not modified
[detail]         src/TimeRangeParameterWidget.cpp:  version-3.5.0	modified out of comments
[detail] --- src/TimeRangeParameterWidget.cpp-version-3.5.0-stripped	2025-09-28 04:01:08.631520531 +0200
[detail] +++ src/TimeRangeParameterWidget.cpp-HEAD-stripped	2025-09-28 04:01:08.635520551 +0200
[detail] @@ -5,32 +5,34 @@
[detail]  
[detail]  #include "TimeRangeParameterWidget.h"
[detail]  #include "TimePicker.h"
[detail] +#include "ui_TimeRangeParameterWidget.h"
[detail]  
[detail]  namespace GeopsyGui {
[detail]  
[detail]  
[detail]  TimeRangeParameterWidget::TimeRangeParameterWidget(QWidget *parent, Qt::WindowFlags f)
[detail] -    : QWidget(parent, f)
[detail] +      : QWidget(parent, f),
[detail] +        _ui(new Ui::TimeRangeParameterWidget)
[detail]  {
[detail]    TRACE;
[detail] -  setupUi(this);
[detail] +    _ui->setupUi(this);
[detail]  
[detail] -  connect(from, SIGNAL(textChanged(const QString&)), this, SIGNAL(parametersChanged()));
[detail] -  connect(to, SIGNAL(textChanged(const QString&)), this, SIGNAL(parametersChanged()));
[detail] -  connect(referenceEdit, SIGNAL(activated(int)), this, SIGNAL(parametersChanged()));
[detail] -  connect(fromType, SIGNAL(activated(int)), this, SIGNAL(parametersChanged()));
[detail] -  connect(toType, SIGNAL(activated(int)), this, SIGNAL(parametersChanged()));
[detail] +    connect(_ui->from, SIGNAL(textChanged(const QString&)), this, SIGNAL(parametersChanged()));
[detail] +    connect(_ui->to, SIGNAL(textChanged(const QString&)), this, SIGNAL(parametersChanged()));
[detail] +    connect(_ui->referenceEdit, SIGNAL(activated(int)), this, SIGNAL(parametersChanged()));
[detail] +    connect(_ui->fromType, SIGNAL(activated(int)), this, SIGNAL(parametersChanged()));
[detail] +    connect(_ui->toType, SIGNAL(activated(int)), this, SIGNAL(parametersChanged()));
[detail]  
[detail] -  connect(referenceEdit, SIGNAL(activated(int)), this, SLOT(referenceEditChanged()));
[detail] -  connect(fromType, SIGNAL(activated(int)), this, SLOT(fromTypeChanged()));
[detail] -  connect(toType, SIGNAL(activated(int)), this, SLOT(toTypeChanged()));
[detail] +    connect(_ui->referenceEdit, SIGNAL(activated(int)), this, SLOT(referenceEditChanged()));
[detail] +    connect(_ui->fromType, SIGNAL(activated(int)), this, SLOT(fromTypeChanged()));
[detail] +    connect(_ui->toType, SIGNAL(activated(int)), this, SLOT(toTypeChanged()));
[detail]  
[detail] -  fromType->setCurrentIndex(1);
[detail] -  toType->setCurrentIndex(1);
[detail] +    _ui->fromType->setCurrentIndex(1);
[detail] +    _ui->toType->setCurrentIndex(1);
[detail]  
[detail]    _pickNames=TimePick::registeredNames();
[detail] -  fromType->addItems(_pickNames);
[detail] -  toType->addItems(_pickNames);
[detail] +    _ui->fromType->addItems(_pickNames);
[detail] +    _ui->toType->addItems(_pickNames);
[detail]  }
[detail]  
[detail]  void TimeRangeParameterWidget::updateAllFields()
[detail] @@ -45,13 +47,13 @@
[detail]  {
[detail]    TRACE;
[detail]    _subPool=subPool;
[detail] -  for(int i=referenceEdit->count()-1; i>0; i--) {
[detail] -    referenceEdit->removeItem(i);
[detail] +    for(int i=_ui->referenceEdit->count()-1; i>0; i--) {
[detail] +      _ui->referenceEdit->removeItem(i);
[detail]    }
[detail]    if(_subPool) {
[detail]      QMap<QString,int> names=_subPool->signalNames();
[detail]      for(QMap<QString,int>::iterator it=names.begin(); it!=names.end(); it++) {
[detail] -      referenceEdit->addItem(it.key());
[detail] +        _ui->referenceEdit->addItem(it.key());
[detail]      }
[detail]    }
[detail]  }
[detail] @@ -62,14 +64,14 @@
[detail]    QStringList pickNames=TimePick::registeredNames();
[detail]    if(pickNames!=_pickNames) {
[detail]      _pickNames=pickNames;
[detail] -    while(fromType->count()>3) {
[detail] -      fromType->removeItem(3);
[detail] +      while(_ui->fromType->count()>3) {
[detail] +        _ui->fromType->removeItem(3);
[detail]      }
[detail] -    fromType->addItems(_pickNames);
[detail] -    while(toType->count()>3) {
[detail] -      toType->removeItem(3);
[detail] +      _ui->fromType->addItems(_pickNames);
[detail] +      while(_ui->toType->count()>3) {
[detail] +        _ui->toType->removeItem(3);
[detail]      }
[detail] -    toType->addItems(_pickNames);
[detail] +      _ui->toType->addItems(_pickNames);
[detail]    }
[detail]    fromTypeChanged();
[detail]    toTypeChanged();
[detail] @@ -78,13 +80,13 @@
[detail]  void TimeRangeParameterWidget::referenceEditChanged()
[detail]  {
[detail]    TRACE;
[detail] -  if(referenceEdit->currentIndex()==0) {
[detail] +    if(_ui->referenceEdit->currentIndex()==0) {
[detail]      _reference=*_subPool;
[detail]    } else {
[detail] -    QString name=referenceEdit->currentText();
[detail] +      QString name=_ui->referenceEdit->currentText();
[detail]      _reference.removeAll();
[detail]      for(SubSignalPool::const_iterator it=_subPool->begin(); it!=_subPool->end(); it++) {
[detail] -      if((*it)->nameComponent()==name) {
[detail] +        if((*it)->metaData()->nameComponent()==name) {
[detail]          _reference.addSignal(*it);
[detail]        }
[detail]      }
[detail] @@ -96,42 +98,42 @@
[detail]  void TimeRangeParameterWidget::fromTypeChanged()
[detail]  {
[detail]    TRACE;
[detail] -  switch (fromType->currentIndex()) {
[detail] +    switch (_ui->fromType->currentIndex()) {
[detail]    case 0:
[detail] -    from->setEnabled(true);
[detail] -    fromPick->setEnabled(true);
[detail] -    referenceEdit->setEnabled(toType->currentIndex()!=0 && toType->currentIndex()!=2);
[detail] +      _ui->from->setEnabled(true);
[detail] +      _ui->fromPick->setEnabled(true);
[detail] +      _ui->referenceEdit->setEnabled(_ui->toType->currentIndex()!=0 && _ui->toType->currentIndex()!=2);
[detail]      break;
[detail]    case 1:
[detail] -    from->setEnabled(false);
[detail] -    fromPick->setEnabled(false);
[detail] -    referenceEdit->setEnabled(true);
[detail] +      _ui->from->setEnabled(false);
[detail] +      _ui->fromPick->setEnabled(false);
[detail] +      _ui->referenceEdit->setEnabled(true);
[detail]      if(_reference.isEmpty()) {
[detail] -      from->setText(_subPool->timeRange().start().toString(DateTime::defaultUserFormat));
[detail] +        _ui->from->setText(_subPool->timeRange().start().toString(DateTime::defaultUserFormat));
[detail]      } else {
[detail] -      from->setText(_reference.timeRange().start().toString(DateTime::defaultUserFormat));
[detail] +        _ui->from->setText(_reference.timeRange().start().toString(DateTime::defaultUserFormat));
[detail]      }
[detail]      break;
[detail]    case 2:
[detail] -    from->setEnabled(true);
[detail] -    fromPick->setEnabled(false);
[detail] -    referenceEdit->setEnabled(toType->currentIndex()!=0 && toType->currentIndex()!=2);
[detail] -    if(toType->currentIndex()==2) {
[detail] -      toType->setCurrentIndex(1);
[detail] +      _ui->from->setEnabled(true);
[detail] +      _ui->fromPick->setEnabled(false);
[detail] +      _ui->referenceEdit->setEnabled(_ui->toType->currentIndex()!=0 && _ui->toType->currentIndex()!=2);
[detail] +      if(_ui->toType->currentIndex()==2) {
[detail] +        _ui->toType->setCurrentIndex(1);
[detail]        toTypeChanged();
[detail]      }
[detail]      break;
[detail]    default:
[detail]      if(_reference.isEmpty()) {
[detail] -      from->setText(QString());
[detail] +        _ui->from->setText(QString());
[detail]      } else {
[detail] -      Signal * sig=_reference.at(0);
[detail] -      DateTime t=sig->metaData<TimePick>().value(fromType->currentText());
[detail] -      from->setText(t.toString(DateTime::defaultUserFormat));
[detail] -    }
[detail] -    from->setEnabled(false);
[detail] -    fromPick->setEnabled(false);
[detail] -    referenceEdit->setEnabled(true);
[detail] +        SignalSegment * sig=_reference.at(0);
[detail] +        DateTime t=sig->metaData()->optionalData().get<TimePick>().value(_ui->fromType->currentText());
[detail] +        _ui->from->setText(t.toString(DateTime::defaultUserFormat));
[detail] +      }
[detail] +      _ui->from->setEnabled(false);
[detail] +      _ui->fromPick->setEnabled(false);
[detail] +      _ui->referenceEdit->setEnabled(true);
[detail]      break;
[detail]    }
[detail]  }
[detail] @@ -139,42 +141,42 @@
[detail]  void TimeRangeParameterWidget::toTypeChanged()
[detail]  {
[detail]    TRACE;
[detail] -  switch (toType->currentIndex()) {
[detail] +    switch (_ui->toType->currentIndex()) {
[detail]    case 0:
[detail] -    to->setEnabled(true);
[detail] -    toPick->setEnabled(true);
[detail] -    referenceEdit->setEnabled(fromType->currentIndex()!=0 && fromType->currentIndex()!=2);
[detail] +      _ui->to->setEnabled(true);
[detail] +      _ui->toPick->setEnabled(true);
[detail] +      _ui->referenceEdit->setEnabled(_ui->fromType->currentIndex()!=0 && _ui->fromType->currentIndex()!=2);
[detail]      break;
[detail]    case 1:
[detail] -    to->setEnabled(false);
[detail] -    toPick->setEnabled(false);
[detail] -    referenceEdit->setEnabled(true);
[detail] +      _ui->to->setEnabled(false);
[detail] +      _ui->toPick->setEnabled(false);
[detail] +      _ui->referenceEdit->setEnabled(true);
[detail]      if(_reference.isEmpty()) {
[detail] -      to->setText(_subPool->timeRange().end().toString(DateTime::defaultUserFormat));
[detail] +        _ui->to->setText(_subPool->timeRange().end().toString(DateTime::defaultUserFormat));
[detail]      } else {
[detail] -      to->setText(_reference.timeRange().end().toString(DateTime::defaultUserFormat));
[detail] +        _ui->to->setText(_reference.timeRange().end().toString(DateTime::defaultUserFormat));
[detail]      }
[detail]      break;
[detail]    case 2:
[detail] -    to->setEnabled(true);
[detail] -    toPick->setEnabled(false);
[detail] -    referenceEdit->setEnabled(fromType->currentIndex()!=0 && fromType->currentIndex()!=2);
[detail] -    if(fromType->currentIndex()==2) {
[detail] -      fromType->setCurrentIndex(1);
[detail] +      _ui->to->setEnabled(true);
[detail] +      _ui->toPick->setEnabled(false);
[detail] +      _ui->referenceEdit->setEnabled(_ui->fromType->currentIndex()!=0 && _ui->fromType->currentIndex()!=2);
[detail] +      if(_ui->fromType->currentIndex()==2) {
[detail] +        _ui->fromType->setCurrentIndex(1);
[detail]        fromTypeChanged();
[detail]      }
[detail]      break;
[detail]    default:
[detail]      if(!_reference.isEmpty()) {
[detail] -      Signal * sig=_reference.at(0);
[detail] -      DateTime t=sig->metaData<TimePick>().value(toType->currentText());
[detail] -      to->setText(t.toString(DateTime::defaultUserFormat));
[detail] +        SignalSegment * sig=_reference.at(0);
[detail] +        DateTime t=sig->metaData()->optionalData().get<TimePick>().value(_ui->toType->currentText());
[detail] +        _ui->to->setText(t.toString(DateTime::defaultUserFormat));
[detail]      } else {
[detail] -      to->setText(QString());
[detail] +        _ui->to->setText(QString());
[detail]      }
[detail] -    to->setEnabled(false);
[detail] -    toPick->setEnabled(false);
[detail] -    referenceEdit->setEnabled(true);
[detail] +      _ui->to->setEnabled(false);
[detail] +      _ui->toPick->setEnabled(false);
[detail] +      _ui->referenceEdit->setEnabled(true);
[detail]      break;
[detail]    }
[detail]  }
[detail] @@ -182,34 +184,34 @@
[detail]  void TimeRangeParameterWidget::on_fromPick_clicked()
[detail]  {
[detail]    TRACE;
[detail] -  TimePicker * tp=new TimePicker(fromPick);
[detail] -  connect(tp, SIGNAL(picked(const QString&)), from, SLOT(setText(const QString&)));
[detail] -  from->setFocus();
[detail] +    TimePicker * tp=new TimePicker(_ui->fromPick);
[detail] +    connect(tp, SIGNAL(picked(const QString&)), _ui->from, SLOT(setText(const QString&)));
[detail] +    _ui->from->setFocus();
[detail]  }
[detail]  
[detail]  void TimeRangeParameterWidget::on_toPick_clicked()
[detail]  {
[detail]    TRACE;
[detail] -  TimePicker * tp=new TimePicker(toPick);
[detail] -  connect(tp, SIGNAL(picked(const QString&)), to, SLOT(setText(const QString&)));
[detail] -  to->setFocus();
[detail] +    TimePicker * tp=new TimePicker(_ui->toPick);
[detail] +    connect(tp, SIGNAL(picked(const QString&)), _ui->to, SLOT(setText(const QString&)));
[detail] +    _ui->to->setFocus();
[detail]  }
[detail]  
[detail]  void TimeRangeParameterWidget::getParameters(TimeRangeParameters &param) const
[detail]  {
[detail]    TRACE;
[detail]    bool ok=true;
[detail] -  switch(fromType->currentIndex()) {
[detail] +    switch(_ui->fromType->currentIndex()) {
[detail]    case 0: {
[detail]        param.setStartType(TimeRangeParameters::Absolute);
[detail]        DateTime t;
[detail] -      if(t.fromString(from->text(), DateTime::defaultUserFormat)) {
[detail] +        if(t.fromString(_ui->from->text(), DateTime::defaultUserFormat)) {
[detail]          param.setStart(t);
[detail]        }
[detail]      }
[detail]      break;
[detail]    case 1:
[detail] -    if(referenceEdit->currentIndex()==0) {
[detail] +      if(_ui->referenceEdit->currentIndex()==0) {
[detail]        param.setStartType(TimeRangeParameters::Signal);
[detail]        param.setStart(_subPool->timeRange().start());
[detail]      } else {
[detail] @@ -219,34 +221,34 @@
[detail]      break;
[detail]    case 2: {
[detail]        param.setStartType(TimeRangeParameters::Delta);
[detail] -      double v=Number::durationToSeconds(from->text(), ok);
[detail] +        double v=Number::durationToSeconds(_ui->from->text(), ok);
[detail]        if(ok) {
[detail]          param.setDeltaT(v);
[detail]        }
[detail]      }
[detail]      break;
[detail]    default:
[detail] -    if(referenceEdit->currentIndex()==0) {
[detail] +      if(_ui->referenceEdit->currentIndex()==0) {
[detail]        param.setStartType(TimeRangeParameters::Pick);
[detail] -      param.setStartPick(fromType->currentText());
[detail] -      param.setStart(_subPool->firstTimePick(fromType->currentText()));
[detail] +        param.setStartPick(_ui->fromType->currentText());
[detail] +        param.setStart(_subPool->firstTimePick(_ui->fromType->currentText()));
[detail]      } else {
[detail]        param.setStartType(TimeRangeParameters::Absolute);
[detail] -      param.setStart(_reference.firstTimePick(fromType->currentText()));
[detail] +        param.setStart(_reference.firstTimePick(_ui->fromType->currentText()));
[detail]      }
[detail]      break;
[detail]    }
[detail] -  switch(toType->currentIndex()) {
[detail] +    switch(_ui->toType->currentIndex()) {
[detail]    case 0: {
[detail]        param.setEndType(TimeRangeParameters::Absolute);
[detail]        DateTime t;
[detail] -      if(t.fromString(to->text(), DateTime::defaultUserFormat)) {
[detail] +        if(t.fromString(_ui->to->text(), DateTime::defaultUserFormat)) {
[detail]          param.setEnd(t);
[detail]        }
[detail]      }
[detail]      break;
[detail]    case 1:
[detail] -    if(referenceEdit->currentIndex()==0) {
[detail] +      if(_ui->referenceEdit->currentIndex()==0) {
[detail]        param.setEndType(TimeRangeParameters::Signal);
[detail]        param.setEnd(_subPool->timeRange().end());
[detail]      } else {
[detail] @@ -256,24 +258,24 @@
[detail]      break;
[detail]    case 2: {
[detail]        param.setEndType(TimeRangeParameters::Delta);
[detail] -      double v=Number::durationToSeconds(to->text(), ok);
[detail] +        double v=Number::durationToSeconds(_ui->to->text(), ok);
[detail]        if(ok) {
[detail]          param.setDeltaT(v);
[detail]        }
[detail]      }
[detail]      break;
[detail]    default:
[detail] -    if(referenceEdit->currentIndex()==0) {
[detail] +      if(_ui->referenceEdit->currentIndex()==0) {
[detail]        param.setEndType(TimeRangeParameters::Pick);
[detail] -      param.setEndPick(toType->currentText());
[detail] -      param.setEnd(_subPool->lastTimePick(toType->currentText()));
[detail] +        param.setEndPick(_ui->toType->currentText());
[detail] +        param.setEnd(_subPool->lastTimePick(_ui->toType->currentText()));
[detail]      } else {
[detail]        param.setEndType(TimeRangeParameters::Absolute);
[detail] -      param.setEnd(_reference.lastTimePick(toType->currentText()));
[detail] +        param.setEnd(_reference.lastTimePick(_ui->toType->currentText()));
[detail]      }
[detail]      break;
[detail]    }
[detail] -  param.setReference(referenceEdit->currentText());
[detail] +    param.setReference(_ui->referenceEdit->currentText());
[detail]  }
[detail]  
[detail]  void TimeRangeParameterWidget::setParameters(const TimeRangeParameters & param)
[detail] @@ -281,47 +283,49 @@
[detail]    TRACE;
[detail]    switch(param.startType()) {
[detail]    case TimeRangeParameters::Absolute:
[detail] -    fromType->setCurrentIndex(0);
[detail] -    from->setText(param.start().toString(DateTime::defaultUserFormat));
[detail] +      _ui->fromType->setCurrentIndex(0);
[detail] +      _ui->from->setText(param.start().toString(DateTime::defaultUserFormat));
[detail]      break;
[detail]    case TimeRangeParameters::Signal:
[detail] -    fromType->setCurrentIndex(1);
[detail] +      _ui->fromType->setCurrentIndex(1);
[detail]      break;
[detail]    case TimeRangeParameters::Delta:
[detail] -    fromType->setCurrentIndex(2);
[detail] -    from->setText(QString::number(param.deltaT()));
[detail] +      _ui->fromType->setCurrentIndex(2);
[detail] +      _ui->from->setText(QString::number(param.deltaT()));
[detail]      break;
[detail]    case TimeRangeParameters::Pick:
[detail]      if(!param.startPick().isEmpty()) {
[detail]        int index=TimePick::registeredNames().indexOf(param.startPick());
[detail]        if(index>-1) {
[detail] -        fromType->setCurrentIndex(3+index);
[detail] +          _ui->fromType->setCurrentIndex(3+index);
[detail]        }
[detail]      }
[detail]      break;
[detail]    }
[detail] +    fromTypeChanged();
[detail]    switch(param.endType()) {
[detail]    case TimeRangeParameters::Absolute:
[detail] -    toType->setCurrentIndex(0);
[detail] -    to->setText(param.end().toString(DateTime::defaultUserFormat));
[detail] +      _ui->toType->setCurrentIndex(0);
[detail] +      _ui->to->setText(param.end().toString(DateTime::defaultUserFormat));
[detail]      break;
[detail]    case TimeRangeParameters::Signal:
[detail] -    toType->setCurrentIndex(1);
[detail] +      _ui->toType->setCurrentIndex(1);
[detail]      break;
[detail]    case TimeRangeParameters::Delta:
[detail] -    toType->setCurrentIndex(2);
[detail] -    to->setText(QString::number(param.deltaT()));
[detail] +      _ui->toType->setCurrentIndex(2);
[detail] +      _ui->to->setText(QString::number(param.deltaT()));
[detail]      break;
[detail]    case TimeRangeParameters::Pick:
[detail]      if(!param.endPick().isEmpty()) {
[detail]        int index=TimePick::registeredNames().indexOf(param.endPick());
[detail]        if(index>-1) {
[detail] -        toType->setCurrentIndex(3+index);
[detail] +          _ui->toType->setCurrentIndex(3+index);
[detail]        }
[detail]      }
[detail]      break;
[detail]    }
[detail] -  referenceEdit->setCurrentText(param.reference());
[detail] +    toTypeChanged();
[detail] +    _ui->referenceEdit->setCurrentText(param.reference());
[detail]  }
[detail]  
[detail]  } 
[detail]                    src/TimeReference.cpp:  version-3.5.0	not modified
[detail]                  src/TimeWindowLayer.cpp:  version-3.5.0	modified out of comments
[detail] --- src/TimeWindowLayer.cpp-version-3.5.0-stripped	2025-09-28 04:01:08.667520705 +0200
[detail] +++ src/TimeWindowLayer.cpp-HEAD-stripped	2025-09-28 04:01:08.671520724 +0200
[detail] @@ -53,13 +53,13 @@
[detail]  }
[detail]  
[detail]  inline void TimeWindowLayer::paintTimeWindows(const GraphContentsOptions& gc, QPainter& p,
[detail] -                                              const TimeWindowList& windows, const Signal * sig, int iSig) const
[detail] +                                              const TimeWindowList& windows, const SignalSegment * sig, int iSig) const
[detail]  {
[detail]    TRACE;
[detail]    p.save();
[detail]    int wtop, wheight;
[detail]    _sig->timeWindowY(gc, iSig, _size, wtop, wheight);
[detail] -  const DateTime& tref=_sig->timeReference(sig);
[detail] +  DateTime tref=_sig->timeReference(sig);
[detail]    TimeRange gcLimits(tref.shifted(gc.xVisMin()), tref.shifted(gc.xVisMax()));
[detail]    int n=windows.count();
[detail]    int i=0;
[detail] @@ -118,14 +118,14 @@
[detail]    if(!_sig || !_sig->subPool()) return;
[detail]    const GraphContentsOptions& gc=lp.options();
[detail]    const SubSignalPool& subPool=*_sig->subPool();
[detail] -  QMap<const Signal *, TimeWindowList *>::const_iterator it;
[detail] +  QMap<const SignalSegment *, TimeWindowList *>::const_iterator it;
[detail]    int isigmin, isigmax;
[detail]    SAFE_UNINITIALIZED(isigmin, 0);
[detail]    SAFE_UNINITIALIZED(isigmax, 0);
[detail]    _sig->visibleIndexRange(gc, isigmin, isigmax);
[detail]    for(int iSig=isigmin; iSig < isigmax; ++iSig) {
[detail]      if(lp.terminated()) return;
[detail] -    Signal * sig=subPool.at(iSig);
[detail] +    SignalSegment * sig=subPool.at(iSig);
[detail]      it=_windows.find(sig);
[detail]      if(it!=_windows.end()) {
[detail]        paintTimeWindows(gc, p, *it.value(), sig, iSig);
[detail] @@ -173,20 +173,20 @@
[detail]  {
[detail]    TRACE;
[detail]    LayerLocker ll(this);
[detail] -  QList<Signal *> sigs=_sig->hitSignals(ry1, ry2);
[detail] +  QList<SignalSegment *> sigs=_sig->hitSignals(ry1, ry2);
[detail]    switch(id) {
[detail]    case Add:
[detail]      for(int i=sigs.count()-1; i>=0; --i) {
[detail] -      Signal * sig=sigs.at(i);
[detail] -      const DateTime& tref=_sig->timeReference(sig);
[detail] +      SignalSegment * sig=sigs.at(i);
[detail] +      DateTime tref=_sig->timeReference(sig);
[detail]        GeopsyCore::TimeRange r(tref.shifted(rx1), tref.shifted(rx2));
[detail]        emit addWindows(sig, r);
[detail]      }
[detail]      return true;
[detail]    case Remove:
[detail]      for(int i=sigs.count()-1; i>=0; --i) {
[detail] -      Signal * sig=sigs.at(i);
[detail] -      const DateTime& tref=_sig->timeReference(sig);
[detail] +      SignalSegment * sig=sigs.at(i);
[detail] +      DateTime tref=_sig->timeReference(sig);
[detail]        GeopsyCore::TimeRange r(tref.shifted(rx1), tref.shifted(rx2));
[detail]        emit removeWindows(sig, r);
[detail]      }
[detail] @@ -198,7 +198,7 @@
[detail]  }
[detail]  
[detail]  
[detail] -void TimeWindowLayer::addTimeWindows(Signal * sig, TimeWindowList * l)
[detail] +void TimeWindowLayer::addTimeWindows(SignalSegment * sig, TimeWindowList * l)
[detail]  {
[detail]    TRACE;
[detail]    LayerLocker ll(this);
[detail] @@ -216,10 +216,10 @@
[detail]  }
[detail]  
[detail]  
[detail] -void TimeWindowLayer::addTimeWindowsInternal(Signal * sig, TimeWindowList * l)
[detail] +void TimeWindowLayer::addTimeWindowsInternal(SignalSegment * sig, TimeWindowList * l)
[detail]  {
[detail]    TRACE;
[detail] -  QMap<const Signal *, TimeWindowList *>::iterator mapit;
[detail] +  QMap<const SignalSegment *, TimeWindowList *>::iterator mapit;
[detail]    mapit=_windows.find(sig);
[detail]    if(_windowOwner && mapit!=_windows.end()) {
[detail]      mapit.value()->add(*l);
[detail] @@ -234,7 +234,7 @@
[detail]    TRACE;
[detail]    LayerLocker ll(this);
[detail]    if(_windowOwner) {
[detail] -    QMap<const Signal *, TimeWindowList *>::iterator it;
[detail] +    QMap<const SignalSegment *, TimeWindowList *>::iterator it;
[detail]      for(it=_windows.begin(); it!=_windows.end(); it++) {
[detail]        delete it.value();
[detail]      }
[detail] @@ -278,7 +278,7 @@
[detail]        att.add("signalIndex");
[detail]        QString& index=att.value(0);
[detail]        int n=subPool->count();
[detail] -      QMap<const Signal *, TimeWindowList *>::const_iterator it;
[detail] +      QMap<const SignalSegment *, TimeWindowList *>::const_iterator it;
[detail]        for(int i=0; i<n; i++) {
[detail]          it=_windows.find(subPool->at(i));
[detail]          if(it!=_windows.end()) {
[detail]         src/WindowingParameterWidget.cpp:  version-3.5.0	modified out of comments
[detail] --- src/WindowingParameterWidget.cpp-version-3.5.0-stripped	2025-09-28 04:01:08.687520802 +0200
[detail] +++ src/WindowingParameterWidget.cpp-HEAD-stripped	2025-09-28 04:01:08.691520820 +0200
[detail] @@ -34,7 +34,6 @@
[detail]  
[detail]    connect(windowLength, SIGNAL(valueChanged(double)), this, SIGNAL(parametersChanged()));
[detail]    connect(windowMaxLength, SIGNAL(valueChanged(double)), this, SIGNAL(parametersChanged()));
[detail] -  connect(filterWidget, SIGNAL(parametersChanged()), this, SIGNAL(parametersChanged()));
[detail]  
[detail]    windowLength->setRange(0.0, std::numeric_limits<double>::infinity());
[detail]    windowMaxLength->setRange(0.0, std::numeric_limits<double>::infinity());
[detail] @@ -199,7 +198,6 @@
[detail]    on_isOverlap_toggled();
[detail]    on_isBadSample_toggled();
[detail]    on_badSampleRelative_currentIndexChanged(0);
[detail] -  filterWidget->updateAllFields();
[detail]    on_windowLengthType_currentIndexChanged(0);
[detail]    on_isSeismicEventTrigger_toggled();
[detail]  }
[detail] @@ -394,6 +392,24 @@
[detail]    }
[detail]  }
[detail]  
[detail] +void WindowingParameterWidget::on_filterButton_clicked()
[detail] +{
[detail] +  TRACE;
[detail] +  Dialog * d=new Dialog(this);
[detail] +  d->setWindowTitle(tr("Frequency filter"));
[detail] +  FilterParameterWidget * dw=new FilterParameterWidget();
[detail] +  d->setMainWidget(dw);
[detail] +  Settings::getWidget(d, "FilterParameterWidget");
[detail] +  dw->setParameters(_filter);
[detail] +  dw->updateAllFields();
[detail] +  if(d->exec()==QDialog::Accepted) {
[detail] +    Settings::setWidget(d, "FilterParameterWidget");
[detail] +    dw->getParameters(_filter);
[detail] +  }
[detail] +  delete d;
[detail] +
[detail] +}
[detail] +
[detail]  void WindowingParameterWidget::getParameters(WindowingParameters& param) const
[detail]  {
[detail]    TRACE;
[detail] @@ -474,7 +490,7 @@
[detail]      slta.minimumThreshold=filtMinStaLta->value();
[detail]      slta.maximumThreshold=filtMaxStaLta->value();
[detail]      param.setFilterSignalAntiTrigger(slta);
[detail] -    filterWidget->getParameters(param.filter());
[detail] +    param.filter()=_filter;
[detail]    } else {
[detail]      for(int i=0; i<_nComponents; i++) {
[detail]        param.setFilterComponent(i, false);
[detail] @@ -550,7 +566,7 @@
[detail]      filtLtaLength->setValue(param.filterSignalAntiTrigger().longLength);
[detail]      filtMinStaLta->setValue(param.filterSignalAntiTrigger().minimumThreshold);
[detail]      filtMaxStaLta->setValue(param.filterSignalAntiTrigger().maximumThreshold);
[detail] -    filterWidget->setParameters(param.filter());
[detail] +    _filter=param.filter();
[detail]    }
[detail]  
[detail]    isSeismicEventTrigger->setChecked(param.seismicEventTrigger());
[detail]              src/AbstractGraphicWindow.h:  version-3.5.0	not modified
[detail]                 src/AbstractToolWidget.h:  version-3.5.0	modified out of comments
[detail] --- src/AbstractToolWidget.h-version-3.5.0-stripped	2025-09-28 04:01:08.723520975 +0200
[detail] +++ src/AbstractToolWidget.h-HEAD-stripped	2025-09-28 04:01:08.727520995 +0200
[detail] @@ -30,8 +30,8 @@
[detail]  
[detail]    virtual void closeChildren();
[detail]    virtual void restoreFields();
[detail] -  virtual void beginSignalChange(Signal * ) {}
[detail] -  virtual void endSignalChange(Signal * ) {}
[detail] +  virtual void beginSignalChange(SignalSegment * ) {}
[detail] +  virtual void endSignalChange(SignalSegment * ) {}
[detail]    virtual void updateAllFields() {}
[detail]    virtual void start(int ) {}
[detail]  
[detail] @@ -47,7 +47,8 @@
[detail]    void saveLogParameters(QString fileName=QString());
[detail]    virtual void showTool();
[detail]  signals:
[detail] -  void updateSubPool();
[detail] +  void beginUpdateSubPool();
[detail] +  void endUpdateSubPool();
[detail]  protected:
[detail]    void closeEvent(QCloseEvent * e);
[detail]    
[detail]                    src/ArrayDefinition.h:  version-3.5.0	modified out of comments
[detail] --- src/ArrayDefinition.h-version-3.5.0-stripped	2025-09-28 04:01:08.743521073 +0200
[detail] +++ src/ArrayDefinition.h-HEAD-stripped	2025-09-28 04:01:08.747521091 +0200
[detail] @@ -1,14 +1,17 @@
[detail]  
[detail]  
[detail] -#ifndef Qtb_ARRAYDEFINITION_H
[detail] -#define Qtb_ARRAYDEFINITION_H
[detail] +#ifndef ARRAYDEFINITION_H
[detail] +#define ARRAYDEFINITION_H
[detail]  
[detail]  #include <QGpGuiTools.h>
[detail] -#include "ui_ArrayDefinition.h"
[detail] +
[detail] +namespace Ui {
[detail] +class ArrayDefinition;
[detail] +}
[detail]  
[detail]  namespace GeopsyGui {
[detail]  
[detail] -class ArrayDefinition : public Dialog, public Ui::ArrayDefinition
[detail] +  class ArrayDefinition : public Dialog
[detail]  {
[detail]    Q_OBJECT
[detail]  public:
[detail] @@ -24,6 +27,8 @@
[detail]    void on_capSettingsBrowse_clicked();
[detail]    void on_groupList_currentIndexChanged (QTreeWidgetItem * current, QTreeWidgetItem * previous);
[detail]    void on_wdBrowse_clicked(); 
[detail] +  private:
[detail] +    Ui::ArrayDefinition * _ui;
[detail]  };
[detail]    
[detail]  } 
[detail]                           src/ArrayMap.h:  version-3.5.0	not modified
[detail]        src/AsciiSignalComponentsWidget.h:  version-3.5.0	not modified
[detail]            src/AsciiSignalFormatEditor.h:  version-3.5.0	not modified
[detail]             src/AsciiSignalRulesWidget.h:  version-3.5.0	not modified
[detail]                    src/ChronogramLayer.h:  version-3.5.0	not modified
[detail]               src/ChronogramProperties.h:  version-3.5.0	not modified
[detail]                         src/CityLoader.h:  version-3.5.0	not modified
[detail]                     src/CitySignalItem.h:  version-3.5.0	not modified
[detail]                   src/DirectoryMonitor.h:  version-3.5.0	modified out of comments
[detail] --- src/DirectoryMonitor.h-version-3.5.0-stripped	2025-09-28 04:01:08.879521730 +0200
[detail] +++ src/DirectoryMonitor.h-HEAD-stripped	2025-09-28 04:01:08.883521748 +0200
[detail] @@ -21,7 +21,7 @@
[detail]  
[detail]    void setDatabase(SignalDatabase * db) {_db=db;}
[detail]    void removeAllFiles();
[detail] -  void removeFile(QString path);
[detail] +    void removeFile(const SignalFileIndex& file);
[detail]  private slots:
[detail]    void on_dirButton_clicked();
[detail]    void on_startButton_clicked();
[detail] @@ -29,6 +29,7 @@
[detail]    void checkForNewFiles();
[detail]  private:
[detail]    void showStatus();
[detail] +    void removeFile(const QString& file);
[detail]  
[detail]    SignalDatabase * _db;
[detail]    QDateTime _lastCheckTime;
[detail] @@ -37,7 +38,7 @@
[detail]    int _loadedCount;
[detail]    QDir _dir;
[detail]    QTimer _timer;
[detail] -  QMap<QString, SignalFile *> _fileMap;
[detail] +    QMap<QString, SignalFileIndex> _files;
[detail]  };
[detail]  
[detail]  } 
[detail]              src/FilterParameterWidget.h:  version-3.5.0	modified out of comments
[detail] --- src/FilterParameterWidget.h-version-3.5.0-stripped	2025-09-28 04:01:08.903521846 +0200
[detail] +++ src/FilterParameterWidget.h-HEAD-stripped	2025-09-28 04:01:08.907521864 +0200
[detail] @@ -4,12 +4,15 @@
[detail]  #define FILTERPARAMETERWIDGET_H
[detail]  
[detail]  #include <GeopsyCore.h>
[detail] -#include "ui_FilterParameterWidget.h"
[detail]  #include "GeopsyGuiDLLExport.h"
[detail]  
[detail] +namespace Ui {
[detail] +  class FilterParameterWidget;
[detail] +}
[detail] +
[detail]  namespace GeopsyGui {
[detail]  
[detail] -  class GEOPSYGUI_EXPORT FilterParameterWidget : public QWidget, private Ui::FilterParameterWidget
[detail] +  class GEOPSYGUI_EXPORT FilterParameterWidget : public QWidget
[detail]    {
[detail]      Q_OBJECT
[detail]    public:
[detail] @@ -23,10 +26,13 @@
[detail]      void on_filterType_currentIndexChanged(int);
[detail]      void on_butterworthButton_toggled(bool);
[detail]      void on_frequencyWindowButton_toggled(bool);
[detail] +    void on_chebyshevType1Button_toggled(bool);
[detail]    private:
[detail]      void setDefaultWindow();
[detail]    signals:
[detail]      void parametersChanged();
[detail] +  private:
[detail] +    Ui::FilterParameterWidget * _ui;
[detail]    };
[detail]  
[detail]  } 
[detail]                    src/GeopsyGuiEngine.h:  version-3.5.0	modified out of comments
[detail] --- src/GeopsyGuiEngine.h-version-3.5.0-stripped	2025-09-28 04:01:08.923521942 +0200
[detail] +++ src/GeopsyGuiEngine.h-HEAD-stripped	2025-09-28 04:01:08.927521961 +0200
[detail] @@ -35,8 +35,8 @@
[detail]      virtual QStatusBar * statusBar() {return nullptr;}
[detail]      virtual ProgressBar * progressBar() {return nullptr;}
[detail]  
[detail] -    virtual SignalFileFormat askLoadFormat(const QString& signalFileName);
[detail] -    virtual bool askRD3LogParameter(int& nSamples, double& sampFreq, double& t0);
[detail] +    SignalFileFormat askLoadFormat(const QString& signalFileName);
[detail] +    bool askRD3LogParameter(int& nSamples, double& sampFreq, double& t0);
[detail]    };
[detail]  
[detail]  } 
[detail]                 src/GeopsyGuiInterface.h:  version-3.5.0	not modified
[detail]                       src/HeaderWidget.h:  version-3.5.0	modified out of comments
[detail] --- src/HeaderWidget.h-version-3.5.0-stripped	2025-09-28 04:01:08.967522154 +0200
[detail] +++ src/HeaderWidget.h-HEAD-stripped	2025-09-28 04:01:08.971522174 +0200
[detail] @@ -21,8 +21,8 @@
[detail]    private slots:
[detail]      void beginSignalChange(SignalDatabase * db);
[detail]      void endSignalChange(SignalDatabase * db);
[detail] -    void beginSignalChange(Signal * sig);
[detail] -    void endSignalChange(Signal * sig);
[detail] +    void beginSignalChange(SignalSegment * sig);
[detail] +    void endSignalChange(SignalSegment * sig);
[detail]  
[detail]      void on_loadBut_clicked();
[detail]      void on_saveBut_clicked();
[detail]                         src/LoadFormat.h:  version-3.5.0	not modified
[detail]              src/MorletParameterWidget.h:  version-3.5.0	not modified
[detail]       src/NormalizationParameterWidget.h:  version-3.5.0	not modified
[detail]                         src/PickFormat.h:  version-3.5.0	not modified
[detail]                           src/PickItem.h:  version-3.5.0	not modified
[detail]                          src/PickLayer.h:  version-3.5.0	modified out of comments
[detail] --- src/PickLayer.h-version-3.5.0-stripped	2025-09-28 04:01:09.059522600 +0200
[detail] +++ src/PickLayer.h-HEAD-stripped	2025-09-28 04:01:09.067522638 +0200
[detail] @@ -50,10 +50,10 @@
[detail]    virtual bool setPick(const QString& pickName=QString());
[detail]  signals:
[detail]    void mouseMoved(double t);
[detail] -  void pickBegin(bool magnify, int context, double time, Signal * sig, int iSig);
[detail] -  void pickChanged(Signal * sig, QString pickName);
[detail] +  void pickBegin(bool magnify, int context, double time, SignalSegment * sig, int iSig);
[detail] +  void pickChanged(SignalSegment * sig, QString pickName);
[detail]    void pickEnd();
[detail] -  void currentSignalChanged(Signal * sig, int iSig);
[detail] +  void currentSignalChanged(SignalSegment * sig, int iSig);
[detail]  protected:
[detail]    void initMembers();
[detail]    virtual void paintData(const LayerPainterRequest& lp, QPainter& p, double dotpercm) const;
[detail]                src/PickParameterwidget.h:  version-3.5.0	not modified
[detail]                         src/PickToPick.h:  version-3.5.0	not modified
[detail]                    src/PicksProperties.h:  version-3.5.0	not modified
[detail]                    src/RD3LogParameter.h:  version-3.5.0	not modified
[detail]                  src/RelativePositions.h:  version-3.5.0	not modified
[detail]                   src/SeismicEventItem.h:  version-3.5.0	not modified
[detail]                     src/SignalFileItem.h:  version-3.5.0	modified out of comments
[detail] --- src/SignalFileItem.h-version-3.5.0-stripped	2025-09-28 04:01:09.171523140 +0200
[detail] +++ src/SignalFileItem.h-HEAD-stripped	2025-09-28 04:01:09.175523160 +0200
[detail] @@ -12,8 +12,9 @@
[detail]  class GEOPSYGUI_EXPORT SignalFileItem : public QAbstractItemModel
[detail]  {
[detail]  public:
[detail] -  SignalFileItem(SignalDatabase * db, QObject * parent=nullptr);
[detail] -  ~SignalFileItem() {}
[detail] +    SignalFileItem(QObject * parent=nullptr);
[detail] +
[detail] +    void setDatabase(SignalDatabase * db);
[detail]  
[detail]    void beginReset();
[detail]    void endReset();
[detail] @@ -21,22 +22,25 @@
[detail]    void beginAddFile();
[detail]    void endAddFile();
[detail]  
[detail] -  virtual int rowCount(const QModelIndex &parent=QModelIndex()) const;
[detail] -  virtual int columnCount(const QModelIndex &parent=QModelIndex()) const;
[detail] -  virtual QVariant data(const QModelIndex &index, int role) const;
[detail] -  virtual QModelIndex parent (const QModelIndex & index) const;
[detail] -  virtual QModelIndex index (int row, int column, const QModelIndex & parent=QModelIndex()) const;
[detail] -  virtual Qt::ItemFlags flags (const QModelIndex & ) const {return Qt::ItemIsSelectable | Qt::ItemIsEnabled;}
[detail] +    void beginRemoveFile(int index);
[detail] +    void beginRemoveFile(const SignalFileIndex& index);
[detail] +    void endRemoveFile();
[detail] +
[detail] +    int rowCount(const QModelIndex& parent=QModelIndex()) const;
[detail] +    int columnCount(const QModelIndex& parent=QModelIndex()) const;
[detail] +    QVariant data(const QModelIndex& index, int role) const;
[detail] +    QVariant headerData(int section, Qt::Orientation orientation, int role=Qt::DisplayRole) const;
[detail] +    QModelIndex parent(const QModelIndex& index) const;
[detail] +    QModelIndex index(int row, int column, const QModelIndex& parent=QModelIndex()) const;
[detail] +    Qt::ItemFlags flags(const QModelIndex&) const {return Qt::ItemIsSelectable | Qt::ItemIsEnabled;}
[detail]  
[detail]    void getSelection(SubSignalPool& sel, const QItemSelectionModel& sm);
[detail] -  void getSelection(QList<SignalFile *>& sel, const QItemSelectionModel& sm);
[detail] -  static SignalFile * file(const QModelIndex & index);
[detail] -  QModelIndex index(SignalFile * f);
[detail] -  void remove(const QList<SignalFile *>& sel);
[detail] +    void getSelection(QList<SignalFileIndex>& sel, const QItemSelectionModel& sm);
[detail]  private:
[detail]    SignalDatabase * _db;
[detail] -};
[detail]  
[detail] +    SignalFileIndex fileIndex(const QModelIndex& index) const;
[detail] +  };
[detail]  
[detail]  } 
[detail]  
[detail]                    src/SignalGroupItem.h:  version-3.5.0	modified out of comments
[detail] --- src/SignalGroupItem.h-version-3.5.0-stripped	2025-09-28 04:01:09.195523256 +0200
[detail] +++ src/SignalGroupItem.h-HEAD-stripped	2025-09-28 04:01:09.199523276 +0200
[detail] @@ -19,17 +19,17 @@
[detail]  
[detail]    void setDatabase(SignalDatabase * db);
[detail]  
[detail] -  virtual int rowCount(const QModelIndex& parent=QModelIndex()) const;
[detail] -  virtual int columnCount(const QModelIndex& parent=QModelIndex()) const;
[detail] -  virtual QVariant data(const QModelIndex& index, int role) const;
[detail] -  virtual bool setData(const QModelIndex& index, const QVariant& value, int role=Qt::EditRole);
[detail] -  virtual QModelIndex parent(const QModelIndex& index) const;
[detail] -  virtual QModelIndex index(int row, int column, const QModelIndex& parent=QModelIndex()) const;
[detail] -  virtual Qt::ItemFlags flags(const QModelIndex&) const;
[detail] -  virtual QStringList mimeTypes() const;
[detail] -  virtual Qt::DropActions supportedDropActions() const;
[detail] -  virtual QMimeData * mimeData(const QModelIndexList& indexes) const;
[detail] -  virtual bool dropMimeData(const QMimeData * data, Qt::DropAction action,
[detail] +    int rowCount(const QModelIndex& parent=QModelIndex()) const;
[detail] +    int columnCount(const QModelIndex& parent=QModelIndex()) const;
[detail] +    QVariant data(const QModelIndex& index, int role) const;
[detail] +    bool setData(const QModelIndex& index, const QVariant& value, int role=Qt::EditRole);
[detail] +    QModelIndex parent(const QModelIndex& index) const;
[detail] +    QModelIndex index(int row, int column, const QModelIndex& parent=QModelIndex()) const;
[detail] +    Qt::ItemFlags flags(const QModelIndex&) const;
[detail] +    QStringList mimeTypes() const;
[detail] +    Qt::DropActions supportedDropActions() const;
[detail] +    QMimeData * mimeData(const QModelIndexList& indexes) const;
[detail] +    bool dropMimeData(const QMimeData * data, Qt::DropAction action,
[detail]                              int row, int column, const QModelIndex& parent);
[detail]  
[detail]    void addSignals(const SubSignalPool& sel, const QItemSelectionModel& sm);
[detail] @@ -37,6 +37,9 @@
[detail]    void getSelection(QList<AbstractSignalGroup *>& sel, const QItemSelectionModel& sm, const QModelIndex& parent=QModelIndex());
[detail]    static AbstractSignalGroup * group(const QModelIndex& index);
[detail]    QModelIndex index(AbstractSignalGroup * g) const;
[detail] +
[detail] +    void beginResetModel();
[detail] +    void endResetModel();
[detail]  private slots:
[detail]    void databaseDestroyed();
[detail]    void dataChanged(AbstractSignalGroup * g);
[detail]                        src/SignalLayer.h:  version-3.5.0	modified out of comments
[detail] --- src/SignalLayer.h-version-3.5.0-stripped	2025-09-28 04:01:09.215523353 +0200
[detail] +++ src/SignalLayer.h-HEAD-stripped	2025-09-28 04:01:09.219523373 +0200
[detail] @@ -68,7 +68,7 @@
[detail]      enum Clip {NoClip, ClipOverlap, ClipValue, ClipPercentage};
[detail]      enum YAxis{ViewerIndex, Receiver, SignalName, Overlay};
[detail]      enum TimeRange {AvailableRange, AroundPickRange, CustomRange};
[detail] -    enum TimeScale {AbsoluteTime, RelativeToStartTime};
[detail] +    enum TimeScale {AbsoluteTime, RelativeToStartTime, Correlation};
[detail]      ENUM_AS_STRING_DECL(Normalize)
[detail]      ENUM_AS_STRING_DECL(Offset)
[detail]      ENUM_AS_STRING_DECL(Clip)
[detail] @@ -146,8 +146,8 @@
[detail]  
[detail]      void highlightSignal(const GraphContentsOptions& gc, QPainter& p, int w, int iSig, int isigmin, int isigmax) const;
[detail]  
[detail] -    const QColor& signalColor(const Signal * sig) const;
[detail] -    void setSignalColor(const Signal * sig, const QColor& c);
[detail] +    const QColor& signalColor(const SignalSegment * sig) const;
[detail] +    void setSignalColor(const SignalSegment * sig, const QColor& c);
[detail]      void clearSignalColors();
[detail]      Legend signalLegend() const;
[detail]      void setSignalLegend(const Legend& l);
[detail] @@ -161,17 +161,17 @@
[detail]      void visibleIndexRange(const GraphContentsOptions& gc, int& isigmin, int& isigmax) const;
[detail]      double signalY(int index) const {return _signalY[index];}
[detail]      void timeWindowY(const GraphContentsOptions& gc, int iSig, double rh, int& top, int& height) const;
[detail] -    void drawingAmplitude(const Signal * sig, int itmin, int itmax, double& valClip, double& affMax) const;
[detail] +    void drawingAmplitude(const SignalSegment * sig, int itmin, int itmax, double& valClip, double& affMax) const;
[detail]      double maxAmplitude(const GraphContentsOptions& gc) const;
[detail] -    bool visibleSamples(const GraphContentsOptions& gc, const Signal * sig,
[detail] +    bool visibleSamples(const GraphContentsOptions& gc, const SignalSegment * sig,
[detail]                          int& itmin, int& itmax, double& x0, double& dx) const;
[detail] -    void visibleSamples(const GraphContentsOptions& gc, const Signal * sig, int& itmin, int& itmax) const;
[detail] -    const DateTime& timeReference(const Signal * sig) const;
[detail] +    void visibleSamples(const GraphContentsOptions& gc, const SignalSegment * sig, int& itmin, int& itmax) const;
[detail] +    DateTime timeReference(const SignalSegment * sig) const;
[detail]  
[detail]      enum TrackingModes{AddGaps, RemoveGaps};
[detail]      virtual void toggleTrackingAction(bool checked, int id=-1);
[detail]      virtual bool trackRectangle(int id, double rx1, double ry1, double rx2, double ry2, Qt::KeyboardModifiers);
[detail] -    QList<Signal *> hitSignals(double ry1, double ry2) const;
[detail] +    QList<SignalSegment *> hitSignals(double ry1, double ry2) const;
[detail]    signals:
[detail]      void propertiesChanged();
[detail]    protected:
[detail] @@ -226,9 +226,9 @@
[detail]      
[detail]      double _overlap;
[detail]      
[detail] -    QMap<const Signal *, double> _signalOverlaps;
[detail] +    QMap<const SignalSegment *, double> _signalOverlaps;
[detail]      
[detail] -    QMap<const Signal *, QColor> _signalColors;
[detail] +    QMap<const SignalSegment *, QColor> _signalColors;
[detail]  
[detail]      
[detail]      
[detail] @@ -242,14 +242,16 @@
[detail]      double _beforePickDelay;
[detail]      double _afterPickDelay;
[detail]  
[detail] -    void drawSignal(const GraphContentsOptions& gc, QPainter& p, const Signal * sig,
[detail] +    void drawSignal(const GraphContentsOptions& gc, QPainter& p, const SignalSegment * sig,
[detail]                       int iSig, int itmin, int itmax, double x0, double dx,
[detail]                       bool allSamplesVisible, double affMax, int pixelWidth,
[detail]                       bool variableArea, bool wiggleTrace) const;
[detail] -    void drawGaps(const GraphContentsOptions& gc, QPainter& p, const Signal * sig, int iSig) const;
[detail] +    void drawGaps(const GraphContentsOptions& gc, QPainter& p, const SignalSegment * sig, int iSig) const;
[detail]    private:
[detail]      void spinOverlap(int nSteps, bool individual, int y);
[detail]  
[detail] +    QMap<int, QColor> * _signalIndexColors;
[detail] +
[detail]      static const QString signalColorTag;
[detail]      static const QString signalOverlapTag;
[detail]      static const QString indexTag;
[detail] @@ -288,7 +290,7 @@
[detail]      }
[detail]    }
[detail]  
[detail] -  inline void SignalLayer::visibleSamples(const GraphContentsOptions& gc, const Signal * sig,
[detail] +  inline void SignalLayer::visibleSamples(const GraphContentsOptions& gc, const SignalSegment * sig,
[detail]                                            int& itmin, int& itmax) const
[detail]    {
[detail]      TRACE;
[detail]                src/SignalLayerControls.h:  version-3.5.0	not modified
[detail]                  src/SignalsProperties.h:  version-3.5.0	not modified
[detail]               src/SparseTimeRangeModel.h:  version-3.5.0	not modified
[detail]             src/StationCoordinatesItem.h:  version-3.5.0	not modified
[detail]                      src/SubPoolWindow.h:  version-3.5.0	modified out of comments
[detail] --- src/SubPoolWindow.h-version-3.5.0-stripped	2025-09-28 04:01:09.291523720 +0200
[detail] +++ src/SubPoolWindow.h-HEAD-stripped	2025-09-28 04:01:09.295523740 +0200
[detail] @@ -43,13 +43,11 @@
[detail]  public slots:
[detail]    void addSignals(const SubSignalPool& sel);
[detail]    void addSignals(QWidget * , const SubSignalPool& sel) {addSignals(sel);}
[detail] -  void addFile(SignalDatabase * db, QString fileName);
[detail] -  void addSignal(SignalDatabase * db, int id);
[detail] -  void addSignal(SubPoolWindow * viewer, int index);
[detail] -  virtual void subPoolUpdate()=0;
[detail] +  virtual void beginSubPoolUpdate() {}
[detail] +  virtual void endSubPoolUpdate()=0;
[detail]    void setHeaderWidget(HeaderWidget * w=nullptr);
[detail] -  virtual void beginSignalChange(Signal * sig=nullptr);
[detail] -  virtual void endSignalChange(Signal * sig=nullptr);
[detail] +  virtual void beginSignalChange(SignalSegment * sig=nullptr);
[detail] +  virtual void endSignalChange(SignalSegment * sig=nullptr);
[detail]  protected:
[detail]    virtual void closeEvent (QCloseEvent * e);
[detail]  signals:
[detail]                         src/TimePicker.h:  version-3.5.0	not modified
[detail]           src/TimeRangeParameterWidget.h:  version-3.5.0	modified out of comments
[detail] --- src/TimeRangeParameterWidget.h-version-3.5.0-stripped	2025-09-28 04:01:09.327523895 +0200
[detail] +++ src/TimeRangeParameterWidget.h-HEAD-stripped	2025-09-28 04:01:09.331523913 +0200
[detail] @@ -5,12 +5,15 @@
[detail]  
[detail]  #include <GeopsyCore.h>
[detail]  
[detail] -#include "ui_TimeRangeParameterWidget.h"
[detail]  #include "GeopsyGuiDLLExport.h"
[detail]  
[detail] +namespace Ui {
[detail] +  class TimeRangeParameterWidget;
[detail] +}
[detail] +
[detail]  namespace GeopsyGui {
[detail]  
[detail] -  class GEOPSYGUI_EXPORT TimeRangeParameterWidget : public QWidget, private Ui::TimeRangeParameterWidget
[detail] +  class GEOPSYGUI_EXPORT TimeRangeParameterWidget : public QWidget
[detail]    {
[detail]      Q_OBJECT
[detail]    public:
[detail] @@ -32,6 +35,8 @@
[detail]    signals:
[detail]      void parametersChanged();
[detail]    private:
[detail] +    Ui::TimeRangeParameterWidget * _ui;
[detail] +
[detail]      QMap<QString,int> _signalNames;
[detail]      const SubSignalPool * _subPool;
[detail]      SubSignalPool _reference;
[detail]                      src/TimeReference.h:  version-3.5.0	not modified
[detail]                    src/TimeWindowLayer.h:  version-3.5.0	modified out of comments
[detail] --- src/TimeWindowLayer.h-version-3.5.0-stripped	2025-09-28 04:01:09.363524068 +0200
[detail] +++ src/TimeWindowLayer.h-HEAD-stripped	2025-09-28 04:01:09.363524068 +0200
[detail] @@ -28,7 +28,7 @@
[detail]    static const QString xmlTimeWindowLayerTag;
[detail]  
[detail]    void addTimeWindows(const SubSignalPool& subPool, TimeWindowList * l);
[detail] -  void addTimeWindows(Signal * sig, TimeWindowList * l);
[detail] +  void addTimeWindows(SignalSegment * sig, TimeWindowList * l);
[detail]    void clearTimeWindows();
[detail]  
[detail]    virtual Rect boundingRect() const;
[detail] @@ -49,17 +49,17 @@
[detail]    virtual bool xml_setProperty(XML_SETPROPERTY_ARGS);
[detail]    virtual void xml_layerPolish(XML_POLISH_ARGS);
[detail]  signals:
[detail] -  void addWindows(const Signal * sig, const TimeRange& r);
[detail] -  void removeWindows(const Signal * sig, const TimeRange& r);
[detail] +  void addWindows(const SignalSegment * sig, const TimeRange& r);
[detail] +  void removeWindows(const SignalSegment * sig, const TimeRange& r);
[detail]  private:
[detail]    virtual void paintData(const LayerPainterRequest& lp, QPainter& p, double dotpercm) const;
[detail]  
[detail] -  void addTimeWindowsInternal(Signal * sig, TimeWindowList * l);
[detail] +  void addTimeWindowsInternal(SignalSegment * sig, TimeWindowList * l);
[detail]    inline void paintTimeWindows(const GraphContentsOptions& gc, QPainter& p,
[detail] -                               const TimeWindowList& windows, const Signal * sig, int iSig) const;
[detail] +                               const TimeWindowList& windows, const SignalSegment * sig, int iSig) const;
[detail]  
[detail]    SignalLayer * _sig;
[detail] -  QMap<const Signal *, TimeWindowList *> _windows;
[detail] +  QMap<const SignalSegment *, TimeWindowList *> _windows;
[detail]  
[detail]    double _size;
[detail]    bool _showColors;
[detail]           src/WindowingParameterWidget.h:  version-3.5.0	modified out of comments
[detail] --- src/WindowingParameterWidget.h-version-3.5.0-stripped	2025-09-28 04:01:09.379524146 +0200
[detail] +++ src/WindowingParameterWidget.h-HEAD-stripped	2025-09-28 04:01:09.383524165 +0200
[detail] @@ -63,11 +63,13 @@
[detail]      void on_badSampleRelative_currentIndexChanged(int);
[detail]      void on_windowLengthType_currentIndexChanged(int);
[detail]      void on_isSeismicEventTrigger_toggled();
[detail] +    void on_filterButton_clicked();
[detail]    signals:
[detail]      void parametersChanged();
[detail]    private:
[detail]      int _nComponents;
[detail]      QAction * _addWindowsAction, * _removeWindowsAction;
[detail] +    FilterParameters _filter;
[detail]    };
[detail]  
[detail]  } 
[detail]                   src/ArrayDefinition.ui:  version-3.5.0	not modified
[detail]       src/AsciiSignalComponentsWidget.ui:  version-3.5.0	not modified
[detail]           src/AsciiSignalFormatEditor.ui:  version-3.5.0	not modified
[detail]            src/AsciiSignalRulesWidget.ui:  version-3.5.0	not modified
[detail]              src/ChronogramProperties.ui:  version-3.5.0	not modified
[detail]                        src/CityLoader.ui:  version-3.5.0	not modified
[detail]                  src/DirectoryMonitor.ui:  version-3.5.0	not modified
[detail]             src/FilterParameterWidget.ui:  version-3.5.0	modified out of comments
[detail] --- src/FilterParameterWidget.ui-version-3.5.0-stripped	2025-09-28 04:01:09.515524803 +0200
[detail] +++ src/FilterParameterWidget.ui-HEAD-stripped	2025-09-28 04:01:09.519524822 +0200
[detail] @@ -6,14 +6,14 @@
[detail]     <rect>
[detail]      <x>0</x>
[detail]      <y>0</y>
[detail] -    <width>340</width>
[detail] -    <height>212</height>
[detail] +    <width>313</width>
[detail] +    <height>345</height>
[detail]     </rect>
[detail]    </property>
[detail]    <property name="windowTitle">
[detail]     <string>Filter parameters</string>
[detail]    </property>
[detail] -  <layout class="QVBoxLayout" name="verticalLayout_3">
[detail] +  <layout class="QVBoxLayout" name="verticalLayout_2">
[detail]     <property name="leftMargin">
[detail]      <number>0</number>
[detail]     </property>
[detail] @@ -64,18 +64,24 @@
[detail]       </item>
[detail]       <item>
[detail]        <widget class="QGpGuiTools::DoubleSpinBox" name="filtFromFreq">
[detail] +       <property name="sizePolicy">
[detail] +        <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
[detail] +         <horstretch>0</horstretch>
[detail] +         <verstretch>0</verstretch>
[detail] +        </sizepolicy>
[detail] +       </property>
[detail]         <property name="minimumSize">
[detail]          <size>
[detail]           <width>20</width>
[detail]           <height>0</height>
[detail]          </size>
[detail]         </property>
[detail] +       <property name="suffix">
[detail] +        <string> Hz</string>
[detail] +       </property>
[detail]         <property name="minimum">
[detail]          <double>0.000000000000000</double>
[detail]         </property>
[detail] -       <property name="maximum">
[detail] -        <double>999999999999999967336168804116691273849533185806555472917961779471295845921727862608739868455469056.000000000000000</double>
[detail] -       </property>
[detail]         <property name="value">
[detail]          <double>5.000000000000000</double>
[detail]         </property>
[detail] @@ -84,36 +90,35 @@
[detail]       <item>
[detail]        <widget class="QLabel" name="toFreqLabel">
[detail]         <property name="text">
[detail] -        <string>Hz to</string>
[detail] +        <string>to</string>
[detail]         </property>
[detail]        </widget>
[detail]       </item>
[detail]       <item>
[detail]        <widget class="QGpGuiTools::DoubleSpinBox" name="filtToFreq">
[detail] +       <property name="sizePolicy">
[detail] +        <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
[detail] +         <horstretch>0</horstretch>
[detail] +         <verstretch>0</verstretch>
[detail] +        </sizepolicy>
[detail] +       </property>
[detail]         <property name="minimumSize">
[detail]          <size>
[detail]           <width>20</width>
[detail]           <height>0</height>
[detail]          </size>
[detail]         </property>
[detail] +       <property name="suffix">
[detail] +        <string> Hz</string>
[detail] +       </property>
[detail]         <property name="minimum">
[detail]          <double>0.000000000000000</double>
[detail]         </property>
[detail] -       <property name="maximum">
[detail] -        <double>999999999999999967336168804116691273849533185806555472917961779471295845921727862608739868455469056.000000000000000</double>
[detail] -       </property>
[detail]         <property name="value">
[detail]          <double>10.000000000000000</double>
[detail]         </property>
[detail]        </widget>
[detail]       </item>
[detail] -     <item>
[detail] -      <widget class="QLabel" name="textLabel6_3">
[detail] -       <property name="text">
[detail] -        <string>Hz</string>
[detail] -       </property>
[detail] -      </widget>
[detail] -     </item>
[detail]      </layout>
[detail]     </item>
[detail]     <item>
[detail] @@ -121,8 +126,8 @@
[detail]       <property name="title">
[detail]        <string>Filter method</string>
[detail]       </property>
[detail] -     <layout class="QVBoxLayout" name="verticalLayout_2">
[detail] -      <item>
[detail] +     <layout class="QGridLayout" name="gridLayout">
[detail] +      <item row="0" column="0" colspan="2">
[detail]         <layout class="QHBoxLayout">
[detail]          <property name="spacing">
[detail]           <number>6</number>
[detail] @@ -130,7 +135,7 @@
[detail]          <item>
[detail]           <widget class="QRadioButton" name="butterworthButton">
[detail]            <property name="text">
[detail] -           <string>Butterworth filter (outphasing)</string>
[detail] +           <string>Butterworth (outphasing)</string>
[detail]            </property>
[detail]           </widget>
[detail]          </item>
[detail] @@ -151,7 +156,7 @@
[detail]           </spacer>
[detail]          </item>
[detail]          <item>
[detail] -         <widget class="QCheckBox" name="causalEdit">
[detail] +         <widget class="QCheckBox" name="butterworthCausal">
[detail]            <property name="text">
[detail]             <string>Causal</string>
[detail]            </property>
[detail] @@ -159,36 +164,10 @@
[detail]          </item>
[detail]         </layout>
[detail]        </item>
[detail] -      <item>
[detail] -       <layout class="QHBoxLayout">
[detail] -        <property name="spacing">
[detail] -         <number>6</number>
[detail] -        </property>
[detail] -        <item>
[detail] -         <spacer>
[detail] -          <property name="orientation">
[detail] -           <enum>Qt::Horizontal</enum>
[detail] -          </property>
[detail] -          <property name="sizeType">
[detail] -           <enum>QSizePolicy::Expanding</enum>
[detail] -          </property>
[detail] -          <property name="sizeHint" stdset="0">
[detail] -           <size>
[detail] -            <width>40</width>
[detail] -            <height>20</height>
[detail] -           </size>
[detail] -          </property>
[detail] -         </spacer>
[detail] -        </item>
[detail] -        <item>
[detail] -         <widget class="QLabel" name="orderLabel">
[detail] -          <property name="text">
[detail] -           <string>Order of Butterworth's filter</string>
[detail] -          </property>
[detail] -         </widget>
[detail] -        </item>
[detail] -        <item>
[detail] -         <widget class="QSpinBox" name="orderEdit">
[detail] +      <item row="1" column="1">
[detail] +       <layout class="QFormLayout" name="formLayout_3">
[detail] +        <item row="0" column="1">
[detail] +         <widget class="QSpinBox" name="butterworthOrder">
[detail]            <property name="minimum">
[detail]             <number>1</number>
[detail]            </property>
[detail] @@ -197,14 +176,16 @@
[detail]            </property>
[detail]           </widget>
[detail]          </item>
[detail] +        <item row="0" column="0">
[detail] +         <widget class="QLabel" name="butterworthOrderLabel">
[detail] +          <property name="text">
[detail] +           <string>Order of Butterworth's filter:</string>
[detail] +          </property>
[detail] +         </widget>
[detail] +        </item>
[detail]         </layout>
[detail]        </item>
[detail] -      <item>
[detail] -       <layout class="QHBoxLayout">
[detail] -        <property name="spacing">
[detail] -         <number>6</number>
[detail] -        </property>
[detail] -        <item>
[detail] +      <item row="2" column="0" colspan="2">
[detail]           <widget class="QRadioButton" name="frequencyWindowButton">
[detail]            <property name="toolTip">
[detail]             <string>&lt;!DOCTYPE HTML PUBLIC &quot;-
[detail] @@ -215,23 +196,18 @@
[detail]  &lt;p&gt;For low and high pass filters, only half of the window function is used.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
[detail]            </property>
[detail]            <property name="whatsThis">
[detail] -           <string>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
[detail] -p, li {white-space: pre-wrap;}
[detail] -&lt;/style&gt;&lt;/head&gt;&lt;body &gt;
[detail] -&lt;p &gt;The modulus of the spectrum will be multiplied by a factor between 0 and 1, not changing the phase of the spectrum.&lt;/p&gt;
[detail] -&lt;p &gt;The width defines the length of the transition between those two values.&lt;/p&gt;
[detail] -&lt;p &gt;It is the ratio of the transition range in Hz over the threshold frequency(ies).&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
[detail] +         <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The modulus of the spectrum will be multiplied by a factor between 0 and 1, not changing the phase of the spectrum.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
[detail]            </property>
[detail]            <property name="text">
[detail] -           <string>Frequency domain filter</string>
[detail] +         <string>Frequency window</string>
[detail]            </property>
[detail]            <property name="checked">
[detail]             <bool>true</bool>
[detail]            </property>
[detail]           </widget>
[detail]          </item>
[detail] -        <item>
[detail] -         <spacer>
[detail] +      <item row="3" column="0">
[detail] +       <spacer name="horizontalSpacer">
[detail]            <property name="orientation">
[detail]             <enum>Qt::Horizontal</enum>
[detail]            </property>
[detail] @@ -243,42 +219,29 @@
[detail]            </property>
[detail]           </spacer>
[detail]          </item>
[detail] -       </layout>
[detail] -      </item>
[detail] -      <item>
[detail] -       <layout class="QHBoxLayout" name="horizontalLayout_2">
[detail] -        <item>
[detail] -         <spacer name="horizontalSpacer">
[detail] -          <property name="orientation">
[detail] -           <enum>Qt::Horizontal</enum>
[detail] -          </property>
[detail] -          <property name="sizeHint" stdset="0">
[detail] -           <size>
[detail] -            <width>148</width>
[detail] -            <height>13</height>
[detail] -           </size>
[detail] -          </property>
[detail] -         </spacer>
[detail] -        </item>
[detail] -        <item>
[detail] -         <layout class="QVBoxLayout" name="verticalLayout">
[detail] -          <item>
[detail] -           <widget class="QGpGuiMath::WindowFunctionParameterWidget" name="windowEdit" native="true"/>
[detail] -          </item>
[detail] -          <item>
[detail] -           <layout class="QHBoxLayout" name="horizontalLayout">
[detail] -            <item>
[detail] -             <widget class="QLabel" name="windowWidthLabel">
[detail] +      <item row="3" column="1">
[detail] +       <layout class="QFormLayout" name="formLayout_2">
[detail] +        <item row="0" column="0">
[detail] +         <widget class="QLabel" name="frequencyWindowWidthLabel">
[detail]                <property name="toolTip">
[detail]                 <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Only for low and high pass filters.&lt;/p&gt;&lt;p&gt;A 10% width will generate a smooth transition (first or second half shape of the window function) betwen fc and fc*1.1 for high pass and fc*0.9 and fc for low pass.&lt;/p&gt;&lt;p&gt;Using a Tukey window for low and high pass is relatively meaningless.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
[detail]                </property>
[detail]                <property name="text">
[detail] -               <string>Window relative width</string>
[detail] +           <string>Window relative width:</string>
[detail]                </property>
[detail]               </widget>
[detail]              </item>
[detail] -            <item>
[detail] -             <widget class="QGpGuiTools::DoubleSpinBox" name="windowWidthEdit">
[detail] +        <item row="0" column="1">
[detail] +         <widget class="QGpGuiTools::DoubleSpinBox" name="frequencyWindowWidth">
[detail] +          <property name="whatsThis">
[detail] +           <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;
[detail] +&lt;p&gt;Frequency limits are f_min and f_max, df is the window relative width.&lt;/p&gt;
[detail] +&lt;ul&gt;
[detail] +&lt;li&gt;Low pass: transition from pass to stop bands between f_min*(1-df) and f_min.&lt;/li&gt;
[detail] +&lt;li&gt;High pass: transition from stop to pass bands between f_min and f_min*(1+df).&lt;/li&gt;
[detail] +&lt;li&gt;Band pass and band stop: window is between f_min and f_max.&lt;/li&gt;
[detail] +&lt;/body&gt;&lt;/html&gt;</string>
[detail] +          </property>
[detail]                <property name="suffix">
[detail]                 <string> %</string>
[detail]                </property>
[detail] @@ -290,12 +253,107 @@
[detail]                </property>
[detail]               </widget>
[detail]              </item>
[detail] -           </layout>
[detail] +        <item row="1" column="0" colspan="2">
[detail] +         <widget class="QGpGuiMath::WindowFunctionParameterWidget" name="windowEdit" native="true"/>
[detail]            </item>
[detail]           </layout>
[detail]          </item>
[detail] +      <item row="5" column="1">
[detail] +       <layout class="QFormLayout" name="formLayout">
[detail] +        <item row="0" column="0">
[detail] +         <widget class="QLabel" name="chebyshevType1TransitionWidthLabel">
[detail] +          <property name="text">
[detail] +           <string>Transition  band relative width:</string>
[detail] +          </property>
[detail] +         </widget>
[detail] +        </item>
[detail] +        <item row="0" column="1">
[detail] +         <widget class="QGpGuiTools::DoubleSpinBox" name="chebyshevType1TransitionWidth">
[detail] +          <property name="whatsThis">
[detail] +           <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;
[detail] +&lt;p&gt;Frequency limits are f_min and f_max, df is the transition band relative width.&lt;/p&gt;
[detail] +&lt;ul&gt;
[detail] +&lt;li&gt;Low pass: transition from pass to stop bands between f_min*(1-df) and f_min.&lt;/li&gt;
[detail] +&lt;li&gt;High pass: transition from stop to pass bands between f_min and f_min*(1+df).&lt;/li&gt;
[detail] +&lt;li&gt;Band pass:&lt;ul&gt;
[detail] +  &lt;li&gt;transition from stop to pass bands between f_min and f_min*(1+df).&lt;/li&gt;
[detail] +  &lt;li&gt;transition from pass to stop bands between f_max*(1-df) and f_max.&lt;/li&gt;
[detail] +  &lt;/ul&gt;&lt;/li&gt;
[detail] +&lt;li&gt;Band stop:&lt;ul&gt;
[detail] +  &lt;li&gt;transition from pass to stop bands between f_min*(1-df) and f_min.&lt;/li&gt;
[detail] +  &lt;li&gt;transition from stop to pass bands between f_max and f_max*(1+df).&lt;/li&gt;
[detail] +  &lt;/ul&gt;&lt;/li&gt;
[detail] +&lt;/ul&gt;
[detail] +&lt;/body&gt;&lt;/html&gt;</string>
[detail] +          </property>
[detail] +          <property name="suffix">
[detail] +           <string> %</string>
[detail] +          </property>
[detail] +          <property name="value">
[detail] +           <double>10.000000000000000</double>
[detail] +          </property>
[detail] +         </widget>
[detail] +        </item>
[detail] +        <item row="1" column="0">
[detail] +         <widget class="QLabel" name="chebyshevType1MaxLossPassLabel">
[detail] +          <property name="text">
[detail] +           <string>Maximum loss in the pass band:</string>
[detail] +          </property>
[detail] +         </widget>
[detail] +        </item>
[detail] +        <item row="1" column="1">
[detail] +         <widget class="QGpGuiTools::DoubleSpinBox" name="chebyshevType1MaxLossPass">
[detail] +          <property name="suffix">
[detail] +           <string> dB</string>
[detail] +          </property>
[detail] +          <property name="value">
[detail] +           <double>1.000000000000000</double>
[detail] +          </property>
[detail] +         </widget>
[detail] +        </item>
[detail] +        <item row="2" column="0">
[detail] +         <widget class="QLabel" name="chebyshevType1MinAttenuationStopLabel">
[detail] +          <property name="text">
[detail] +           <string>Minimum attenuation in the stop band:</string>
[detail] +          </property>
[detail] +         </widget>
[detail] +        </item>
[detail] +        <item row="2" column="1">
[detail] +         <widget class="QGpGuiTools::DoubleSpinBox" name="chebyshevType1MinAttenuationStop">
[detail] +          <property name="suffix">
[detail] +           <string> dB</string>
[detail] +          </property>
[detail] +          <property name="value">
[detail] +           <double>1.000000000000000</double>
[detail] +          </property>
[detail] +         </widget>
[detail] +        </item>
[detail] +        <item row="3" column="0">
[detail] +         <widget class="QLabel" name="chebyshevType1MaxRippleLabel">
[detail] +          <property name="text">
[detail] +           <string>Maximum ripple in the pass band:</string>
[detail] +          </property>
[detail] +         </widget>
[detail] +        </item>
[detail] +        <item row="3" column="1">
[detail] +         <widget class="QGpGuiTools::DoubleSpinBox" name="chebyshevType1MaxRipple">
[detail] +          <property name="suffix">
[detail] +           <string> dB</string>
[detail] +          </property>
[detail] +          <property name="value">
[detail] +           <double>0.500000000000000</double>
[detail] +          </property>
[detail] +         </widget>
[detail] +        </item>
[detail]         </layout>
[detail]        </item>
[detail] +      <item row="4" column="0" colspan="2">
[detail] +       <widget class="QRadioButton" name="chebyshevType1Button">
[detail] +        <property name="text">
[detail] +         <string>Chebyshev type 1</string>
[detail] +        </property>
[detail] +       </widget>
[detail] +      </item>
[detail]       </layout>
[detail]      </widget>
[detail]     </item>
[detail] @@ -310,7 +368,7 @@
[detail]    <customwidget>
[detail]     <class>QGpGuiMath::WindowFunctionParameterWidget</class>
[detail]     <extends>QWidget</extends>
[detail] -   <header>QGpGuiMath.h</header>
[detail] +   <header>WindowFunctionParameterWidget.h</header>
[detail]    </customwidget>
[detail]   </customwidgets>
[detail]   <resources/>
[detail]                      src/HeaderWidget.ui:  version-3.5.0	modified out of comments
[detail] --- src/HeaderWidget.ui-version-3.5.0-stripped	2025-09-28 04:01:09.539524919 +0200
[detail] +++ src/HeaderWidget.ui-HEAD-stripped	2025-09-28 04:01:09.539524919 +0200
[detail] @@ -27,7 +27,7 @@
[detail]  &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
[detail]  p, li { white-space: pre-wrap; }
[detail]  &lt;/style&gt;&lt;/head&gt;&lt;body&gt;
[detail] -&lt;p&gt;This tool lets you edit and excute scripts to manipulate signal header data. See &lt;a href=&quot;http:
[detail] +&lt;p&gt;This tool lets you edit and excute scripts to manipulate signal header data. See &lt;a href=&quot;https:
[detail]       </property>
[detail]       <property name="wordWrap">
[detail]        <bool>true</bool>
[detail]                        src/LoadFormat.ui:  version-3.5.0	not modified
[detail]             src/MorletParameterWidget.ui:  version-3.5.0	not modified
[detail]      src/NormalizationParameterWidget.ui:  version-3.5.0	not modified
[detail]               src/PickParameterwidget.ui:  version-3.5.0	not modified
[detail]                        src/PickToPick.ui:  version-3.5.0	not modified
[detail]                   src/PicksProperties.ui:  version-3.5.0	not modified
[detail]                   src/RD3LogParameter.ui:  version-3.5.0	not modified
[detail]                 src/RelativePositions.ui:  version-3.5.0	not modified
[detail]               src/SignalLayerControls.ui:  version-3.5.0	not modified
[detail]                 src/SignalsProperties.ui:  version-3.5.0	modified out of comments
[detail] --- src/SignalsProperties.ui-version-3.5.0-stripped	2025-09-28 04:01:09.699525692 +0200
[detail] +++ src/SignalsProperties.ui-HEAD-stripped	2025-09-28 04:01:09.703525711 +0200
[detail] @@ -7,7 +7,7 @@
[detail]      <x>0</x>
[detail]      <y>0</y>
[detail]      <width>283</width>
[detail] -    <height>602</height>
[detail] +    <height>620</height>
[detail]     </rect>
[detail]    </property>
[detail]    <property name="windowTitle">
[detail] @@ -313,6 +313,11 @@
[detail]            <string>Relative to start time</string>
[detail]           </property>
[detail]          </item>
[detail] +        <item>
[detail] +         <property name="text">
[detail] +          <string>Correlation</string>
[detail] +         </property>
[detail] +        </item>
[detail]         </widget>
[detail]        </item>
[detail]       </layout>
[detail]          src/TimeRangeParameterWidget.ui:  version-3.5.0	not modified
[detail]                     src/TimeReference.ui:  version-3.5.0	not modified
[detail]          src/WindowingParameterWidget.ui:  version-3.5.0	modified out of comments
[detail] --- src/WindowingParameterWidget.ui-version-3.5.0-stripped	2025-09-28 04:01:09.747525924 +0200
[detail] +++ src/WindowingParameterWidget.ui-HEAD-stripped	2025-09-28 04:01:09.751525944 +0200
[detail] @@ -7,7 +7,7 @@
[detail]      <x>0</x>
[detail]      <y>0</y>
[detail]      <width>311</width>
[detail] -    <height>297</height>
[detail] +    <height>303</height>
[detail]     </rect>
[detail]    </property>
[detail]    <property name="windowTitle">
[detail] @@ -38,7 +38,7 @@
[detail]        <enum>QTabWidget::Rounded</enum>
[detail]       </property>
[detail]       <property name="currentIndex">
[detail] -      <number>0</number>
[detail] +      <number>2</number>
[detail]       </property>
[detail]       <widget class="QWidget" name="generalTab">
[detail]        <attribute name="title">
[detail] @@ -788,51 +788,11 @@
[detail]         </property>
[detail]        </widget>
[detail]       </widget>
[detail] -     <widget class="QWidget" name="TabPage">
[detail] -      <attribute name="title">
[detail] -       <string>Filter</string>
[detail] -      </attribute>
[detail] -      <layout class="QVBoxLayout">
[detail] -       <property name="spacing">
[detail] -        <number>6</number>
[detail] -       </property>
[detail] -       <property name="leftMargin">
[detail] -        <number>9</number>
[detail] -       </property>
[detail] -       <property name="topMargin">
[detail] -        <number>9</number>
[detail] -       </property>
[detail] -       <property name="rightMargin">
[detail] -        <number>9</number>
[detail] -       </property>
[detail] -       <property name="bottomMargin">
[detail] -        <number>9</number>
[detail] -       </property>
[detail] -       <item>
[detail] -        <widget class="GeopsyGui::FilterParameterWidget" name="filterWidget" native="true"/>
[detail] -       </item>
[detail] -      </layout>
[detail] -     </widget>
[detail]       <widget class="QWidget" name="filteredTab">
[detail]        <attribute name="title">
[detail]         <string>Filtered signal</string>
[detail]        </attribute>
[detail] -      <layout class="QVBoxLayout">
[detail] -       <property name="spacing">
[detail] -        <number>6</number>
[detail] -       </property>
[detail] -       <property name="leftMargin">
[detail] -        <number>8</number>
[detail] -       </property>
[detail] -       <property name="topMargin">
[detail] -        <number>8</number>
[detail] -       </property>
[detail] -       <property name="rightMargin">
[detail] -        <number>8</number>
[detail] -       </property>
[detail] -       <property name="bottomMargin">
[detail] -        <number>8</number>
[detail] -       </property>
[detail] +      <layout class="QVBoxLayout" name="verticalLayout_3">
[detail]         <item>
[detail]          <layout class="QHBoxLayout">
[detail]           <property name="spacing">
[detail] @@ -1084,6 +1044,8 @@
[detail]          </layout>
[detail]         </item>
[detail]         <item>
[detail] +        <layout class="QHBoxLayout" name="horizontalLayout_3">
[detail] +         <item>
[detail]          <widget class="QCheckBox" name="isFilteredTab">
[detail]           <property name="whatsThis">
[detail]            <string>&lt;p&gt;Do not forget to check the parameters of anti-trigger in the &lt;b&gt;Filtered Signal&lt;/b&gt; tab.&lt;/p&gt;</string>
[detail] @@ -1093,6 +1055,15 @@
[detail]           </property>
[detail]          </widget>
[detail]         </item>
[detail] +         <item>
[detail] +          <widget class="QToolButton" name="filterButton">
[detail] +           <property name="text">
[detail] +            <string>Filter</string>
[detail] +           </property>
[detail] +          </widget>
[detail] +         </item>
[detail] +        </layout>
[detail] +       </item>
[detail]        </layout>
[detail]       </widget>
[detail]      </widget>
[detail] @@ -1105,11 +1076,6 @@
[detail]     <extends>QDoubleSpinBox</extends>
[detail]     <header>QGpGuiTools.h</header>
[detail]    </customwidget>
[detail] -  <customwidget>
[detail] -   <class>GeopsyGui::FilterParameterWidget</class>
[detail] -   <extends>QWidget</extends>
[detail] -   <header>FilterParameterWidget.h</header>
[detail] -  </customwidget>
[detail]   </customwidgets>
[detail]   <resources/>
[detail]   <connections/>
[summary] Total differences: 3755 lines
[summary] Modification level is B
OLD_DIR=$(pwd)
echo "GeopsyGui"
cd $(find . -name "GeopsyGui" | tail -n 1) || exit 2
pwd
dpversion B  || exit 2
cd $OLD_DIR || exit 2
################## geopsyfigs
[detail]                       src/GeopsyFigs.cpp:  version-1.0.2	modified out of comments
[detail] --- src/GeopsyFigs.cpp-version-1.0.2-stripped	2025-09-28 04:01:09.799526175 +0200
[detail] +++ src/GeopsyFigs.cpp-HEAD-stripped	2025-09-28 04:01:09.803526195 +0200
[detail] @@ -8,18 +8,19 @@
[detail]  #include "SciFigsVersion.h"
[detail]  
[detail]  
[detail] -#ifdef Q_OS_WIN
[detail]  #include <GeopsyGui.h>
[detail] -TimeWindow fake(DateTime::minimumTime, DateTime::maximumTime);
[detail] -#endif
[detail]  
[detail]  const char * GeopsyFigs::interfaceVersion() const
[detail]  {
[detail]    return SCIFIGS_VERSION;
[detail]  }
[detail]  
[detail] -PACKAGE_INFO("geopsyfigs", GEOPSYFIGS)
[detail] +bool GeopsyFigs::init()
[detail] +{
[detail] +  
[detail]  
[detail] -#if(QT_VERSION < QT_VERSION_CHECK(5, 0, 0))
[detail] -Q_EXPORT_PLUGIN2(geopsyfigs, GeopsyFigs)
[detail] -#endif
[detail] +  PickLayer fake;
[detail] +  return fake.xml_tagName()=="PickLayer";
[detail] +}
[detail] +
[detail] +PACKAGE_INFO("geopsyfigs", GEOPSYFIGS)
[detail]                         src/GeopsyFigs.h:  version-1.0.2	modified out of comments
[detail] --- src/GeopsyFigs.h-version-1.0.2-stripped	2025-09-28 04:01:09.819526272 +0200
[detail] +++ src/GeopsyFigs.h-HEAD-stripped	2025-09-28 04:01:09.823526292 +0200
[detail] @@ -13,10 +13,11 @@
[detail]  #endif
[detail]    Q_INTERFACES(SciFigs::SciFigsPlugin)
[detail]  public:
[detail] -  virtual QString tag() const {return "geopsygui";}
[detail] -  virtual QString title() const {return tr("Signal viewer based on Geopsy database");}
[detail] +  QString tag() const {return "geopsygui";}
[detail] +  QString title() const {return tr("Signal viewer based on Geopsy database");}
[detail]  
[detail] -  virtual const char * interfaceVersion() const;
[detail] +  const char * interfaceVersion() const;
[detail] +  bool init();
[detail]  };
[detail]  
[detail]  #endif 
[summary] Total differences: 46 lines
[summary] Modification level is C
OLD_DIR=$(pwd)
echo "geopsyfigs"
cd $(find . -name "geopsyfigs" | tail -n 1) || exit 2
pwd
dpversion C  || exit 2
cd $OLD_DIR || exit 2
################## GeopsySLink
[detail]                      src/GeopsySLink.cpp:  version-2.1.0	not modified
[detail]                         src/SeedLink.cpp:  version-2.1.0	not modified
[detail]                   src/SeedLinkServer.cpp:  version-2.1.0	modified out of comments
[detail] --- src/SeedLinkServer.cpp-version-2.1.0-stripped	2025-09-28 04:01:09.899526659 +0200
[detail] +++ src/SeedLinkServer.cpp-HEAD-stripped	2025-09-28 04:01:09.903526678 +0200
[detail] @@ -110,7 +110,7 @@
[detail]      int n=stat->count();
[detail]      for(int i=0; i<n; i++) {
[detail]        const SeedLinkStream * stream=stat->at(i);
[detail] -      Signal * sig=stream->signal();
[detail] +      SignalSegment * sig=stream->signal();
[detail]        if(sig) {
[detail]          subPool.addSignal(sig);
[detail]        }
[detail]                  src/SeedLinkStation.cpp:  version-2.1.0	not modified
[detail]                   src/SeedLinkStream.cpp:  version-2.1.0	modified out of comments
[detail] --- src/SeedLinkStream.cpp-version-2.1.0-stripped	2025-09-28 04:01:09.939526852 +0200
[detail] +++ src/SeedLinkStream.cpp-HEAD-stripped	2025-09-28 04:01:09.943526871 +0200
[detail] @@ -100,19 +100,20 @@
[detail]    TRACE;
[detail]    SignalDatabase * db=_station->server()->database();
[detail]    if(db) {
[detail] -    _signal=new DynamicSignal(db);
[detail] -    _signal->setName(_station->network() + "_" + _station->name());
[detail] -    if(seedName().endsWith( "Z" ))
[detail] -      _signal->setComponent(Signal::Vertical);
[detail] -    else if(seedName().endsWith( "E" ))
[detail] -      _signal->setComponent(Signal::East);
[detail] -    else if(seedName().endsWith( "N" ))
[detail] -      _signal->setComponent(Signal::North);
[detail] -    else
[detail] -      _signal->setComponent(Signal::UndefinedComponent);
[detail] -    _signal->setType(Signal::Waveform);
[detail] -    _signal->setHeaderModified(true);
[detail] -    _signal->setReadOnlySamples(true);
[detail] +    _signal=new SignalSegment(db);
[detail] +    _signal->setDynamic();
[detail] +    _signal->metaData()->setName(_station->network()+"_"+_station->name());
[detail] +    if(seedName().endsWith("Z")) {
[detail] +      _signal->metaData()->setComponent(SignalMetaData::Vertical);
[detail] +    } else if(seedName().endsWith("E")) {
[detail] +      _signal->metaData()->setComponent(SignalMetaData::East);
[detail] +    } else if(seedName().endsWith("N")) {
[detail] +      _signal->metaData()->setComponent(SignalMetaData::North);
[detail] +    } else {
[detail] +      _signal->metaData()->setComponent(SignalMetaData::UndefinedComponent);
[detail] +    }
[detail] +    _signal->metaData()->setModified(true);
[detail] +    _signal->metaData()->setReadOnlySamples(true);
[detail]      return true;
[detail]    } else {
[detail]      App::log(tr("In SeedLinkStream::createSignal(), no database specified.\n") );
[detail] @@ -126,22 +127,22 @@
[detail]    TRACE;
[detail]    switch (bt) {
[detail]    case Unlimited:
[detail] -    _signal->set(t, samples, nSamples);
[detail] +    _signal->dynamicValues()->set(t, samples, nSamples);
[detail]      break;
[detail]    case CreateNew: {
[detail]        if(maxTime==0.0) return;
[detail]        double availableTime=maxTime-_signal->startTime().secondsTo(t);
[detail]        if((nSamples*_signal->samplingPeriod())>availableTime) {
[detail]          int nSamplesOld=qFloor(availableTime/_signal->samplingPeriod());
[detail] -        _signal->set(t, samples, nSamplesOld);
[detail] -        DynamicSignal * oldSignal=_signal;
[detail] +        _signal->dynamicValues()->set(t, samples, nSamplesOld);
[detail] +        SignalSegment * oldSignal=_signal;
[detail]          if(createSignal()) {
[detail]            _signal->setStartTime(oldSignal->endTime());
[detail]            _signal->setSamplingPeriod(oldSignal->samplingPeriod());
[detail] -          _signal->set(_signal->startTime(), samples+nSamplesOld, nSamples-nSamplesOld);
[detail] +          _signal->dynamicValues()->set(_signal->startTime(), samples+nSamplesOld, nSamples-nSamplesOld);
[detail]          }
[detail]        } else {
[detail] -        _signal->set(t, samples, nSamples);
[detail] +        _signal->dynamicValues()->set(t, samples, nSamples);
[detail]        }
[detail]      }
[detail]      break;
[detail] @@ -150,9 +151,9 @@
[detail]        double availableTime=maxTime-_signal->startTime().secondsTo(t);
[detail]        if((nSamples*_signal->samplingPeriod())>availableTime) {
[detail]          int n=nSamples-qFloor(availableTime/_signal->samplingPeriod());
[detail] -        _signal->shiftStartTime(n);
[detail] +        _signal->dynamicValues()->shiftStartTime(n);
[detail]        }
[detail] -      _signal->set(t, samples, nSamples);
[detail] +      _signal->dynamicValues()->set(t, samples, nSamples);
[detail]      }
[detail]      break;
[detail]    }
[detail]                           src/SeedLink.h:  version-2.1.0	modified out of comments
[detail] --- src/SeedLink.h-version-2.1.0-stripped	2025-09-28 04:01:09.959526948 +0200
[detail] +++ src/SeedLink.h-HEAD-stripped	2025-09-28 04:01:09.963526968 +0200
[detail] @@ -49,8 +49,8 @@
[detail]    virtual void run();
[detail]  signals:
[detail]    void infoAvailable();
[detail] -  void beginSignalChange(Signal * sig, GeopsyCore::TimeRange tw);
[detail] -  void endSignalChange(Signal * sig, GeopsyCore::TimeRange tw);
[detail] +  void beginSignalChange(SignalSegment * sig, GeopsyCore::TimeRange tw);
[detail] +  void endSignalChange(SignalSegment * sig, GeopsyCore::TimeRange tw);
[detail]    void error(GeopsySLink::SeedLink::Error e);
[detail]  private:
[detail]    static SeedLink * _instance;
[detail]                     src/SeedLinkServer.h:  version-2.1.0	not modified
[detail]                    src/SeedLinkStation.h:  version-2.1.0	not modified
[detail]                     src/SeedLinkStream.h:  version-2.1.0	modified out of comments
[detail] --- src/SeedLinkStream.h-version-2.1.0-stripped	2025-09-28 04:01:10.011527200 +0200
[detail] +++ src/SeedLinkStream.h-HEAD-stripped	2025-09-28 04:01:10.015527220 +0200
[detail] @@ -46,7 +46,7 @@
[detail]    bool gapCheck() const {return _gapCheck;}
[detail]    int gapThreshold() const {return _gapThreshold;}
[detail]  
[detail] -  DynamicSignal * signal() const {return _signal;}
[detail] +  SignalSegment * signal() const {return _signal;}
[detail]    void initSignal(const DateTime& t, double samplingFrequency);
[detail]    void detachSignal() {_signal=nullptr;}
[detail]    void set(const DateTime& t, int * samples, int nSamples, BufferType bt, double maxTime=0.0);
[detail] @@ -70,7 +70,7 @@
[detail]    bool _listening;
[detail]    QByteArray _tag;
[detail]  
[detail] -  DynamicSignal * _signal;
[detail] +  SignalSegment * _signal;
[detail]  };
[detail]  
[detail]  } 
[summary] Total differences: 120 lines
[summary] Modification level is B
OLD_DIR=$(pwd)
echo "GeopsySLink"
cd $(find . -name "GeopsySLink" | tail -n 1) || exit 2
pwd
dpversion B  || exit 2
cd $OLD_DIR || exit 2
################## GeopsySLinkGui
[detail]                   src/GeopsySLinkGui.cpp:  version-2.0.3	not modified
[detail]                   src/SeedLinkLoader.cpp:  version-2.0.3	modified out of comments
[detail] --- src/SeedLinkLoader.cpp-version-2.0.3-stripped	2025-09-28 04:01:10.083527547 +0200
[detail] +++ src/SeedLinkLoader.cpp-HEAD-stripped	2025-09-28 04:01:10.087527567 +0200
[detail] @@ -32,10 +32,10 @@
[detail]  
[detail]    _seedLink=new SeedLink(this);
[detail]    connect(_seedLink,SIGNAL(infoAvailable()), this, SLOT(streamInfoAvailable()), Qt::QueuedConnection);
[detail] -  connect(_seedLink,SIGNAL(beginSignalChange(Signal *, GeopsyCore::TimeRange)),
[detail] -           this, SLOT(beginSignalChange(Signal *)), Qt::QueuedConnection);
[detail] -  connect(_seedLink,SIGNAL(endSignalChange(Signal *, GeopsyCore::TimeRange)),
[detail] -           this, SLOT(endSignalChange(Signal *)), Qt::QueuedConnection);
[detail] +  connect(_seedLink,SIGNAL(beginSignalChange(SignalSegment *, GeopsyCore::TimeRange)),
[detail] +           this, SLOT(beginSignalChange(SignalSegment *)), Qt::QueuedConnection);
[detail] +  connect(_seedLink,SIGNAL(endSignalChange(SignalSegment *, GeopsyCore::TimeRange)),
[detail] +           this, SLOT(endSignalChange(SignalSegment *)), Qt::QueuedConnection);
[detail]    connect(_seedLink, SIGNAL(error(GeopsySLink::SeedLink::Error)),
[detail]             this, SLOT(seedLinkError(GeopsySLink::SeedLink::Error)), Qt::QueuedConnection);
[detail]    SeedLinkLoaderOptions::restore(_seedLink);
[detail] @@ -161,13 +161,13 @@
[detail]    }
[detail]  }
[detail]  
[detail] -void SeedLinkLoader::beginSignalChange(Signal * sig)
[detail] +void SeedLinkLoader::beginSignalChange(SignalSegment * sig)
[detail]  {
[detail]    TRACE;
[detail]    GeopsyGuiEngine::instance()->beginSignalChange(sig);
[detail]  }
[detail]  
[detail] -void SeedLinkLoader::endSignalChange(Signal * sig)
[detail] +void SeedLinkLoader::endSignalChange(SignalSegment * sig)
[detail]  {
[detail]    TRACE;
[detail]    seedLinkActivity->hit();
[detail]            src/SeedLinkLoaderOptions.cpp:  version-2.0.3	not modified
[detail]               src/SeedLinkStreamItem.cpp:  version-2.0.3	not modified
[detail]                     src/SeedLinkLoader.h:  version-2.0.3	modified out of comments
[detail] --- src/SeedLinkLoader.h-version-2.0.3-stripped	2025-09-28 04:01:10.135527799 +0200
[detail] +++ src/SeedLinkLoader.h-HEAD-stripped	2025-09-28 04:01:10.139527818 +0200
[detail] @@ -36,8 +36,8 @@
[detail]    void streamInfoAvailable();
[detail]    void seedLinkError(GeopsySLink::SeedLink::Error e);
[detail]    void showContextMenu(const QPoint & pos);
[detail] -  void beginSignalChange(Signal * sig);
[detail] -  void endSignalChange(Signal * sig);
[detail] +  void beginSignalChange(SignalSegment * sig);
[detail] +  void endSignalChange(SignalSegment * sig);
[detail]  signals:
[detail]    void started();
[detail]    void stopped();
[detail]              src/SeedLinkLoaderOptions.h:  version-2.0.3	not modified
[detail]                 src/SeedLinkStreamItem.h:  version-2.0.3	not modified
[detail]                    src/SeedLinkLoader.ui:  version-2.0.3	not modified
[detail]             src/SeedLinkLoaderOptions.ui:  version-2.0.3	not modified
[summary] Total differences: 46 lines
[summary] Modification level is B
OLD_DIR=$(pwd)
echo "GeopsySLinkGui"
cd $(find . -name "GeopsySLinkGui" | tail -n 1) || exit 2
pwd
dpversion B  || exit 2
cd $OLD_DIR || exit 2
################## DinverCore
[detail]                src/AbstractCondition.cpp:  version-1.4.0	not modified
[detail]                  src/AbstractForward.cpp:  version-1.4.0	not modified
[detail]                      src/ActiveModel.cpp:  version-1.4.0	not modified
[detail]                     src/ActiveModels.cpp:  version-1.4.0	not modified
[detail]              src/ArtificialBeeColony.cpp:  version-1.4.0	not modified
[detail]                         src/BatchRun.cpp:  version-1.4.0	not modified
[detail]                       src/BestModels.cpp:  version-1.4.0	not modified
[detail]                          src/DinverC.cpp:  version-1.4.0	not modified
[detail]                       src/DinverCore.cpp:  version-1.4.0	not modified
[detail]                 src/DinverCoreEngine.cpp:  version-1.4.0	not modified
[detail]                    src/DinverFortran.cpp:  version-1.4.0	not modified
[detail]                      src/DinverIndex.cpp:  version-1.4.0	no last version available
[detail]                  src/DinverInterface.cpp:  version-1.4.0	not modified
[detail]                        src/Generator.cpp:  version-1.4.0	not modified
[detail]                  src/GeneratorModels.cpp:  version-1.4.0	not modified
[detail]               src/ImportanceSampling.cpp:  version-1.4.0	not modified
[detail]                            src/Model.cpp:  version-1.4.0	not modified
[detail]                  src/ModelRepository.cpp:  version-1.4.0	not modified
[detail]                         src/ModelSet.cpp:  version-1.4.0	not modified
[detail]                         src/NewModel.cpp:  version-1.4.0	not modified
[detail]                   src/ParamCondition.cpp:  version-1.4.0	not modified
[detail]                 src/ParamSpaceScript.cpp:  version-1.4.0	not modified
[detail]                        src/Parameter.cpp:  version-1.4.0	not modified
[detail]                    src/ParameterGrid.cpp:  version-1.4.0	not modified
[detail]                      src/ParentIndex.cpp:  version-1.4.0	not modified
[detail]                         src/PdfCurve.cpp:  version-1.4.0	not modified
[detail]               src/QuadraticCondition.cpp:  version-1.4.0	not modified
[detail]                        src/RealSpace.cpp:  version-1.4.0	not modified
[detail]                     src/ReportReader.cpp:  version-1.4.0	not modified
[detail]                     src/ReportWriter.cpp:  version-1.4.0	not modified
[detail]                     src/ScaledModels.cpp:  version-1.4.0	not modified
[detail]                  src/SimpleCondition.cpp:  version-1.4.0	not modified
[detail]                          src/Simplex.cpp:  version-1.4.0	not modified
[detail]                     src/SumCondition.cpp:  version-1.4.0	not modified
[detail]               src/TemporaryDirectory.cpp:  version-1.4.0	not modified
[detail]                 src/VoronoiNavigator.cpp:  version-1.4.0	not modified
[detail]                        src/XMLDinver.cpp:  version-1.4.0	not modified
[detail]                 src/XMLDinverContext.cpp:  version-1.4.0	modified out of comments
[detail] --- src/XMLDinverContext.cpp-version-1.4.0-stripped	2025-09-28 04:01:10.831531163 +0200
[detail] +++ src/XMLDinverContext.cpp-HEAD-stripped	2025-09-28 04:01:10.835531181 +0200
[detail] @@ -8,7 +8,7 @@
[detail]  
[detail]    
[detail]    XMLDinverContext::XMLDinverContext(FileType ft)
[detail] -    : XMLContext(false)
[detail] +    : XMLContext()
[detail]     {
[detail]       _fileType=ft;
[detail]     }
[detail]                  src/XMLDinverHeader.cpp:  version-1.4.0	not modified
[detail]                 src/XMLVirtualPlugin.cpp:  version-1.4.0	not modified
[detail]                  src/AbstractCondition.h:  version-1.4.0	not modified
[detail]                    src/AbstractForward.h:  version-1.4.0	not modified
[detail]                        src/ActiveModel.h:  version-1.4.0	modified out of comments
[detail] --- src/ActiveModel.h-version-1.4.0-stripped	2025-09-28 04:01:10.907531530 +0200
[detail] +++ src/ActiveModel.h-HEAD-stripped	2025-09-28 04:01:10.915531569 +0200
[detail] @@ -6,7 +6,7 @@
[detail]  #include <QGpCoreTools.h>
[detail]  
[detail]  #include "DinverCoreDLLExport.h"
[detail] -#include "Index.h"
[detail] +#include "DinverIndex.h"
[detail]  
[detail]  namespace DinverCore {
[detail]  
[detail]                       src/ActiveModels.h:  version-1.4.0	not modified
[detail]                src/ArtificialBeeColony.h:  version-1.4.0	not modified
[detail]                           src/BatchRun.h:  version-1.4.0	not modified
[detail]                         src/BestModels.h:  version-1.4.0	not modified
[detail]                            src/DinverC.h:  version-1.4.0	not modified
[detail]                   src/DinverCoreEngine.h:  version-1.4.0	not modified
[detail]                      src/DinverFortran.h:  version-1.4.0	not modified
[detail]                        src/DinverIndex.h:  version-1.4.0	no last version available
[detail]                    src/DinverInterface.h:  version-1.4.0	not modified
[detail]                          src/Generator.h:  version-1.4.0	not modified
[detail]                    src/GeneratorModels.h:  version-1.4.0	modified out of comments
[detail] --- src/GeneratorModels.h-version-1.4.0-stripped	2025-09-28 04:01:11.075532342 +0200
[detail] +++ src/GeneratorModels.h-HEAD-stripped	2025-09-28 04:01:11.079532361 +0200
[detail] @@ -6,7 +6,7 @@
[detail]  #include <QGpCoreTools.h>
[detail]  
[detail]  #include "DinverCoreDLLExport.h"
[detail] -#include "Index.h"
[detail] +#include "DinverIndex.h"
[detail]  
[detail]  namespace DinverCore {
[detail]  
[detail]                 src/ImportanceSampling.h:  version-1.4.0	not modified
[detail]                              src/Model.h:  version-1.4.0	not modified
[detail]                    src/ModelRepository.h:  version-1.4.0	modified out of comments
[detail] --- src/ModelRepository.h-version-1.4.0-stripped	2025-09-28 04:01:11.127532593 +0200
[detail] +++ src/ModelRepository.h-HEAD-stripped	2025-09-28 04:01:11.131532613 +0200
[detail] @@ -7,7 +7,7 @@
[detail]  
[detail]  #include "DinverCoreDLLExport.h"
[detail]  #include "Generator.h"
[detail] -#include "Index.h"
[detail] +#include "DinverIndex.h"
[detail]  
[detail]  namespace DinverCore {
[detail]  
[detail]                           src/ModelSet.h:  version-1.4.0	modified out of comments
[detail] --- src/ModelSet.h-version-1.4.0-stripped	2025-09-28 04:01:11.147532690 +0200
[detail] +++ src/ModelSet.h-HEAD-stripped	2025-09-28 04:01:11.147532690 +0200
[detail] @@ -6,7 +6,7 @@
[detail]  #include <QtCore>
[detail]  #include <QGpCoreMath.h>
[detail]  
[detail] -#include "Index.h"
[detail] +#include "DinverIndex.h"
[detail]  
[detail]  namespace DinverCore {
[detail]  
[detail]                           src/NewModel.h:  version-1.4.0	not modified
[detail]                     src/ParamCondition.h:  version-1.4.0	not modified
[detail]                   src/ParamSpaceScript.h:  version-1.4.0	not modified
[detail]                          src/Parameter.h:  version-1.4.0	not modified
[detail]                      src/ParameterGrid.h:  version-1.4.0	not modified
[detail]                        src/ParentIndex.h:  version-1.4.0	not modified
[detail]                           src/PdfCurve.h:  version-1.4.0	not modified
[detail]                 src/QuadraticCondition.h:  version-1.4.0	not modified
[detail]                          src/RealSpace.h:  version-1.4.0	not modified
[detail]                       src/ReportReader.h:  version-1.4.0	not modified
[detail]                       src/ReportWriter.h:  version-1.4.0	not modified
[detail]                       src/ScaledModels.h:  version-1.4.0	modified out of comments
[detail] --- src/ScaledModels.h-version-1.4.0-stripped	2025-09-28 04:01:11.335533598 +0200
[detail] +++ src/ScaledModels.h-HEAD-stripped	2025-09-28 04:01:11.339533618 +0200
[detail] @@ -4,7 +4,7 @@
[detail]  #define SCALEDMODELS_H
[detail]  
[detail]  #include "DinverCoreDLLExport.h"
[detail] -#include "Index.h"
[detail] +#include "DinverIndex.h"
[detail]  
[detail]  namespace DinverCore {
[detail]  
[detail]                    src/SimpleCondition.h:  version-1.4.0	not modified
[detail]                            src/Simplex.h:  version-1.4.0	not modified
[detail]                       src/SumCondition.h:  version-1.4.0	not modified
[detail]                 src/TemporaryDirectory.h:  version-1.4.0	not modified
[detail]                   src/VoronoiNavigator.h:  version-1.4.0	not modified
[detail]                          src/XMLDinver.h:  version-1.4.0	not modified
[detail]                   src/XMLDinverContext.h:  version-1.4.0	not modified
[detail]                    src/XMLDinverHeader.h:  version-1.4.0	not modified
[detail]                   src/XMLVirtualPlugin.h:  version-1.4.0	not modified
[summary] Total differences: 66 lines
[summary] Modification level is B
OLD_DIR=$(pwd)
echo "DinverCore"
cd $(find . -name "DinverCore" | tail -n 1) || exit 2
pwd
dpversion B  || exit 2
cd $OLD_DIR || exit 2
################## DinverGui
[detail]                        src/DinverGui.cpp:  version-1.0.0	not modified
[detail]                src/ParamMinMaxWidget.cpp:  version-1.0.0	not modified
[detail]                 src/ParamSpaceEditor.cpp:  version-1.0.0	not modified
[detail]                  src/ParamMinMaxWidget.h:  version-1.0.0	not modified
[detail]                   src/ParamSpaceEditor.h:  version-1.0.0	not modified
[detail]                 src/ParamMinMaxWidget.ui:  version-1.0.0	not modified
[detail]                  src/ParamSpaceEditor.ui:  version-1.0.0	not modified
# No modification since last version
################## DinverDCCore
[detail]                   src/AutocorrTarget.cpp:  version-2.3.0	modified out of comments
[detail] --- src/AutocorrTarget.cpp-version-2.3.0-stripped	2025-09-28 04:01:11.675535241 +0200
[detail] +++ src/AutocorrTarget.cpp-HEAD-stripped	2025-09-28 04:01:11.679535261 +0200
[detail] @@ -18,7 +18,7 @@
[detail]    
[detail]    
[detail]    
[detail] -  setMisfitType(Misfit::L2_NormalizedBySigmaOnly);
[detail] +  setMisfitType(MisfitType::L2_NormalizedBySigmaOnly);
[detail]  }
[detail]  
[detail]  
[detail] @@ -55,7 +55,7 @@
[detail]  {
[detail]    Q_UNUSED(context)
[detail]    
[detail] -  setMisfitType(Misfit::L2_NormalizedBySigmaOnly);
[detail] +  setMisfitType(MisfitType::L2_NormalizedBySigmaOnly);
[detail]    return true;
[detail]  }
[detail]  
[detail]             src/BottomValueCondition.cpp:  version-2.3.0	not modified
[detail]                      src/DCModelInfo.cpp:  version-2.3.0	not modified
[detail]                    src/DCReportBlock.cpp:  version-2.3.0	not modified
[detail]                     src/DinverDCCore.cpp:  version-2.3.0	not modified
[detail]                 src/DispersionTarget.cpp:  version-2.3.0	modified out of comments
[detail] --- src/DispersionTarget.cpp-version-2.3.0-stripped	2025-09-28 04:01:11.775535725 +0200
[detail] +++ src/DispersionTarget.cpp-HEAD-stripped	2025-09-28 04:01:11.779535743 +0200
[detail] @@ -14,13 +14,13 @@
[detail]    {
[detail]      TRACE;
[detail]      
[detail] -    setMisfitType(Misfit::L2_LogNormalized);
[detail] +    setMisfitType(MisfitType::L2_LogNormalized);
[detail]    }
[detail]  
[detail]    bool DispersionTarget::xml_polish(XML_POLISH_ARGS)
[detail]    {
[detail]      Q_UNUSED(context)
[detail] -    if(misfitType()==Misfit::L2_Normalized) { 
[detail] +    if(misfitType().typeId()==MisfitType::L2_Normalized) { 
[detail]        
[detail]        for(QList<ModalCurve>::iterator it=curves().begin(); it!=curves().end(); ++it) {
[detail]          ModalCurve& c=*it;
[detail] @@ -30,7 +30,7 @@
[detail]          }
[detail]        }
[detail]        
[detail] -      setMisfitType(Misfit::L2_LogNormalized);
[detail] +      setMisfitType(MisfitType::L2_LogNormalized);
[detail]      }
[detail]      return true;
[detail]    }
[detail]           src/EllipticityCurveTarget.cpp:  version-2.3.0	no last version available
[detail]            src/EllipticityPeakTarget.cpp:  version-2.3.0	modified out of comments
[detail] --- src/EllipticityPeakTarget.cpp-version-2.3.0-stripped	2025-09-28 04:01:11.799535841 +0200
[detail] +++ src/EllipticityPeakTarget.cpp-HEAD-stripped	2025-09-28 04:01:11.803535860 +0200
[detail] @@ -32,6 +32,7 @@
[detail]      TRACE;
[detail]      Q_UNUSED(context)
[detail]      writeProperty(s, "minimumAmplitude", _minimumAmplitude);
[detail] +    Target::xml_writeProperties(s, context);
[detail]    }
[detail]  
[detail]    void EllipticityPeakTarget::xml_writeChildren(XML_WRITECHILDREN_ARGS) const
[detail]                          src/Forward.cpp:  version-2.3.0	not modified
[detail]                  src/GradientProfile.cpp:  version-2.3.0	not modified
[detail]                  src/GroundParameter.cpp:  version-2.3.0	not modified
[detail]                    src/LinearProfile.cpp:  version-2.3.0	not modified
[detail]            src/MagnetoTelluricTarget.cpp:  version-2.3.0	not modified
[detail]                 src/ModalCurveTarget.cpp:  version-2.3.0	not modified
[detail]               src/ModalStorageReader.cpp:  version-2.3.0	not modified
[detail]               src/Param3DGroundModel.cpp:  version-2.3.0	not modified
[detail]                 src/ParamGroundModel.cpp:  version-2.3.0	modified out of comments
[detail] --- src/ParamGroundModel.cpp-version-2.3.0-stripped	2025-09-28 04:01:11.955536595 +0200
[detail] +++ src/ParamGroundModel.cpp-HEAD-stripped	2025-09-28 04:01:11.955536595 +0200
[detail] @@ -48,8 +48,8 @@
[detail]    _profiles.append(rho);
[detail]  
[detail]    double d=0.0, v;
[detail] -  for(int i=0; i<m->layerCount();i++) {
[detail] -    if(i<m->layerCount()-1) d+=m->h(i);
[detail] +  for(int i=0; i<m->numberOfLayers();i++) {
[detail] +    if(i<m->numberOfLayers()-1) d+=m->h(i);
[detail]      v=1.0/m->slowP(i);
[detail]      vp->addLayer(new ParamLayer(vp, i, v, v, vs) );
[detail]      v=1.0/m->slowS(i);
[detail]                       src/ParamLayer.cpp:  version-2.3.0	not modified
[detail]                     src/ParamProfile.cpp:  version-2.3.0	not modified
[detail]                 src/PoissonCondition.cpp:  version-2.3.0	not modified
[detail]                  src/PowerLawProfile.cpp:  version-2.3.0	not modified
[detail]                 src/RefractionTarget.cpp:  version-2.3.0	not modified
[detail]                           src/Target.cpp:  version-2.3.0	modified out of comments
[detail] --- src/Target.cpp-version-2.3.0-stripped	2025-09-28 04:01:12.051537059 +0200
[detail] +++ src/Target.cpp-HEAD-stripped	2025-09-28 04:01:12.055537077 +0200
[detail] @@ -14,7 +14,7 @@
[detail]    _selected=true;
[detail]    _misfitWeight=1.0;
[detail]    _minimumMisfit=0.0;
[detail] -  _misfitType=Misfit::L2_Normalized;
[detail] +  _misfitType=MisfitType::L2_Normalized;
[detail]  }
[detail]  
[detail]  
[detail] @@ -35,7 +35,7 @@
[detail]    writeProperty(s, "selected", _selected);
[detail]    writeProperty(s, "misfitWeight", _misfitWeight);
[detail]    writeProperty(s, "minimumMisfit", _minimumMisfit);
[detail] -  writeProperty(s, "misfitType", Misfit::convertType(_misfitType));
[detail] +  writeProperty(s, "misfitType", MisfitType::convertType(_misfitType.typeId()));
[detail]  }
[detail]  
[detail]  XMLMember Target::xml_member(XML_MEMBER_ARGS)
[detail] @@ -61,7 +61,7 @@
[detail]    switch(memberID) {
[detail]    case 0: _misfitWeight=content.toDouble(ok); return ok;
[detail]    case 1: _minimumMisfit=content.toDouble(ok); return ok;
[detail] -  case 2: _misfitType=Misfit::convertType(content.toStringView(), ok); return ok;
[detail] +  case 2: _misfitType=MisfitType::convertType(content.toStringView(), ok); return ok;
[detail]    case 3: _selected=content.toBool(ok); return ok;
[detail]    default: return false;
[detail]    }
[detail]                       src/TargetList.cpp:  version-2.3.0	modified out of comments
[detail] --- src/TargetList.cpp-version-2.3.0-stripped	2025-09-28 04:01:12.071537155 +0200
[detail] +++ src/TargetList.cpp-HEAD-stripped	2025-09-28 04:01:12.075537175 +0200
[detail] @@ -117,7 +117,7 @@
[detail]    }
[detail]  }
[detail]  
[detail] -void TargetList::setMisfitType(Misfit::Type t)
[detail] +void TargetList::setMisfitType(MisfitType::Type t)
[detail]  {
[detail]    TRACE;
[detail]    _dispersionTarget.setMisfitType(t);
[detail] @@ -152,6 +152,7 @@
[detail]      if(!_dispersionFactory) {
[detail]        _dispersionFactory=new DispersionFactory;
[detail]      }
[detail] +    _ellipticityCurveTarget.setMisfitType();
[detail]    }
[detail]    if(_autocorrTarget.selected() && !_autocorrTarget.curves().isEmpty()) {
[detail]      _autocorrFactory=new AutocorrFactory(_autocorrTarget.curves().rings());
[detail] @@ -333,14 +334,14 @@
[detail]    }
[detail]  
[detail]    
[detail] -  if(_dispersionTarget.misfitType()!=Misfit::Determinant &&
[detail] +  if(_dispersionTarget.misfitType().typeId()!=MisfitType::Determinant &&
[detail]       !_dispersionFactory->calculate(surfModel, _ellipticityFactory)) {
[detail]      ok=false;
[detail]      return;
[detail]    }
[detail]  
[detail]    if(_dispersionTarget.selected() && !_dispersionTarget.curves().isEmpty()) {
[detail] -    if(_dispersionTarget.misfitType()==Misfit::Determinant) {
[detail] +    if(_dispersionTarget.misfitType().typeId()==MisfitType::Determinant) {
[detail]        individualMisfit=determinantMisfit(_dispersionTarget.curves(), surfModel);
[detail]      } else {
[detail]        individualMisfit=curveMisfit(_dispersionTarget.curves(), *_dispersionFactory, _dispersionTarget, nDimensions);
[detail] @@ -406,7 +407,7 @@
[detail]    TRACE;
[detail]    double individualMisfit;
[detail]    if(_refractionVpTarget.selected() && !_refractionVpTarget.curves().isEmpty()) {
[detail] -    RefractionDippingModel m(surfModel->layerCount());
[detail] +    RefractionDippingModel m(surfModel->numberOfLayers());
[detail]      m.fromSeismic1DModel( *surfModel, pitch, Seismic1DModel::P);
[detail]      if(!_refractionVpFactory->calculate(&m)) {
[detail]        ok=false;
[detail] @@ -421,7 +422,7 @@
[detail]      totalWeight+=_refractionVpTarget.misfitWeight();
[detail]    }
[detail]    if(_refractionVsTarget.selected() && !_refractionVsTarget.curves().isEmpty()) {
[detail] -    RefractionDippingModel m(surfModel->layerCount());
[detail] +    RefractionDippingModel m(surfModel->numberOfLayers());
[detail]      m.fromSeismic1DModel( *surfModel, pitch, Seismic1DModel::S);
[detail]      if( !_refractionVsFactory->calculate(&m) ) {
[detail]        ok=false;
[detail] @@ -504,32 +505,33 @@
[detail]      }
[detail]    }
[detail]    if(nValues>0) {
[detail] -    switch(target.misfitType()) {
[detail] -    case Misfit::L1:
[detail] -    case Misfit::L1_Normalized:
[detail] -    case Misfit::L1_LogNormalized:
[detail] -    case Misfit::L1_NormalizedBySigmaOnly:
[detail] +    switch(target.misfitType().typeId()) {
[detail] +    case MisfitType::L1:
[detail] +    case MisfitType::L1_Normalized:
[detail] +    case MisfitType::L1_LogNormalized:
[detail] +    case MisfitType::L1_NormalizedBySigmaOnly:
[detail]        rms_val/=nValues;
[detail]        break;
[detail] -    case Misfit::RMS:
[detail] +    case MisfitType::RMS:
[detail]        rms_val=sqrt(rms_val/nValues);
[detail]        break;
[detail] -    case Misfit::L2:
[detail] -    case Misfit::L2_Normalized:
[detail] -    case Misfit::L2_Inverse:
[detail] -    case Misfit::L2_LogNormalized:
[detail] -    case Misfit::L2_NormalizedBySigmaOnly:
[detail] +    case MisfitType::L2:
[detail] +    case MisfitType::L2_Normalized:
[detail] +    case MisfitType::L2_Inverse:
[detail] +    case MisfitType::L2_LogNormalized:
[detail] +    case MisfitType::L2_NormalizedBySigmaOnly:
[detail] +    case MisfitType::L2_PeriodicNormalized:
[detail]        rms_val=sqrt(rms_val/nValues);
[detail]        break;
[detail] -    case Misfit::Akaike:
[detail] +    case MisfitType::Akaike:
[detail]        rms_val=nValues*log(sqrt(rms_val))+2.0*nDimensions;
[detail]        break;
[detail] -    case Misfit::AkaikeFewSamples:
[detail] +    case MisfitType::AkaikeFewSamples:
[detail]        rms_val=nValues*log(sqrt(rms_val))
[detail]                  +2.0*nDimensions+(2.0*nDimensions*(nDimensions+1.0))/(nValues-nDimensions-1.0);
[detail]        break;
[detail] -    case Misfit::Determinant:
[detail] -    case Misfit::TypeCount:
[detail] +    case MisfitType::Determinant:
[detail] +    case MisfitType::TypeCount:
[detail]        ASSERT(false);
[detail]      }
[detail]      
[detail] @@ -554,32 +556,33 @@
[detail]      rms_val+=it->misfit(nValues, nData, f, target.misfitType(), target.minimumMisfit());
[detail]    }
[detail]    if(nValues>0) {
[detail] -    switch(target.misfitType()) {
[detail] -    case Misfit::L1:
[detail] -    case Misfit::L1_Normalized:
[detail] -    case Misfit::L1_LogNormalized:
[detail] -    case Misfit::L1_NormalizedBySigmaOnly:
[detail] +    switch(target.misfitType().typeId()) {
[detail] +    case MisfitType::L1:
[detail] +    case MisfitType::L1_Normalized:
[detail] +    case MisfitType::L1_LogNormalized:
[detail] +    case MisfitType::L1_NormalizedBySigmaOnly:
[detail]        rms_val/=nValues;
[detail]        break;
[detail] -    case Misfit::RMS:
[detail] +    case MisfitType::RMS:
[detail]        rms_val=sqrt(rms_val/nValues);
[detail]        break;
[detail] -    case Misfit::L2:
[detail] -    case Misfit::L2_Normalized:
[detail] -    case Misfit::L2_Inverse:
[detail] -    case Misfit::L2_LogNormalized:
[detail] -    case Misfit::L2_NormalizedBySigmaOnly:
[detail] +    case MisfitType::L2:
[detail] +    case MisfitType::L2_Normalized:
[detail] +    case MisfitType::L2_Inverse:
[detail] +    case MisfitType::L2_LogNormalized:
[detail] +    case MisfitType::L2_NormalizedBySigmaOnly:
[detail] +    case MisfitType::L2_PeriodicNormalized:
[detail]        rms_val=sqrt(rms_val);
[detail]        break;
[detail] -    case Misfit::Akaike:
[detail] +    case MisfitType::Akaike:
[detail]        rms_val=nValues*log10(sqrt(rms_val))+2.0*nDimensions;
[detail]        break;
[detail] -    case Misfit::AkaikeFewSamples:
[detail] +    case MisfitType::AkaikeFewSamples:
[detail]        rms_val=nValues*log10(sqrt(rms_val))
[detail]                  +2.0*nDimensions+(2.0*nDimensions*(nDimensions+1.0))/(nValues-nDimensions-1.0);
[detail]        break;
[detail] -    case Misfit::Determinant:
[detail] -    case Misfit::TypeCount:
[detail] +    case MisfitType::Determinant:
[detail] +    case MisfitType::TypeCount:
[detail]        ASSERT(false);
[detail]      }
[detail]      
[detail] @@ -604,32 +607,33 @@
[detail]      rms_val+=it->misfit(nValues, nData, f, target.misfitType(), target.minimumMisfit());
[detail]    }
[detail]    if(nValues>0) {
[detail] -    switch(target.misfitType()) {
[detail] -    case Misfit::L1:
[detail] -    case Misfit::L1_Normalized:
[detail] -    case Misfit::L1_LogNormalized:
[detail] -    case Misfit::L1_NormalizedBySigmaOnly:
[detail] +    switch(target.misfitType().typeId()) {
[detail] +    case MisfitType::L1:
[detail] +    case MisfitType::L1_Normalized:
[detail] +    case MisfitType::L1_LogNormalized:
[detail] +    case MisfitType::L1_NormalizedBySigmaOnly:
[detail]        rms_val/=nValues;
[detail]        break;
[detail] -    case Misfit::RMS:
[detail] +    case MisfitType::RMS:
[detail]        rms_val=sqrt(rms_val/nValues);
[detail]        break;
[detail] -    case Misfit::L2:
[detail] -    case Misfit::L2_Normalized:
[detail] -    case Misfit::L2_Inverse:
[detail] -    case Misfit::L2_LogNormalized:
[detail] -    case Misfit::L2_NormalizedBySigmaOnly:
[detail] +    case MisfitType::L2:
[detail] +    case MisfitType::L2_Normalized:
[detail] +    case MisfitType::L2_Inverse:
[detail] +    case MisfitType::L2_LogNormalized:
[detail] +    case MisfitType::L2_NormalizedBySigmaOnly:
[detail] +    case MisfitType::L2_PeriodicNormalized:
[detail]        rms_val=sqrt(rms_val);
[detail]        break;
[detail] -    case Misfit::Akaike:
[detail] +    case MisfitType::Akaike:
[detail]        rms_val=nValues * log10(sqrt( rms_val)) + 2.0*nDimensions;
[detail]        break;
[detail] -    case Misfit::AkaikeFewSamples:
[detail] +    case MisfitType::AkaikeFewSamples:
[detail]        rms_val=nValues * log10(sqrt( rms_val))
[detail]                  +2.0*nDimensions+(2.0*nDimensions*(nDimensions+1.0))/(nValues-nDimensions-1.0);
[detail]        break;
[detail] -    case Misfit::Determinant:
[detail] -    case Misfit::TypeCount:
[detail] +    case MisfitType::Determinant:
[detail] +    case MisfitType::TypeCount:
[detail]        ASSERT(false);
[detail]      }
[detail]      
[detail] @@ -686,26 +690,10 @@
[detail]    TRACE;
[detail]    Q_UNUSED(context)
[detail]    static const QString attName("type");
[detail] -  if(tag=="DispersionTarget") {
[detail] +  if(tag==DispersionTarget::xmlDispersionTargetTag) {
[detail]      return XMLMember(&_dispersionTarget);
[detail] -  } else if(tag==ModalCurveTarget::xmlModalCurveTargetTag) {
[detail] -    XMLRestoreAttributeIterator it=attributes.find(attName);
[detail] -    if(it!=attributes.end()) {
[detail] -      if(it.value()=="ellipticity") {
[detail] +  } else if(tag==EllipticityCurveTarget::xmlEllipticityCurveTargetTag) {
[detail]          return XMLMember(&_ellipticityCurveTarget);
[detail] -      } else if(it.value()=="dispersion") {  
[detail] -                                             
[detail] -        return XMLMember(&_dispersionTarget);
[detail] -      } else {
[detail] -        App::log(tr("Wrong type of modal curve target: %1\n").arg(it.value().toStringView()));
[detail] -        return XMLMember(XMLMember::Unknown);
[detail] -      }
[detail] -    } else {
[detail] -      App::log(tr("No type defined for modal curve target\n") );
[detail] -      return XMLMember(XMLMember::Unknown);
[detail] -    }
[detail] -  } else if(tag==AutocorrTarget::xmlAutocorrTargetTag) {
[detail] -    return XMLMember(&_autocorrTarget);
[detail]    } else if(tag==EllipticityPeakTarget::xmlEllipticityPeakTargetTag ||
[detail]              tag=="ValueTarget") {                               
[detail]      XMLRestoreAttributeIterator it=attributes.find(attName);
[detail] @@ -735,6 +723,24 @@
[detail]        App::log(tr("No type defined for refraction target\n") );
[detail]        return XMLMember(XMLMember::Unknown);
[detail]      }
[detail] +  } else if(tag==ModalCurveTarget::xmlModalCurveTargetTag) {
[detail] +    XMLRestoreAttributeIterator it=attributes.find(attName);
[detail] +    if(it!=attributes.end()) {
[detail] +      if(it.value()=="ellipticity") {        
[detail] +        return XMLMember(&_ellipticityCurveTarget);
[detail] +      } else if(it.value()=="dispersion") {  
[detail] +                                             
[detail] +        return XMLMember(&_dispersionTarget);
[detail] +      } else {
[detail] +        App::log(tr("Wrong type of modal curve target: %1\n").arg(it.value().toStringView()));
[detail] +        return XMLMember(XMLMember::Unknown);
[detail] +      }
[detail] +    } else {
[detail] +      App::log(tr("No type defined for modal curve target\n") );
[detail] +      return XMLMember(XMLMember::Unknown);
[detail] +    }
[detail] +  } else if(tag==AutocorrTarget::xmlAutocorrTargetTag) {
[detail] +    return XMLMember(&_autocorrTarget);
[detail]    } else if(tag==MagnetoTelluricTarget::xmlMagnetoTelluricTargetTag) {
[detail]      return XMLMember(&_magnetoTelluricTarget);
[detail]    
[detail] @@ -836,12 +842,12 @@
[detail]    case 10: _ellipticityPeakTarget.setMinimumMisfit(content.toDouble(ok)); return ok; 
[detail]    case 11: _refractionVpTarget.setMinimumMisfit(content.toDouble(ok)); return ok; 
[detail]    case 12: _refractionVsTarget.setMinimumMisfit(content.toDouble(ok)); return ok; 
[detail] -  case 13: _dispersionTarget.setMisfitType(Misfit::convertType(content.toStringView(), ok)); return ok; 
[detail] -  case 14: _autocorrTarget.setMisfitType(Misfit::convertType(content.toStringView(), ok)); return ok; 
[detail] -  case 15: _ellipticityCurveTarget.setMisfitType(Misfit::convertType(content.toStringView(), ok)); return ok; 
[detail] -  case 16: _ellipticityPeakTarget.setMisfitType(Misfit::convertType(content.toStringView(), ok)); return ok; 
[detail] -  case 17: _refractionVpTarget.setMisfitType(Misfit::convertType(content.toStringView(), ok)); return ok; 
[detail] -  case 18: _refractionVsTarget.setMisfitType(Misfit::convertType(content.toStringView(), ok)); return ok; 
[detail] +  case 13: _dispersionTarget.setMisfitType(MisfitType::convertType(content.toStringView(), ok)); return ok; 
[detail] +  case 14: _autocorrTarget.setMisfitType(MisfitType::convertType(content.toStringView(), ok)); return ok; 
[detail] +  case 15: _ellipticityCurveTarget.setMisfitType(MisfitType::convertType(content.toStringView(), ok)); return ok; 
[detail] +  case 16: _ellipticityPeakTarget.setMisfitType(MisfitType::convertType(content.toStringView(), ok)); return ok; 
[detail] +  case 17: _refractionVpTarget.setMisfitType(MisfitType::convertType(content.toStringView(), ok)); return ok; 
[detail] +  case 18: _refractionVsTarget.setMisfitType(MisfitType::convertType(content.toStringView(), ok)); return ok; 
[detail]    default: return false;
[detail]    }
[detail]  }
[detail] @@ -898,8 +904,8 @@
[detail]                                      _rho->resampledProfile().values(),
[detail]                                      &_nu->minResampledProfile().values(),
[detail]                                      &_nu->maxResampledProfile().values());
[detail] -  double maxDepth=m1.depth(m1.layerCount()-1);
[detail] -  double maxDepth2=m2->depth(m2->layerCount()-1);
[detail] +  double maxDepth=m1.depth(m1.numberOfLayers()-1);
[detail] +  double maxDepth2=m2->depth(m2->numberOfLayers()-1);
[detail]    if(maxDepth2>maxDepth) {
[detail]      maxDepth=maxDepth2;
[detail]    }
[detail]                     src/TargetList2D.cpp:  version-2.3.0	not modified
[detail]                   src/UniformProfile.cpp:  version-2.3.0	not modified
[detail]                     src/AutocorrTarget.h:  version-2.3.0	not modified
[detail]               src/BottomValueCondition.h:  version-2.3.0	not modified
[detail]                        src/DCModelInfo.h:  version-2.3.0	not modified
[detail]                      src/DCReportBlock.h:  version-2.3.0	not modified
[detail]                   src/DispersionTarget.h:  version-2.3.0	not modified
[detail]             src/EllipticityCurveTarget.h:  version-2.3.0	no last version available
[detail]              src/EllipticityPeakTarget.h:  version-2.3.0	not modified
[detail]                            src/Forward.h:  version-2.3.0	not modified
[detail]                    src/GradientProfile.h:  version-2.3.0	not modified
[detail]                    src/GroundParameter.h:  version-2.3.0	not modified
[detail]                      src/LinearProfile.h:  version-2.3.0	not modified
[detail]              src/MagnetoTelluricTarget.h:  version-2.3.0	not modified
[detail]                   src/ModalCurveTarget.h:  version-2.3.0	not modified
[detail]                 src/ModalStorageReader.h:  version-2.3.0	not modified
[detail]                 src/Param3DGroundModel.h:  version-2.3.0	not modified
[detail]                   src/ParamGroundModel.h:  version-2.3.0	not modified
[detail]                         src/ParamLayer.h:  version-2.3.0	not modified
[detail]                       src/ParamProfile.h:  version-2.3.0	not modified
[detail]                   src/PoissonCondition.h:  version-2.3.0	not modified
[detail]                    src/PowerLawProfile.h:  version-2.3.0	not modified
[detail]                   src/RefractionTarget.h:  version-2.3.0	not modified
[detail]                             src/Target.h:  version-2.3.0	modified out of comments
[detail] --- src/Target.h-version-2.3.0-stripped	2025-09-28 04:01:12.443538953 +0200
[detail] +++ src/Target.h-HEAD-stripped	2025-09-28 04:01:12.447538973 +0200
[detail] @@ -24,8 +24,8 @@
[detail]    double minimumMisfit() const {return _minimumMisfit;}
[detail]    void setMinimumMisfit(double m) {_minimumMisfit=m;}
[detail]  
[detail] -  Misfit::Type misfitType() const {return _misfitType;}
[detail] -  void setMisfitType(Misfit::Type t) {_misfitType=t;}
[detail] +  const MisfitType& misfitType() const {return _misfitType;}
[detail] +  void setMisfitType(const MisfitType& t) {_misfitType=t;}
[detail]  protected:
[detail]    virtual void xml_writeProperties(XML_WRITEPROPERTIES_ARGS) const;
[detail]    virtual bool xml_setProperty(XML_SETPROPERTY_ARGS);
[detail] @@ -34,7 +34,7 @@
[detail]    bool _selected;
[detail]    double _misfitWeight;
[detail]    double _minimumMisfit;
[detail] -  Misfit::Type _misfitType;
[detail] +  MisfitType _misfitType;
[detail]  };
[detail]  
[detail]  } 
[detail]                         src/TargetList.h:  version-2.3.0	modified out of comments
[detail] --- src/TargetList.h-version-2.3.0-stripped	2025-09-28 04:01:12.467539069 +0200
[detail] +++ src/TargetList.h-HEAD-stripped	2025-09-28 04:01:12.471539088 +0200
[detail] @@ -12,6 +12,7 @@
[detail]  #include "ModalCurveTarget.h"
[detail]  #include "DispersionTarget.h"
[detail]  #include "AutocorrTarget.h"
[detail] +#include "EllipticityCurveTarget.h"
[detail]  #include "EllipticityPeakTarget.h"
[detail]  #include "RefractionTarget.h"
[detail]  #include "MagnetoTelluricTarget.h"
[detail] @@ -58,8 +59,8 @@
[detail]    AutocorrTarget& autocorrTarget() {return _autocorrTarget;}
[detail]    const AutocorrTarget& autocorrTarget() const {return _autocorrTarget;}
[detail]  
[detail] -  ModalCurveTarget& ellipticityCurveTarget() {return _ellipticityCurveTarget;}
[detail] -  const ModalCurveTarget& ellipticityCurveTarget() const {return _ellipticityCurveTarget;}
[detail] +  EllipticityCurveTarget& ellipticityCurveTarget() {return _ellipticityCurveTarget;}
[detail] +  const EllipticityCurveTarget& ellipticityCurveTarget() const {return _ellipticityCurveTarget;}
[detail]  
[detail]    EllipticityPeakTarget& ellipticityPeakTarget() {return _ellipticityPeakTarget;}
[detail]    const EllipticityPeakTarget& ellipticityPeakTarget() const {return _ellipticityPeakTarget;}
[detail] @@ -76,7 +77,7 @@
[detail]    const Point& position() const {return _position;}
[detail]    void setPosition(const Point& p) {_position=p;}
[detail]  
[detail] -  void setMisfitType(Misfit::Type t);
[detail] +  void setMisfitType(MisfitType::Type t);
[detail]  
[detail]    bool isEmpty() const;
[detail]    void validateTargets();
[detail] @@ -109,7 +110,7 @@
[detail]    
[detail]    DispersionTarget _dispersionTarget;
[detail]    AutocorrTarget _autocorrTarget;
[detail] -  ModalCurveTarget _ellipticityCurveTarget;
[detail] +  EllipticityCurveTarget _ellipticityCurveTarget;
[detail]    EllipticityPeakTarget _ellipticityPeakTarget;
[detail]    RefractionTarget _refractionVpTarget;
[detail]    RefractionTarget _refractionVsTarget;
[detail]                       src/TargetList2D.h:  version-2.3.0	not modified
[detail]                     src/UniformProfile.h:  version-2.3.0	not modified
[summary] Total differences: 445 lines
[summary] Modification level is B
OLD_DIR=$(pwd)
echo "DinverDCCore"
cd $(find . -name "DinverDCCore" | tail -n 1) || exit 2
pwd
dpversion B  || exit 2
cd $OLD_DIR || exit 2
################## DinverDCGui
[detail]                   src/AutocorrViewer.cpp:  version-1.3.0	not modified
[detail]                    src/DCModelViewer.cpp:  version-1.3.0	not modified
[detail]                      src/DinverDCGui.cpp:  version-1.3.0	not modified
[detail]                 src/DispersionViewer.cpp:  version-1.3.0	not modified
[detail]                src/EllipticityViewer.cpp:  version-1.3.0	not modified
[detail]                src/GroundModelViewer.cpp:  version-1.3.0	not modified
[detail]            src/MagnetoTelluricViewer.cpp:  version-1.3.0	not modified
[detail]                 src/RefractionViewer.cpp:  version-1.3.0	not modified
[detail]                      src/ViewerParam.cpp:  version-1.3.0	not modified
[detail]                     src/AutocorrViewer.h:  version-1.3.0	not modified
[detail]                      src/DCModelViewer.h:  version-1.3.0	not modified
[detail]                   src/DispersionViewer.h:  version-1.3.0	not modified
[detail]                  src/EllipticityViewer.h:  version-1.3.0	not modified
[detail]                  src/GroundModelViewer.h:  version-1.3.0	not modified
[detail]              src/MagnetoTelluricViewer.h:  version-1.3.0	not modified
[detail]                   src/RefractionViewer.h:  version-1.3.0	not modified
[detail]                        src/ViewerParam.h:  version-1.3.0	not modified
[detail]                       src/ViewerParam.ui:  version-1.3.0	not modified
# No modification since last version
################## QGpCoreStat
[detail]      src/GaussianMixtureDistribution.cpp:  version-1.3.0	modified out of comments
[detail] --- src/GaussianMixtureDistribution.cpp-version-1.3.0-stripped	2025-09-28 04:01:12.875541040 +0200
[detail] +++ src/GaussianMixtureDistribution.cpp-HEAD-stripped	2025-09-28 04:01:12.879541060 +0200
[detail] @@ -243,7 +243,7 @@
[detail]            PrivateVector<double> v(d2.mean());
[detail]            v-=d1.mean();
[detail]            v.abs();
[detail] -          PrivateVector<double> s(v.count());
[detail] +          PrivateVector<double> s(v.size());
[detail]            d1.stddev(s);
[detail]            s*=stddevFactor;
[detail]            if(s.hasElementGreaterThan(v) && m1<value(d2.mean())) {
[detail] @@ -349,7 +349,7 @@
[detail]      for(int im=0; im<_modeCount; im++) {
[detail]        t+=formatMode.arg(im).arg(_weights[im]);
[detail]        const MultivariateNormalDistribution& d=_modes[im];
[detail] -      for(int id=0; id<d.count(); id++) {
[detail] +      for(int id=0; id<d.size(); id++) {
[detail]          t+=formatDim.arg(d.mean(id), 0, 'g', 6).arg(d.stddev(id), 0, 'g', 6);
[detail]          if(varianceMatrix) {
[detail]            t+=d.variance().toUserString();
[detail]                src/GaussianMixtureEM.cpp:  version-1.3.0	modified out of comments
[detail] --- src/GaussianMixtureEM.cpp-version-1.3.0-stripped	2025-09-28 04:01:12.895541137 +0200
[detail] +++ src/GaussianMixtureEM.cpp-HEAD-stripped	2025-09-28 04:01:12.899541156 +0200
[detail] @@ -89,7 +89,7 @@
[detail]            x0.at(iDim, 0)=pos[iDim]-muSum[iDim];
[detail]          }
[detail]          x0*=x0.transposed();
[detail] -        x0*=h[iBucket]*sampleCount;
[detail] +        x0*=h[iBucket]*static_cast<double>(sampleCount);
[detail]          sigmaSum+=x0;
[detail]        }
[detail]        sigmaSum*=muNormFactor;
[detail]        src/GaussianMixtureLikelihood.cpp:  version-1.3.0	not modified
[detail]        src/GaussianMixtureParameters.cpp:  version-1.3.0	not modified
[detail]                        src/Histogram.cpp:  version-1.3.0	not modified
[detail]                      src/Histogram2D.cpp:  version-1.3.0	not modified
[detail]               src/HistogramInversion.cpp:  version-1.3.0	not modified
[detail]                  src/HistogramReader.cpp:  version-1.3.0	modified out of comments
[detail] --- src/HistogramReader.cpp-version-1.3.0-stripped	2025-09-28 04:01:12.995541620 +0200
[detail] +++ src/HistogramReader.cpp-HEAD-stripped	2025-09-28 04:01:12.999541640 +0200
[detail] @@ -1242,27 +1242,8 @@
[detail]      App::log(tr("Old slowness max file (before 2017)\n") );
[detail]    }
[detail]  
[detail] -  Curve<Point2D> HistogramReader::misfit(bool& ok) const
[detail] +  QList<Curve<Point2D>> HistogramReader::readCurves() const
[detail]    {
[detail] -    Curve<Point2D> m;
[detail] -    if(!_xSampling) {
[detail] -      App::log(tr("No sampling for X defined\n"));
[detail] -      ok=false;
[detail] -      return m;
[detail] -    }
[detail] -    for(int i=0; i<_xSampling->count(); i++) {
[detail] -      m.append(Point2D(_xSampling->value(i), 0.0));
[detail] -    }
[detail] -    if(_xSampling->scaleType()!=SamplingParameters::Log) {
[detail] -      App::log(tr("Only log sampling is accepted\n"));
[detail] -      ok=false;
[detail] -      return m;
[detail] -    }
[detail] -    if(_curveFileNames.isEmpty()) {
[detail] -      App::log(tr("No curves provided for misfit\n"));
[detail] -      ok=false;
[detail] -      return m;
[detail] -    }
[detail]      QStringList expandedFileNames=File::expand(_curveFileNames);
[detail]      QList<Curve<Point2D>> curves;
[detail]      for(QStringList::const_iterator it=expandedFileNames.begin(); it!=expandedFileNames.end(); it++) {
[detail] @@ -1282,9 +1263,38 @@
[detail]          }
[detail]        } else {
[detail]          App::log(tr("Cannot open file '%1'\n").arg(*it));
[detail] +        curves.clear();
[detail] +        return curves;
[detail] +      }
[detail] +    }
[detail] +    return curves;
[detail] +  }
[detail] +
[detail] +  Curve<Point2D> HistogramReader::misfit(bool& ok) const
[detail] +  {
[detail] +    Curve<Point2D> m;
[detail] +    if(!_xSampling) {
[detail] +      App::log(tr("No sampling for X defined\n"));
[detail] +      ok=false;
[detail] +      return m;
[detail] +    }
[detail] +    for(int i=0; i<_xSampling->count(); i++) {
[detail] +      m.append(Point2D(_xSampling->value(i), 0.0));
[detail] +    }
[detail] +    if(_xSampling->scaleType()!=SamplingParameters::Log) {
[detail] +      App::log(tr("Only log sampling is accepted\n"));
[detail]          ok=false;
[detail]          return m;
[detail]        }
[detail] +    if(_curveFileNames.isEmpty()) {
[detail] +      App::log(tr("No curves provided for misfit\n"));
[detail] +      ok=false;
[detail] +      return m;
[detail] +    }
[detail] +    QList<Curve<Point2D>> curves=readCurves();
[detail] +    if(curves.isEmpty()) {
[detail] +      ok=false;
[detail] +      return m;
[detail]      }
[detail]      int * hitCount=new int[m.count()];
[detail]      for(int i=m.count()-1; i>=0; i--) {
[detail] @@ -1322,11 +1332,13 @@
[detail]        double minDy=std::numeric_limits<double>::infinity();
[detail]        for(itc=curves.begin(); itc!=curves.end(); it++) {
[detail]          const Curve<Point2D>& c=*itc;
[detail] +        if(it->x()>=c.constAt(0).x() && it->x()<=c.constAt(c.count()-1).x()) {
[detail]          double dy=fabs(1.0-it->y()/c.interpole(it->x(), xSamp, ySamp).y());
[detail]          if(dy<minDy) {
[detail]            minDy=dy;
[detail]          }
[detail]        }
[detail] +      }
[detail]        int i=m.indexOf(it->x(), precision);
[detail]        Point2D& mp=m.constXAt(i);
[detail]        mp.setY(mp.y()+minDy*minDy);
[detail]            src/MultivariateHistogram.cpp:  version-1.3.0	modified out of comments
[detail] --- src/MultivariateHistogram.cpp-version-1.3.0-stripped	2025-09-28 04:01:13.015541717 +0200
[detail] +++ src/MultivariateHistogram.cpp-HEAD-stripped	2025-09-28 04:01:13.019541737 +0200
[detail] @@ -14,9 +14,9 @@
[detail]        _bucket(dimensionCount, nullptr)
[detail]    {
[detail]      ASSERT(dimensionCount>=1);
[detail] -    _samplings=new SamplingParameters[_bucket.count()];
[detail] -    _periodic=new bool[_bucket.count()];
[detail] -    _data=static_cast<int*>(allocateVector(sizeof(int)*(_bucket.count()+1)));
[detail] +    _samplings=new SamplingParameters[_bucket.size()];
[detail] +    _periodic=new bool[_bucket.size()];
[detail] +    _data=static_cast<int*>(allocateVector(sizeof(int)*(_bucket.size()+1)));
[detail]      _bucketCount2=1;
[detail]      _normalizationFactor=1.0;
[detail]    }
[detail] @@ -36,12 +36,12 @@
[detail]  
[detail]    void MultivariateHistogram::reallocate()
[detail]    {
[detail] -    _data=static_cast<int*>(reallocateVector(_data, sizeof(int)*(_bucket.count()+1)));
[detail] +    _data=static_cast<int*>(reallocateVector(_data, sizeof(int)*(_bucket.size()+1)));
[detail]    }
[detail]  
[detail]    void MultivariateHistogram::addSample(const Vector<double>& x)
[detail]    {
[detail] -    for(int i=_bucket.count()-1; i>=0; i--) {
[detail] +    for(int i=_bucket.size()-1; i>=0; i--) {
[detail]        _newBucket[i]=_samplings[i].index(x[i]);
[detail]      }
[detail]      bool matched=false;
[detail] @@ -50,7 +50,7 @@
[detail]        bucketValueAt(index)++;
[detail]      } else {
[detail]        add();
[detail] -      int n=_bucket.count()+1;
[detail] +      int n=_bucket.size()+1;
[detail]        memmove(_data+n*(index+1), _data+n*index,  sizeof(int)*n*(size()-1-index));
[detail]        memcpy(_data+n*index, _newBucket.values(), sizeof(int)*n);
[detail]        bucketValueAt(index)=1;
[detail] @@ -66,7 +66,7 @@
[detail]      for(int ib=0; ib<size(); ib++) {
[detail]        printf("%5i:", ib);
[detail]        const Vector<int>& b=bucketAt(ib);
[detail] -      for(int id=0; id<b.count(); id++) {
[detail] +      for(int id=0; id<b.size(); id++) {
[detail]          printf(" %5i", b[id]);
[detail]        }
[detail]        printf(" %5i\n", bucketValueAt(ib));
[detail] @@ -116,7 +116,7 @@
[detail]        _normalizationFactor+=bucketValueAt(i);
[detail]      }
[detail]      double bucketHyperVolume=1.0;
[detail] -    for(int i=_bucket.count()-1; i>=0; i--) {
[detail] +    for(int i=_bucket.size()-1; i>=0; i--) {
[detail]        bucketHyperVolume*=_samplings[i].step();
[detail]      }
[detail]      _normalizationFactor=1.0/(_normalizationFactor*bucketHyperVolume);
[detail] @@ -125,7 +125,7 @@
[detail]    double MultivariateHistogram::misfit(const GaussianMixtureDistribution& f) const
[detail]    {
[detail]      double m=0.0, d;
[detail] -    PrivateVector<double> pos(_bucket.count());
[detail] +    PrivateVector<double> pos(_bucket.size());
[detail]      for(int i=size()-1; i>=0; i--) {
[detail]        bucketPosition(i, pos);
[detail]        d=normalizedBucketValueAt(i)-f.value(pos);
[detail] @@ -143,8 +143,8 @@
[detail]        }
[detail]      }
[detail]      if(!toRemove.isEmpty()) {
[detail] -      int bucketSize=_bucket.count()+1;
[detail] -      int removeCount=toRemove.count()-1;
[detail] +      int bucketSize=_bucket.size()+1;
[detail] +      int removeCount=toRemove.size()-1;
[detail]        int index, moveSize;
[detail]        int offset=0;
[detail]        for(int i=0; i<removeCount; i++) {
[detail] @@ -165,7 +165,7 @@
[detail]  
[detail]    MultivariateStatistics * MultivariateHistogram::statistics() const
[detail]    {
[detail] -    int bucketSize=_bucket.count();
[detail] +    int bucketSize=_bucket.size();
[detail]      MultivariateStatistics * stat=new MultivariateStatistics(bucketSize);
[detail]      PrivateVector<double> pos(bucketSize);
[detail]      for(int ib=size()-1; ib>=0; ib--) {
[detail] @@ -184,7 +184,7 @@
[detail]      max.setValue(-std::numeric_limits<double>::infinity());
[detail]      for(int ib=size()-1; ib>=0; ib--) {
[detail]        const Vector<int>& b=bucketAt(ib);
[detail] -      for(int id=_bucket.count()-1; id>=0; id--) {
[detail] +      for(int id=_bucket.size()-1; id>=0; id--) {
[detail]          if(b[id]<min[id]) {
[detail]            min[id]=b[id];
[detail]          }
[detail] @@ -193,7 +193,7 @@
[detail]          }
[detail]        }
[detail]      }
[detail] -    for(int i=_bucket.count()-1; i>=0; i--) {
[detail] +    for(int i=_bucket.size()-1; i>=0; i--) {
[detail]        min[i]=_samplings[i].value(min[i]);
[detail]        max[i]=_samplings[i].value(max[i]);
[detail]      }
[detail]                      src/QGpCoreStat.cpp:  version-1.3.0	not modified
[detail]   src/SampleClassificationParameters.cpp:  version-1.3.0	not modified
[detail]                     src/SampleFilter.cpp:  version-1.3.0	not modified
[detail]        src/GaussianMixtureDistribution.h:  version-1.3.0	modified out of comments
[detail] --- src/GaussianMixtureDistribution.h-version-1.3.0-stripped	2025-09-28 04:01:13.079542026 +0200
[detail] +++ src/GaussianMixtureDistribution.h-HEAD-stripped	2025-09-28 04:01:13.079542026 +0200
[detail] @@ -20,7 +20,7 @@
[detail]      void operator=(const GaussianMixtureDistribution& o);
[detail]  
[detail]      int modeCount() const {return _modeCount;}
[detail] -    int dimensionCount() const {return _modes[0].count();}
[detail] +    int dimensionCount() const {return _modes[0].size();}
[detail]  
[detail]      void clearVariance();
[detail]      inline void setMode(int mode, int dim, double mean, double stddev);
[detail]                  src/GaussianMixtureEM.h:  version-1.3.0	not modified
[detail]          src/GaussianMixtureLikelihood.h:  version-1.3.0	not modified
[detail]          src/GaussianMixtureParameters.h:  version-1.3.0	not modified
[detail]                          src/Histogram.h:  version-1.3.0	not modified
[detail]                        src/Histogram2D.h:  version-1.3.0	not modified
[detail]                 src/HistogramInversion.h:  version-1.3.0	not modified
[detail]                    src/HistogramReader.h:  version-1.3.0	modified out of comments
[detail] --- src/HistogramReader.h-version-1.3.0-stripped	2025-09-28 04:01:13.187542549 +0200
[detail] +++ src/HistogramReader.h-HEAD-stripped	2025-09-28 04:01:13.191542567 +0200
[detail] @@ -70,6 +70,7 @@
[detail]      bool configureFKMaxFile(const QString& line);
[detail]      void configureSPACMaxFile();
[detail]      void configureCapMaxFile();
[detail] +    QList<Curve<Point2D>> readCurves() const;
[detail]  
[detail]      Action _action;
[detail]      struct ManualFlags {
[detail]              src/MultivariateHistogram.h:  version-1.3.0	modified out of comments
[detail] --- src/MultivariateHistogram.h-version-1.3.0-stripped	2025-09-28 04:01:13.207542645 +0200
[detail] +++ src/MultivariateHistogram.h-HEAD-stripped	2025-09-28 04:01:13.215542683 +0200
[detail] @@ -21,7 +21,7 @@
[detail]      void setSampling(int dim, const SamplingParameters& s, bool periodic=false);
[detail]      const SamplingParameters& sampling(int dim) const {return _samplings[dim];}
[detail]  
[detail] -    int dimensionCount() const {return _bucket.count();}
[detail] +    int dimensionCount() const {return _bucket.size();}
[detail]      int bucketCount() const {return size();}
[detail]      int sampleCount() const;
[detail]  
[detail] @@ -59,25 +59,25 @@
[detail]    inline void MultivariateHistogram::bucketPosition(int index, Vector<double>& pos) const
[detail]    {
[detail]      const Vector<int>& bucket=bucketAt(index);
[detail] -    for(int i=bucket.count()-1; i>=0; i--) {
[detail] +    for(int i=bucket.size()-1; i>=0; i--) {
[detail]        pos[i]=_samplings[i].value(bucket[i]);
[detail]      }
[detail]    }
[detail]  
[detail]    inline const Vector<int>& MultivariateHistogram::bucketAt(int index) const
[detail]    {
[detail] -    _bucket.setValues(_data+(_bucket.count()+1)*index);
[detail] +    _bucket.setValues(_data+(_bucket.size()+1)*index);
[detail]      return _bucket;
[detail]    }
[detail]  
[detail]    inline const int& MultivariateHistogram::bucketValueAt(int index) const
[detail]    {
[detail] -    return _data[(_bucket.count()+1)*index+_bucket.count()];
[detail] +    return _data[(_bucket.size()+1)*index+_bucket.size()];
[detail]    }
[detail]  
[detail]    inline int& MultivariateHistogram::bucketValueAt(int index)
[detail]    {
[detail] -    return _data[(_bucket.count()+1)*index+_bucket.count()];
[detail] +    return _data[(_bucket.size()+1)*index+_bucket.size()];
[detail]    }
[detail]  
[detail]    inline double MultivariateHistogram::normalizedBucketValueAt(int index) const
[detail]     src/SampleClassificationParameters.h:  version-1.3.0	not modified
[detail]                       src/SampleFilter.h:  version-1.3.0	not modified
[summary] Total differences: 281 lines
[summary] Modification level is B
OLD_DIR=$(pwd)
echo "QGpCoreStat"
cd $(find . -name "QGpCoreStat" | tail -n 1) || exit 2
pwd
dpversion B  || exit 2
cd $OLD_DIR || exit 2
################## QGpGuiStat
[detail]                  src/CategoryChooser.cpp:  version-0.0.0	not modified
[detail]                       src/QGpGuiStat.cpp:  version-0.0.0	not modified
[detail]             src/SampleClassification.cpp:  version-0.0.0	not modified
[detail]                    src/CategoryChooser.h:  version-0.0.0	not modified
[detail]               src/SampleClassification.h:  version-0.0.0	not modified
[detail]                   src/CategoryChooser.ui:  version-0.0.0	not modified
[detail]              src/SampleClassification.ui:  version-0.0.0	not modified
# No modification since last version
################## HVCore
[detail]                   src/AbstractHVTool.cpp:  version-1.2.0	modified out of comments
[detail] --- src/AbstractHVTool.cpp-version-1.2.0-stripped	2025-09-28 04:01:13.439543766 +0200
[detail] +++ src/AbstractHVTool.cpp-HEAD-stripped	2025-09-28 04:01:13.447543804 +0200
[detail] @@ -13,7 +13,6 @@
[detail]      : AbstractTool(parent)
[detail]    {
[detail]      TRACE;
[detail] -    setParameters(new HVParameters);
[detail]    }
[detail]  
[detail]    
[detail] @@ -195,7 +194,7 @@
[detail]    }
[detail]  
[detail]    
[detail] -  bool AbstractHVTool::addWindows(Signal * sig)
[detail] +  bool AbstractHVTool::addWindows(SignalSegment * sig)
[detail]    {
[detail]      TRACE;
[detail]      int n=_stations.count();
[detail]                  src/AbstractResults.cpp:  version-1.2.0	not modified
[detail]                  src/AbstractStation.cpp:  version-1.2.0	modified out of comments
[detail] --- src/AbstractStation.cpp-version-1.2.0-stripped	2025-09-28 04:01:13.483543979 +0200
[detail] +++ src/AbstractStation.cpp-HEAD-stripped	2025-09-28 04:01:13.487543999 +0200
[detail] @@ -30,13 +30,9 @@
[detail]    QString AbstractStation::shortFileName() const
[detail]    {
[detail]      TRACE;
[detail] -    Signal * sig=_signals->originalSignals()->firstValidSignal();
[detail] +    SignalSegment * sig=_signals->originalSignals()->firstValidSignal();
[detail]      if(sig) {
[detail] -      SignalFile * file=sig->file();
[detail] -      if(file)
[detail] -        return file->shortName();
[detail] -      else
[detail] -        return "### temporary signal ###";
[detail] +      return sig->displayFileShortName();
[detail]      } else {
[detail]        return "Error: empty station";
[detail]      }
[detail] @@ -59,7 +55,7 @@
[detail]      }
[detail]    }
[detail]  
[detail] -  void AbstractStation::initResults(int windowCount, const HVParameters& param)
[detail] +  void AbstractStation::initResults(int windowCount, const HVCoreParameters& param)
[detail]    {
[detail]      TRACE;
[detail]      int nResults=_results.count();
[detail] @@ -178,7 +174,7 @@
[detail]      emit windowsChanged();
[detail]    }
[detail]  
[detail] -  bool AbstractStation::save(QDir outputDir, const HVParameters& param)
[detail] +  bool AbstractStation::save(QDir outputDir, const HVCoreParameters& param)
[detail]    {
[detail]      TRACE;
[detail]      int nResults=_results.count();
[detail] @@ -205,7 +201,7 @@
[detail]    SignalDatabase * AbstractStation::database() const
[detail]    {
[detail]      TRACE;
[detail] -    Signal * sig=_signals->originalSignals()->firstValidSignal();
[detail] +    SignalSegment * sig=_signals->originalSignals()->firstValidSignal();
[detail]      if(sig) {
[detail]        return sig->database();
[detail]      } else {
[detail] @@ -229,7 +225,7 @@
[detail]      }
[detail]    }
[detail]  
[detail] -  QString AbstractStation::log(const HVParameters& param) const
[detail] +  QString AbstractStation::log(const HVCoreParameters& param) const
[detail]    {
[detail]      TRACE;
[detail]      QString log;
[detail] @@ -249,19 +245,19 @@
[detail]        s << "[COMP " << QString::number(i) << "]\n";
[detail]        const SubSignalPool& subpool=_signals->originalSignals()->originals(i);
[detail]        for(int j=0; j<subpool.count(); j++) {
[detail] -        Signal * sig=subpool.at(j);
[detail] +        SignalSegment * sig=subpool.at(j);
[detail]          s << " [SIG " << QString::number(j) << "] ";
[detail]          if(sig->file()) {
[detail] -          s << sig->file()->name() << " at index " << sig->numberInFile();
[detail] +          s << sig->fileName() << " at index " << sig->indexInFile().value();
[detail]          } else { 
[detail] -          QString cmt=sig->metaData<Comments>().value();
[detail] +          QString cmt=sig->metaData()->optionalData().get<Comments>().value();
[detail]            if(cmt.endsWith("\n")) {
[detail]              cmt.chop(1);
[detail]            }
[detail]            s << cmt;
[detail]          }
[detail]          if(db) {
[detail] -          s << " (ID=" << sig->id() << ")";
[detail] +          s << " (ID=" << sig->id().toString() << ")";
[detail]          }
[detail]          s << "\n";
[detail]        }
[detail]                     src/CurveResults.cpp:  version-1.2.0	modified out of comments
[detail] --- src/CurveResults.cpp-version-1.2.0-stripped	2025-09-28 04:01:13.507544095 +0200
[detail] +++ src/CurveResults.cpp-HEAD-stripped	2025-09-28 04:01:13.507544095 +0200
[detail] @@ -32,7 +32,7 @@
[detail]      _stddevHigh.clear();
[detail]    }
[detail]  
[detail] -  void CurveResults::setWindows(int winCount, const HVParameters& param)
[detail] +  void CurveResults::setWindows(int winCount, const HVCoreParameters& param)
[detail]    {
[detail]      TRACE;
[detail]      setFrequencySampling(param.frequencySampling());
[detail] @@ -67,9 +67,15 @@
[detail]      double * y=_windows->y();
[detail]      int di=winIndex*frequencySampling().count();
[detail]      int n=frequencySampling().count();
[detail] +    if(curve.size()>=2) {
[detail]      for(int i=0; i<n; i++) {
[detail]        y[i+di]=curve.interpole(x[i], LogScale, LogScale).y();
[detail]      }
[detail] +    } else {
[detail] +      for(int i=0; i<n; i++) {
[detail] +        y[i+di]=std::numeric_limits<double>::quiet_NaN();
[detail] +      }
[detail] +    }
[detail]      _averageWindowLength.add(winLength);
[detail]    }
[detail]  
[detail] @@ -453,9 +459,11 @@
[detail]      if(_peaks.isEmpty()) {
[detail]        s << "# Number of windows for f0 = 0\n";
[detail]      } else {
[detail] -      int n=_peaks.count();
[detail] +      VectorList<RealStatisticalValue> sortedPeaks=_peaks;
[detail] +      std::sort(sortedPeaks.begin(), sortedPeaks.end());
[detail] +      int n=sortedPeaks.count();
[detail]        for(int index=0; index<n; index++) {
[detail] -        const RealStatisticalValue& p=_peaks.at(index);
[detail] +        const RealStatisticalValue& p=sortedPeaks.at(index);
[detail]          s << QString("# Number of windows for f%1 = %2\n").arg(index).arg(p.weight());
[detail]          s << QString("# f%1 from windows").arg(index);
[detail]          s << QString("\t%1\t%2\t%3\n")
[detail] @@ -474,10 +482,10 @@
[detail]      
[detail]      int ns=frequencySampling().count();
[detail]      for(int is=0; is<ns; is++) {
[detail] -      s << QString("%1\t%2\t%3\t%4\n").arg(_average.x(is))
[detail] -                                      .arg(_average.y(is))
[detail] -                                      .arg(_stddevLow.y(is))
[detail] -                                      .arg(_stddevHigh.y(is));
[detail] +      s << QString("%1\t%2\t%3\t%4\n").arg(_average.x(is), 0, 'g', 20)
[detail] +                                      .arg(_average.y(is), 0, 'g', 20)
[detail] +                                      .arg(_stddevLow.y(is), 0, 'g', 20)
[detail] +                                      .arg(_stddevHigh.y(is), 0, 'g', 20);
[detail]      }
[detail]      if(s.status()==QTextStream::WriteFailed) {
[detail]        App::log(tr("Error while writing to file '%1'\n").arg(fileName));
[detail] src/FrequencyDomainEllipticityStation.cpp:  version-1.2.0	no last version available
[detail]   src/FrequencyDomainEllipticityTool.cpp:  version-1.2.0	no last version available
[detail]         src/FrequencyWindowRejection.cpp:  version-1.2.0	not modified
[detail]                           src/HVCore.cpp:  version-1.2.0	not modified
[detail]                 src/HVCoreParameters.cpp:  version-1.2.0	no last version available
[detail]                     src/HVParameters.cpp:  version-1.2.0	modified out of comments
[detail] --- src/HVParameters.cpp-version-1.2.0-stripped	2025-09-28 04:01:13.571544405 +0200
[detail] +++ src/HVParameters.cpp-HEAD-stripped	2025-09-28 04:01:13.575544423 +0200
[detail] @@ -8,77 +8,38 @@
[detail]  
[detail]    
[detail]    HVParameters::HVParameters()
[detail] -    : AbstractParameters()
[detail] +    : HVCoreParameters()
[detail]    {
[detail]      TRACE;
[detail] -    _windowing.setLength(50.0);  
[detail] -    _frequencySampling.setRange(0.2, 20.0);
[detail] -    _frequencySampling.setScaleType(SamplingParameters::Log);
[detail] -    _frequencySampling.setStep(1.025);
[detail] -
[detail]      _smoothing.setMethod(SmoothingParameters::Function);
[detail]      _smoothing.windowFunction().setShape(WindowFunctionParameters::KonnoOhmachi);
[detail]      _smoothing.setWidthType(SmoothingParameters::Log);
[detail]      _smoothing.setScaleType(SamplingParameters::Log);
[detail]      _smoothing.setWidth(0.2); 
[detail]  
[detail] -    _commonTimeWindows=false;
[detail] -
[detail] -    _oversamplingFactor=1.0;
[detail] -    _highPassFrequency=0;
[detail]      _horizontal=Squared;
[detail]      _horizontalAzimuth=0.0;
[detail] -
[detail] -    _doMakeUp=true;
[detail] -    _plotCountPerLineResults=2;
[detail] -    _pageHeightResults=29.7;
[detail] -
[detail] -    _tapering.setShape(WindowFunctionParameters::Tukey);
[detail] -    _tapering.setAlpha(0.1);
[detail] -
[detail] -    _rotationStep=Angle::degreesToRadians(10.0);
[detail]    }
[detail]  
[detail] -  ENUM_AS_STRING_BEGIN(HVParameters, HorizontalType)
[detail] -  ENUM_AS_STRING_DATA_4(Azimuth, Energy, Geometric, Squared);
[detail] -  ENUM_AS_STRING_END
[detail] -
[detail]    int HVParameters::keywordCount(PARAMETERS_KEYWORDCOUNT_ARGS) const
[detail]    {
[detail] -    return 12+AbstractParameters::keywordCount();
[detail] +    return 2+HVCoreParameters::keywordCount();
[detail]    }
[detail]  
[detail]    int HVParameters::totalKeywordCount(PARAMETERS_TOTALKEYWORDCOUNT_ARGS) const
[detail]    {
[detail] -    return AbstractParameters::totalKeywordCount()+
[detail] -        _timeRange.totalKeywordCount()+
[detail] -        _windowing.totalKeywordCount()+
[detail] +    return HVCoreParameters::totalKeywordCount()+
[detail]          _smoothing.totalKeywordCount()+
[detail] -        _tapering.totalKeywordCount()+
[detail] -        _frequencyWindowRejection.totalKeywordCount()+
[detail] -        _frequencySampling.totalKeywordCount();
[detail] +        _frequencyWindowRejection.totalKeywordCount();
[detail]    }
[detail]  
[detail]    void HVParameters::collectKeywords(PARAMETERS_COLLECTKEYWORDS_ARGS)
[detail]    {
[detail]      TRACE;
[detail] -    int baseIndex=AbstractParameters::keywordCount();
[detail] -    keywords.add(prefix+"OVER_SAMPLING_FACTOR"+suffix, this, baseIndex+11);
[detail] -    keywords.add(prefix+"DO_HIGH_PASS"+suffix, this, baseIndex);         
[detail] -    keywords.add(prefix+"HIGH_PASS_FREQUENCY"+suffix, this, baseIndex+1);
[detail] -    keywords.add(prefix+"HORIZONTAL_COMPONENTS"+suffix, this, baseIndex+2);
[detail] -    keywords.add(prefix+"HORIZONTAL_AZIMUTH"+suffix, this, baseIndex+3);
[detail] -    keywords.add(prefix+"ROTATION_STEP"+suffix, this, baseIndex+4);
[detail] -    keywords.add(prefix+"COMMON_TIME_WINDOWS"+suffix, this, baseIndex+5);
[detail] -    keywords.add(prefix+"SIGNAL_FILE_NAME"+suffix, this, baseIndex+6);   
[detail] -    keywords.add(prefix+"MINIMUM"+suffix, this, baseIndex+7);            
[detail] -    keywords.add(prefix+"MAXIMUM"+suffix, this, baseIndex+8);            
[detail] -    keywords.add(prefix+"SAMPLES_NUMBER"+suffix, this, baseIndex+9);     
[detail] -    keywords.add(prefix+"SAMPLING_TYPE"+suffix, this, baseIndex+10);     
[detail] -    _timeRange.collectKeywords(keywords, prefix, suffix);
[detail] -    _windowing.collectKeywords(keywords, prefix, suffix);
[detail] -    _frequencySampling.collectKeywords(keywords, prefix, "_FREQUENCY"+suffix);
[detail] -    _tapering.collectKeywords(keywords, prefix, suffix);
[detail] +    int baseIndex=HVCoreParameters::keywordCount();
[detail] +    HVCoreParameters::collectKeywords(keywords, prefix, suffix);
[detail] +    keywords.add(prefix+"HORIZONTAL_COMPONENTS"+suffix, this, baseIndex);
[detail] +    keywords.add(prefix+"HORIZONTAL_AZIMUTH"+suffix, this, baseIndex+1);
[detail]      _smoothing.collectKeywords(keywords, prefix, suffix);
[detail]      _frequencyWindowRejection.collectKeywords(keywords, prefix, suffix);
[detail]    }
[detail] @@ -87,22 +48,11 @@
[detail]    {
[detail]      TRACE;
[detail]      QString log;
[detail] -    log+=_timeRange.toString(prefix, suffix);
[detail] -    log+=prefix+"COMMON_TIME_WINDOWS"+suffix+"="+(_commonTimeWindows ? "true" : "false")+"\n";
[detail] -    log+=_windowing.toString(prefix, suffix);
[detail] -    log+=_tapering.toString(prefix, suffix);
[detail] +    log+=HVCoreParameters::toString(prefix, suffix);
[detail]      log+=_smoothing.toString(prefix, suffix);
[detail] -    log+=_frequencySampling.toString(prefix, "_FREQUENCY"+suffix);
[detail] -    log+="# Required when using short time windows when the number of frequency samples\n"
[detail] -         "# is higher than the number of points in the spectra.\n";
[detail] -    log+=prefix+"OVER_SAMPLING_FACTOR"+suffix+"="+QString::number(_oversamplingFactor)+"\n";
[detail] -    log+=prefix+"HIGH_PASS_FREQUENCY"+suffix+"="+QString::number(_highPassFrequency)+"\n";
[detail] -    log+="# Possible values for HORIZONTAL_COMPONENTS: Squared, Energy, Azimuth, Geometric\n";
[detail]      log+=prefix+"HORIZONTAL_COMPONENTS"+suffix+"="+convertHorizontalType(_horizontal)+"\n";
[detail]      log+="# HORIZONTAL_AZIMUTH is used only when HORIZONTAL_COMPONENTS==Azimuth\n";
[detail]      log+=prefix+"HORIZONTAL_AZIMUTH"+suffix+"="+QString::number(_horizontalAzimuth)+"\n";
[detail] -    log+="# Used only for rotated output\n";
[detail] -    log+=prefix+"ROTATION_STEP"+suffix+"="+QString::number(Angle::radiansToDegrees(_rotationStep))+"\n";
[detail]      log+=_frequencyWindowRejection.toString(prefix, suffix);
[detail]      return log;
[detail]    }
[detail] @@ -111,42 +61,21 @@
[detail]    {
[detail]      TRACE;
[detail]      bool ok=true;
[detail] -    switch(index-AbstractParameters::keywordCount()) {
[detail] +    switch(index-HVCoreParameters::keywordCount()) {
[detail]      case 0:
[detail] -      obsoleteKeyword(keywords, 0);
[detail] -      if(value=="false") {
[detail] -        _highPassFrequency=0.0;
[detail] -      }
[detail] -      return _highPassFrequency>=0.0;
[detail] -    case 1:
[detail] -      _highPassFrequency=value.toDouble(&ok);
[detail] -      return ok && _highPassFrequency>=0.0;
[detail] -    case 2:
[detail]        _horizontal=convertHorizontalType(value, ok);
[detail]        return ok;
[detail] -    case 3:
[detail] +    case 1:
[detail]        _horizontalAzimuth=value.toDouble(&ok);
[detail]        return ok;
[detail] -    case 4:
[detail] -      _rotationStep=Angle::degreesToRadians(value.toDouble(&ok));
[detail] -      return ok;
[detail] -    case 5:
[detail] -      _commonTimeWindows=(value=="true");
[detail] -      return true;
[detail] -    case 6:         
[detail] -    case 7:         
[detail] -    case 8:         
[detail] -    case 9:         
[detail] -    case 10:        
[detail] -      obsoleteKeyword(keywords, index-AbstractParameters::keywordCount());
[detail] -      return true;
[detail] -    case 11:
[detail] -      _oversamplingFactor=value.toDouble(&ok);
[detail] -      return ok;
[detail]      default:
[detail]        break;
[detail]      }
[detail] -    return AbstractParameters::setValue(index, value, unit, keywords);
[detail] +    return HVCoreParameters::setValue(index, value, unit, keywords);
[detail]    }
[detail]  
[detail] +  ENUM_AS_STRING_BEGIN(HVParameters, HorizontalType)
[detail] +  ENUM_AS_STRING_DATA_4(Azimuth, Energy, Geometric, Squared);
[detail] +  ENUM_AS_STRING_END
[detail] +
[detail]  } 
[detail]               src/HVRotateParameters.cpp:  version-1.2.0	no last version available
[detail]                  src/HVRotateStation.cpp:  version-1.2.0	modified out of comments
[detail] --- src/HVRotateStation.cpp-version-1.2.0-stripped	2025-09-28 04:01:13.595544520 +0200
[detail] +++ src/HVRotateStation.cpp-HEAD-stripped	2025-09-28 04:01:13.599544539 +0200
[detail] @@ -1,7 +1,8 @@
[detail]  
[detail]  
[detail]  #include "HVRotateStation.h"
[detail] -#include "HVParameters.h"
[detail] +#include "RotateResults.h"
[detail] +#include "HVRotateParameters.h"
[detail]  #include "HVStationSignals.h"
[detail]  
[detail]  namespace HVCore {
[detail] @@ -22,17 +23,21 @@
[detail]      return r;
[detail]    }
[detail]  
[detail] -  void HVRotateStation::process(StationProcessSignals * proc, int windowIndex, const HVParameters * param) const
[detail] +  void HVRotateStation::process(StationProcessSignals * proc, int windowIndex,
[detail] +                                const HVCoreParameters * param) const
[detail]    {
[detail]      TRACE;
[detail] +    const HVRotateParameters * rotParam=static_cast<const HVRotateParameters *>(param);
[detail]      HVStationSignals * hvProc=static_cast<HVStationSignals *>(proc);
[detail]      const TimeWindow& r=windowAt(windowIndex);
[detail] -    hvProc->setProcessed(_signals, r, param);
[detail] +    hvProc->setProcessed(_signals, r, rotParam);
[detail]  
[detail]      RotateResults& res=*static_cast<RotateResults *>(_results[0]);
[detail]      int n=res.azimuthCount();
[detail]      for(int i=0; i<n; i++) {
[detail] -      Curve<Point2D> hv=hvProc->horizontal(res.azimuth(i), param);
[detail] +      Curve<Point2D> hv=hvProc->horizontal(res.azimuth(i),
[detail] +                                           rotParam->frequencySampling(),
[detail] +                                           rotParam->smoothing());
[detail]        hv.yDivide(hvProc->vertical());
[detail]        res.setWindow(i, r.lengthSeconds(), hv);
[detail]      }
[detail]                     src/HVRotateTool.cpp:  version-1.2.0	not modified
[detail]                        src/HVStation.cpp:  version-1.2.0	modified out of comments
[detail] --- src/HVStation.cpp-version-1.2.0-stripped	2025-09-28 04:01:13.631544694 +0200
[detail] +++ src/HVStation.cpp-HEAD-stripped	2025-09-28 04:01:13.635544714 +0200
[detail] @@ -15,7 +15,7 @@
[detail]      TRACE;
[detail]    }
[detail]  
[detail] -  bool HVStation::save(int, QDir outputDir, const HVParameters& param)
[detail] +  bool HVStation::save(int, QDir outputDir, const HVCoreParameters& param)
[detail]    {
[detail]      TRACE;
[detail]      QString fileName=_signals->originalSignals()->name();
[detail] @@ -37,26 +37,29 @@
[detail]      return r;
[detail]    }
[detail]  
[detail] -  void HVStation::process(StationProcessSignals * proc, int windowIndex, const HVParameters * param) const
[detail] +  void HVStation::process(StationProcessSignals * proc, int windowIndex, const HVCoreParameters * param) const
[detail]    {
[detail]      TRACE;
[detail] +    const HVParameters * hvParam=static_cast<const HVParameters *>(param);
[detail]      HVStationSignals * hvProc=static_cast<HVStationSignals *>(proc);
[detail]      const TimeWindow& r=windowAt(windowIndex);
[detail] -    hvProc->setProcessed(_signals, r, param);
[detail] +    hvProc->setProcessed(_signals, r, hvParam);
[detail]  
[detail]      Curve<Point2D> hv;
[detail] -    switch (param->horizontal()) {
[detail] +    switch (hvParam->horizontal()) {
[detail]      case HVParameters::Energy:
[detail] -      hv=hvProc->horizontal(param);
[detail] +      hv=hvProc->horizontal(hvParam);
[detail]        break;
[detail]      case HVParameters::Azimuth:
[detail] -      hv=hvProc->horizontal(param->horizontalAzimuth(), param);
[detail] +      hv=hvProc->horizontal(hvParam->horizontalAzimuth(),
[detail] +                            hvParam->frequencySampling(),
[detail] +                            hvParam->smoothing());
[detail]        break;
[detail]      case HVParameters::Squared:
[detail] -      hv=hvProc->horizontal(param, 0.5);
[detail] +      hv=hvProc->horizontal(hvParam, 0.5);
[detail]        break;
[detail]      case HVParameters::Geometric:
[detail] -      hv=hvProc->horizontalGeometric(param);
[detail] +      hv=hvProc->horizontalGeometric(hvParam);
[detail]        break;
[detail]      }
[detail]      hv.yDivide(hvProc->vertical());
[detail]                 src/HVStationSignals.cpp:  version-1.2.0	modified out of comments
[detail] --- src/HVStationSignals.cpp-version-1.2.0-stripped	2025-09-28 04:01:13.655544810 +0200
[detail] +++ src/HVStationSignals.cpp-HEAD-stripped	2025-09-28 04:01:13.659544829 +0200
[detail] @@ -55,7 +55,9 @@
[detail]    }
[detail]  
[detail]    
[detail] -  Curve<Point2D> HVStationSignals::horizontal(double azimuth, const HVParameters *param)
[detail] +  Curve<Point2D> HVStationSignals::horizontal(double azimuth,
[detail] +                                              const SamplingParameters& sampling,
[detail] +                                              const SmoothingParameters& smoothing)
[detail]    {
[detail]      TRACE;
[detail]      double a=Angle::degreesToRadians(azimuth);
[detail] @@ -65,12 +67,12 @@
[detail]      h2c->multiply(sin(a));
[detail]      h1c->add(h2c);
[detail]      Curve<Point2D> h=h1c->abs(1.0/processed(1)->duration());
[detail] -    h.smooth(param->frequencySampling(), param->smoothing());
[detail] +    h.smooth(sampling, smoothing);
[detail]      return h;
[detail]    }
[detail]  
[detail]    bool HVStationSignals::fft(const StationProcessSignals * from, int iComp,
[detail] -                             const TimeRange& tw, const HVParameters *param)
[detail] +                             const TimeRange& tw, const HVCoreParameters *param)
[detail]    {
[detail]      TRACE;
[detail]      if(!copyOriginalSignal(iComp, tw, from)) {
[detail]                           src/HVTask.cpp:  version-1.2.0	modified out of comments
[detail] --- src/HVTask.cpp-version-1.2.0-stripped	2025-09-28 04:01:13.675544907 +0200
[detail] +++ src/HVTask.cpp-HEAD-stripped	2025-09-28 04:01:13.675544907 +0200
[detail] @@ -34,7 +34,7 @@
[detail]  
[detail]    void HVTask::init()
[detail]    {
[detail] -    const HVParameters * param=taskManager()->parameters();
[detail] +    const HVCoreParameters * param=taskManager()->parameters();
[detail]      _station->clearResults();
[detail]      _station->initResults(_station->windowCount(), *param);
[detail]      _station->setHighPassFilter(param->highPassFrequency());
[detail]                    src/HVTaskManager.cpp:  version-1.2.0	modified out of comments
[detail] --- src/HVTaskManager.cpp-version-1.2.0-stripped	2025-09-28 04:01:13.691544984 +0200
[detail] +++ src/HVTaskManager.cpp-HEAD-stripped	2025-09-28 04:01:13.695545003 +0200
[detail] @@ -23,7 +23,7 @@
[detail]      TRACE;
[detail]    }
[detail]  
[detail] -  bool HVTaskManager::setParameters(const HVParameters * param)
[detail] +  bool HVTaskManager::setParameters(const HVCoreParameters * param)
[detail]    {
[detail]      TRACE;
[detail]      _parameters=param;
[detail]                           src/HVTool.cpp:  version-1.2.0	modified out of comments
[detail] --- src/HVTool.cpp-version-1.2.0-stripped	2025-09-28 04:01:13.715545100 +0200
[detail] +++ src/HVTool.cpp-HEAD-stripped	2025-09-28 04:01:13.719545120 +0200
[detail] @@ -13,6 +13,7 @@
[detail]      : AbstractHVTool(parent)
[detail]    {
[detail]      TRACE;
[detail] +    setParameters(new HVParameters);
[detail]    }
[detail]  
[detail]    bool HVTool::setSubPool(SubSignalPool * subPool)
[detail] @@ -23,8 +24,8 @@
[detail]      }
[detail]      if(!_stationSignals.addSignals(subPool) ||
[detail]         !_stationSignals.hasAllComponents() ||
[detail] -       _stationSignals.components()!=StationSignals::AllComponent) {
[detail] -      if(_stationSignals.components()!=StationSignals::AllComponent) {
[detail] +       _stationSignals.components()!=StationSignals::ThreeComponents) {
[detail] +      if(_stationSignals.components()!=StationSignals::ThreeComponents) {
[detail]          App::log(tr("Detected less than 3 components\n"));
[detail]        }
[detail]        return false;
[detail]                         src/HVWorker.cpp:  version-1.2.0	modified out of comments
[detail] --- src/HVWorker.cpp-version-1.2.0-stripped	2025-09-28 04:01:13.735545196 +0200
[detail] +++ src/HVWorker.cpp-HEAD-stripped	2025-09-28 04:01:13.735545196 +0200
[detail] @@ -26,7 +26,7 @@
[detail]    void HVWorker::process(ParallelTask * t)
[detail]    {
[detail]      HVTask * hvt=static_cast<HVTask *>(t);
[detail] -    const HVParameters * param=taskManager()->parameters();
[detail] +    const HVCoreParameters * param=taskManager()->parameters();
[detail]      while(!terminated()) {
[detail]        if(!t->hasStepToProcess()) {
[detail]          t->setFinishing();
[detail]                    src/NewNoiseModel.cpp:  version-1.2.0	not modified
[detail]                 src/RayDecParameters.cpp:  version-1.2.0	no last version available
[detail]                    src/RayDecStation.cpp:  version-1.2.0	no last version available
[detail]             src/RayDecStationSignals.cpp:  version-1.2.0	no last version available
[detail]                       src/RayDecTool.cpp:  version-1.2.0	no last version available
[detail]                    src/RotateResults.cpp:  version-1.2.0	modified out of comments
[detail] --- src/RotateResults.cpp-version-1.2.0-stripped	2025-09-28 04:01:13.791545467 +0200
[detail] +++ src/RotateResults.cpp-HEAD-stripped	2025-09-28 04:01:13.795545487 +0200
[detail] @@ -33,12 +33,13 @@
[detail]      }
[detail]    }
[detail]  
[detail] -  void RotateResults::setWindows(int winCount, const HVParameters& param)
[detail] +  void RotateResults::setWindows(int winCount, const HVCoreParameters& param)
[detail]    {
[detail]      TRACE;
[detail] -    setFrequencySampling(param.frequencySampling());
[detail] +    const HVRotateParameters& rotParam=static_cast<const HVRotateParameters&>(param);
[detail] +    setFrequencySampling(rotParam.frequencySampling());
[detail]      _windowCount=winCount;
[detail] -    double da=Angle::radiansToDegrees(param.rotationStep());
[detail] +    double da=Angle::radiansToDegrees(rotParam.rotationStep());
[detail]      int nAzimuth=qFloor(180.0/da)+1;
[detail]      int ns=frequencySampling().count();
[detail]  
[detail]               src/SpectrumParameters.cpp:  version-1.2.0	no last version available
[detail]            src/SpectrumRotateStation.cpp:  version-1.2.0	modified out of comments
[detail] --- src/SpectrumRotateStation.cpp-version-1.2.0-stripped	2025-09-28 04:01:13.819545602 +0200
[detail] +++ src/SpectrumRotateStation.cpp-HEAD-stripped	2025-09-28 04:01:13.823545622 +0200
[detail] @@ -27,17 +27,20 @@
[detail]      return r;
[detail]    }
[detail]  
[detail] -  void SpectrumRotateStation::process(StationProcessSignals * proc, int windowIndex, const HVParameters * param) const
[detail] +  void SpectrumRotateStation::process(StationProcessSignals * proc, int windowIndex, const HVCoreParameters * param) const
[detail]    {
[detail]      TRACE;
[detail] +    const HVRotateParameters * rotParam=static_cast<const HVRotateParameters *>(param);
[detail]      HVStationSignals * spectrumProc=static_cast<HVStationSignals *>(proc);
[detail]      const TimeWindow& r=windowAt(windowIndex);
[detail] -    spectrumProc->setProcessed(_signals, r, param);
[detail] +    spectrumProc->setProcessed(_signals, r, rotParam);
[detail]  
[detail]      RotateResults& res=*static_cast<RotateResults *>(_results[0]);
[detail]      int n=res.azimuthCount();
[detail]      for(int i=0; i<n; i++) {
[detail] -      Curve<Point2D> spec=spectrumProc->horizontal(res.azimuth(i), param);
[detail] +      Curve<Point2D> spec=spectrumProc->horizontal(res.azimuth(i),
[detail] +                                                   rotParam->frequencySampling(),
[detail] +                                                   rotParam->smoothing());
[detail]        res.setWindow(i, r.lengthSeconds(), spec);
[detail]      }
[detail]    }
[detail]               src/SpectrumRotateTool.cpp:  version-1.2.0	modified out of comments
[detail] --- src/SpectrumRotateTool.cpp-version-1.2.0-stripped	2025-09-28 04:01:13.843545718 +0200
[detail] +++ src/SpectrumRotateTool.cpp-HEAD-stripped	2025-09-28 04:01:13.847545738 +0200
[detail] @@ -12,7 +12,7 @@
[detail]      : AbstractHVTool(parent)
[detail]    {
[detail]      TRACE;
[detail] -    _stationSignals.setComponents(StationSignals::HorizontalComponent);
[detail] +    _stationSignals.setComponents(StationSignals::HorizontalComponents);
[detail]    }
[detail]  
[detail]    bool SpectrumRotateTool::setSubPool(SubSignalPool * subPool)
[detail]                  src/SpectrumStation.cpp:  version-1.2.0	modified out of comments
[detail] --- src/SpectrumStation.cpp-version-1.2.0-stripped	2025-09-28 04:01:13.863545815 +0200
[detail] +++ src/SpectrumStation.cpp-HEAD-stripped	2025-09-28 04:01:13.871545853 +0200
[detail] @@ -16,12 +16,13 @@
[detail]      TRACE;
[detail]    }
[detail]  
[detail] -  bool SpectrumStation::save(int, QDir outputDir, const HVParameters& param)
[detail] +  bool SpectrumStation::save(int, QDir outputDir, const HVCoreParameters& param)
[detail]    {
[detail]      TRACE;
[detail] -    Signal * sig=_signals->originalSignals()->firstValidSignal();
[detail] +    SignalSegment * sig=_signals->originalSignals()->firstValidSignal();
[detail]      ASSERT(sig);
[detail] -    QString fileName=sig->name()+"_"+Signal::componentLetter(sig->component());
[detail] +    QString fileName=sig->metaData()->name()+"_"
[detail] +                       +SignalMetaData::componentLetter(sig->metaData()->component());
[detail]      fileName=outputDir.absoluteFilePath(fileName+".spec");
[detail]      return _results[0]->save(fileName, log(param));
[detail]    }
[detail] @@ -40,7 +41,7 @@
[detail]      return r;
[detail]    }
[detail]  
[detail] -  void SpectrumStation::process(StationProcessSignals * proc, int windowIndex, const HVParameters * param) const
[detail] +  void SpectrumStation::process(StationProcessSignals * proc, int windowIndex, const HVCoreParameters * param) const
[detail]    {
[detail]      TRACE;
[detail]      SpectrumStationSignals * spectrumProc=static_cast<SpectrumStationSignals *>(proc);
[detail]           src/SpectrumStationSignals.cpp:  version-1.2.0	not modified
[detail]                     src/SpectrumTool.cpp:  version-1.2.0	modified out of comments
[detail] --- src/SpectrumTool.cpp-version-1.2.0-stripped	2025-09-28 04:01:13.899545990 +0200
[detail] +++ src/SpectrumTool.cpp-HEAD-stripped	2025-09-28 04:01:13.903546008 +0200
[detail] @@ -2,6 +2,7 @@
[detail]  
[detail]  #include "SpectrumTool.h"
[detail]  #include "SpectrumStation.h"
[detail] +#include "SpectrumParameters.h"
[detail]  #include "CurveResults.h"
[detail]  
[detail]  namespace HVCore {
[detail] @@ -13,6 +14,7 @@
[detail]      : AbstractHVTool(parent)
[detail]    {
[detail]      TRACE;
[detail] +    setParameters(new SpectrumParameters);
[detail]      _stationSignals.setComponents(StationSignals::AnyComponent);
[detail]    }
[detail]  
[detail]                     src/AbstractHVTool.h:  version-1.2.0	modified out of comments
[detail] --- src/AbstractHVTool.h-version-1.2.0-stripped	2025-09-28 04:01:13.919546086 +0200
[detail] +++ src/AbstractHVTool.h-HEAD-stripped	2025-09-28 04:01:13.923546105 +0200
[detail] @@ -6,7 +6,7 @@
[detail]  #include <GeopsyCore.h>
[detail]  
[detail]  #include "HVCoreDLLExport.h"
[detail] -#include "HVParameters.h"
[detail] +#include "HVCoreParameters.h"
[detail]  #include "HVTaskManager.h"
[detail]  
[detail]  namespace HVCore {
[detail] @@ -21,8 +21,8 @@
[detail]  
[detail]      bool setSubPool(SubSignalPool * subPool);
[detail]  
[detail] -    inline const HVParameters * parameters() const;
[detail] -    inline HVParameters * parameters();
[detail] +    inline const HVCoreParameters * parameters() const;
[detail] +    inline HVCoreParameters * parameters();
[detail]  
[detail]      const QList<AbstractStation *>& stations() const {return _stations;}
[detail]  
[detail] @@ -30,7 +30,7 @@
[detail]      void inverseWindows(QList<AbstractStation *> * stations=nullptr);
[detail]      void addWindows(AbstractStation * stat, const TimeRange * r=nullptr, QString log=QString());
[detail]      void removeWindows(AbstractStation * stat, const TimeRange& r);
[detail] -    bool addWindows(Signal * sig);
[detail] +    bool addWindows(SignalSegment * sig);
[detail]      bool loadWindows(const QStringList& fileNames);
[detail]  
[detail]      void setWindowColors();
[detail] @@ -48,14 +48,14 @@
[detail]      SparseKeepSignal * globalKeep(const TimeRange& r);
[detail]    };
[detail]  
[detail] -  inline const HVParameters * AbstractHVTool::parameters() const
[detail] +  inline const HVCoreParameters * AbstractHVTool::parameters() const
[detail]    {
[detail] -    return static_cast<const HVParameters *>(AbstractTool::parameters());
[detail] +    return static_cast<const HVCoreParameters *>(AbstractTool::parameters());
[detail]    }
[detail]  
[detail] -  inline HVParameters * AbstractHVTool::parameters()
[detail] +  inline HVCoreParameters * AbstractHVTool::parameters()
[detail]    {
[detail] -    return static_cast<HVParameters *>(AbstractTool::parameters());
[detail] +    return static_cast<HVCoreParameters *>(AbstractTool::parameters());
[detail]    }
[detail]  
[detail]  } 
[detail]                    src/AbstractResults.h:  version-1.2.0	modified out of comments
[detail] --- src/AbstractResults.h-version-1.2.0-stripped	2025-09-28 04:01:13.939546182 +0200
[detail] +++ src/AbstractResults.h-HEAD-stripped	2025-09-28 04:01:13.939546182 +0200
[detail] @@ -10,7 +10,7 @@
[detail]  namespace HVCore {
[detail]  
[detail]    class AbstractStation;
[detail] -  class HVParameters;
[detail] +  class HVCoreParameters;
[detail]  
[detail]    class HVCORE_EXPORT AbstractResults : public QObject
[detail]    {
[detail] @@ -22,7 +22,7 @@
[detail]      AbstractStation * parent() const;
[detail]  
[detail]      virtual void clear()=0;
[detail] -    virtual void setWindows(int winCount, const HVParameters& param)=0;
[detail] +    virtual void setWindows(int winCount, const HVCoreParameters& param)=0;
[detail]      virtual void setWindow(int winIndex, double winLength, const Curve<Point2D>& curve)=0;
[detail]      virtual int windowCount() const=0;
[detail]      virtual void setWindowColor(int winIndex, const Color& col);
[detail]                    src/AbstractStation.h:  version-1.2.0	modified out of comments
[detail] --- src/AbstractStation.h-version-1.2.0-stripped	2025-09-28 04:01:13.955546259 +0200
[detail] +++ src/AbstractStation.h-HEAD-stripped	2025-09-28 04:01:13.963546299 +0200
[detail] @@ -10,7 +10,7 @@
[detail]  namespace HVCore {
[detail]  
[detail]    class AbstractResults;
[detail] -  class HVParameters;
[detail] +  class HVCoreParameters;
[detail]  
[detail]    class HVCORE_EXPORT AbstractStation : public QObject
[detail]    {
[detail] @@ -22,16 +22,16 @@
[detail]      int indexOf(AbstractResults * c) {return _results.indexOf(c);}
[detail]  
[detail]      virtual StationProcessSignals * createProcessSignals()=0;
[detail] -    virtual void process(StationProcessSignals * proc, int windowIndex, const HVParameters * param) const=0;
[detail] +    virtual void process(StationProcessSignals * proc, int windowIndex, const HVCoreParameters * param) const=0;
[detail]      virtual void setStatistics();
[detail]      virtual void setPeaks();
[detail] -    virtual bool save(QDir outputDir, const HVParameters& param);
[detail] -    virtual bool save(int index, QDir outputDir, const HVParameters& param)=0;
[detail] +    virtual bool save(QDir outputDir, const HVCoreParameters& param);
[detail] +    virtual bool save(int index, QDir outputDir, const HVCoreParameters& param)=0;
[detail]  
[detail]      void addResults();
[detail]      int resultCount() const {return _results.count();}
[detail]      void clearResults();
[detail] -    void initResults(int windowCount, const HVParameters& param);
[detail] +    void initResults(int windowCount, const HVCoreParameters& param);
[detail]      virtual const AbstractResults * results(int index) const {return index<resultCount() ? _results[index] : nullptr;}
[detail]      virtual AbstractResults * results(int index) {return index<resultCount() ? _results[index] : nullptr;}
[detail]      virtual double resultMaxAmplitude() const;
[detail] @@ -68,7 +68,7 @@
[detail]      QString windowingLog() const {return _winLog;}
[detail]      void clearWindowingLog() {_winLog.clear();}
[detail]      void addWindowingLog(const QString& t) {_winLog+=t;}
[detail] -    QString log(const HVParameters& param) const;
[detail] +    QString log(const HVCoreParameters& param) const;
[detail]  
[detail]      SignalDatabase * database() const;
[detail]    public slots:
[detail]                       src/CurveResults.h:  version-1.2.0	modified out of comments
[detail] --- src/CurveResults.h-version-1.2.0-stripped	2025-09-28 04:01:13.979546375 +0200
[detail] +++ src/CurveResults.h-HEAD-stripped	2025-09-28 04:01:13.983546395 +0200
[detail] @@ -19,7 +19,7 @@
[detail]      enum PeakValue {PeakFrequency, PeakAmplitude};
[detail]  
[detail]      void clear();
[detail] -    void setWindows(int winCount, const HVParameters& param);
[detail] +    void setWindows(int winCount, const HVCoreParameters& param);
[detail]      void addWindows(int winCount);
[detail]      int windowCount() const {return _windows->curveCount();}
[detail]      void setWindow(int winIndex, double winLength, const Curve<Point2D>& curve);
[detail]  src/FrequencyDomainEllipticityStation.h:  version-1.2.0	no last version available
[detail]     src/FrequencyDomainEllipticityTool.h:  version-1.2.0	no last version available
[detail]           src/FrequencyWindowRejection.h:  version-1.2.0	not modified
[detail]                   src/HVCoreParameters.h:  version-1.2.0	no last version available
[detail]                       src/HVParameters.h:  version-1.2.0	modified out of comments
[detail] --- src/HVParameters.h-version-1.2.0-stripped	2025-09-28 04:01:14.027546608 +0200
[detail] +++ src/HVParameters.h-HEAD-stripped	2025-09-28 04:01:14.031546627 +0200
[detail] @@ -6,11 +6,12 @@
[detail]  #include <GeopsyCore.h>
[detail]  
[detail]  #include "HVCoreDLLExport.h"
[detail] +#include "HVCoreParameters.h"
[detail]  #include "FrequencyWindowRejection.h"
[detail]  
[detail]  namespace HVCore {
[detail]  
[detail] -  class HVCORE_EXPORT HVParameters : public AbstractParameters
[detail] +  class HVCORE_EXPORT HVParameters : public HVCoreParameters
[detail]    {
[detail]    public:
[detail]      HVParameters();
[detail] @@ -20,59 +21,16 @@
[detail]      enum HorizontalType {Energy, Azimuth, Squared, Geometric};
[detail]      ENUM_AS_STRING_DECL(HorizontalType)
[detail]  
[detail] -    TimeRangeParameters& timeRange() {return _timeRange;}
[detail] -    const TimeRangeParameters& timeRange() const {return _timeRange;}
[detail] -    void setTimeRange(const TimeRangeParameters& r) {_timeRange=r;}
[detail] -
[detail] -    bool commonTimeWindows() const {return _commonTimeWindows;}
[detail] -    void setCommonTimeWindows(bool c) {_commonTimeWindows=c;}
[detail] -
[detail] -    WindowingParameters& windowing() {return _windowing;}
[detail] -    const WindowingParameters& windowing() const {return _windowing;}
[detail] -    void setWindowing(const WindowingParameters& w) {_windowing=w;}
[detail] -
[detail] -    SamplingParameters& frequencySampling() {return _frequencySampling;}
[detail] -    const SamplingParameters& frequencySampling() const {return _frequencySampling;}
[detail] -    void setFrequencySampling(const SamplingParameters& s) {_frequencySampling=s;}
[detail] -
[detail] -    WindowFunctionParameters& tapering() {return _tapering;}
[detail] -    const WindowFunctionParameters& tapering() const {return _tapering;}
[detail] -    void setTapering(const WindowFunctionParameters& t) {_tapering=t;}
[detail] -
[detail] -    double oversamplingFactor() const {return _oversamplingFactor;}
[detail] -    void setOversamplingFactor(double f) {_oversamplingFactor=f;}
[detail] -
[detail]      SmoothingParameters& smoothing() {return _smoothing;}
[detail]      const SmoothingParameters& smoothing() const {return _smoothing;}
[detail]      void setSmoothing(const SmoothingParameters& s) {_smoothing=s;}
[detail]  
[detail] -    double highPassFrequency() const {return _highPassFrequency;}
[detail] -    void setHighPassFrequency(double h) {_highPassFrequency=h;}
[detail] -
[detail]      HorizontalType horizontal() const {return _horizontal;}
[detail]      void setHorizontal(HorizontalType h) {_horizontal=h;}
[detail]  
[detail]      double horizontalAzimuth() const {return _horizontalAzimuth;}
[detail]      void setHorizontalAzimuth(double h) {_horizontalAzimuth=h;}
[detail]  
[detail] -    bool doMakeUp() const {return _doMakeUp;}
[detail] -    void setDoMakeUp(bool d) {_doMakeUp=d;}
[detail] -
[detail] -    const QString& makeUpResults() const {return _makeUpResults;}
[detail] -    void setMakeUpResults(const QString& m) {_makeUpResults=m;}
[detail] -
[detail] -    const QString& makeUpSummary() const {return _makeUpSummary;}
[detail] -    void setMakeUpSummary(const QString& m) {_makeUpSummary=m;}
[detail] -
[detail] -    int plotCountPerLineResults() const {return _plotCountPerLineResults;}
[detail] -    void setPlotCountPerLineResults(int p) {_plotCountPerLineResults=p;}
[detail] -
[detail] -    double pageHeightResults() const {return _pageHeightResults;}
[detail] -    void setPageHeightResults(double p) {_pageHeightResults=p;}
[detail] -
[detail] -    double rotationStep() const {return _rotationStep;}
[detail] -    void setRotationStep(double s) {_rotationStep=s;}
[detail] -
[detail]      FrequencyWindowRejection& frequencyWindowRejection() {return _frequencyWindowRejection;}
[detail]      const FrequencyWindowRejection& frequencyWindowRejection() const {return _frequencyWindowRejection;}
[detail]      void setFrequencyWindowRejection(const FrequencyWindowRejection& fwr) {_frequencyWindowRejection=fwr;}
[detail] @@ -83,24 +41,11 @@
[detail]      QString toString(PARAMETERS_TOSTRING_ARGS_DECL) const;
[detail]      int totalKeywordCount(PARAMETERS_TOTALKEYWORDCOUNT_ARGS) const;
[detail]    private:
[detail] -    TimeRangeParameters _timeRange;
[detail] -    bool _commonTimeWindows;
[detail] -    WindowingParameters _windowing;
[detail] -    SamplingParameters _frequencySampling;
[detail]      SmoothingParameters _smoothing;
[detail] -    WindowFunctionParameters _tapering;
[detail]      FrequencyWindowRejection _frequencyWindowRejection;
[detail] -    double _oversamplingFactor;
[detail]      double _horizontalAzimuth;
[detail] -    double _highPassFrequency;
[detail]  
[detail]      HorizontalType _horizontal;
[detail] -    int _plotCountPerLineResults;
[detail] -    bool _doMakeUp;
[detail] -    QString _makeUpResults;
[detail] -    QString _makeUpSummary;
[detail] -    double _pageHeightResults;
[detail] -    double _rotationStep;
[detail]    };
[detail]  
[detail]  } 
[detail]                 src/HVRotateParameters.h:  version-1.2.0	no last version available
[detail]                    src/HVRotateStation.h:  version-1.2.0	modified out of comments
[detail] --- src/HVRotateStation.h-version-1.2.0-stripped	2025-09-28 04:01:14.055546743 +0200
[detail] +++ src/HVRotateStation.h-HEAD-stripped	2025-09-28 04:01:14.063546781 +0200
[detail] @@ -4,17 +4,18 @@
[detail]  #define HVROTATESTATION_H
[detail]  
[detail]  #include "HVStation.h"
[detail] -#include "RotateResults.h"
[detail]  #include "HVCoreDLLExport.h"
[detail]  
[detail]  namespace HVCore {
[detail]  
[detail] +  class HVRotateParameters;
[detail] +
[detail]    class HVCORE_EXPORT HVRotateStation : public HVStation
[detail]    {
[detail]    public:
[detail]      HVRotateStation(StationSignals * sig);
[detail]  
[detail] -    void process(StationProcessSignals * proc, int windowIndex, const HVParameters * param) const;
[detail] +    void process(StationProcessSignals * proc, int windowIndex, const HVCoreParameters * param) const;
[detail]    protected:
[detail]      AbstractResults * createResults();
[detail]    };
[detail]                       src/HVRotateTool.h:  version-1.2.0	not modified
[detail]                          src/HVStation.h:  version-1.2.0	modified out of comments
[detail] --- src/HVStation.h-version-1.2.0-stripped	2025-09-28 04:01:14.095546936 +0200
[detail] +++ src/HVStation.h-HEAD-stripped	2025-09-28 04:01:14.099546956 +0200
[detail] @@ -21,8 +21,8 @@
[detail]      QString name(int) const {return name();}
[detail]  
[detail]      StationProcessSignals * createProcessSignals();
[detail] -    void process(StationProcessSignals * proc, int windowIndex, const HVParameters * param) const;
[detail] -    bool save(int, QDir outputDir, const HVParameters& param);
[detail] +    void process(StationProcessSignals * proc, int windowIndex, const HVCoreParameters * param) const;
[detail] +    bool save(int, QDir outputDir, const HVCoreParameters& param);
[detail]  
[detail]      bool frequencyWindowRejection(const FrequencyWindowRejection& param);
[detail]    protected:
[detail]                   src/HVStationSignals.h:  version-1.2.0	modified out of comments
[detail] --- src/HVStationSignals.h-version-1.2.0-stripped	2025-09-28 04:01:14.115547033 +0200
[detail] +++ src/HVStationSignals.h-HEAD-stripped	2025-09-28 04:01:14.119547052 +0200
[detail] @@ -23,10 +23,12 @@
[detail]      const Curve<Point2D>& vertical() const {return _verticalSpectrum;}
[detail]      Curve<Point2D> horizontal(const HVParameters * param, double factor=1.0);
[detail]      Curve<Point2D> horizontalGeometric(const HVParameters * param);
[detail] -    Curve<Point2D> horizontal(double azimuth, const HVParameters * param);
[detail] +    Curve<Point2D> horizontal(double azimuth,
[detail] +                              const SamplingParameters& sampling,
[detail] +                              const SmoothingParameters& smoothing);
[detail]    private:
[detail]      bool fft(const StationProcessSignals * from, int icomp,
[detail] -             const TimeRange& tw, const HVParameters * param);
[detail] +             const TimeRange& tw, const HVCoreParameters * param);
[detail]  
[detail]      Curve<Point2D> _verticalSpectrum;
[detail]    };
[detail]                             src/HVTask.h:  version-1.2.0	not modified
[detail]                      src/HVTaskManager.h:  version-1.2.0	modified out of comments
[detail] --- src/HVTaskManager.h-version-1.2.0-stripped	2025-09-28 04:01:14.151547207 +0200
[detail] +++ src/HVTaskManager.h-HEAD-stripped	2025-09-28 04:01:14.155547227 +0200
[detail] @@ -9,7 +9,7 @@
[detail]  
[detail]  namespace HVCore {
[detail]  
[detail] -  class HVParameters;
[detail] +  class HVCoreParameters;
[detail]    class AbstractStation;
[detail]  
[detail]    class HVCORE_EXPORT HVTaskManager : public ParallelTaskManager
[detail] @@ -18,8 +18,8 @@
[detail]      HVTaskManager(const QList<AbstractStation *>& stations);
[detail]      ~HVTaskManager();
[detail]  
[detail] -    bool setParameters(const HVParameters * p);
[detail] -    const HVParameters * parameters() const {return _parameters;}
[detail] +    bool setParameters(const HVCoreParameters * p);
[detail] +    const HVCoreParameters * parameters() const {return _parameters;}
[detail]  
[detail]      AbstractStation * station(int index) {return _stations.at(index);}
[detail]      void setTasks();
[detail] @@ -27,7 +27,7 @@
[detail]      LoopWorker * newWorker();
[detail]      ParallelTask * createTask(int taskIndex);
[detail]  
[detail] -    const HVParameters * _parameters;
[detail] +    const HVCoreParameters * _parameters;
[detail]      QList<AbstractStation *> _stations;
[detail]    };
[detail]  
[detail]                             src/HVTool.h:  version-1.2.0	modified out of comments
[detail] --- src/HVTool.h-version-1.2.0-stripped	2025-09-28 04:01:14.175547323 +0200
[detail] +++ src/HVTool.h-HEAD-stripped	2025-09-28 04:01:14.179547342 +0200
[detail] @@ -4,6 +4,7 @@
[detail]  #define HVTOOL_H
[detail]  
[detail]  #include "AbstractHVTool.h"
[detail] +#include "HVParameters.h"
[detail]  #include "HVCoreDLLExport.h"
[detail]  
[detail]  namespace HVCore {
[detail] @@ -15,11 +16,24 @@
[detail]  
[detail]      bool setSubPool(SubSignalPool * subPool);
[detail]      bool frequencyWindowRejection(QList<AbstractStation *> * stations=nullptr);
[detail] +
[detail] +    inline const HVParameters * parameters() const;
[detail] +    inline HVParameters * parameters();
[detail]    protected:
[detail]      AbstractStation * createStation(StationSignals * sigs);
[detail]      QString toolName() {return tr("HV spectral ratio");}
[detail]    };
[detail]  
[detail] +  inline const HVParameters * HVTool::parameters() const
[detail] +  {
[detail] +    return static_cast<const HVParameters *>(AbstractHVTool::parameters());
[detail] +  }
[detail] +
[detail] +  inline HVParameters * HVTool::parameters()
[detail] +  {
[detail] +    return static_cast<HVParameters *>(AbstractHVTool::parameters());
[detail] +  }
[detail] +
[detail]  } 
[detail]  
[detail]  #endif 
[detail]                           src/HVWorker.h:  version-1.2.0	not modified
[detail]                      src/NewNoiseModel.h:  version-1.2.0	not modified
[detail]                   src/RayDecParameters.h:  version-1.2.0	no last version available
[detail]                      src/RayDecStation.h:  version-1.2.0	no last version available
[detail]               src/RayDecStationSignals.h:  version-1.2.0	no last version available
[detail]                         src/RayDecTool.h:  version-1.2.0	no last version available
[detail]                      src/RotateResults.h:  version-1.2.0	modified out of comments
[detail] --- src/RotateResults.h-version-1.2.0-stripped	2025-09-28 04:01:14.243547651 +0200
[detail] +++ src/RotateResults.h-HEAD-stripped	2025-09-28 04:01:14.247547671 +0200
[detail] @@ -4,6 +4,7 @@
[detail]  #define ROTATERESULTS_H
[detail]  
[detail]  #include "AbstractResults.h"
[detail] +#include "HVRotateParameters.h"
[detail]  #include "HVCoreDLLExport.h"
[detail]  
[detail]  namespace HVCore {
[detail] @@ -15,7 +16,7 @@
[detail]      ~RotateResults();
[detail]  
[detail]      void clear();
[detail] -    void setWindows(int winCount, const HVParameters& param);
[detail] +    void setWindows(int winCount, const HVCoreParameters& param);
[detail]      void setWindow(int azimuthIndex, double, const Curve<Point2D>& hv);
[detail]      int windowCount() const {return _windowCount;}
[detail]      void setStatistics();
[detail]                 src/SpectrumParameters.h:  version-1.2.0	no last version available
[detail]              src/SpectrumRotateStation.h:  version-1.2.0	modified out of comments
[detail] --- src/SpectrumRotateStation.h-version-1.2.0-stripped	2025-09-28 04:01:14.271547787 +0200
[detail] +++ src/SpectrumRotateStation.h-HEAD-stripped	2025-09-28 04:01:14.275547806 +0200
[detail] @@ -15,7 +15,7 @@
[detail]      SpectrumRotateStation(StationSignals * sig);
[detail]  
[detail]      StationProcessSignals * createProcessSignals();
[detail] -    void process(StationProcessSignals * proc, int windowIndex, const HVParameters * param) const;
[detail] +    void process(StationProcessSignals * proc, int windowIndex, const HVCoreParameters * param) const;
[detail]    protected:
[detail]      AbstractResults * createResults();
[detail]    };
[detail]                 src/SpectrumRotateTool.h:  version-1.2.0	not modified
[detail]                    src/SpectrumStation.h:  version-1.2.0	modified out of comments
[detail] --- src/SpectrumStation.h-version-1.2.0-stripped	2025-09-28 04:01:14.307547960 +0200
[detail] +++ src/SpectrumStation.h-HEAD-stripped	2025-09-28 04:01:14.311547980 +0200
[detail] @@ -20,8 +20,8 @@
[detail]      virtual QString name(int) const {return name();}
[detail]  
[detail]      StationProcessSignals * createProcessSignals();
[detail] -    void process(StationProcessSignals * proc, int windowIndex, const HVParameters * param) const;
[detail] -    virtual bool save(int, QDir outputDir, const HVParameters& param);
[detail] +    void process(StationProcessSignals * proc, int windowIndex, const HVCoreParameters * param) const;
[detail] +    bool save(int, QDir outputDir, const HVCoreParameters& param);
[detail]    protected:
[detail]      AbstractResults * createResults();
[detail]    };
[detail]             src/SpectrumStationSignals.h:  version-1.2.0	not modified
[detail]                       src/SpectrumTool.h:  version-1.2.0	not modified
[summary] Total differences: 969 lines
[summary] Modification level is B
OLD_DIR=$(pwd)
echo "HVCore"
cd $(find . -name "HVCore" | tail -n 1) || exit 2
pwd
dpversion B  || exit 2
cd $OLD_DIR || exit 2
################## HVGui
[detail]             src/AbstractHVToolWidget.cpp:  version-1.2.0	no last version available
[detail]                src/AbstractPeakModel.cpp:  version-1.2.0	not modified
[detail]              src/AbstractResultSheet.cpp:  version-1.2.0	modified out of comments
[detail] --- src/AbstractResultSheet.cpp-version-1.2.0-stripped	2025-09-28 04:01:14.407548444 +0200
[detail] +++ src/AbstractResultSheet.cpp-HEAD-stripped	2025-09-28 04:01:14.411548463 +0200
[detail] @@ -44,6 +44,11 @@
[detail]      a->setStatusTip(tr("Set categories from signal groups."));
[detail]      connect(a, SIGNAL(triggered()), this, SLOT(groupsToCategories()));
[detail]      menuTools->addAction(a);
[detail] +
[detail] +    a=new QAction(tr("&Array layout"), this);
[detail] +    a->setStatusTip(tr("Place results on the sheet according to their relative positions."));
[detail] +    connect(a, SIGNAL(triggered()), this, SLOT(arrayLayout()));
[detail] +    menuTools->addAction(a);
[detail]    }
[detail]  
[detail]    
[detail] @@ -204,7 +209,7 @@
[detail]      if(!fileName.isEmpty()) {
[detail]        QString log;
[detail]        if(res->parent()) {
[detail] -        log=res->parent()->log(_parameters);
[detail] +        log=res->parent()->log(*_parameters);
[detail]        }
[detail]        res->save(fileName, log);
[detail]      }
[detail] @@ -309,7 +314,7 @@
[detail]    {
[detail]      TRACE;
[detail]      ASSERT(!_stations.isEmpty());
[detail] -    Signal * s=_stations.first()->originalSignals()->firstValidSignal();
[detail] +    SignalSegment * s=_stations.first()->originalSignals()->firstValidSignal();
[detail]      ASSERT(s);
[detail]      return s->database();
[detail]    }
[detail] @@ -412,4 +417,32 @@
[detail]    }
[detail]  
[detail]  
[detail] +  
[detail] +  void AbstractResultSheet::arrayLayout()
[detail] +  {
[detail] +    TRACE;
[detail] +    if(_stations.isEmpty()) return;
[detail] +    static const QString title=tr("Array layout");
[detail] +    if(!selectAll(title)) return;
[detail] +
[detail] +    QList<AbstractResultWidget *> res=selectedResults();
[detail] +    int n=res.size();
[detail] +    LabelLayout layout(n);
[detail] +    for(int i=0; i<n; i++) {
[detail] +      AbstractResultWidget * w=res.at(i);
[detail] +      Point2D p(w->values()->coordinates());
[detail] +      p.setY(-p.y());
[detail] +      layout.setLabel(i, p, Point2D(w->printWidth(), w->printHeight()));
[detail] +    }
[detail] +    layout.scale(sheet()->printRight()); 
[detail] +    layout.optimize(1.1);
[detail] +    layout.moveTo(Point2D(1.0, 1.0));
[detail] +    for(int i=0; i<n; i++) {
[detail] +      AbstractResultWidget * w=res.at(i);
[detail] +      w->setAnchor(GraphicObject::Center);
[detail] +      w->setPrintAnchor(layout.position(i));
[detail] +      w->updateGeometry();
[detail] +    }
[detail] +  }
[detail] +
[detail]  } 
[detail]             src/AbstractResultWidget.cpp:  version-1.2.0	not modified
[detail]                  src/AbstractSummary.cpp:  version-1.2.0	modified out of comments
[detail] --- src/AbstractSummary.cpp-version-1.2.0-stripped	2025-09-28 04:01:14.443548618 +0200
[detail] +++ src/AbstractSummary.cpp-HEAD-stripped	2025-09-28 04:01:14.447548637 +0200
[detail] @@ -329,7 +329,9 @@
[detail]      statList.append((*it)->coordinates());
[detail]    }
[detail]    
[detail] -  VectorList<double> distances=statList.project();
[detail] +  double a,b;
[detail] +  statList.leastSquare(a, b);
[detail] +  VectorList<double> distances=statList.project(a, b);
[detail]    
[detail]    QMap<double, CurveResults *> dist2stat;
[detail]    for(int i=_results.count() - 1;i >= 0;i-- ) {
[detail] @@ -386,7 +388,7 @@
[detail]  
[detail]    _spectrumGridPalette=new ColorMapWidget(nullptr);
[detail]    _spectrumGridPalette->setObjectName("SpectrumPalette");
[detail] -  _spectrumGridPalette->generate(0, 19, ColorPalette::defaultSequential, ColorPalette::Reversed);
[detail] +  _spectrumGridPalette->generate(0, 19, 1, ColorPalette::defaultSequential, ColorPalette::Reversed);
[detail]    _spectrumGridPalette->setNumberPrecision(2);
[detail]    _spectrumGridPalette->setOrientation(Axis::West);
[detail]    _spectrumGridPalette->setTitle(_stackedLayer->graph()->yAxis()->title());
[detail] @@ -464,7 +466,7 @@
[detail]    _bubbleNameLayer->setErrorBar(NameLineLayer::NoBar);
[detail]    StationLine * line;
[detail]    line=new StationLine;
[detail] -  line->setPen(Pen(Qt::NoPen));
[detail] +  line->setPen(Pen(Pen::NoLine));
[detail]    _bubbleNameLayer->setReferenceLine(line);
[detail]  }
[detail]  
[detail]                 src/AveragePeakModel.cpp:  version-1.2.0	not modified
[detail]                src/CategoryGroupItem.cpp:  version-1.2.0	not modified
[detail]                 src/CurveResultSheet.cpp:  version-1.2.0	not modified
[detail]          src/CurveResultSheetOptions.cpp:  version-1.2.0	not modified
[detail]                src/CurveResultWidget.cpp:  version-1.2.0	not modified
[detail]                src/FilterTimeWindows.cpp:  version-1.2.0	not modified
[detail]                            src/HVGui.cpp:  version-1.2.0	not modified
[detail]       src/HorizontalComponentsWidget.cpp:  version-1.2.0	no last version available
[detail]                  src/LoadWinStatList.cpp:  version-1.2.0	not modified
[detail]                       src/PeakEditor.cpp:  version-1.2.0	not modified
[detail]                  src/PeakSearchRange.cpp:  version-1.2.0	not modified
[detail]            src/RayDecParameterWidget.cpp:  version-1.2.0	no last version available
[detail]            src/RotateParameterWidget.cpp:  version-1.2.0	no last version available
[detail]                src/RotateResultSheet.cpp:  version-1.2.0	not modified
[detail]               src/RotateResultWidget.cpp:  version-1.2.0	not modified
[detail]                      src/SetCategory.cpp:  version-1.2.0	not modified
[detail]                      src/StationLine.cpp:  version-1.2.0	not modified
[detail]                 src/StationPeakModel.cpp:  version-1.2.0	not modified
[detail]                 src/StatisticResults.cpp:  version-1.2.0	not modified
[detail]                      src/StudentTest.cpp:  version-1.2.0	not modified
[detail]            src/StudentTestCurveModel.cpp:  version-1.2.0	not modified
[detail]                src/SummaryMapOptions.cpp:  version-1.2.0	not modified
[detail]               src/AbstractHVToolWidget.h:  version-1.2.0	no last version available
[detail]                  src/AbstractPeakModel.h:  version-1.2.0	not modified
[detail]                src/AbstractResultSheet.h:  version-1.2.0	modified out of comments
[detail] --- src/AbstractResultSheet.h-version-1.2.0-stripped	2025-09-28 04:01:14.783550261 +0200
[detail] +++ src/AbstractResultSheet.h-HEAD-stripped	2025-09-28 04:01:14.787550280 +0200
[detail] @@ -22,7 +22,7 @@
[detail]      virtual void setStations(const QList<AbstractStation *>& stations);
[detail]      virtual void setLimits(double maxAmplitude)=0;
[detail]      void showValues();
[detail] -    void setParameters(const HVParameters& param) {_parameters=param;}
[detail] +    void setParameters(const HVCoreParameters * param) {_parameters=param;}
[detail]  
[detail]      virtual void setValueTitle(const QString& t);
[detail]      const QString& valueTitle() const {return _valueTitle;}
[detail] @@ -46,6 +46,7 @@
[detail]      void setCategories();
[detail]      void categoriesToGroups();
[detail]      void groupsToCategories();
[detail] +    void arrayLayout();
[detail]    signals:
[detail]      void resultsChanged();
[detail]    protected:
[detail] @@ -61,7 +62,7 @@
[detail]      QList<AbstractResultWidget *> _results;
[detail]    private:
[detail]      QString _valueTitle;
[detail] -    HVParameters _parameters;
[detail] +    const HVCoreParameters * _parameters;
[detail]    };
[detail]  
[detail]  } 
[detail]               src/AbstractResultWidget.h:  version-1.2.0	not modified
[detail]                    src/AbstractSummary.h:  version-1.2.0	not modified
[detail]                   src/AveragePeakModel.h:  version-1.2.0	not modified
[detail]                  src/CategoryGroupItem.h:  version-1.2.0	modified out of comments
[detail] --- src/CategoryGroupItem.h-version-1.2.0-stripped	2025-09-28 04:01:14.847550570 +0200
[detail] +++ src/CategoryGroupItem.h-HEAD-stripped	2025-09-28 04:01:14.851550590 +0200
[detail] @@ -19,7 +19,7 @@
[detail]  
[detail]      static bool belongsTo(AbstractStation * stat, const AbstractSignalGroup * g);
[detail]    private:
[detail] -    QSet<Signal *> _signals;
[detail] +    QSet<SignalSegment *> _signals;
[detail]    };
[detail]  
[detail]  } 
[detail]                   src/CurveResultSheet.h:  version-1.2.0	not modified
[detail]            src/CurveResultSheetOptions.h:  version-1.2.0	not modified
[detail]                  src/CurveResultWidget.h:  version-1.2.0	not modified
[detail]                  src/FilterTimeWindows.h:  version-1.2.0	not modified
[detail]         src/HorizontalComponentsWidget.h:  version-1.2.0	no last version available
[detail]                    src/LoadWinStatList.h:  version-1.2.0	not modified
[detail]                         src/PeakEditor.h:  version-1.2.0	not modified
[detail]                    src/PeakSearchRange.h:  version-1.2.0	not modified
[detail]              src/RayDecParameterWidget.h:  version-1.2.0	no last version available
[detail]              src/RotateParameterWidget.h:  version-1.2.0	no last version available
[detail]                  src/RotateResultSheet.h:  version-1.2.0	not modified
[detail]                 src/RotateResultWidget.h:  version-1.2.0	not modified
[detail]                        src/SetCategory.h:  version-1.2.0	not modified
[detail]                        src/StationLine.h:  version-1.2.0	not modified
[detail]                   src/StationPeakModel.h:  version-1.2.0	not modified
[detail]                   src/StatisticResults.h:  version-1.2.0	not modified
[detail]                        src/StudentTest.h:  version-1.2.0	not modified
[detail]              src/StudentTestCurveModel.h:  version-1.2.0	not modified
[detail]                  src/SummaryMapOptions.h:  version-1.2.0	not modified
[detail]              src/AbstractHVToolWidget.ui:  version-1.2.0	no last version available
[detail]           src/CurveResultSheetOptions.ui:  version-1.2.0	not modified
[detail]                 src/FilterTimeWindows.ui:  version-1.2.0	not modified
[detail]        src/HorizontalComponentsWidget.ui:  version-1.2.0	no last version available
[detail]                   src/LoadWinStatList.ui:  version-1.2.0	not modified
[detail]                        src/PeakEditor.ui:  version-1.2.0	not modified
[detail]                   src/PeakSearchRange.ui:  version-1.2.0	not modified
[detail]             src/RayDecParameterWidget.ui:  version-1.2.0	no last version available
[detail]             src/RotateParameterWidget.ui:  version-1.2.0	no last version available
[detail]                       src/SetCategory.ui:  version-1.2.0	not modified
[detail]                       src/StudentTest.ui:  version-1.2.0	not modified
[detail]                 src/SummaryMapOptions.ui:  version-1.2.0	not modified
[summary] Total differences: 135 lines
[summary] Modification level is B
OLD_DIR=$(pwd)
echo "HVGui"
cd $(find . -name "HVGui" | tail -n 1) || exit 2
pwd
dpversion B  || exit 2
cd $OLD_DIR || exit 2
################## ArrayCore
[detail]            src/ARDSSensorOrientation.cpp:  version-4.2.1	no last version available
[detail]             src/AbstractArrayResults.cpp:  version-4.2.1	not modified
[detail]                src/AbstractArrayTool.cpp:  version-4.2.1	modified out of comments
[detail] --- src/AbstractArrayTool.cpp-version-4.2.1-stripped	2025-09-28 04:01:15.307552793 +0200
[detail] +++ src/AbstractArrayTool.cpp-HEAD-stripped	2025-09-28 04:01:15.311552813 +0200
[detail] @@ -5,6 +5,8 @@
[detail]  #include "ArrayStations.h"
[detail]  #include "ArrayTaskManager.h"
[detail]  #include "AbstractArrayResults.h"
[detail] +#include "AbstractFKFunction.h"
[detail] +#include "ArrayWorker.h"
[detail]  
[detail]  namespace ArrayCore {
[detail]  
[detail] @@ -23,6 +25,12 @@
[detail]      delete _results;
[detail]    }
[detail]  
[detail] +  void AbstractArrayTool::setResults(AbstractArrayResults * r)
[detail] +  {
[detail] +    delete _results;
[detail] +    _results=r;
[detail] +  }
[detail] +
[detail]    bool AbstractArrayTool::setSubPool(SubSignalPool * subPool)
[detail]    {
[detail]      TRACE;
[detail] @@ -55,7 +63,7 @@
[detail]      return true;
[detail]    }
[detail]  
[detail] -  StationSignals * AbstractArrayTool::belongsTo(Signal * sig)
[detail] +  StationSignals * AbstractArrayTool::belongsTo(SignalSegment * sig)
[detail]    {
[detail]      TRACE;
[detail]      QList<StationSignals *>::iterator it;
[detail] @@ -92,10 +100,12 @@
[detail]        
[detail]        
[detail]        if(samplingParam.minimum()<=0.0) {
[detail] +        double min=minimumFrequency(2, param->windowing().periodCount());
[detail] +        APP_LOG(1, tr("Minimum frequency to have at least two block sets: %1 Hz\n").arg(min));
[detail]          samplingParam.setMinimum(minimumFrequency(2, param->windowing().periodCount()));
[detail]        }
[detail]        if(samplingParam.maximum()<=0.0) {
[detail] -        samplingParam.setMaximum(maximumFrequency());
[detail] +        samplingParam.setMaximum(0.5*_arraySelection.commonSamplingFrequency());
[detail]        }
[detail]        if(samplingParam.step()<=1.0) {
[detail]          samplingParam.setStep(1.025);
[detail] @@ -112,20 +122,20 @@
[detail]    }
[detail]  
[detail]    
[detail] -  double AbstractArrayTool::minimumFrequency(int nBlockSet, double periodCount) const
[detail] +  double AbstractArrayTool::minimumFrequency(int nBlockSet, double periodCount)
[detail]    {
[detail]      TRACE;
[detail]      
[detail] -    double nWin=nBlockSet*parameters()->blockAveraging().count(array()->count());
[detail] +    double nWin=nBlockSet*parameters()->blockAveraging().count(crossSpectrumMatrixSize());
[detail]      SparseTimeRange rref=timeRange();
[detail]      
[detail] -    double maxWinLength=rref.totalLength()/nWin;
[detail] +    double maxWinLength=rref.lengthSeconds()/nWin;
[detail]      SparseTimeRange r=rref;
[detail]      
[detail]      
[detail]      r.removeBlocks(maxWinLength*(1.0+1e-10));
[detail]      
[detail] -    while(nWin*maxWinLength>r.totalLength()) {
[detail] +    while(nWin*maxWinLength>r.lengthSeconds()) {
[detail]        
[detail]        maxWinLength*=0.975;
[detail]        r=rref;
[detail] @@ -136,16 +146,6 @@
[detail]      return periodCount/maxWinLength;
[detail]    }
[detail]  
[detail] -  double AbstractArrayTool::maximumFrequency() const
[detail] -  {
[detail] -    TRACE;
[detail] -    if(!array()->isEmpty()) {
[detail] -      return 0.5*array()->samplingFrequency();
[detail] -    } else {
[detail] -      return 0.0;
[detail] -    }
[detail] -  }
[detail] -
[detail]    bool AbstractArrayTool::setLoop()
[detail]    {
[detail]      TRACE;
[detail]        src/AbstractEllipticityEngine.cpp:  version-4.2.1	not modified
[detail]               src/AbstractFKFunction.cpp:  version-4.2.1	modified out of comments
[detail] --- src/AbstractFKFunction.cpp-version-4.2.1-stripped	2025-09-28 04:01:15.343552968 +0200
[detail] +++ src/AbstractFKFunction.cpp-HEAD-stripped	2025-09-28 04:01:15.347552986 +0200
[detail] @@ -15,6 +15,7 @@
[detail]  #include "PoggiFKVertical.h"
[detail]  #include "PoggiFKRadial.h"
[detail]  #include "HRFKVertical.h"
[detail] +#include "HRFKPolarVertical.h"
[detail]  #include "HRFKRadial.h"
[detail]  #include "HRFKTransverse.h"
[detail]  #include "HRFKRayleighSquared.h"
[detail] @@ -22,7 +23,9 @@
[detail]  #include "HRFKRayleighFixedEll.h"
[detail]  #include "HRFKDirectRayleighAll.h"
[detail]  #include "HRFKDirectLove.h"
[detail] -#include "SensorOrientationCapon.h"
[detail] +#include "HRFKVelocityStrainRateRayleigh.h"
[detail] +#include "HRFKVelocityStrainRateLove.h"
[detail] +#include "ARDSSensorOrientation.h"
[detail]  #include "HRFKDirectRadial.h"
[detail]  #include "HRFKDirectTransverse.h"
[detail]  #include "SingleDirectRayleigh.h"
[detail] @@ -30,6 +33,8 @@
[detail]  #include "ActiveHRFKVertical.h"
[detail]  #include "ActiveHRFKRayleigh.h"
[detail]  #include "ActiveConvFKRayleighAll.h"
[detail] +#include "LocalSourceVertical.h"
[detail] +#include "WaveNumberConverter.h"
[detail]  
[detail]  namespace ArrayCore {
[detail]  
[detail] @@ -63,6 +68,13 @@
[detail]    }
[detail]  
[detail]    
[detail] +  void AbstractFKFunction::setPowerEngine(int stationCount)
[detail] +  {
[detail] +    delete _powerEngine;
[detail] +    _powerEngine=new FKPower(stationCount, matrixSize(stationCount));
[detail] +  }
[detail] +
[detail] +  
[detail]    void AbstractFKFunction::setPowerEngine(FKPower * p)
[detail]    {
[detail]      if(p!=_powerEngine) {
[detail] @@ -129,10 +141,23 @@
[detail]      }
[detail]    }
[detail]  
[detail] +  bool AbstractFKFunction::acceptPeak(const FunctionSearchExtremum& m, const WaveNumberConverter& conv,
[detail] +                                      const FKParameters * param) const
[detail] +  {
[detail] +    const Vector<double>& k=m.position();
[detail] +    double slowness=conv.slowness(k);
[detail] +    return slowness>param->minimumSlowness() &&
[detail] +           slowness<param->maximumSlowness() &&
[detail] +           !isOnLimit(k, conv.frequency());
[detail] +  }
[detail] +
[detail]    
[detail] -   void AbstractFKFunction::setAssociatedResults(const Vector<double>&, double power,
[detail] -                                                 FKPeaks::Value& val) const
[detail] +   void AbstractFKFunction::setAssociatedResults(const Vector<double>& k, double power,
[detail] +                                                 FKPeaks::Value& val,
[detail] +                                                const WaveNumberConverter& conv) const
[detail]     {
[detail] +     val.slowness=conv.slowness(k);
[detail] +     val.azimuth=Angle::radiansToDegrees(Angle::mathToGeographic(k.azimuth(0, 1)));
[detail]       val.ellipticity=std::numeric_limits<double>::quiet_NaN();
[detail]       val.verticalNoise=std::numeric_limits<double>::quiet_NaN();
[detail]       val.horizontalNoise=std::numeric_limits<double>::quiet_NaN();
[detail] @@ -152,6 +175,7 @@
[detail]        switch(param->processType()) {
[detail]        case FKParameters::Conventional:
[detail]        case FKParameters::Capon:
[detail] +      case FKParameters::LocalSourceVertical:
[detail]        case FKParameters::Omni:
[detail]        case FKParameters::ActiveCapon:
[detail]        case FKParameters::ActiveConventional:
[detail] @@ -179,19 +203,42 @@
[detail]      case ArrayStations::ThreeComponents:
[detail]        
[detail]        break;
[detail] +    case ArrayStations::ThreeComponentsAndStrain:
[detail] +      switch(param->processType()) {
[detail] +      case FKParameters::VelocityStrainRateRayleigh:
[detail] +      case FKParameters::VelocityStrainRateLove:
[detail] +        break;
[detail] +      default:
[detail] +        App::log(tr("'%1' processing is not allowed for three components and strain.\n")
[detail] +                     .arg(FKParameters::convertProcessType(param->processType())));
[detail] +        return nullptr;
[detail] +      }
[detail] +      break;
[detail]      }
[detail]      AbstractFKFunction * f=nullptr;
[detail]      switch(param->processType()) {
[detail]      case FKParameters::Undefined:
[detail]        App::log(tr("Processing type is not defined.\n"));
[detail]        return nullptr;
[detail] +    case FKParameters::SpectrumMatch:
[detail] +    case FKParameters::CrossSpectrumMatch:
[detail] +    case FKParameters::PlaneWaveInversion:
[detail] +    case FKParameters::FullSpectrumOneMode:
[detail] +      return nullptr;
[detail]      
[detail]      case FKParameters::Conventional:
[detail]        f=new ConvFKVertical(cache);
[detail]        break;
[detail]      case FKParameters::Capon:
[detail] +      switch(param->inversionMethod()) {
[detail] +      case FKParameters::RefinedGrid:
[detail]        f=new HRFKVertical(cache);
[detail]        break;
[detail] +      case FKParameters::Gradient:
[detail] +        f=new HRFKPolarVertical(cache);
[detail] +        break;
[detail] +      }
[detail] +      break;
[detail]      case FKParameters::Omni:
[detail]        
[detail]        break;
[detail] @@ -201,6 +248,9 @@
[detail]      case FKParameters::ActiveConventional:
[detail]        f=new ActiveConvFKVertical(cache);
[detail]        break;
[detail] +    case FKParameters::LocalSourceVertical:
[detail] +      f=new LocalSourceVertical(cache);
[detail] +      break;
[detail]      
[detail]      case FKParameters::ConventionalRadial:
[detail]        f=new ConvFKRadial(cache);
[detail] @@ -247,8 +297,8 @@
[detail]      case FKParameters::LDS3:
[detail]        f=new HRFKDirectLove(cache);
[detail]        break;
[detail] -    case FKParameters::SensorOrientation:
[detail] -      f=new SensorOrientationCapon(cache);
[detail] +    case FKParameters::ARDSSensorOrientation:
[detail] +      f=new ARDSSensorOrientation(cache);
[detail]        break;
[detail]      case FKParameters::RDSSingle:
[detail]        f=new SingleDirectRayleigh(cache);
[detail] @@ -268,6 +318,12 @@
[detail]      case FKParameters::ActiveRTBF:
[detail]        f=new ActiveHRFKRayleigh(cache);
[detail]        break;
[detail] +    case FKParameters::VelocityStrainRateRayleigh:
[detail] +      f=new HRFKVelocityStrainRateRayleigh(cache);
[detail] +      break;
[detail] +    case FKParameters::VelocityStrainRateLove:
[detail] +      f=new HRFKVelocityStrainRateLove(cache);
[detail] +      break;
[detail]      }
[detail]      return f;
[detail]    }
[detail] @@ -278,7 +334,7 @@
[detail]      return nullptr;
[detail]    }
[detail]  
[detail] -  const ComplexMatrix * AbstractFKFunction::crossSpectrum() const
[detail] +  const HermitianMatrix * AbstractFKFunction::crossSpectrum() const
[detail]    {
[detail]      if(_crossSpectrum) {
[detail]        return _crossSpectrum->matrix();
[detail] @@ -287,5 +343,8 @@
[detail]      }
[detail]    }
[detail]  
[detail] +  ENUM_AS_STRING_BEGIN(AbstractFKFunction, CoordinateSystem)
[detail] +  ENUM_AS_STRING_DATA_2(CartesianCoordinates, PolarCoordinates);
[detail] +  ENUM_AS_STRING_END
[detail]  
[detail]  } 
[detail]               src/AbstractFKRayleigh.cpp:  version-4.2.1	modified out of comments
[detail] --- src/AbstractFKRayleigh.cpp-version-4.2.1-stripped	2025-09-28 04:01:15.363553064 +0200
[detail] +++ src/AbstractFKRayleigh.cpp-HEAD-stripped	2025-09-28 04:01:15.367553083 +0200
[detail] @@ -2,6 +2,7 @@
[detail]  
[detail]  #include "AbstractFKRayleigh.h"
[detail]  #include "AbstractEllipticityEngine.h"
[detail] +#include "FKCrossSpectrum.h"
[detail]  
[detail]  namespace ArrayCore {
[detail]  
[detail] @@ -27,9 +28,10 @@
[detail]    }
[detail]  
[detail]    void AbstractFKRayleigh::setAssociatedResults(const Vector<double>& kell, double power,
[detail] -                                                FKPeaks::Value& val) const
[detail] +                                                FKPeaks::Value& val,
[detail] +                                                const WaveNumberConverter& conv) const
[detail]    {
[detail] -    val.power=power;
[detail] +    AbstractFKFunction::setAssociatedResults(kell, power, val, conv);
[detail]      if(_ellEngine) {
[detail]        switch(_ellipticityCorrection) {
[detail]        case FKParameters::None:
[detail] @@ -69,8 +71,6 @@
[detail]    void AbstractFKRayleigh::rawEllipticity(const Vector<double>& kell, FKPeaks::Value& val) const
[detail]    {
[detail]      val.ellipticity=Angle::radiansToDegrees(kell[2]);
[detail] -    val.verticalNoise=std::numeric_limits<double>::quiet_NaN();
[detail] -    val.horizontalNoise=std::numeric_limits<double>::quiet_NaN();
[detail]    }
[detail]  
[detail]    void curveToFile(const QString& fileName, double eh, double ez,
[detail] @@ -109,123 +109,48 @@
[detail]      }
[detail]    }
[detail]  
[detail] -  PolynomialFraction AbstractFKRayleigh::phiH(double eh, double ez, double ch)
[detail] +  Polynomial AbstractFKRayleigh::denominatorPhi(double eh, double ez)
[detail]    {
[detail] -    PolynomialFraction phi(0, 2);
[detail] -    phi.numerator().setCoefficient(0, eh*(ez-eh));
[detail] -    phi.denominator().setCoefficient(0, -eh*ez);
[detail] -    phi.denominator().setCoefficient(1, eh+ez);
[detail] -    phi.denominator().setCoefficient(2, -1.0);
[detail] -    phi/=ch;
[detail] -    phi-=1.0;
[detail] -    phi*=phi;
[detail] -    return phi;
[detail] -  }
[detail] -
[detail] -  PolynomialFraction AbstractFKRayleigh::phiZ(double eh, double ez, double cz)
[detail] -  {
[detail] -    PolynomialFraction phi(2, 2);
[detail] -    phi.numerator().setCoefficient(2, (ez-eh)/ez);
[detail] -    phi.denominator().setCoefficient(0, -eh*ez);
[detail] -    phi.denominator().setCoefficient(1, eh+ez);
[detail] -    phi.denominator().setCoefficient(2, -1.0);
[detail] -    phi/=cz;
[detail] -    phi-=1.0;
[detail] -    phi*=phi;
[detail] +    Polynomial phi(2);
[detail] +    phi.setCoefficient(0, -eh*ez);
[detail] +    phi.setCoefficient(1, eh+ez);
[detail] +    phi.setCoefficient(2, -1.0);
[detail]      return phi;
[detail]    }
[detail]  
[detail] -  PolynomialFraction AbstractFKRayleigh::phiA(double eh, double ez, double ea, double ca)
[detail] +  Polynomial AbstractFKRayleigh::numeratorPhiH(double eh, double ez, double ch,
[detail] +                                               const Polynomial& denominator)
[detail]    {
[detail] -    PolynomialFraction phi(2, 2);
[detail] -    double ezh=ez-eh;
[detail] -    double eah=ea-eh;
[detail] -    double ezah=eh*(ez-ea);
[detail] -    phi.numerator().setCoefficient(0, ezah*ezah);
[detail] -    phi.numerator().setCoefficient(1, 2.0*eah*ezah);
[detail] -    phi.numerator().setCoefficient(2, eah*eah);
[detail] -    phi.denominator().setCoefficient(0, -eh*ea*ea*ezh);
[detail] -    phi.denominator().setCoefficient(1, (ea*ea+eh*ez)*ezh);
[detail] -    phi.denominator().setCoefficient(2, -eh*ezh);
[detail] -    phi.denominator()-=phi.numerator();
[detail] -    phi/=ca;
[detail] -    phi-=1.0;
[detail] +    Polynomial phi(0);
[detail] +    phi.setCoefficient(0, eh*(ez-eh));
[detail] +    phi/=ch;
[detail] +    phi-=denominator;
[detail]      phi*=phi;
[detail]      return phi;
[detail]    }
[detail]  
[detail] -  PolynomialFraction AbstractFKRayleigh::cH(double eh, double ez)
[detail] -  {
[detail] -    PolynomialFraction phi(0, 2);
[detail] -    phi.numerator().setCoefficient(0, eh*(ez-eh));
[detail] -    phi.denominator().setCoefficient(0, -eh*ez);
[detail] -    phi.denominator().setCoefficient(1, eh+ez);
[detail] -    phi.denominator().setCoefficient(2, -1.0);
[detail] -    return phi;
[detail] -  }
[detail] -
[detail] -  PolynomialFraction AbstractFKRayleigh::cZ(double eh, double ez)
[detail] -  {
[detail] -    PolynomialFraction phi(2, 2);
[detail] -    phi.numerator().setCoefficient(2, (ez-eh)/ez);
[detail] -    phi.denominator().setCoefficient(0, -eh*ez);
[detail] -    phi.denominator().setCoefficient(1, eh+ez);
[detail] -    phi.denominator().setCoefficient(2, -1.0);
[detail] -    return phi;
[detail] -  }
[detail] -
[detail] -  PolynomialFraction AbstractFKRayleigh::cA(double eh, double ez, double ea)
[detail] -  {
[detail] -    PolynomialFraction phi(2, 2);
[detail] -    double ezh=ez-eh;
[detail] -    double eah=ea-eh;
[detail] -    double ezah=eh*(ez-ea);
[detail] -    phi.numerator().setCoefficient(0, ezah*ezah);
[detail] -    phi.numerator().setCoefficient(1, 2.0*eah*ezah);
[detail] -    phi.numerator().setCoefficient(2, eah*eah);
[detail] -    phi.denominator().setCoefficient(0, -eh*ea*ea*ezh);
[detail] -    phi.denominator().setCoefficient(1, (ea*ea+eh*ez)*ezh);
[detail] -    phi.denominator().setCoefficient(2, -eh*ezh);
[detail] -    phi.denominator()-=phi.numerator();
[detail] -    return phi;
[detail] -  }
[detail] -
[detail] -  Polynomial AbstractFKRayleigh::phitH(double eh, double ez, double th)
[detail] +  Polynomial AbstractFKRayleigh::numeratorPhiZ(double eh, double ez, double cz,
[detail] +                                               const Polynomial& denominator)
[detail]    {
[detail]      Polynomial phi(2);
[detail] -    phi.setCoefficient(0, -eh*(eh+th*(ez-eh)));
[detail] -    phi.setCoefficient(1, eh+ez);
[detail] -    phi.setCoefficient(2, -1.0);
[detail] -    phi/=eh*(ez-eh)*th;
[detail] -    phi*=phi;
[detail] -    return phi;
[detail] -  }
[detail] -
[detail] -  PolynomialFraction AbstractFKRayleigh::phitZ(double eh, double ez, double tz)
[detail] -  {
[detail] -    PolynomialFraction phi(2, 2);
[detail] -    phi.numerator().setCoefficient(0, -ez*ez*eh);
[detail] -    phi.numerator().setCoefficient(1, ez*(eh+ez));
[detail] -    phi.numerator().setCoefficient(2, -eh-tz*(ez-eh));
[detail] -    phi.denominator().setCoefficient(2, 1.0);
[detail] -    phi/=(ez-eh)*tz;
[detail] +    phi.setCoefficient(2, (ez-eh)/ez);
[detail] +    phi/=cz;
[detail] +    phi-=denominator;
[detail]      phi*=phi;
[detail]      return phi;
[detail]    }
[detail]  
[detail] -  PolynomialFraction AbstractFKRayleigh::phitA(double eh, double ez, double ea, double ta)
[detail] +  Polynomial AbstractFKRayleigh::numeratorPhiA(double eh, double ez, double ea, double ca,
[detail] +                                               const Polynomial& denominator)
[detail]    {
[detail] -    PolynomialFraction phi(2, 2);
[detail] +    Polynomial phi(2);
[detail]      double eah=ea-eh;
[detail]      double ezah=eh*(ez-ea);
[detail] -    phi.numerator().setCoefficient(0, -eh*ea*ea);
[detail] -    phi.numerator().setCoefficient(1, ea*ea+eh*ez);
[detail] -    phi.numerator().setCoefficient(2, -eh);
[detail] -    phi.denominator().setCoefficient(0, ezah*ezah);
[detail] -    phi.denominator().setCoefficient(1, 2.0*eah*ezah);
[detail] -    phi.denominator().setCoefficient(2, eah*eah);
[detail] -    phi*=(ez-eh)/ta;
[detail] -    phi-=1.0;
[detail] +    phi.setCoefficient(0, ezah*ezah);
[detail] +    phi.setCoefficient(1, 2.0*eah*ezah);
[detail] +    phi.setCoefficient(2, eah*eah);
[detail] +    phi/=ca*(eah*ea+ezah);
[detail] +    phi-=denominator;
[detail]      phi*=phi;
[detail]      return phi;
[detail]    }
[detail] @@ -385,9 +312,6 @@
[detail]  #endif
[detail]  
[detail]      if(ez*eh<0.0 || ez*ea<0.0) {      
[detail] -      val.ellipticity=std::numeric_limits<double>::quiet_NaN();
[detail] -      val.horizontalNoise=std::numeric_limits<double>::quiet_NaN();
[detail] -      val.verticalNoise=std::numeric_limits<double>::quiet_NaN();
[detail]  #ifdef ELLIPTICITY_EXTRA_VALUES
[detail]        val.extraValues->at(0)=-1.0;
[detail]  #endif
[detail] @@ -395,9 +319,6 @@
[detail]      }
[detail]  
[detail]      if(fabs(eh)>fabs(ea) || fabs(ea)>fabs(ez)) {      
[detail] -      val.ellipticity=std::numeric_limits<double>::quiet_NaN();
[detail] -      val.horizontalNoise=std::numeric_limits<double>::quiet_NaN();
[detail] -      val.verticalNoise=std::numeric_limits<double>::quiet_NaN();
[detail]  #ifdef ELLIPTICITY_EXTRA_VALUES
[detail]        val.extraValues->at(0)=-2.0;
[detail]  #endif
[detail] @@ -406,9 +327,6 @@
[detail]  
[detail]      
[detail]      if(ca<0.0) {
[detail] -      val.ellipticity=std::numeric_limits<double>::quiet_NaN();
[detail] -      val.horizontalNoise=std::numeric_limits<double>::quiet_NaN();
[detail] -      val.verticalNoise=std::numeric_limits<double>::quiet_NaN();
[detail]  #ifdef ELLIPTICITY_EXTRA_VALUES
[detail]        val.extraValues->at(0)=0.0;
[detail]  #endif
[detail] @@ -419,15 +337,24 @@
[detail]      PolynomialFraction phi(0, 0);
[detail]      int rootCount;
[detail]  
[detail] +    phi.denominator()=denominatorPhi(eh, ez);
[detail]      if(ch>0.0) {
[detail]        if(cz>0.0) {
[detail] -        phi=phiH(eh, ez, ch)+phiZ(eh, ez, cz);
[detail] +        
[detail] +        phi.numerator()=numeratorPhiH(eh, ez, ch, phi.denominator())
[detail] +                       +numeratorPhiZ(eh, ez, cz, phi.denominator());
[detail] +        phi.denominator()*=phi.denominator();
[detail] +        
[detail]          xir=solve(phi, rootCount, eh, ez, 2.0);
[detail]  #ifdef ELLIPTICITY_EXTRA_VALUES
[detail]          val.extraValues->at(0)=1.0;
[detail]  #endif
[detail]         } else {
[detail] -        phi=phiH(eh, ez, ch)+phiA(eh, ez, ea, ca);
[detail] +        
[detail] +        phi.numerator()=numeratorPhiH(eh, ez, ch, phi.denominator())
[detail] +                       +numeratorPhiA(eh, ez, ea, ca, phi.denominator());
[detail] +        phi.denominator()*=phi.denominator();
[detail] +        
[detail]          xir=solve(phi, rootCount, eh, ez, 100.0);
[detail]  #ifdef ELLIPTICITY_EXTRA_VALUES
[detail]          val.extraValues->at(0)=2.0;
[detail] @@ -435,15 +362,16 @@
[detail]        }
[detail]      } else {
[detail]        if(cz>0.0) {
[detail] -        phi=phiZ(eh, ez, cz)+phiA(eh, ez, ea, ca);
[detail] +        
[detail] +        phi.numerator()=numeratorPhiZ(eh, ez, cz, phi.denominator())
[detail] +                       +numeratorPhiA(eh, ez, ea, ca, phi.denominator());
[detail] +        phi.denominator()*=phi.denominator();
[detail] +        
[detail]          xir=solve(phi, rootCount, eh, ez, 100.0);
[detail]  #ifdef ELLIPTICITY_EXTRA_VALUES
[detail]          val.extraValues->at(0)=3.0;
[detail]  #endif
[detail]        } else {
[detail] -        val.ellipticity=std::numeric_limits<double>::quiet_NaN();
[detail] -        val.horizontalNoise=std::numeric_limits<double>::quiet_NaN();
[detail] -        val.verticalNoise=std::numeric_limits<double>::quiet_NaN();
[detail]  #ifdef ELLIPTICITY_EXTRA_VALUES
[detail]          val.extraValues->at(0)=-4.0;
[detail]  #endif
[detail] @@ -462,17 +390,11 @@
[detail]        val.horizontalNoise=sxir*(cxir*ez-sxir);
[detail]        val.verticalNoise=cxir*(sxir/eh-cxir);
[detail]        if(val.horizontalNoise<0.0 || val.verticalNoise<0.0) {
[detail] -        val.ellipticity=std::numeric_limits<double>::quiet_NaN();
[detail] -        val.verticalNoise=std::numeric_limits<double>::quiet_NaN();
[detail] -        val.horizontalNoise=std::numeric_limits<double>::quiet_NaN();
[detail]  #ifdef ELLIPTICITY_EXTRA_VALUES
[detail]          val.extraValues->at(0)=-3.0;
[detail]  #endif
[detail]        }
[detail]      } else {
[detail] -      val.ellipticity=std::numeric_limits<double>::quiet_NaN();
[detail] -      val.verticalNoise=std::numeric_limits<double>::quiet_NaN();
[detail] -      val.horizontalNoise=std::numeric_limits<double>::quiet_NaN();
[detail]  #ifdef ELLIPTICITY_EXTRA_VALUES
[detail]        val.extraValues->at(0)=-5.0;
[detail]  #endif
[detail]      src/ActiveConvEllipticityEngine.cpp:  version-4.2.1	not modified
[detail]             src/ActiveConvFKRayleigh.cpp:  version-4.2.1	modified out of comments
[detail] --- src/ActiveConvFKRayleigh.cpp-version-4.2.1-stripped	2025-09-28 04:01:15.399553238 +0200
[detail] +++ src/ActiveConvFKRayleigh.cpp-HEAD-stripped	2025-09-28 04:01:15.403553257 +0200
[detail] @@ -42,7 +42,7 @@
[detail]      
[detail]      src+=_crossSpectrum->sourceOffset();
[detail]      
[detail] -    setPowerEngine(new FKPower(_crossSpectrum->array().count(), 2));
[detail] +    setPowerEngine(_crossSpectrum->array().count());
[detail]      powerEngine()->setCrossSpectrum(_crossSpectrum->matrix());
[detail]      
[detail]      
[detail] @@ -63,7 +63,7 @@
[detail]  
[detail]    void ActiveConvFKRayleigh::shareSteering(const ActiveConvFKRayleigh * s)
[detail]    {
[detail] -    setPowerEngine(new FKPower(_crossSpectrum->array().count(), 2));
[detail] +    setPowerEngine(_crossSpectrum->array().count());
[detail]      powerEngine()->setCrossSpectrum(_crossSpectrum->matrix());
[detail]      _steering=s->_steering;
[detail]    }
[detail] @@ -78,7 +78,10 @@
[detail]      GridSearch1D * grid=new GridSearch1D(3);
[detail]      grid->setRelativePrecision(0, param.velocityRelativePrecision());
[detail]      grid->setFunction(this);
[detail] -    grid->setGrid(param.gridStep(), param.effectiveGridSize(), param.gridStep());
[detail] +    if(!grid->setGrid(param.gridStep(), param.effectiveGridSize(), param.gridStep())) {
[detail] +      delete grid;
[detail] +      return nullptr;
[detail] +    }
[detail]      return grid;
[detail]    }
[detail]  
[detail]          src/ActiveConvFKRayleighAll.cpp:  version-4.2.1	modified out of comments
[detail] --- src/ActiveConvFKRayleighAll.cpp-version-4.2.1-stripped	2025-09-28 04:01:15.419553335 +0200
[detail] +++ src/ActiveConvFKRayleighAll.cpp-HEAD-stripped	2025-09-28 04:01:15.423553354 +0200
[detail] @@ -40,7 +40,7 @@
[detail]    void ActiveConvFKRayleighAll::setFunctionValue(Attributes& a) const
[detail]    {
[detail]      a.ell.setUnitExp(a.x);
[detail] -    const Vector<Complex>& e=FKSteering::twoComponentRayleighCross(a.ell, powerEngine());
[detail] +    const Vector<Complex>& e=FKSteering::twoComponentRayleighAll(a.ell, powerEngine());
[detail]      powerEngine()->setConventionalValue(e);
[detail]      a.value=powerEngine()->value();
[detail]    }
[detail] @@ -48,8 +48,8 @@
[detail]    void ActiveConvFKRayleighAll::setFunctionDerivatives(Attributes& a) const
[detail]    {
[detail]      
[detail] -    const Vector<Complex>& de=FKSteering::twoComponentRayleighCrossGradient(a.ell, powerEngine());
[detail] -    a.slope=2.0*powerEngine()->factorN()*powerEngine()->ellipticityGradient(de);
[detail] +    const Vector<Complex>& de=FKSteering::twoComponentRayleighAllGradient(a.ell, powerEngine());
[detail] +    a.slope=2.0*powerEngine()->factorN()*powerEngine()->gradient(de);
[detail]      
[detail]      a.concavity=powerEngine()->factorN()*powerEngine()->xiSecondDerivative();
[detail]      a.concavity=2.0*(a.concavity-a.value);
[detail] @@ -62,7 +62,7 @@
[detail]  
[detail]      Complex ell;
[detail]      ell.setUnitExp(kell[2]);
[detail] -    const Vector<Complex>& e0=FKSteering::twoComponentRayleighCross(ell, powerEngine());
[detail] +    const Vector<Complex>& e0=FKSteering::twoComponentRayleighAll(ell, powerEngine());
[detail]      powerEngine()->setConventionalValue(e0);
[detail]      double p=powerEngine()->value();
[detail]      _steering->twoComponentSensorProjections(powerEngine());
[detail] @@ -82,7 +82,7 @@
[detail]  
[detail]      for(double k=0; k<6.28; k+=0.001) {
[detail]        oneComponentSteering(k);
[detail] -      const Vector<Complex>& e0=FKSteering::twoComponentRayleighCross(ell, powerEngine());
[detail] +      const Vector<Complex>& e0=FKSteering::twoComponentRayleighAll(ell, powerEngine());
[detail]        powerEngine()->setConventionalValue(e0);
[detail]        double p=powerEngine()->value();
[detail]        _steering->twoComponentSensorProjections(powerEngine());
[detail]       src/ActiveConvFKRayleighRadial.cpp:  version-4.2.1	modified out of comments
[detail] --- src/ActiveConvFKRayleighRadial.cpp-version-4.2.1-stripped	2025-09-28 04:01:15.439553432 +0200
[detail] +++ src/ActiveConvFKRayleighRadial.cpp-HEAD-stripped	2025-09-28 04:01:15.443553450 +0200
[detail] @@ -36,7 +36,7 @@
[detail]    {
[detail]      
[detail]      const Vector<Complex>& de=FKSteering::twoComponentRayleighRadialGradient(a.ell, powerEngine());
[detail] -    a.slope=2.0*powerEngine()->factorN()*powerEngine()->ellipticityGradient(de);
[detail] +    a.slope=2.0*powerEngine()->factorN()*powerEngine()->gradient(de);
[detail]      
[detail]      double tan=a.ell.im()/a.ell.re();
[detail]      a.concavity=powerEngine()->factorN()*powerEngine()->xiSecondDerivative();
[detail]     src/ActiveConvFKRayleighVertical.cpp:  version-4.2.1	modified out of comments
[detail] --- src/ActiveConvFKRayleighVertical.cpp-version-4.2.1-stripped	2025-09-28 04:01:15.459553528 +0200
[detail] +++ src/ActiveConvFKRayleighVertical.cpp-HEAD-stripped	2025-09-28 04:01:15.463553547 +0200
[detail] @@ -36,7 +36,7 @@
[detail]    {
[detail]      
[detail]      const Vector<Complex>& de=FKSteering::twoComponentRayleighVerticalGradient(a.ell, powerEngine());
[detail] -    a.slope=2.0*powerEngine()->factorN()*powerEngine()->ellipticityGradient(de);
[detail] +    a.slope=2.0*powerEngine()->factorN()*powerEngine()->gradient(de);
[detail]      
[detail]      double cot=a.ell.re()/a.ell.im();
[detail]      a.concavity=powerEngine()->factorN()*powerEngine()->xiSecondDerivative();
[detail]             src/ActiveConvFKVertical.cpp:  version-4.2.1	modified out of comments
[detail] --- src/ActiveConvFKVertical.cpp-version-4.2.1-stripped	2025-09-28 04:01:15.479553625 +0200
[detail] +++ src/ActiveConvFKVertical.cpp-HEAD-stripped	2025-09-28 04:01:15.483553645 +0200
[detail] @@ -37,7 +37,7 @@
[detail]      
[detail]      src+=_crossSpectrum->sourceOffset();
[detail]      
[detail] -    setPowerEngine(new FKPower(_crossSpectrum->array().count(), 1));
[detail] +    setPowerEngine(_crossSpectrum->array().count());
[detail]      powerEngine()->setCrossSpectrum(_crossSpectrum->matrix());
[detail]      
[detail]      
[detail] @@ -57,7 +57,10 @@
[detail]      GridSearch1D * grid=new GridSearch1D(2);
[detail]      grid->setRelativePrecision(0, param.velocityRelativePrecision());
[detail]      grid->setFunction(this);
[detail] -    grid->setGrid(param.gridStep(), param.effectiveGridSize(), param.gridStep());
[detail] +    if(!grid->setGrid(param.gridStep(), param.effectiveGridSize(), param.gridStep())) {
[detail] +      delete grid;
[detail] +      return nullptr;
[detail] +    }
[detail]      return grid;
[detail]    }
[detail]  
[detail]               src/ActiveFKParameters.cpp:  version-4.2.1	not modified
[detail]                 src/ActiveFKSteering.cpp:  version-4.2.1	not modified
[detail]                     src/ActiveFKTask.cpp:  version-4.2.1	not modified
[detail]              src/ActiveFKTaskManager.cpp:  version-4.2.1	not modified
[detail]                     src/ActiveFKTool.cpp:  version-4.2.1	not modified
[detail]                  src/ActiveFKToolSet.cpp:  version-4.2.1	not modified
[detail]                   src/ActiveFKWorker.cpp:  version-4.2.1	modified out of comments
[detail] --- src/ActiveFKWorker.cpp-version-4.2.1-stripped	2025-09-28 04:01:15.595554185 +0200
[detail] +++ src/ActiveFKWorker.cpp-HEAD-stripped	2025-09-28 04:01:15.599554205 +0200
[detail] @@ -72,7 +72,7 @@
[detail]        case ActiveFKParameters::Raw:
[detail]          break;
[detail]        case ActiveFKParameters::Spectrum:
[detail] -        _grid->multiplyValues(YAxis, frequencyIndex, 1.0/crossSpectrum()->matrix()->trace(0.0).re());
[detail] +        _grid->multiplyValues(YAxis, frequencyIndex, 1.0/crossSpectrum()->matrix()->trace().re());
[detail]          break;
[detail]        case ActiveFKParameters::Maximum: {
[detail]            Curve<Point2D> c=_grid->crossSection(YAxis, frequencyIndex);
[detail]               src/ActiveHRFKRayleigh.cpp:  version-4.2.1	modified out of comments
[detail] --- src/ActiveHRFKRayleigh.cpp-version-4.2.1-stripped	2025-09-28 04:01:15.615554282 +0200
[detail] +++ src/ActiveHRFKRayleigh.cpp-HEAD-stripped	2025-09-28 04:01:15.619554302 +0200
[detail] @@ -36,7 +36,7 @@
[detail]    void ActiveHRFKRayleigh::setFunctionValue(Attributes& a) const
[detail]    {
[detail]      a.ell.setUnitExp(a.x);
[detail] -    const Vector<Complex>& e=FKSteering::twoComponentRayleighCross(a.ell, powerEngine());
[detail] +    const Vector<Complex>& e=FKSteering::twoComponentRayleighAll(a.ell, powerEngine());
[detail]      powerEngine()->setHighResolutionValue(e);
[detail]      a.value=powerEngine()->value();
[detail]    }
[detail] @@ -45,8 +45,8 @@
[detail]    {
[detail]      double value2=a.value*a.value;
[detail]      
[detail] -    const Vector<Complex>& de=FKSteering::twoComponentRayleighCrossGradient(a.ell, powerEngine());
[detail] -    a.slope=-2.0*value2*powerEngine()->ellipticityGradient(de);
[detail] +    const Vector<Complex>& de=FKSteering::twoComponentRayleighAllGradient(a.ell, powerEngine());
[detail] +    a.slope=-2.0*value2*powerEngine()->gradient(de);
[detail]      
[detail]      a.concavity=powerEngine()->xiSecondDerivative();
[detail]      a.concavity=2.0*(a.slope*a.slope/a.value+a.value-value2*a.concavity);
[detail]               src/ActiveHRFKVertical.cpp:  version-4.2.1	not modified
[detail]                        src/ArrayCore.cpp:  version-4.2.1	not modified
[detail]               src/ArrayCrossSpectrum.cpp:  version-4.2.1	modified out of comments
[detail] --- src/ArrayCrossSpectrum.cpp-version-4.2.1-stripped	2025-09-28 04:01:15.671554553 +0200
[detail] +++ src/ArrayCrossSpectrum.cpp-HEAD-stripped	2025-09-28 04:01:15.675554571 +0200
[detail] @@ -35,12 +35,14 @@
[detail]        _eastIndex=1;
[detail]        break;
[detail]      case ArrayStations::ThreeComponents:
[detail] +    case ArrayStations::ThreeComponentsAndStrain:
[detail]        _verticalIndex=0;
[detail]        _northIndex=1;
[detail]        _eastIndex=2;
[detail]        break;
[detail]      }
[detail]      setStations(array);
[detail] +    setInstrumentalResponses();
[detail]    }
[detail]  
[detail]    
[detail] @@ -62,8 +64,7 @@
[detail]      int n=_stations.count();
[detail]      for(int i=0; i<n; i++ ) {
[detail]        stat=_stations.at(i);
[detail] -      if(!stat->setSpectrumValue(win, _parameters, _timeWindows->plan(),
[detail] -                                 _timeWindows->taper()) ||
[detail] +      if(!stat->setSpectrumValue(win, _parameters, *_timeWindows) ||
[detail]           !stat->lockSamples()) {
[detail]          for(i--; i>=0; i--) {
[detail]            _stations.at(i)->unlockSamples();
[detail] @@ -97,11 +98,69 @@
[detail]      }
[detail]    }
[detail]  
[detail] +  void ArrayCrossSpectrum::setInstrumentalResponses()
[detail] +  {
[detail] +    TODO("Add array parameter for instrumental correction");
[detail] +    
[detail] +    InstrumentalResponse * resp=new InstrumentalResponse;
[detail] +    resp->addZero(Complex());
[detail] +    resp->addZero(Complex());
[detail] +    resp->addPole(Complex(-22.211059, 22.217768));
[detail] +    resp->addPole(Complex(-22.211059, -22.217768));
[detail] +    resp->setFrequencyFactor(2.0*M_PI);
[detail] +    resp->setNormalizationFactor(1.0);
[detail] +    resp->setFilterFrequencies(QString("0.1 0.2 100 125"));
[detail] +
[detail] +    int n=_stations.size();
[detail] +    for(int i=0; i<n; i++) {
[detail] +      ArrayStationSignals * sig=_stations.at(i);
[detail] +      if(sig->originalSignals()->firstValidSignal()->metaData()->amplitudeUnit()==SignalMetaData::Velocity) {
[detail] +        sig->setInstrumentalResponse(resp);
[detail] +      }
[detail] +    }
[detail] +  }
[detail] +
[detail] +  void ArrayCrossSpectrum::setTimeWindows(const ArrayTimeWindows * tw)
[detail] +  {
[detail] +    _timeWindows=tw;
[detail] +    int n=_stations.size();
[detail] +    for(int i=0; i<n; i++) {
[detail] +      _stations.at(i)->clearInstrumentalResponseValues();
[detail] +    }
[detail] +  }
[detail] +
[detail]    void ArrayCrossSpectrum::resetMatrix()
[detail]    {
[detail]      _matrix->zero();
[detail]    }
[detail]  
[detail] +  void ArrayCrossSpectrum::add(HermitianMatrix& covmat, const Vector<Complex>& sig) const
[detail] +  {
[detail] +    if(parameters()->normalizeCrossSpectrum()) {
[detail] +      HermitianMatrix csi;
[detail] +      csi.crossProducts(sig);
[detail] +      csi/=csi.trace();
[detail] +      covmat+=csi;
[detail] +    } else {
[detail] +      covmat.addCrossProducts(sig);
[detail] +    }
[detail] +  }
[detail] +
[detail] +  const Complex& ArrayCrossSpectrum::eastSpectrumValueAt(int index)
[detail] +  {
[detail] +    return _stations.at(index)->spectrumValue(_eastIndex);
[detail] +  }
[detail] +
[detail] +  const Complex& ArrayCrossSpectrum::northSpectrumValueAt(int index)
[detail] +  {
[detail] +    return _stations.at(index)->spectrumValue(_northIndex);
[detail] +  }
[detail] +
[detail] +  const Complex& ArrayCrossSpectrum::verticalSpectrumValueAt(int index)
[detail] +  {
[detail] +    return _stations.at(index)->spectrumValue(_verticalIndex);
[detail] +  }
[detail] +
[detail]    void ArrayCrossSpectrum::addVertical()
[detail]    {
[detail]  #ifdef PROCESS_TIMING
[detail] @@ -111,14 +170,14 @@
[detail]  #endif
[detail]      int stationCount=_stations.count();
[detail]  
[detail] -    ComplexMatrix& covmat=*_matrix;
[detail] -    ComplexMatrix sig(stationCount, 1);
[detail] +    HermitianMatrix& covmat=*_matrix;
[detail] +    PrivateVector<Complex> sig(stationCount);
[detail]  
[detail]      if(parameters()->frequencyBandwidth()==0.0) {
[detail]        for(int is=0; is<stationCount; is++) {
[detail] -        sig.at(is, 0)=_stations.at(is)->spectrumValue(_verticalIndex);
[detail] +        sig[is]=_stations.at(is)->spectrumValue(_verticalIndex);
[detail]        }
[detail] -      covmat+=sig*sig.conjugate().transposed();
[detail] +      add(covmat, sig);
[detail]      } else {
[detail]        const GaussianFrequencyBand& frequencyFilter=*_timeWindows->frequencyFilter();
[detail]        int nFreq=frequencyFilter.maximumIndex();
[detail] @@ -126,11 +185,11 @@
[detail]        for(int iFreq=frequencyFilter.minimumIndex(); iFreq<=nFreq; iFreq++) {
[detail]          filter=frequencyFilter.taperValue(iFreq);
[detail]          for(int is=0; is<stationCount; is++) {
[detail] -          Complex& s=sig.at(is, 0);
[detail] +          Complex& s=sig[is];
[detail]            s=_stations.at(is)->spectrumValue(_verticalIndex, iFreq);
[detail]            s*=filter;
[detail]          }
[detail] -        covmat+=sig*sig.conjugate().transposed();
[detail] +        add(covmat, sig);
[detail]        }
[detail]      }
[detail]  #ifdef PROCESS_TIMING
[detail] @@ -142,7 +201,7 @@
[detail]    }
[detail]  
[detail]    
[detail] -  void ArrayCrossSpectrum::addHorizontal(ComplexMatrix& covmat)
[detail] +  void ArrayCrossSpectrum::addHorizontal(HermitianMatrix& covmat)
[detail]    {
[detail]  #ifdef PROCESS_TIMING
[detail]      QElapsedTimer chrono;
[detail] @@ -151,16 +210,16 @@
[detail]  #endif
[detail]      int stationCount=_stations.count();
[detail]  
[detail] -    ComplexMatrix sig(2*stationCount, 1);
[detail] +    PrivateVector<Complex> sig(2*stationCount);
[detail]  
[detail]      if(parameters()->frequencyBandwidth()==0.0) {
[detail]        for(int is=0; is<stationCount; is++) {
[detail] -        sig.at(is, 0)=_stations.at(is)->spectrumValue(_eastIndex);
[detail] +        sig[is]=_stations.at(is)->spectrumValue(_eastIndex);
[detail]        }
[detail]        for(int is=0; is<stationCount; is++) {
[detail] -        sig.at(stationCount+is, 0)=_stations.at(is)->spectrumValue(_northIndex);
[detail] +        sig[stationCount+is]=_stations.at(is)->spectrumValue(_northIndex);
[detail]        }
[detail] -      covmat+=sig*sig.conjugate().transposed();
[detail] +      add(covmat, sig);
[detail]      } else {
[detail]        const GaussianFrequencyBand& frequencyFilter=*_timeWindows->frequencyFilter();
[detail]        int nFreq=frequencyFilter.maximumIndex();
[detail] @@ -168,16 +227,16 @@
[detail]        for(int iFreq=frequencyFilter.minimumIndex(); iFreq<=nFreq; iFreq++) {
[detail]          filter=frequencyFilter.taperValue(iFreq);
[detail]          for(int is=0; is<stationCount; is++) {
[detail] -          Complex& s=sig.at(is, 0);
[detail] +          Complex& s=sig[is];
[detail]            s=_stations.at(is)->spectrumValue(_eastIndex, iFreq);
[detail]            s*=filter;
[detail]          }
[detail]          for(int is=0; is<stationCount; is++) {
[detail] -          Complex& s=sig.at(stationCount+is, 0);
[detail] +          Complex& s=sig[stationCount+is];
[detail]            s=_stations.at(is)->spectrumValue(_northIndex, iFreq);
[detail]            s*=filter;
[detail]          }
[detail] -        covmat+=sig*sig.conjugate().transposed();
[detail] +        add(covmat, sig);
[detail]        }
[detail]      }
[detail]  #ifdef PROCESS_TIMING
[detail]                  src/ArrayParameters.cpp:  version-4.2.1	modified out of comments
[detail] --- src/ArrayParameters.cpp-version-4.2.1-stripped	2025-09-28 04:01:15.691554649 +0200
[detail] +++ src/ArrayParameters.cpp-HEAD-stripped	2025-09-28 04:01:15.695554669 +0200
[detail] @@ -15,7 +15,9 @@
[detail]      _frequencySampling.setStep(1.025);
[detail]      _frequencyBandwidth=0.05;
[detail]      _oversamplingFactor=1.0;
[detail] -    _selectArrayRadius=0.0;
[detail] +    _normalizeCrossSpectrum=false;
[detail] +    _selectArrayRadius=std::numeric_limits<double>::quiet_NaN();
[detail] +    _selectArrayDirection=std::numeric_limits<double>::quiet_NaN();
[detail]      _selectDurationFactor=0.0;
[detail]      _magneticDeclination=0.0;
[detail]      
[detail] @@ -35,7 +37,7 @@
[detail]  
[detail]    int ArrayParameters::keywordCount(PARAMETERS_KEYWORDCOUNT_ARGS) const
[detail]    {
[detail] -    return 8+AbstractParameters::keywordCount();
[detail] +    return 11+AbstractParameters::keywordCount();
[detail]    }
[detail]  
[detail]    int ArrayParameters::totalKeywordCount(PARAMETERS_TOTALKEYWORDCOUNT_ARGS) const
[detail] @@ -56,10 +58,13 @@
[detail]      keywords.add(prefix+"SELECT_DURATION_FACTOR", this, baseIndex+1);
[detail]      keywords.add(prefix+"SELECT_ARRAY_CENTER", this, baseIndex+2);
[detail]      keywords.add(prefix+"SELECT_ARRAY_RADIUS", this, baseIndex+3);
[detail] +    keywords.add(prefix+"SELECT_ARRAY_DIRECTION", this, baseIndex+8);
[detail] +    keywords.add(prefix+"EXCLUDE_STATION_NAME_PATTERN", this, baseIndex+10);
[detail]      keywords.add(prefix+"OUTPUT_BASE_NAME", this, baseIndex+4);
[detail]      keywords.add(prefix+"MAGNETIC_DECLINATION", this, baseIndex+5);
[detail]      keywords.add(prefix+"OUTPUT_FILE", this, baseIndex+6);  
[detail]      keywords.add(prefix+"OVER_SAMPLING_FACTOR"+suffix, this, baseIndex+7);
[detail] +    keywords.add(prefix+"NORMALIZE_CROSSSPECTRUM"+suffix, this, baseIndex+9);
[detail]      _timeLimits.collectKeywords(keywords, prefix, suffix);
[detail]      _windowing.collectKeywords(keywords, prefix, suffix);
[detail]      _frequencySampling.collectKeywords(keywords, prefix, "_FREQUENCY"+suffix);
[detail] @@ -81,20 +86,44 @@
[detail]      log+="# Required when using short and fixed length time windows, avoid classical oblique lines visible in the results\n"
[detail]           "# when the number of frequency samples is higher than the number of points in the spectra.\n";
[detail]      log+=prefix+"OVER_SAMPLING_FACTOR"+suffix+"="+QString::number(_oversamplingFactor)+"\n";
[detail] +    log+="# Before stacking, the cross-spectrum matrix is normalized (the same factor for all components)\n";
[detail] +    log+=prefix+"NORMALIZE_CROSSSPECTRUM"+suffix+"="+(_normalizeCrossSpectrum ? "y\n" : "n\n");
[detail] +    log+=arraySelectionToString(prefix, suffix);
[detail] +    log+=magneticDeclinationToString(prefix, suffix);
[detail] +    log+=prefix+"OUTPUT_BASE_NAME"+suffix+"="+_outputBaseName+"\n";
[detail] +    return log;
[detail] +  }
[detail] +
[detail] +  QString ArrayParameters::arraySelectionToString(PARAMETERS_TOSTRING_ARGS_IMPL) const
[detail] +  {
[detail] +    QString log;
[detail]      log+="# A station is selected for processing only if it is available over a duration greater or equal to\n"
[detail]           "# SELECT_DURATION_FACTOR*[total required duration]. The factor can vary from 0 to 1\n";
[detail]      log+=prefix+"SELECT_DURATION_FACTOR"+suffix+"="+QString::number(_selectDurationFactor)+"\n";
[detail] -    log+="# A station is selected for processing only if it is located at less than SELECT_ARRAY_RADIUS\n"
[detail] -         "# from SELECT_ARRAY_CENTER. SELECT_ARRAY_CENTER is the X, Y coordinates of the center or the name of a station.\n";
[detail] +    log+="# SELECT_ARRAY_CENTER is the X, Y coordinates of the center or the name of a station. It is used by\n"
[detail] +         "# SELECT_ARRAY_RADIUS or SELECT_ARRAY_DIRECTION\n";
[detail]      log+=prefix+"SELECT_ARRAY_CENTER"+suffix+"="+_selectArrayCenter+"\n";
[detail] +    log+="# A station is selected for processing only if it is located at less than SELECT_ARRAY_RADIUS\n"
[detail] +         "# from SELECT_ARRAY_CENTER. If the radius is NaN, this option is ignored.\n";
[detail]      log+=prefix+"SELECT_ARRAY_RADIUS"+suffix+"="+QString::number(_selectArrayRadius)+"\n";
[detail] +    log+="# A station is selected for processing only if it is located in the half plane located at SELECT_ARRAY_CENTER.\n"
[detail] +         "# The direction is the angle in degrees counted clockwize from the north of the normal to the limit of the half\n"
[detail] +         "# plane. If the direction is NaN, this option is ignored.\n";
[detail] +    log+=prefix+"SELECT_ARRAY_DIRECTION"+suffix+"(deg)="+QString::number(_selectArrayDirection)+"\n";
[detail] +    log+="# All station names matching the pattern (regular expression) are excluded\n";
[detail] +    log+=prefix+"EXCLUDE_STATION_NAME_PATTERN"+suffix+"="+_excludeStationNamePattern+"\n";
[detail] +    return log;
[detail] +  }
[detail] +
[detail] +  QString ArrayParameters::magneticDeclinationToString(PARAMETERS_TOSTRING_ARGS_IMPL) const
[detail] +  {
[detail] +    QString log;
[detail]      log+="# Assuming that the north of sensors is aligned to the magnetic north and sensor coordinates to UTM grid,\n"
[detail]           "# relative coordinates between stations are calculated with a correction for the difference between the\n"
[detail]           "# geographical and the local UTM norths and for the magnetic declination. The later can be, for instance,\n"
[detail]           "# calculated at https:
[detail]           "# The value must be in degrees (positive for eastwards and negative for westwards).\n";
[detail]      log+=prefix+"MAGNETIC_DECLINATION"+suffix+"="+QString::number(_magneticDeclination)+"\n";
[detail] -    log+=prefix+"OUTPUT_BASE_NAME"+suffix+"="+_outputBaseName+"\n";
[detail]      return log;
[detail]    }
[detail]  
[detail] @@ -114,7 +143,7 @@
[detail]        return true;
[detail]      case 3:
[detail]        _selectArrayRadius=value.toDouble(&ok);
[detail] -      return ok && _selectArrayRadius>=0.0;
[detail] +      return ok;
[detail]      case 4:
[detail]        _outputBaseName=value;
[detail]        return true;
[detail] @@ -128,6 +157,15 @@
[detail]      case 7:
[detail]        _oversamplingFactor=value.toDouble(&ok);
[detail]        return ok;
[detail] +    case 8:
[detail] +      _selectArrayDirection=value.toDouble(&ok);
[detail] +      return ok;
[detail] +    case 9:
[detail] +      _normalizeCrossSpectrum=Number::toBoolean(value, ok);
[detail] +      return ok;
[detail] +    case 10:
[detail] +      _excludeStationNamePattern=value;
[detail] +      return true;
[detail]      default:
[detail]        break;
[detail]      }
[detail] @@ -141,7 +179,9 @@
[detail]      VectorList<int> sel;
[detail]      int n=array.array()->count();
[detail]  
[detail] -    if(n>0) {
[detail] +    if(n==0) {
[detail] +      return true;
[detail] +    }
[detail]        
[detail]        
[detail]        
[detail] @@ -158,8 +198,8 @@
[detail]            SparseTimeRange ssr=s.timeRange(r);
[detail]            APP_LOG(2, tr("Station %1 avalaible duration: %2 s\n")
[detail]                    .arg(s.name())
[detail] -                  .arg(ssr.totalLength()));
[detail] -          if(ssr.totalLength()>=requiredDuration) {
[detail] +                .arg(ssr.lengthSeconds()));
[detail] +        if(ssr.lengthSeconds()>=requiredDuration) {
[detail]              sel.append(i);
[detail]            }
[detail]          }
[detail] @@ -171,11 +211,9 @@
[detail]          }
[detail]        }
[detail]  
[detail] -      if(_selectArrayRadius>0.0 && !_selectArrayCenter.isEmpty()) {
[detail] -        APP_LOG(1, tr("Checking location of stations...\n"));
[detail] -        n=array.count();
[detail] -        sel.clear();
[detail]          Point2D center;
[detail] +    n=array.count();
[detail] +    if(!_selectArrayCenter.isEmpty()) {
[detail]          if(!center.fromString(_selectArrayCenter)) {
[detail]            int i;
[detail]            for(i=0; i<n; i++) {
[detail] @@ -190,8 +228,14 @@
[detail]              return false;
[detail]            }
[detail]          }
[detail] +    }
[detail] +
[detail] +    if(isnormal(_selectArrayRadius) &&
[detail] +       _selectArrayRadius>0.0 &&
[detail] +       !_selectArrayCenter.isEmpty()) {
[detail]          APP_LOG(1, tr("Looking for stations at maximum %1 m from %2\n")
[detail]                  .arg(_selectArrayRadius).arg(center.toString('f', 3)));
[detail] +      sel.clear();
[detail]          for(int i=0; i<n; i++) {
[detail]            APP_LOG(2, tr("Station %1 at %2 m from center\n")
[detail]                    .arg(array.name(i))
[detail] @@ -207,6 +251,52 @@
[detail]                             .arg(array.toString(ArraySelection::Relative)));
[detail]          }
[detail]        }
[detail] +
[detail] +    n=array.count();
[detail] +    if(isnormal(_selectArrayDirection) &&
[detail] +       !_selectArrayCenter.isEmpty()) {
[detail] +      APP_LOG(1, tr("Looking for stations towards %2 from %2\n")
[detail] +                     .arg(_selectArrayDirection).arg(center.toString('f', 3)));
[detail] +      double a=Angle::geographicToMath(Angle::degreesToRadians(_selectArrayDirection));
[detail] +      Point2D ref(cos(a), sin(a));
[detail] +      sel.clear();
[detail] +      for(int i=0; i<n; i++) {
[detail] +        Point2D p=array.position(i);
[detail] +        p-=center;
[detail] +        APP_LOG(2, tr("Station %1 in direction %1 m from center\n")
[detail] +                       .arg(array.name(i))
[detail] +                       .arg(p.toString()));
[detail] +        if(p.scalarProduct(ref)>=0.0) {
[detail] +          sel.append(i);
[detail] +        }
[detail] +      }
[detail] +      array.select(sel);
[detail] +      if(array.count()<n) {
[detail] +        App::log(1, tr("Selected %1 stations:\n%2")
[detail] +                        .arg(array.count())
[detail] +                        .arg(array.toString(ArraySelection::Relative)));
[detail] +      }
[detail] +    }
[detail] +
[detail] +    n=array.count();
[detail] +    if(!_excludeStationNamePattern.isEmpty()) {
[detail] +      QRegularExpression rx(_excludeStationNamePattern);
[detail] +      sel.clear();
[detail] +      for(int i=0; i<n; i++) {
[detail] +        const QString& name=array.name(i);
[detail] +        if(!name.contains(rx)) {
[detail] +          sel.append(i);
[detail] +        } else {
[detail] +          APP_LOG(2, tr("Station %1 excluded\n")
[detail] +                         .arg(name));
[detail] +        }
[detail] +      }
[detail] +      array.select(sel);
[detail] +      if(array.count()<n) {
[detail] +        App::log(1, tr("Selected %1 stations:\n%2")
[detail] +                        .arg(array.count())
[detail] +                        .arg(array.toString(ArraySelection::Relative)));
[detail] +      }
[detail]      }
[detail]      return true;
[detail]    }
[detail]                   src/ArraySelection.cpp:  version-4.2.1	modified out of comments
[detail] --- src/ArraySelection.cpp-version-4.2.1-stripped	2025-09-28 04:01:15.711554746 +0200
[detail] +++ src/ArraySelection.cpp-HEAD-stripped	2025-09-28 04:01:15.711554746 +0200
[detail] @@ -22,6 +22,32 @@
[detail]    }
[detail]  
[detail]    
[detail] +  ArraySelection::ArraySelection(const QList<NamedPoint>& r, bool calcRelativePos)
[detail] +  {
[detail] +    _array=nullptr;
[detail] +    _parent=nullptr;
[detail] +    int n=r.size();
[detail] +    if(calcRelativePos) {
[detail] +      Point2D reference;
[detail] +      for(int i=0; i<n; i++) {
[detail] +        reference+=r.at(i);
[detail] +      }
[detail] +      if(n>1) {
[detail] +        reference/=static_cast<double>(n);
[detail] +      }
[detail] +      for(int i=0; i<n; i++) {
[detail] +        _selected.append(i);
[detail] +        _relativePos.append(Point2D(r.at(i)-reference));
[detail] +      }
[detail] +    } else {
[detail] +      for(int i=0; i<n; i++) {
[detail] +        _selected.append(i);
[detail] +        _relativePos.append(Point2D(r.at(i)));
[detail] +      }
[detail] +    }
[detail] +  }
[detail] +
[detail] +  
[detail]    ArraySelection::~ArraySelection()
[detail]    {
[detail]      TRACE;
[detail] @@ -41,6 +67,7 @@
[detail]        }
[detail]        setRelativePos();
[detail]      }
[detail] +    _commonSamplingFrequency=0.0;
[detail]    }
[detail]  
[detail]    void ArraySelection::select(VectorList<int> sel)
[detail] @@ -108,7 +135,7 @@
[detail]      return _array->name(_selected.at(index));
[detail]    }
[detail]  
[detail] -  Point2D ArraySelection::position(int index) const
[detail] +  const Point2D& ArraySelection::position(int index) const
[detail]    {
[detail]      return _array->position(_selected.at(index));
[detail]    }
[detail] @@ -131,5 +158,33 @@
[detail]      select(sel);
[detail]    }
[detail]  
[detail] +  double ArraySelection::radius() const
[detail] +  {
[detail] +    TRACE;
[detail] +    double r=0.0;
[detail] +    for(int i=count()-1; i>=0; i--) {
[detail] +      double d=relativePos(i).length();
[detail] +      if(d>r) {
[detail] +        r=d;
[detail] +      }
[detail] +    }
[detail] +    return r;
[detail] +  }
[detail] +
[detail] +  double ArraySelection::commonSamplingFrequency() const
[detail] +  {
[detail] +    if(_commonSamplingFrequency==0.0) {
[detail] +      int n=count();
[detail] +      _commonSamplingFrequency=samplingFrequency(0);
[detail] +      for(int i=1; i<n; i++) {
[detail] +        double f=samplingFrequency(i);
[detail] +        if(_commonSamplingFrequency!=f) {
[detail] +          _commonSamplingFrequency=Number::greatestCommonFactor(_commonSamplingFrequency, f);
[detail] +        }
[detail] +      }
[detail] +    }
[detail] +    return _commonSamplingFrequency;
[detail] +  }
[detail] +
[detail]  } 
[detail]  
[detail]              src/ArrayStationSignals.cpp:  version-4.2.1	modified out of comments
[detail] --- src/ArrayStationSignals.cpp-version-4.2.1-stripped	2025-09-28 04:01:15.727554824 +0200
[detail] +++ src/ArrayStationSignals.cpp-HEAD-stripped	2025-09-28 04:01:15.731554842 +0200
[detail] @@ -1,6 +1,7 @@
[detail]  
[detail]  
[detail]  #include "ArrayStationSignals.h"
[detail] +#include "ArrayTimeWindows.h"
[detail]  
[detail]  namespace ArrayCore {
[detail]  
[detail] @@ -20,11 +21,38 @@
[detail]      : StationProcessSignals(originalSignals)
[detail]    {
[detail]      TRACE;
[detail] +    _instrumentalResponse=nullptr;
[detail] +    _instrumentalResponseFunction=nullptr;
[detail] +    _instrumentalResponseValue=nullptr;
[detail]    }
[detail]  
[detail]    ArrayStationSignals::~ArrayStationSignals()
[detail]    {
[detail]      TRACE;
[detail] +    clearInstrumentalResponseValues();
[detail] +  }
[detail] +
[detail] +  void ArrayStationSignals::clearInstrumentalResponseValues()
[detail] +  {
[detail] +    TRACE;
[detail] +    delete _instrumentalResponseValue;
[detail] +    delete _instrumentalResponseFunction;
[detail] +    _instrumentalResponseFunction=nullptr;
[detail] +    _instrumentalResponseValue=nullptr;
[detail] +  }
[detail] +
[detail] +  void ArrayStationSignals::setInstrumentalResponseValue(double frequency)
[detail] +  {
[detail] +    _instrumentalResponseValue=new Complex;
[detail] +    *_instrumentalResponseValue=_instrumentalResponse->inverseValue(frequency);
[detail] +    *_instrumentalResponseValue*=_instrumentalResponse->filter(frequency)*
[detail] +                                   _instrumentalResponse->normalizationFactor();
[detail] +  }
[detail] +
[detail] +  void ArrayStationSignals::setInstrumentalResponseFunction(int nSamples, double samplingFrequency)
[detail] +  {
[detail] +    _instrumentalResponseFunction=new InstrumentalResponseFunction(nSamples, 1.0/samplingFrequency);
[detail] +    _instrumentalResponseFunction->setValues(*_instrumentalResponse);
[detail]    }
[detail]  
[detail]    void ArrayStationSignals::showProcessingTime()
[detail] @@ -39,10 +67,9 @@
[detail]    }
[detail]  
[detail]    
[detail] -  bool ArrayStationSignals::setSpectrumValue(const TimeRange &tw, const AbstractParameters *param,
[detail] -                                             const FourierPlan &plan, const TaperDelegate& taper)
[detail] +  bool ArrayStationSignals::setSpectrumValue(const TimeRange &tw, const ArrayParameters *param,
[detail] +                                             const ArrayTimeWindows& win)
[detail]    {
[detail] -    const ArrayParameters * arrayParam=static_cast<const ArrayParameters *>(param);
[detail]  #ifdef PROCESS_TIMING
[detail]      QElapsedTimer chrono;
[detail]      qint64 tcp, tsb, ttp, tft;
[detail] @@ -57,34 +84,51 @@
[detail]        tcp=chrono.nsecsElapsed();
[detail]  #endif
[detail]        DoubleSignal *& sig=processed(iComp);
[detail] +      if(sig->samplingPeriod()!=win.plan().samplingPeriod()) {
[detail] +        DoubleSignal * sigDec=new DoubleSignal;
[detail] +        sigDec->decimateTime(sig->samplingFrequency()*win.plan().samplingPeriod(), sig);
[detail] +        delete sig;
[detail] +        sig=sigDec;
[detail] +      }
[detail]        
[detail]        sig->subtractValue();
[detail]  #ifdef PROCESS_TIMING
[detail]        tsb=chrono.nsecsElapsed();
[detail]  #endif
[detail]        
[detail] -      if(!sig->taper(taper)) {
[detail] +      if(!sig->taper(win.taper())) {
[detail]          App::log(tr("Error applying taper, skipped\n"));
[detail]        }
[detail]  #ifdef PROCESS_TIMING
[detail]        ttp=chrono.nsecsElapsed();
[detail]  #endif
[detail]  
[detail] -      
[detail] -      if(arrayParam->oversamplingFactor()>1.0) {
[detail] +      if(param->oversamplingFactor()>1.0) {
[detail]          DoubleSignal * sigLarge=new DoubleSignal;
[detail] -        sigLarge->frequencyOverSample(arrayParam->oversamplingFactor(), sig);
[detail] +        sigLarge->frequencyOverSample(param->oversamplingFactor(), sig);
[detail]          delete sig;
[detail]          sig=sigLarge;
[detail]        }
[detail]  
[detail]        
[detail]  #ifndef COMPATIBILITY_2_5_0
[detail] -      if(arrayParam->frequencyBandwidth()==0.0) {
[detail] -        _spectrumValue[iComp]=sig->discreteFourierTransform(plan);
[detail] +      if(param->frequencyBandwidth()==0.0) {
[detail] +        _spectrumValue[iComp]=sig->discreteFourierTransform(win.plan());
[detail] +        if(_instrumentalResponse) {
[detail] +          if(!_instrumentalResponseValue) {
[detail] +            setInstrumentalResponseValue(win.frequency().center());
[detail] +          }
[detail] +          _spectrumValue[iComp]*=*_instrumentalResponseValue;
[detail] +        }
[detail]        } else {
[detail]  #endif
[detail]          sig->fastFourierTransform(DoubleSignal::Spectrum);
[detail] +        if(_instrumentalResponse) {
[detail] +          if(!_instrumentalResponseFunction) {
[detail] +            setInstrumentalResponseFunction(sig->nSamples(), sig->samplingFrequency());
[detail] +          }
[detail] +          _instrumentalResponseFunction->apply(sig);
[detail] +        }
[detail]  #ifndef COMPATIBILITY_2_5_0
[detail]        }
[detail]  #endif
[detail] @@ -101,4 +145,29 @@
[detail]      return true;
[detail]    }
[detail]  
[detail] +
[detail] +  
[detail] +  bool ArrayStationSignals::setWaveforms(const TimeRange &tw, const ArrayTimeWindows& win)
[detail] +  {
[detail] +    int nComp=nComponents();
[detail] +    for(int iComp=0; iComp<nComp; iComp++) {
[detail] +      if(!copyOriginalSignal(iComp, tw)) {
[detail] +        return false;
[detail] +      }
[detail] +      DoubleSignal *& sig=processed(iComp);
[detail] +      
[detail] +      sig->subtractValue();
[detail] +      
[detail] +      if(!sig->taper(win.taper())) {
[detail] +        App::log(tr("Error applying taper, skipped\n"));
[detail] +      }
[detail] +      if(_instrumentalResponse) {
[detail] +        if(!_instrumentalResponseFunction) {
[detail] +          setInstrumentalResponseFunction(sig->nSamples(), sig->samplingFrequency());
[detail] +        }
[detail] +        _instrumentalResponseFunction->apply(sig);
[detail] +      }
[detail] +    }
[detail] +    return true;
[detail] +  }
[detail]  } 
[detail]                    src/ArrayStations.cpp:  version-4.2.1	modified out of comments
[detail] --- src/ArrayStations.cpp-version-4.2.1-stripped	2025-09-28 04:01:15.755554959 +0200
[detail] +++ src/ArrayStations.cpp-HEAD-stripped	2025-09-28 04:01:15.759554978 +0200
[detail] @@ -103,7 +103,7 @@
[detail]    double ArrayStations::radius() const
[detail]    {
[detail]      TRACE;
[detail] -    double r=0;
[detail] +    double r=0.0;
[detail]      for(const_iterator it=begin(); it!=end(); ++it) {
[detail]        double d=_reference.distanceTo((*it)->coordinates());
[detail]        if(d>r) {
[detail] @@ -136,22 +136,28 @@
[detail]      return z;
[detail]    }
[detail]  
[detail] -  double ArrayStations::samplingFrequency() const
[detail] +  double ArrayStations::samplingFrequency(int index) const
[detail]    {
[detail] -    return stationSignals(0)->samplingFrequency();
[detail] +    return stationSignals(index)->samplingFrequency();
[detail]    }
[detail]  
[detail]    ArrayStations::Mode ArrayStations::mode() const
[detail]    {
[detail]      TRACE;
[detail] -    StationSignals::Components comps=components();
[detail] -    if(comps & StationSignals::VerticalComponent) {
[detail] -      if(comps & StationSignals::HorizontalComponent) {
[detail] +    switch(components()) {
[detail] +    case StationSignals::ThreeComponents:
[detail]          return ThreeComponents;
[detail] -      }
[detail] -    } else if(comps & StationSignals::HorizontalComponent) {
[detail] +    case StationSignals::HorizontalComponents:
[detail]        return Horizontal;
[detail] +    case StationSignals::HorizontalStrainComponents:
[detail] +    case StationSignals::ThreeComponentsAndStrain:
[detail] +      return ThreeComponentsAndStrain;
[detail] +    case StationSignals::VerticalComponents:
[detail] +      return Vertical;
[detail] +    default:
[detail] +      break;
[detail]      }
[detail] +    ASSERT(false);
[detail]      return Vertical;
[detail]    }
[detail]  
[detail] @@ -165,7 +171,7 @@
[detail]      return at(index)->name();
[detail]    }
[detail]  
[detail] -  Point2D ArrayStations::position(int index) const
[detail] +  const Point2D& ArrayStations::position(int index) const
[detail]    {
[detail]      return at(index)->coordinates();
[detail]    }
[detail]                        src/ArrayTask.cpp:  version-4.2.1	not modified
[detail]                 src/ArrayTaskManager.cpp:  version-4.2.1	not modified
[detail]                 src/ArrayTimeWindows.cpp:  version-4.2.1	modified out of comments
[detail] --- src/ArrayTimeWindows.cpp-version-4.2.1-stripped	2025-09-28 04:01:15.807555210 +0200
[detail] +++ src/ArrayTimeWindows.cpp-HEAD-stripped	2025-09-28 04:01:15.811555230 +0200
[detail] @@ -4,7 +4,6 @@
[detail]  #include <QGpCoreTools.h>
[detail]  
[detail]  #include "ArrayTimeWindows.h"
[detail] -#include "ArrayStationSignals.h"
[detail]  
[detail]  namespace ArrayCore {
[detail]  
[detail] @@ -17,10 +16,10 @@
[detail]      : _parameters(param), _keep(keep), _taper(&param->taper())
[detail]    {
[detail]      TRACE;
[detail] -    const StationSignals * s=array->array()->first();
[detail] -    _samplingFrequency=s->samplingFrequency();
[detail] -    _samplingPeriod=s->samplingPeriod();
[detail] -    _events=s->firstValidSignal()->database()->seismicEvents();
[detail] +    _samplingFrequency=array->commonSamplingFrequency();
[detail] +    _samplingPeriod=1.0/_samplingFrequency;
[detail] +    App::log(tr("Common sampling frequency: %1 Hz\n").arg(_samplingFrequency));
[detail] +    _events=array->array()->first()->firstValidSignal()->database()->seismicEvents();
[detail]      _frequency.setRelativeWidth(_parameters->frequencyBandwidth());
[detail]      _list.setVerbosityLevel(7);
[detail]      _plan=nullptr;
[detail] @@ -77,7 +76,7 @@
[detail]        double duration=_list.at(0).lengthSeconds();
[detail]        if(_parameters->frequencyBandwidth()==0) {
[detail]          delete _plan;
[detail] -        _plan=new FourierPlan(qRound(_list.at(0).lengthSamples(_samplingFrequency)*oversamplingFactor),
[detail] +        _plan=new FourierPlan(qFloor(_list.at(0).lengthSamples(_samplingFrequency)*oversamplingFactor),
[detail]                                _samplingPeriod, _frequency.center());
[detail]          if(_frequencyFilter) {
[detail]            delete _frequencyFilter;
[detail] @@ -92,7 +91,7 @@
[detail]        }
[detail]        
[detail]        
[detail] -      int nSamples=qRound(duration*_samplingFrequency);
[detail] +      int nSamples=qFloor(duration*_samplingFrequency);
[detail]        _taper.createFunction(0, nSamples-1, 0, nSamples-1);
[detail]      }
[detail]    }
[detail]                      src/ArrayWorker.cpp:  version-4.2.1	modified out of comments
[detail] --- src/ArrayWorker.cpp-version-4.2.1-stripped	2025-09-28 04:01:15.827555306 +0200
[detail] +++ src/ArrayWorker.cpp-HEAD-stripped	2025-09-28 04:01:15.831555326 +0200
[detail] @@ -28,8 +28,11 @@
[detail]      const BlockAveragingParameters& param=_crossSpectrum->parameters()->blockAveraging();
[detail]      _crossSpectrum->setTimeWindows(at->timeWindows());
[detail]      const TimeWindowList& winList=_crossSpectrum->timeWindows()->list();
[detail] +    double timePrecision=0.5/_crossSpectrum->array().commonSamplingFrequency();
[detail] +    int matrixSize=crossSpectrumMatrixSize();
[detail]      while(!terminated()) {
[detail] -      VectorList<int> blocks=param.list(t->currentStep(), _crossSpectrum->stationCount(), winList);
[detail] +      VectorList<int> blocks=param.list(t->currentStep(), matrixSize,
[detail] +                                        winList, timePrecision);
[detail]        if(blocks.isEmpty()) {
[detail]          t->setFinishing();
[detail]          break;
[detail]                src/AsyncArrayProcess.cpp:  version-4.2.1	modified out of comments
[detail] --- src/AsyncArrayProcess.cpp-version-4.2.1-stripped	2025-09-28 04:01:15.851555423 +0200
[detail] +++ src/AsyncArrayProcess.cpp-HEAD-stripped	2025-09-28 04:01:15.855555441 +0200
[detail] @@ -36,7 +36,7 @@
[detail]      for(int i=0; i<n; i++) {
[detail]        const StationSignals& stat=*array().at(i);
[detail]        SparseTimeRange r=stat.timeRange(_globalRange);
[detail] -      double length=r.totalLength();
[detail] +      double length=r.lengthSeconds();
[detail]        if(length>maxLength) {
[detail]          _referenceStationIndex=i;
[detail]          maxLength=length;
[detail]                      src/AsyncFKLoop.cpp:  version-4.2.1	not modified
[detail]                      src/AsyncFKTool.cpp:  version-4.2.1	not modified
[detail]                  src/AsyncParameters.cpp:  version-4.2.1	not modified
[detail]                 src/AsyncStationPair.cpp:  version-4.2.1	not modified
[detail]         src/BlockAveragingParameters.cpp:  version-4.2.1	modified out of comments
[detail] --- src/BlockAveragingParameters.cpp-version-4.2.1-stripped	2025-09-28 04:01:15.935555828 +0200
[detail] +++ src/BlockAveragingParameters.cpp-HEAD-stripped	2025-09-28 04:01:15.939555848 +0200
[detail] @@ -30,13 +30,13 @@
[detail]    }
[detail]  
[detail]    
[detail] -  int BlockAveragingParameters::count(int stationCount) const
[detail] +  int BlockAveragingParameters::count(int matrixSize) const
[detail]    {
[detail]      TRACE;
[detail]      if(_count>0) {
[detail]        return _count;
[detail]      } else if(_countFactor>0.0){
[detail] -      return qRound(_countFactor*stationCount);
[detail] +      return qRound(_countFactor*matrixSize);
[detail]      } else {
[detail]        return INT_MAX;
[detail]      }
[detail] @@ -80,15 +80,16 @@
[detail]  
[detail]  
[detail]    
[detail] -  VectorList<int> BlockAveragingParameters::list(int firstWindowIndex, int stationCount,
[detail] -                                                 const TimeRangeList& winList) const
[detail] +  VectorList<int> BlockAveragingParameters::list(int firstWindowIndex, int matrixSize,
[detail] +                                                 const TimeRangeList& winList,
[detail] +                                                 double timePrecision) const
[detail]    {
[detail]      TRACE;
[detail]      
[detail]      
[detail]      
[detail]      int nWin=winList.count();
[detail] -    int nBlocks=count(stationCount);
[detail] +    int nBlocks=count(matrixSize);
[detail]      TimeRange currentWindow;
[detail]      VectorList<int> list;
[detail]      int windowIndex=firstWindowIndex;
[detail] @@ -110,7 +111,7 @@
[detail]        
[detail]        windowIndex++;
[detail]        if(!_overlap) {
[detail] -        while(windowIndex<nWin && winList.at(windowIndex).intersects(currentWindow)) {
[detail] +        while(windowIndex<nWin && winList.at(windowIndex).intersects(currentWindow, timePrecision)) {
[detail]            windowIndex++;
[detail]          }
[detail]        }
[detail] @@ -153,7 +154,7 @@
[detail]      log+="# Overlap of blocks is controled by WINDOW_OVERLAP. If this option is set to 'y', overlapping \n"
[detail]           "# blocks are skipped. Do not confuse block overlap and block set overlap (see STATISTIC_MAX_OVERLAP).\n";
[detail]      log+=prefix+"BLOCK_OVERLAP"+suffix+"(y/n)="+(_overlap ? "y\n" : "n\n");
[detail] -    log+="# If BLOCK_COUNT is null, BLOCK_COUNT=BLOCK_COUNT_FACTOR*<number of stations>\n";
[detail] +    log+="# If BLOCK_COUNT is null, BLOCK_COUNT=BLOCK_COUNT_FACTOR*<cross-spectrum matrix size>\n";
[detail]      log+=prefix+"BLOCK_COUNT"+suffix+"="+QString::number(_count)+"\n";
[detail]      log+=prefix+"BLOCK_COUNT_FACTOR"+suffix+"="+QString::number(_countFactor)+"\n";
[detail]      log+="# If STATISTIC_COUNT is not null, approx. STATISTIC_COUNT estimates par frequency\n";
[detail] @@ -170,8 +171,8 @@
[detail]      bool ok=true;
[detail]      switch(index-AbstractParameters::keywordCount()) {
[detail]      case 0:
[detail] -      _overlap=(value=="y");
[detail] -      return true;
[detail] +      _overlap=Number::toBoolean(value, ok);
[detail] +      return ok;
[detail]      case 1:
[detail]        _count=value.toInt(&ok);
[detail]        return ok;
[detail]            src/ConvEllipticityEngine.cpp:  version-4.2.1	not modified
[detail]                     src/ConvFKRadial.cpp:  version-4.2.1	modified out of comments
[detail] --- src/ConvFKRadial.cpp-version-4.2.1-stripped	2025-09-28 04:01:15.971556003 +0200
[detail] +++ src/ConvFKRadial.cpp-HEAD-stripped	2025-09-28 04:01:15.979556041 +0200
[detail] @@ -41,7 +41,7 @@
[detail]      }
[detail]    }
[detail]  
[detail] -  const ComplexMatrix * ConvFKRadial::crossSpectrum() const
[detail] +  const HermitianMatrix * ConvFKRadial::crossSpectrum() const
[detail]    {
[detail]      if(_crossSpectrum) {
[detail]        return _crossSpectrum->rotatedMatrix(0);
[detail] @@ -65,7 +65,8 @@
[detail]    {
[detail]      if(isInsideLimits(k)) {
[detail]        powerEngine()->setCrossSpectrum(_crossSpectrum->rotatedMatrix(k));
[detail] -      powerEngine()->setConventionalValue(oneComponentSteering(k));
[detail] +      powerEngine()->setCartesianWavenumber(k);
[detail] +      powerEngine()->setConventionalValue(oneComponentSteering());
[detail]        return powerEngine()->value();
[detail]      } else {
[detail]        return -1.0;
[detail]                   src/ConvFKRayleigh.cpp:  version-4.2.1	modified out of comments
[detail] --- src/ConvFKRayleigh.cpp-version-4.2.1-stripped	2025-09-28 04:01:15.995556118 +0200
[detail] +++ src/ConvFKRayleigh.cpp-HEAD-stripped	2025-09-28 04:01:15.999556138 +0200
[detail] @@ -11,12 +11,14 @@
[detail]    ConvFKRayleigh::ConvFKRayleigh(FKCache * cache)
[detail]      : AbstractFKRayleigh(cache)
[detail]    {
[detail] +    if(cache) {
[detail]      cache->setPassiveSteering();
[detail]    }
[detail] +  }
[detail]  
[detail]    void ConvFKRayleigh::initialize(const FKParameters& param)
[detail]    {
[detail] -    setPowerEngine(new FKPower(cache()->array()->count(), 2));
[detail] +    setPowerEngine(cache()->array()->count());
[detail]      steeringInitialization()->setSensorPositionErrors(param);
[detail]      steeringInitialization()->setSensorOrientationErrors(param);
[detail]      steeringInitialization()->setPhaseShifts(param.gridStep(), param.effectiveGridSize());
[detail] @@ -30,7 +32,10 @@
[detail]      grid->setRelativePrecision(0, param.velocityRelativePrecision());
[detail]      grid->setRelativePrecision(1, param.velocityRelativePrecision());
[detail]      grid->setFunction(this);
[detail] -    grid->setGrid(param.gridStep(), param.effectiveGridSize());
[detail] +    if(!grid->setGrid(param.gridStep(), param.effectiveGridSize())) {
[detail] +      delete grid;
[detail] +      return nullptr;
[detail] +    }
[detail]      return grid;
[detail]    }
[detail]  
[detail] @@ -62,7 +67,7 @@
[detail]      }
[detail]    }
[detail]  
[detail] -  const ComplexMatrix * ConvFKRayleigh::crossSpectrum() const
[detail] +  const HermitianMatrix * ConvFKRayleigh::crossSpectrum() const
[detail]    {
[detail]      if(_crossSpectrum) {
[detail]        return _crossSpectrum->rotatedMatrix(0);
[detail]                src/ConvFKRayleighAll.cpp:  version-4.2.1	modified out of comments
[detail] --- src/ConvFKRayleighAll.cpp-version-4.2.1-stripped	2025-09-28 04:01:16.015556215 +0200
[detail] +++ src/ConvFKRayleighAll.cpp-HEAD-stripped	2025-09-28 04:01:16.019556234 +0200
[detail] @@ -75,7 +75,8 @@
[detail]    double ConvFKRayleighAll::value(Vector<double>& kell) const
[detail]    {
[detail]      if(isInsideLimits(kell)) {
[detail] -      oneComponentSteering(kell);
[detail] +      powerEngine()->setCartesianWavenumber(kell);
[detail] +      oneComponentSteering();
[detail]        powerEngine()->setCrossSpectrum(_crossSpectrum->rotatedMatrix(kell));
[detail]        maximumEllipticity();
[detail]        canonicalEllipticity(_xi.x);
[detail] @@ -89,7 +90,7 @@
[detail]    void ConvFKRayleighAll::setFunctionValue(Attributes& a) const
[detail]    {
[detail]      a.ell.setUnitExp(a.x);
[detail] -    const Vector<Complex>& e=FKSteering::twoComponentRayleighCross(a.ell, powerEngine());
[detail] +    const Vector<Complex>& e=FKSteering::twoComponentRayleighAll(a.ell, powerEngine());
[detail]      powerEngine()->setConventionalValue(e);
[detail]      a.value=powerEngine()->value();
[detail]    }
[detail] @@ -97,8 +98,8 @@
[detail]    void ConvFKRayleighAll::setFunctionDerivatives(Attributes& a) const
[detail]    {
[detail]      
[detail] -    const Vector<Complex>& de=FKSteering::twoComponentRayleighCrossGradient(a.ell, powerEngine());
[detail] -    a.slope=2.0*powerEngine()->factorN()*powerEngine()->ellipticityGradient(de);
[detail] +    const Vector<Complex>& de=FKSteering::twoComponentRayleighAllGradient(a.ell, powerEngine());
[detail] +    a.slope=2.0*powerEngine()->factorN()*powerEngine()->gradient(de);
[detail]      
[detail]      a.concavity=powerEngine()->factorN()*powerEngine()->xiSecondDerivative();
[detail]      a.concavity=2.0*(a.concavity-a.value);
[detail] @@ -107,15 +108,16 @@
[detail]    
[detail]    double ConvFKRayleighAll::wavenumberNormalizedConcavity(const Vector<double>& kell) const
[detail]    {
[detail] -    oneComponentSteering(kell);
[detail] +    powerEngine()->setCartesianWavenumber(kell);
[detail] +    oneComponentSteering();
[detail]      powerEngine()->setCrossSpectrum(_crossSpectrum->rotatedMatrix(kell));
[detail]  
[detail]      Complex ell;
[detail]      ell.setUnitExp(kell[2]);
[detail] -    const Vector<Complex>& e0=FKSteering::twoComponentRayleighCross(ell, powerEngine());
[detail] +    const Vector<Complex>& e0=FKSteering::twoComponentRayleighAll(ell, powerEngine());
[detail]      powerEngine()->setConventionalValue(e0);
[detail]      double p=powerEngine()->value();
[detail] -    steering()->twoComponentSensorRadialProjections(kell, powerEngine());
[detail] +    steering()->twoComponentSensorRadialProjections(powerEngine());
[detail]      powerEngine()->conventionalKRadialFirstDerivative(powerEngine()->ellipticitySteeringVector());
[detail]      return powerEngine()->conventionalKRadialSecondDerivative()/p;
[detail]    }
[detail] @@ -136,11 +138,12 @@
[detail]      for(double k=0; k<6.28; k+=0.001) {
[detail]        PrivateVector<double> kv(k1);
[detail]        kv*=k;
[detail] -      oneComponentSteering(kv);
[detail] -      const Vector<Complex>& e0=FKSteering::twoComponentRayleighCross(ell, powerEngine());
[detail] +      powerEngine()->setCartesianWavenumber(kv);
[detail] +      oneComponentSteering();
[detail] +      const Vector<Complex>& e0=FKSteering::twoComponentRayleighAll(ell, powerEngine());
[detail]        powerEngine()->setConventionalValue(e0);
[detail]        double p=powerEngine()->value();
[detail] -      steering()->twoComponentSensorRadialProjections(kv, powerEngine());
[detail] +      steering()->twoComponentSensorRadialProjections(powerEngine());
[detail]        double dp=powerEngine()->conventionalKRadialFirstDerivative(powerEngine()->ellipticitySteeringVector());
[detail]        double ddp=powerEngine()->conventionalKRadialSecondDerivative();
[detail]        s << k << " " << p << " " << dp << " " << ddp << Qt::endl;
[detail]             src/ConvFKRayleighRadial.cpp:  version-4.2.1	modified out of comments
[detail] --- src/ConvFKRayleighRadial.cpp-version-4.2.1-stripped	2025-09-28 04:01:16.035556312 +0200
[detail] +++ src/ConvFKRayleighRadial.cpp-HEAD-stripped	2025-09-28 04:01:16.039556331 +0200
[detail] @@ -27,7 +27,8 @@
[detail]    double ConvFKRayleighRadial::value(Vector<double>& kell) const
[detail]    {
[detail]      if(isInsideLimits(kell)) {
[detail] -      oneComponentSteering(kell);
[detail] +      powerEngine()->setCartesianWavenumber(kell);
[detail] +      oneComponentSteering();
[detail]        powerEngine()->setCrossSpectrum(_crossSpectrum->rotatedMatrix(kell));
[detail]        minimumEllipticity();
[detail]        canonicalEllipticity(_xi.x);
[detail] @@ -50,7 +51,7 @@
[detail]    {
[detail]      
[detail]      const Vector<Complex>& de=FKSteering::twoComponentRayleighRadialGradient(a.ell, powerEngine());
[detail] -    a.slope=2.0*powerEngine()->factorN()*powerEngine()->ellipticityGradient(de);
[detail] +    a.slope=2.0*powerEngine()->factorN()*powerEngine()->gradient(de);
[detail]      
[detail]      double tan=a.ell.im()/a.ell.re();
[detail]      a.concavity=powerEngine()->factorN()*powerEngine()->xiSecondDerivative();
[detail]           src/ConvFKRayleighVertical.cpp:  version-4.2.1	modified out of comments
[detail] --- src/ConvFKRayleighVertical.cpp-version-4.2.1-stripped	2025-09-28 04:01:16.055556409 +0200
[detail] +++ src/ConvFKRayleighVertical.cpp-HEAD-stripped	2025-09-28 04:01:16.059556427 +0200
[detail] @@ -34,7 +34,8 @@
[detail]    double ConvFKRayleighVertical::value(Vector<double>& kell) const
[detail]    {
[detail]      if(isInsideLimits(kell)) {
[detail] -      oneComponentSteering(kell);
[detail] +      powerEngine()->setCartesianWavenumber(kell);
[detail] +      oneComponentSteering();
[detail]        powerEngine()->setCrossSpectrum(_crossSpectrum->rotatedMatrix(kell));
[detail]        minimumEllipticity();
[detail]        canonicalEllipticity(_xi.x);
[detail] @@ -57,7 +58,7 @@
[detail]    {
[detail]      
[detail]      const Vector<Complex>& de=FKSteering::twoComponentRayleighVerticalGradient(a.ell, powerEngine());
[detail] -    a.slope=2.0*powerEngine()->factorN()*powerEngine()->ellipticityGradient(de);
[detail] +    a.slope=2.0*powerEngine()->factorN()*powerEngine()->gradient(de);
[detail]      
[detail]      double cot=a.ell.re()/a.ell.im();
[detail]      a.concavity=powerEngine()->factorN()*powerEngine()->xiSecondDerivative();
[detail]                 src/ConvFKTransverse.cpp:  version-4.2.1	not modified
[detail]                   src/ConvFKVertical.cpp:  version-4.2.1	modified out of comments
[detail] --- src/ConvFKVertical.cpp-version-4.2.1-stripped	2025-09-28 04:01:16.091556582 +0200
[detail] +++ src/ConvFKVertical.cpp-HEAD-stripped	2025-09-28 04:01:16.095556602 +0200
[detail] @@ -11,12 +11,14 @@
[detail]    ConvFKVertical::ConvFKVertical(FKCache * cache)
[detail]      : AbstractFKFunction(cache)
[detail]    {
[detail] +    if(cache) {
[detail]      cache->setPassiveSteering();
[detail]    }
[detail] +  }
[detail]  
[detail]    void ConvFKVertical::initialize(const FKParameters& param)
[detail]    {
[detail] -    setPowerEngine(new FKPower(cache()->array()->count(), 1));
[detail] +    setPowerEngine(cache()->array()->count());
[detail]      if(_crossSpectrum) {
[detail]        powerEngine()->setCrossSpectrum(_crossSpectrum->matrix());
[detail]      }
[detail] @@ -26,12 +28,19 @@
[detail]  
[detail]    FunctionSearch * ConvFKVertical::createSearch(const FKParameters& param)
[detail]    {
[detail] +    if(param.inversionMethod()==FKParameters::RefinedGrid) {
[detail]      GridSearch2D * grid=new GridSearch2D;
[detail]      grid->setRelativePrecision(0, param.velocityRelativePrecision());
[detail]      grid->setRelativePrecision(1, param.velocityRelativePrecision());
[detail]      grid->setFunction(this);
[detail] -    grid->setGrid(param.gridStep(), param.effectiveGridSize());
[detail] +      if(!grid->setGrid(param.gridStep(), param.effectiveGridSize())) {
[detail] +        delete grid;
[detail] +        return nullptr;
[detail] +      }
[detail]      return grid;
[detail] +    } else {
[detail] +      return nullptr;
[detail] +    }
[detail]    }
[detail]  
[detail]    void ConvFKVertical::resetCrossSpectrum()
[detail] @@ -71,7 +80,8 @@
[detail]    double ConvFKVertical::value(Vector<double>& k) const
[detail]    {
[detail]      if(isInsideLimits(k)) {
[detail] -      powerEngine()->setConventionalValue(oneComponentSteering(k));
[detail] +      powerEngine()->setCartesianWavenumber(k);
[detail] +      powerEngine()->setConventionalValue(oneComponentSteering());
[detail]        return powerEngine()->value();
[detail]      } else {
[detail]        return -1.0;
[detail]     src/ConvThreeComponentXiFunction.cpp:  version-4.2.1	not modified
[detail]                   src/CorrParameters.cpp:  version-4.2.1	no last version available
[detail]               src/CorrStationSignals.cpp:  version-4.2.1	no last version available
[detail]                         src/CorrTask.cpp:  version-4.2.1	no last version available
[detail]                  src/CorrTaskManager.cpp:  version-4.2.1	no last version available
[detail]                         src/CorrTool.cpp:  version-4.2.1	no last version available
[detail]                       src/CorrWorker.cpp:  version-4.2.1	no last version available
[detail]                    src/CrossSpectrum.cpp:  version-4.2.1	not modified
[detail] src/CrossSpectrumAnchorMatchFunction.cpp:  version-4.2.1	no last version available
[detail]       src/CrossSpectrumMatchFunction.cpp:  version-4.2.1	no last version available
[detail]    src/CrossSpectrumMatchTaskManager.cpp:  version-4.2.1	no last version available
[detail]         src/CrossSpectrumMatchWorker.cpp:  version-4.2.1	no last version available
[detail]       src/DistinctWavenumbersOneMode.cpp:  version-4.2.1	no last version available
[detail]                   src/ESACStatistics.cpp:  version-4.2.1	modified out of comments
[detail] --- src/ESACStatistics.cpp-version-4.2.1-stripped	2025-09-28 04:01:16.195557084 +0200
[detail] +++ src/ESACStatistics.cpp-HEAD-stripped	2025-09-28 04:01:16.199557104 +0200
[detail] @@ -37,11 +37,11 @@
[detail]      Attributes a;
[detail]      a.x=k0;
[detail]      if(!_opt.minimize(a, this, 0.25*k0)) {
[detail] -      _opt.curves<ESACStatistics, Attributes>(this, 0.1*k0, 10.0*k0, 0.01*k0);
[detail] +      _opt.curves<ESACStatistics, Attributes>(this, -10*k0, 10.0*k0, 0.01*k0);
[detail]        a.x=k0;
[detail]        _opt.minimize(a, this, 0.25*k0);
[detail]      }
[detail] -    return a.x;
[detail] +    return fabs(a.x);
[detail]    }
[detail]  
[detail]  #if 0
[detail] @@ -102,7 +102,11 @@
[detail]        j0kr=j0(kr);
[detail]        si=p.y()-j0kr;
[detail]        dsi=p.x()*j1(kr);
[detail] +      if(kr==0.0) {
[detail] +        ddsi=dsi*dsi+0.5*si*p.x();
[detail] +      } else {
[detail]        ddsi=dsi*dsi+si*p.x()*(p.x()*j0kr-dsi/kr);
[detail] +      }
[detail]        dsi*=si;
[detail]        si*=si;
[detail]        a.value+=si;
[detail]                          src/FKCache.cpp:  version-4.2.1	modified out of comments
[detail] --- src/FKCache.cpp-version-4.2.1-stripped	2025-09-28 04:01:16.219557201 +0200
[detail] +++ src/FKCache.cpp-HEAD-stripped	2025-09-28 04:01:16.223557221 +0200
[detail] @@ -1,6 +1,7 @@
[detail]  
[detail]  
[detail]  #include "FKCache.h"
[detail] +#include "VelocityStrainRateSteering.h"
[detail]  
[detail]  namespace ArrayCore {
[detail]  
[detail] @@ -19,8 +20,15 @@
[detail]    FKCache::~FKCache()
[detail]    {
[detail]      TRACE;
[detail] +    clearSteering();
[detail] +  }
[detail] +
[detail] +  void FKCache::clearSteering()
[detail] +  {
[detail]      delete _passiveSteering;
[detail] +    _passiveSteering=nullptr;
[detail]      delete _beampattern;
[detail] +    _beampattern=nullptr;
[detail]    }
[detail]  
[detail]    void FKCache::setPassiveSteering()
[detail] @@ -30,6 +38,14 @@
[detail]        _beampattern=new TheoreticalFK(_array->relativePos());
[detail]      }
[detail]    }
[detail] +
[detail] +  void FKCache::setPassiveVelocityStrainRateSteering()
[detail] +  {
[detail] +    if(!_passiveSteering) {
[detail] +      _passiveSteering=new VelocityStrainRateSteering(_array);
[detail] +      _beampattern=new TheoreticalFK(_array->relativePos());
[detail] +    }
[detail] +  }
[detail]  
[detail]  } 
[detail]  
[detail]                  src/FKCrossSpectrum.cpp:  version-4.2.1	modified out of comments
[detail] --- src/FKCrossSpectrum.cpp-version-4.2.1-stripped	2025-09-28 04:01:16.239557297 +0200
[detail] +++ src/FKCrossSpectrum.cpp-HEAD-stripped	2025-09-28 04:01:16.243557317 +0200
[detail] @@ -22,9 +22,6 @@
[detail]      _invRotateStep=1.0/_rotateStep;
[detail]  
[detail]      _rotatedMatrices=nullptr;
[detail] -    _rotatedRadialMatrices=nullptr;
[detail] -    _verticalMatrix=nullptr;
[detail] -    _horizontalMatrix=nullptr;
[detail]      _source=nullptr;
[detail]      resize();
[detail]    }
[detail] @@ -34,9 +31,6 @@
[detail]    {
[detail]      TRACE;
[detail]      delete [] _rotatedMatrices;
[detail] -    delete [] _rotatedRadialMatrices;
[detail] -    delete _verticalMatrix;
[detail] -    delete _horizontalMatrix;
[detail]    }
[detail]  
[detail]    
[detail] @@ -44,14 +38,8 @@
[detail]    {
[detail]      
[detail]      delete [] _rotatedMatrices;
[detail] -    delete [] _rotatedRadialMatrices;
[detail] -    delete _verticalMatrix;
[detail] -    delete _horizontalMatrix;
[detail]      delete _matrix;
[detail]      _rotatedMatrices=nullptr;
[detail] -    _rotatedRadialMatrices=nullptr;
[detail] -    _verticalMatrix=nullptr;
[detail] -    _horizontalMatrix=nullptr;
[detail]      _matrix=nullptr;
[detail]  
[detail]      int stationCount=_array.count();
[detail] @@ -59,12 +47,15 @@
[detail]      processType=static_cast<const FKParameters *>(_parameters)->processType();
[detail]      switch(processType) {
[detail]      case FKParameters::Undefined:
[detail] +    case FKParameters::PlaneWaveInversion:
[detail] +    case FKParameters::FullSpectrumOneMode:
[detail]      case FKParameters::Conventional:
[detail]      case FKParameters::Capon:
[detail] +    case FKParameters::LocalSourceVertical:
[detail]      case FKParameters::Omni:
[detail]      case FKParameters::ActiveConventional:
[detail]      case FKParameters::ActiveCapon:
[detail] -      _matrix=new ComplexMatrix(stationCount);
[detail] +      _matrix=new HermitianMatrix(stationCount);
[detail]        break;
[detail]      case FKParameters::PoggiVertical:
[detail]      case FKParameters::PoggiRadial:
[detail] @@ -72,7 +63,7 @@
[detail]      case FKParameters::CaponTransverse:
[detail]      case FKParameters::ConventionalRadial:
[detail]      case FKParameters::ConventionalTransverse:
[detail] -      _rotatedMatrices=new ComplexMatrix[_rotateStepCount];
[detail] +      _rotatedMatrices=new HermitianMatrix[_rotateStepCount];
[detail]        for(int i=0; i<_rotateStepCount; i++) {
[detail]          _rotatedMatrices[i].resize(stationCount);
[detail]        }
[detail] @@ -81,28 +72,41 @@
[detail]      case FKParameters::RTBF:
[detail]      case FKParameters::ARTBF:
[detail]      case FKParameters::RTBFFixedEll:
[detail] -      _rotatedMatrices=new ComplexMatrix[_rotateStepCount];
[detail] -      _rotatedRadialMatrices=new ComplexMatrix[_rotateStepCount];
[detail] +      _rotatedMatrices=new HermitianMatrix[_rotateStepCount];
[detail]        for(int i=0; i<_rotateStepCount; i++) {
[detail]          _rotatedMatrices[i].resize(2*stationCount);
[detail] -        _rotatedRadialMatrices[i].resize(stationCount);
[detail]        }
[detail] -      _verticalMatrix=new ComplexMatrix(stationCount);
[detail]        break;
[detail]      case FKParameters::LDS2:
[detail]      case FKParameters::ActiveRTBF:
[detail]      case FKParameters::ActiveConventionalRayleigh:
[detail] -      _matrix=new ComplexMatrix(2*stationCount);
[detail] +      _matrix=new HermitianMatrix(2*stationCount);
[detail]        break;
[detail]      case FKParameters::ARDS:
[detail] -      _matrix=new ComplexMatrix(3*stationCount);
[detail] -      _verticalMatrix=new ComplexMatrix(stationCount);
[detail] -      _horizontalMatrix=new ComplexMatrix(2*stationCount);
[detail] -      break;
[detail]      case FKParameters::LDS3:
[detail] -    case FKParameters::SensorOrientation:
[detail] +    case FKParameters::ARDSSensorOrientation:
[detail]      case FKParameters::RDSSingle:
[detail] -      _matrix=new ComplexMatrix(3*stationCount);
[detail] +      _matrix=new HermitianMatrix(3*stationCount);
[detail] +      break;
[detail] +    case FKParameters::VelocityStrainRateRayleigh:
[detail] +    case FKParameters::VelocityStrainRateLove:
[detail] +      _matrix=new HermitianMatrix(velocityStrainRateMatrixSize());
[detail] +      break;
[detail] +    case FKParameters::CrossSpectrumMatch:
[detail] +      switch(_mode) {
[detail] +      case ArrayStations::Vertical:
[detail] +        _matrix=new HermitianMatrix(stationCount);
[detail] +        break;
[detail] +      case ArrayStations::Horizontal:
[detail] +      case ArrayStations::ThreeComponentsAndStrain:
[detail] +        ASSERT(false);
[detail] +        break;
[detail] +      case ArrayStations::ThreeComponents:
[detail] +        _matrix=new HermitianMatrix(3*stationCount);
[detail] +        break;
[detail] +      }
[detail] +      break;
[detail] +    case FKParameters::SpectrumMatch:
[detail]        break;
[detail]      }
[detail]    }
[detail] @@ -253,7 +257,7 @@
[detail]  
[detail]      
[detail]      if(!_arrayMask.isEmpty()) {
[detail] -      *_matrix=_matrix->dotMultiply(_arrayMask);
[detail] +      _matrix->dotMultiply(_arrayMask);
[detail]        APP_LOG(4, _matrix->toOctaveString()+"\n")
[detail]      }
[detail]  #ifdef CROSS_SPECTRUM_TIMING
[detail] @@ -312,24 +313,7 @@
[detail]  
[detail]    bool FKCrossSpectrum::invert()
[detail]    {
[detail] -    if(_horizontalMatrix && _verticalMatrix) {
[detail] -      int n=_array.count();
[detail] -      int n2=2*n;
[detail] -      int n21=2*n-1;
[detail] -      int n31=3*n-1;
[detail] -      *_verticalMatrix=_matrix->subMatrix(n2, n2, n31, n31);
[detail] -      if(!invert(*_verticalMatrix)) {
[detail] -        App::log(tr("Cannot invert cross spectrum for vertical sub matrix\n"));
[detail] -        return false;
[detail] -      }
[detail] -      *_horizontalMatrix=_matrix->subMatrix(0, 0, n21, n21);
[detail] -      if(!invert(*_horizontalMatrix)) {
[detail] -        App::log(tr("Cannot invert cross spectrum for horizontal sub matrix\n"));
[detail] -        return false;
[detail] -      }
[detail] -    }
[detail]      if(!invert(*_matrix)) {
[detail] -      App::log(tr("Cannot invert cross spectrum\n"));
[detail]        return false;
[detail]      }
[detail]      return true;
[detail] @@ -337,24 +321,6 @@
[detail]  
[detail]    bool FKCrossSpectrum::invertRotatedMatrices()
[detail]    {
[detail] -    if(_rotatedRadialMatrices && _verticalMatrix) {
[detail] -      int n=_array.count();
[detail] -      int n1=n-1;
[detail] -      int n2=2*n-1;
[detail] -      *_verticalMatrix=_rotatedMatrices[0].subMatrix(n, n, n2, n2);
[detail] -      if(!invert(*_verticalMatrix)) {
[detail] -        App::log(tr("Cannot invert cross spectrum for vertical sub matrix\n"));
[detail] -        return false;
[detail] -      }
[detail] -      for(int i=0; i<_rotateStepCount; i++) {
[detail] -        _rotatedRadialMatrices[i]=_rotatedMatrices[i].subMatrix(0, 0, n1, n1);
[detail] -        if(!invert(_rotatedRadialMatrices[i])) {
[detail] -          App::log(tr("Cannot invert cross spectrum for radial sub matrix in direction %1 deg\n")
[detail] -                   .arg(Angle::radiansToDegrees(i*_rotateStep)));
[detail] -          return false;
[detail] -        }
[detail] -      }
[detail] -    }
[detail]      for(int i=0; i<_rotateStepCount; i++) {
[detail]        if(!invert(_rotatedMatrices[i])) {
[detail]          App::log(tr("Cannot invert cross spectrum for direction %1 deg\n")
[detail] @@ -370,8 +336,8 @@
[detail]      int stationCount=_stations.count();
[detail]  
[detail]      const ArrayStationSignals * stat;
[detail] -    ComplexMatrix& covmat=_rotatedMatrices[rotationIndex];
[detail] -    ComplexMatrix sig(stationCount, 1);
[detail] +    HermitianMatrix& covmat=_rotatedMatrices[rotationIndex];
[detail] +    PrivateVector<Complex> sig(stationCount);
[detail]      Angle rotation;
[detail]      rotation.setRadians(_rotateStep*rotationIndex);
[detail]      Complex rsv;
[detail] @@ -381,7 +347,7 @@
[detail]      if(parameters()->frequencyBandwidth()==0.0) {
[detail]        for(int is=0; is<stationCount; is++) {
[detail]          stat=_stations.at(is);
[detail] -        Complex& s=sig.at(is, 0);
[detail] +        Complex& s=sig[is];
[detail]          const Complex& rot=sensorRotations[is];
[detail]          rsv=stat->spectrumValue(_eastIndex)*rot.re();
[detail]          rsv-=stat->spectrumValue(_northIndex)*rot.im();
[detail] @@ -390,7 +356,7 @@
[detail]          rsv+=stat->spectrumValue(_eastIndex)*rot.im();
[detail]          s+=rotation.sin()*rsv;  
[detail]        }
[detail] -      covmat+=sig*sig.conjugateTransposedVector();
[detail] +      add(covmat, sig);
[detail]      } else {
[detail]        const GaussianFrequencyBand& frequencyFilter=*_timeWindows->frequencyFilter();
[detail]        int nFreq=frequencyFilter.maximumIndex();
[detail] @@ -400,7 +366,7 @@
[detail]          filter=frequencyFilter.taperValue(iFreq);
[detail]          for(int is=0; is<stationCount; is++) {
[detail]            stat=_stations.at(is);
[detail] -          Complex& s=sig.at(is, 0);
[detail] +          Complex& s=sig[is];
[detail]            const Complex& rot=sensorRotations[is];
[detail]            rsv=stat->spectrumValue(_eastIndex, iFreq)*rot.re();
[detail]            rsv-=stat->spectrumValue(_northIndex, iFreq)*rot.im();
[detail] @@ -411,7 +377,7 @@
[detail]            
[detail]            s*=filter;
[detail]          }
[detail] -        covmat+=sig*sig.conjugateTransposedVector();
[detail] +        add(covmat, sig);
[detail]        }
[detail]      }
[detail]    }
[detail] @@ -425,15 +391,15 @@
[detail]      
[detail]  
[detail]      const ArrayStationSignals * stat;
[detail] -    ComplexMatrix& covmat=_rotatedMatrices[rotationIndex];
[detail] -    ComplexMatrix sig(stationCount, 1);
[detail] +    HermitianMatrix& covmat=_rotatedMatrices[rotationIndex];
[detail] +    PrivateVector<Complex> sig(stationCount);
[detail]      Angle rotation;
[detail]      rotation.setRadians(_rotateStep*rotationIndex);
[detail]      Complex rsv;
[detail]      if(parameters()->frequencyBandwidth()==0.0) {
[detail]        for(int is=0; is<stationCount; is++) {
[detail]          stat=_stations.at(is);
[detail] -        Complex& s=sig.at(is, 0);
[detail] +        Complex& s=sig[is];
[detail]          const Complex& rot=sensorRotations[is];
[detail]          rsv=stat->spectrumValue(_northIndex)*rot.re();
[detail]          rsv+=stat->spectrumValue(_eastIndex)*rot.im();
[detail] @@ -442,7 +408,7 @@
[detail]          rsv-=stat->spectrumValue(_northIndex)*rot.im();
[detail]          s-=rotation.sin()*rsv;   
[detail]        }
[detail] -      covmat+=sig*sig.conjugateTransposedVector();
[detail] +      add(covmat, sig);
[detail]      } else {
[detail]        const GaussianFrequencyBand& frequencyFilter=*_timeWindows->frequencyFilter();
[detail]        int nFreq=frequencyFilter.maximumIndex();
[detail] @@ -452,7 +418,7 @@
[detail]          filter=frequencyFilter.taperValue(iFreq);
[detail]          for(int is=0; is<stationCount; is++) {
[detail]            stat=_stations.at(is);
[detail] -          Complex& s=sig.at(is, 0);
[detail] +          Complex& s=sig[is];
[detail]            const Complex& rot=sensorRotations[is];
[detail]            rsv=stat->spectrumValue(_northIndex, iFreq)*rot.re();
[detail]            rsv+=stat->spectrumValue(_eastIndex, iFreq)*rot.im();
[detail] @@ -463,7 +429,7 @@
[detail]            
[detail]            s*=filter;
[detail]          }
[detail] -        covmat+=sig*sig.conjugateTransposedVector();
[detail] +        add(covmat, sig);
[detail]        }
[detail]      }
[detail]    }
[detail] @@ -473,15 +439,15 @@
[detail]      int stationCount=_stations.count();
[detail]  
[detail]      const ArrayStationSignals * stat;
[detail] -    ComplexMatrix& covmat=_rotatedMatrices[rotationIndex];
[detail] -    ComplexMatrix sig(2*stationCount, 1);
[detail] +    HermitianMatrix& covmat=_rotatedMatrices[rotationIndex];
[detail] +    PrivateVector<Complex> sig(2*stationCount);
[detail]      Angle rotation;
[detail]      rotation.setRadians(_rotateStep*rotationIndex);
[detail]      Complex rsv;
[detail]      if(parameters()->frequencyBandwidth()==0.0) {
[detail]        for(int is=0; is<stationCount; is++) {
[detail]          stat=_stations.at(is);
[detail] -        Complex& s=sig.at(is, 0);
[detail] +        Complex& s=sig[is];
[detail]          const Complex& rot=sensorRotations[is];
[detail]          rsv=stat->spectrumValue(_eastIndex)*rot.re();
[detail]          rsv-=stat->spectrumValue(_northIndex)*rot.im();
[detail] @@ -491,9 +457,9 @@
[detail]          s+=rotation.sin()*rsv;  
[detail]        }
[detail]        for(int is=0; is<stationCount; is++) {
[detail] -        sig.at(stationCount+is, 0)=_stations.at(is)->spectrumValue(_verticalIndex);
[detail] +        sig[stationCount+is]=_stations.at(is)->spectrumValue(_verticalIndex);
[detail]        }
[detail] -      covmat+=sig*sig.conjugateTransposedVector();
[detail] +      add(covmat, sig);
[detail]      } else {
[detail]        const GaussianFrequencyBand& frequencyFilter=*_timeWindows->frequencyFilter();
[detail]        int nFreq=frequencyFilter.maximumIndex();
[detail] @@ -502,7 +468,7 @@
[detail]          filter=frequencyFilter.taperValue(iFreq);
[detail]          for(int is=0; is<stationCount; is++) {
[detail]            stat=_stations.at(is);
[detail] -          Complex& s=sig.at(is, 0);
[detail] +          Complex& s=sig[is];
[detail]            const Complex& rot=sensorRotations[is];
[detail]            rsv=stat->spectrumValue(_eastIndex, iFreq)*rot.re();
[detail]            rsv-=stat->spectrumValue(_northIndex, iFreq)*rot.im();
[detail] @@ -513,11 +479,11 @@
[detail]            s*=filter;
[detail]          }
[detail]          for(int is=0; is<stationCount; is++) {
[detail] -          Complex& s=sig.at(stationCount+is, 0);
[detail] +          Complex& s=sig[stationCount+is];
[detail]            s=_stations.at(is)->spectrumValue(_verticalIndex, iFreq);
[detail]            s*=filter;
[detail]          }
[detail] -        covmat+=sig*sig.conjugateTransposedVector();
[detail] +        add(covmat, sig);
[detail]        }
[detail]      }
[detail]    }
[detail] @@ -528,27 +494,27 @@
[detail]      int stationCount2=2*stationCount;
[detail]  
[detail]      const ArrayStationSignals * stat;
[detail] -    ComplexMatrix& covmat=*_matrix;
[detail] -    ComplexMatrix sig(3*stationCount, 1);
[detail] +    HermitianMatrix& covmat=*_matrix;
[detail] +    PrivateVector<Complex> sig(3*stationCount);
[detail]      if(parameters()->frequencyBandwidth()==0.0) {
[detail]        for(int is=0; is<stationCount; is++) {
[detail]          stat=_stations.at(is);
[detail] -        Complex& s=sig.at(is, 0);
[detail] +        Complex& s=sig[is];
[detail]          const Complex& rot=sensorRotations[is];
[detail]           s=stat->spectrumValue(_eastIndex)*rot.re();
[detail]           s-=stat->spectrumValue(_northIndex)*rot.im();
[detail]        }
[detail]        for(int is=0; is<stationCount; is++) {
[detail]          stat=_stations.at(is);
[detail] -        Complex& s=sig.at(stationCount+is, 0);
[detail] +        Complex& s=sig[stationCount+is];
[detail]          const Complex& rot=sensorRotations[is];
[detail]          s=stat->spectrumValue(_northIndex)*rot.re();
[detail]          s+=stat->spectrumValue(_eastIndex)*rot.im();
[detail]        }
[detail]        for(int is=0; is<stationCount; is++) {
[detail] -        sig.at(stationCount2+is, 0)=_stations.at(is)->spectrumValue(_verticalIndex);
[detail] +        sig[stationCount2+is]=_stations.at(is)->spectrumValue(_verticalIndex);
[detail]        }
[detail] -      covmat+=sig*sig.conjugateTransposedVector();
[detail] +      add(covmat, sig);
[detail]      } else {
[detail]        const GaussianFrequencyBand& frequencyFilter=*_timeWindows->frequencyFilter();
[detail]        int nFreq=frequencyFilter.maximumIndex();
[detail] @@ -557,7 +523,7 @@
[detail]          filter=frequencyFilter.taperValue(iFreq);
[detail]          for(int is=0; is<stationCount; is++) {
[detail]            stat=_stations.at(is);
[detail] -          Complex& s=sig.at(is, 0);
[detail] +          Complex& s=sig[is];
[detail]            const Complex& rot=sensorRotations[is];
[detail]            s=stat->spectrumValue(_eastIndex, iFreq)*rot.re();
[detail]            s-=stat->spectrumValue(_northIndex, iFreq)*rot.im();
[detail] @@ -565,20 +531,274 @@
[detail]          }
[detail]          for(int is=0; is<stationCount; is++) {
[detail]            stat=_stations.at(is);
[detail] -          Complex& s=sig.at(stationCount+is, 0);
[detail] +          Complex& s=sig[stationCount+is];
[detail]            const Complex& rot=sensorRotations[is];
[detail]            s=stat->spectrumValue(_northIndex, iFreq)*rot.re();
[detail]            s+=stat->spectrumValue(_eastIndex, iFreq)*rot.im();
[detail]            s*=filter;
[detail]          }
[detail]          for(int is=0; is<stationCount; is++) {
[detail] -          Complex& s=sig.at(stationCount2+is, 0);
[detail] +          Complex& s=sig[stationCount2+is];
[detail]            s=_stations.at(is)->spectrumValue(_verticalIndex, iFreq);
[detail]            s*=filter;
[detail]          }
[detail] -        covmat+=sig*sig.conjugateTransposedVector();
[detail] +        add(covmat, sig);
[detail] +      }
[detail] +    }
[detail] +  }
[detail] +
[detail] +  void FKCrossSpectrum::addThreeComponent()
[detail] +  {
[detail] +    int stationCount=_stations.count();
[detail] +    int stationCount2=2*stationCount;
[detail] +
[detail] +    HermitianMatrix& covmat=*_matrix;
[detail] +    PrivateVector<Complex> sig(3*stationCount);
[detail] +    if(parameters()->frequencyBandwidth()==0.0) {
[detail] +      for(int is=0; is<stationCount; is++) {
[detail] +        sig[is]=_stations.at(is)->spectrumValue(_eastIndex);
[detail] +      }
[detail] +      for(int is=0; is<stationCount; is++) {
[detail] +        sig[stationCount+is]=_stations.at(is)->spectrumValue(_northIndex);
[detail] +      }
[detail] +      for(int is=0; is<stationCount; is++) {
[detail] +        sig[stationCount2+is]=_stations.at(is)->spectrumValue(_verticalIndex);
[detail] +      }
[detail] +      add(covmat, sig);
[detail] +    } else {
[detail] +      const GaussianFrequencyBand& frequencyFilter=*_timeWindows->frequencyFilter();
[detail] +      int nFreq=frequencyFilter.maximumIndex();
[detail] +      double filter;
[detail] +      for(int iFreq=frequencyFilter.minimumIndex(); iFreq<=nFreq; iFreq++) {
[detail] +        filter=frequencyFilter.taperValue(iFreq);
[detail] +        for(int is=0; is<stationCount; is++) {
[detail] +          Complex& s=sig[is];
[detail] +          s=_stations.at(is)->spectrumValue(_eastIndex, iFreq);
[detail] +          s*=filter;
[detail] +        }
[detail] +        for(int is=0; is<stationCount; is++) {
[detail] +          Complex& s=sig[stationCount+is];
[detail] +          s=_stations.at(is)->spectrumValue(_northIndex, iFreq);
[detail] +          s*=filter;
[detail] +        }
[detail] +        for(int is=0; is<stationCount; is++) {
[detail] +          Complex& s=sig[stationCount2+is];
[detail] +          s=_stations.at(is)->spectrumValue(_verticalIndex, iFreq);
[detail] +          s*=filter;
[detail] +        }
[detail] +        add(covmat, sig);
[detail] +      }
[detail] +    }
[detail] +  }
[detail] +
[detail] +  int FKCrossSpectrum::velocityStrainRateMatrixSize() const
[detail] +  {
[detail] +    int stationCount=_stations.count();
[detail] +    int n=0;
[detail] +    for(int is=0; is<stationCount; is++) {
[detail] +      const ArrayStationSignals * sta=_stations.at(is);
[detail] +      switch(sta->originalSignals()->components()) {
[detail] +      case StationSignals::VerticalComponents:
[detail] +        n++;
[detail] +        break;
[detail] +      case StationSignals::ThreeComponents:
[detail] +        if(!sta->originalSignals()->originals(_verticalIndex).isEmpty()) {
[detail] +          if(!sta->originalSignals()->originals(_eastIndex).isEmpty() &&
[detail] +              !sta->originalSignals()->originals(_northIndex).isEmpty()) {
[detail] +            n+=3;
[detail] +          } else {
[detail] +            n++;
[detail] +          }
[detail] +        }
[detail] +        break;
[detail] +      case StationSignals::HorizontalStrainComponents:
[detail] +        n++;
[detail] +        break;
[detail] +      default:
[detail] +        break;
[detail] +      }
[detail] +    }
[detail] +    return n;
[detail] +  }
[detail] +
[detail] +  
[detail] +  void FKCrossSpectrum::setHorizontalStrainOrientations(const QList<int>& fiberNodes, double * orientations) const
[detail] +  {
[detail] +    QMap<QString, QList<int>> segments;
[detail] +    QMap<QString, QList<int>>::iterator it;
[detail] +    int nf=fiberNodes.size();
[detail] +    for(int i=0; i<nf; i++) {
[detail] +      int iStation=fiberNodes.at(i);
[detail] +      QString stationName=_array.name(iStation);
[detail] +      it=segments.find(stationName);
[detail] +      if(it!=segments.end()) {
[detail] +        it.value().append(iStation);
[detail] +      } else {
[detail] +        QList<int> nodes;
[detail] +        nodes.append(iStation);
[detail] +        segments.insert(stationName, nodes);
[detail] +      }
[detail] +    }
[detail] +    
[detail] +    for(it=segments.begin(); it!=segments.end(); it++) {
[detail] +      
[detail] +      QList<int>& line=it.value();
[detail] +      double angle=0.0;
[detail] +      for(int i=0; i<line.size(); i++) {
[detail] +        for(int j=i+1; j<line.size(); j++) {
[detail] +          double o=_array.relativePos(line.at(i)).azimuthTo(_array.relativePos(line.at(j)));
[detail] +          if(o>M_PI) {
[detail] +            o-=M_PI;
[detail] +          }
[detail] +          angle+=o;
[detail] +        }
[detail] +      }
[detail] +      angle/=line.size()*(line.size()-1)*0.5;
[detail] +      for(int i=0; i<line.size(); i++) {
[detail] +        orientations[line.at(i)]=angle;
[detail] +      }
[detail] +    }
[detail] +  }
[detail] +
[detail] +  
[detail] +  double * FKCrossSpectrum::horizontalStrainOrientations() const
[detail] +  {
[detail] +    int stationCount=_stations.count();
[detail] +    double * orientations=new double[stationCount];
[detail] +    for(int is=0; is<stationCount; is++) {
[detail] +      orientations[is]=std::numeric_limits<double>::quiet_NaN();
[detail] +    }
[detail] +
[detail] +    QList<int> fiberNodes;
[detail] +    for(int is=0; is<stationCount; is++) {
[detail] +      const ArrayStationSignals * sta=_stations.at(is);
[detail] +      switch(sta->originalSignals()->components()) {
[detail] +      case StationSignals::VerticalComponents:
[detail] +        orientations[is]=-1;
[detail] +        break;
[detail] +      case StationSignals::ThreeComponents:
[detail] +        orientations[is]=-3;
[detail] +        break;
[detail] +      case StationSignals::HorizontalStrainComponents:
[detail] +        fiberNodes.append(is);
[detail] +        break;
[detail] +      default:
[detail] +        break;
[detail] +      }
[detail] +    }
[detail] +    setHorizontalStrainOrientations(fiberNodes, orientations);
[detail] +    
[detail] +    for(int is=0; is<stationCount; is++) {
[detail] +      if(isnan(orientations[is])) {
[detail] +        App::log(tr("No orientation can be calculated for horizontal strain station %1 at (%2).\n")
[detail] +                     .arg(is).arg(array().relativePos(is).toString()));
[detail] +        delete [] orientations;
[detail] +        return nullptr;
[detail] +      }
[detail] +    }
[detail] +    return orientations;
[detail] +  }
[detail] +
[detail] +  void FKCrossSpectrum::addVelocityStrainRate(const Complex * sensorRotations)
[detail] +  {
[detail] +    int stationCount=_stations.count();
[detail] +    HermitianMatrix& covmat=*_matrix;
[detail] +    PrivateVector<Complex> sig(covmat.columnCount());
[detail] +    int ie=0;
[detail] +    if(parameters()->frequencyBandwidth()==0.0) {
[detail] +      for(int is=0; is<stationCount; is++) {
[detail] +        const ArrayStationSignals * sta=_stations.at(is);
[detail] +        switch(sta->originalSignals()->components()) {
[detail] +        case StationSignals::VerticalComponents:
[detail] +          sig[ie++]=sta->spectrumValue(_verticalIndex);
[detail] +          break;
[detail] +        case StationSignals::ThreeComponents: {
[detail] +            const Complex& rot=sensorRotations[is];
[detail] +            sig[ie++]=sta->spectrumValue(_eastIndex)*rot.re()-sta->spectrumValue(_northIndex)*rot.im();
[detail] +            sig[ie++]=sta->spectrumValue(_northIndex)*rot.re()+sta->spectrumValue(_eastIndex)*rot.im();
[detail] +            sig[ie++]=sta->spectrumValue(_verticalIndex);
[detail] +          }
[detail] +          break;
[detail] +        case StationSignals::HorizontalStrainComponents:
[detail] +          sig[ie++]=sta->spectrumValue(0);
[detail] +          break;
[detail] +        default:
[detail] +          break;
[detail] +        }
[detail] +      }
[detail] +      add(covmat, sig);
[detail] +    } else {
[detail] +      const GaussianFrequencyBand& frequencyFilter=*_timeWindows->frequencyFilter();
[detail] +      int nFreq=frequencyFilter.maximumIndex();
[detail] +      double filter;
[detail] +      for(int iFreq=frequencyFilter.minimumIndex(); iFreq<=nFreq; iFreq++) {
[detail] +        filter=frequencyFilter.taperValue(iFreq);
[detail] +        for(int is=0; is<stationCount; is++) {
[detail] +          const ArrayStationSignals * sta=_stations.at(is);
[detail] +          switch(sta->originalSignals()->components()) {
[detail] +          case StationSignals::VerticalComponents: {
[detail] +              Complex& sv=sig[ie++];
[detail] +              sv=sta->spectrumValue(_verticalIndex, iFreq);
[detail] +              sv*=filter;
[detail] +            }
[detail] +            break;
[detail] +          case StationSignals::ThreeComponents: {
[detail] +              const Complex& rot=sensorRotations[is];
[detail] +              Complex& se=sig[ie++];
[detail] +              se=sta->spectrumValue(_eastIndex, iFreq)*rot.re();
[detail] +              se-=sta->spectrumValue(_northIndex, iFreq)*rot.im();
[detail] +              se*=filter;
[detail] +              Complex& sn=sig[ie++];
[detail] +              sn=sta->spectrumValue(_northIndex, iFreq)*rot.re();
[detail] +              sn+=sta->spectrumValue(_eastIndex, iFreq)*rot.im();
[detail] +              sn*=filter;
[detail] +              Complex& sv=sig[ie++];
[detail] +              sv=sta->spectrumValue(_verticalIndex, iFreq);
[detail] +              sv*=filter;
[detail] +            }
[detail] +            break;
[detail] +          case StationSignals::HorizontalStrainComponents: {
[detail] +              Complex& s=sig[ie++];
[detail] +              s=sta->spectrumValue(_verticalIndex, iFreq);
[detail] +              s*=filter;
[detail] +            }
[detail] +            break;
[detail] +          default:
[detail] +            break;
[detail] +          }
[detail] +        }
[detail] +        add(covmat, sig);
[detail] +      }
[detail]        }
[detail]      }
[detail] +
[detail] +  void FKCrossSpectrum::setVerticalSpectra(Vector<Complex>& s)
[detail] +  {
[detail] +    int stationCount=_stations.count();
[detail] +
[detail] +    ASSERT(parameters()->frequencyBandwidth()==0.0);
[detail] +
[detail] +    for(int is=0; is<stationCount; is++) {
[detail] +      s[is]=_stations.at(is)->spectrumValue(_verticalIndex);
[detail] +    }
[detail] +  }
[detail] +
[detail] +  void FKCrossSpectrum::setThreeComponentSpectra(Vector<Complex>& s)
[detail] +  {
[detail] +    int stationCount=_stations.count();
[detail] +    int stationCount2=2*stationCount;
[detail] +
[detail] +    ASSERT(parameters()->frequencyBandwidth()==0.0);
[detail] +
[detail] +    for(int is=0; is<stationCount; is++) {
[detail] +      s[is]=_stations.at(is)->spectrumValue(_eastIndex);
[detail] +    }
[detail] +    for(int is=0; is<stationCount; is++) {
[detail] +      s[stationCount+is]=_stations.at(is)->spectrumValue(_northIndex);
[detail] +    }
[detail] +    for(int is=0; is<stationCount; is++) {
[detail] +      s[stationCount2+is]=_stations.at(is)->spectrumValue(_verticalIndex);
[detail] +    }
[detail]    }
[detail]  
[detail]    
[detail] @@ -589,16 +809,16 @@
[detail]    {
[detail]      int stationCount=_stations.count();
[detail]  
[detail] -    ComplexMatrix& covmat=*_matrix;
[detail] -    ComplexMatrix sig(stationCount, 1);
[detail] +    HermitianMatrix& covmat=*_matrix;
[detail] +    PrivateVector<Complex> sig(stationCount);
[detail]  #ifndef COMPATIBILITY_2_5_0
[detail]      if(parameters()->frequencyBandwidth()==0.0) {
[detail]        for(int is=0; is<stationCount; is++) {
[detail] -        Complex& s=sig.at(is, 0);
[detail] +        Complex& s=sig[is];
[detail]          s=_stations.at(is)->spectrumValue(_verticalIndex);
[detail]          s*=geom.amplitudeFactor(is);
[detail]        }
[detail] -      covmat+=sig*sig.conjugateTransposedVector();
[detail] +      add(covmat, sig);
[detail]      } else {
[detail]  #endif
[detail]        const GaussianFrequencyBand& frequencyFilter=*_timeWindows->frequencyFilter();
[detail] @@ -607,7 +827,7 @@
[detail]        for(int iFreq=frequencyFilter.minimumIndex(); iFreq<=nFreq; iFreq++) {
[detail]          filter=frequencyFilter.taperValue(iFreq);
[detail]          for(int is=0; is<stationCount; is++) {
[detail] -          Complex& s=sig.at(is, 0);
[detail] +          Complex& s=sig[is];
[detail]            s=_stations.at(is)->spectrumValue(_verticalIndex, iFreq);
[detail]  #ifdef COMPATIBILITY_2_5_0
[detail]            s*=filter;
[detail] @@ -615,7 +835,7 @@
[detail]            s*=filter*geom.amplitudeFactor(is);
[detail]  #endif
[detail]          }
[detail] -        covmat+=sig*sig.conjugateTransposedVector();
[detail] +        add(covmat, sig);
[detail]        }
[detail]  #ifndef COMPATIBILITY_2_5_0
[detail]      }
[detail] @@ -627,22 +847,22 @@
[detail]      int stationCount=_stations.count();
[detail]  
[detail]      const ArrayStationSignals * stat;
[detail] -    ComplexMatrix& covmat=*_matrix;
[detail] -    ComplexMatrix sig(2*stationCount, 1);
[detail] +    HermitianMatrix& covmat=*_matrix;
[detail] +    PrivateVector<Complex> sig(2*stationCount);
[detail]      if(parameters()->frequencyBandwidth()==0.0) {
[detail]        for(int is=0; is<stationCount; is++) {
[detail]          stat=_stations.at(is);
[detail] -        Complex& s=sig.at(is, 0);
[detail] +        Complex& s=sig[is];
[detail]          s=geom.radialRotation(is).sin()*stat->spectrumValue(_northIndex);
[detail]          s+=geom.radialRotation(is).cos()*stat->spectrumValue(_eastIndex);
[detail]          s*=geom.amplitudeFactor(is);
[detail]        }
[detail]        for(int is=0; is<stationCount; is++) {
[detail] -        Complex& s=sig.at(stationCount+is, 0);
[detail] +        Complex& s=sig[stationCount+is];
[detail]          s=_stations.at(is)->spectrumValue(_verticalIndex);
[detail]          s*=geom.amplitudeFactor(is);
[detail]        }
[detail] -      covmat+=sig*sig.conjugateTransposedVector();
[detail] +      add(covmat, sig);
[detail]      } else {
[detail]        const GaussianFrequencyBand& frequencyFilter=*_timeWindows->frequencyFilter();
[detail]        int nFreq=frequencyFilter.maximumIndex();
[detail] @@ -651,17 +871,17 @@
[detail]          filter=frequencyFilter.taperValue(iFreq);
[detail]          for(int is=0; is<stationCount; is++) {
[detail]            stat=_stations.at(is);
[detail] -          Complex& s=sig.at(is, 0);
[detail] +          Complex& s=sig[is];
[detail]            s=geom.radialRotation(is).sin()*stat->spectrumValue(_northIndex, iFreq);
[detail]            s+=geom.radialRotation(is).cos()*stat->spectrumValue(_eastIndex, iFreq);
[detail]            s*=filter*geom.amplitudeFactor(is);
[detail]          }
[detail]          for(int is=0; is<stationCount; is++) {
[detail] -          Complex& s=sig.at(stationCount+is, 0);
[detail] +          Complex& s=sig[stationCount+is];
[detail]            s=_stations.at(is)->spectrumValue(_verticalIndex, iFreq);
[detail]            s*=filter*geom.amplitudeFactor(is);
[detail]          }
[detail] -        covmat+=sig*sig.conjugateTransposedVector();
[detail] +        add(covmat, sig);
[detail]        }
[detail]      }
[detail]    }
[detail] @@ -671,17 +891,17 @@
[detail]      int stationCount=_stations.count();
[detail]  
[detail]      const ArrayStationSignals * stat;
[detail] -    ComplexMatrix& covmat=*_matrix;
[detail] -    ComplexMatrix sig(stationCount, 1);
[detail] +    HermitianMatrix& covmat=*_matrix;
[detail] +    PrivateVector<Complex> sig(stationCount);
[detail]      if(parameters()->frequencyBandwidth()==0.0) {
[detail]        for(int is=0; is<stationCount; is++) {
[detail]          stat=_stations.at(is);
[detail] -        Complex& s=sig.at(is, 0);
[detail] +        Complex& s=sig[is];
[detail]          s=geom.transverseRotation(is).sin()*stat->spectrumValue(_northIndex);
[detail]          s+=geom.transverseRotation(is).cos()*stat->spectrumValue(_eastIndex);
[detail]          s*=geom.amplitudeFactor(is);
[detail]        }
[detail] -      covmat+=sig*sig.conjugateTransposedVector();
[detail] +      add(covmat, sig);
[detail]      } else {
[detail]        const GaussianFrequencyBand& frequencyFilter=*_timeWindows->frequencyFilter();
[detail]        int nFreq=frequencyFilter.maximumIndex();
[detail] @@ -690,12 +910,12 @@
[detail]          filter=frequencyFilter.taperValue(iFreq);
[detail]          for(int is=0; is<stationCount; is++) {
[detail]            stat=_stations.at(is);
[detail] -          Complex& s=sig.at(is, 0);
[detail] +          Complex& s=sig[is];
[detail]            s=geom.transverseRotation(is).sin()*stat->spectrumValue(_northIndex, iFreq);
[detail]            s+=geom.transverseRotation(is).cos()*stat->spectrumValue(_eastIndex, iFreq);
[detail]            s*=filter*geom.amplitudeFactor(is);
[detail]          }
[detail] -        covmat+=sig*sig.conjugateTransposedVector();
[detail] +        add(covmat, sig);
[detail]        }
[detail]      }
[detail]    }
[detail] @@ -705,8 +925,8 @@
[detail]      int stationCount=_stations.count();
[detail]      int stationCount2=2*stationCount;
[detail]  
[detail] -    ComplexMatrix& covmat=*_matrix;
[detail] -    ComplexMatrix sig(3*stationCount, 1);
[detail] +    HermitianMatrix& covmat=*_matrix;
[detail] +    PrivateVector<Complex> sig(3*stationCount);
[detail]      if(parameters()->frequencyBandwidth()==0.0) {
[detail]      } else {
[detail]        const GaussianFrequencyBand& frequencyFilter=*_timeWindows->frequencyFilter();
[detail] @@ -715,45 +935,56 @@
[detail]        for(int iFreq=frequencyFilter.minimumIndex(); iFreq<=nFreq; iFreq++) {
[detail]          filter=frequencyFilter.taperValue(iFreq);
[detail]          for(int is=0; is<stationCount; is++) {
[detail] -          Complex& s=sig.at(is, 0);
[detail] +          Complex& s=sig[is];
[detail]            s=_stations.at(is)->spectrumValue(_eastIndex, iFreq);
[detail]            s*=filter*geom.amplitudeFactor(is);
[detail]          }
[detail]          for(int is=0; is<stationCount; is++) {
[detail] -          Complex& s=sig.at(stationCount+is, 0);
[detail] +          Complex& s=sig[stationCount+is];
[detail]            s=_stations.at(is)->spectrumValue(_northIndex, iFreq);
[detail]            s*=filter*geom.amplitudeFactor(is);
[detail]          }
[detail]          for(int is=0; is<stationCount; is++) {
[detail] -          Complex& s=sig.at(stationCount2+is, 0);
[detail] +          Complex& s=sig[stationCount2+is];
[detail]            s=_stations.at(is)->spectrumValue(_verticalIndex, iFreq);
[detail]            s*=filter*geom.amplitudeFactor(is);
[detail]          }
[detail] -        covmat+=sig*sig.conjugateTransposedVector();
[detail] +        add(covmat, sig);
[detail]        }
[detail]      }
[detail]    }
[detail]  
[detail]    
[detail] -  bool FKCrossSpectrum::invert(ComplexMatrix& covmat)
[detail] +  bool FKCrossSpectrum::invert(HermitianMatrix& covmat)
[detail]    {
[detail] -    ComplexMatrix u, vt;
[detail] -    VectorList<double> sigma;
[detail] -    int n=covmat.rowCount();
[detail] -
[detail] -    
[detail] -
[detail]      if(parameters()->damping()>0.0) {
[detail]        
[detail] -      double d=covmat.trace(0.0).re();
[detail] +      double d=covmat.trace().re();
[detail]        
[detail]        d*=parameters()->damping();
[detail] +      int n=covmat.rowCount();
[detail]        for(int ir=0; ir<n; ir++) {
[detail]          covmat.at(ir, ir)+=d;
[detail]        }
[detail]      }
[detail] +    
[detail] +    
[detail] +    
[detail] +    if(!covmat.choleskyInvert()) {
[detail] +      App::log(tr("Cannot invert cross-spectrum matrix\n"));
[detail] +      if(App::verbosity()>=3) {
[detail] +        covmat.hermitianUpToLow();
[detail] +        if(App::verbosity()>=20) {
[detail] +          QDir d(QDir::tempPath());
[detail] +          QString csfn=File::uniqueName("crossspectrum", d);
[detail] +          covmat.toOctaveFile(csfn, "F");
[detail] +          App::log(tr("Cross-spectrum matrix saved to '%1'\n").arg(csfn));
[detail] +        }
[detail] +        int n=covmat.rowCount();
[detail] +        ComplexMatrix u, vt;
[detail] +        PrivateVector<double> sigma(n);
[detail]      covmat.singularValue(sigma, u, vt);
[detail] -    double sRef=1e-12*sigma.first();
[detail] +        double sRef=1e-12*sigma.at(0);
[detail]      for(int row=0; row<n ;row++ ) {
[detail]        if(sigma.at(row)<sRef) {
[detail]          if(_timeWindows) {
[detail] @@ -767,14 +998,9 @@
[detail]          return false;
[detail]        }
[detail]      }
[detail] -    
[detail] -    
[detail] -
[detail] -    
[detail] -    if(!covmat.invert(u, sigma, vt)) {
[detail] +      }
[detail]        return false;
[detail]      }
[detail] -    
[detail]      return true;
[detail]    }
[detail]  
[detail] @@ -794,6 +1020,7 @@
[detail]        }
[detail]        break;
[detail]      case ArrayStations::Horizontal:
[detail] +    case ArrayStations::ThreeComponentsAndStrain:
[detail]        break;
[detail]      case ArrayStations::ThreeComponents:
[detail]        switch(processType) {
[detail] @@ -920,8 +1147,10 @@
[detail]      Complex crossNV=north*conjVertical;
[detail]      
[detail]      
[detail] -    double theta=atan(-crossEV.abs()/crossNV.abs()*
[detail] -                      cos(crossEV.phase())/cos(crossNV.phase()));
[detail] +    
[detail] +    
[detail] +    
[detail] +    double theta=atan(-crossEV.re()/crossNV.re());
[detail]      Complex h=cos(theta)*east+sin(theta)*north;
[detail]      double crossH=(h*conjVertical).im();
[detail]      
[detail]                   src/FKFunctionPlot.cpp:  version-4.2.1	modified out of comments
[detail] --- src/FKFunctionPlot.cpp-version-4.2.1-stripped	2025-09-28 04:01:16.259557394 +0200
[detail] +++ src/FKFunctionPlot.cpp-HEAD-stripped	2025-09-28 04:01:16.263557413 +0200
[detail] @@ -7,10 +7,13 @@
[detail]    
[detail]  
[detail]    
[detail] -  FKFunctionPlot::FKFunctionPlot(AbstractFKFunction * f)
[detail] -    : FunctionPlot(3, f)
[detail] +  FKFunctionPlot::FKFunctionPlot(int xSize, AbstractFKFunction * f)
[detail] +    : FunctionPlot(xSize, f)
[detail]    {
[detail]      _mode=BeamPower;
[detail] +    _polarCoordinates=false;
[detail] +    _stationIndex=0;
[detail] +    _array=nullptr;
[detail]    }
[detail]  
[detail]    
[detail] @@ -19,12 +22,27 @@
[detail]  
[detail]    }
[detail]  
[detail] +  void FKFunctionPlot::setFunction(AbstractFKFunction * f)
[detail] +  {
[detail] +    if(f) {
[detail] +      _polarCoordinates=f->coordinateSystem()==AbstractFKFunction::PolarCoordinates;
[detail] +    }
[detail] +    FunctionPlot::setFunction(f);
[detail] +  }
[detail] +
[detail]    
[detail]  
[detail]    double FKFunctionPlot::value(double x, double y) const
[detail]    {
[detail] +    if(_polarCoordinates) {
[detail] +      Complex k(x, y);
[detail] +      _x[0]=k.abs();
[detail] +      _x[1]=k.phase();
[detail] +    } else {
[detail]      _x[0]=x;
[detail]      _x[1]=y;
[detail] +    }
[detail] +    double f;
[detail]      switch(_mode) {
[detail]      case BeamPower:
[detail]        break;
[detail] @@ -33,6 +51,30 @@
[detail]      case Ellipticity:
[detail]        function()->value(_x);
[detail]        return Angle::radiansToDegrees(_x[2]);
[detail] +    case LocalSourceVelocity:
[detail] +      if(_array){
[detail] +        Point2D p=_array->array()->toRelative(Point2D(x, y));
[detail] +        _x[0]=p.x();
[detail] +        _x[1]=p.y();
[detail] +      }
[detail] +      f=function()->value(_x);
[detail] +      if(f==0.0) {
[detail] +        return std::numeric_limits<double>::quiet_NaN();
[detail] +      } else {
[detail] +        return 2.0*M_PI*_frequency/_x[2];
[detail] +      }
[detail] +    case LocalSourceBeamPower:
[detail] +      if(_array) {
[detail] +        Point2D p=_array->array()->toRelative(Point2D(x, y));
[detail] +        _x[0]=p.x();
[detail] +        _x[1]=p.y();
[detail] +      }
[detail] +      f=function()->value(_x);
[detail] +      if(f==0.0) {
[detail] +        return std::numeric_limits<double>::quiet_NaN();
[detail] +      } else {
[detail] +        return f;
[detail] +      }
[detail]      case FixedEllipticity:
[detail]        return function()->valueFixed(_x);
[detail]      case CrossSpectralMatrix: {
[detail] @@ -56,6 +98,9 @@
[detail]            return std::numeric_limits<double>::quiet_NaN();
[detail]          }
[detail]        }
[detail] +    case SensorOrientation:
[detail] +      function()->value(_x);
[detail] +      return Angle::radiansToDegrees(_x[3+_stationIndex]);
[detail]      case GradientDirection:
[detail]      case Concavity:
[detail]      case StepDirection:
[detail]                 src/FKGradientSearch.cpp:  version-4.2.1	modified out of comments
[detail] --- src/FKGradientSearch.cpp-version-4.2.1-stripped	2025-09-28 04:01:16.279557491 +0200
[detail] +++ src/FKGradientSearch.cpp-HEAD-stripped	2025-09-28 04:01:16.283557510 +0200
[detail] @@ -6,320 +6,90 @@
[detail]  namespace ArrayCore {
[detail]  
[detail]    
[detail] -#if 0
[detail] +
[detail]  #define TRACE_GRADIENTSEARCH
[detail]  
[detail]    
[detail] -  FKGradientSearch::FKGradientSearch()
[detail] -    : FKGridSearch()
[detail] +  FKGradientSearch::FKGradientSearch(size_t dimensionCount)
[detail] +    : NewtonOptimizationND(dimensionCount)
[detail]    {
[detail]      TRACE;
[detail] -    _searchGridIndexList=nullptr;
[detail] -    
[detail] -    _s1.fkp.initOneComponent();
[detail] -    _s2.fkp.initOneComponent();
[detail] -    _refinep.initOneComponent();
[detail] +    ASSERT(dimensionCount>=2);
[detail] +    _kStep=0.0;
[detail] +    _kMax=0.0;
[detail]    }
[detail]  
[detail]    
[detail]    FKGradientSearch::~FKGradientSearch()
[detail]    {
[detail]      TRACE;
[detail] -    delete [] _searchGridIndexList;
[detail]    }
[detail]  
[detail]    
[detail] -  void FKGradientSearch::setScales(const Point& scaledToRealFactors)
[detail] -  {
[detail] -    _scaledToReal=scaledToRealFactors;
[detail] -    _realToScaled.setX(1.0/_scaledToReal.x());
[detail] -    _realToScaled.setY(1.0/_scaledToReal.y());
[detail] -    _realToScaled.setZ(1.0/_scaledToReal.z());
[detail] -    DoubleMatrix s(3, 1);
[detail] -    s.at(0,0)=_scaledToReal.x();
[detail] -    s.at(1,0)=_scaledToReal.y();
[detail] -    s.at(2,0)=_scaledToReal.z();
[detail] -    _hessianScaledToReal=s*s.transposed();
[detail] -  }
[detail] -
[detail] -  void FKGradientSearch::setGrid(const Point& gridSize)
[detail] +  bool FKGradientSearch::setGrid(double kStep, double kMax)
[detail]    {
[detail] -    
[detail] -    
[detail] -    _gridSize.setX(qFloor(gridSize.x()*_realToScaled.x())*_scaledToReal.x());
[detail] -    _gridSize.setY(qFloor(gridSize.y()*_realToScaled.y())*_scaledToReal.y());
[detail] -    _gridSize.setZ(qFloor(gridSize.z()*_realToScaled.z())*_scaledToReal.z());
[detail] -
[detail] -    
[detail] -    
[detail] -    
[detail] -
[detail] -    _climbStep=0.25;
[detail] -    
[detail] -    _minStep=0.005*_climbStep;
[detail] -    _maxClimb=::sqrt(2.0);
[detail] -    FKGridSearch::setGrid(-gridSize.x()*_realToScaled.x(), gridSize.x()*_realToScaled.x(), 1.0,
[detail] -                          -gridSize.y()*_realToScaled.y(), gridSize.y()*_realToScaled.y(), 1.0,
[detail] -                          -gridSize.z()*_realToScaled.z(), gridSize.z()*_realToScaled.z(), 1.0);
[detail] -    
[detail] -    _refinep.setSteering(function()->steering());
[detail] -
[detail] -    
[detail] +    TRACE;
[detail] +    if(_kMax<2.0*_kStep) {
[detail] +      App::log(tr("Grid, the difference between max (%1) and step (%2) is too small.\n")
[detail] +                   .arg(kMax).arg(kStep));
[detail] +      return false;
[detail] +    }
[detail] +    _kStep=kStep;
[detail] +    _kMax=kMax;
[detail] +    return true;
[detail]    }
[detail]  
[detail]    void FKGradientSearch::localMax(int nMax, double absThres, double relThres)
[detail]    {
[detail] +    TRACE;
[detail]      clearMaxima();
[detail] -#ifdef TRACE_GRADIENTSEARCH
[detail] -    printf("Looking for local maxima\n");
[detail] -#endif
[detail] -    for(int i=0; i<_nxyz; i++) {
[detail] -      freeClimbing(_coordinates[i], _climbStep, _coordinates[i]);
[detail] -      
[detail] +#ifdef PROCESS_TIMING
[detail] +    QElapsedTimer chrono;
[detail] +    qint64 tlc, trf;
[detail] +    chrono.start();
[detail] +#endif
[detail] +    for(double k=_kStep; k<=_kMax; k+=_kStep) {
[detail] +      _currentPosition[0]=k;
[detail] +      double thetaStep=_kStep/k;
[detail] +      for(double theta=0.0; theta<2*M_PI; theta+=thetaStep) {
[detail] +        _currentPosition[1]=theta;
[detail] +        if(_function->isValid(k, theta)) {
[detail] +          addMaximum(0.0);
[detail]      }
[detail] -    FunctionSearch::localMax(nMax, absThres, relThres);
[detail] -    FunctionSearch::unique();
[detail]    }
[detail] -
[detail] -  
[detail] -
[detail] -  
[detail] -
[detail] -#if 0
[detail] -  void FKGradientSearch::gridClimbing(int startGridIndex)
[detail] -  {
[detail] -    const AbstractFKFunction& f=*function();
[detail] -    Point k0=_coordinates[startGridIndex];
[detail] -    if(!f.isInsideLimits(k0)) {
[detail] -      return;
[detail]      }
[detail] -#ifdef TRACE_GRADIENTSEARCH
[detail] -    printf("  grid climbing from (%lf, %lf, %lf)\n", k0.x(), k0.y(), k0.z());
[detail] +#ifdef PROCESS_TIMING
[detail] +    tlc=chrono.nsecsElapsed();
[detail]  #endif
[detail] -    State * s=&_s1;
[detail] -    State * sOld=&_s2;
[detail] -
[detail] -    int iSteps=0;
[detail] -    Point step=_climbStep;
[detail] -
[detail] -    sOld->i=startGridIndex;
[detail] -    sOld->p.setSteering(f.steering(sOld->i));
[detail] -    sOld->dp=f.gradient(sOld->p);
[detail] -    scaleStep(sOld->dp, step);
[detail] -
[detail] -    Point dk;
[detail] -    do {
[detail] -      s->i=nextGridIndex(sOld);
[detail] -      if(s->i<0) {
[detail] -#ifdef TRACE_GRADIENTSEARCH
[detail] -        printf("  Going outside limits\n");
[detail] +    FunctionSearch::localMax(nMax, absThres, relThres);
[detail] +#ifdef PROCESS_TIMING
[detail] +    trf=chrono.nsecsElapsed();
[detail] +    globalTimeMutex.lock();
[detail] +    ttlc+=tlc;
[detail] +    ttrf+=trf-tlc;
[detail] +    globalTimeMutex.unlock();
[detail]  #endif
[detail] -        return;
[detail]        }
[detail] -      s->p.setSteering(f.steering(s->i));
[detail] -      s->dp=f.gradient(s->p);
[detail] -      scaleStep(s->dp, step);
[detail] -      iSteps++;
[detail]        
[detail]        
[detail] -      
[detail] -      
[detail] -      if(s->p.value()>sOld->p.value() && sOld->dp.scalarProduct(s->dp)>0.0) {
[detail] -        qSwap(sOld, s);
[detail] -      } else {
[detail] -        if(f.concavity(sOld->p)<0.0) {
[detail] -#ifdef TRACE_GRADIENTSEARCH
[detail] -          printf("    found negative concativity after %i steps\n", iSteps);
[detail] -#endif
[detail] -          Point dk=sOld->p.newtonStep(step, Point());
[detail] -          refineMax(_coordinates[sOld->i], step, dk);
[detail] -          return;
[detail] -        } else {
[detail] -          step*=0.5;
[detail] -          if(step.x()>_cacheGridStep.x() &&
[detail] -             step.y()>_cacheGridStep.y() &&
[detail] -             step.z()>_cacheGridStep.z()){
[detail] -            scaleStep(sOld->dp, step);
[detail] -#ifdef TRACE_GRADIENTSEARCH
[detail] -            printf("    reducing step to (%lf, %lf, %lf) after %i steps\n",
[detail] -                   step.x(), step.y(), step.z(), iSteps);
[detail] -#endif
[detail] -          } else {
[detail] -#ifdef TRACE_GRADIENTSEARCH
[detail] -            printf("    switching to free climbing after %i steps\n", iSteps);
[detail] -#endif
[detail] -            freeClimbing(_coordinates[sOld->i], step, k0);
[detail] -            return;
[detail] -          }
[detail] -        }
[detail] -      }
[detail] -      dk=_coordinates[sOld->i];
[detail] -      dk-=k0;
[detail] -    } while(dk.x()<_maxClimb.x() &&
[detail] -            dk.y()<_maxClimb.y() &&
[detail] -            dk.z()<_maxClimb.z());
[detail] -#ifdef TRACE_GRADIENTSEARCH
[detail] -    const Point& k=_coordinates[sOld->i];
[detail] -    printf("    reaching max distance at (%lf, %lf, %lf) after %i steps\n", k.x(), k.y(), k.z(), iSteps);
[detail] -#endif
[detail] -  }
[detail] -#endif
[detail] -
[detail] -  void FKGradientSearch::freeClimbing(Point p, double step, const Point& p0)
[detail] +  double FKGradientSearch::refineMax(double)
[detail]    {
[detail] -    const AbstractFKFunction& f=*function();
[detail] -    if(!f.isInsideLimits(p*_scaledToReal)) {
[detail] -      return;
[detail] -    }
[detail] -#ifdef TRACE_GRADIENTSEARCH
[detail] -    printf("  free climbing from (%lf, %lf, %lf)\n", p.x()*_scaledToReal.x(),
[detail] -                                                     p.y()*_scaledToReal.y(),
[detail] -                                                     Angle::radiansToDegrees(p.z()*_scaledToReal.z()));
[detail] -#endif
[detail] -    State * s=&_s1;
[detail] -    State * sOld=&_s2;
[detail] -
[detail] -    int iSteps=0;
[detail] -
[detail] -    s->fkp.setSteering(f.steering());
[detail] -
[detail] -    sOld->p=p;
[detail] -    sOld->fkp.setSteering(f.steering());
[detail] -    f.setGradient(sOld->p*_scaledToReal, sOld->fkp);
[detail] -    sOld->dp=sOld->fkp.gradient()*_realToScaled;
[detail] -    sOld->dp*=step/sOld->dp.length();
[detail] -
[detail] -    do {
[detail] -      s->p=sOld->p+sOld->dp;
[detail] -      f.setGradient(s->p*_scaledToReal, s->fkp);
[detail] -      s->dp=s->fkp.gradient()*_realToScaled;
[detail] -      s->dp*=step/s->dp.length();
[detail] -      iSteps++;
[detail] -#ifdef TRACE_GRADIENTSEARCH
[detail] -      printf("      (%lf, %lf, %lf)\n",
[detail] -             s->p.x()*_scaledToReal.x(), s->p.y()*_scaledToReal.y(), Angle::radiansToDegrees(s->p.z()*_scaledToReal.z()));
[detail] -      FunctionSearchMaximum * max=f.createMaximum(s->fkp.value(), s->p*_scaledToReal);
[detail] -      if(max) {
[detail] -        _maxima.append(max);
[detail] -      }
[detail] -#endif
[detail] -      
[detail] -      
[detail] -      
[detail] -      
[detail] -      bool validStep=s->fkp.value()>sOld->fkp.value() &&
[detail] -                     sOld->dp.scalarProduct(s->dp)>0.0;
[detail] -      if(!validStep || step<_climbStep) {
[detail] -        f.setHessian(sOld->p*_scaledToReal, sOld->fkp);
[detail] -        if(sOld->fkp.concavity(&_hessianScaledToReal)<0.0) {
[detail] -#ifdef TRACE_GRADIENTSEARCH
[detail] -          printf("    found negative concativity after %i steps\n", iSteps);
[detail] -#endif
[detail] -          Point dp=sOld->fkp.newtonStep()*_realToScaled;
[detail] -          refineMax(sOld->p, dp);
[detail] -          return;
[detail] -        }
[detail] -      }
[detail] -      if(validStep) {
[detail] -        qSwap(sOld, s);
[detail] +    reset(_currentPosition);
[detail] +    PrivateVector<double> step(2);
[detail] +    step[0]=_kStep*0.1;
[detail] +    step[1]=step[0]/_currentPosition[0];
[detail] +    if(maximize(step)) {
[detail]          
[detail] +      Complex k;
[detail] +      k.setExp(position()[0], position()[1]);
[detail] +      _currentPosition.copyValues(position());
[detail] +      _currentPosition[0]=k.re();
[detail] +      _currentPosition[1]=k.im();
[detail] +      return value();
[detail]        } else {
[detail] -        if(step>_minStep) {
[detail] -          step*=0.5;
[detail] -          sOld->dp*=step/sOld->dp.length();
[detail] -#ifdef TRACE_GRADIENTSEARCH
[detail] -          printf("    reducing step to %lf after %i steps\n", step, iSteps);
[detail] -#endif
[detail] -        } else {
[detail] -#ifdef TRACE_GRADIENTSEARCH
[detail] -          printf("      too small step %lf after %i steps\n",
[detail] -                 step, iSteps);
[detail] -#endif
[detail] -          return;
[detail] -        }
[detail] +      return 0.0;
[detail]        }
[detail] -    } while((sOld->p-p0).length()<_maxClimb);
[detail] -#ifdef TRACE_GRADIENTSEARCH
[detail] -    printf("    reaching max distance at (%lf, %lf, %lf) after %i steps\n",
[detail] -           sOld->p.x()*_scaledToReal.x(),
[detail] -           sOld->p.y()*_scaledToReal.y(),
[detail] -           Angle::radiansToDegrees(sOld->p.z()*_scaledToReal.z()),
[detail] -           iSteps);
[detail] -#endif
[detail]    }
[detail]  
[detail] -  
[detail] -  void FKGradientSearch::refineMax(Point p, Point dp)
[detail] -  {
[detail] -    double maxStep=_climbStep;
[detail] -    const AbstractFKFunction& f=*function();
[detail] -    int iNewtonSteps=0;
[detail] -    Point oldp;
[detail] -    double l=dp.length();
[detail] -    if(l>maxStep) {
[detail] -      dp*=maxStep/l;
[detail] -    }
[detail] -    while(dp.length()>p.length()*_precision) {
[detail] -      oldp=p;
[detail] -      p+=dp;
[detail] -#ifdef TRACE_GRADIENTSEARCH
[detail] -          printf("      (%lf, %lf, %lf)\n",
[detail] -                 p.x()*_scaledToReal.x(),
[detail] -                 p.y()*_scaledToReal.y(),
[detail] -                 Angle::radiansToDegrees(p.z()*_scaledToReal.z()));
[detail] -#endif
[detail] -      iNewtonSteps++;
[detail] -      f.setGradient(p*_scaledToReal, _refinep);
[detail] -      f.setHessian(p*_scaledToReal, _refinep);
[detail] -      if(_refinep.concavity(&_hessianScaledToReal)<0.0) {
[detail] -        Point newdp=_refinep.newtonStep()*_realToScaled;
[detail] -        l=newdp.length();
[detail] -        if(l>maxStep) {
[detail] -          newdp*=maxStep/l;
[detail] -        }
[detail] -        
[detail] -        Point diff=dp;
[detail] -        diff+=newdp;
[detail] -        if(diff.length()<dp.length()*0.01) {
[detail] -          maxStep*=0.5;
[detail] -          dp=newdp*(maxStep/newdp.length());
[detail] -#ifdef TRACE_GRADIENTSEARCH
[detail] -          printf("      reducing Newton max step to %lf after %i steps\n",
[detail] -                 maxStep, iNewtonSteps);
[detail] -#endif
[detail] -        } else {
[detail] -          dp=newdp;
[detail] -        }
[detail] -      } else {
[detail] -        if(maxStep>_minStep){
[detail] -          maxStep*=0.5;
[detail] -          p=oldp;
[detail] -          dp*=maxStep/dp.length();
[detail] -#ifdef TRACE_GRADIENTSEARCH
[detail] -          printf("      reducing Newton max step to %lf after %i steps\n",
[detail] -                 maxStep, iNewtonSteps);
[detail] -#endif
[detail] -        } else {
[detail] -#ifdef TRACE_GRADIENTSEARCH
[detail] -          printf("      too small Newton max step %lf after %i steps\n",
[detail] -                 maxStep, iNewtonSteps);
[detail] -#endif
[detail] -          return;
[detail] -        }
[detail] -      }
[detail] -    }
[detail] -#ifdef TRACE_GRADIENTSEARCH
[detail] -    printf("      peak found at (%lf, %lf, %lf) after %i Newton iterations\n",
[detail] -           p.x()*_scaledToReal.x(),
[detail] -           p.y()*_scaledToReal.y(),
[detail] -           Angle::radiansToDegrees(p.z()*_scaledToReal.z()),
[detail] -           iNewtonSteps);
[detail] -#endif
[detail] -    FunctionSearchMaximum * max=f.createMaximum(_refinep.value(), p*_scaledToReal);
[detail] -    if(max) {
[detail] -      _maxima.append(max);
[detail] -    }
[detail] -  }
[detail] -#endif
[detail]  } 
[detail]  
[detail]                     src/FKParameters.cpp:  version-4.2.1	modified out of comments
[detail] --- src/FKParameters.cpp-version-4.2.1-stripped	2025-09-28 04:01:16.299557588 +0200
[detail] +++ src/FKParameters.cpp-HEAD-stripped	2025-09-28 04:01:16.303557606 +0200
[detail] @@ -35,7 +35,32 @@
[detail]      _sensorOrientationMaximumCorrection=M_PI/9.0;
[detail]      _sensorOrientationMaximumIterations=100;
[detail]  
[detail] -    _brightSpots=0;
[detail] +    _brightSpotCount=0;
[detail] +    _brightSpotDamping=0.99;
[detail] +
[detail] +    _localSourceStepFactor=0.05;
[detail] +    _localSourceSizeFactor=10.0;
[detail] +
[detail] +    _maximumIterations=50000;
[detail] +    _startingPositionSeed=1234;
[detail] +    _minimumAmplitudeFactor=1e-6;
[detail] +    _maximumAmplitudeFactor=1e6;
[detail] +    _nRayleighSources=5;
[detail] +    _nLoveSources=5;
[detail] +    _nRayleighModes=1;
[detail] +    _nLoveModes=1;
[detail] +    _ellipticityMaximumStep=M_PI/6.0;
[detail] +    _wavenumberMaximumStep=0.2;
[detail] +    _directionMaximumStep=M_PI/18.0;
[detail] +    _distanceMaximumStep=0.2;
[detail] +    _amplitudeMaximumStep=0.2;
[detail] +    _phaseMaximumStep=M_PI/6.0;
[detail] +    _ellipticityPrecision=M_PI/1800.0;
[detail] +    _wavenumberPrecision=0.0001;
[detail] +    _directionPrecision=M_PI/180000.0;
[detail] +    _distancePrecision=0.0001;
[detail] +    _amplitudePrecision=0.0001;
[detail] +    _phasePrecision=M_PI/180000.0;
[detail]    }
[detail]  
[detail]    
[detail] @@ -52,6 +77,9 @@
[detail]        case ArrayStations::ThreeComponents:
[detail]          _processType=ARDS;
[detail]          break;
[detail] +      case ArrayStations::ThreeComponentsAndStrain:
[detail] +        _processType=VelocityStrainRateRayleigh;
[detail] +        break;
[detail]        }
[detail]      }
[detail]      setDefaultValues();
[detail] @@ -70,7 +98,7 @@
[detail]      _exportAllFKGrids=false;
[detail]      _damping=0.0;
[detail]      _rotateStepCount=72;
[detail] -    setfrequencyBandwidth(0.0);
[detail] +    setFrequencyBandwidth(0.0);
[detail]      blockAveraging().setStatisticCount(50);
[detail]      blockAveraging().setStatisticMaxOverlap(0.0);
[detail]  
[detail] @@ -98,20 +126,27 @@
[detail]      switch(_processType) {
[detail]      case ARDS:
[detail]      case LDS3:
[detail] -    case SensorOrientation:
[detail] +    case ARDSSensorOrientation:
[detail]      case RDSSingle:
[detail] +    case VelocityStrainRateRayleigh:
[detail] +    case VelocityStrainRateLove:
[detail]        blockAveraging().setCount(0);
[detail] -      blockAveraging().setCountFactor(6.0);
[detail] +      blockAveraging().setCountFactor(2.0);
[detail]        _relativeThreshold=0.01;
[detail]        _saveUndefinedEllipticities=false;
[detail]        break;
[detail]      case Undefined:
[detail] +    case SpectrumMatch:
[detail] +    case CrossSpectrumMatch:
[detail] +    case PlaneWaveInversion:
[detail] +    case FullSpectrumOneMode:
[detail]      case Capon:
[detail]      case CaponRadial:
[detail]      case CaponTransverse:
[detail]      case Omni:
[detail]      case PoggiRadial:
[detail]      case PoggiVertical:
[detail] +    case LocalSourceVertical:
[detail]        blockAveraging().setCount(0);
[detail]        blockAveraging().setCountFactor(2.0);
[detail]        break;
[detail] @@ -119,14 +154,14 @@
[detail]      case ARTBF:
[detail]      case RTBFFixedEll:
[detail]        blockAveraging().setCount(0);
[detail] -      blockAveraging().setCountFactor(4.0);
[detail] +      blockAveraging().setCountFactor(2.0);
[detail]        _relativeThreshold=0.01;
[detail]        _inversionMethod=RefinedGrid; 
[detail]        _saveUndefinedEllipticities=false;
[detail]        break;
[detail]      case LDS2:
[detail]        blockAveraging().setCount(0);
[detail] -      blockAveraging().setCountFactor(4.0);
[detail] +      blockAveraging().setCountFactor(2.0);
[detail]        break;
[detail]      case Conventional:
[detail]      case ConventionalRadial:
[detail] @@ -170,20 +205,27 @@
[detail]    {
[detail]      switch(t) {
[detail]      case Undefined:
[detail] +    case SpectrumMatch:
[detail] +    case CrossSpectrumMatch:
[detail] +    case PlaneWaveInversion:
[detail] +    case FullSpectrumOneMode:
[detail]      case Capon:
[detail]      case Omni:
[detail]      case CaponRadial:
[detail]      case CaponTransverse:
[detail] +    case LocalSourceVertical:
[detail]      case RTBF:
[detail]      case ARTBF:
[detail]      case RTBFFixedEll:
[detail]      case ARDS:
[detail] -    case SensorOrientation:
[detail] +    case ARDSSensorOrientation:
[detail]      case RDSSingle:
[detail]      case PoggiVertical:
[detail]      case PoggiRadial:
[detail]      case LDS2:
[detail]      case LDS3:
[detail] +    case VelocityStrainRateRayleigh:
[detail] +    case VelocityStrainRateLove:
[detail]      case ActiveCapon:
[detail]      case ActiveRTBF:
[detail]        switch(m) {
[detail] @@ -285,6 +327,18 @@
[detail]      }
[detail]    }
[detail]  
[detail] +  double FKParameters::sourceMapStep(double aperture) const
[detail] +  {
[detail] +    TRACE;
[detail] +    return aperture*_localSourceStepFactor;
[detail] +  }
[detail] +
[detail] +  double FKParameters::sourceMapSize(double aperture) const
[detail] +  {
[detail] +    TRACE;
[detail] +    return aperture*_localSourceSizeFactor;
[detail] +  }
[detail] +
[detail]    void FKParameters::clearCurveRefine()
[detail]    {
[detail]      TRACE;
[detail] @@ -301,7 +355,7 @@
[detail]  
[detail]    int FKParameters::keywordCount(PARAMETERS_KEYWORDCOUNT_ARGS) const
[detail]    {
[detail] -    return 41+ArrayParameters::keywordCount();
[detail] +    return 64+ArrayParameters::keywordCount();
[detail]    }
[detail]  
[detail]    void FKParameters::collectKeywords(PARAMETERS_COLLECTKEYWORDS_ARGS)
[detail] @@ -348,8 +402,31 @@
[detail]      keywords.add(prefix+"SENSOR_ORIENTATION_MAXIMUM_RADIUS"+suffix, this, baseIndex+37);
[detail]      keywords.add(prefix+"SENSOR_ORIENTATION_MAXIMUM_CORRECTION"+suffix, this, baseIndex+34);
[detail]      keywords.add(prefix+"SENSOR_ORIENTATION_MAXIMUM_ITERATIONS"+suffix, this, baseIndex+35);
[detail] -    keywords.add(prefix+"BRIGHT_SPOTS"+suffix, this, baseIndex+38);
[detail] +    keywords.add(prefix+"BRIGHT_SPOT_COUNT"+suffix, this, baseIndex+38);
[detail] +    keywords.add(prefix+"BRIGHT_SPOT_DAMPING"+suffix, this, baseIndex+43);
[detail]      keywords.add(prefix+"ELLIPTICITY_CORRECTION"+suffix, this, baseIndex+39);
[detail] +    keywords.add(prefix+"LOCAL_SOURCE_STEP_FACTOR"+suffix, this, baseIndex+41);
[detail] +    keywords.add(prefix+"LOCAL_SOURCE_SIZE_FACTOR"+suffix, this, baseIndex+42);
[detail] +    keywords.add(prefix+"INVERSION_MAXIMUM_ITERATION"+suffix, this, baseIndex+44);
[detail] +    keywords.add(prefix+"INVERSION_STARTING_SEED"+suffix, this, baseIndex+45);
[detail] +    keywords.add(prefix+"INVERSION_MINIMUM_AMPLITUDE_FACTOR"+suffix, this, baseIndex+46);
[detail] +    keywords.add(prefix+"INVERSION_MAXIMUM_AMPLITUDE_FACTOR"+suffix, this, baseIndex+47);
[detail] +    keywords.add(prefix+"INVERSION_RAYLEIGH_SOURCES"+suffix, this, baseIndex+48);
[detail] +    keywords.add(prefix+"INVERSION_LOVE_SOURCES"+suffix, this, baseIndex+49);
[detail] +    keywords.add(prefix+"INVERSION_RAYLEIGH_MODES"+suffix, this, baseIndex+50);
[detail] +    keywords.add(prefix+"INVERSION_LOVE_MODES"+suffix, this, baseIndex+51);
[detail] +    keywords.add(prefix+"INVERSION_ELLIPTICITY_MAXIMUM_STEP"+suffix, this, baseIndex+52);
[detail] +    keywords.add(prefix+"INVERSION_WAVENUMBER_MAXIMUM_STEP"+suffix, this, baseIndex+53);
[detail] +    keywords.add(prefix+"INVERSION_DIRECTION_MAXIMUM_STEP"+suffix, this, baseIndex+54);
[detail] +    keywords.add(prefix+"INVERSION_DISTANCE_MAXIMUM_STEP"+suffix, this, baseIndex+55);
[detail] +    keywords.add(prefix+"INVERSION_AMPLITUDE_MAXIMUM_STEP"+suffix, this, baseIndex+56);
[detail] +    keywords.add(prefix+"INVERSION_PHASE_MAXIMUM_STEP"+suffix, this, baseIndex+57);
[detail] +    keywords.add(prefix+"INVERSION_ELLIPTICITY_PRECISION"+suffix, this, baseIndex+58);
[detail] +    keywords.add(prefix+"INVERSION_WAVENUMBER_PRECISION"+suffix, this, baseIndex+59);
[detail] +    keywords.add(prefix+"INVERSION_DIRECTION_PRECISION"+suffix, this, baseIndex+60);
[detail] +    keywords.add(prefix+"INVERSION_DISTANCE_PRECISION"+suffix, this, baseIndex+61);
[detail] +    keywords.add(prefix+"INVERSION_AMPLITUDE_PRECISION"+suffix, this, baseIndex+62);
[detail] +    keywords.add(prefix+"INVERSION_PHASE_PRECISION"+suffix, this, baseIndex+63);
[detail]    }
[detail]  
[detail]    QString FKParameters::toString(PARAMETERS_TOSTRING_ARGS_IMPL) const
[detail] @@ -373,29 +450,32 @@
[detail]           "#  CaponRadial              EN   High resolution FK processing (Capon, 1969) for radial projections.\n"
[detail]           "#  CaponTransverse          EN   High resolution FK processing (Capon, 1969) for transverse projections.\n"
[detail]           "#  RTBF                     ENZ  According to Wathelet et al (2018).\n"
[detail] -         "#                                Cross spectrum made of radial projections and vertical.\n"
[detail] +         "#                                Cross-spectrum made of radial projections and vertical.\n"
[detail]           "#                                Product of radial and vertical ellipticity steering.\n"
[detail]           "#  ARTBF                    ENZ  RTBF with all-component ellipticity steering.\n"
[detail] -         "#                                Cross spectrum made of radial projections and vertical.\n"
[detail] +         "#                                Cross-spectrum made of radial projections and vertical.\n"
[detail]           "#  PoggiVertical            ENZ  According Poggi et al. (2010)\n"
[detail]           "#                                k picked from vertical processing.\n"
[detail]           "#  PoggiRadial              ENZ  According Poggi et al. (2010)\n"
[detail]           "#                                k picked from radial processing.\n"
[detail]           "#  ARDS                     ENZ  Rayleigh Direct Steering with All-component ellipticity steerting.\n"
[detail] -         "#                                Cross spectrum made of raw components E, N and Z.\n"
[detail] +         "#                                Cross-spectrum made of raw components E, N and Z.\n"
[detail]           "#                                Radial projections included in the steering matrix.\n"
[detail]           "#  LDS3                     ENZ  Love Direct Steering.\n"
[detail] -         "#                                Cross spectrum made of raw components E, N and Z.\n"
[detail] +         "#                                Cross-spectrum made of raw components E, N and Z.\n"
[detail]           "#                                Transverse projections included in the steering matrix.\n"
[detail]           "#  LDS2                     EN   Love Direct Steering.\n"
[detail] -         "#                                Cross spectrum made of raw components E and N.\n"
[detail] +         "#                                Cross-spectrum made of raw components E and N.\n"
[detail]           "#                                Transverse projections included in the steering matrix.\n"
[detail]           "#  Experimental modes:\n"
[detail] +         "#  SpectrumMatch            ENZ  Inversion of spectra with multiple waves.\n"
[detail] +         "#  CrossSpectrumMatch       ENZ  Inversion of a cross-spectrum with multiple waves.\n"
[detail] +         "#  PlaneWaveInversion       ENZ  Inversion of multiple plane waves.\n"
[detail]           "#  RTBFFixedEll             ENZ  Same as RTBF but ellipticity is fixed.\n"
[detail]           "#                                FIXED_ELLIPTICITY_FILE_NAME must be provided.\n"
[detail]           "#  ActiveConventional       Z    Conventional FK processing for active sources.\n"
[detail]           "#  ActiveRTBF               ENZ  RTBF for active sources\n"
[detail] -         "#                                Cross spectrum made of radial and transverse projections.\n";
[detail] +         "#                                Cross-spectrum made of radial and transverse projections.\n";
[detail]      log+=prefix+"PROCESS_TYPE"+suffix+"="+convertProcessType(_processType)+"\n";
[detail]      switch(_processType) {
[detail]      case RTBF:
[detail] @@ -421,7 +501,11 @@
[detail]           "# is reconstructed and removed from the cross-spectral matrix. Another best\n"
[detail]           "# peak is searched with the modified cross-spectral matrix. The process is\n"
[detail]           "# repeated until removing the expected number of bright spots.\n";
[detail] -    log+=prefix+"BRIGHT_SPOTS"+suffix+"="+QString::number(_brightSpots)+"\n";
[detail] +    log+=prefix+"BRIGHT_SPOT_COUNT"+suffix+"="+QString::number(_brightSpotCount)+"\n";
[detail] +    log+="# The signal power corresponding to a peak is calculated from the beam power and\n"
[detail] +         "# incoherent noise estimation. The resulting power is multiplied by the damping.\n"
[detail] +         "# If the signal power is over-estimated, the cross-spectrum after removal may be singular.\n";
[detail] +    log+=prefix+"BRIGHT_SPOT_DAMPING"+suffix+"="+QString::number(_brightSpotDamping)+"\n";
[detail]      log+="# If provided and PROCESS_TYPE==RTBF, ARTBF or ARDS, the ellipticity is forced to the provided curve.\n"
[detail]           "# The file must contain two columns: frequency and signed ellipticity.\n"
[detail]           "# Provided sampling must not necessarily match the processing sampling frequency, linear interpolation is used.\n"
[detail] @@ -488,6 +572,13 @@
[detail]      log+=prefix+"K_MAX"+suffix+" (rad/m)="+QString::number(_kmax)+"\n";
[detail]      log+="#\n"
[detail]           "#\n"
[detail] +           "#     Local sources (only for PROCESS_TYPE=LocalSource*)\n"
[detail] +           "#\n"
[detail] +           "#\n";
[detail] +    log+=prefix+"LOCAL_SOURCE_STEP_FACTOR"+suffix+"="+QString::number(_localSourceStepFactor)+"\n";
[detail] +    log+=prefix+"LOCAL_SOURCE_SIZE_FACTOR"+suffix+"="+QString::number(_localSourceSizeFactor)+"\n";
[detail] +    log+="#\n"
[detail] +         "#\n"
[detail]           "#     Peak picking\n"
[detail]           "#\n"
[detail]           "#\n";
[detail] @@ -512,6 +603,39 @@
[detail]      log+=prefix+"SENSOR_ORIENTATION_MAXIMUM_RADIUS"+suffix+"="+QString::number(_sensorOrientationMaximumRadius)+"\n";
[detail]      log+=prefix+"SENSOR_ORIENTATION_MAXIMUM_CORRECTION"+suffix+"="+QString::number(Angle::radiansToDegrees(_sensorOrientationMaximumCorrection))+"\n";
[detail]      log+=prefix+"SENSOR_ORIENTATION_MAXIMUM_ITERATIONS"+suffix+"="+QString::number(_sensorOrientationMaximumIterations)+"\n";
[detail] +    log+="#\n"
[detail] +           "#\n"
[detail] +           "#     Wavefield inversion (only for PROCESS_TYPE=[Cross]SpectrumMatch or PlaneWaveInversion)\n"
[detail] +           "#\n"
[detail] +           "#\n";
[detail] +    log+="# Maximum number of iterations before aborting.\n";
[detail] +    log+=prefix+"INVERSION_MAXIMUM_ITERATION"+suffix+"="+QString::number(_maximumIterations)+"\n";
[detail] +    log+="# Random seed for generating random starting parameters.\n";
[detail] +    log+=prefix+"INVERSION_STARTING_SEED"+suffix+"="+QString::number(_startingPositionSeed)+"\n";
[detail] +    log+="# Range for amplitudes are based on the the range of amplitude observed for receivers.\n";
[detail] +    log+="# These factors allows to enlarge this range (typically 0.5 and 2).\n";
[detail] +    log+=prefix+"INVERSION_MINIMUM_AMPLITUDE_FACTOR"+suffix+"="+QString::number(_minimumAmplitudeFactor)+"\n";
[detail] +    log+=prefix+"INVERSION_MAXIMUM_AMPLITUDE_FACTOR"+suffix+"="+QString::number(_maximumAmplitudeFactor)+"\n";
[detail] +    log+="# Number of sources and modes for Rayleigh and Love waves.\n";
[detail] +    log+=prefix+"INVERSION_RAYLEIGH_SOURCES"+suffix+"="+QString::number(_nRayleighSources)+"\n";
[detail] +    log+=prefix+"INVERSION_LOVE_SOURCES"+suffix+"="+QString::number(_nLoveSources)+"\n";
[detail] +    log+=prefix+"INVERSION_RAYLEIGH_MODES"+suffix+"="+QString::number(_nRayleighModes)+"\n";
[detail] +    log+=prefix+"INVERSION_LOVE_MODES"+suffix+"="+QString::number(_nLoveModes)+"\n";
[detail] +    log+="# Maximum step allowed for each type of parameter during one iteration.\n"
[detail] +         "#   If WAVENUMBER==0, the value is set to the minimum wavenumber (frequency dependent)\n"
[detail] +         "#   If AMPLITUDE==0, the value is set to the minimum amplitude (time and frequency dependent)\n";
[detail] +    log+=prefix+"INVERSION_ELLIPTICITY_MAXIMUM_STEP"+suffix+" (deg.)="+QString::number(Angle::radiansToDegrees(_ellipticityMaximumStep))+"\n";
[detail] +    log+=prefix+"INVERSION_WAVENUMBER_MAXIMUM_STEP"+suffix+" (%)="+QString::number(_wavenumberMaximumStep*100.0)+"\n";
[detail] +    log+=prefix+"INVERSION_DIRECTION_MAXIMUM_STEP"+suffix+" (deg.)="+QString::number(Angle::radiansToDegrees(_directionMaximumStep))+"\n";
[detail] +    log+=prefix+"INVERSION_DISTANCE_MAXIMUM_STEP"+suffix+" (%)="+QString::number(_distanceMaximumStep*100.0)+"\n";
[detail] +    log+=prefix+"INVERSION_AMPLITUDE_MAXIMUM_STEP"+suffix+" (%)="+QString::number(_amplitudeMaximumStep*100.0)+"\n";
[detail] +    log+=prefix+"INVERSION_PHASE_MAXIMUM_STEP"+suffix+" (deg.)="+QString::number(Angle::radiansToDegrees(_phaseMaximumStep))+"\n";
[detail] +    log+=prefix+"INVERSION_ELLIPTICITY_PRECISION"+suffix+" (deg.)="+QString::number(Angle::radiansToDegrees(_ellipticityPrecision))+"\n";
[detail] +    log+=prefix+"INVERSION_WAVENUMBER_PRECISION"+suffix+" (%)="+QString::number(_wavenumberPrecision*100.0)+"\n";
[detail] +    log+=prefix+"INVERSION_DIRECTION_PRECISION"+suffix+" (deg.)="+QString::number(Angle::radiansToDegrees(_directionPrecision))+"\n";
[detail] +    log+=prefix+"INVERSION_DISTANCE_PRECISION"+suffix+" (%)="+QString::number(_distancePrecision*100.0)+"\n";
[detail] +    log+=prefix+"INVERSION_AMPLITUDE_PRECISION"+suffix+" (%)="+QString::number(_amplitudePrecision*100.0)+"\n";
[detail] +    log+=prefix+"INVERSION_PHASE_PRECISION"+suffix+" (deg.)="+QString::number(Angle::radiansToDegrees(_phasePrecision))+"\n";
[detail]      return log;
[detail]    }
[detail]  
[detail] @@ -579,10 +703,10 @@
[detail]        _relativeThreshold=value.toDouble(&ok)*0.01;
[detail]        return ok;
[detail]      case 6:
[detail] -      _exportAllFKGrids=(value=="y");
[detail] -      return true;
[detail] +      _exportAllFKGrids=Number::toBoolean(value, ok);
[detail] +      return ok;
[detail]      case 27:
[detail] -      _saveUndefinedEllipticities=(value=="y");
[detail] +      _saveUndefinedEllipticities=Number::toBoolean(value, ok);
[detail]        return ok;
[detail]      case 7:
[detail]        if(_damping>=0.0) {
[detail] @@ -623,7 +747,7 @@
[detail]        _sourceGridSize=value.toDouble(&ok);
[detail]        return ok;
[detail]      case 29:
[detail] -      _sortResultValues=(value=="y");
[detail] +      _sortResultValues=Number::toBoolean(value, ok);
[detail]        return ok;
[detail]      case 30:
[detail]        sensorOrientationErrorsFromString(value, ok);
[detail] @@ -650,7 +774,7 @@
[detail]        _sensorOrientationMaximumRadius=value.toDouble(&ok);
[detail]        return ok && _sensorOrientationMaximumRadius>=0.0;
[detail]      case 38:
[detail] -      _brightSpots=value.toInt(&ok);
[detail] +      _brightSpotCount=value.toInt(&ok);
[detail]        return ok;
[detail]      case 39:
[detail]        _ellipticityCorrection=convertEllipticityCorrection(value, ok);
[detail] @@ -658,6 +782,75 @@
[detail]      case 40:
[detail]        _maxPeakCountFactor=value.toDouble(&ok);
[detail]        return ok;
[detail] +    case 41:
[detail] +      _localSourceStepFactor=value.toDouble(&ok);
[detail] +      return ok;
[detail] +    case 42:
[detail] +      _localSourceSizeFactor=value.toDouble(&ok);
[detail] +      return ok;
[detail] +    case 43:
[detail] +      _brightSpotDamping=value.toDouble(&ok);
[detail] +      return ok;
[detail] +    case 44:
[detail] +      _maximumIterations=value.toInt(&ok);
[detail] +      return ok;
[detail] +    case 45:
[detail] +      _startingPositionSeed=value.toInt(&ok);
[detail] +      return ok;
[detail] +    case 46:
[detail] +      _minimumAmplitudeFactor=value.toDouble(&ok);
[detail] +      return ok;
[detail] +    case 47:
[detail] +      _maximumAmplitudeFactor=value.toDouble(&ok);
[detail] +      return ok;
[detail] +    case 48:
[detail] +      _nRayleighSources=value.toInt(&ok);
[detail] +      return ok;
[detail] +    case 49:
[detail] +      _nLoveSources=value.toInt(&ok);
[detail] +      return ok;
[detail] +    case 50:
[detail] +      _nRayleighModes=value.toInt(&ok);
[detail] +      return ok;
[detail] +    case 51:
[detail] +      _nLoveModes=value.toInt(&ok);
[detail] +      return ok;
[detail] +    case 52:
[detail] +      _ellipticityMaximumStep=Angle::degreesToRadians(value.toDouble(&ok));
[detail] +      return ok;
[detail] +    case 53:
[detail] +      _wavenumberMaximumStep=0.01*value.toDouble(&ok);
[detail] +      return ok;
[detail] +    case 54:
[detail] +      _directionMaximumStep=Angle::degreesToRadians(value.toDouble(&ok));
[detail] +      return ok;
[detail] +    case 55:
[detail] +      _distanceMaximumStep=0.01*value.toDouble(&ok);
[detail] +      return ok;
[detail] +    case 56:
[detail] +      _amplitudeMaximumStep=0.01*value.toDouble(&ok);
[detail] +      return ok;
[detail] +    case 57:
[detail] +      _phaseMaximumStep=Angle::degreesToRadians(value.toDouble(&ok));
[detail] +      return ok;
[detail] +    case 58:
[detail] +      _ellipticityPrecision=Angle::degreesToRadians(value.toDouble(&ok));
[detail] +      return ok;
[detail] +    case 59:
[detail] +      _wavenumberPrecision=0.01*value.toDouble(&ok);
[detail] +      return ok;
[detail] +    case 60:
[detail] +      _directionPrecision=Angle::degreesToRadians(value.toDouble(&ok));
[detail] +      return ok;
[detail] +    case 61:
[detail] +      _distancePrecision=0.01*value.toDouble(&ok);
[detail] +      return ok;
[detail] +    case 62:
[detail] +      _amplitudePrecision=0.01*value.toDouble(&ok);
[detail] +      return ok;
[detail] +    case 63:
[detail] +      _phasePrecision=Angle::degreesToRadians(value.toDouble(&ok));
[detail] +      return ok;
[detail]      default:
[detail]        break;
[detail]      }
[detail] @@ -763,12 +956,14 @@
[detail]    }
[detail]  
[detail]    ENUM_AS_STRING_BEGIN(FKParameters, ProcessType)
[detail] -  ENUM_AS_STRING_DATA_23(ActiveCapon, ActiveConventional, ActiveConventionalRayleigh,
[detail] -                         ActiveRTBF, ARDS, ARTBF, Capon, CaponRadial, CaponTransverse,
[detail] +  ENUM_AS_STRING_DATA_30(ActiveCapon, ActiveConventional, ActiveConventionalRayleigh,
[detail] +                         ActiveRTBF, ARDS, ARDSSensorOrientation, ARTBF,
[detail] +                         Capon, CaponRadial, CaponTransverse,
[detail]                           Conventional, ConventionalRadial, ConventionalRayleigh,
[detail] -                         ConventionalTransverse, LDS2, LDS3, Omni, PoggiRadial,
[detail] -                         PoggiVertical, RDSSingle, RTBF, RTBFFixedEll,
[detail] -                         SensorOrientation, Undefined);
[detail] +                         ConventionalTransverse, CrossSpectrumMatch, FullSpectrumOneMode,
[detail] +                         LDS2, LDS3, LocalSourceVertical, Omni,
[detail] +                         PlaneWaveInversion, PoggiRadial, PoggiVertical, RDSSingle, RTBF, RTBFFixedEll,
[detail] +                         SpectrumMatch, Undefined, VelocityStrainRateLove, VelocityStrainRateRayleigh);
[detail]    ENUM_AS_STRING_SYNONYM("Projections", RTBF);
[detail]    ENUM_AS_STRING_DEFAULT_VALUE(Undefined);
[detail]    ENUM_AS_STRING_END
[detail]                          src/FKPeaks.cpp:  version-4.2.1	modified out of comments
[detail] --- src/FKPeaks.cpp-version-4.2.1-stripped	2025-09-28 04:01:16.319557685 +0200
[detail] +++ src/FKPeaks.cpp-HEAD-stripped	2025-09-28 04:01:16.323557703 +0200
[detail] @@ -50,22 +50,21 @@
[detail]      TRACE;
[detail]      double n=capacity();
[detail]      n*=sizeof(Value);
[detail] -    n/=1024.0*1024.0;
[detail]      _dataLock.lockForWrite();
[detail]      Value * newValues=static_cast<Value *>(reallocateVector((uchar *)_values, sizeof(Value)));
[detail]      if(newValues) {
[detail]        _values=newValues;
[detail]      } else {
[detail] -      App::log(tr("Failed to reallocate results for %1 values (size=%2 Mb)\n"
[detail] +      App::log(tr("Failed to reallocate results for %1 values (size=%2)\n"
[detail]                    "Container is full.")
[detail]                 .arg(capacity())
[detail] -               .arg(n));
[detail] +                   .arg(Number::bytesToString(n)));
[detail]        _full=true;
[detail]      }
[detail]      _dataLock.unlock();
[detail] -    APP_LOG(1, tr("Reallocated results for %1 values (size=%2 Mb)\n")
[detail] +    APP_LOG(1, tr("Reallocated results for %1 values (size=%2)\n")
[detail]              .arg(capacity())
[detail] -            .arg(n))
[detail] +            .arg(Number::bytesToString(n)))
[detail]    }
[detail]  
[detail]    FKPeaks::Value * FKPeaks::add()
[detail] @@ -152,7 +151,7 @@
[detail]            << v.power << " "
[detail]            << (v.valid ? 1 : 0);
[detail]          if(v.extraValues) {
[detail] -          int n=v.extraValues->count();
[detail] +          int n=v.extraValues->size();
[detail]            for(int i=0; i<n; i++) {
[detail]              s << " " << v.extraValues->at(i);
[detail]            }
[detail]                          src/FKPower.cpp:  version-4.2.1	modified out of comments
[detail] --- src/FKPower.cpp-version-4.2.1-stripped	2025-09-28 04:01:16.343557801 +0200
[detail] +++ src/FKPower.cpp-HEAD-stripped	2025-09-28 04:01:16.343557801 +0200
[detail] @@ -7,19 +7,26 @@
[detail]  
[detail]    
[detail]  
[detail] -  FKPower::FKPower(int stationCount, int matrixSizeFactor)
[detail] -    : _fe(matrixSizeFactor*stationCount, 0.0),
[detail] -      _ddfe(matrixSizeFactor*stationCount, 0.0),
[detail] -      _e(matrixSizeFactor*stationCount, 0.0),
[detail] -      _exi(matrixSizeFactor*stationCount, 0.0),
[detail] -      _edxi(matrixSizeFactor*stationCount, 0.0),
[detail] -      _re(matrixSizeFactor*stationCount, 0.0),
[detail] -      _re2(matrixSizeFactor*stationCount, 0.0),
[detail] -      _r(matrixSizeFactor*stationCount, 0.0),
[detail] -      _eGrid(stationCount, nullptr)
[detail] +  FKPower::FKPower(int stationCount, int matrixSize)
[detail] +      : _fe(matrixSize, 0.0),
[detail] +        _ddrfe(matrixSize, 0.0),
[detail] +        _ddtfe(matrixSize, 0.0),
[detail] +        _e(matrixSize, 0.0),
[detail] +        _exi(matrixSize, 0.0),
[detail] +        _edxi(matrixSize, 0.0),
[detail] +        _rre(matrixSize, 0.0),
[detail] +        _rte(matrixSize, 0.0),
[detail] +        _re2(matrixSize, 0.0),
[detail] +        _rr(matrixSize, 0.0),
[detail] +        _rt(matrixSize, 0.0),
[detail] +        _rGrid(stationCount, nullptr),
[detail] +        _qValue(stationCount, 0.0),
[detail] +        _qGrid(stationCount, nullptr)
[detail]    {
[detail]      _p2=0.0;
[detail] -    _dp=0.0;
[detail] +    _dpr=0.0;
[detail] +    _dpt=0.0;
[detail] +    _kAbs=0.0;
[detail]      _q=nullptr;
[detail]      _f=nullptr;
[detail]      _factorN=1.0/(stationCount*stationCount);
[detail]                        src/FKResults.cpp:  version-4.2.1	modified out of comments
[detail] --- src/FKResults.cpp-version-4.2.1-stripped	2025-09-28 04:01:16.359557877 +0200
[detail] +++ src/FKResults.cpp-HEAD-stripped	2025-09-28 04:01:16.363557897 +0200
[detail] @@ -305,6 +305,7 @@
[detail]    bool FKResults::save(QString fileName, const QString& log)
[detail]    {
[detail]      TRACE;
[detail] +    if(_peaks.size()>0) {
[detail]      _peaks.sort(parameters()->sortResultValues());
[detail]      if(!fileName.endsWith(".max")) {
[detail]        fileName+=".max";
[detail] @@ -314,6 +315,7 @@
[detail]        return false;
[detail]      }
[detail]      App::log(tr("Results saved in '%1'.\n").arg(fileName));
[detail] +    }
[detail]      return true;
[detail]    }
[detail]  
[detail]                       src/FKSteering.cpp:  version-4.2.1	modified out of comments
[detail] --- src/FKSteering.cpp-version-4.2.1-stripped	2025-09-28 04:01:16.379557974 +0200
[detail] +++ src/FKSteering.cpp-HEAD-stripped	2025-09-28 04:01:16.383557994 +0200
[detail] @@ -9,9 +9,7 @@
[detail]  
[detail]    
[detail]    FKSteering::FKSteering(const ArraySelection * array)
[detail] -    : _coordinates(array->count(), 0.0),
[detail] -      _xCoordinates(array->count(), 0.0),
[detail] -      _yCoordinates(array->count(), 0.0)
[detail] +    : _coordinates(array->count(), 0.0)
[detail]    {
[detail]      _array=array;
[detail]      _kCount=0;
[detail] @@ -25,13 +23,12 @@
[detail]      _rotations=nullptr;
[detail]      _sensorOrientationErrors=nullptr;
[detail]      _sensorPositionErrors=false;
[detail] +    _localSourceDistances=nullptr;
[detail]  
[detail]      
[detail]      for(int i=array->count()-1; i>=0; i--) {
[detail]        const Point2D& r=_array->relativePos(i);
[detail]        _coordinates[i]=Complex(r.x(), r.y());
[detail] -      _xCoordinates[i]=r.x();
[detail] -      _yCoordinates[i]=r.y();
[detail]      }
[detail]    }
[detail]  
[detail] @@ -70,8 +67,8 @@
[detail]        _phaseShiftsX=new Complex[nx]+halfCount*stationCount;
[detail]        _phaseShiftsY=new Complex[nx]+halfCount*stationCount;
[detail]  
[detail] -      App::log(tr("Pre-computing steering vectors for X and Y (%2 cells per axis): %1 Mb\n")
[detail] -               .arg(2*nx*sizeof(Complex)/(1024.0*1024.0))
[detail] +      App::log(tr("Pre-computing steering vectors for X and Y (%2 cells per axis): %1\n")
[detail] +               .arg(Number::bytesToString(2*nx*sizeof(Complex)))
[detail]                 .arg(_kCount));
[detail]        Complex * kx, * ky, x;
[detail]        double k;
[detail] @@ -95,13 +92,13 @@
[detail]    {
[detail]      if(!_phaseShifts) {
[detail]        int halfCount=qRound(size/step);
[detail] -      _kCount=(2*halfCount+1);
[detail] +      _kCount=2*halfCount+1;
[detail]        int stationCount=_array->count();
[detail]        int nx=_kCount*stationCount;
[detail]        _phaseShifts=new Complex[_kCount*nx]+halfCount*(nx+stationCount);
[detail]  
[detail] -      App::log(tr("Pre-computing steering vectors on the grid (%2 cells per axis): %1 Mb\n")
[detail] -               .arg(_kCount*nx*sizeof(Complex)/(1024.0*1024.0))
[detail] +      App::log(tr("Pre-computing steering vectors on the grid (%2 cells per axis): %1\n")
[detail] +               .arg(Number::bytesToString(_kCount*nx*sizeof(Complex)))
[detail]                 .arg(_kCount));
[detail]  
[detail]        Complex * valuesX, * values;
[detail] @@ -150,8 +147,8 @@
[detail]        int halfCount=(_kCount-1)/2;
[detail]        _rotations=new Complex[_kCount*_kCount]+halfCount*(_kCount+1);
[detail]  
[detail] -      App::log(tr("Pre-computing radial rotations on the grid (%2 cells per axis): %1 Mb\n")
[detail] -               .arg(_kCount*_kCount*sizeof(Complex)/(1024.0*1024.0))
[detail] +      App::log(tr("Pre-computing radial rotations on the grid (%2 cells per axis): %1\n")
[detail] +               .arg(Number::bytesToString(_kCount*_kCount*sizeof(Complex)))
[detail]                 .arg(_kCount));
[detail]        Complex * valuesX;
[detail]  
[detail] @@ -178,8 +175,8 @@
[detail]        int halfCount=(_kCount-1)/2;
[detail]        _rotations=new Complex[_kCount*_kCount]+halfCount*(_kCount+1);
[detail]  
[detail] -      App::log(tr("Pre-computing transverse rotations on the grid (%2 cells per axis): %1 Mb\n")
[detail] -               .arg(_kCount*_kCount*sizeof(Complex)/(1024.0*1024.0))
[detail] +      App::log(tr("Pre-computing transverse rotations on the grid (%2 cells per axis): %1\n")
[detail] +               .arg(Number::bytesToString(_kCount*_kCount*sizeof(Complex)))
[detail]                 .arg(_kCount));
[detail]        Complex * valuesX;
[detail]  
[detail] @@ -209,8 +206,6 @@
[detail]        if(delta!=Point2D()) {
[detail]          for(int i=0; i<stationCount; i++) {
[detail]            _coordinates[i]+=Complex(delta.x(), delta.y());
[detail] -          _xCoordinates[i]+=delta.x();
[detail] -          _yCoordinates[i]+=delta.y();
[detail]          }
[detail]          App::log(tr("Sensor position error for all stations: %1\n").arg(delta.toString('g', 20)));
[detail]        }
[detail] @@ -231,8 +226,6 @@
[detail]              randDelta.setY(r.uniform(-delta.y(), delta.y()));
[detail]            } while (randDelta.x()*randDelta.x()*invdx2>1.0-randDelta.y()*randDelta.y()*invdy2);
[detail]            _coordinates[i]+=Complex(randDelta.x(), randDelta.y());
[detail] -          _xCoordinates[i]+=randDelta.x();
[detail] -          _yCoordinates[i]+=randDelta.y();
[detail]            if(i>0) {
[detail]              str+=", \\\n  ";
[detail]            }
[detail] @@ -249,8 +242,6 @@
[detail]          if(delta!=Point2D()) {
[detail]            usedErrorCount++;
[detail]            _coordinates[i]+=Complex(delta.x(), delta.y());
[detail] -          _xCoordinates[i]+=delta.x();
[detail] -          _yCoordinates[i]+=delta.y();
[detail]            App::log(tr("Sensor position error for station '%1': %2\n").arg(name).arg(delta.toString('g', 20)));
[detail]          }
[detail]        }
[detail] @@ -312,6 +303,8 @@
[detail]            usedErrorCount++;
[detail]            _sensorOrientationErrors[i].setUnitExp(Angle::degreesToRadians(angle));
[detail]            App::log(tr("Sensor orientation error for station '%1': %2\n").arg(name).arg(angle));
[detail] +        } else {
[detail] +          APP_LOG(1, tr("  no error for station '%1'\n").arg(name));
[detail]          }
[detail]        }
[detail]        if(usedErrorCount<availableErrorCount) {
[detail] @@ -323,6 +316,60 @@
[detail]        }
[detail]      }
[detail]    }
[detail] +
[detail] +  void FKSteering::setLocalSourceDistances(const IrregularGridSearch2D& grid)
[detail] +  {
[detail] +    if(!_localSourceDistances) {
[detail] +      int halfCount=grid.xSize();
[detail] +      _xyCount=2*halfCount+1;
[detail] +      int stationCount=_array->count();
[detail] +      int nx=_xyCount*stationCount;
[detail] +      _localSourceDistances=new double[_xyCount*nx]+halfCount*(nx+stationCount);
[detail] +
[detail] +      App::log(tr("Pre-computing distances from local sources to sensors (%2 cells per axis): %1\n")
[detail] +                   .arg(Number::bytesToString(_xyCount*nx*sizeof(double)))
[detail] +                   .arg(_xyCount));
[detail] +
[detail] +      double * valuesX, * values;
[detail] +      for(int y=-halfCount; y<=halfCount; y++) {
[detail] +        valuesX=_localSourceDistances+y*nx;
[detail] +        for(int x=-halfCount; x<=halfCount; x++) {
[detail] +          values=valuesX+x*stationCount;
[detail] +          Complex pos(-grid.x(x), -grid.x(y));
[detail] +          for(int i=0; i<stationCount; i++) {
[detail] +            values[i]=(pos+_coordinates[i]).abs();
[detail] +          }
[detail] +        }
[detail] +      }
[detail] +    }
[detail] +  }
[detail] +
[detail] +  void FKSteering::setLocalSourceDistances(int n, double step)
[detail] +  {
[detail] +    if(!_localSourceDistances) {
[detail] +      int halfCount=n;
[detail] +      _xyCount=2*halfCount+1;
[detail] +      int stationCount=_array->count();
[detail] +      int nx=_xyCount*stationCount;
[detail] +      _localSourceDistances=new double[_xyCount*nx]+halfCount*(nx+stationCount);
[detail] +
[detail] +      App::log(tr("Pre-computing distances from local sources to sensors (%2 cells per axis): %1\n")
[detail] +                   .arg(Number::bytesToString(_xyCount*nx*sizeof(double)))
[detail] +                   .arg(_xyCount));
[detail] +
[detail] +      double * valuesX, * values;
[detail] +      for(int y=-halfCount; y<=halfCount; y++) {
[detail] +        valuesX=_localSourceDistances+y*nx;
[detail] +        for(int x=-halfCount; x<=halfCount; x++) {
[detail] +          values=valuesX+x*stationCount;
[detail] +          Complex pos(-x*step, -y*step);
[detail] +          for(int i=0; i<stationCount; i++) {
[detail] +            values[i]=(pos+_coordinates[i]).abs();
[detail] +          }
[detail] +        }
[detail] +      }
[detail] +    }
[detail] +  }
[detail]  
[detail]    
[detail]  
[detail]                    src/FKTaskManager.cpp:  version-4.2.1	not modified
[detail]                           src/FKTool.cpp:  version-4.2.1	modified out of comments
[detail] --- src/FKTool.cpp-version-4.2.1-stripped	2025-09-28 04:01:16.415558149 +0200
[detail] +++ src/FKTool.cpp-HEAD-stripped	2025-09-28 04:01:16.419558167 +0200
[detail] @@ -5,7 +5,13 @@
[detail]  #include "KminSolver.h"
[detail]  #include "FKResults.h"
[detail]  #include "FKTaskManager.h"
[detail] -#include "SensorOrientationTaskManager.h"
[detail] +#include "SpectrumMatchTaskManager.h"
[detail] +#include "CrossSpectrumMatchTaskManager.h"
[detail] +#include "PlaneWaveInversionTaskManager.h"
[detail] +#include "PlaneWaveInversionTaskManager2.h"
[detail] +#include "FullSpectrumOneModeTaskManager.h"
[detail] +#include "FullSpectrumResults.h"
[detail] +#include "AbstractFKFunction.h"
[detail]  
[detail]  namespace ArrayCore {
[detail]  
[detail] @@ -17,7 +23,6 @@
[detail]    {
[detail]      TRACE;
[detail]      _kmaxSolver=nullptr;
[detail] -    setResults(new FKResults);
[detail]      setParameters(new FKParameters);
[detail]    }
[detail]  
[detail] @@ -28,24 +33,14 @@
[detail]      delete _kmaxSolver;
[detail]    }
[detail]  
[detail] -  bool FKTool::setSubPool(SubSignalPool *subPool)
[detail] -  {
[detail] -    TRACE;
[detail] -    if(AbstractArrayTool::setSubPool(subPool)) {
[detail] -      return true;
[detail] -    } else {
[detail] -      return false;
[detail] -    }
[detail] -  }
[detail] -
[detail]    bool FKTool::setLoop()
[detail]    {
[detail]      TRACE;
[detail] -    if(!AbstractArrayTool::setLoop()) {
[detail] +    selectStations();
[detail] +    if(_arraySelection.count()<2) {
[detail] +      App::log(tr("Less than two selected stations, aborting.\n"));
[detail]        return false;
[detail]      }
[detail] -
[detail] -    selectStations();
[detail]      if(!setFrequencySampling()) {
[detail]        return false;
[detail]      }
[detail] @@ -53,16 +48,24 @@
[detail]      FKParameters * param=parameters();
[detail]      if(param->kmin()==0.0 ||
[detail]         param->kmax()==0.0) {
[detail] -      setWaveNumberGrid();
[detail] +      if(!setWaveNumberGrid()) {
[detail] +        return false;
[detail] +      }
[detail]      }
[detail]  
[detail]      switch(param->processType()) {
[detail]      case FKParameters::ARDS:
[detail] -    case FKParameters::SensorOrientation:
[detail] +    case FKParameters::ARDSSensorOrientation:
[detail]      case FKParameters::RDSSingle:
[detail]      case FKParameters::RTBF:
[detail]      case FKParameters::ARTBF:
[detail]      case FKParameters::RTBFFixedEll:
[detail] +    case FKParameters::VelocityStrainRateRayleigh:
[detail] +    case FKParameters::VelocityStrainRateLove:
[detail] +    case FKParameters::SpectrumMatch:
[detail] +    case FKParameters::CrossSpectrumMatch:
[detail] +    case FKParameters::PlaneWaveInversion:
[detail] +    case FKParameters::FullSpectrumOneMode:
[detail]        break;
[detail]      case FKParameters::Undefined:
[detail]        ASSERT(false);
[detail] @@ -71,6 +74,7 @@
[detail]      case FKParameters::ConventionalTransverse:
[detail]      case FKParameters::ConventionalRayleigh:
[detail]      case FKParameters::Capon:
[detail] +    case FKParameters::LocalSourceVertical:
[detail]      case FKParameters::CaponRadial:
[detail]      case FKParameters::CaponTransverse:
[detail]      case FKParameters::PoggiVertical:
[detail] @@ -94,13 +98,31 @@
[detail]    ParallelTaskManager * FKTool::createLoop()
[detail]    {
[detail]      switch(parameters()->processType()) {
[detail] -    case FKParameters::SensorOrientation:
[detail] -      return new SensorOrientationTaskManager(array());
[detail] +    case FKParameters::SpectrumMatch:
[detail] +      setResults(new FullSpectrumResults);
[detail] +      return new SpectrumMatchTaskManager(array());
[detail] +    case FKParameters::CrossSpectrumMatch:
[detail] +      setResults(new FullSpectrumResults);
[detail] +      return new CrossSpectrumMatchTaskManager(array());
[detail] +    case FKParameters::PlaneWaveInversion:
[detail] +      setResults(new FullSpectrumResults);
[detail] +      return new PlaneWaveInversionTaskManager2(array());
[detail] +    case FKParameters::FullSpectrumOneMode:
[detail] +      setResults(new FullSpectrumResults);
[detail] +      return new FullSpectrumOneModeTaskManager(array());
[detail]      default:
[detail] -      break;
[detail] -    }
[detail] +      setResults(new FKResults);
[detail]      return new FKTaskManager(array());
[detail]    }
[detail] +  }
[detail] +
[detail] +  int FKTool::crossSpectrumMatrixSize() const
[detail] +  {
[detail] +    AbstractFKFunction * f=AbstractFKFunction::create(_arraySelection.mode(), parameters(), nullptr);
[detail] +    int n=f->matrixSize(_arraySelection.count());
[detail] +    delete f;
[detail] +    return n;
[detail] +  }
[detail]  
[detail]    
[detail]    bool FKTool::setWaveNumberGrid()
[detail] @@ -132,7 +154,7 @@
[detail]      } else {
[detail]        App::log(tr("Error computing kmin for %1 station coordinates:\n").arg(n));
[detail]        for(int i=0; i<n; i++) {
[detail] -        App::log("  "+stations.at(i).toString());
[detail] +        App::log("  "+stations.at(i).toString()+"\n");
[detail]        }
[detail]        return false;
[detail]      }
[detail] @@ -184,12 +206,6 @@
[detail]  
[detail]    bool FKTool::saveResults(const QString& fileName)
[detail]    {
[detail] -    switch(parameters()->processType()) {
[detail] -    case FKParameters::SensorOrientation:
[detail] -      return results()->save(fileName, log()) && static_cast<SensorOrientationTaskManager *>(loop())->save(fileName, log());
[detail] -    default:
[detail] -      break;
[detail] -    }
[detail]      return results()->save(fileName, log());
[detail]    }
[detail]  
[detail]                         src/FKWorker.cpp:  version-4.2.1	modified out of comments
[detail] --- src/FKWorker.cpp-version-4.2.1-stripped	2025-09-28 04:01:16.435558245 +0200
[detail] +++ src/FKWorker.cpp-HEAD-stripped	2025-09-28 04:01:16.439558264 +0200
[detail] @@ -60,6 +60,9 @@
[detail]        f->setMaximumWavenumber(param->effectiveGridSize());
[detail]        f->setMaximumSlowness(param->maximumSlowness());
[detail]        _search=f->createSearch(*param);
[detail] +      if(!_search) {
[detail] +        return false;
[detail] +      }
[detail]        f->setGridStep(param->gridStep());
[detail]        return true;
[detail]      } else {
[detail] @@ -69,6 +72,12 @@
[detail]      }
[detail]    }
[detail]  
[detail] +  int FKWorker::crossSpectrumMatrixSize() const
[detail] +  {
[detail] +    AbstractFKFunction * function=static_cast<AbstractFKFunction *>(_search->function());
[detail] +    return function->matrixSize();
[detail] +  }
[detail] +
[detail]    void FKWorker::process(const VectorList<int>& blocks)
[detail]    {
[detail]      WaveNumberConverter conv(_crossSpectrum->timeWindows()->frequency().center());
[detail] @@ -104,7 +113,7 @@
[detail]                                param->maximumAzimuth());
[detail]  
[detail]      if(crossSpectrum()->calculate(blocks, function)) {
[detail] -      if(param->brightSpots()<=0) {
[detail] +      if(param->brightSpotCount()<=0) {
[detail]          localizeMax();
[detail]          addPeaks(conv);
[detail]        } else {
[detail] @@ -117,14 +126,14 @@
[detail]    {
[detail]      const FKParameters * param=crossSpectrum()->parameters();
[detail]      AbstractFKFunction * function=static_cast<AbstractFKFunction *>(_search->function());
[detail] -    int brightSpots=0;
[detail] +    int brightSpotCount=0;
[detail]      double power0=0.0;
[detail]      while(true) {
[detail]        _search->globalMax(param->absoluteThreshold());
[detail] -      if(_search->maximaCount()!=1) {
[detail] +      if(_search->extrema().size()!=1) {
[detail]          break;
[detail]        }
[detail] -      const FunctionSearchMaximum& m=**_search->begin();
[detail] +      const FunctionSearchExtremum& m=*_search->extrema().first();
[detail]        if(addPeak(m, conv, param, function)) {
[detail]          FKPeaks::Value * value=_peaks.lastValue();
[detail]          if(power0==0.0) {
[detail] @@ -136,14 +145,14 @@
[detail]            }
[detail]          }
[detail]  
[detail] -        if(brightSpots>=param->brightSpots()) {
[detail] +        if(brightSpotCount>=param->brightSpotCount()) {
[detail]            break;
[detail]          }
[detail] -        if(!function->remove(m.position(), *value)) {
[detail] +        if(!function->remove(m.position(), *value, param->brightSpotDamping())) {
[detail]            
[detail]            return;
[detail]          }
[detail] -        brightSpots++;
[detail] +        brightSpotCount++;
[detail]        }
[detail]      }
[detail]    }
[detail] @@ -200,34 +209,29 @@
[detail]      TRACE;
[detail]      const FKParameters * param=static_cast<const FKParameters *>(taskManager()->parameters());
[detail]      AbstractFKFunction * function=static_cast<AbstractFKFunction *>(_search->function());
[detail] -    FunctionMaximaIterator it;
[detail] -    APP_LOG(4, tr("    Found %1 peaks\n").arg(_search->maximaCount()))
[detail] -    for(it=_search->begin(); it!=_search->end(); ++it) {
[detail] -      addPeak(**it, conv, param, function);
[detail] +    int n=_search->extrema().size();
[detail] +    APP_LOG(4, tr("    Found %1 peaks\n").arg(n))
[detail] +    for(int i=0; i<n; i++) {
[detail] +      addPeak(*_search->extrema().at(i), conv, param, function);
[detail]      }
[detail]      return true;
[detail]    }
[detail]  
[detail] -  bool FKWorker::addPeak(const FunctionSearchMaximum& m, const WaveNumberConverter& conv,
[detail] +  bool FKWorker::addPeak(const FunctionSearchExtremum& m, const WaveNumberConverter& conv,
[detail]                           const FKParameters * param, AbstractFKFunction * function)
[detail]    {
[detail] -    const Vector<double>& k=m.position();
[detail] -    double slowness=conv.slowness(k);
[detail] -    if(slowness>param->minimumSlowness() &&
[detail] -       !function->isOnLimit(k, conv.frequency())) {
[detail] +    if(function->acceptPeak(m, conv, param)) {
[detail]        FKPeaks::Value * val=_peaks.add();
[detail]        if(val) {
[detail]          val->time=_peaks.time(conv.time());
[detail]          val->frequency=conv.frequency();
[detail] -        val->slowness=slowness;
[detail] -        val->azimuth=conv.azimuth(k);
[detail]          val->valid=true;
[detail]          val->extraValues=nullptr;
[detail] -        function->setAssociatedResults(k, m.value(), *val);
[detail] +        function->setAssociatedResults(m.position(), m.value(), *val, conv);
[detail]          APP_LOG(4, tr("%1 Hz: new peak at %2 m/s propagating towards %3 with ellippticity %4 deg\n")
[detail]                              .arg(conv.frequency())
[detail] -                            .arg(1.0/slowness)
[detail] -                            .arg(conv.azimuth(k))
[detail] +                            .arg(1.0/val->slowness)
[detail] +                            .arg(val->azimuth)
[detail]                              .arg(Angle::radiansToDegrees(::atan(val->ellipticity))))
[detail]        } else {
[detail]          return false;
[detail]   src/FreeDirectionRayleighLoveModel.cpp:  version-4.2.1	no last version available
[detail]                 src/FreePlaneWaveSum.cpp:  version-4.2.1	no last version available
[detail] src/FreeRayleighLoveChangeOfVariable.cpp:  version-4.2.1	no last version available
[detail]     src/FullSpectrumFreeRayleighLove.cpp:  version-4.2.1	no last version available
[detail]                src/FullSpectrumModel.cpp:  version-4.2.1	no last version available
[detail]              src/FullSpectrumOneMode.cpp:  version-4.2.1	no last version available
[detail]   src/FullSpectrumOneModeTaskManager.cpp:  version-4.2.1	no last version available
[detail]        src/FullSpectrumOneModeWorker.cpp:  version-4.2.1	no last version available
[detail]              src/FullSpectrumResults.cpp:  version-4.2.1	no last version available
[detail] src/FullSpectrumSeparatedRayleighLove.cpp:  version-4.2.1	no last version available
[detail]        src/HRDirectEllipticityEngine.cpp:  version-4.2.1	not modified
[detail]              src/HREllipticityEngine.cpp:  version-4.2.1	not modified
[detail]   src/HRFKAngularRayleighEllipticity.cpp:  version-4.2.1	not modified
[detail]                   src/HRFKDirectLove.cpp:  version-4.2.1	modified out of comments
[detail] --- src/HRFKDirectLove.cpp-version-4.2.1-stripped	2025-09-28 04:01:16.555558825 +0200
[detail] +++ src/HRFKDirectLove.cpp-HEAD-stripped	2025-09-28 04:01:16.559558844 +0200
[detail] @@ -22,7 +22,7 @@
[detail]  
[detail]    void HRFKDirectLove::initialize(const FKParameters& param)
[detail]    {
[detail] -    setPowerEngine(new FKPower(cache()->array()->count(), 3));
[detail] +    setPowerEngine(cache()->array()->count());
[detail]      if(_crossSpectrum) {
[detail]        powerEngine()->setCrossSpectrum(_crossSpectrum->matrix());
[detail]      }
[detail] @@ -47,7 +47,9 @@
[detail]    {
[detail]      if(isInsideLimits(kell)) {
[detail]        kell[2]=M_PI/2.0;
[detail] -      const Vector<Complex>& e=steering()->threeComponentLove(kell, powerEngine());
[detail] +      powerEngine()->setCartesianWavenumber(kell);
[detail] +      oneComponentSteering();
[detail] +      const Vector<Complex>& e=steering()->threeComponentLove(powerEngine());
[detail]        powerEngine()->setHighResolutionValue(e);
[detail]        return powerEngine()->value();
[detail]      } else {
[detail] @@ -55,15 +57,11 @@
[detail]      }
[detail]    }
[detail]  
[detail] -  double HRFKDirectLove::ellipticity(const Vector<double>&) const
[detail] -  {
[detail] -    return std::numeric_limits<double>::infinity();
[detail] -  }
[detail] -
[detail]    bool HRFKDirectLove::remove(const Vector<double>& k, double, double, double)
[detail]    {
[detail]      
[detail] -    const Vector<Complex>& q0values=oneComponentSteering(k);
[detail] +    powerEngine()->setCartesianWavenumber(k);
[detail] +    const Vector<Complex>& q0values=oneComponentSteering();
[detail]      Angle theta0(k[0], k[1]);
[detail]      int n=_crossSpectrum->array().count();
[detail]      int n2=n*2;
[detail] @@ -76,7 +74,7 @@
[detail]        q0.at(i, 0)=q0values[i];
[detail]        q0ct.at(0, i)=conjugate(q0values[i]);
[detail]      }
[detail] -    ComplexMatrix Fh=V0*V0.conjugate().transposed();
[detail] +    ComplexMatrix Fh=V0*V0.conjugateTransposedVector();
[detail]      ComplexMatrix F(n*3);
[detail]      F.zero();
[detail]      F.copyAt(0, 0, Fh);
[detail]                 src/HRFKDirectRadial.cpp:  version-4.2.1	modified out of comments
[detail] --- src/HRFKDirectRadial.cpp-version-4.2.1-stripped	2025-09-28 04:01:16.575558922 +0200
[detail] +++ src/HRFKDirectRadial.cpp-HEAD-stripped	2025-09-28 04:01:16.575558922 +0200
[detail] @@ -10,7 +10,7 @@
[detail]  
[detail]    void HRFKDirectRadial::initialize(const FKParameters& param)
[detail]    {
[detail] -    setPowerEngine(new FKPower(cache()->array()->count(), 2));
[detail] +    setPowerEngine(cache()->array()->count());
[detail]      if(_crossSpectrum) {
[detail]        powerEngine()->setCrossSpectrum(_crossSpectrum->matrix());
[detail]      }
[detail] @@ -48,7 +48,9 @@
[detail]    double HRFKDirectRadial::value(Vector<double>& k) const
[detail]    {
[detail]      if(isInsideLimits(k)) {
[detail] -      const Vector<Complex>& e=steering()->twoComponentRadial(k, powerEngine());
[detail] +      powerEngine()->setCartesianWavenumber(k);
[detail] +      oneComponentSteering();
[detail] +      const Vector<Complex>& e=steering()->twoComponentRadial(powerEngine());
[detail]        powerEngine()->setHighResolutionValue(e);
[detail]        return powerEngine()->value();
[detail]      } else {
[detail] @@ -56,5 +58,12 @@
[detail]      }
[detail]    }
[detail]  
[detail] +  void HRFKDirectRadial::setAssociatedResults(const Vector<double>& k, double power,
[detail] +                                              FKPeaks::Value& val,
[detail] +                                              const WaveNumberConverter& conv) const
[detail] +  {
[detail] +    AbstractFKFunction::setAssociatedResults(k, power, val, conv);
[detail] +  }
[detail] +
[detail]  } 
[detail]  
[detail]               src/HRFKDirectRayleigh.cpp:  version-4.2.1	modified out of comments
[detail] --- src/HRFKDirectRayleigh.cpp-version-4.2.1-stripped	2025-09-28 04:01:16.595559018 +0200
[detail] +++ src/HRFKDirectRayleigh.cpp-HEAD-stripped	2025-09-28 04:01:16.599559037 +0200
[detail] @@ -31,7 +31,7 @@
[detail]  
[detail]    void HRFKDirectRayleigh::initialize(const FKParameters& param)
[detail]    {
[detail] -    setPowerEngine(new FKPower(cache()->array()->count(), 3));
[detail] +    setPowerEngine(cache()->array()->count());
[detail]      if(_crossSpectrum) {
[detail]        powerEngine()->setCrossSpectrum(_crossSpectrum->matrix());
[detail]      }
[detail] @@ -89,7 +89,7 @@
[detail]      }
[detail]    }
[detail]  
[detail] -  const ComplexMatrix * HRFKDirectRayleigh::crossSpectrum() const
[detail] +  const HermitianMatrix * HRFKDirectRayleigh::crossSpectrum() const
[detail]    {
[detail]      if(_crossSpectrum) {
[detail]        return _crossSpectrum->matrix();
[detail]            src/HRFKDirectRayleighAll.cpp:  version-4.2.1	modified out of comments
[detail] --- src/HRFKDirectRayleighAll.cpp-version-4.2.1-stripped	2025-09-28 04:01:16.615559115 +0200
[detail] +++ src/HRFKDirectRayleighAll.cpp-HEAD-stripped	2025-09-28 04:01:16.619559135 +0200
[detail] @@ -70,28 +70,12 @@
[detail]  #endif
[detail]    }
[detail]  
[detail] -
[detail]    void HRFKDirectRayleighAll::initialize(const FKParameters& param)
[detail]    {
[detail]      HRFKDirectRayleigh::initialize(param);
[detail]      _ellEngine=new HRDirectEllipticityEngine(cache(), param);
[detail]    }
[detail]  
[detail] -  inline void HRFKDirectRayleighAll::maximumEllipticity() const
[detail] -  {
[detail] -    
[detail] -    
[detail] -    double xi0=_xi.x;
[detail] -    if(!_ellOptimization.maximize(_xi, this, M_PI/8.0)) {
[detail] -      App::log(tr("Error maximizing beampower for ellipticity (cross)\n"));
[detail] -      
[detail] -      _ellOptimization.curves<HRFKDirectRayleighAll, Attributes>(this, -M_PI/2, M_PI/2, M_PI/1800.0);
[detail] -      _xi.x=xi0;
[detail] -      _ellOptimization.maximize(_xi, this, M_PI/8.0);
[detail] -    }
[detail] -    commitEvaluationStat();
[detail] -  }
[detail] -
[detail]    inline void HRFKDirectRayleighAll::gridMaximumEllipticity() const
[detail]    {
[detail]      _xi.evaluationCount=0;
[detail] @@ -107,7 +91,7 @@
[detail]      }
[detail]      
[detail]      double bestX=maxX;
[detail] -    while(step>_ellOptimization.absolutePrecision()) {
[detail] +    while(step>_ellOptimization.precision()) {
[detail]        step*=0.5;
[detail]        _xi.x=bestX-step;
[detail]        setFunctionValue(_xi);
[detail] @@ -128,7 +112,6 @@
[detail]      _xi.evaluationCount/=4;  
[detail]      _xi.x=bestX;
[detail]      _xi.value=maxValue;
[detail] -    commitEvaluationStat();
[detail]    }
[detail]  
[detail]    double HRFKDirectRayleighAll::value(const Vector<int>& index) const
[detail] @@ -141,8 +124,10 @@
[detail]        steering()->threeComponentRayleigh(index, powerEngine());
[detail]  #ifdef ELLIPTICITY_GRID_OPTIMIZATION
[detail]        gridMaximumEllipticity();
[detail] +      commitEvaluationStat();
[detail]  #else
[detail]        maximumEllipticity();
[detail] +      commitEvaluationStat();
[detail]  #endif
[detail]  #ifdef PROCESS_TIMING
[detail]        qint64 t=chrono.nsecsElapsed();
[detail] @@ -163,9 +148,12 @@
[detail]        QElapsedTimer chrono;
[detail]        chrono.start();
[detail]  #endif
[detail] -      steering()->threeComponentRayleigh(kell, powerEngine());
[detail] +      powerEngine()->setCartesianWavenumber(kell);
[detail] +      oneComponentSteering();
[detail] +      steering()->threeComponentRayleigh(powerEngine());
[detail]        
[detail]        maximumEllipticity();
[detail] +      commitEvaluationStat();
[detail]        canonicalEllipticity(_xi.x);
[detail]        kell[2]=_xi.x;
[detail]  #ifdef PROCESS_TIMING
[detail] @@ -183,7 +171,9 @@
[detail]    double HRFKDirectRayleighAll::valueFixed(const Vector<double>& kell) const
[detail]    {
[detail]      if(isInsideLimits(kell)) {
[detail] -      steering()->threeComponentRayleigh(kell, powerEngine());
[detail] +      powerEngine()->setCartesianWavenumber(kell);
[detail] +      oneComponentSteering();
[detail] +      steering()->threeComponentRayleigh(powerEngine());
[detail]        _xi.x=kell[2];
[detail]        setFunctionValue(_xi);
[detail]        return _xi.value;
[detail] @@ -195,26 +185,27 @@
[detail]    void HRFKDirectRayleighAll::setFunctionValue(Attributes& a) const
[detail]    {
[detail]      a.ell.setUnitExp(a.x);
[detail] -    const Vector<Complex>& e=FKSteering::threeComponentRayleighCross(a.ell, powerEngine());
[detail] +    const Vector<Complex>& e=FKSteering::threeComponentRayleighAll(a.ell, powerEngine());
[detail]      powerEngine()->setHighResolutionValue(e);
[detail]      a.value=powerEngine()->value();
[detail]    }
[detail]  
[detail]    void HRFKDirectRayleighAll::setFunctionDerivatives(Attributes& a) const
[detail]    {
[detail] -    double value2=a.value*a.value;
[detail] +    double value2=-2.0*a.value*a.value;
[detail]      
[detail] -    const Vector<Complex>& de=FKSteering::threeComponentRayleighCrossGradient(a.ell, powerEngine());
[detail] -    a.slope=-2.0*value2*powerEngine()->ellipticityGradient(de);
[detail] +    const Vector<Complex>& de=FKSteering::threeComponentRayleighAllGradient(a.ell, powerEngine());
[detail] +    a.slope=value2*powerEngine()->gradient(de);
[detail]      
[detail]      a.concavity=powerEngine()->xiSecondDerivative();
[detail] -    a.concavity=2.0*(a.slope*a.slope/a.value+a.value-value2*a.concavity);
[detail] +    a.concavity=2.0*(a.slope*a.slope/a.value+a.value)+value2*a.concavity;
[detail]    }
[detail]  
[detail] -  bool HRFKDirectRayleighAll::remove(const Vector<double>& kell, FKPeaks::Value& val)
[detail] +  bool HRFKDirectRayleighAll::remove(const Vector<double>& kell, FKPeaks::Value& val, double damping)
[detail]    {
[detail]      
[detail] -    const Vector<Complex>& q0values=steering()->oneComponent(kell, powerEngine());
[detail] +    powerEngine()->setCartesianWavenumber(kell);
[detail] +    const Vector<Complex>& q0values=oneComponentSteering();
[detail]      Angle theta0(kell[0], kell[1]);
[detail]      Complex ell0;
[detail]      ell0.setUnitExp(atan(kell[2]));
[detail] @@ -229,7 +220,7 @@
[detail]        q0.at(i, 0)=q0values[i];
[detail]        q0ct.at(0, i)=conjugate(q0values[i]);
[detail]      }
[detail] -    ComplexMatrix Fh=V0*V0.conjugate().transposed();
[detail] +    ComplexMatrix Fh=V0*V0.conjugateTransposedVector();
[detail]      Fh*=ell0.im()*ell0.im();
[detail]      ComplexMatrix Fz=q0*q0ct;
[detail]      Fz*=ell0.re()*ell0.re();
[detail] @@ -242,7 +233,7 @@
[detail]      Fx.transpose();
[detail]      F.copyAt(n2, 0, Fx);
[detail]      F.copyAt(n2, n2, Fz);
[detail] -    F*=val.power/(1.0+val.verticalNoise/static_cast<double>(n));
[detail] +    F*=val.power*damping/(1.0+val.verticalNoise/static_cast<double>(n));
[detail]      
[detail]      
[detail]      return invertCrossSpectrum();
[detail] @@ -251,14 +242,16 @@
[detail]    
[detail]    double HRFKDirectRayleighAll::wavenumberNormalizedConcavity(const Vector<double>& kell) const
[detail]    {
[detail] -    steering()->threeComponentRayleigh(kell, powerEngine());
[detail] +    powerEngine()->setCartesianWavenumber(kell);
[detail] +    oneComponentSteering();
[detail] +    steering()->threeComponentRayleigh(powerEngine());
[detail]  
[detail]      Complex ell;
[detail]      ell.setUnitExp(kell[2]);
[detail] -    const Vector<Complex>& e0=FKSteering::threeComponentRayleighCross(ell, powerEngine());
[detail] +    const Vector<Complex>& e0=FKSteering::threeComponentRayleighAll(ell, powerEngine());
[detail]      powerEngine()->setHighResolutionValue(e0);
[detail]      double p=powerEngine()->value();
[detail] -    steering()->threeComponentSensorRadialProjections(kell, powerEngine());
[detail] +    steering()->threeComponentSensorRadialProjections(powerEngine());
[detail]      powerEngine()->highResolutionKRadialFirstDerivative(powerEngine()->ellipticitySteeringVector());
[detail]      return powerEngine()->highResolutionKRadialSecondDerivative()/p;
[detail]    }
[detail] @@ -273,7 +266,8 @@
[detail]        setFunctionDerivatives(_xi); 
[detail]        return _xi.concavity;
[detail]      default:
[detail] -      steering()->threeComponentSensorRadialProjections(kell, powerEngine());
[detail] +      powerEngine()->setCartesianWavenumber(kell);
[detail] +      steering()->threeComponentSensorRadialProjections(powerEngine());
[detail]        powerEngine()->highResolutionKRadialFirstDerivative(powerEngine()->ellipticitySteeringVector());
[detail]        return powerEngine()->highResolutionKRadialSecondDerivative();
[detail]      }
[detail]         src/HRFKDirectRayleighRadial.cpp:  version-4.2.1	modified out of comments
[detail] --- src/HRFKDirectRayleighRadial.cpp-version-4.2.1-stripped	2025-09-28 04:01:16.635559211 +0200
[detail] +++ src/HRFKDirectRayleighRadial.cpp-HEAD-stripped	2025-09-28 04:01:16.639559231 +0200
[detail] @@ -58,7 +58,9 @@
[detail]    double HRFKDirectRayleighRadial::value(Vector<double>& kell) const
[detail]    {
[detail]      if(isInsideLimits(kell)) {
[detail] -      steering()->threeComponentRayleigh(kell, powerEngine());
[detail] +      powerEngine()->setCartesianWavenumber(kell);
[detail] +      oneComponentSteering();
[detail] +      steering()->threeComponentRayleigh( powerEngine());
[detail]        maximumEllipticity();
[detail]        canonicalEllipticity(_xi.x);
[detail]        kell[2]=_xi.x;
[detail] @@ -81,7 +83,7 @@
[detail]      double value2=a.value*a.value;
[detail]      
[detail]      const Vector<Complex>& de=FKSteering::threeComponentRayleighRadialGradient(a.ell, powerEngine());
[detail] -    a.slope=-2.0*value2*powerEngine()->ellipticityGradient(de);
[detail] +    a.slope=-2.0*value2*powerEngine()->gradient(de);
[detail]      
[detail]      double tan=a.ell.im()/a.ell.re();
[detail]      a.concavity=powerEngine()->xiSecondDerivative();
[detail] @@ -91,14 +93,16 @@
[detail]    
[detail]    double HRFKDirectRayleighRadial::wavenumberNormalizedConcavity(const Vector<double>& kell) const
[detail]    {
[detail] -    steering()->threeComponentRayleigh(kell, powerEngine());
[detail] +    powerEngine()->setCartesianWavenumber(kell);
[detail] +    oneComponentSteering();
[detail] +    steering()->threeComponentRayleigh(powerEngine());
[detail]  
[detail]      Complex ell;
[detail]      ell.setUnitExp(kell[2]);
[detail]      const Vector<Complex>& e0=FKSteering::threeComponentRayleighRadial(ell, powerEngine());
[detail]      powerEngine()->setHighResolutionValue(e0);
[detail]      double p=powerEngine()->value();
[detail] -    steering()->threeComponentSensorRadialProjections(kell, powerEngine());
[detail] +    steering()->threeComponentSensorRadialProjections(powerEngine());
[detail]      powerEngine()->highResolutionKRadialFirstDerivative(powerEngine()->ellipticitySteeringVector());
[detail]      return powerEngine()->highResolutionKRadialSecondDerivative()/p;
[detail]    }
[detail] @@ -113,7 +117,8 @@
[detail]        setFunctionDerivatives(_xi); 
[detail]        return _xi.concavity;
[detail]      default:
[detail] -      steering()->threeComponentSensorRadialProjections(kell, powerEngine());
[detail] +      powerEngine()->setCartesianWavenumber(kell);
[detail] +      steering()->threeComponentSensorRadialProjections(powerEngine());
[detail]        powerEngine()->highResolutionKRadialFirstDerivative(powerEngine()->ellipticitySteeringVector());
[detail]        return powerEngine()->highResolutionKRadialSecondDerivative();
[detail]      }
[detail]        src/HRFKDirectRayleighSquared.cpp:  version-4.2.1	modified out of comments
[detail] --- src/HRFKDirectRayleighSquared.cpp-version-4.2.1-stripped	2025-09-28 04:01:16.659559328 +0200
[detail] +++ src/HRFKDirectRayleighSquared.cpp-HEAD-stripped	2025-09-28 04:01:16.663559346 +0200
[detail] @@ -51,7 +51,9 @@
[detail]    double HRFKDirectRayleighSquared::value(Vector<double>& kell) const
[detail]    {
[detail]      if(isInsideLimits(kell)) {
[detail] -      steering()->threeComponentRayleigh(kell, powerEngine());
[detail] +      powerEngine()->setCartesianWavenumber(kell);
[detail] +      oneComponentSteering();
[detail] +      steering()->threeComponentRayleigh(powerEngine());
[detail]        maximumEllipticity();
[detail]        if(_xi1.value>_xi2.value) {
[detail]          kell[2]=_xi1.x;
[detail] @@ -68,7 +70,9 @@
[detail]    double HRFKDirectRayleighSquared::valueFixed(const Vector<double>& kell) const
[detail]    {
[detail]      if(isInsideLimits(kell)) {
[detail] -      steering()->threeComponentRayleigh(kell, powerEngine());
[detail] +      powerEngine()->setCartesianWavenumber(kell);
[detail] +      oneComponentSteering();
[detail] +      steering()->threeComponentRayleigh(powerEngine());
[detail]        _xi1.x=kell[2];
[detail]        setFunctionValue(_xi1);
[detail]        return _xi1.value;
[detail] @@ -94,7 +98,7 @@
[detail]    {
[detail]      
[detail]      const Vector<Complex>& de=FKSteering::threeComponentRayleighRadialGradient(a.ell, powerEngine());
[detail] -    a.slope=-2.0*a.valueH2*powerEngine()->ellipticityGradient(de);
[detail] +    a.slope=-2.0*a.valueH2*powerEngine()->gradient(de);
[detail]      
[detail]      double slope2=a.slope*a.slope;
[detail]      a.concavity=powerEngine()->xiSecondDerivative();
[detail] @@ -109,8 +113,10 @@
[detail]    }
[detail]  
[detail]    void HRFKDirectRayleighSquared::setAssociatedResults(const Vector<double>& kell, double power,
[detail] -                                                       FKPeaks::Value& val) const
[detail] +                                                       FKPeaks::Value& val,
[detail] +                                                       const WaveNumberConverter& conv) const
[detail]    {
[detail] +    AbstractFKFunction::setAssociatedResults(kell, power, val, conv);
[detail]      val.power=sqrt(power)/tan(kell[2]);
[detail]      rawEllipticity(kell, val);
[detail]    }
[detail]       src/HRFKDirectRayleighVertical.cpp:  version-4.2.1	modified out of comments
[detail] --- src/HRFKDirectRayleighVertical.cpp-version-4.2.1-stripped	2025-09-28 04:01:16.675559404 +0200
[detail] +++ src/HRFKDirectRayleighVertical.cpp-HEAD-stripped	2025-09-28 04:01:16.679559424 +0200
[detail] @@ -59,7 +59,9 @@
[detail]        QElapsedTimer chrono;
[detail]        chrono.start();
[detail]  #endif
[detail] -      steering()->threeComponentRayleigh(kell, powerEngine());
[detail] +      powerEngine()->setCartesianWavenumber(kell);
[detail] +      oneComponentSteering();
[detail] +      steering()->threeComponentRayleigh(powerEngine());
[detail]        maximumEllipticity();
[detail]        canonicalEllipticity(_xi.x);
[detail]        kell[2]=_xi.x;
[detail] @@ -88,7 +90,7 @@
[detail]      double value2=a.value*a.value;
[detail]      
[detail]      const Vector<Complex>& de=FKSteering::threeComponentRayleighVerticalGradient(a.ell, powerEngine());
[detail] -    a.slope=-2.0*value2*powerEngine()->ellipticityGradient(de);
[detail] +    a.slope=-2.0*value2*powerEngine()->gradient(de);
[detail]      
[detail]      double cot=a.ell.re()/a.ell.im();
[detail]      a.concavity=powerEngine()->xiSecondDerivative();
[detail] @@ -98,14 +100,16 @@
[detail]    
[detail]    double HRFKDirectRayleighVertical::wavenumberNormalizedConcavity(const Vector<double>& kell) const
[detail]    {
[detail] -    steering()->threeComponentRayleigh(kell, powerEngine());
[detail] +    powerEngine()->setCartesianWavenumber(kell);
[detail] +    oneComponentSteering();
[detail] +    steering()->threeComponentRayleigh(powerEngine());
[detail]  
[detail]      Complex ell;
[detail]      ell.setUnitExp(kell[2]);
[detail]      const Vector<Complex>& e0=FKSteering::threeComponentRayleighVertical(ell, powerEngine());
[detail]      powerEngine()->setHighResolutionValue(e0);
[detail]      double p=powerEngine()->value();
[detail] -    steering()->threeComponentSensorRadialProjections(kell, powerEngine());
[detail] +    steering()->threeComponentSensorRadialProjections(powerEngine());
[detail]      powerEngine()->highResolutionKRadialFirstDerivative(powerEngine()->ellipticitySteeringVector());
[detail]      return powerEngine()->highResolutionKRadialSecondDerivative()/p;
[detail]    }
[detail] @@ -120,7 +124,8 @@
[detail]        setFunctionDerivatives(_xi); 
[detail]        return _xi.concavity;
[detail]      default:
[detail] -      steering()->threeComponentSensorRadialProjections(kell, powerEngine());
[detail] +      powerEngine()->setCartesianWavenumber(kell);
[detail] +      steering()->threeComponentSensorRadialProjections(powerEngine());
[detail]        powerEngine()->highResolutionKRadialFirstDerivative(powerEngine()->ellipticitySteeringVector());
[detail]        return powerEngine()->highResolutionKRadialSecondDerivative();
[detail]      }
[detail]             src/HRFKDirectTransverse.cpp:  version-4.2.1	modified out of comments
[detail] --- src/HRFKDirectTransverse.cpp-version-4.2.1-stripped	2025-09-28 04:01:16.699559520 +0200
[detail] +++ src/HRFKDirectTransverse.cpp-HEAD-stripped	2025-09-28 04:01:16.699559520 +0200
[detail] @@ -15,7 +15,7 @@
[detail]  
[detail]    void HRFKDirectTransverse::initialize(const FKParameters& param)
[detail]    {
[detail] -    setPowerEngine(new FKPower(cache()->array()->count(), 2));
[detail] +    setPowerEngine(cache()->array()->count());
[detail]      if(_crossSpectrum) {
[detail]        powerEngine()->setCrossSpectrum(_crossSpectrum->matrix());
[detail]      }
[detail] @@ -28,7 +28,9 @@
[detail]    double HRFKDirectTransverse::value(Vector<double>& k) const
[detail]    {
[detail]      if(isInsideLimits(k)) {
[detail] -      const Vector<Complex>& e=steering()->twoComponentTransverse(k, powerEngine());
[detail] +      powerEngine()->setCartesianWavenumber(k);
[detail] +      oneComponentSteering();
[detail] +      const Vector<Complex>& e=steering()->twoComponentTransverse(powerEngine());
[detail]        powerEngine()->setHighResolutionValue(e);
[detail]        return powerEngine()->value();
[detail]      } else {
[detail]                src/HRFKPolarVertical.cpp:  version-4.2.1	no last version available
[detail]                       src/HRFKRadial.cpp:  version-4.2.1	modified out of comments
[detail] --- src/HRFKRadial.cpp-version-4.2.1-stripped	2025-09-28 04:01:16.723559637 +0200
[detail] +++ src/HRFKRadial.cpp-HEAD-stripped	2025-09-28 04:01:16.727559655 +0200
[detail] @@ -28,9 +28,9 @@
[detail]    double HRFKRadial::value(Vector<double>& k) const
[detail]    {
[detail]      if(isInsideLimits(k)) {
[detail] -      const Vector<Complex>& e=steering()->oneComponent(k, powerEngine());
[detail] +      powerEngine()->setCartesianWavenumber(k);
[detail]        powerEngine()->setCrossSpectrum(_crossSpectrum->rotatedMatrix(k));
[detail] -      powerEngine()->setHighResolutionValue(e);
[detail] +      powerEngine()->setHighResolutionValue(oneComponentSteering());
[detail]        return powerEngine()->value();
[detail]      } else {
[detail]        return -1.0;
[detail] @@ -41,10 +41,11 @@
[detail]    
[detail]    double HRFKRadial::wavenumberNormalizedConcavity(const Vector<double>& k) const
[detail]    {
[detail] +    powerEngine()->setCartesianWavenumber(k);
[detail]      powerEngine()->setCrossSpectrum(_crossSpectrum->rotatedMatrix(k));
[detail] -    powerEngine()->setHighResolutionValue(steering()->oneComponent(k, powerEngine()));
[detail] +    powerEngine()->setHighResolutionValue(oneComponentSteering());
[detail]      double p=powerEngine()->value();
[detail] -    steering()->oneComponentSensorRadialProjections(k, powerEngine());
[detail] +    steering()->oneComponentSensorRadialProjections(powerEngine());
[detail]      powerEngine()->highResolutionKRadialFirstDerivative(powerEngine()->steeringVector());
[detail]      return powerEngine()->highResolutionKRadialSecondDerivative()/p;
[detail]    }
[detail]                     src/HRFKRayleigh.cpp:  version-4.2.1	not modified
[detail]                  src/HRFKRayleighAll.cpp:  version-4.2.1	modified out of comments
[detail] --- src/HRFKRayleighAll.cpp-version-4.2.1-stripped	2025-09-28 04:01:16.759559810 +0200
[detail] +++ src/HRFKRayleighAll.cpp-HEAD-stripped	2025-09-28 04:01:16.767559850 +0200
[detail] @@ -51,7 +51,8 @@
[detail]    double HRFKRayleighAll::value(Vector<double>& kell) const
[detail]    {
[detail]      if(isInsideLimits(kell)) {
[detail] -      oneComponentSteering(kell);
[detail] +      powerEngine()->setCartesianWavenumber(kell);
[detail] +      oneComponentSteering();
[detail]        powerEngine()->setCrossSpectrum(_crossSpectrum->rotatedMatrix(kell));
[detail]        maximumEllipticity();
[detail]        canonicalEllipticity(_xi.x);
[detail] @@ -65,7 +66,8 @@
[detail]    double HRFKRayleighAll::valueFixed(const Vector<double>& kell) const
[detail]    {
[detail]      if(isInsideLimits(kell)) {
[detail] -      oneComponentSteering(kell);
[detail] +      powerEngine()->setCartesianWavenumber(kell);
[detail] +      oneComponentSteering();
[detail]        powerEngine()->setCrossSpectrum(_crossSpectrum->rotatedMatrix(kell));
[detail]        _xi.x=kell[2];
[detail]        setFunctionValue(_xi);
[detail] @@ -78,7 +80,7 @@
[detail]    void HRFKRayleighAll::setFunctionValue(Attributes& a) const
[detail]    {
[detail]      a.ell.setUnitExp(a.x);
[detail] -    const Vector<Complex>& e=FKSteering::twoComponentRayleighCross(a.ell, powerEngine());
[detail] +    const Vector<Complex>& e=FKSteering::twoComponentRayleighAll(a.ell, powerEngine());
[detail]      powerEngine()->setHighResolutionValue(e);
[detail]      a.value=powerEngine()->value();
[detail]    }
[detail] @@ -87,8 +89,8 @@
[detail]    {
[detail]      double value2=a.value*a.value;
[detail]      
[detail] -    const Vector<Complex>& de=FKSteering::twoComponentRayleighCrossGradient(a.ell, powerEngine());
[detail] -    a.slope=-2.0*value2*powerEngine()->ellipticityGradient(de);
[detail] +    const Vector<Complex>& de=FKSteering::twoComponentRayleighAllGradient(a.ell, powerEngine());
[detail] +    a.slope=-2.0*value2*powerEngine()->gradient(de);
[detail]      
[detail]      a.concavity=powerEngine()->xiSecondDerivative();
[detail]      a.concavity=2.0*(a.slope*a.slope/a.value+a.value-value2*a.concavity);
[detail] @@ -97,15 +99,16 @@
[detail]    
[detail]    double HRFKRayleighAll::wavenumberNormalizedConcavity(const Vector<double>& kell) const
[detail]    {
[detail] -    oneComponentSteering(kell);
[detail] +    powerEngine()->setCartesianWavenumber(kell);
[detail] +    oneComponentSteering();
[detail]      powerEngine()->setCrossSpectrum(_crossSpectrum->rotatedMatrix(kell));
[detail]  
[detail]      Complex ell;
[detail]      ell.setUnitExp(kell[2]);
[detail] -    const Vector<Complex>& e0=FKSteering::twoComponentRayleighCross(ell, powerEngine());
[detail] +    const Vector<Complex>& e0=FKSteering::twoComponentRayleighAll(ell, powerEngine());
[detail]      powerEngine()->setHighResolutionValue(e0);
[detail]      double p=powerEngine()->value();
[detail] -    steering()->twoComponentSensorRadialProjections(kell, powerEngine());
[detail] +    steering()->twoComponentSensorRadialProjections(powerEngine());
[detail]      powerEngine()->highResolutionKRadialFirstDerivative(powerEngine()->ellipticitySteeringVector());
[detail]      return powerEngine()->highResolutionKRadialSecondDerivative()/p;
[detail]    }
[detail] @@ -126,11 +129,12 @@
[detail]      for(double k=0; k<0.5; k+=0.0001) {
[detail]        PrivateVector<double> kv(k1);
[detail]        kv*=k;
[detail] -      oneComponentSteering(kv);
[detail] -      const Vector<Complex>& e0=FKSteering::twoComponentRayleighCross(ell, powerEngine());
[detail] +      powerEngine()->setCartesianWavenumber(kv);
[detail] +      oneComponentSteering();
[detail] +      const Vector<Complex>& e0=FKSteering::twoComponentRayleighAll(ell, powerEngine());
[detail]        powerEngine()->setHighResolutionValue(e0);
[detail]        double p=powerEngine()->value();
[detail] -      steering()->twoComponentSensorRadialProjections(kv, powerEngine());
[detail] +      steering()->twoComponentSensorRadialProjections(powerEngine());
[detail]        double dp=powerEngine()->highResolutionKRadialFirstDerivative(powerEngine()->ellipticitySteeringVector());
[detail]        double ddp=powerEngine()->highResolutionKRadialSecondDerivative();
[detail]        s << k << " " << p*1e16 << " " << dp*1e16 << " " << ddp*1e16 << Qt::endl;
[detail]             src/HRFKRayleighFixedEll.cpp:  version-4.2.1	modified out of comments
[detail] --- src/HRFKRayleighFixedEll.cpp-version-4.2.1-stripped	2025-09-28 04:01:16.783559926 +0200
[detail] +++ src/HRFKRayleighFixedEll.cpp-HEAD-stripped	2025-09-28 04:01:16.787559946 +0200
[detail] @@ -42,7 +42,8 @@
[detail]    double HRFKRayleighFixedEll::value(Vector<double>& k) const
[detail]    {
[detail]      if(isInsideLimits(k)) {
[detail] -      steering()->oneComponent(k, powerEngine());
[detail] +      powerEngine()->setCartesianWavenumber(k);
[detail] +      oneComponentSteering();
[detail]        const Vector<Complex>& e=steering()->twoComponentRayleighRadial(_currentFixedEllipticity,
[detail]                                                                        powerEngine());
[detail]        
[detail]               src/HRFKRayleighRadial.cpp:  version-4.2.1	modified out of comments
[detail] --- src/HRFKRayleighRadial.cpp-version-4.2.1-stripped	2025-09-28 04:01:16.803560023 +0200
[detail] +++ src/HRFKRayleighRadial.cpp-HEAD-stripped	2025-09-28 04:01:16.807560043 +0200
[detail] @@ -27,7 +27,8 @@
[detail]    double HRFKRayleighRadial::value(Vector<double>& kell) const
[detail]    {
[detail]      if(isInsideLimits(kell)) {
[detail] -      oneComponentSteering(kell);
[detail] +      powerEngine()->setCartesianWavenumber(kell);
[detail] +      oneComponentSteering();
[detail]        if(_crossSpectrum) {
[detail]          powerEngine()->setCrossSpectrum(_crossSpectrum->rotatedMatrix(kell));
[detail]        }
[detail] @@ -53,7 +54,7 @@
[detail]      double value2=a.value*a.value;
[detail]      
[detail]      const Vector<Complex>& de=FKSteering::twoComponentRayleighRadialGradient(a.ell, powerEngine());
[detail] -    a.slope=-2.0*value2*powerEngine()->ellipticityGradient(de);
[detail] +    a.slope=-2.0*value2*powerEngine()->gradient(de);
[detail]      
[detail]      double tan=a.ell.im()/a.ell.re();
[detail]      a.concavity=powerEngine()->xiSecondDerivative();
[detail] @@ -68,7 +69,7 @@
[detail]      const Vector<Complex>& e0=FKSteering::twoComponentRayleighRadial(ell, powerEngine());
[detail]      powerEngine()->setHighResolutionValue(e0);
[detail]      double p=powerEngine()->value();
[detail] -    steering()->twoComponentSensorRadialProjections(kell, powerEngine());
[detail] +    steering()->twoComponentSensorRadialProjections(powerEngine());
[detail]      powerEngine()->highResolutionKRadialFirstDerivative(powerEngine()->ellipticitySteeringVector());
[detail]      return powerEngine()->highResolutionKRadialSecondDerivative()/p;
[detail]    }
[detail]              src/HRFKRayleighSquared.cpp:  version-4.2.1	modified out of comments
[detail] --- src/HRFKRayleighSquared.cpp-version-4.2.1-stripped	2025-09-28 04:01:16.823560119 +0200
[detail] +++ src/HRFKRayleighSquared.cpp-HEAD-stripped	2025-09-28 04:01:16.827560139 +0200
[detail] @@ -128,7 +128,8 @@
[detail]        QElapsedTimer chrono;
[detail]        chrono.start();
[detail]  #endif
[detail] -      steering()->oneComponent(kell, powerEngine());
[detail] +      powerEngine()->setCartesianWavenumber(kell);
[detail] +      oneComponentSteering();
[detail]        powerEngine()->setCrossSpectrum(_crossSpectrum->rotatedMatrix(kell));
[detail]        maximumEllipticity();
[detail]  #ifdef PROCESS_TIMING
[detail] @@ -152,7 +153,8 @@
[detail]    double HRFKRayleighSquared::valueFixed(const Vector<double>& kell) const
[detail]    {
[detail]      if(isInsideLimits(kell)) {
[detail] -      steering()->oneComponent(kell, powerEngine());
[detail] +      powerEngine()->setCartesianWavenumber(kell);
[detail] +      oneComponentSteering();
[detail]        powerEngine()->setCrossSpectrum(_crossSpectrum->rotatedMatrix(kell));
[detail]        _xi1.x=kell[2];
[detail]        setFunctionValue(_xi1);
[detail] @@ -179,7 +181,7 @@
[detail]    {
[detail]      
[detail]      const Vector<Complex>& de=FKSteering::twoComponentRayleighRadialGradient(a.ell, powerEngine());
[detail] -    a.slope=-2.0*a.valueH2*powerEngine()->ellipticityGradient(de);
[detail] +    a.slope=-2.0*a.valueH2*powerEngine()->gradient(de);
[detail]      
[detail]      double slope2=a.slope*a.slope;
[detail]      a.concavity=powerEngine()->xiSecondDerivative();
[detail] @@ -196,7 +198,8 @@
[detail]    
[detail]    double HRFKRayleighSquared::wavenumberNormalizedConcavity(const Vector<double>& kell) const
[detail]    {
[detail] -    steering()->oneComponent(kell, powerEngine());
[detail] +    powerEngine()->setCartesianWavenumber(kell);
[detail] +    oneComponentSteering();
[detail]      powerEngine()->setCrossSpectrum(_crossSpectrum->rotatedMatrix(kell));
[detail]  
[detail]      Complex ell;
[detail] @@ -204,15 +207,17 @@
[detail]      const Vector<Complex>& e0=FKSteering::twoComponentRayleighRadial(ell, powerEngine());
[detail]      powerEngine()->setHighResolutionValue(e0);
[detail]      double p=powerEngine()->value();
[detail] -    steering()->twoComponentSensorRadialProjections(kell, powerEngine());
[detail] +    steering()->twoComponentSensorRadialProjections(powerEngine());
[detail]      powerEngine()->highResolutionKRadialFirstDerivative(powerEngine()->ellipticitySteeringVector());
[detail]      double tan=ell.im()/ell.re();
[detail]      return powerEngine()->highResolutionKRadialSecondDerivative()/(2.0*tan*tan*p*p);
[detail]    }
[detail]  
[detail]    void HRFKRayleighSquared::setAssociatedResults(const Vector<double>& kell, double power,
[detail] -                                                 FKPeaks::Value& val) const
[detail] +                                                 FKPeaks::Value& val,
[detail] +                                                 const WaveNumberConverter& conv) const
[detail]    {
[detail] +    AbstractFKFunction::setAssociatedResults(kell, power, val, conv);
[detail]      val.power=sqrt(power)/tan(kell[2]);
[detail]      rawEllipticity(kell, val);
[detail]    }
[detail]             src/HRFKRayleighVertical.cpp:  version-4.2.1	modified out of comments
[detail] --- src/HRFKRayleighVertical.cpp-version-4.2.1-stripped	2025-09-28 04:01:16.843560216 +0200
[detail] +++ src/HRFKRayleighVertical.cpp-HEAD-stripped	2025-09-28 04:01:16.847560236 +0200
[detail] @@ -34,7 +34,8 @@
[detail]    double HRFKRayleighVertical::value(Vector<double>& kell) const
[detail]    {
[detail]      if(isInsideLimits(kell)) {
[detail] -      oneComponentSteering(kell);
[detail] +      powerEngine()->setCartesianWavenumber(kell);
[detail] +      oneComponentSteering();
[detail]        if(_crossSpectrum) {
[detail]          powerEngine()->setCrossSpectrum(_crossSpectrum->rotatedMatrix(kell));
[detail]        }
[detail] @@ -60,7 +61,7 @@
[detail]      double value2=a.value*a.value;
[detail]      
[detail]      const Vector<Complex>& de=FKSteering::twoComponentRayleighVerticalGradient(a.ell, powerEngine());
[detail] -    a.slope=-2.0*value2*powerEngine()->ellipticityGradient(de);
[detail] +    a.slope=-2.0*value2*powerEngine()->gradient(de);
[detail]      
[detail]      double cot=a.ell.re()/a.ell.im();
[detail]      a.concavity=powerEngine()->xiSecondDerivative();
[detail] @@ -75,7 +76,7 @@
[detail]      const Vector<Complex>& e0=FKSteering::twoComponentRayleighVertical(ell, powerEngine());
[detail]      powerEngine()->setHighResolutionValue(e0);
[detail]      double p=powerEngine()->value();
[detail] -    steering()->twoComponentSensorRadialProjections(kell, powerEngine());
[detail] +    steering()->twoComponentSensorRadialProjections(powerEngine());
[detail]      powerEngine()->highResolutionKRadialFirstDerivative(powerEngine()->ellipticitySteeringVector());
[detail]      return powerEngine()->highResolutionKRadialSecondDerivative()/p;
[detail]    }
[detail]                   src/HRFKTransverse.cpp:  version-4.2.1	not modified
[detail]       src/HRFKVelocityStrainRateLove.cpp:  version-4.2.1	no last version available
[detail]   src/HRFKVelocityStrainRateRayleigh.cpp:  version-4.2.1	no last version available
[detail]                     src/HRFKVertical.cpp:  version-4.2.1	modified out of comments
[detail] --- src/HRFKVertical.cpp-version-4.2.1-stripped	2025-09-28 04:01:16.883560410 +0200
[detail] +++ src/HRFKVertical.cpp-HEAD-stripped	2025-09-28 04:01:16.887560429 +0200
[detail] @@ -1,6 +1,7 @@
[detail]  
[detail]  
[detail]  #include "HRFKVertical.h"
[detail] +#include "HRFKPolarVertical.h"
[detail]  #include "FKPower.h"
[detail]  
[detail]  namespace ArrayCore {
[detail] @@ -69,20 +66,6 @@
[detail]        return -1.0;
[detail]      }
[detail]    }
[detail] -#if 0
[detail] -  void HRFKVertical::setGradient(FKPower& p) const
[detail] -  {
[detail] -    
[detail] -    p.setHighResolutionValue(_crossSpectrum->matrix());
[detail] -    p.setOneComponentGradient();
[detail] -  }
[detail] -
[detail] -  void HRFKVertical::setHessian(FKPower &p) const
[detail] -  {
[detail] -    
[detail] -    p.setOneComponentHessian(_crossSpectrum->matrix());
[detail] -  }
[detail] -#endif
[detail]  
[detail]    double HRFKVertical::value(Vector<double>& k) const
[detail]    {
[detail] @@ -91,9 +74,8 @@
[detail]        QElapsedTimer chrono;
[detail]        chrono.start();
[detail]  #endif
[detail] -      
[detail] -      powerEngine()->setHighResolutionValue(oneComponentSteering(k));
[detail] -      
[detail] +      powerEngine()->setCartesianWavenumber(k);
[detail] +      powerEngine()->setHighResolutionValue(oneComponentSteering());
[detail]  #ifdef PROCESS_TIMING
[detail]        qint64 t=chrono.nsecsElapsed();
[detail]        globalTimeMutex.lock();
[detail] @@ -106,44 +88,36 @@
[detail]      }
[detail]    }
[detail]  
[detail] -  
[detail] -  void HRFKVertical::gradient(const Vector<double>&, Vector<double>& grad) const
[detail] -  {
[detail] -    Q_UNUSED(grad);
[detail] -    TODO_WARNING;
[detail] -    
[detail] -  }
[detail] -
[detail] -#if 0
[detail] -  void HRFKVertical::setGradient(const Point& k, FKPower& p) const
[detail] -  {
[detail] -    
[detail] -    FKSteeringOneComponent * s=static_cast<FKSteeringOneComponent *>(_steering);
[detail] -    s->initValue(k);
[detail] -    s->initGradient();
[detail] -    p.setHighResolutionValue(_crossSpectrum->matrix());
[detail] -    p.setOneComponentGradient();
[detail] -  }
[detail] -
[detail] -  void HRFKVertical::setHessian(const Point&, FKPower& p) const
[detail] -  {
[detail] -    FKSteeringOneComponent * s=static_cast<FKSteeringOneComponent *>(_steering);
[detail] -    s->initHessian();
[detail] -    p.setOneComponentHessian(_crossSpectrum->matrix());
[detail] +  void HRFKVertical::setAssociatedResults(const Vector<double>& k, double power,
[detail] +                                          FKPeaks::Value& val,
[detail] +                                          const WaveNumberConverter& conv) const
[detail] +  {
[detail] +    AbstractFKFunction::setAssociatedResults(k, power, val, conv);
[detail] +    
[detail] +    val.verticalNoise=cache()->arrayPatternSecondDerivativeAtOrigin(k)/wavenumberNormalizedConcavity(k);
[detail] +
[detail] +    val.extraValues=new PrivateVector<double>(1);
[detail] +    HRFKPolarVertical p(cache());
[detail] +    int n=cache()->array()->count();
[detail] +    FKPower * eng=new FKPower(n, n);
[detail] +    eng->setCrossSpectrum(powerEngine()->crossSpectrum());
[detail] +    p.setPowerEngine(eng);
[detail] +    Complex kpc(k[0], k[1]);
[detail] +    PrivateVector<double> kp(k), grad(2);
[detail] +    kp[0]=kpc.abs();
[detail] +    kp[1]=kpc.phase();
[detail] +    p.value(kp);
[detail] +    p.gradient(kp, grad);
[detail] +    (*val.extraValues)[0]=grad.length();
[detail]    }
[detail] -#endif
[detail]  
[detail] -
[detail] -  bool HRFKVertical::remove(const Vector<double>& k, FKPeaks::Value& val)
[detail] +  bool HRFKVertical::remove(const Vector<double>& k, FKPeaks::Value& val, double damping)
[detail]    {
[detail]      
[detail] -    const Vector<Complex>& q0values=steering()->oneComponent(k, powerEngine());
[detail] -    
[detail] -    
[detail] -    
[detail] +    powerEngine()->setCartesianWavenumber(k);
[detail] +    const Vector<Complex>& q0values=oneComponentSteering();
[detail]      ComplexMatrix F=q0values.crossMatrix();
[detail] -    
[detail] -    F*=val.power/(1.0+val.verticalNoise);
[detail] +    F*=val.power*damping/(1.0+val.verticalNoise);
[detail]      _originalCrossSpectrum-=F;
[detail]      *_crossSpectrum->matrix()=_originalCrossSpectrum;
[detail]      return invertCrossSpectrum();
[detail] @@ -152,35 +126,12 @@
[detail]    
[detail]    double HRFKVertical::wavenumberNormalizedConcavity(const Vector<double>& k) const
[detail]    {
[detail] -    powerEngine()->setHighResolutionValue(oneComponentSteering(k));
[detail] +    powerEngine()->setCartesianWavenumber(k);
[detail] +    powerEngine()->setHighResolutionValue(oneComponentSteering());
[detail]      double p=powerEngine()->value();
[detail] -    steering()->oneComponentSensorRadialProjections(k, powerEngine());
[detail] +    steering()->oneComponentSensorRadialProjections(powerEngine());
[detail]      powerEngine()->highResolutionKRadialFirstDerivative(powerEngine()->steeringVector());
[detail]      return powerEngine()->highResolutionKRadialSecondDerivative()/p;
[detail]    }
[detail]  
[detail] -  
[detail] -  void HRFKVertical::testKDerivatives(const Vector<double>& k) const
[detail] -  {
[detail] -    QFile f("/tmp/kderivatives");
[detail] -    f.open(QIODevice::WriteOnly);
[detail] -    QTextStream s(&f);
[detail] -
[detail] -    PrivateVector<double> k1(k);
[detail] -    k1/=k1.length(0, 1);
[detail] -    for(double k=0; k<0.5; k+=0.001) {
[detail] -      PrivateVector<double> kv(k1);
[detail] -      kv*=k;
[detail] -      const Vector<Complex>& e0=oneComponentSteering(kv);
[detail] -      powerEngine()->setHighResolutionValue(e0);
[detail] -      double p=powerEngine()->value();
[detail] -      steering()->oneComponentSensorRadialProjections(kv, powerEngine());
[detail] -      double dp=powerEngine()->highResolutionKRadialFirstDerivative(e0);
[detail] -      double ddp=powerEngine()->highResolutionKRadialSecondDerivative();
[detail] -      s << k << " " << p << " " << dp << " " << ddp << Qt::endl;
[detail] -    }
[detail] -    f.close();
[detail] -    exit(0);
[detail] -  }
[detail] -
[detail]  } 
[detail]                  src/IncoherentNoise.cpp:  version-4.2.1	not modified
[detail]                      src/KNullSolver.cpp:  version-4.2.1	modified out of comments
[detail] --- src/KNullSolver.cpp-version-4.2.1-stripped	2025-09-28 04:01:16.923560603 +0200
[detail] +++ src/KNullSolver.cpp-HEAD-stripped	2025-09-28 04:01:16.927560623 +0200
[detail] @@ -30,9 +30,9 @@
[detail]      _function->setGridStep(param.gridStep());
[detail]      grid.localMax(INT_MAX, 1.0/threshold, 0.0);
[detail]      _points.clear();
[detail] -    FunctionMaximaIterator it;
[detail] -    for(it=grid.begin(); it!=grid.end(); ++it) {
[detail] -      const FunctionSearchMaximum& m=**it;
[detail] +    int n=grid.extrema().size();
[detail] +    for(int i=0; i<n; i++) {
[detail] +      const FunctionSearchExtremum& m=*grid.extrema().at(i);
[detail]        const Vector<double>& k=m.position();
[detail]        if(k.length(0, 1)<param.kmax()) {
[detail]          _points.append(Point2D(k[0], k[1]));
[detail] @@ -42,7 +42,7 @@
[detail]      
[detail]      std::sort(_points.begin(), _points.end(), lengthLessThan);
[detail]      App::log(tr("Found %1 null points (<%2) in theoretical array response.\n")
[detail] -             .arg(_points.count()).arg(threshold));
[detail] +             .arg(_points.size()).arg(threshold));
[detail]    }
[detail]  
[detail]    bool KNullSolver::lengthLessThan(const Point2D& p1, const Point2D& p2)
[detail]                       src/KmaxSolver.cpp:  version-4.2.1	not modified
[detail]                       src/KminSolver.cpp:  version-4.2.1	modified out of comments
[detail] --- src/KminSolver.cpp-version-4.2.1-stripped	2025-09-28 04:01:16.959560778 +0200
[detail] +++ src/KminSolver.cpp-HEAD-stripped	2025-09-28 04:01:16.963560796 +0200
[detail] @@ -15,6 +15,7 @@
[detail]      
[detail]      double dmin, dmax;
[detail]      distanceRange(dmin, dmax);
[detail] +    APP_LOG(1, tr("Distance range: from %1 m to %2 m\n").arg(dmin).arg(dmax));
[detail]      double sf=shapeFactor();
[detail]      if(sf<0.1 || sf>10.0) { 
[detail]        return 2.0*M_PI/dmax;
[detail]             src/LocalSourceModeModel.cpp:  version-4.2.1	no last version available
[detail]              src/LocalSourceVertical.cpp:  version-4.2.1	no last version available
[detail]                  src/MSPACStatistics.cpp:  version-4.2.1	not modified
[detail]                 src/MuttiArrayFKLoop.cpp:  version-4.2.1	not modified
[detail]                 src/ORACrossSpectrum.cpp:  version-4.2.1	modified out of comments
[detail] --- src/ORACrossSpectrum.cpp-version-4.2.1-stripped	2025-09-28 04:01:17.019561067 +0200
[detail] +++ src/ORACrossSpectrum.cpp-HEAD-stripped	2025-09-28 04:01:17.023561086 +0200
[detail] @@ -77,7 +77,7 @@
[detail]      
[detail]      for(int i1=0; i1<n; i1++) {
[detail]        for(int i2=i1+1; i2<n; i2++) {
[detail] -        _pairMatrices[i1+i2*n]+=_sigs[i1]*_sigs[i2].conjugate().transposed();
[detail] +        _pairMatrices[i1+i2*n]+=_sigs[i1]*_sigs[i2].conjugateTransposedVector();
[detail]        }
[detail]      }
[detail]      return true;
[detail]                    src/ORAParameters.cpp:  version-4.2.1	not modified
[detail]                   src/ORATaskManager.cpp:  version-4.2.1	not modified
[detail]                          src/ORATool.cpp:  version-4.2.1	modified out of comments
[detail] --- src/ORATool.cpp-version-4.2.1-stripped	2025-09-28 04:01:17.075561338 +0200
[detail] +++ src/ORATool.cpp-HEAD-stripped	2025-09-28 04:01:17.079561357 +0200
[detail] @@ -25,7 +25,7 @@
[detail]      TRACE;
[detail]      if(AbstractArrayTool::setSubPool(subPool)) {
[detail]        switch (array()->components()) {
[detail] -      case StationSignals::AllComponent:
[detail] +      case StationSignals::ThreeComponents:
[detail]          break;
[detail]        default:
[detail]          Message::warning(MSG_ID, tr("Checking components"),
[detail]                        src/ORAWorker.cpp:  version-4.2.1	not modified
[detail]                   src/OmniFKRayleigh.cpp:  version-4.2.1	not modified
[detail]                   src/OmniFKVertical.cpp:  version-4.2.1	not modified
[detail]                src/OneComponentModel.cpp:  version-4.2.1	no last version available
[detail]        src/PlaneWaveChangeOfVariable.cpp:  version-4.2.1	no last version available
[detail]    src/PlaneWaveFixedIncoherentNoise.cpp:  version-4.2.1	no last version available
[detail]              src/PlaneWaveFixedModel.cpp:  version-4.2.1	no last version available
[detail]         src/PlaneWaveIncoherentNoise.cpp:  version-4.2.1	no last version available
[detail]        src/PlaneWaveIncoherentNoise2.cpp:  version-4.2.1	no last version available
[detail]    src/PlaneWaveInversionTaskManager.cpp:  version-4.2.1	no last version available
[detail]   src/PlaneWaveInversionTaskManager2.cpp:  version-4.2.1	no last version available
[detail]         src/PlaneWaveInversionWorker.cpp:  version-4.2.1	no last version available
[detail]        src/PlaneWaveInversionWorker2.cpp:  version-4.2.1	no last version available
[detail]          src/PlaneWaveModeFixedModel.cpp:  version-4.2.1	no last version available
[detail]       src/PlaneWaveModeFixedSpectrum.cpp:  version-4.2.1	no last version available
[detail]               src/PlaneWaveModeModel.cpp:  version-4.2.1	no last version available
[detail]            src/PlaneWaveModeSpectrum.cpp:  version-4.2.1	no last version available
[detail]                   src/PlaneWaveModel.cpp:  version-4.2.1	no last version available
[detail]              src/PlaneWaveParameters.cpp:  version-4.2.1	no last version available
[detail]                     src/PlaneWaveSum.cpp:  version-4.2.1	no last version available
[detail]                    src/PoggiFKRadial.cpp:  version-4.2.1	modified out of comments
[detail] --- src/PoggiFKRadial.cpp-version-4.2.1-stripped	2025-09-28 04:01:17.235562112 +0200
[detail] +++ src/PoggiFKRadial.cpp-HEAD-stripped	2025-09-28 04:01:17.239562130 +0200
[detail] @@ -30,12 +30,7 @@
[detail]      return _crossSpectrum->invert() && _crossSpectrum->invertRotatedMatrices();
[detail]    }
[detail]  
[detail] -  double PoggiFKRadial::ellipticity(const Vector<double>& k)
[detail] -  {
[detail] -    HRFKVertical vertical(cache());
[detail] -    PrivateVector<double> nck(k);
[detail] -    return ::sqrt(value(nck)/vertical.value(nck));
[detail] -  }
[detail] +  
[detail]  
[detail]  } 
[detail]  
[detail]                  src/PoggiFKVertical.cpp:  version-4.2.1	modified out of comments
[detail] --- src/PoggiFKVertical.cpp-version-4.2.1-stripped	2025-09-28 04:01:17.255562208 +0200
[detail] +++ src/PoggiFKVertical.cpp-HEAD-stripped	2025-09-28 04:01:17.259562227 +0200
[detail] @@ -30,12 +30,7 @@
[detail]      return _crossSpectrum->invert() && _crossSpectrum->invertRotatedMatrices();
[detail]    }
[detail]  
[detail] -  double PoggiFKVertical::ellipticity(const Vector<double>& k)
[detail] -  {
[detail] -    HRFKRadial radial(cache());
[detail] -    PrivateVector<double> nck(k);
[detail] -    return ::sqrt(radial.value(nck)/value(nck));
[detail] -  }
[detail] +  
[detail]  
[detail]  } 
[detail]  
[detail]         src/RayleighChangeOfVariable.cpp:  version-4.2.1	no last version available
[detail]     src/RayleighLoveChangeOfVariable.cpp:  version-4.2.1	no last version available
[detail]                src/RayleighLoveModel.cpp:  version-4.2.1	no last version available
[detail]                    src/RayleighModel.cpp:  version-4.2.1	no last version available
[detail]                  src/ReceiverSpectra.cpp:  version-4.2.1	no last version available
[detail]              src/RepellingDirections.cpp:  version-4.2.1	no last version available
[detail]                  src/RepellingValues.cpp:  version-4.2.1	no last version available
[detail]                        src/RingPairs.cpp:  version-4.2.1	not modified
[detail]                src/SPACCrossSpectrum.cpp:  version-4.2.1	modified out of comments
[detail] --- src/SPACCrossSpectrum.cpp-version-4.2.1-stripped	2025-09-28 04:01:17.327562556 +0200
[detail] +++ src/SPACCrossSpectrum.cpp-HEAD-stripped	2025-09-28 04:01:17.331562574 +0200
[detail] @@ -29,15 +29,16 @@
[detail]      _horizontalMatrix=nullptr;
[detail]      switch (_mode) {
[detail]      case ArrayStations::ThreeComponents:
[detail] -      _horizontalMatrix=new ComplexMatrix(2*_array.count());
[detail] +      _horizontalMatrix=new HermitianMatrix(2*_array.count());
[detail]        break;
[detail]      case ArrayStations::Horizontal:
[detail] +    case ArrayStations::ThreeComponentsAndStrain:
[detail]        ASSERT(false);
[detail]      case ArrayStations::Vertical:
[detail]        break;
[detail]      }
[detail]      delete _matrix;
[detail] -    _matrix=new ComplexMatrix(_array.count());
[detail] +    _matrix=new HermitianMatrix(_array.count());
[detail]    }
[detail]  
[detail]    bool SPACCrossSpectrum::calculate(const VectorList<int>& blocks)
[detail] @@ -80,12 +81,8 @@
[detail]        diag[i]=1.0/::sqrt(c.re());
[detail]      }
[detail]      for(int i=0; i<n; i++) {
[detail] -      int j;
[detail] -      for(j=0; j<i; j++) {
[detail] -        covmat.at(i, j)*=diag[i]*diag[j];
[detail] -      }
[detail]        covmat.at(i, i)=1.0;
[detail] -      for(j++; j<n; j++) {
[detail] +      for(int j=i+1; j<n; j++) {
[detail]          covmat.at(i, j)*=diag[i]*diag[j];
[detail]        }
[detail]      }
[detail]                   src/SPACParameters.cpp:  version-4.2.1	not modified
[detail]                        src/SPACPeaks.cpp:  version-4.2.1	modified out of comments
[detail] --- src/SPACPeaks.cpp-version-4.2.1-stripped	2025-09-28 04:01:17.363562729 +0200
[detail] +++ src/SPACPeaks.cpp-HEAD-stripped	2025-09-28 04:01:17.367562749 +0200
[detail] @@ -41,22 +41,21 @@
[detail]      TRACE;
[detail]      double n=capacity();
[detail]      n*=sizeof(Value);
[detail] -    n/=1024.0*1024.0;
[detail]      _dataLock.lockForWrite();
[detail]      Value * newValues=static_cast<Value *>(reallocateVector((uchar *)_values, sizeof(Value)));
[detail]      if(newValues) {
[detail]        _values=newValues;
[detail]      } else {
[detail] -      App::log(tr("Failed to reallocate results for %1 values (size=%2 Mb)\n"
[detail] +      App::log(tr("Failed to reallocate results for %1 values (size=%2)\n"
[detail]                    "Container is full.")
[detail]                 .arg(capacity())
[detail] -               .arg(n));
[detail] +                   .arg(Number::bytesToString(n)));
[detail]        _full=true;
[detail]      }
[detail]      _dataLock.unlock();
[detail] -    APP_LOG(1, tr("Reallocated results for %1 values (size=%2 Mb)\n")
[detail] +    APP_LOG(1, tr("Reallocated results for %1 values (size=%2)\n")
[detail]              .arg(capacity())
[detail] -            .arg(n))
[detail] +            .arg(Number::bytesToString(n)))
[detail]    }
[detail]  
[detail]    bool SPACPeaks::add(Mode::Polarization polarization,
[detail]                      src/SPACResults.cpp:  version-4.2.1	modified out of comments
[detail] --- src/SPACResults.cpp-version-4.2.1-stripped	2025-09-28 04:01:17.387562845 +0200
[detail] +++ src/SPACResults.cpp-HEAD-stripped	2025-09-28 04:01:17.391562865 +0200
[detail] @@ -45,12 +45,14 @@
[detail]    {
[detail]      AbstractArrayResults::setArray(array);
[detail]      switch (_array->array()->components()) {
[detail] -    case StationSignals::AllComponent:
[detail] +    case StationSignals::ThreeComponents:
[detail]        _nComponents=3;
[detail]        break;
[detail] -    case StationSignals::VerticalComponent:
[detail] +    case StationSignals::VerticalComponents:
[detail]        _nComponents=1;
[detail]        break;
[detail] +    default:
[detail] +      ASSERT(false);
[detail]      }
[detail]    }
[detail]  
[detail]                         src/SPACRing.cpp:  version-4.2.1	not modified
[detail]                  src/SPACTaskManager.cpp:  version-4.2.1	not modified
[detail]                         src/SPACTool.cpp:  version-4.2.1	modified out of comments
[detail] --- src/SPACTool.cpp-version-4.2.1-stripped	2025-09-28 04:01:17.439563096 +0200
[detail] +++ src/SPACTool.cpp-HEAD-stripped	2025-09-28 04:01:17.443563116 +0200
[detail] @@ -28,12 +28,12 @@
[detail]      TRACE;
[detail]      if(AbstractArrayTool::setSubPool(subPool)) {
[detail]        switch (array()->components()) {
[detail] -      case StationSignals::VerticalComponent:
[detail] -      case StationSignals::AllComponent:
[detail] +      case StationSignals::VerticalComponents:
[detail] +      case StationSignals::ThreeComponents:
[detail]          break;
[detail]        default:
[detail]          Message::warning(MSG_ID, tr("Creating array"),
[detail] -                              tr( "Error while checking components: only vertical or 3 components are allowed."),
[detail] +                              tr( "Error while checking components: only vertical or three components are allowed."),
[detail]                                Message::cancel());
[detail]          return false;
[detail]        }
[detail] @@ -46,6 +46,11 @@
[detail]    bool SPACTool::setLoop()
[detail]    {
[detail]      TRACE;
[detail] +    selectStations();
[detail] +    if(_arraySelection.count()<2) {
[detail] +      App::log(tr("Less than two selected stations, aborting.\n"));
[detail] +      return false;
[detail] +    }
[detail]      if(!setFrequencySampling()) {
[detail]        return false;
[detail]      }
[detail]                       src/SPACWorker.cpp:  version-4.2.1	not modified
[detail]            src/SeparatedPlaneWaveSum.cpp:  version-4.2.1	no last version available
[detail] src/SeparatedRayleighLoveChangeOfVariable.cpp:  version-4.2.1	no last version available
[detail]       src/SeparatedRayleighLoveModel.cpp:  version-4.2.1	no last version available
[detail]           src/SimulatedArrayStations.cpp:  version-4.2.1	modified out of comments
[detail] --- src/SimulatedArrayStations.cpp-version-4.2.1-stripped	2025-09-28 04:01:17.491563348 +0200
[detail] +++ src/SimulatedArrayStations.cpp-HEAD-stripped	2025-09-28 04:01:17.495563367 +0200
[detail] @@ -24,7 +24,7 @@
[detail]      TRACE;
[detail]    }
[detail]  
[detail] -  double SimulatedArrayStations::samplingFrequnecy() const
[detail] +  double SimulatedArrayStations::samplingFrequnecy(int) const
[detail]    {
[detail]      return 1.0;
[detail]    }
[detail] @@ -44,7 +44,7 @@
[detail]      return _stations.at(index).name();
[detail]    }
[detail]  
[detail] -  Point2D SimulatedArrayStations::position(int index) const
[detail] +  const Point2D& SimulatedArrayStations::position(int index) const
[detail]    {
[detail]      return _stations.at(index);
[detail]    }
[detail]             src/SingleDirectRayleigh.cpp:  version-4.2.1	modified out of comments
[detail] --- src/SingleDirectRayleigh.cpp-version-4.2.1-stripped	2025-09-28 04:01:17.511563445 +0200
[detail] +++ src/SingleDirectRayleigh.cpp-HEAD-stripped	2025-09-28 04:01:17.515563464 +0200
[detail] @@ -14,31 +14,63 @@
[detail]      TRACE;
[detail]    }
[detail]  
[detail] -  void SingleDirectRayleigh::addCrossSpectrum()
[detail] +  void SingleDirectRayleigh::initialize(const FKParameters& param)
[detail]    {
[detail] -    _crossSpectrum->addRayleighSingle();
[detail] +    setPowerEngine(cache()->array()->count());
[detail] +    if(_crossSpectrum) {
[detail] +      powerEngine()->setCrossSpectrum(_crossSpectrum->matrix());
[detail]    }
[detail]  
[detail] -  void SingleDirectRayleigh::meanCrossSpectrum(int)
[detail] +    steeringInitialization()->setSensorPositionErrors(param);
[detail] +    steeringInitialization()->setSensorOrientationErrors(param);
[detail] +    _ellOptimization.setAbsolutePrecision(param.ellipticityAbsolutePrecision());
[detail] +    AbstractFKRayleigh::initialize(param);
[detail] +  }
[detail] +
[detail] +  FunctionSearch * SingleDirectRayleigh::createSearch(const FKParameters&)
[detail]    {
[detail] -    _crossSpectrum->meanRayleighSingle();
[detail] +    GridSearch1D * grid=new GridSearch1D(2);
[detail] +    grid->setRelativePrecision(0, M_PI/18000.0);
[detail] +    grid->setFunction(this);
[detail] +    grid->setGrid(0.0, M_PI, M_PI/180.0);
[detail] +    return grid;
[detail]    }
[detail]  
[detail]    double SingleDirectRayleigh::value(const Vector<int>& index) const
[detail]    {
[detail] -    return index[0]==1 ? 1.0 : 0.0;
[detail] +    PrivateVector<double> param(2);
[detail] +    param[0]=index[0]*M_PI/180.0;
[detail] +    return value(param);
[detail]    }
[detail]  
[detail] -  double SingleDirectRayleigh::value(Vector<double>&) const
[detail] +  double SingleDirectRayleigh::value(Vector<double>& azell) const
[detail] +  {
[detail] +    Complex rotation;
[detail] +    rotation.setUnitExp(azell[0]);
[detail] +    steering()->threeComponentRayleigh(rotation, powerEngine());
[detail] +    
[detail] +    maximumEllipticity();
[detail] +    canonicalEllipticity(_xi.x);
[detail] +    if(_xi.x<0.0) {
[detail] +      _xi.x=-_xi.x;
[detail] +    }
[detail] +    azell[1]=_xi.x;
[detail] +    return _xi.value;
[detail] +  }
[detail] +
[detail] +  void SingleDirectRayleigh::setAssociatedResults(const Vector<double>& azell, double power,
[detail] +                                                  FKPeaks::Value& val,
[detail] +                                                  const WaveNumberConverter&) const
[detail]    {
[detail] -    return 0.0;
[detail] +    val.slowness=std::numeric_limits<double>::quiet_NaN();
[detail] +    val.azimuth=Angle::radiansToDegrees(azell[0]);
[detail] +    val.ellipticity=Angle::radiansToDegrees(azell[1]);
[detail] +    val.verticalNoise=std::numeric_limits<double>::quiet_NaN();
[detail] +    val.horizontalNoise=std::numeric_limits<double>::quiet_NaN();
[detail] +    val.power=power;
[detail]    }
[detail]  
[detail] -  double SingleDirectRayleigh::ellipticity(const Vector<double>&)
[detail] -  {
[detail] -    return _crossSpectrum->matrix()->at(2, 2).re();
[detail]      
[detail] -  }
[detail]  
[detail]  } 
[detail]  
[detail]                       src/SourceList.cpp:  version-4.2.1	no last version available
[detail]                 src/SourceParameters.cpp:  version-4.2.1	no last version available
[detail]            src/SpectrumMatchFunction.cpp:  version-4.2.1	no last version available
[detail]         src/SpectrumMatchTaskManager.cpp:  version-4.2.1	no last version available
[detail]              src/SpectrumMatchWorker.cpp:  version-4.2.1	no last version available
[detail]                      src/StationPair.cpp:  version-4.2.1	modified out of comments
[detail] --- src/StationPair.cpp-version-4.2.1-stripped	2025-09-28 04:01:17.563563697 +0200
[detail] +++ src/StationPair.cpp-HEAD-stripped	2025-09-28 04:01:17.567563715 +0200
[detail] @@ -13,6 +13,7 @@
[detail]    void StationPair::setStations(const ArraySelection& array, int index1, int index2)
[detail]    {
[detail]      TRACE;
[detail] +    ASSERT(index1<index2);
[detail]      _s1=index1;
[detail]      _s2=index2;
[detail]      const StationSignals * ss1=array.stationSignals(_s1);
[detail]                     src/StationPairs.cpp:  version-4.2.1	not modified
[detail]                  src/SteeringFactors.cpp:  version-4.2.1	not modified
[detail]           src/SyntheticCrossSpectrum.cpp:  version-4.2.1	no last version available
[detail]       src/VelocityStrainRateSteering.cpp:  version-4.2.1	no last version available
[detail]              src/WaveNumberConverter.cpp:  version-4.2.1	not modified
[detail]                       src/Wavenumber.cpp:  version-4.2.1	not modified
[detail]              src/ARDSSensorOrientation.h:  version-4.2.1	no last version available
[detail]               src/AbstractArrayResults.h:  version-4.2.1	modified out of comments
[detail] --- src/AbstractArrayResults.h-version-4.2.1-stripped	2025-09-28 04:01:17.667564199 +0200
[detail] +++ src/AbstractArrayResults.h-HEAD-stripped	2025-09-28 04:01:17.671564217 +0200
[detail] @@ -18,9 +18,10 @@
[detail]      AbstractArrayResults();
[detail]      virtual ~AbstractArrayResults();
[detail]  
[detail] -    void setParameters(const ArrayParameters * param) {_parameters=param;}
[detail] +    virtual void setParameters(const ArrayParameters * param) {_parameters=param;}
[detail]      virtual void setArray(const ArraySelection * array) {_array=array;}
[detail]      virtual void clear()=0;
[detail] +    virtual bool save(QString fileName, const QString& log)=0;
[detail]    protected:
[detail]      const ArrayParameters * _parameters;
[detail]      const ArraySelection * _array;
[detail]                  src/AbstractArrayTool.h:  version-4.2.1	modified out of comments
[detail] --- src/AbstractArrayTool.h-version-4.2.1-stripped	2025-09-28 04:01:17.687564295 +0200
[detail] +++ src/AbstractArrayTool.h-HEAD-stripped	2025-09-28 04:01:17.691564315 +0200
[detail] @@ -19,9 +19,9 @@
[detail]      Q_OBJECT
[detail]    public:
[detail]      AbstractArrayTool(QObject * parent);
[detail] -    virtual ~AbstractArrayTool();
[detail] +    ~AbstractArrayTool();
[detail]  
[detail] -    virtual bool setSubPool(SubSignalPool * subPool);
[detail] +    bool setSubPool(SubSignalPool * subPool);
[detail]  
[detail]      const ArraySelection * array() const {return &_arraySelection;}
[detail]  
[detail] @@ -33,19 +33,20 @@
[detail]      bool selectStations();
[detail]      bool setFrequencySampling();
[detail]  
[detail] -    virtual bool setLoop();
[detail] +    bool setLoop();
[detail]  
[detail] -    double minimumFrequency(int nWindows, double periodCount) const;
[detail] -    double maximumFrequency() const;
[detail] +    double minimumFrequency(int nWindows, double periodCount);
[detail] +
[detail] +    AbstractArrayResults * results() const {return _results;}
[detail]    public slots:
[detail]      void start(int threadCount, bool forceParallel);
[detail]    protected:
[detail] -    void setResults(AbstractArrayResults * r) {_results=r;}
[detail] -    AbstractArrayResults * results() const {return _results;}
[detail] +    void setResults(AbstractArrayResults * r);
[detail] +    virtual int crossSpectrumMatrixSize() const {return _arraySelection.count();}
[detail]  
[detail]      virtual QString toolName()=0;
[detail] -    StationSignals * belongsTo(Signal * sig);
[detail] -  private:
[detail] +    StationSignals * belongsTo(SignalSegment * sig);
[detail] +
[detail]      ArrayStations _array;
[detail]      ArraySelection _arraySelection;
[detail]      AbstractArrayResults * _results;
[detail]          src/AbstractEllipticityEngine.h:  version-4.2.1	not modified
[detail]                 src/AbstractFKFunction.h:  version-4.2.1	modified out of comments
[detail] --- src/AbstractFKFunction.h-version-4.2.1-stripped	2025-09-28 04:01:17.723564470 +0200
[detail] +++ src/AbstractFKFunction.h-HEAD-stripped	2025-09-28 04:01:17.727564488 +0200
[detail] @@ -17,8 +17,8 @@
[detail]    inline const Vector<Complex>& oneComponentSteering(const Vector<int>& index) const { \
[detail]      return steering()->oneComponent(index, powerEngine()); \
[detail]    } \
[detail] -  inline const Vector<Complex>& oneComponentSteering(const Vector<double>& k) const { \
[detail] -    return steering()->oneComponent(k, powerEngine()); \
[detail] +  inline const Vector<Complex>& oneComponentSteering() const { \
[detail] +    return steering()->oneComponent(powerEngine()); \
[detail]    }
[detail]  
[detail]  #define FK_ACTIVE_STEERING \
[detail] @@ -42,6 +42,11 @@
[detail]      AbstractFKFunction(FKCache * cache);
[detail]      ~AbstractFKFunction();
[detail]  
[detail] +    enum CoordinateSystem {CartesianCoordinates, PolarCoordinates};
[detail] +    ENUM_AS_STRING_DECL(CoordinateSystem)
[detail] +
[detail] +    virtual CoordinateSystem coordinateSystem() const {return CartesianCoordinates;}
[detail] +
[detail]      void setMaximumSlowness(double slow) {_squaredSlowMax=slow*slow;}
[detail]      double maximumSlowness() const {return sqrt(_squaredSlowMax);}
[detail]  
[detail] @@ -67,29 +72,40 @@
[detail]      virtual bool setFixedEllipticity(double ) {return true;}
[detail]      virtual double wavenumberNormalizedConcavity(const Vector<double>& ) const {return 0.0;}
[detail]  
[detail] +    virtual bool acceptPeak(const FunctionSearchExtremum& m, const WaveNumberConverter& conv,
[detail] +                            const FKParameters * param) const;
[detail]      virtual void setAssociatedResults(const Vector<double>& kell, double power,
[detail] -                                      FKPeaks::Value& val) const;
[detail] +                                      FKPeaks::Value& val,
[detail] +                                      const WaveNumberConverter& conv) const;
[detail]  
[detail] -    virtual bool remove(const Vector<double>& , FKPeaks::Value& /*val*/) {return false;}
[detail] +    virtual bool remove(const Vector<double>& ,
[detail] +                        FKPeaks::Value& ,
[detail] +                        double ) {return false;}
[detail]  
[detail]      virtual bool isOnLimit(const Vector<double>& k, double frequency) const;
[detail]      inline bool isInsideLimits(const Vector<int>& index) const;
[detail]      inline bool isInsideLimits(const Vector<double>& k) const;
[detail] +    inline bool isInsideLimits(double k, double theta) const;
[detail] +    bool isValid(Vector<double>& k) const {return isInsideLimits(k);}
[detail] +    bool isValid(double k, double theta) const {return isInsideLimits(k, theta);}
[detail]  
[detail]      virtual void setCrossSpectrum(FKCrossSpectrum * s) {_crossSpectrum=s;}
[detail] -    void setCrossSpectrum(const ComplexMatrix * f) {_powerEngine->setCrossSpectrum(f);}
[detail] -    virtual const ComplexMatrix * crossSpectrum() const;
[detail] +    void setCrossSpectrum(const HermitianMatrix * f) {_powerEngine->setCrossSpectrum(f);}
[detail] +    virtual const HermitianMatrix * crossSpectrum() const;
[detail] +
[detail] +    virtual int matrixSize(int stationCount) const {return stationCount;}
[detail] +    void setPowerEngine(int stationCount);
[detail] +    void setPowerEngine(FKPower * p);
[detail] +    FKPower * powerEngine() const {return _powerEngine;}
[detail]  
[detail]      static AbstractFKFunction * create(ArrayStations::Mode mode,
[detail]                                         const FKParameters * param,
[detail]                                         FKCache * cache);
[detail]      void setGridStep(double step) {_gridStep=step;}
[detail] +    int matrixSize() const {return _powerEngine->fe().size();}
[detail]    protected:
[detail]      FKCache * cache() const {return _cache;}
[detail]  
[detail] -    void setPowerEngine(FKPower * p);
[detail] -    FKPower * powerEngine() const {return _powerEngine;}
[detail] -
[detail]      FKCrossSpectrum * _crossSpectrum;
[detail]    private:
[detail]      FKCache * _cache;
[detail] @@ -124,6 +140,15 @@
[detail]      return Angle::isInsideRadians(a, _minAzimuth, _maxAzimuth);
[detail]    }
[detail]  
[detail] +  inline bool AbstractFKFunction::isInsideLimits(double k, double theta) const
[detail] +  {
[detail] +    double k2=k*k;
[detail] +    if(k2<_squaredKminTotal || k2>_squaredKmaxTotal) {
[detail] +      return false;
[detail] +    }
[detail] +    return Angle::isInsideRadians(theta, _minAzimuth, _maxAzimuth);
[detail] +  }
[detail] +
[detail]    template <class Function, class Attributes> void printEllipticityCurve(const Function * func)
[detail]    {
[detail]      QFile f("/tmp/ellderivatives");
[detail]                 src/AbstractFKRayleigh.h:  version-4.2.1	modified out of comments
[detail] --- src/AbstractFKRayleigh.h-version-4.2.1-stripped	2025-09-28 04:01:17.743564566 +0200
[detail] +++ src/AbstractFKRayleigh.h-HEAD-stripped	2025-09-28 04:01:17.747564585 +0200
[detail] @@ -25,7 +25,8 @@
[detail]      };
[detail]  
[detail]      void setAssociatedResults(const Vector<double>& kell, double power,
[detail] -                              FKPeaks::Value& val) const;
[detail] +                              FKPeaks::Value& val,
[detail] +                              const WaveNumberConverter& conv) const;
[detail]      double radialPower(Vector<double>& kell) const;
[detail]      double radialConcavity(Vector<double>& kell, int axis) const;
[detail]      double verticalPower(Vector<double>& kell) const;
[detail] @@ -33,15 +34,13 @@
[detail]  
[detail]      static inline void canonicalEllipticity(double& xi);
[detail]  
[detail] -    static PolynomialFraction phiH(double eh, double ez, double ch);
[detail] -    static PolynomialFraction phiZ(double eh, double ez, double cz);
[detail] -    static PolynomialFraction phiA(double eh, double ez, double ea, double ca);
[detail] -    static PolynomialFraction cH(double eh, double ez);
[detail] -    static PolynomialFraction cZ(double eh, double ez);
[detail] -    static PolynomialFraction cA(double eh, double ez, double ea);
[detail] -    static Polynomial phitH(double eh, double ez, double th);
[detail] -    static PolynomialFraction phitZ(double eh, double ez, double tz);
[detail] -    static PolynomialFraction phitA(double eh, double ez, double ea, double ta);
[detail] +    static Polynomial denominatorPhi(double eh, double ez);
[detail] +    static Polynomial numeratorPhiH(double eh, double ez, double ch,
[detail] +                                    const Polynomial& denominator);
[detail] +    static Polynomial numeratorPhiZ(double eh, double ez, double cz,
[detail] +                                    const Polynomial& denominator);
[detail] +    static Polynomial numeratorPhiA(double eh, double ez, double ea, double ca,
[detail] +                                    const Polynomial& denominator);
[detail]      static double minimumConcavityFactorHZ(double eh, double ez);
[detail]      static double minimumConcavityFactorA(double eh, double ez, double ea);
[detail]    protected:
[detail]        src/ActiveConvEllipticityEngine.h:  version-4.2.1	not modified
[detail]               src/ActiveConvFKRayleigh.h:  version-4.2.1	modified out of comments
[detail] --- src/ActiveConvFKRayleigh.h-version-4.2.1-stripped	2025-09-28 04:01:17.775564721 +0200
[detail] +++ src/ActiveConvFKRayleigh.h-HEAD-stripped	2025-09-28 04:01:17.779564740 +0200
[detail] @@ -14,6 +14,7 @@
[detail]      ActiveConvFKRayleigh(FKCache * cache);
[detail]      ~ActiveConvFKRayleigh();
[detail]  
[detail] +    int matrixSize(int stationCount) const {return 2*stationCount;}
[detail]      void initialize(const FKParameters& param);
[detail]      FunctionSearch * createSearch(const FKParameters& param);
[detail]      bool setSource(const VectorList<int>& blocks);
[detail]            src/ActiveConvFKRayleighAll.h:  version-4.2.1	not modified
[detail]         src/ActiveConvFKRayleighRadial.h:  version-4.2.1	not modified
[detail]       src/ActiveConvFKRayleighVertical.h:  version-4.2.1	not modified
[detail]               src/ActiveConvFKVertical.h:  version-4.2.1	not modified
[detail]                 src/ActiveFKParameters.h:  version-4.2.1	not modified
[detail]                   src/ActiveFKSteering.h:  version-4.2.1	modified out of comments
[detail] --- src/ActiveFKSteering.h-version-4.2.1-stripped	2025-09-28 04:01:17.875565203 +0200
[detail] +++ src/ActiveFKSteering.h-HEAD-stripped	2025-09-28 04:01:17.875565203 +0200
[detail] @@ -49,17 +49,17 @@
[detail]    inline const Vector<Complex>& ActiveFKSteering::oneComponent(double k, FKPower * p) const
[detail]    {
[detail]      int n=_array->count();
[detail] -    Vector<Complex>& e=p->steeringVector();
[detail] +    Vector<Complex>& q=p->oneComponentSteeringVectorValue();
[detail]      for(int i=0; i<n; i++) {
[detail] -      e[i].setUnitExp(-k*_distances[i]);
[detail] +      q[i].setUnitExp(-k*_distances[i]);
[detail]      }
[detail] -    p->setOneComponentSteeringVector(&e);
[detail] -    return e;
[detail] +    p->setOneComponentSteeringVector(&q);
[detail] +    return q;
[detail]    }
[detail]  
[detail]    inline void ActiveFKSteering::oneComponentSensorProjections(FKPower * p) const
[detail]    {
[detail] -    Vector<double>& r=p->sensorProjections();
[detail] +    Vector<double>& r=p->sensorRadialProjections();
[detail]      int n=_array->count();
[detail]      for(int i=0; i<n; i++) {
[detail]        double& ri=r[i];
[detail] @@ -69,7 +69,7 @@
[detail]  
[detail]    inline void ActiveFKSteering::twoComponentSensorProjections(FKPower * p) const
[detail]    {
[detail] -    Vector<double>& r=p->sensorProjections();
[detail] +    Vector<double>& r=p->sensorRadialProjections();
[detail]      int n=_array->count();
[detail]      for(int i=0; i<n; i++) {
[detail]        double& ri=r[i];
[detail]                       src/ActiveFKTask.h:  version-4.2.1	not modified
[detail]                src/ActiveFKTaskManager.h:  version-4.2.1	not modified
[detail]                       src/ActiveFKTool.h:  version-4.2.1	not modified
[detail]                    src/ActiveFKToolSet.h:  version-4.2.1	not modified
[detail]                     src/ActiveFKWorker.h:  version-4.2.1	not modified
[detail]                 src/ActiveHRFKRayleigh.h:  version-4.2.1	not modified
[detail]                 src/ActiveHRFKVertical.h:  version-4.2.1	not modified
[detail]                 src/ArrayCrossSpectrum.h:  version-4.2.1	modified out of comments
[detail] --- src/ArrayCrossSpectrum.h-version-4.2.1-stripped	2025-09-28 04:01:17.995565784 +0200
[detail] +++ src/ArrayCrossSpectrum.h-HEAD-stripped	2025-09-28 04:01:17.999565804 +0200
[detail] @@ -5,6 +5,7 @@
[detail]  
[detail]  #include "ArrayCoreDLLExport.h"
[detail]  #include "ArrayTimeWindows.h"
[detail] +#include "ArrayStationSignals.h"
[detail]  
[detail]  namespace ArrayCore {
[detail]  
[detail] @@ -15,7 +16,7 @@
[detail]                         const ArrayParameters * param);
[detail]      virtual ~ArrayCrossSpectrum();
[detail]  
[detail] -    void setTimeWindows(const ArrayTimeWindows * tw) {_timeWindows=tw;}
[detail] +    void setTimeWindows(const ArrayTimeWindows * tw);
[detail]      const ArrayTimeWindows * timeWindows() const {return _timeWindows;}
[detail]  
[detail]      const ArraySelection& array() const {return _array;}
[detail] @@ -28,14 +29,21 @@
[detail]      void addHorizontal() {addHorizontal(*_matrix);}
[detail]      void meanMatrix(int nBlocks);
[detail]  
[detail] -    const ComplexMatrix * matrix() const {return _matrix;}
[detail] -    ComplexMatrix * matrix() {return _matrix;}
[detail] +    const Complex& eastSpectrumValueAt(int index);
[detail] +    const Complex& northSpectrumValueAt(int index);
[detail] +    const Complex& verticalSpectrumValueAt(int index);
[detail] +
[detail] +    const HermitianMatrix * matrix() const {return _matrix;}
[detail] +    HermitianMatrix * matrix() {return _matrix;}
[detail]  
[detail]      bool lockTimeWindow(const TimeRange& win);
[detail]      void unlockTimeWindow();
[detail] +    ArrayStationSignals * station(int index) const {return _stations.at(index);}
[detail]    protected:
[detail] -    void addHorizontal(ComplexMatrix& covmat);
[detail] +    void add(HermitianMatrix& covmat, const Vector<Complex>& sig) const;
[detail] +    void addHorizontal(HermitianMatrix& covmat);
[detail]      void setStations(const ArraySelection * array);
[detail] +    void setInstrumentalResponses();
[detail]  
[detail]      ArraySelection _array;
[detail]      QList<ArrayStationSignals *> _stations;
[detail] @@ -44,7 +52,7 @@
[detail]      ArrayStations::Mode _mode;
[detail]      int _verticalIndex, _northIndex, _eastIndex;
[detail]  
[detail] -    ComplexMatrix * _matrix;
[detail] +    HermitianMatrix * _matrix;
[detail]    };
[detail]  
[detail]  } 
[detail]                    src/ArrayParameters.h:  version-4.2.1	modified out of comments
[detail] --- src/ArrayParameters.h-version-4.2.1-stripped	2025-09-28 04:01:18.019565900 +0200
[detail] +++ src/ArrayParameters.h-HEAD-stripped	2025-09-28 04:01:18.023565919 +0200
[detail] @@ -32,14 +32,16 @@
[detail]      const WindowFunctionParameters& taper() const {return _taper;}
[detail]  
[detail]      double frequencyBandwidth() const {return _frequencyBandwidth;}
[detail] -    void setfrequencyBandwidth(double f) {_frequencyBandwidth=f;}
[detail] +    void setFrequencyBandwidth(double f) {_frequencyBandwidth=f;}
[detail]  
[detail]      double oversamplingFactor() const {return _oversamplingFactor;}
[detail]      void setOversamplingFactor(double f) {_oversamplingFactor=f;}
[detail]  
[detail] +    int normalizeCrossSpectrum() const {return _normalizeCrossSpectrum;}
[detail] +    void setNormalizeCrossSpectrum(bool n) {_normalizeCrossSpectrum=n;}
[detail] +
[detail]      const QString& outputBaseName() const {return _outputBaseName;}
[detail]      void setOutputBaseName(const QString& n) {_outputBaseName=n;}
[detail] -    virtual QString outputName(const QString& groupName) const=0;
[detail]  
[detail]      double selectDurationFactor() const {return _selectDurationFactor;}
[detail]      void setSelectDurationFactor(double f) {_selectDurationFactor=f;}
[detail] @@ -50,6 +52,12 @@
[detail]      double selectArrayRadius() const {return _selectArrayRadius;}
[detail]      void setSelectArrayRadius(double f) {_selectArrayRadius=f;}
[detail]  
[detail] +    double selectArrayDirection() const {return _selectArrayDirection;}
[detail] +    void setSelectArrayDirection(double f) {_selectArrayDirection=f;}
[detail] +
[detail] +    const QString& excludeStationNamePattern() const {return _excludeStationNamePattern;}
[detail] +    void setExcludeStationNamePattern(const QString& p) {_excludeStationNamePattern=p;}
[detail] +
[detail]      double magneticDeclination() const {return _magneticDeclination;}
[detail]      void setMagneticDeclination(double d) {_magneticDeclination=d;}
[detail]  
[detail] @@ -67,6 +75,9 @@
[detail]    protected:
[detail]      int keywordCount(PARAMETERS_KEYWORDCOUNT_ARGS) const;
[detail]      bool setValue(PARAMETERS_SETVALUE_ARGS);
[detail] +
[detail] +    QString arraySelectionToString(PARAMETERS_TOSTRING_ARGS_IMPL) const;
[detail] +    QString magneticDeclinationToString(PARAMETERS_TOSTRING_ARGS_IMPL) const;
[detail]    private:
[detail]      TimeRangeParameters _timeLimits;
[detail]      WindowingParameters _windowing;
[detail] @@ -76,11 +87,14 @@
[detail]      double _selectDurationFactor;
[detail]      QString _selectArrayCenter;
[detail]      double _selectArrayRadius;
[detail] +    double _selectArrayDirection;
[detail] +    QString _excludeStationNamePattern;
[detail]      double _magneticDeclination;
[detail]      double _minimumFrequency;
[detail]      double _maximumFrequency;
[detail]      double _frequencyBandwidth;
[detail]      double _oversamplingFactor;
[detail] +    int _normalizeCrossSpectrum;
[detail]      QString _outputBaseName;
[detail]    };
[detail]  
[detail]                     src/ArraySelection.h:  version-4.2.1	modified out of comments
[detail] --- src/ArraySelection.h-version-4.2.1-stripped	2025-09-28 04:01:18.039565997 +0200
[detail] +++ src/ArraySelection.h-HEAD-stripped	2025-09-28 04:01:18.043566015 +0200
[detail] @@ -13,19 +13,22 @@
[detail]    public:
[detail]      ArraySelection(const ArrayStations * array);
[detail]      ArraySelection(const ArraySelection * array);
[detail] +    ArraySelection(const QList<NamedPoint>& r, bool calcRelativePos=true);
[detail]      ~ArraySelection();
[detail]  
[detail]      const ArrayStations * array() const {return _array;}
[detail]      StationSignals::Components components() const {return _array->components();}
[detail]      ArrayStations::Mode mode() const {return _array->mode();}
[detail] -    double samplingFrequency() const {return _array->samplingFrequency();}
[detail] +    double samplingFrequency(int index) const {return _array->samplingFrequency(index);}
[detail] +    double commonSamplingFrequency() const;
[detail]  
[detail]      int count() const {return _selected.count();}
[detail]      bool isEmpty() const {return _selected.isEmpty();}
[detail]      void clear();
[detail]      QString name(int index) const;
[detail] -    Point2D position(int index) const;
[detail] +    const Point2D& position(int index) const;
[detail]      StationSignals * stationSignals(int index) const;
[detail] +    double radius() const;
[detail]  
[detail]      void select(const Point& src, double minDistance, double maxDistance);
[detail]      void select(VectorList<int> sel);
[detail] @@ -43,6 +46,7 @@
[detail]      const ArraySelection * _parent;
[detail]      VectorList<int> _selected;
[detail]      VectorList<Point2D> _relativePos;
[detail] +    mutable double _commonSamplingFrequency;
[detail]    };
[detail]  
[detail]  } 
[detail]                src/ArrayStationSignals.h:  version-4.2.1	modified out of comments
[detail] --- src/ArrayStationSignals.h-version-4.2.1-stripped	2025-09-28 04:01:18.059566093 +0200
[detail] +++ src/ArrayStationSignals.h-HEAD-stripped	2025-09-28 04:01:18.063566113 +0200
[detail] @@ -10,21 +10,32 @@
[detail]  
[detail]  namespace ArrayCore {
[detail]  
[detail] +  class ArrayTimeWindows;
[detail] +
[detail]    class ARRAYCORE_EXPORT ArrayStationSignals : public StationProcessSignals
[detail]    {
[detail]    public:
[detail]      ArrayStationSignals(const StationSignals * originalSignals);
[detail]      ~ArrayStationSignals();
[detail]  
[detail] -    bool setSpectrumValue(const TimeRange& tw, const AbstractParameters * param,
[detail] -                          const FourierPlan& plan, const TaperDelegate& taper);
[detail] +    void setInstrumentalResponse(const InstrumentalResponse * resp) {_instrumentalResponse=resp;}
[detail] +    void clearInstrumentalResponseValues();
[detail] +
[detail] +    bool setSpectrumValue(const TimeRange& tw, const ArrayParameters * param, const ArrayTimeWindows& win);
[detail] +    bool setWaveforms(const TimeRange &tw, const ArrayTimeWindows& win);
[detail]  
[detail]      inline Complex spectrumValue(int component, int iFreq) const;
[detail]      const Complex& spectrumValue(int component) const {return _spectrumValue[component];}
[detail]  
[detail]      static void showProcessingTime();
[detail]    protected:
[detail] +    void setInstrumentalResponseValue(double frequency);
[detail] +    void setInstrumentalResponseFunction(int nSamples, double samplingFrequency);
[detail] +
[detail]      Complex _spectrumValue[3];
[detail] +    const InstrumentalResponse * _instrumentalResponse;
[detail] +    InstrumentalResponseFunction * _instrumentalResponseFunction;
[detail] +    Complex * _instrumentalResponseValue;
[detail]    };
[detail]  
[detail]    inline Complex ArrayStationSignals::spectrumValue(int component, int iFreq) const
[detail]                      src/ArrayStations.h:  version-4.2.1	modified out of comments
[detail] --- src/ArrayStations.h-version-4.2.1-stripped	2025-09-28 04:01:18.079566190 +0200
[detail] +++ src/ArrayStations.h-HEAD-stripped	2025-09-28 04:01:18.083566209 +0200
[detail] @@ -16,7 +16,7 @@
[detail]      ArrayStations();
[detail]      virtual ~ArrayStations() {}
[detail]  
[detail] -    enum Mode {Vertical, Horizontal, ThreeComponents};
[detail] +    enum Mode {Vertical, Horizontal, ThreeComponents, ThreeComponentsAndStrain};
[detail]  
[detail]      Rect rectangle() const;
[detail]  
[detail] @@ -34,10 +34,10 @@
[detail]      QString toString(char format, int precision) const;
[detail]  
[detail]      virtual Mode mode() const;
[detail] -    virtual double samplingFrequency() const;
[detail] +    virtual double samplingFrequency(int index) const;
[detail]      virtual int count() const;
[detail]      virtual QString name(int index) const;
[detail] -    virtual Point2D position(int index) const;
[detail] +    virtual const Point2D& position(int index) const;
[detail]      virtual StationSignals * stationSignals(int index) const;
[detail]    private:
[detail]      Point2D _reference;
[detail]                          src/ArrayTask.h:  version-4.2.1	not modified
[detail]                   src/ArrayTaskManager.h:  version-4.2.1	modified out of comments
[detail] --- src/ArrayTaskManager.h-version-4.2.1-stripped	2025-09-28 04:01:18.115566364 +0200
[detail] +++ src/ArrayTaskManager.h-HEAD-stripped	2025-09-28 04:01:18.119566383 +0200
[detail] @@ -18,7 +18,7 @@
[detail]    {
[detail]    public:
[detail]      ArrayTaskManager(const ArraySelection * array);
[detail] -    virtual ~ArrayTaskManager();
[detail] +    ~ArrayTaskManager();
[detail]  
[detail]      const ArraySelection& array() const {return _array;}
[detail]  
[detail]                   src/ArrayTimeWindows.h:  version-4.2.1	modified out of comments
[detail] --- src/ArrayTimeWindows.h-version-4.2.1-stripped	2025-09-28 04:01:18.139566479 +0200
[detail] +++ src/ArrayTimeWindows.h-HEAD-stripped	2025-09-28 04:01:18.143566499 +0200
[detail] @@ -5,7 +5,6 @@
[detail]  
[detail]  #include "ArraySelection.h"
[detail]  #include "ArrayParameters.h"
[detail] -#include "ArrayStationSignals.h"
[detail]  #include "ArrayCoreDLLExport.h"
[detail]  
[detail]  namespace ArrayCore {
[detail] @@ -34,6 +33,8 @@
[detail]      const FourierPlan& plan() const {return *_plan;}
[detail]      const TaperDelegate& taper() const {return _taper;}
[detail]      QString toString(int index) const;
[detail] +    const ArrayParameters * parameters() const {return _parameters;}
[detail] +    const SparseKeepSignal * keep() const {return _keep;}
[detail]    private:
[detail]      void initPreprocessing();
[detail]  
[detail]                        src/ArrayWorker.h:  version-4.2.1	modified out of comments
[detail] --- src/ArrayWorker.h-version-4.2.1-stripped	2025-09-28 04:01:18.155566557 +0200
[detail] +++ src/ArrayWorker.h-HEAD-stripped	2025-09-28 04:01:18.159566577 +0200
[detail] @@ -18,6 +18,7 @@
[detail]      ~ArrayWorker();
[detail]  
[detail]      void setTaskManager(ArrayTaskManager * tm) {ParallelTaskWorker::setTaskManager(tm);}
[detail] +    virtual int crossSpectrumMatrixSize() const {return _crossSpectrum->array().count();}
[detail]    protected:
[detail]      inline ArrayTaskManager * taskManager() const;
[detail]  
[detail]                  src/AsyncArrayProcess.h:  version-4.2.1	not modified
[detail]                        src/AsyncFKLoop.h:  version-4.2.1	not modified
[detail]                        src/AsyncFKTool.h:  version-4.2.1	not modified
[detail]                    src/AsyncParameters.h:  version-4.2.1	not modified
[detail]                   src/AsyncStationPair.h:  version-4.2.1	not modified
[detail]           src/BlockAveragingParameters.h:  version-4.2.1	modified out of comments
[detail] --- src/BlockAveragingParameters.h-version-4.2.1-stripped	2025-09-28 04:01:18.247567001 +0200
[detail] +++ src/BlockAveragingParameters.h-HEAD-stripped	2025-09-28 04:01:18.251567021 +0200
[detail] @@ -19,7 +19,7 @@
[detail]      bool blockOverlap() const {return _overlap;}
[detail]      void setBlockOverlap(bool o) {_overlap=o;}
[detail]  
[detail] -    int count(int stationCount) const;
[detail] +    int count(int matrixSize) const;
[detail]      int count() const {return _count;}
[detail]      void setCount(int n) {_count=n;}
[detail]  
[detail] @@ -33,8 +33,9 @@
[detail]      void setStatisticMaxOverlap(double n);
[detail]  
[detail]      int increment(const TimeRangeList& winList, const VectorList<int>& blocks) const;
[detail] -    VectorList<int> list(int firstWindowIndex, int stationCount,
[detail] -                      const TimeRangeList& winList) const;
[detail] +    VectorList<int> list(int firstWindowIndex, int matrixSize,
[detail] +                      const TimeRangeList& winList,
[detail] +                      double timePrecision) const;
[detail]  
[detail]      QString toString(PARAMETERS_TOSTRING_ARGS_DECL) const;
[detail]      void collectKeywords(PARAMETERS_COLLECTKEYWORDS_ARGS);
[detail]              src/ConvEllipticityEngine.h:  version-4.2.1	not modified
[detail]                       src/ConvFKRadial.h:  version-4.2.1	modified out of comments
[detail] --- src/ConvFKRadial.h-version-4.2.1-stripped	2025-09-28 04:01:18.287567194 +0200
[detail] +++ src/ConvFKRadial.h-HEAD-stripped	2025-09-28 04:01:18.287567194 +0200
[detail] @@ -20,7 +20,7 @@
[detail]      void meanCrossSpectrum(int nBlocks);
[detail]      void addIncoherentNoise(double horizontal, double);
[detail]  
[detail] -    const ComplexMatrix * crossSpectrum() const;
[detail] +    const HermitianMatrix * crossSpectrum() const;
[detail]      double value(const Vector<int>& index) const;
[detail]      double value(Vector<double>& k) const;
[detail]    };
[detail]                     src/ConvFKRayleigh.h:  version-4.2.1	modified out of comments
[detail] --- src/ConvFKRayleigh.h-version-4.2.1-stripped	2025-09-28 04:01:18.307567292 +0200
[detail] +++ src/ConvFKRayleigh.h-HEAD-stripped	2025-09-28 04:01:18.307567292 +0200
[detail] @@ -13,6 +13,7 @@
[detail]    public:
[detail]      ConvFKRayleigh(FKCache * cache);
[detail]  
[detail] +    int matrixSize(int stationCount) const {return 2*stationCount;}
[detail]      void initialize(const FKParameters& param);
[detail]      FunctionSearch * createSearch(const FKParameters& param);
[detail]  
[detail] @@ -21,7 +22,7 @@
[detail]      void meanCrossSpectrum(int nBlocks);
[detail]      void addIncoherentNoise(double horizontal, double vertical);
[detail]  
[detail] -    const ComplexMatrix * crossSpectrum() const;
[detail] +    const HermitianMatrix * crossSpectrum() const;
[detail]  
[detail]      FK_PASSIVE_STEERING
[detail]    };
[detail]                  src/ConvFKRayleighAll.h:  version-4.2.1	not modified
[detail]               src/ConvFKRayleighRadial.h:  version-4.2.1	not modified
[detail]             src/ConvFKRayleighVertical.h:  version-4.2.1	not modified
[detail]                   src/ConvFKTransverse.h:  version-4.2.1	not modified
[detail]                     src/ConvFKVertical.h:  version-4.2.1	not modified
[detail]       src/ConvThreeComponentXiFunction.h:  version-4.2.1	not modified
[detail]                     src/CorrParameters.h:  version-4.2.1	no last version available
[detail]                 src/CorrStationSignals.h:  version-4.2.1	no last version available
[detail]                           src/CorrTask.h:  version-4.2.1	no last version available
[detail]                    src/CorrTaskManager.h:  version-4.2.1	no last version available
[detail]                           src/CorrTool.h:  version-4.2.1	no last version available
[detail]                         src/CorrWorker.h:  version-4.2.1	no last version available
[detail]                      src/CrossSpectrum.h:  version-4.2.1	not modified
[detail]   src/CrossSpectrumAnchorMatchFunction.h:  version-4.2.1	no last version available
[detail]         src/CrossSpectrumMatchFunction.h:  version-4.2.1	no last version available
[detail]      src/CrossSpectrumMatchTaskManager.h:  version-4.2.1	no last version available
[detail]           src/CrossSpectrumMatchWorker.h:  version-4.2.1	no last version available
[detail]         src/DistinctWavenumbersOneMode.h:  version-4.2.1	no last version available
[detail]                     src/ESACStatistics.h:  version-4.2.1	not modified
[detail]                            src/FKCache.h:  version-4.2.1	modified out of comments
[detail] --- src/FKCache.h-version-4.2.1-stripped	2025-09-28 04:01:18.511568277 +0200
[detail] +++ src/FKCache.h-HEAD-stripped	2025-09-28 04:01:18.515568297 +0200
[detail] @@ -21,7 +21,9 @@
[detail]  
[detail]      const ArraySelection * array() const {return _array;}
[detail]  
[detail] +    void clearSteering();
[detail]      void setPassiveSteering();
[detail] +    void setPassiveVelocityStrainRateSteering();
[detail]      FKSteering * passiveSteering() const {return _passiveSteering;}
[detail]  
[detail]      inline double arrayPatternSecondDerivativeAtOrigin(const Vector<double>& k) const;
[detail]                    src/FKCrossSpectrum.h:  version-4.2.1	modified out of comments
[detail] --- src/FKCrossSpectrum.h-version-4.2.1-stripped	2025-09-28 04:01:18.531568375 +0200
[detail] +++ src/FKCrossSpectrum.h-HEAD-stripped	2025-09-28 04:01:18.535568393 +0200
[detail] @@ -33,7 +33,9 @@
[detail]      void resize();
[detail]      void resetRotatedMatrices();
[detail]  
[detail] +    virtual void addThreeComponent();
[detail]      virtual void addThreeComponent(const Complex * sensorRotations);
[detail] +    virtual void addVelocityStrainRate(const Complex * sensorRotations);
[detail]      
[detail]      
[detail]      
[detail] @@ -45,24 +47,26 @@
[detail]      virtual void addActiveTransverse(const ActiveFKSteering& geom);
[detail]      virtual void addActiveThreeComponent(const ActiveFKSteering& geom);
[detail]      void addRayleighSingle();
[detail] +    void setVerticalSpectra(Vector<Complex>& s);
[detail] +    void setThreeComponentSpectra(Vector<Complex>& s);
[detail]  
[detail]      void meanRotatedMatrices(int nBlocks);
[detail]      void meanRayleighSingle();
[detail]  
[detail]      bool invert();
[detail]      bool invertRotatedMatrices();
[detail] -    bool invert(ComplexMatrix& covmat);
[detail] +    bool invert(HermitianMatrix& covmat);
[detail]  
[detail] -    inline const ComplexMatrix * rotatedMatrix(const Vector<double>& k) const;
[detail] -    inline const ComplexMatrix * rotatedMatrix(const Vector<int>& index) const;
[detail] -    inline ComplexMatrix * rotatedMatrix(int rotationIndex);
[detail] -
[detail] -    inline const ComplexMatrix * rotatedRadialMatrix(const Vector<double>& k) const;
[detail] -    const ComplexMatrix * verticalMatrix() const {return _verticalMatrix;}
[detail] +    inline const HermitianMatrix * rotatedMatrix(const Vector<double>& k) const;
[detail] +    inline const HermitianMatrix * rotatedMatrix(const Vector<int>& index) const;
[detail] +    inline HermitianMatrix * rotatedMatrix(int rotationIndex);
[detail] +    virtual int velocityStrainRateMatrixSize() const;
[detail] +    virtual double * horizontalStrainOrientations() const;
[detail]  
[detail]      bool setMask();
[detail]    protected:
[detail]      bool selectStations(const Point& src);
[detail] +    void setHorizontalStrainOrientations(const QList<int>& fiberNodes, double * orientations) const;
[detail]  
[detail]      virtual void addRotatedRadial(int rotationIndex, const Complex * sensorRotations);
[detail]      virtual void addRotatedTransverse(int rotationIndex, const Complex * sensorRotations);
[detail] @@ -70,10 +74,7 @@
[detail]  
[detail]      inline int rotationIndex(double kx, double ky) const;
[detail]  
[detail] -    ComplexMatrix * _rotatedMatrices;
[detail] -    ComplexMatrix * _rotatedRadialMatrices;
[detail] -    ComplexMatrix * _verticalMatrix;
[detail] -    ComplexMatrix * _horizontalMatrix;
[detail] +    HermitianMatrix * _rotatedMatrices;
[detail]  
[detail]      int _rotateStepCount;
[detail]      double _rotateStep, _invRotateStep;
[detail] @@ -105,26 +106,21 @@
[detail]      }
[detail]    }
[detail]  
[detail] -  inline const ComplexMatrix * FKCrossSpectrum::rotatedMatrix(const Vector<int>& index) const
[detail] +  inline const HermitianMatrix * FKCrossSpectrum::rotatedMatrix(const Vector<int>& index) const
[detail]    {
[detail]      return _rotatedMatrices+rotationIndex(index[0], index[1]);
[detail]    }
[detail]  
[detail] -  inline const ComplexMatrix * FKCrossSpectrum::rotatedMatrix(const Vector<double>& k) const
[detail] +  inline const HermitianMatrix * FKCrossSpectrum::rotatedMatrix(const Vector<double>& k) const
[detail]    {
[detail]      return _rotatedMatrices+rotationIndex(k[0], k[1]);
[detail]    }
[detail]  
[detail] -  inline ComplexMatrix * FKCrossSpectrum::rotatedMatrix(int rotationIndex)
[detail] +  inline HermitianMatrix * FKCrossSpectrum::rotatedMatrix(int rotationIndex)
[detail]    {
[detail]      return _rotatedMatrices+rotationIndex;
[detail]    }
[detail]  
[detail] -  inline const ComplexMatrix * FKCrossSpectrum::rotatedRadialMatrix(const Vector<double>& k) const
[detail] -  {
[detail] -    return _rotatedRadialMatrices+rotationIndex(k[0], k[1]);
[detail] -  }
[detail] -
[detail]  } 
[detail]  
[detail]  #endif 
[detail]                     src/FKFunctionPlot.h:  version-4.2.1	modified out of comments
[detail] --- src/FKFunctionPlot.h-version-4.2.1-stripped	2025-09-28 04:01:18.551568471 +0200
[detail] +++ src/FKFunctionPlot.h-HEAD-stripped	2025-09-28 04:01:18.555568490 +0200
[detail] @@ -12,26 +12,41 @@
[detail]    class ARRAYCORE_EXPORT FKFunctionPlot : public FunctionPlot
[detail]    {
[detail]    public:
[detail] -    FKFunctionPlot(AbstractFKFunction * f=nullptr);
[detail] +    FKFunctionPlot(int xSize, AbstractFKFunction * f=nullptr);
[detail]      ~FKFunctionPlot();
[detail]  
[detail]      enum Mode {BeamPower, InverseBeamPower,
[detail]                 Ellipticity, FixedEllipticity,
[detail]                 GradientDirection, Concavity, StepDirection,
[detail] -               CrossSpectralMatrix
[detail] +               CrossSpectralMatrix, SensorOrientation,
[detail] +               LocalSourceVelocity, LocalSourceBeamPower
[detail]                };
[detail]  
[detail]      void setMode(Mode m) {_mode=m;}
[detail]      Mode mode() const {return _mode;}
[detail]  
[detail]      void setFixedEllipticity(double xi) {_x[2]=xi;}
[detail] +    void setStationIndex(int i) {_stationIndex=i;}
[detail]  
[detail] -    void setFunction(AbstractFKFunction * f) {FunctionPlot::setFunction(f);}
[detail] +    void setFunction(AbstractFKFunction * f);
[detail]      inline AbstractFKFunction * function() const;
[detail]  
[detail] +    void setFrequency(double f) {_frequency=f;}
[detail] +    double frequency() const {return _frequency;}
[detail] +
[detail] +    void setPolarCoordinates() {_polarCoordinates=true;}
[detail] +    void setCartesianCoordinates() {_polarCoordinates=false;}
[detail] +    bool isPolarCoordinates() const {return _polarCoordinates;}
[detail] +
[detail] +    void setArray(const ArraySelection * a) {_array=a;}
[detail] +
[detail]      double value(double x, double y) const;
[detail]    private:
[detail]      Mode _mode;
[detail] +    bool _polarCoordinates;
[detail] +    int _stationIndex;
[detail] +    double _frequency;
[detail] +    const ArraySelection * _array;
[detail]    };
[detail]  
[detail]    inline AbstractFKFunction * FKFunctionPlot::function() const
[detail]                   src/FKGradientSearch.h:  version-4.2.1	modified out of comments
[detail] --- src/FKGradientSearch.h-version-4.2.1-stripped	2025-09-28 04:01:18.575568586 +0200
[detail] +++ src/FKGradientSearch.h-HEAD-stripped	2025-09-28 04:01:18.579568606 +0200
[detail] @@ -7,45 +7,22 @@
[detail]  #include "ArrayCoreDLLExport.h"
[detail]  
[detail]  namespace ArrayCore {
[detail] -#if 0
[detail] -  class ARRAYCORE_EXPORT FKGradientSearch : public FKGridSearch
[detail] +
[detail] +  class ARRAYCORE_EXPORT FKGradientSearch : public NewtonOptimizationND
[detail]    {
[detail]    public:
[detail] -    FKGradientSearch();
[detail] +    FKGradientSearch(size_t dimensionCount=2);
[detail]      ~FKGradientSearch();
[detail]  
[detail] -    void setScales(const Point& scales);
[detail] -    void setGrid(const Point& gridSize);
[detail] -    void localMax(int nMax, double absThres, double relThres);
[detail] +    bool setGrid(double step, double size);
[detail] +    void localMax(int nMax, double absThres=0.0, double relThres=0.0);
[detail]  
[detail]    private:
[detail] -    struct State {
[detail] -      int i;
[detail] -      Point p;
[detail] -      Point dp;
[detail] -      FKPower fkp;
[detail] -    };
[detail] -    State _s1, _s2;
[detail] -    FKPower _refinep;
[detail] -
[detail] -    
[detail] -    
[detail] -
[detail] -    
[detail] -    void freeClimbing(Point p, double step, const Point& p0);
[detail] -    void refineMax(Point p, Point px);
[detail] -
[detail] -    Point _scaledToReal, _realToScaled;
[detail] -    Matrix3x3 _hessianScaledToReal;
[detail] -    bool * _visited;
[detail] -    int * _searchGridIndexList;
[detail] -    int _searchGridCount;
[detail] -    Point _gridSize;
[detail] -    double _cacheGridStep, _invCacheGridStep, _climbStep, _minStep, _maxClimb;
[detail] -
[detail] +    double refineMax(double val);
[detail]      
[detail] +    double _kStep, _kMax;
[detail]    };
[detail] -#endif
[detail] +
[detail]  } 
[detail]  
[detail]  #endif 
[detail]                       src/FKParameters.h:  version-4.2.1	modified out of comments
[detail] --- src/FKParameters.h-version-4.2.1-stripped	2025-09-28 04:01:18.595568683 +0200
[detail] +++ src/FKParameters.h-HEAD-stripped	2025-09-28 04:01:18.599568702 +0200
[detail] @@ -35,8 +35,17 @@
[detail]                        ARDS,
[detail]                        LDS3,
[detail]                        LDS2,
[detail] -                      SensorOrientation,
[detail] +                      ARDSSensorOrientation,
[detail]  
[detail] +                      LocalSourceVertical,
[detail] +
[detail] +                      VelocityStrainRateRayleigh,
[detail] +                      VelocityStrainRateLove,
[detail] +
[detail] +                      SpectrumMatch,
[detail] +                      CrossSpectrumMatch,
[detail] +                      PlaneWaveInversion,
[detail] +                      FullSpectrumOneMode,
[detail]                        ActiveConventional,
[detail]                        ActiveCapon,
[detail]                        ActiveConventionalRayleigh,
[detail] @@ -73,6 +82,9 @@
[detail]      double effectiveGridSize() const;
[detail]      double effectiveGridSize(double frequency) const;
[detail]  
[detail] +    double sourceMapStep(double aperture) const;
[detail] +    double sourceMapSize(double aperture) const;
[detail] +
[detail]      double kmin() const {return _kmin;}
[detail]      void setKmin(double k);
[detail]  
[detail] @@ -105,6 +117,7 @@
[detail]      void setEllipticityAbsolutePrecision(double p) {_ellipticityAbsolutePrecision=p;}
[detail]  
[detail]      int maximumPeakCount(int sensorCount) const;
[detail] +    int maximumPeakCount() const {return _maxPeakCount;}
[detail]      void setMaximumPeakCount(int m) {_maxPeakCount=m;}
[detail]  
[detail]      void setMaximumPeakCountFactor(double f) {_maxPeakCountFactor=f;}
[detail] @@ -162,8 +175,11 @@
[detail]      int sensorOrientationMaximumIterations() const {return _sensorOrientationMaximumIterations;}
[detail]      void setSensorOrientationMaximumIterations(int n) {_sensorOrientationMaximumIterations=n;}
[detail]  
[detail] -    int brightSpots() const {return _brightSpots;}
[detail] -    void setBrightSpots(int n) {_brightSpots=n;}
[detail] +    int brightSpotCount() const {return _brightSpotCount;}
[detail] +    void setBrightSpotCount(int n) {_brightSpotCount=n;}
[detail] +
[detail] +    double brightSpotDamping() const {return _brightSpotDamping;}
[detail] +    void setBrightSpotDamping(double d) {_brightSpotDamping=d;}
[detail]  
[detail]      double minimumDistance() const {return _minimumDistance;}
[detail]      void setMinimumDistance(double m) {_minimumDistance=m;}
[detail] @@ -177,14 +193,80 @@
[detail]      double sourceGridSize() const {return _sourceGridSize;}
[detail]      void setSourceGridSize(double s) {_sourceGridSize=s;}
[detail]  
[detail] -    virtual QString toString(PARAMETERS_TOSTRING_ARGS_DECL) const;
[detail] -    virtual void collectKeywords(PARAMETERS_COLLECTKEYWORDS_ARGS);
[detail] +    double localSourceStepFactor() const {return _localSourceStepFactor;}
[detail] +    void setLocalSourceStepFactor(double f) {_localSourceStepFactor=f;}
[detail] +
[detail] +    double localSourceSizeFactor() const {return _localSourceSizeFactor;}
[detail] +    void setLocalSourceSizeFactor(double f) {_localSourceSizeFactor=f;}
[detail] +
[detail] +    int startingPositionSeed() const {return _startingPositionSeed;}
[detail] +    void setStartingPositionSeed(int s) {_startingPositionSeed=s;}
[detail] +
[detail] +    int maximumNumberOfIterations() const {return _maximumIterations;}
[detail] +    void setMaximumNumberOfIterations(int n) {_maximumIterations=n;}
[detail] +
[detail] +    double minimumAmplitudeFactor() const {return _minimumAmplitudeFactor;}
[detail] +    void setMinimumAmplitudeFactor(double f) {_minimumAmplitudeFactor=f;}
[detail] +
[detail] +    double maximumAmplitudeFactor() const {return _maximumAmplitudeFactor;}
[detail] +    void setMaximumAmplitudeFactor(double f) {_maximumAmplitudeFactor=f;}
[detail] +
[detail] +    int numberOfRayleighSources() const {return _nRayleighSources;}
[detail] +    void setNumberOfRayleighSources(int n) {_nRayleighSources=n;}
[detail] +
[detail] +    int numberOfLoveSources() const {return _nLoveSources;}
[detail] +    void setNumberOfLoveSources(int n) {_nLoveSources=n;}
[detail] +
[detail] +    int numberOfRayleighModes() const {return _nRayleighModes;}
[detail] +    void setNumberOfRayleighModes(int n) {_nRayleighModes=n;}
[detail] +
[detail] +    int numberOfLoveModes() const {return _nLoveModes;}
[detail] +    void setNumberOfLoveModes(int n) {_nLoveModes=n;}
[detail] +
[detail] +    double ellipticityMaximumStep() const {return _ellipticityMaximumStep;}
[detail] +    void setEllipticityMaximumStep(double s) {_ellipticityMaximumStep=s;}
[detail] +
[detail] +    double wavenumberMaximumStep() const {return _wavenumberMaximumStep;}
[detail] +    void setWavenumberMaximumStep(double s) {_wavenumberMaximumStep=s;}
[detail] +
[detail] +    double directionMaximumStep() const {return _directionMaximumStep;}
[detail] +    void setDirectionMaximumStep(double s) {_directionMaximumStep=s;}
[detail] +
[detail] +    double distanceMaximumStep() const {return _distanceMaximumStep;}
[detail] +    void setDistanceMaximumStep(double s) {_distanceMaximumStep=s;}
[detail] +
[detail] +    double amplitudeMaximumStep() const {return _amplitudeMaximumStep;}
[detail] +    void setAmplitudeMaximumStep(double s) {_amplitudeMaximumStep=s;}
[detail] +
[detail] +    double phaseMaximumStep() const {return _phaseMaximumStep;}
[detail] +    void setPhaseMaximumStep(double s) {_phaseMaximumStep=s;}
[detail] +
[detail] +    double ellipticityPrecision() const {return _ellipticityPrecision;}
[detail] +    void setEllipticityPrecision(double p) {_ellipticityPrecision=p;}
[detail] +
[detail] +    double wavenumberPrecision() const {return _wavenumberPrecision;}
[detail] +    void setWavenumberPrecision(double p) {_wavenumberPrecision=p;}
[detail] +
[detail] +    double directionPrecision() const {return _directionPrecision;}
[detail] +    void setDirectionPrecision(double p) {_directionPrecision=p;}
[detail] +
[detail] +    double distancePrecision() const {return _distancePrecision;}
[detail] +    void setDistancePrecision(double p) {_distancePrecision=p;}
[detail] +
[detail] +    double amplitudePrecision() const {return _amplitudePrecision;}
[detail] +    void setAmplitudePrecisionp(double p) {_amplitudePrecision=p;}
[detail] +
[detail] +    double phasePrecision() const {return _phasePrecision;}
[detail] +    void setPhasePrecision(double p) {_phasePrecision=p;}
[detail]  
[detail]      void setDefaultValues(ArrayStations::Mode m);
[detail]      void setDefaultValues();
[detail]      static double defaultGridStepFactor(ProcessType p, InversionMethod m);
[detail]  
[detail]      QString outputName(const QString& groupName) const;
[detail] +
[detail] +    QString toString(PARAMETERS_TOSTRING_ARGS_DECL) const;
[detail] +    void collectKeywords(PARAMETERS_COLLECTKEYWORDS_ARGS);
[detail]    protected:
[detail]      int keywordCount(PARAMETERS_KEYWORDCOUNT_ARGS) const;
[detail]      bool setValue(PARAMETERS_SETVALUE_ARGS);
[detail] @@ -219,7 +301,18 @@
[detail]      double _sensorOrientationMaximumRadius;
[detail]      double _sensorOrientationMaximumCorrection;
[detail]      int _sensorOrientationMaximumIterations;
[detail] -    int _brightSpots;
[detail] +    int _brightSpotCount;
[detail] +    double _brightSpotDamping;
[detail] +    double _localSourceStepFactor, _localSourceSizeFactor;
[detail] +    int _maximumIterations;
[detail] +    int _startingPositionSeed;
[detail] +    double _minimumAmplitudeFactor, _maximumAmplitudeFactor;
[detail] +    int _nRayleighSources, _nLoveSources;
[detail] +    int _nRayleighModes, _nLoveModes;
[detail] +    double _ellipticityMaximumStep, _wavenumberMaximumStep, _directionMaximumStep,
[detail] +        _distanceMaximumStep, _amplitudeMaximumStep, _phaseMaximumStep;
[detail] +    double _ellipticityPrecision, _wavenumberPrecision, _directionPrecision,
[detail] +        _distancePrecision, _amplitudePrecision, _phasePrecision;
[detail]    };
[detail]  
[detail]    inline bool FKParameters::isRefine() const
[detail] @@ -241,12 +334,19 @@
[detail]    case FKParameters::ARTBF: \
[detail]    case FKParameters::RTBFFixedEll: \
[detail]    case FKParameters::ARDS: \
[detail] -  case FKParameters::SensorOrientation: \
[detail] +  case FKParameters::ARDSSensorOrientation: \
[detail]    case FKParameters::RDSSingle: \
[detail] +  case FKParameters::VelocityStrainRateRayleigh: \
[detail] +  case FKParameters::VelocityStrainRateLove: \
[detail]    case FKParameters::PoggiVertical: \
[detail]    case FKParameters::PoggiRadial: \
[detail]    case FKParameters::LDS2: \
[detail] -  case FKParameters::LDS3:
[detail] +  case FKParameters::LDS3: \
[detail] +  case FKParameters::LocalSourceVertical: \
[detail] +  case FKParameters::SpectrumMatch: \
[detail] +  case FKParameters::CrossSpectrumMatch: \
[detail] +  case FKParameters::PlaneWaveInversion: \
[detail] +  case FKParameters::FullSpectrumOneMode:
[detail]  
[detail]  #define FKPARAMETERS_ACTIVE_PROCESS_TYPES \
[detail]    case FKParameters::ActiveConventional: \
[detail]                            src/FKPeaks.h:  version-4.2.1	not modified
[detail]                            src/FKPower.h:  version-4.2.1	modified out of comments
[detail] --- src/FKPower.h-version-4.2.1-stripped	2025-09-28 04:01:18.627568837 +0200
[detail] +++ src/FKPower.h-HEAD-stripped	2025-09-28 04:01:18.631568857 +0200
[detail] @@ -14,41 +14,60 @@
[detail]    class ARRAYCORE_EXPORT FKPower
[detail]    {
[detail]    public:
[detail] -    FKPower(int stationCount, int matrixSizeFactor);
[detail] +    FKPower(int stationCount, int matrixSize);
[detail]      ~FKPower();
[detail]  
[detail] -    void setCrossSpectrum(const ComplexMatrix * f) {_f=f;}
[detail] -    const ComplexMatrix * crossSpectrum() const {return _f;}
[detail] +    void setCrossSpectrum(const HermitianMatrix * f) {_f=f;}
[detail] +    const HermitianMatrix * crossSpectrum() const {return _f;}
[detail] +
[detail] +    int stationCount() const {return _qValue.size();}
[detail]  
[detail]      void setOneComponentSteeringVector(const Vector<Complex> * q) {_q=q;}
[detail]      const Vector<Complex>& oneComponentSteeringVector() {return *_q;}
[detail]  
[detail] -    int stationCount() const {return _eGrid.count();}
[detail] +    Vector<Complex>& oneComponentSteeringVectorGrid() {return _qGrid;}
[detail] +    Vector<Complex>& oneComponentSteeringVectorValue() {return _qValue;}
[detail] +
[detail]      Vector<Complex>& steeringVector() {return _e;}
[detail]      Vector<Complex>& ellipticitySteeringVector() {return _exi;}
[detail]      Vector<Complex>& ellipticityDerivativeSteeringVector() {return _edxi;}
[detail] -    Vector<Complex>& steeringVectorGrid() {return _eGrid;}
[detail]      const Vector<Complex>& fe() const {return _fe;}
[detail] -    Vector<double>& sensorProjections() {return _r;}
[detail] +    Vector<double>& sensorRadialProjections() {return _rr;}
[detail] +    Vector<double>& sensorTransverseProjections() {return _rt;}
[detail] +    Vector<double>& sensorProjectionsGrid() {return _rGrid;}
[detail]      double factorN() const {return _factorN;}
[detail]  
[detail] +    inline void setCartesianWavenumber(const Vector<double>& k);
[detail] +    inline void setPolarWavenumber(const Vector<double>& k);
[detail] +    double absoluteWavenumber() const {return _kAbs;}
[detail] +    double wavenumberDirection() const {return atan2(_kScalarProduct.im(), -_kScalarProduct.re());}
[detail] +    const Complex& wavenumberScalarProduct() const {return _kScalarProduct;}
[detail] +    const Complex& radialWavenumberRotation() const {return _kRadialRotation;}
[detail] +    const Complex& transverseWavenumberRotation() const {return _kTransverseRotation;}
[detail] +    const Complex& radialWavenumberProjection() const {return _kRadialProjection;}
[detail] +    const Complex& transverseWavenumberProjection() const {return _kTransverseProjection;}
[detail] +
[detail]      inline Complex steering(const Vector<Complex>& e);
[detail]      inline void setConventionalValue(const Vector<Complex>& e);
[detail]      inline void setHighResolutionValue(const Vector<Complex>& e);
[detail]      inline void setRayleighTwoComponentValue(double ell, const Vector<Complex>& e);
[detail]      inline void setRayleighThreeComponentValue(double ell, const Vector<Complex>& e);
[detail]  
[detail] -    inline double ellipticityGradient(const Vector<Complex>& de) const;
[detail] -    inline double orientationGradient(const ComplexMatrix& df);
[detail] +    inline double gradient(const Vector<Complex>& de) const;
[detail] +    inline double gradient(const SparseVector<Complex>& de) const;
[detail]  
[detail]      inline double conventionalKRadialFirstDerivative(const Vector<Complex>& e);
[detail]      inline double conventionalKRadialSecondDerivative();
[detail]  
[detail]      inline double highResolutionKRadialFirstDerivative(const Vector<Complex>& e);
[detail] -    double highResolutionKRadialFirstDerivative() const {return _dp;}
[detail] +    double highResolutionKRadialFirstDerivative() const {return _dpr;}
[detail] +    inline double highResolutionKTransverseFirstDerivative(const Vector<Complex>& e);
[detail] +    double highResolutionKTransverseFirstDerivative() const {return _dpt;}
[detail]      inline double highResolutionKRadialSecondDerivative();
[detail] +    inline double highResolutionKTransverseSecondDerivative();
[detail] +    inline double highResolutionKRadialTransverseSecondDerivative();
[detail]      inline double xiSecondDerivative();
[detail] -    
[detail] +    inline double xiSecondDerivative(const Vector<Complex>& de);
[detail]  
[detail]      double value() const {return _p.re();}
[detail]      void setValue(double p) {_p=p;}
[detail] @@ -54,28 +73,63 @@
[detail]      void setValue(double p) {_p=p;}
[detail]      double value2() const {return _p2;}
[detail]      
[detail] -    
[detail] -    
[detail] -    
[detail] -
[detail]      QString toString(char format='g', int precision=6) const;
[detail]      void toOctaveFile(const QString& fileName) const;
[detail]    private:
[detail] -    const ComplexMatrix * _f;
[detail] -    PrivateVector<Complex> _fe, _ddfe, _e, _exi, _edxi, _re, _re2;
[detail] -    PrivateVector<double> _r;
[detail] +    inline void setAllWavenumbers();
[detail] +
[detail] +    int _matrixSize;
[detail] +    const HermitianMatrix * _f;
[detail] +    PrivateVector<Complex> _fe, _ddrfe, _ddtfe, _e, _exi, _edxi, _rre, _rte, _re2;
[detail] +    PrivateVector<double> _rr, _rt;
[detail] +    Vector<double> _rGrid;
[detail] +
[detail]      const Vector<Complex> * _q;
[detail] -    Vector<Complex> _eGrid;
[detail] +    PrivateVector<Complex> _qValue;
[detail] +    Vector<Complex> _qGrid;
[detail] +
[detail]      Complex _p;
[detail] -    double _p2, _dp, _factorN;
[detail] +    double _p2, _dpr, _dpt, _factorN, _kAbs;
[detail] +    Complex _kScalarProduct, _kRadialRotation, _kTransverseRotation, _kRadialProjection, _kTransverseProjection;
[detail]    };
[detail]  
[detail]    inline Complex FKPower::steering(const Vector<Complex>& e)
[detail]    {
[detail] -    _fe.multiply(*_f, e);
[detail] +    _f->multiply(e, _fe);
[detail]      return _fe.scalarProductConjugate(e);
[detail]    }
[detail]  
[detail] +  inline void FKPower::setAllWavenumbers()
[detail] +  {
[detail] +    if(_kAbs>0.0) {
[detail] +      
[detail] +      _kRadialRotation=_kScalarProduct/_kAbs;
[detail] +      
[detail] +      _kTransverseRotation=_kRadialRotation;
[detail] +      _kTransverseRotation.imaginaryMultiply();
[detail] +    } else {
[detail] +      _kRadialRotation=Complex(1.0, 0.0);
[detail] +      _kTransverseRotation=_kRadialRotation;
[detail] +    }
[detail] +    _kScalarProduct.setRe(-_kScalarProduct.re());
[detail] +    _kRadialProjection=Complex(_kRadialRotation.re(), -_kRadialRotation.im());
[detail] +    _kTransverseProjection=Complex(-_kRadialRotation.im(), -_kRadialRotation.re());
[detail] +  }
[detail] +
[detail] +  inline void FKPower::setCartesianWavenumber(const Vector<double>& k)
[detail] +  {
[detail] +    _kScalarProduct=Complex(k[0], k[1]);
[detail] +    _kAbs=_kScalarProduct.abs();
[detail] +    setAllWavenumbers();
[detail] +  }
[detail] +
[detail] +  inline void FKPower::setPolarWavenumber(const Vector<double>& k)
[detail] +  {
[detail] +    _kAbs=k[0];
[detail] +    _kScalarProduct.setExp(_kAbs, k[1]);
[detail] +    setAllWavenumbers();
[detail] +  }
[detail] +
[detail]    inline void FKPower::setHighResolutionValue(const Vector<Complex>& e)
[detail]    {
[detail]      _p=steering(e);
[detail] @@ -109,64 +163,94 @@
[detail]    {
[detail]      setHighResolutionValue(e);
[detail]      double ps=pow(_p.re(), 1.5)*ell*ell;
[detail] -    
[detail]      _p=ps;
[detail]    }
[detail]  
[detail]    inline double FKPower::conventionalKRadialFirstDerivative(const Vector<Complex>& e)
[detail]    {
[detail] -    _re.dotMultiply(_r, e);
[detail] -    _dp=-2.0*_factorN*_fe.scalarProductConjugate(_re).im();
[detail] -    return _dp;
[detail] +    _rre.dotMultiply(_rr, e);
[detail] +    _dpr=-2.0*_factorN*_fe.scalarProductConjugate(_rre).im();
[detail] +    return _dpr;
[detail]    }
[detail]  
[detail]    inline double FKPower::conventionalKRadialSecondDerivative()
[detail]    {
[detail] -    _re2.dotMultiply(_r, _re);
[detail] +    _re2.dotMultiply(_rr, _rre);
[detail]      double dp2=_fe.scalarProductConjugate(_re2).re();
[detail] -    _fe.multiply(*_f, _re);
[detail] -    dp2-=_fe.scalarProductConjugate(_re).re();
[detail] +    _f->multiply(_rre, _fe);
[detail] +    dp2-=_fe.scalarProductConjugate(_rre).re();
[detail]      return -2.0*_factorN*dp2;
[detail]    }
[detail]  
[detail]    inline double FKPower::highResolutionKRadialFirstDerivative(const Vector<Complex>& e)
[detail]    {
[detail]      _p2=2.0*_p.re()*_p.re();
[detail] -    _re.dotMultiply(_r, e);
[detail] -    _dp=_p2*_fe.scalarProductConjugate(_re).im();
[detail] -    return _dp;
[detail] +    _rre.dotMultiply(_rr, e);
[detail] +    _dpr=_p2*_fe.scalarProductConjugate(_rre).im();
[detail] +    return _dpr;
[detail] +  }
[detail] +
[detail] +  inline double FKPower::highResolutionKTransverseFirstDerivative(const Vector<Complex>& e)
[detail] +  {
[detail] +    _rte.dotMultiply(_rt, e);
[detail] +    _dpt=_kAbs*_p2*_fe.scalarProductConjugate(_rte).im();
[detail] +    return _dpt;
[detail]    }
[detail]  
[detail]    inline double FKPower::highResolutionKRadialSecondDerivative()
[detail]    {
[detail] -    double dp2=2.0*_dp*_dp/_p.re();
[detail] -    _re2.dotMultiply(_r, _re);
[detail] +    double dp2=2.0*_dpr*_dpr/_p.re();
[detail] +    _re2.dotMultiply(_rr, _rre);
[detail]      dp2+=_p2*_fe.scalarProductConjugate(_re2).re();
[detail] -    _ddfe.multiply(*_f, _re);
[detail] -    dp2-=_p2*_ddfe.scalarProductConjugate(_re).re();
[detail] +    _f->multiply(_rre, _ddrfe);
[detail] +    dp2-=_p2*_ddrfe.scalarProductConjugate(_rre).re();
[detail]      return dp2;
[detail]    }
[detail]  
[detail] -  inline double FKPower::xiSecondDerivative()
[detail] +  inline double FKPower::highResolutionKTransverseSecondDerivative()
[detail]    {
[detail] -    _ddfe.multiply(*_f, _edxi);
[detail] -    return _ddfe.scalarProductConjugate(_edxi).re();
[detail] +    double dp2=2.0*_dpt*_dpt/_p.re();
[detail] +    dp2-=_kAbs*_p2*_fe.scalarProductConjugate(_rre).im();
[detail] +    _re2.dotMultiply(_rt, _rte);
[detail] +    double k2p2=_kAbs*_kAbs*_p2;
[detail] +    dp2+=k2p2*_fe.scalarProductConjugate(_re2).re();
[detail] +    _f->multiply(_rte, _ddtfe);
[detail] +    dp2-=k2p2*_ddtfe.scalarProductConjugate(_rte).re();
[detail] +    return dp2;
[detail]    }
[detail]  
[detail] -  inline double FKPower::ellipticityGradient(const Vector<Complex>& de) const
[detail] +  inline double FKPower::highResolutionKRadialTransverseSecondDerivative()
[detail]    {
[detail] -    return _fe.scalarProductConjugate(de).re();
[detail] +    double dp2=2.0*_dpr*_dpt/_p.re();
[detail] +    dp2+=_p2*_fe.scalarProductConjugate(_rte).im();
[detail] +    _re2.dotMultiply(_rr, _rte);
[detail] +    double kp2=_kAbs*_p2;
[detail] +    dp2+=kp2*_fe.scalarProductConjugate(_re2).re();
[detail] +    dp2-=kp2*_ddtfe.scalarProductConjugate(_rre).re();
[detail] +    return dp2;
[detail]    }
[detail]  
[detail] -  inline double FKPower::orientationGradient(const ComplexMatrix& df)
[detail] +  inline double FKPower::xiSecondDerivative()
[detail]    {
[detail] -    _exi.multiply(df, _fe);
[detail] -    return _exi.scalarProductConjugate(_fe).re();
[detail] +    _f->multiply(_edxi, _ddrfe);
[detail] +    return _ddrfe.scalarProductConjugate(_edxi).re();
[detail]    }
[detail]  
[detail] +  inline double FKPower::xiSecondDerivative(const Vector<Complex>& de)
[detail] +  {
[detail] +    _f->multiply(de, _ddrfe);
[detail] +    return _ddrfe.scalarProductConjugate(de).re();
[detail] +  }
[detail]    
[detail] +  inline double FKPower::gradient(const Vector<Complex>& de) const
[detail] +  {
[detail] +    return _fe.scalarProductConjugate(de).re();
[detail] +  }
[detail]  
[detail] -  
[detail] +  inline double FKPower::gradient(const SparseVector<Complex>& de) const
[detail] +  {
[detail] +    return de.conjugateScalarProduct(_fe).re();
[detail] +  }
[detail]  
[detail]  } 
[detail]  
[detail]                          src/FKResults.h:  version-4.2.1	modified out of comments
[detail] --- src/FKResults.h-version-4.2.1-stripped	2025-09-28 04:01:18.651568954 +0200
[detail] +++ src/FKResults.h-HEAD-stripped	2025-09-28 04:01:18.655568974 +0200
[detail] @@ -19,10 +19,10 @@
[detail]    {
[detail]    public:
[detail]      FKResults();
[detail] -    virtual ~FKResults();
[detail] +    ~FKResults();
[detail]  
[detail]      void setArray(const ArraySelection * array);
[detail] -    virtual void clear();
[detail] +    void clear();
[detail]  
[detail]      const FKParameters * parameters() const {return static_cast<const FKParameters *>(_parameters);}
[detail]  
[detail]                         src/FKSteering.h:  version-4.2.1	modified out of comments
[detail] --- src/FKSteering.h-version-4.2.1-stripped	2025-09-28 04:01:18.671569050 +0200
[detail] +++ src/FKSteering.h-HEAD-stripped	2025-09-28 04:01:18.675569070 +0200
[detail] @@ -27,64 +27,68 @@
[detail]      void setTransverseRotations(double step);
[detail]      void setSensorPositionErrors(const FKParameters& param);
[detail]      void setSensorOrientationErrors(const FKParameters& param);
[detail] +    void setLocalSourceDistances(const IrregularGridSearch2D& grid);
[detail] +    void setLocalSourceDistances(int n, double step);
[detail]  
[detail]      const ArraySelection * array() const {return _array;}
[detail]  
[detail]      const Vector<Complex>& coordinates() const {return _coordinates;}
[detail] -    const Vector<double>& xCoordinates() const {return _xCoordinates;}
[detail] -    const Vector<double>& yCoordinates() const {return _yCoordinates;}
[detail]  
[detail]      inline const Complex& rotation(const Vector<int>& index) const;
[detail]      inline const Complex * sensorOrientationErrors() const {return _sensorOrientationErrors;}
[detail]  
[detail]      inline const Vector<Complex>& oneComponent(const Vector<int>& index, FKPower * p) const;
[detail] -    inline const Vector<Complex>& oneComponent(const Vector<double>& k, FKPower * p) const;
[detail] +    inline const Vector<Complex>& oneComponent(FKPower * p) const;
[detail] +
[detail] +    inline const Vector<double>& localSourceDistances(const Vector<int>& index, FKPower * p) const;
[detail] +    inline const Vector<double>& localSourceDistances(const Vector<double>& x, FKPower * p) const;
[detail]  
[detail]      inline const Vector<Complex>& twoComponentHorizontal(const Vector<int>& index, FKPower * p) const;
[detail] -    inline const Vector<Complex>& twoComponentRadial(const Vector<double>& k, FKPower * p) const;
[detail] -    inline const Vector<Complex>& twoComponentTransverse(const Vector<double>& k, FKPower * p) const;
[detail] +    inline const Vector<Complex>& twoComponentRadial(FKPower * p) const;
[detail] +    inline const Vector<Complex>& twoComponentTransverse(FKPower * p) const;
[detail]  
[detail]      inline const Vector<Complex>& threeComponentRayleigh(const Vector<int>& index, FKPower * p) const;
[detail] -    inline const Vector<Complex>& threeComponentRayleigh(const Vector<double>& k, FKPower * p) const;
[detail] +    inline const Vector<Complex>& threeComponentRayleigh(FKPower * p) const;
[detail] +    inline const Vector<Complex>& threeComponentRayleigh(const Complex& rotation, FKPower * p) const;
[detail]      inline const Vector<Complex>& threeComponentLove(const Vector<int>& index, FKPower * p) const;
[detail] -    inline const Vector<Complex>& threeComponentLove(const Vector<double>& k, FKPower * p) const;
[detail] +    inline const Vector<Complex>& threeComponentLove(FKPower * p) const;
[detail]  
[detail] -    static inline const Vector<Complex>& twoComponentRayleighCross(const Complex& ell, FKPower * p);
[detail] +    static inline const Vector<Complex>& twoComponentRayleighAll(const Complex& ell, FKPower * p);
[detail]      static inline const Vector<Complex>& twoComponentRayleighRadial(const Complex& ell, FKPower * p);
[detail]      static inline const Vector<Complex>& twoComponentRayleighVertical(const Complex& ell, FKPower * p);
[detail]  
[detail] -    static inline const Vector<Complex>& threeComponentRayleighCross(const Complex& ell, FKPower * p);
[detail] +    static inline const Vector<Complex>& threeComponentRayleighAll(const Complex& ell, FKPower * p);
[detail]      static inline const Vector<Complex>& threeComponentRayleighRadial(const Complex& ell, FKPower * p);
[detail]      static inline const Vector<Complex>& threeComponentRayleighVertical(const Complex& ell, FKPower * p);
[detail]  
[detail] -    static inline const Vector<Complex>& twoComponentRayleighCrossGradient(const Complex& ell, FKPower * p);
[detail] +    static inline const Vector<Complex>& twoComponentRayleighAllGradient(const Complex& ell, FKPower * p);
[detail]      static inline const Vector<Complex>& twoComponentRayleighRadialGradient(const Complex& ell, FKPower * p);
[detail]      static inline const Vector<Complex>& twoComponentRayleighVerticalGradient(const Complex& ell, FKPower * p);
[detail]  
[detail] -    static inline const Vector<Complex>& threeComponentRayleighCrossGradient(const Complex& ell, FKPower * p);
[detail] +    static inline const Vector<Complex>& threeComponentRayleighAllGradient(const Complex& ell, FKPower * p);
[detail]      static inline const Vector<Complex>& threeComponentRayleighRadialGradient(const Complex& ell, FKPower * p);
[detail]      static inline const Vector<Complex>& threeComponentRayleighVerticalGradient(const Complex& ell, FKPower * p);
[detail]  
[detail] -    inline void oneComponentSensorRadialProjections(const Vector<double>& k, FKPower * p) const;
[detail] -    inline void twoComponentSensorRadialProjections(const Vector<double>& k, FKPower * p) const;
[detail] -    inline void threeComponentSensorRadialProjections(const Vector<double>& k, FKPower * p) const;
[detail] -  private:
[detail] +    inline void oneComponentSensorRadialProjections(FKPower * p) const;
[detail] +    inline void twoComponentSensorRadialProjections(FKPower * p) const;
[detail] +    inline void threeComponentSensorRadialProjections(FKPower * p) const;
[detail] +
[detail] +    inline void oneComponentSensorTransverseProjections(FKPower * p) const;
[detail] +  protected:
[detail]      const ArraySelection * _array;
[detail]      PrivateVector<Complex> _coordinates;
[detail] -    PrivateVector<double> _xCoordinates;
[detail] -    PrivateVector<double> _yCoordinates;
[detail]  
[detail] -    int _kCount;
[detail] +    int _kCount, _xyCount, _ellCount;
[detail] +    bool _sensorPositionErrors;
[detail]  #ifdef FKSTEERING_1D
[detail]      Complex * _phaseShiftsX, * _phaseShiftsY;
[detail]  #else
[detail]      Complex * _phaseShifts;
[detail]  #endif
[detail]      Complex * _rotations;
[detail] +    double * _localSourceDistances;
[detail]  
[detail] -    int _ellCount;
[detail]      Complex * _sensorOrientationErrors;
[detail] -    bool _sensorPositionErrors;
[detail]    };
[detail]  
[detail]    inline const Complex& FKSteering::rotation(const Vector<int>& index) const
[detail] @@ -112,34 +116,23 @@
[detail]    inline const Vector<Complex>& FKSteering::oneComponent(const Vector<int>& index,
[detail]                                                           FKPower * p) const
[detail]    {
[detail] -    Vector<Complex>& e=p->steeringVectorGrid();
[detail] -    e.setValues(_phaseShifts+(index[1]*_kCount+index[0])*_array->count());
[detail] -    p->setOneComponentSteeringVector(&e);
[detail] -    return e;
[detail] +    Vector<Complex>& q=p->oneComponentSteeringVectorGrid();
[detail] +    q.setValues(_phaseShifts+(index[1]*_kCount+index[0])*_array->count());
[detail] +    p->setOneComponentSteeringVector(&q);
[detail] +    return q;
[detail]    }
[detail]  #endif
[detail]  
[detail] -  inline const Vector<Complex>& FKSteering::oneComponent(const Vector<double>& k,
[detail] -                                                         FKPower * p) const
[detail] +  inline const Vector<Complex>& FKSteering::oneComponent(FKPower * p) const
[detail]    {
[detail]      int n=_array->count();
[detail] -    Vector<Complex>& e=p->steeringVector();
[detail] -#if defined(__SSE3__) && !defined(Q_OS_DARWIN)
[detail] -    
[detail] -    Complex ck(-k[0], k[1]), x;
[detail] +    Vector<Complex>& q=p->oneComponentSteeringVectorValue();
[detail] +    const Complex& k=p->wavenumberScalarProduct();
[detail]      for(int i=0; i<n; i++) {
[detail] -      x=ck;
[detail] -      x*=_coordinates[i];
[detail] -      e[i].setUnitExp(x.re());
[detail] +      q[i].setUnitExp(k.realPartOfProduct(_coordinates[i]));
[detail]      }
[detail] -#else
[detail] -    for(int i=0; i<n; i++) {
[detail] -      const Point2D& r=_array->relativePos(i);
[detail] -      e[i].setUnitExp(-k.scalarProduct(r));
[detail] -    }
[detail] -#endif
[detail] -    p->setOneComponentSteeringVector(&e);
[detail] -    return e;
[detail] +    p->setOneComponentSteeringVector(&q);
[detail] +    return q;
[detail]    }
[detail]  
[detail]    inline const Vector<Complex>& FKSteering::twoComponentHorizontal(const Vector<int>& index,
[detail] @@ -160,18 +153,16 @@
[detail]      return e;
[detail]    }
[detail]  
[detail] -  inline const Vector<Complex>& FKSteering::twoComponentRadial(const Vector<double>& k,
[detail] -                                                               FKPower * p) const
[detail] +  inline const Vector<Complex>& FKSteering::twoComponentRadial(FKPower * p) const
[detail]    {
[detail]      int n=_array->count();
[detail] -    Complex rotation(k[0], k[1]);
[detail] -    rotation/=rotation.abs();
[detail]      Vector<Complex>& e=p->steeringVector();
[detail] +    const Vector<Complex>& q=p->oneComponentSteeringVector();
[detail] +    const Complex& rotation=p->radialWavenumberRotation();
[detail]      for(int i=0; i<n; i++) {
[detail] -      const Point2D& r=_array->relativePos(i);
[detail]        Complex& ei=e[i];
[detail]        Complex& ein=e[i+n];
[detail] -      ei.setUnitExp(-k.scalarProduct(r));
[detail] +      ei=q[i];
[detail]        ein=ei;
[detail]        ei*=rotation.re();
[detail]        ein*=rotation.im();
[detail] @@ -179,18 +170,16 @@
[detail]      return e;
[detail]    }
[detail]  
[detail] -  inline const Vector<Complex>& FKSteering::twoComponentTransverse(const Vector<double>& k,
[detail] -                                                                   FKPower * p) const
[detail] +  inline const Vector<Complex>& FKSteering::twoComponentTransverse(FKPower * p) const
[detail]    {
[detail]      int n=_array->count();
[detail] -    Complex rotation(-k[1], k[0]);
[detail] -    rotation/=rotation.abs();
[detail]      Vector<Complex>& e=p->steeringVector();
[detail] +    const Vector<Complex>& q=p->oneComponentSteeringVector();
[detail] +    const Complex& rotation=p->transverseWavenumberRotation();
[detail]      for(int i=0; i<n; i++) {
[detail] -      const Point2D& r=_array->relativePos(i);
[detail]        Complex& ei=e[i];
[detail]        Complex& ein=e[i+n];
[detail] -      ei.setUnitExp(-k.scalarProduct(r));
[detail] +      ei=q[i];
[detail]        ein=ei;
[detail]        ei*=rotation.re();
[detail]        ein*=rotation.im();
[detail] @@ -220,26 +209,19 @@
[detail]      return e;
[detail]    }
[detail]  
[detail] -  inline const Vector<Complex>& FKSteering::threeComponentRayleigh(const Vector<double>& k,
[detail] -                                                                   FKPower * p) const
[detail] +  inline const Vector<Complex>& FKSteering::threeComponentRayleigh(FKPower * p) const
[detail]    {
[detail]      
[detail]      int n=_array->count();
[detail]      int n2=n << 1;
[detail] -    Complex rotation(k[0], k[1]);
[detail] -    double absRot=rotation.abs();
[detail] -    if(absRot>0.0) {
[detail] -      rotation/=absRot;
[detail] -    } else {
[detail] -      rotation=Complex(1.0, 0.0);
[detail] -    }
[detail] +    const Vector<Complex>& q=p->oneComponentSteeringVector();
[detail] +    const Complex& rotation=p->radialWavenumberRotation();
[detail]      Vector<Complex>& e=p->steeringVector();
[detail]      for(int i=0; i<n; i++) {
[detail] -      const Point2D& r=_array->relativePos(i);
[detail]        Complex& ei=e[i];
[detail]        Complex& ein=e[i+n];
[detail]        Complex& ei2n=e[i+n2];
[detail] -      ei2n.setUnitExp(-k.scalarProduct(r));
[detail] +      ei2n=q[i];
[detail]        ei=ei2n;
[detail]        ein=ei;
[detail]        ei*=rotation.re();
[detail] @@ -248,6 +230,19 @@
[detail]      return e;
[detail]    }
[detail]  
[detail] +  inline const Vector<Complex>& FKSteering::threeComponentRayleigh(const Complex& rotation,
[detail] +                                                                   FKPower * p) const
[detail] +  {
[detail] +    ASSERT(_array->count()==1);
[detail] +    ASSERT(fabs(rotation.abs2()-1.0)<1e-10);
[detail] +    
[detail] +    Vector<Complex>& e=p->steeringVector();
[detail] +    e[0]=rotation.re();
[detail] +    e[1]=rotation.im();
[detail] +    e[2]=1.0;
[detail] +    return e;
[detail] +  }
[detail] +
[detail]    inline const Vector<Complex>& FKSteering::threeComponentLove(const Vector<int>& index,
[detail]                                                                 FKPower * p) const
[detail]    {
[detail] @@ -260,7 +255,7 @@
[detail]        Complex& ei=e[i];
[detail]        Complex& ein=e[i+n];
[detail]        Complex& ei2n=e[i+n2];
[detail] -      ei2n=Complex();
[detail] +      ei2n.setNull();
[detail]        ei=q[i];
[detail]        ein=ei;
[detail]        ei*=rot.re();
[detail] @@ -269,27 +264,20 @@
[detail]      return e;
[detail]    }
[detail]  
[detail] -  inline const Vector<Complex>& FKSteering::threeComponentLove(const Vector<double>& k,
[detail] -                                                               FKPower * p) const
[detail] +  inline const Vector<Complex>& FKSteering::threeComponentLove(FKPower * p) const
[detail]    {
[detail]      
[detail]      int n=_array->count();
[detail]      int n2=n << 1;
[detail] -    Complex rotation(-k[1], k[0]);
[detail] -    double absRot=rotation.abs();
[detail] -    if(absRot>0.0) {
[detail] -      rotation/=absRot;
[detail] -    } else {
[detail] -      rotation=Complex(1.0, 0.0);
[detail] -    }
[detail] +    const Vector<Complex>& q=p->oneComponentSteeringVector();
[detail] +    const Complex& rotation=p->transverseWavenumberRotation();
[detail]      Vector<Complex>& e=p->steeringVector();
[detail]      for(int i=0; i<n; i++) {
[detail] -      const Point2D& r=_array->relativePos(i);
[detail]        Complex& ei=e[i];
[detail]        Complex& ein=e[i+n];
[detail]        Complex& ei2n=e[i+n2];
[detail] -      ei2n=Complex();
[detail] -      ei.setUnitExp(-k.scalarProduct(r));
[detail] +      ei2n.setNull();
[detail] +      ei=q[i];
[detail]        ein=ei;
[detail]        ei*=rotation.re();
[detail]        ein*=rotation.im();
[detail] @@ -297,7 +285,7 @@
[detail]      return e;
[detail]    }
[detail]  
[detail] -  inline const Vector<Complex>& FKSteering::twoComponentRayleighCross(const Complex& ell,
[detail] +  inline const Vector<Complex>& FKSteering::twoComponentRayleighAll(const Complex& ell,
[detail]                                                                        FKPower * p)
[detail]    {
[detail]      const Vector<Complex>& q=p->oneComponentSteeringVector();
[detail] @@ -344,13 +332,13 @@
[detail]        Complex& ein=exi[i+n];
[detail]        ei=q[i];
[detail]        ein=ei;
[detail] -      ei.imaginaryMultiply(-1.0);
[detail] +      ei.negativeImaginaryMultiply();
[detail]        ein*=f;
[detail]      }
[detail]      return exi;
[detail]    }
[detail]  
[detail] -  inline const Vector<Complex>& FKSteering::twoComponentRayleighCrossGradient(const Complex& ell,
[detail] +  inline const Vector<Complex>& FKSteering::twoComponentRayleighAllGradient(const Complex& ell,
[detail]                                                                                FKPower * p)
[detail]    {
[detail]      const Vector<Complex>& q=p->oneComponentSteeringVector();
[detail] @@ -378,7 +366,7 @@
[detail]      double f=-1.0/(ell.re()*ell.re());
[detail]      for(int i=0; i<n; i++) {
[detail]        Complex& ei=edxi[i];
[detail] -      edxi[i+n]=Complex();
[detail] +      edxi[i+n].setNull();
[detail]        ei=q[i];
[detail]        ei.imaginaryMultiply(f);
[detail]      }
[detail] @@ -394,14 +382,14 @@
[detail]      double f=-1.0/(ell.im()*ell.im());
[detail]      for(int i=0; i<n; i++) {
[detail]        Complex& ein=edxi[i+n];
[detail] -      edxi[i]=Complex();
[detail] +      edxi[i].setNull();
[detail]        ein=q[i];
[detail]        ein*=f;
[detail]      }
[detail]      return edxi;
[detail]    }
[detail]  
[detail] -  inline const Vector<Complex>& FKSteering::threeComponentRayleighCross(const Complex& ell,
[detail] +  inline const Vector<Complex>& FKSteering::threeComponentRayleighAll(const Complex& ell,
[detail]                                                                          FKPower * p)
[detail]    {
[detail]      const Vector<Complex>& e=p->steeringVector();
[detail] @@ -457,16 +445,16 @@
[detail]        Complex& ein=exi[i+n];
[detail]        Complex& ei2n=exi[i+n2];
[detail]        ei=e[i];
[detail] -      ei.imaginaryMultiply(-1.0);
[detail] +      ei.negativeImaginaryMultiply();
[detail]        ein=e[i+n];
[detail] -      ein.imaginaryMultiply(-1.0);
[detail] +      ein.negativeImaginaryMultiply();
[detail]        ei2n=e[i+n2];
[detail]        ei2n*=f;
[detail]      }
[detail]      return exi;
[detail]    }
[detail]  
[detail] -  inline const Vector<Complex>& FKSteering::threeComponentRayleighCrossGradient(const Complex& ell,
[detail] +  inline const Vector<Complex>& FKSteering::threeComponentRayleighAllGradient(const Complex& ell,
[detail]                                                                                  FKPower * p)
[detail]    {
[detail]      const Vector<Complex>& e=p->steeringVector();
[detail] @@ -504,7 +492,7 @@
[detail]        ei.imaginaryMultiply(f);
[detail]        ein=e[i+n];
[detail]        ein.imaginaryMultiply(f);
[detail] -      edxi[i+n2]=Complex();
[detail] +      edxi[i+n2].setNull();
[detail]      }
[detail]      return edxi;
[detail]    }
[detail] @@ -519,54 +507,80 @@
[detail]      double f=-1.0/(ell.im()*ell.im());
[detail]      for(int i=0; i<n; i++) {
[detail]        Complex& ei2n=edxi[i+n2];
[detail] -      edxi[i]=Complex();
[detail] -      edxi[i+n]=Complex();
[detail] +      edxi[i].setNull();
[detail] +      edxi[i+n].setNull();
[detail]        ei2n=e[i+n2];
[detail]        ei2n*=f;
[detail]      }
[detail]      return edxi;
[detail]    }
[detail]  
[detail] -  inline void FKSteering::oneComponentSensorRadialProjections(const Vector<double>& k, FKPower * p) const
[detail] +  inline void FKSteering::oneComponentSensorRadialProjections(FKPower * p) const
[detail]    {
[detail] -    Vector<double>& r=p->sensorProjections();
[detail] -    Complex k1(k[0], -k[1]);
[detail] -    k1/=k1.abs();
[detail] +    Vector<double>& r=p->sensorRadialProjections();
[detail]      int n=_array->count();
[detail] +    const Complex& k=p->radialWavenumberProjection();
[detail]      for(int i=0; i<n; i++) {
[detail] -      double& ri=r[i];
[detail] -      ri=(k1*_coordinates[i]).re();
[detail] +      r[i]=k.realPartOfProduct(_coordinates[i]);
[detail]      }
[detail]    }
[detail]  
[detail] -  inline void FKSteering::twoComponentSensorRadialProjections(const Vector<double>& k, FKPower * p) const
[detail] +  inline void FKSteering::twoComponentSensorRadialProjections(FKPower * p) const
[detail]    {
[detail] -    Vector<double>& r=p->sensorProjections();
[detail] -    Complex k1(k[0], -k[1]);
[detail] -    k1/=k1.abs();
[detail] +    Vector<double>& r=p->sensorRadialProjections();
[detail]      int n=_array->count();
[detail] +    const Complex& k=p->radialWavenumberProjection();
[detail]      for(int i=0; i<n; i++) {
[detail]        double& ri=r[i];
[detail] -      ri=(k1*_coordinates[i]).re();
[detail] +      ri=k.realPartOfProduct(_coordinates[i]);
[detail]        r[i+n]=ri;
[detail]      }
[detail]    }
[detail]  
[detail] -  inline void FKSteering::threeComponentSensorRadialProjections(const Vector<double>& k, FKPower * p) const
[detail] +  inline void FKSteering::threeComponentSensorRadialProjections(FKPower * p) const
[detail]    {
[detail] -    Vector<double>& r=p->sensorProjections();
[detail] -    Complex k1(k[0], -k[1]);
[detail] -    k1/=k1.abs();
[detail] +    Vector<double>& r=p->sensorRadialProjections();
[detail]      int n=_array->count();
[detail]      int n2=2*n;
[detail] +    const Complex& k=p->radialWavenumberProjection();
[detail]      for(int i=0; i<n; i++) {
[detail]        double& ri=r[i];
[detail] -      ri=(k1*_coordinates[i]).re();
[detail] +      ri=k.realPartOfProduct(_coordinates[i]);
[detail]        r[i+n]=ri;
[detail]        r[i+n2]=ri;
[detail]      }
[detail]    }
[detail]  
[detail] +  inline void FKSteering::oneComponentSensorTransverseProjections(FKPower * p) const
[detail] +  {
[detail] +    Vector<double>& r=p->sensorTransverseProjections();
[detail] +    int n=_array->count();
[detail] +    const Complex& k=p->transverseWavenumberProjection();
[detail] +    for(int i=0; i<n; i++) {
[detail] +      double& ri=r[i];
[detail] +      ri=k.realPartOfProduct(_coordinates[i]);
[detail] +    }
[detail] +  }
[detail] +
[detail] +  inline const Vector<double>& FKSteering::localSourceDistances(const Vector<int>& index,
[detail] +                                                                FKPower * p) const
[detail] +  {
[detail] +    Vector<double>& r=p->sensorProjectionsGrid();
[detail] +    r.setValues(_localSourceDistances+(index[1]*_xyCount+index[0])*_array->count());
[detail] +    return r;
[detail] +  }
[detail] +
[detail] +  inline const Vector<double>& FKSteering::localSourceDistances(const Vector<double>& x,
[detail] +                                                                FKPower * p) const
[detail] +  {
[detail] +    int n=_array->count();
[detail] +    Vector<double>& r=p->sensorRadialProjections();
[detail] +    Complex cx(-x[0], -x[1]);
[detail] +    for(int i=0; i<n; i++) {
[detail] +      r[i]=(cx+_coordinates[i]).abs();
[detail] +    }
[detail] +    return r;
[detail] +  }
[detail]  } 
[detail]  
[detail]  #endif 
[detail]                      src/FKTaskManager.h:  version-4.2.1	not modified
[detail]                             src/FKTool.h:  version-4.2.1	modified out of comments
[detail] --- src/FKTool.h-version-4.2.1-stripped	2025-09-28 04:01:18.703569205 +0200
[detail] +++ src/FKTool.h-HEAD-stripped	2025-09-28 04:01:18.707569225 +0200
[detail] @@ -18,8 +18,6 @@
[detail]      FKTool(QObject * parent);
[detail]      ~FKTool();
[detail]  
[detail] -    virtual bool setSubPool(SubSignalPool *subPool);
[detail] -
[detail]      inline const FKParameters * parameters() const;
[detail]      inline FKParameters * parameters();
[detail]  
[detail] @@ -32,8 +30,9 @@
[detail]  
[detail]      bool saveResults(const QString& fileName);
[detail]    protected:
[detail] -    virtual QString toolName() {return tr("FK Array analysis");}
[detail] +    QString toolName() {return tr("FK Array analysis");}
[detail]      ParallelTaskManager * createLoop();
[detail] +    int crossSpectrumMatrixSize() const;
[detail]    public slots:
[detail]      void start(int threadCount, bool forceParallel);
[detail]    signals:
[detail]                           src/FKWorker.h:  version-4.2.1	modified out of comments
[detail] --- src/FKWorker.h-version-4.2.1-stripped	2025-09-28 04:01:18.723569301 +0200
[detail] +++ src/FKWorker.h-HEAD-stripped	2025-09-28 04:01:18.727569321 +0200
[detail] @@ -23,6 +23,7 @@
[detail]      ~FKWorker();
[detail]  
[detail]      virtual bool setGrid(FKCache * cache);
[detail] +    int crossSpectrumMatrixSize() const;
[detail]      void setTaskManager(FKTaskManager * tm) {ArrayWorker::setTaskManager(tm);}
[detail]      inline AbstractFKFunction * function() const;
[detail]    protected:
[detail] @@ -35,7 +36,7 @@
[detail]      void localizeMax();
[detail]      bool addPeaks(const WaveNumberConverter& conv);
[detail]      void decompose(const WaveNumberConverter& conv);
[detail] -    bool addPeak(const FunctionSearchMaximum& m, const WaveNumberConverter& conv,
[detail] +    bool addPeak(const FunctionSearchExtremum& m, const WaveNumberConverter& conv,
[detail]                   const FKParameters * param, AbstractFKFunction * function);
[detail]      bool setSlownessRange();
[detail]      FKCrossSpectrum * crossSpectrum() {return static_cast<FKCrossSpectrum *>(_crossSpectrum);}
[detail]     src/FreeDirectionRayleighLoveModel.h:  version-4.2.1	no last version available
[detail]                   src/FreePlaneWaveSum.h:  version-4.2.1	no last version available
[detail]   src/FreeRayleighLoveChangeOfVariable.h:  version-4.2.1	no last version available
[detail]       src/FullSpectrumFreeRayleighLove.h:  version-4.2.1	no last version available
[detail]                  src/FullSpectrumModel.h:  version-4.2.1	no last version available
[detail]                src/FullSpectrumOneMode.h:  version-4.2.1	no last version available
[detail]     src/FullSpectrumOneModeTaskManager.h:  version-4.2.1	no last version available
[detail]          src/FullSpectrumOneModeWorker.h:  version-4.2.1	no last version available
[detail]                src/FullSpectrumResults.h:  version-4.2.1	no last version available
[detail]  src/FullSpectrumSeparatedRayleighLove.h:  version-4.2.1	no last version available
[detail]          src/HRDirectEllipticityEngine.h:  version-4.2.1	not modified
[detail]                src/HREllipticityEngine.h:  version-4.2.1	not modified
[detail]     src/HRFKAngularRayleighEllipticity.h:  version-4.2.1	not modified
[detail]                     src/HRFKDirectLove.h:  version-4.2.1	modified out of comments
[detail] --- src/HRFKDirectLove.h-version-4.2.1-stripped	2025-09-28 04:01:18.843569882 +0200
[detail] +++ src/HRFKDirectLove.h-HEAD-stripped	2025-09-28 04:01:18.847569902 +0200
[detail] @@ -19,8 +19,6 @@
[detail]      double value(const Vector<int>& index) const;
[detail]      double value(Vector<double>& kell) const;
[detail]  
[detail] -    double ellipticity(const Vector<double>& kell) const;
[detail] -
[detail]      bool remove(const Vector<double>& k, double ell, double noise, double power);
[detail]    };
[detail]  
[detail]                   src/HRFKDirectRadial.h:  version-4.2.1	modified out of comments
[detail] --- src/HRFKDirectRadial.h-version-4.2.1-stripped	2025-09-28 04:01:18.867569998 +0200
[detail] +++ src/HRFKDirectRadial.h-HEAD-stripped	2025-09-28 04:01:18.871570018 +0200
[detail] @@ -12,12 +12,17 @@
[detail]    public:
[detail]      HRFKDirectRadial(FKCache * cache) : HRFKVertical(cache) {}
[detail]  
[detail] +    int matrixSize(int stationCount) const {return 2*stationCount;}
[detail]      void initialize(const FKParameters& param);
[detail]      void addCrossSpectrum();
[detail]      void addIncoherentNoise(double horizontal, double );
[detail]  
[detail]      double value(const Vector<int>& index) const;
[detail]      double value(Vector<double>& k) const;
[detail] +
[detail] +    void setAssociatedResults(const Vector<double>& k, double power,
[detail] +                              FKPeaks::Value& val,
[detail] +                              const WaveNumberConverter& conv) const;
[detail]    };
[detail]  
[detail]  } 
[detail]                 src/HRFKDirectRayleigh.h:  version-4.2.1	modified out of comments
[detail] --- src/HRFKDirectRayleigh.h-version-4.2.1-stripped	2025-09-28 04:01:18.891570114 +0200
[detail] +++ src/HRFKDirectRayleigh.h-HEAD-stripped	2025-09-28 04:01:18.891570114 +0200
[detail] @@ -17,6 +17,7 @@
[detail]      HRFKDirectRayleigh(FKCache * cache);
[detail]      ~HRFKDirectRayleigh();
[detail]  
[detail] +    int matrixSize(int stationCount) const {return 3*stationCount;}
[detail]      void initialize(const FKParameters& param);
[detail]  
[detail]      void resetCrossSpectrum();
[detail] @@ -25,7 +26,7 @@
[detail]      void addIncoherentNoise(double horizontal, double vertical);
[detail]      bool invertCrossSpectrum();
[detail]  
[detail] -    const ComplexMatrix * crossSpectrum() const;
[detail] +    const HermitianMatrix * crossSpectrum() const;
[detail]    };
[detail]  
[detail]  } 
[detail]              src/HRFKDirectRayleighAll.h:  version-4.2.1	modified out of comments
[detail] --- src/HRFKDirectRayleighAll.h-version-4.2.1-stripped	2025-09-28 04:01:18.911570211 +0200
[detail] +++ src/HRFKDirectRayleighAll.h-HEAD-stripped	2025-09-28 04:01:18.911570211 +0200
[detail] @@ -29,13 +29,28 @@
[detail]  
[detail]      double wavenumberNormalizedConcavity(const Vector<double>& kell) const;
[detail]  
[detail] -    bool remove(const Vector<double>& kell, FKPeaks::Value& val);
[detail] +    bool remove(const Vector<double>& kell, FKPeaks::Value& val, double damping);
[detail] +  protected:
[detail] +    inline void maximumEllipticity() const;
[detail]    private:
[detail]      inline void commitEvaluationStat() const;
[detail] -    inline void maximumEllipticity() const;
[detail]      inline void gridMaximumEllipticity() const;
[detail]    };
[detail]  
[detail] +  inline void HRFKDirectRayleighAll::maximumEllipticity() const
[detail] +  {
[detail] +    
[detail] +    
[detail] +    double xi0=_xi.x;
[detail] +    if(!_ellOptimization.maximize(_xi, this, M_PI/8.0)) {
[detail] +      App::log(tr("Error maximizing beampower for ellipticity (All-)\n"));
[detail] +      
[detail] +      _ellOptimization.curves<HRFKDirectRayleighAll, Attributes>(this, -M_PI/2, M_PI/2, M_PI/1800.0);
[detail] +      _xi.x=xi0;
[detail] +      _ellOptimization.maximize(_xi, this, M_PI/8.0);
[detail] +    }
[detail] +  }
[detail] +
[detail]  } 
[detail]  
[detail]  #endif 
[detail]           src/HRFKDirectRayleighRadial.h:  version-4.2.1	not modified
[detail]          src/HRFKDirectRayleighSquared.h:  version-4.2.1	modified out of comments
[detail] --- src/HRFKDirectRayleighSquared.h-version-4.2.1-stripped	2025-09-28 04:01:18.943570366 +0200
[detail] +++ src/HRFKDirectRayleighSquared.h-HEAD-stripped	2025-09-28 04:01:18.947570384 +0200
[detail] @@ -25,7 +25,8 @@
[detail]      void setFunctionDerivatives(HRFKRayleighSquared::Attributes& a) const;
[detail]  
[detail]      void setAssociatedResults(const Vector<double>& kell, double power,
[detail] -                              FKPeaks::Value& val) const;
[detail] +                              FKPeaks::Value& val,
[detail] +                              const WaveNumberConverter& conv) const;
[detail]    protected:
[detail]      mutable HRFKRayleighSquared::Attributes _xi1, _xi2;
[detail]    private:
[detail]         src/HRFKDirectRayleighVertical.h:  version-4.2.1	not modified
[detail]               src/HRFKDirectTransverse.h:  version-4.2.1	modified out of comments
[detail] --- src/HRFKDirectTransverse.h-version-4.2.1-stripped	2025-09-28 04:01:18.979570539 +0200
[detail] +++ src/HRFKDirectTransverse.h-HEAD-stripped	2025-09-28 04:01:18.983570558 +0200
[detail] @@ -12,6 +12,7 @@
[detail]    public:
[detail]      HRFKDirectTransverse(FKCache * cache);
[detail]  
[detail] +    int matrixSize(int stationCount) const {return 2*stationCount;}
[detail]      void initialize(const FKParameters& param);
[detail]  
[detail]      double value(Vector<double>& k) const;
[detail]                  src/HRFKPolarVertical.h:  version-4.2.1	no last version available
[detail]                         src/HRFKRadial.h:  version-4.2.1	not modified
[detail]                       src/HRFKRayleigh.h:  version-4.2.1	not modified
[detail]                    src/HRFKRayleighAll.h:  version-4.2.1	not modified
[detail]               src/HRFKRayleighFixedEll.h:  version-4.2.1	modified out of comments
[detail] --- src/HRFKRayleighFixedEll.h-version-4.2.1-stripped	2025-09-28 04:01:19.051570888 +0200
[detail] +++ src/HRFKRayleighFixedEll.h-HEAD-stripped	2025-09-28 04:01:19.055570906 +0200
[detail] @@ -19,8 +19,6 @@
[detail]      double value(const Vector<int>& index) const;
[detail]      double value(Vector<double>& k) const;
[detail]  
[detail] -    double ellipticity(const Vector<double>&) {return _currentFixedEllipticity;}
[detail] -
[detail]      bool loadFixedEllipticityCurve(const QString& fileName);
[detail]    private:
[detail]      double _currentFixedEllipticity;
[detail]                 src/HRFKRayleighRadial.h:  version-4.2.1	not modified
[detail]                src/HRFKRayleighSquared.h:  version-4.2.1	modified out of comments
[detail] --- src/HRFKRayleighSquared.h-version-4.2.1-stripped	2025-09-28 04:01:19.087571061 +0200
[detail] +++ src/HRFKRayleighSquared.h-HEAD-stripped	2025-09-28 04:01:19.091571081 +0200
[detail] @@ -28,7 +28,8 @@
[detail]      void setFunctionDerivatives(Attributes& a) const;
[detail]  
[detail]      void setAssociatedResults(const Vector<double>& kell, double power,
[detail] -                              FKPeaks::Value& val) const;
[detail] +                              FKPeaks::Value& val,
[detail] +                              const WaveNumberConverter& conv) const;
[detail]  
[detail]      double wavenumberNormalizedConcavity(const Vector<double>& kell) const;
[detail]  
[detail]               src/HRFKRayleighVertical.h:  version-4.2.1	not modified
[detail]                     src/HRFKTransverse.h:  version-4.2.1	modified out of comments
[detail] --- src/HRFKTransverse.h-version-4.2.1-stripped	2025-09-28 04:01:19.127571254 +0200
[detail] +++ src/HRFKTransverse.h-HEAD-stripped	2025-09-28 04:01:19.131571274 +0200
[detail] @@ -14,8 +14,6 @@
[detail]        : HRFKRadial(cache) {}
[detail]  
[detail]      void addCrossSpectrum();
[detail] -
[detail] -    double ellipticity(const Vector<double>&) {return std::numeric_limits<double>::infinity();}
[detail]    };
[detail]  
[detail]  } 
[detail]         src/HRFKVelocityStrainRateLove.h:  version-4.2.1	no last version available
[detail]     src/HRFKVelocityStrainRateRayleigh.h:  version-4.2.1	no last version available
[detail]                       src/HRFKVertical.h:  version-4.2.1	modified out of comments
[detail] --- src/HRFKVertical.h-version-4.2.1-stripped	2025-09-28 04:01:19.159571409 +0200
[detail] +++ src/HRFKVertical.h-HEAD-stripped	2025-09-28 04:01:19.163571428 +0200
[detail] @@ -19,22 +19,15 @@
[detail]  
[detail]      double value(const Vector<int>& index) const;
[detail]      double value(Vector<double>& k) const;
[detail] -    void gradient(const Vector<double>&, Vector<double>& grad) const;
[detail] -
[detail] -    bool remove(const Vector<double>& k, FKPeaks::Value& val);
[detail] -
[detail] -    
[detail] -    
[detail] -
[detail] -    
[detail]      
[detail] +    bool remove(const Vector<double>& k, FKPeaks::Value& val, double damping);
[detail]  
[detail] +    void setAssociatedResults(const Vector<double>& k, double power,
[detail] +                              FKPeaks::Value& val,
[detail] +                              const WaveNumberConverter& conv) const;
[detail]      double wavenumberNormalizedConcavity(const Vector<double>& k) const;
[detail]    protected:
[detail] -    ComplexMatrix _originalCrossSpectrum;
[detail] -  private:
[detail] -    
[detail] -    void testKDerivatives(const Vector<double>& k) const;
[detail] +    HermitianMatrix _originalCrossSpectrum;
[detail]    };
[detail]  
[detail]  } 
[detail]                    src/IncoherentNoise.h:  version-4.2.1	not modified
[detail]                        src/KNullSolver.h:  version-4.2.1	not modified
[detail]                         src/KmaxSolver.h:  version-4.2.1	not modified
[detail]                         src/KminSolver.h:  version-4.2.1	not modified
[detail]               src/LocalSourceModeModel.h:  version-4.2.1	no last version available
[detail]                src/LocalSourceVertical.h:  version-4.2.1	no last version available
[detail]                    src/MSPACStatistics.h:  version-4.2.1	not modified
[detail]                   src/MuttiArrayFKLoop.h:  version-4.2.1	not modified
[detail]                   src/ORACrossSpectrum.h:  version-4.2.1	not modified
[detail]                      src/ORAParameters.h:  version-4.2.1	not modified
[detail]                     src/ORATaskManager.h:  version-4.2.1	not modified
[detail]                            src/ORATool.h:  version-4.2.1	not modified
[detail]                          src/ORAWorker.h:  version-4.2.1	not modified
[detail]                     src/OmniFKRayleigh.h:  version-4.2.1	not modified
[detail]                     src/OmniFKVertical.h:  version-4.2.1	not modified
[detail]                  src/OneComponentModel.h:  version-4.2.1	no last version available
[detail]          src/PlaneWaveChangeOfVariable.h:  version-4.2.1	no last version available
[detail]      src/PlaneWaveFixedIncoherentNoise.h:  version-4.2.1	no last version available
[detail]                src/PlaneWaveFixedModel.h:  version-4.2.1	no last version available
[detail]           src/PlaneWaveIncoherentNoise.h:  version-4.2.1	no last version available
[detail]          src/PlaneWaveIncoherentNoise2.h:  version-4.2.1	no last version available
[detail]      src/PlaneWaveInversionTaskManager.h:  version-4.2.1	no last version available
[detail]     src/PlaneWaveInversionTaskManager2.h:  version-4.2.1	no last version available
[detail]           src/PlaneWaveInversionWorker.h:  version-4.2.1	no last version available
[detail]          src/PlaneWaveInversionWorker2.h:  version-4.2.1	no last version available
[detail]            src/PlaneWaveModeFixedModel.h:  version-4.2.1	no last version available
[detail]         src/PlaneWaveModeFixedSpectrum.h:  version-4.2.1	no last version available
[detail]                 src/PlaneWaveModeModel.h:  version-4.2.1	no last version available
[detail]              src/PlaneWaveModeSpectrum.h:  version-4.2.1	no last version available
[detail]                     src/PlaneWaveModel.h:  version-4.2.1	no last version available
[detail]                src/PlaneWaveParameters.h:  version-4.2.1	no last version available
[detail]                       src/PlaneWaveSum.h:  version-4.2.1	no last version available
[detail]                      src/PoggiFKRadial.h:  version-4.2.1	modified out of comments
[detail] --- src/PoggiFKRadial.h-version-4.2.1-stripped	2025-09-28 04:01:19.507573091 +0200
[detail] +++ src/PoggiFKRadial.h-HEAD-stripped	2025-09-28 04:01:19.515573129 +0200
[detail] @@ -17,8 +17,6 @@
[detail]      void addCrossSpectrum();
[detail]      void meanCrossSpectrum(int nBlocks);
[detail]      bool invertCrossSpectrum();
[detail] -
[detail] -    double ellipticity(const Vector<double>& k);
[detail]    };
[detail]  
[detail]  } 
[detail]                    src/PoggiFKVertical.h:  version-4.2.1	modified out of comments
[detail] --- src/PoggiFKVertical.h-version-4.2.1-stripped	2025-09-28 04:01:19.531573206 +0200
[detail] +++ src/PoggiFKVertical.h-HEAD-stripped	2025-09-28 04:01:19.535573226 +0200
[detail] @@ -17,8 +17,6 @@
[detail]      void addCrossSpectrum();
[detail]      void meanCrossSpectrum(int nBlocks);
[detail]      bool invertCrossSpectrum();
[detail] -
[detail] -    double ellipticity(const Vector<double>& k);
[detail]    };
[detail]  
[detail]  } 
[detail]           src/RayleighChangeOfVariable.h:  version-4.2.1	no last version available
[detail]       src/RayleighLoveChangeOfVariable.h:  version-4.2.1	no last version available
[detail]                  src/RayleighLoveModel.h:  version-4.2.1	no last version available
[detail]                      src/RayleighModel.h:  version-4.2.1	no last version available
[detail]                    src/ReceiverSpectra.h:  version-4.2.1	no last version available
[detail]                src/RepellingDirections.h:  version-4.2.1	no last version available
[detail]                    src/RepellingValues.h:  version-4.2.1	no last version available
[detail]                          src/RingPairs.h:  version-4.2.1	not modified
[detail]                  src/SPACCrossSpectrum.h:  version-4.2.1	modified out of comments
[detail] --- src/SPACCrossSpectrum.h-version-4.2.1-stripped	2025-09-28 04:01:19.607573574 +0200
[detail] +++ src/SPACCrossSpectrum.h-HEAD-stripped	2025-09-28 04:01:19.611573594 +0200
[detail] @@ -39,7 +39,7 @@
[detail]  
[detail]      StationPairs _stationPairs;
[detail]      VectorList<RingPairs> _rings;
[detail] -    ComplexMatrix * _horizontalMatrix;
[detail] +    HermitianMatrix * _horizontalMatrix;
[detail]    };
[detail]  
[detail]    inline Complex SPACCrossSpectrum::verticalAutocorr(int station1, int station2) const
[detail]                     src/SPACParameters.h:  version-4.2.1	not modified
[detail]                          src/SPACPeaks.h:  version-4.2.1	not modified
[detail]                        src/SPACResults.h:  version-4.2.1	not modified
[detail]                           src/SPACRing.h:  version-4.2.1	not modified
[detail]                    src/SPACTaskManager.h:  version-4.2.1	not modified
[detail]                           src/SPACTool.h:  version-4.2.1	not modified
[detail]                         src/SPACWorker.h:  version-4.2.1	not modified
[detail]              src/SeparatedPlaneWaveSum.h:  version-4.2.1	no last version available
[detail] src/SeparatedRayleighLoveChangeOfVariable.h:  version-4.2.1	no last version available
[detail]         src/SeparatedRayleighLoveModel.h:  version-4.2.1	no last version available
[detail]             src/SimulatedArrayStations.h:  version-4.2.1	modified out of comments
[detail] --- src/SimulatedArrayStations.h-version-4.2.1-stripped	2025-09-28 04:01:19.747574250 +0200
[detail] +++ src/SimulatedArrayStations.h-HEAD-stripped	2025-09-28 04:01:19.751574270 +0200
[detail] @@ -14,11 +14,11 @@
[detail]      SimulatedArrayStations(const QList<NamedPoint>& array);
[detail]      ~SimulatedArrayStations();
[detail]  
[detail] -    double samplingFrequnecy() const;
[detail] +    double samplingFrequnecy(int index) const;
[detail]      Mode mode() const;
[detail]      int count() const;
[detail]      QString name(int index) const;
[detail] -    Point2D position(int index) const;
[detail] +    const Point2D& position(int index) const;
[detail]      StationSignals * stationSignals(int) const;
[detail]    private:
[detail]      VectorList<NamedPoint> _stations;
[detail]               src/SingleDirectRayleigh.h:  version-4.2.1	modified out of comments
[detail] --- src/SingleDirectRayleigh.h-version-4.2.1-stripped	2025-09-28 04:01:19.771574367 +0200
[detail] +++ src/SingleDirectRayleigh.h-HEAD-stripped	2025-09-28 04:01:19.775574385 +0200
[detail] @@ -13,15 +13,16 @@
[detail]    public:
[detail]      SingleDirectRayleigh(FKCache * cache);
[detail]  
[detail] -    void addCrossSpectrum();
[detail] -    void meanCrossSpectrum(int);
[detail] +    void initialize(const FKParameters& param);
[detail] +    FunctionSearch * createSearch(const FKParameters& param);
[detail]  
[detail]      double value(const Vector<int>& index) const;
[detail] -    double value(Vector<double>&) const;
[detail] -
[detail] -    double ellipticity(const Vector<double>&);
[detail] +    double value(Vector<double>& azell) const;
[detail]  
[detail]      bool isOnLimit(const Vector<double>&, double) const {return false;}
[detail] +    void setAssociatedResults(const Vector<double>& azell, double power,
[detail] +                              FKPeaks::Value& val,
[detail] +                              const WaveNumberConverter&) const;
[detail]    };
[detail]  
[detail]  } 
[detail]                         src/SourceList.h:  version-4.2.1	no last version available
[detail]                   src/SourceParameters.h:  version-4.2.1	no last version available
[detail]              src/SpectrumMatchFunction.h:  version-4.2.1	no last version available
[detail]           src/SpectrumMatchTaskManager.h:  version-4.2.1	no last version available
[detail]                src/SpectrumMatchWorker.h:  version-4.2.1	no last version available
[detail]                        src/StationPair.h:  version-4.2.1	not modified
[detail]                       src/StationPairs.h:  version-4.2.1	not modified
[detail]                    src/SteeringFactors.h:  version-4.2.1	not modified
[detail]             src/SyntheticCrossSpectrum.h:  version-4.2.1	no last version available
[detail]         src/VelocityStrainRateSteering.h:  version-4.2.1	no last version available
[detail]                src/WaveNumberConverter.h:  version-4.2.1	modified out of comments
[detail] --- src/WaveNumberConverter.h-version-4.2.1-stripped	2025-09-28 04:01:19.875574869 +0200
[detail] +++ src/WaveNumberConverter.h-HEAD-stripped	2025-09-28 04:01:19.879574889 +0200
[detail] @@ -18,21 +18,15 @@
[detail]      const DateTime& time() const {return _time;}
[detail]  
[detail]      double frequency() const {return _frequency;}
[detail] +    double slowness(double k) const {return k*_waveNumberFactor;}
[detail]      double slowness(const Vector<double>& k) const {return k.length(0, 1)*_waveNumberFactor;}
[detail] -    inline double azimuth(const Vector<double>& k) const;
[detail] +    double waveNumberFactor() const {return _waveNumberFactor;}
[detail]    private:
[detail]      DateTime _time;
[detail]      double _frequency;
[detail]      double _waveNumberFactor;
[detail]    };
[detail]  
[detail] -
[detail] -  inline double WaveNumberConverter::azimuth(const Vector<double>& k) const
[detail] -  {
[detail] -    double a=90.0-Angle::radiansToDegrees(k.azimuth(0, 1));
[detail] -    return Angle::canonicalDegrees(a);
[detail] -  }
[detail] -
[detail]  } 
[detail]  
[detail]  #endif 
[detail]                         src/Wavenumber.h:  version-4.2.1	not modified
[summary] Total differences: 7189 lines
[summary] Modification level is B
OLD_DIR=$(pwd)
echo "ArrayCore"
cd $(find . -name "ArrayCore" | tail -n 1) || exit 2
pwd
dpversion B  || exit 2
cd $OLD_DIR || exit 2
################## ArrayGui
[detail]                         src/ArrayGui.cpp:  version-1.4.0	not modified
[detail]                    src/ArrayResponse.cpp:  version-1.4.0	modified out of comments
[detail] --- src/ArrayResponse.cpp-version-1.4.0-stripped	2025-09-28 04:01:19.963575295 +0200
[detail] +++ src/ArrayResponse.cpp-HEAD-stripped	2025-09-28 04:01:19.967575313 +0200
[detail] @@ -12,7 +12,7 @@
[detail]  {
[detail]    TRACE;
[detail]    setAttribute(Qt::WA_DeleteOnClose);
[detail] -  _palette.generate(0, 19, ColorPalette::defaultSequential, ColorPalette::Continuous);
[detail] +  _palette.generate(0, 19, 1, ColorPalette::defaultSequential, ColorPalette::Continuous);
[detail]    _palette.setObjectName("Palette");
[detail]  
[detail]    Settings::getSize(this, "ArrayResponse");
[detail]    src/BlockAveragingParameterWidget.cpp:  version-1.4.0	not modified
[detail]                     src/PlotSPACRing.cpp:  version-1.4.0	not modified
[detail]                       src/RingEditor.cpp:  version-1.4.0	modified out of comments
[detail] --- src/RingEditor.cpp-version-1.4.0-stripped	2025-09-28 04:01:20.011575526 +0200
[detail] +++ src/RingEditor.cpp-HEAD-stripped	2025-09-28 04:01:20.015575546 +0200
[detail] @@ -144,7 +144,7 @@
[detail]      int iPair=0;
[detail]      for(int i=nStations-1; i>=0; i--) {
[detail]        for(int j=i-1; j>=0; j--) {
[detail] -        _pairs[iPair++].setStations(array, i, j);
[detail] +        _pairs[iPair++].setStations(array, j, i);
[detail]        }
[detail]      }
[detail]      std::sort(_pairs.begin(), _pairs.end(), StationPair::lessThan);
[detail] @@ -327,7 +327,7 @@
[detail]      _legendEditor=nullptr;
[detail]  
[detail]      ColorPalette pal;
[detail] -    pal.generate(0, 4, "roma");
[detail] +    pal.generate(0, 4, 1, "roma");
[detail]      QColor c;
[detail]      for(int i=0; i<5; i++) {
[detail]        guiColor(pal.color(i), c);
[detail]                   src/WaveNumAnimate.cpp:  version-1.4.0	not modified
[detail]                      src/ArrayResponse.h:  version-1.4.0	not modified
[detail]      src/BlockAveragingParameterWidget.h:  version-1.4.0	not modified
[detail]                       src/PlotSPACRing.h:  version-1.4.0	not modified
[detail]                         src/RingEditor.h:  version-1.4.0	not modified
[detail]                     src/WaveNumAnimate.h:  version-1.4.0	not modified
[detail]     src/BlockAveragingParameterWidget.ui:  version-1.4.0	not modified
[detail]                        src/RingEditor.ui:  version-1.4.0	not modified
[detail]                    src/WaveNumAnimate.ui:  version-1.4.0	not modified
[summary] Total differences: 31 lines
[summary] Modification level is C
OLD_DIR=$(pwd)
echo "ArrayGui"
cd $(find . -name "ArrayGui" | tail -n 1) || exit 2
pwd
dpversion C  || exit 2
cd $OLD_DIR || exit 2
################## geopsy-fk
[detail]                             src/main.cpp:  version-1.0.5	modified out of comments
[detail] --- src/main.cpp-version-1.0.5-stripped	2025-09-28 04:01:20.199576436 +0200
[detail] +++ src/main.cpp-HEAD-stripped	2025-09-28 04:01:20.203576454 +0200
[detail] @@ -63,7 +63,7 @@
[detail]    CoreApplication a(argc, argv, help);
[detail]    
[detail]    GeopsyCoreEngine gp(false);
[detail] -  skipOpenBlasMultiThreading();
[detail] +
[detail]    FKParameters * param=new FKParameters;
[detail]    CoreToolInterface gti;
[detail]    gti.setParameters(param);
[detail] @@ -107,7 +108,6 @@
[detail]      }
[detail]      gti.setTool(nullptr);
[detail]      delete tool;
[detail] -    tool=nullptr;
[detail]      gp.cache()->free(); 
[detail]    }
[detail]    HRFKRayleighSquared::showProcessingTime();
[summary] Total differences: 19 lines
[summary] Modification level is C
OLD_DIR=$(pwd)
echo "geopsy-fk"
cd $(find . -name "geopsy-fk" | tail -n 1) || exit 2
pwd
dpversion C  || exit 2
cd $OLD_DIR || exit 2
################## geopsy-spac
[detail]                             src/main.cpp:  version-1.0.3	modified out of comments
[detail] --- src/main.cpp-version-1.0.3-stripped	2025-09-28 04:01:20.251576687 +0200
[detail] +++ src/main.cpp-HEAD-stripped	2025-09-28 04:01:20.255576705 +0200
[detail] @@ -35,7 +35,6 @@
[detail]    CoreApplication a(argc, argv, help);
[detail]    
[detail]    GeopsyCoreEngine gp(false);
[detail] -  skipOpenBlasMultiThreading();
[detail]  
[detail]    SPACParameters * param=new SPACParameters;
[detail]    CoreToolInterface gti;
[summary] Total differences: 10 lines
[summary] Modification level is C
OLD_DIR=$(pwd)
echo "geopsy-spac"
cd $(find . -name "geopsy-spac" | tail -n 1) || exit 2
pwd
dpversion C  || exit 2
cd $OLD_DIR || exit 2
################## geopsy-hv
[detail]                             src/main.cpp:  version-1.0.2	modified out of comments
[detail] --- src/main.cpp-version-1.0.2-stripped	2025-09-28 04:01:20.303576938 +0200
[detail] +++ src/main.cpp-HEAD-stripped	2025-09-28 04:01:20.303576938 +0200
[detail] @@ -11,11 +11,11 @@
[detail]  
[detail]  ApplicationHelp * help();
[detail]  
[detail] -enum Mode {HV, Spectrum, HVRotate, SpectrumRotate};
[detail] +enum Mode {HV, Spectrum, HVRotate, SpectrumRotate, RayDec};
[detail]  Mode mode=HV;
[detail]  QStringList timeWindowFiles;
[detail]  
[detail] -bool postOptions(int& argc, char ** argv, HVParameters * param)
[detail] +bool modeOptions(int& argc, char ** argv)
[detail]  {
[detail]    bool rotate=false;
[detail]    int i, j = 1;
[detail] @@ -26,15 +26,10 @@
[detail]          mode=HV;
[detail]        } else if(arg=="-spectrum") {
[detail]          mode=Spectrum;
[detail] +      } else if(arg=="-raydec") {
[detail] +        mode=RayDec;
[detail]        } else if(arg=="-rotate") {
[detail]          rotate=true;
[detail] -      } else if(arg=="-load-windows") {
[detail] -        CoreApplication::checkOptionArg(i, argc, argv);
[detail] -        timeWindowFiles.append(argv[i]);
[detail] -      } else if(arg=="-param-example") {
[detail] -        QTextStream(stdout) << param->AbstractParameters::toString()
[detail] -                            << param->toString();
[detail] -        ::exit(0);
[detail]        } else {
[detail]          argv[j++]=argv[i];
[detail]        }
[detail] @@ -45,14 +40,42 @@
[detail]    argc=j;
[detail]    if(rotate) {
[detail]      switch(mode) {
[detail] +    case HV:
[detail] +      mode=HVRotate;
[detail] +      break;
[detail]      case Spectrum:
[detail]        mode=SpectrumRotate;
[detail]        break;
[detail]      default:
[detail] -      mode=HVRotate;
[detail] -      break;
[detail] +      App::log("Rotate option not allowed for this mode.\n");
[detail] +      return false;
[detail]      }
[detail]    }
[detail] +  return true;
[detail] +}
[detail] +
[detail] +bool otherOptions(int& argc, char ** argv, HVCoreParameters * param)
[detail] +{
[detail] +  bool rotate=false;
[detail] +  int i, j = 1;
[detail] +  for (i=1; i<argc; i++) {
[detail] +    QByteArray arg = argv[i];
[detail] +    if (arg[0]=='-') {
[detail] +      if(arg=="-load-windows") {
[detail] +        CoreApplication::checkOptionArg(i, argc, argv);
[detail] +        timeWindowFiles.append(argv[i]);
[detail] +      } else if(arg=="-param-example") {
[detail] +        QTextStream(stdout) << param->AbstractParameters::toString()
[detail] +                            << param->toString();
[detail] +        ::exit(0);
[detail] +      } else {
[detail] +        argv[j++]=argv[i];
[detail] +      }
[detail] +    } else {
[detail] +      argv[j++]=argv[i];
[detail] +    }
[detail] +  }
[detail] +  argc=j;
[detail]    timeWindowFiles=File::expand(timeWindowFiles);
[detail]    return true;
[detail]  }
[detail] @@ -62,15 +85,31 @@
[detail]    CoreApplication a(argc, argv, help);
[detail]    
[detail]    GeopsyCoreEngine gp(false);
[detail] -  skipOpenBlasMultiThreading();
[detail]  
[detail] -  HVParameters * param=new HVParameters;
[detail] +  if(!modeOptions(argc, argv)) {
[detail] +    return 2;
[detail] +  }
[detail] +  HVCoreParameters * param=nullptr;
[detail] +  switch(mode) {
[detail] +  case HV:
[detail] +    param=new HVParameters;
[detail] +    break;
[detail] +  case Spectrum:
[detail] +    param=new SpectrumParameters;
[detail] +    break;
[detail] +  case HVRotate:
[detail] +  case SpectrumRotate:
[detail] +    param=new HVRotateParameters;
[detail] +    break;
[detail] +  case RayDec:
[detail] +    param=new RayDecParameters;
[detail] +  }
[detail]    CoreToolInterface gti;
[detail]    gti.setParameters(param);
[detail]    if(!gti.setOptions(argc, argv)) {
[detail]      return 2;
[detail]    }
[detail] -  if(!postOptions(argc, argv, param)) {
[detail] +  if(!otherOptions(argc, argv, param)) {
[detail]      return 2;
[detail]    }
[detail]    if(!CoreApplication::checkRemainingArgs(argc, argv)) {
[detail] @@ -93,6 +132,8 @@
[detail]      case SpectrumRotate:
[detail]        tool=new SpectrumRotateTool(nullptr);
[detail]        break;
[detail] +    case RayDec:
[detail] +      tool=new RayDecTool(nullptr);
[detail]      }
[detail]      if(!tool) {
[detail]        App::log(tr("Unsupported mode\n"));
[detail] @@ -136,6 +177,7 @@
[detail]    h->addOption("-hv","HV spectral ratio mode (default).");
[detail]    h->addOption("-spectrum","Smooth spectra mode.");
[detail]    h->addOption("-rotate","Produce results in all directions, either HV or Spectrum.");
[detail] +  h->addOption("-raydec","Computes Rayleigh ellipticity according to Hobiger et al. 2009 in GRL.");
[detail]    h->addOption("-load-windows <FILE>", "Load time windows from FILE. Format:\n"
[detail]                                         "  ### Time Windows ###\n"
[detail]                                         "  # From time      To time\n"
[summary] Total differences: 131 lines
[summary] Modification level is C
OLD_DIR=$(pwd)
echo "geopsy-hv"
cd $(find . -name "geopsy-hv" | tail -n 1) || exit 2
pwd
dpversion C  || exit 2
cd $OLD_DIR || exit 2
################## geopsy-corr
# Already increased version number:
# Tag = 
# Version = 0.0.1
################## geopsy-das
# Already increased version number:
# Tag = 
# Version = 0.1.0
################## geopsy
[detail]                              src/AGC.cpp:  version-3.4.0	not modified
[detail]                 src/ChronogramWindow.cpp:  version-3.4.0	modified out of comments
[detail] --- src/ChronogramWindow.cpp-version-3.4.0-stripped	2025-09-28 04:01:20.399577402 +0200
[detail] +++ src/ChronogramWindow.cpp-HEAD-stripped	2025-09-28 04:01:20.403577420 +0200
[detail] @@ -73,7 +73,7 @@
[detail]    SubPoolWindow::setWindowTitle( "Chronogram - " + title);
[detail]  }
[detail]  
[detail] -void ChronogramWindow::subPoolUpdate()
[detail] +void ChronogramWindow::endSubPoolUpdate()
[detail]  {
[detail]    TRACE;
[detail]    AxisWindow * w=_chronogramLayer->graph();
[detail] @@ -83,8 +83,8 @@
[detail]    }
[detail]    chronogramLayer()->subPoolUpdate(&subPool());
[detail]    if(subPool().count()==1) {
[detail] -    Signal & sig=*subPool().at(0);
[detail] -    QString traceName=sig.nameComponent();
[detail] +    SignalSegment& sig=*subPool().at(0);
[detail] +    QString traceName=sig.metaData()->nameComponent();
[detail]      setWindowTitle(traceName);
[detail]    } else {
[detail]      setWindowTitle(subPool().name());
[detail] @@ -134,7 +134,7 @@
[detail]    a.addStringLabel(_chronogramLayer->name(n), true);
[detail]  }
[detail]  
[detail] -void ChronogramWindow::endSignalChange(Signal * sig)
[detail] +void ChronogramWindow::endSignalChange(SignalSegment * sig)
[detail]  {
[detail]    TRACE;
[detail]    if(subPool().isEmpty()) return;
[detail]                      src/Convolution.cpp:  version-3.4.0	modified out of comments
[detail] --- src/Convolution.cpp-version-3.4.0-stripped	2025-09-28 04:01:20.419577499 +0200
[detail] +++ src/Convolution.cpp-HEAD-stripped	2025-09-28 04:01:20.423577517 +0200
[detail] @@ -18,6 +18,7 @@
[detail]    
[detail]    signalList->clear();
[detail]    int n=subPool->count();
[detail] -  for(int i=0;i<n;i++ )
[detail] -    signalList->addItem(tr( "%1. %2" ).arg(i+1).arg(subPool->at(i)->name()));
[detail] +  for(int i=0; i<n; i++) {
[detail] +    signalList->addItem(tr("%1. %2").arg(i+1).arg(subPool->at(i)->metaData()->name()));
[detail] +  }
[detail]  }
[detail]                     src/Correlations.cpp:  version-3.4.0	modified out of comments
[detail] --- src/Correlations.cpp-version-3.4.0-stripped	2025-09-28 04:01:20.439577595 +0200
[detail] +++ src/Correlations.cpp-HEAD-stripped	2025-09-28 04:01:20.443577615 +0200
[detail] @@ -18,6 +18,7 @@
[detail]    
[detail]    signalList->clear();
[detail]    int n=subPool->count();
[detail] -  for(int i=0;i<n;i++ )
[detail] -    signalList->addItem(tr( "%1. %2" ).arg(i+1).arg(subPool->at(i)->nameComponent()));
[detail] +  for(int i=0; i<n; i++) {
[detail] +    signalList->addItem(tr("%1. %2").arg(i+1).arg(subPool->at(i)->metaData()->nameComponent()));
[detail] +  }
[detail]  }
[detail]         src/CustomAsciiFormatsEditor.cpp:  version-3.4.0	not modified
[detail]                        src/CutSignal.cpp:  version-3.4.0	not modified
[detail]                src/DecimateAmplitude.cpp:  version-3.4.0	not modified
[detail]                           src/Engine.cpp:  version-3.4.0	modified out of comments
[detail] --- src/Engine.cpp-version-3.4.0-stripped	2025-09-28 04:01:20.507577924 +0200
[detail] +++ src/Engine.cpp-HEAD-stripped	2025-09-28 04:01:20.511577943 +0200
[detail] @@ -35,7 +35,7 @@
[detail]  }
[detail]  
[detail]  
[detail] -void Engine::beginSignalChange(Signal * sig)
[detail] +void Engine::beginSignalChange(SignalSegment * sig)
[detail]  {
[detail]    TRACE;
[detail]    if(WindowEnvironment::instance()) {
[detail] @@ -51,7 +51,7 @@
[detail]  }
[detail]  
[detail]  
[detail] -void Engine::endSignalChange(Signal * sig)
[detail] +void Engine::endSignalChange(SignalSegment * sig)
[detail]  {
[detail]    TRACE;
[detail]    if(WindowEnvironment::instance()) {
[detail] @@ -116,6 +116,24 @@
[detail]    }
[detail]  }
[detail]  
[detail] +void Engine::beginRemoveFile(SignalDatabase * db, int index)
[detail] +{
[detail] +  TRACE;
[detail] +  if(WindowEnvironment::instance()) {
[detail] +    MainWindow * mw=WindowEnvironment::window(db);
[detail] +    mw->beginRemoveFile(index);
[detail] +  }
[detail] +}
[detail] +
[detail] +void Engine::endRemoveFile(SignalDatabase * db)
[detail] +{
[detail] +  TRACE;
[detail] +  if(WindowEnvironment::instance()) {
[detail] +    MainWindow * mw=WindowEnvironment::window(db);
[detail] +    mw->endRemoveFile();
[detail] +  }
[detail] +}
[detail] +
[detail]  SubPoolWindow * Engine::newTableWindow(QWidget * parent, const SubSignalPool& subPool)
[detail]  {
[detail]    TRACE;
[detail] @@ -196,6 +214,10 @@
[detail]    return wl;
[detail]  }
[detail]  
[detail] +void Engine::setProgressCaption(SignalDatabase *, const QString&)
[detail] +{
[detail] +}
[detail] +
[detail]  void Engine::setProgressMaximum(SignalDatabase * db, int value)
[detail]  {
[detail]    if(WindowEnvironment::instance()) {
[detail] @@ -235,6 +257,13 @@
[detail]    }
[detail]  }
[detail]  
[detail] +void Engine::progressEnd(SignalDatabase * db, int value)
[detail] +{
[detail] +  if(WindowEnvironment::instance()) {
[detail] +    WindowEnvironment::window(db)->setProgressValue(value);
[detail] +  }
[detail] +}
[detail] +
[detail]  void Engine::showMessage(SignalDatabase * db, QString message)
[detail]  {
[detail]    if(WindowEnvironment::instance()) {
[detail]                   src/ExportFileType.cpp:  version-3.4.0	not modified
[detail]                       src/ExportPick.cpp:  version-3.4.0	not modified
[detail]                         src/FileView.cpp:  version-3.4.0	modified out of comments
[detail] --- src/FileView.cpp-version-3.4.0-stripped	2025-09-28 04:01:20.555578155 +0200
[detail] +++ src/FileView.cpp-HEAD-stripped	2025-09-28 04:01:20.559578175 +0200
[detail] @@ -31,13 +31,15 @@
[detail]    _menu=new QMenu(this);
[detail]    setContextMenuPolicy(Qt::DefaultContextMenu);
[detail]  
[detail] -  SignalFileItem * model=new SignalFileItem(Engine::instance()->database(this), this);
[detail] -  header()->hide();
[detail] -  setRootIsDecorated(false);
[detail] +  SignalFileItem * model=new SignalFileItem(this);
[detail] +  model->setDatabase(Engine::instance()->database(this));
[detail]    setModel(model);
[detail]    setSelectionBehavior(QAbstractItemView::SelectRows);
[detail]    setSelectionMode(QAbstractItemView::ExtendedSelection);
[detail]    setEditTriggers(QAbstractItemView::NoEditTriggers);
[detail] +  setAutoExpandDelay(1000);
[detail] +  setAnimated(true);
[detail] +  setUniformRowHeights(true); 
[detail]    setColumnWidth(0,250);
[detail]  }
[detail]  
[detail] @@ -106,6 +108,18 @@
[detail]    model()->endAddFile();
[detail]  }
[detail]  
[detail] +void FileView::beginRemoveFile(int index)
[detail] +{
[detail] +  TRACE;
[detail] +  model()->beginRemoveFile(index);
[detail] +}
[detail] +
[detail] +void FileView::endRemoveFile()
[detail] +{
[detail] +  TRACE;
[detail] +  model()->endRemoveFile();
[detail] +}
[detail] +
[detail]  void FileView::getSelection(SubSignalPool& sel)
[detail]  {
[detail]    TRACE;
[detail] @@ -199,15 +213,17 @@
[detail]  {
[detail]    TRACE;
[detail]    static const QString title=tr("Removing files from database");
[detail] -  QList<SignalFile *> fList;
[detail] +  QList<SignalFileIndex> fList;
[detail]    model()->getSelection(fList, *selectionModel());
[detail]    if(fList.isEmpty()) {
[detail]      Message::warning(MSG_ID, title, tr("No file selected for removal."), Message::ok());
[detail]      return;
[detail]    }
[detail]    QString fileListStr;
[detail] -  for(QList<SignalFile *>::Iterator it=fList.begin();it!=fList.end();++it) {
[detail] -    fileListStr+=((*it)->isOriginalFile() ? "\nO " : "\n  ")+(*it)->name();
[detail] +  for(QList<SignalFileIndex>::const_iterator it=fList.begin();it!=fList.end();++it) {
[detail] +    const SignalFileIndex& fi=*it;
[detail] +    fileListStr+=(fi.file()->isOriginalFile() ? "\nO " : "\n  ")
[detail] +                 +fi.file()->displayName(fi.index());
[detail]    }
[detail]    if(Message::warning(MSG_ID, title,
[detail]                              tr("List of file(s) to remove:\n%1\n\n"
[detail] @@ -225,13 +241,39 @@
[detail]      qApp->processEvents(QEventLoop::ExcludeUserInputEvents); 
[detail]    }
[detail]    mw->filesRemoved(fList);
[detail] -  model()->remove(fList);
[detail] +  QSet<AbstractSignalFile *> toUpdate;
[detail] +  for(QList<SignalFileIndex>::iterator it=fList.begin(); it!=fList.end(); ++it) {
[detail] +    const SignalFileIndex& fi=*it;
[detail] +    if(fi.index().isValid()) {
[detail] +      model()->beginRemoveFile(fi);
[detail] +      fi.file()->remove(fi.index());
[detail] +      QList<SignalFileIndex>::iterator itn=it;
[detail] +      for(itn++; itn!=fList.end(); ++itn) {
[detail] +        SignalFileIndex& fin=*itn;
[detail] +        if(fin.file()==fi.file() && fin.index()>fi.index()) {
[detail] +          fin.index()--;
[detail] +        }
[detail] +      }
[detail] +      model()->endRemoveFile();
[detail] +      if(fi.file()->numberOfFiles().value()==0) {
[detail] +        toUpdate.remove(fi.file());
[detail] +        mw->database()->removeFile(fi.file());
[detail] +      } else {
[detail] +        toUpdate.insert(fi.file());
[detail] +      }
[detail] +    } else {
[detail] +      mw->database()->removeFile(it->file());
[detail] +    }
[detail] +  }
[detail] +  for(QSet<AbstractSignalFile *>::const_iterator it=toUpdate.begin(); it!=toUpdate.end(); ++it) {
[detail] +    (*it)->removalUpdate();
[detail] +  }
[detail]  }
[detail]  
[detail]  void FileView::listReferences()
[detail]  {
[detail]    TRACE;
[detail] -  QList<SignalFile *> fList;
[detail] +  QList<SignalFileIndex> fList;
[detail]    model()->getSelection(fList, *selectionModel());
[detail]    if(fList.isEmpty()) {
[detail]      App::log(tr("No file selected\n"));
[detail] @@ -239,24 +281,24 @@
[detail]    }
[detail]    int n=0;
[detail]    AbstractSignalGroup * g=Engine::instance()->database(this)->masterGroup();
[detail] -  for(QList<SignalFile *>::Iterator itf=fList.begin();itf!=fList.end();++itf) {
[detail] -    SignalFile * sf=*itf;
[detail] +  for(QList<SignalFileIndex>::const_iterator itf=fList.begin(); itf!=fList.end(); ++itf) {
[detail]      SubSignalPool subpool;
[detail] -    subpool.addFile(sf);
[detail] +    subpool.addFile(*itf);
[detail]      bool ref=false;
[detail]      for(SubSignalPool::iterator its=subpool.begin(); its!=subpool.end(); its++) {
[detail] -      Signal * sig=*its;
[detail] +      SignalSegment * sig=*its;
[detail]        if(g->contains(sig)) {
[detail]          App::log(tr("Signal id %1 from file '%2' referenced in groups.\n")
[detail] -                 .arg(sig->id())
[detail] -                 .arg(sf->shortName()));
[detail] +                     .arg(sig->id().toString())
[detail] +                 .arg(sig->fileShortName()));
[detail]          ref=true;
[detail]          n++;
[detail]          break;
[detail]        }
[detail]      }
[detail]      if(!ref) {
[detail] -      App::log(tr("File '%1' is not referenced in groups\n").arg(sf->shortName()));
[detail] +      App::log(tr("File '%1' is not referenced in groups\n")
[detail] +                   .arg(itf->file()->shortDisplayName(itf->index())));
[detail]      }
[detail]    }
[detail]    if(fList.count()>1) {
[detail] @@ -267,15 +309,15 @@
[detail]  void FileView::copyPath()
[detail]  {
[detail]    TRACE;
[detail] -  QList<SignalFile *> fList;
[detail] +  QList<SignalFileIndex> fList;
[detail]    model()->getSelection(fList, *selectionModel());
[detail]    QString fileListStr;
[detail] -  int n=fileListStr.size()-1;
[detail] -  if(!fList.isEmpty()) {
[detail] -    for(int i=0; i<n; i++) {
[detail] -      fileListStr+=fList.at(i)->name()+"\n";
[detail] +  for(QList<SignalFileIndex>::const_iterator it=fList.begin(); it!=fList.end(); ++it) {
[detail] +    const SignalFileIndex& i=*it;
[detail] +    fileListStr+=i.file()->displayName(i.index())+"\n";
[detail]      }
[detail] -    fileListStr+=fList.last()->name();
[detail] +  fileListStr.chop(1);
[detail] +  if(!fileListStr.isEmpty()) {
[detail]      QClipboard * cb=QApplication::clipboard();
[detail]      cb->setText(fileListStr, QClipboard::Clipboard);
[detail]  #ifdef Q_OS_LINUX
[detail]                      src/GeopsyAbout.cpp:  version-3.4.0	not modified
[detail]                src/GeopsyAboutDialog.cpp:  version-3.4.0	not modified
[detail]                    src/GraphicWindow.cpp:  version-3.4.0	modified out of comments
[detail] --- src/GraphicWindow.cpp-version-3.4.0-stripped	2025-09-28 04:01:20.611578427 +0200
[detail] +++ src/GraphicWindow.cpp-HEAD-stripped	2025-09-28 04:01:20.615578445 +0200
[detail] @@ -50,11 +50,11 @@
[detail]    
[detail]    _pickLayer=new PickLayer(_signalLayer);
[detail]    _pickLayer->setObjectName("picks");
[detail] -  connect(_pickLayer, SIGNAL(pickBegin(bool, int, double, Signal *, int)),
[detail] -          this, SLOT(showMagnify(bool, int, double, Signal *)));
[detail] +  connect(_pickLayer, SIGNAL(pickBegin(bool, int, double, SignalSegment *, int)),
[detail] +          this, SLOT(showMagnify(bool, int, double, SignalSegment *)));
[detail]    connect(_pickLayer, SIGNAL(pickEnd()), this, SLOT(closeMagnify()));
[detail]    connect(_pickLayer, SIGNAL(mouseMoved(double)), this, SLOT(setMagnifyPosition(double)));
[detail] -  connect(_pickLayer, SIGNAL(currentSignalChanged(Signal *, int)), this, SLOT(setMagnifySignal(Signal *)));
[detail] +  connect(_pickLayer, SIGNAL(currentSignalChanged(SignalSegment *, int)), this, SLOT(setMagnifySignal(SignalSegment *)));
[detail]    _pickLayer->addTrackingAction(tr("&Pick"), PickLayer::Pick, tr("Pick time events."));
[detail]    _pickLayer->addTrackingAction(tr("&Delete picks"), PickLayer::DeletePicks, tr("Delete time picks."));
[detail]  
[detail] @@ -107,7 +107,7 @@
[detail]    SubPoolWindow::setWindowTitle("Graphic - "+title);
[detail]  }
[detail]  
[detail] -void GraphicWindow::subPoolUpdate()
[detail] +void GraphicWindow::endSubPoolUpdate()
[detail]  {
[detail]    TRACE;
[detail]    AxisWindow * w=_signalLayer->graph();
[detail] @@ -117,8 +117,8 @@
[detail]    }
[detail]    signalLayer()->subPoolUpdate(&subPool());
[detail]    if(subPool().count()==1) {
[detail] -    Signal & sig=*subPool().at(0);
[detail] -    QString traceName=sig.nameComponent();
[detail] +    SignalSegment& sig=*subPool().at(0);
[detail] +    QString traceName=sig.metaData()->nameComponent();
[detail]      setWindowTitle(traceName);
[detail]    } else {
[detail]      setWindowTitle(subPool().name());
[detail] @@ -153,6 +153,7 @@
[detail]        w->xAxis()->setTimeReference(subPool().timeRange().start());
[detail]        break;
[detail]      case SignalLayer::RelativeToStartTime:
[detail] +    case SignalLayer::Correlation:
[detail]        w->xAxis()->setScaleType(Scale::RelativeTime);
[detail]        w->xAxis()->setTimeReference(DateTime());
[detail]        break;
[detail] @@ -177,21 +178,21 @@
[detail]      SignalLayer * layer=signalLayer();
[detail]      if(layer->baseLineCount()==1) {
[detail]        
[detail] -      Signal & sig=*subPool().at(0);
[detail] +      SignalSegment& sig=*subPool().at(0);
[detail]        switch (sig.type()) {
[detail] -      case Signal::Waveform:
[detail] -        w->yAxis()->setTitle(sig.effectiveAmplitudeUnit());
[detail] +      case DoubleSignal::Waveform:
[detail] +        w->yAxis()->setTitle(sig.metaData()->effectiveAmplitudeUnit());
[detail]          w->yAxis()->setNumberType('e');
[detail]          break;
[detail] -      case Signal::Spectrum:
[detail] -        w->yAxis()->setTitle(sig.effectiveAmplitudeUnit()+"/sqrt(Hz)");
[detail] +      case DoubleSignal::Spectrum:
[detail] +        w->yAxis()->setTitle(sig.metaData()->effectiveAmplitudeUnit()+"/sqrt(Hz)");
[detail]          w->yAxis()->setNumberType('e');
[detail]          break;
[detail] -      case Signal::Phase:
[detail] +      case DoubleSignal::Phase:
[detail]          w->yAxis()->setTitle(tr("Rad"));
[detail]          w->yAxis()->setNumberType('f');
[detail]          break;
[detail] -      case Signal::UndefinedSignalType:
[detail] +      case DoubleSignal::UndefinedSignalType:
[detail]          break;
[detail]        }
[detail]        w->yAxis()->setAutoTicks(true);
[detail] @@ -219,10 +220,10 @@
[detail]            a.removeStringLabels();
[detail]            int n=subPool().count()-1;
[detail]            for(int i=0; i<n; i++) {
[detail] -            a.addStringLabel(subPool().at(i)->nameComponent(), false);
[detail] +            a.addStringLabel(subPool().at(i)->metaData()->nameComponent(), false);
[detail]            }
[detail]            
[detail] -          a.addStringLabel(subPool().at(n)->nameComponent(), true);
[detail] +          a.addStringLabel(subPool().at(n)->metaData()->nameComponent(), true);
[detail]          }
[detail]          break;
[detail]        case SignalLayer::SignalName: {
[detail] @@ -250,7 +251,7 @@
[detail]    }
[detail]  }
[detail]  
[detail] -void GraphicWindow::endSignalChange(Signal * sig)
[detail] +void GraphicWindow::endSignalChange(SignalSegment * sig)
[detail]  {
[detail]    TRACE;
[detail]    SignalLayer * layer=signalLayer();
[detail] @@ -291,7 +292,7 @@
[detail]    sel.addSubPool(subPool());
[detail]  }
[detail]  
[detail] -void GraphicWindow::showMagnify(bool show, int context, double time, Signal * sig)
[detail] +void GraphicWindow::showMagnify(bool show, int context, double time, SignalSegment * sig)
[detail]  {
[detail]    TRACE;
[detail]    if(show) {
[detail] @@ -324,7 +325,7 @@
[detail]    if(_magWin) _magWin->setTime(x);
[detail]  }
[detail]  
[detail] -void GraphicWindow::setMagnifySignal(Signal * sig)
[detail] +void GraphicWindow::setMagnifySignal(SignalSegment * sig)
[detail]  {
[detail]    TRACE;
[detail]    if(_magWin) {
[detail]                  src/GroupProperties.cpp:  version-3.4.0	modified out of comments
[detail] --- src/GroupProperties.cpp-version-3.4.0-stripped	2025-09-28 04:01:20.631578523 +0200
[detail] +++ src/GroupProperties.cpp-HEAD-stripped	2025-09-28 04:01:20.635578542 +0200
[detail] @@ -70,18 +70,24 @@
[detail]    multiGroupKeyIndex->setEnabled(checked);
[detail]  }
[detail]  
[detail] -bool GroupProperties::isMultiGroupKey()
[detail] +bool GroupProperties::isMultiGroupKey() const
[detail]  {
[detail]    TRACE;
[detail]    return multiGroupBox && multiGroupBox->isChecked() && multiGroupKeyButton->isChecked();
[detail]  }
[detail]  
[detail] -bool GroupProperties::isMultiGroupArray()
[detail] +bool GroupProperties::isMultiGroupArray() const
[detail]  {
[detail]    TRACE;
[detail]    return multiGroupBox && multiGroupBox->isChecked() && multiGroupArrayButton->isChecked();
[detail]  }
[detail]  
[detail] +bool GroupProperties::isKeepSignalOrder() const
[detail] +{
[detail] +  TRACE;
[detail] +  return keepSignalOrder->isChecked();
[detail] +}
[detail] +
[detail]  MetaDataIndex GroupProperties::splitKey()
[detail]  {
[detail]    TRACE;
[detail]                        src/GroupView.cpp:  version-3.4.0	modified out of comments
[detail] --- src/GroupView.cpp-version-3.4.0-stripped	2025-09-28 04:01:20.651578619 +0200
[detail] +++ src/GroupView.cpp-HEAD-stripped	2025-09-28 04:01:20.655578639 +0200
[detail] @@ -44,6 +44,16 @@
[detail]    return static_cast<SignalGroupItem *>(QTreeView::model());
[detail]  }
[detail]  
[detail] +void GroupView::beginResetModel()
[detail] +{
[detail] +  model()->beginResetModel();
[detail] +}
[detail] +
[detail] +void GroupView::endResetModel()
[detail] +{
[detail] +  model()->endResetModel();
[detail] +}
[detail] +
[detail]  void GroupView::addActions()
[detail]  {
[detail]    TRACE;
[detail]                      src/GroupWidget.cpp:  version-3.4.0	modified out of comments
[detail] --- src/GroupWidget.cpp-version-3.4.0-stripped	2025-09-28 04:01:20.671578716 +0200
[detail] +++ src/GroupWidget.cpp-HEAD-stripped	2025-09-28 04:01:20.675578736 +0200
[detail] @@ -77,3 +77,13 @@
[detail]    }
[detail]    groupView->setMode(m);
[detail]  }
[detail] +
[detail] +void GroupWidget::beginResetModel()
[detail] +{
[detail] +  groupView->beginResetModel();
[detail] +}
[detail] +
[detail] +void GroupWidget::endResetModel()
[detail] +{
[detail] +  groupView->endResetModel();
[detail] +}
[detail]       src/InstrumentalResponseWidget.cpp:  version-3.4.0	modified out of comments
[detail] --- src/InstrumentalResponseWidget.cpp-version-3.4.0-stripped	2025-09-28 04:01:20.691578812 +0200
[detail] +++ src/InstrumentalResponseWidget.cpp-HEAD-stripped	2025-09-28 04:01:20.699578851 +0200
[detail] @@ -62,9 +62,9 @@
[detail]    case Qt::DisplayRole:
[detail]    case Qt::EditRole:
[detail]      if(index.column()==0) {
[detail] -      return QString::number(_values->at(index.row()).re());
[detail] +      return Number::toUserString(_values->at(index.row()).re(), 'f', -16);
[detail]      } else {
[detail] -      return QString::number(_values->at(index.row()).im());
[detail] +      return Number::toUserString(_values->at(index.row()).im(), 'f', -16);
[detail]      }
[detail]    default:
[detail]      return QVariant();
[detail] @@ -188,14 +188,21 @@
[detail]  {
[detail]    TRACE;
[detail]    ComplexPointOptions * options=static_cast<ComplexPointOptions *>(_transfer->pointOptions());
[detail] +  Axis * a=_transfer->graph()->yAxis();
[detail]    if(index==0) {
[detail]      options->setMode(ComplexPointOptions::AbsoluteValue);
[detail] -    _transfer->graph()->yAxis()->setScaleType(Scale::Log);
[detail] -    _transfer->graph()->yAxis()->setTitle(tr("[V/(m/s)]"));
[detail] +    a->setScaleType(Scale::Log);
[detail] +    a->setNumberType('e');
[detail] +    a->setAutoTicks(false);
[detail] +    a->setMajorTicks(10);
[detail] +    a->setMinorTicks(2);
[detail] +    a->setTitle(tr("[V/(m/s)]"));
[detail]    } else {
[detail]      options->setMode(ComplexPointOptions::Phase);
[detail] -    _transfer->graph()->yAxis()->setScaleType(Scale::Linear);
[detail] -    _transfer->graph()->yAxis()->setTitle(tr("Phase [radians]"));
[detail] +    a->setScaleType(Scale::Linear);
[detail] +    a->setNumberType('f');
[detail] +    a->setAutoTicks(true);
[detail] +    a->setTitle(tr("Phase [radians]"));
[detail]    }
[detail]    setTransferPlotLimits();
[detail]  }
[detail] @@ -206,15 +213,21 @@
[detail]    _response.setName(text);
[detail]  }
[detail]  
[detail] -void InstrumentalResponseWidget::on_noiseEdit_textChanged(QString text)
[detail] +void InstrumentalResponseWidget::on_filterEdit_textChanged(QString text)
[detail]  {
[detail]    TRACE;
[detail]    bool ok=true;
[detail] -  double val=Number::toDouble(text, ok);
[detail] -  if(ok) {
[detail] -    _response.setNoiseLevel(val);
[detail] -    updatePlots();
[detail] +  const QChar * ptr=nullptr;
[detail] +  StringSection content(text);
[detail] +  StringSection f;
[detail] +  for(int i=0; i<4; i++) {
[detail] +    f=content.nextField(ptr);
[detail] +    _response.setFilterFrequency(i, f.toDouble(ok));
[detail]    }
[detail] +  if(!_response.isValidFilter()) {
[detail] +    App::log(tr("Four frequencies separated by a white space are required: f1<f2<f3<f4.\n"));
[detail] +  }
[detail] +  updatePlots();
[detail]  }
[detail]  
[detail]  void InstrumentalResponseWidget::on_transductionEdit_textChanged(QString text)
[detail] @@ -301,7 +314,11 @@
[detail]    curve.resize(frequency.count());
[detail]    for(int i=frequency.count()-1; i>=0; i--) {
[detail]      double f=frequency.value(i);
[detail] -    curve.at(i)=ComplexStatisticalPoint(f, _response.value(f));
[detail] +    Complex h=_response.value(f);
[detail] +    h*=_response.filter(f);
[detail] +    h*=_response.normalizationFactor();
[detail] +    h*=_response.transductionFactor();
[detail] +    curve.at(i)=ComplexStatisticalPoint(f, h);
[detail]    }
[detail]    static_cast<ComplexStatisticalLine *>(_transfer->line(0))->setCurve(curve);
[detail]    setTransferPlotLimits();
[detail] @@ -319,7 +336,7 @@
[detail]    blockSignals(true);
[detail]    normalizationEdit->setText(Number::toString(_response.normalizationFactor(), 'g', 6));
[detail]    transductionEdit->setText(Number::toString(_response.transductionFactor(), 'g', 6));
[detail] -  noiseEdit->setText(Number::toString(_response.noiseLevel(), 'g', 6));
[detail] +  filterEdit->setText(_response.filterFrequencies());
[detail]    frequencyEdit->setCurrentIndex((_response.frequencyFactor()==1.0) ? 0 : 1);
[detail]    blockSignals(false);
[detail]    updatePlots();
[detail]                  src/LoadFilePattern.cpp:  version-3.4.0	modified out of comments
[detail] --- src/LoadFilePattern.cpp-version-3.4.0-stripped	2025-09-28 04:01:20.711578909 +0200
[detail] +++ src/LoadFilePattern.cpp-HEAD-stripped	2025-09-28 04:01:20.715578929 +0200
[detail] @@ -2,6 +2,35 @@
[detail]  
[detail]  #include "LoadFilePattern.h"
[detail]  
[detail] +ImportThread::ImportThread(QObject * parent)
[detail] +    : Thread(parent)
[detail] +{
[detail] +  _db=nullptr;
[detail] +}
[detail] +
[detail] +void ImportThread::start(SignalDatabase * db, const QString& filePattern)
[detail] +{
[detail] +  _db=db;
[detail] +  _filePattern=filePattern;
[detail] +  Thread::start();
[detail] +}
[detail] +
[detail] +void ImportThread::run()
[detail] +{
[detail] +  int appVerbosity=App::verbosity();
[detail] +  if(appVerbosity<1) { 
[detail] +    AbstractStream::setApplicationVerbosity(1);
[detail] +  }
[detail] +  QElapsedTimer chrono;
[detail] +  chrono.start();
[detail] +  _db->load(_filePattern, SignalFileFormat::Unknown, true);
[detail] +  qint64 t=chrono.nsecsElapsed();
[detail] +  App::log(tr("Import completed after %1\n").arg(Number::secondsToDuration(t*1e-9)));
[detail] +  if(appVerbosity<1) {
[detail] +    AbstractStream::setApplicationVerbosity(appVerbosity);
[detail] +  }
[detail] +}
[detail] +
[detail]  
[detail]  
[detail]  
[detail] @@ -11,12 +40,17 @@
[detail]    TRACE;
[detail]    setupUi(this);
[detail]    filePatternEdit->addItems(Settings::getHistory("LoadFilePattern"));
[detail] +  _db=nullptr;
[detail] +  _import=new ImportThread(this);
[detail] +  Application::instance()->setStream(importLog , _import);
[detail] +  connect(_import, SIGNAL(finished()), this, SLOT(importFinished()));
[detail]  }
[detail]  
[detail]  
[detail]  LoadFilePattern::~LoadFilePattern()
[detail]  {
[detail]    TRACE;
[detail] +  importLog->remove();
[detail]  }
[detail]  
[detail]  void LoadFilePattern::on_browseDirectories_clicked()
[detail] @@ -30,5 +64,51 @@
[detail]  
[detail]  void LoadFilePattern::saveHistory()
[detail]  {
[detail] +  TRACE;
[detail]    Settings::setHistory("LoadFilePattern", filePatternEdit->currentText());
[detail]  }
[detail] +
[detail] +void LoadFilePattern::closeEvent(QCloseEvent * event)
[detail] +{
[detail] +  TRACE;
[detail] +  if(_import->isRunning()) {
[detail] +    event->ignore();
[detail] +  } else {
[detail] +    event->accept();
[detail] +  }
[detail] +}
[detail] +
[detail] +void LoadFilePattern::on_startBut_clicked()
[detail] +{
[detail] +  TRACE;
[detail] +  startBut->setEnabled(false);
[detail] +  closeBut->setEnabled(false);
[detail] +  MessageContext mc;
[detail] +  QDir baseDir=baseDirectoryEdit->text();
[detail] +  _import->start(_db, baseDir.absoluteFilePath(filePatternEdit->currentText()));
[detail] +  stopBut->setEnabled(true);
[detail] +}
[detail] +
[detail] +void LoadFilePattern::on_stopBut_clicked()
[detail] +{
[detail] +  TRACE;
[detail] +  _db->stopLoad();
[detail] +}
[detail] +
[detail] +void LoadFilePattern::importFinished()
[detail] +{
[detail] +  TRACE;
[detail] +  startBut->setEnabled(true);
[detail] +  stopBut->setEnabled(false);
[detail] +  closeBut->setEnabled(true);
[detail] +}
[detail] +
[detail] +void LoadFilePattern::on_closeBut_clicked()
[detail] +{
[detail] +  TRACE;
[detail] +  while(_import->isRunning()) {
[detail] +    QApplication::processEvents();
[detail] +    App::sleep(500);
[detail] +  }
[detail] +  close();
[detail] +}
[detail]                  src/MagnifierSignal.cpp:  version-3.4.0	modified out of comments
[detail] --- src/MagnifierSignal.cpp-version-3.4.0-stripped	2025-09-28 04:01:20.731579006 +0200
[detail] +++ src/MagnifierSignal.cpp-HEAD-stripped	2025-09-28 04:01:20.735579025 +0200
[detail] @@ -34,9 +34,10 @@
[detail]    w->xAxis()->setRange(0.0, 0.1);
[detail]  }
[detail]  
[detail] -void MagnifierSignal::setSignal(SubSignalPool * parentSubPool, Signal * sig)
[detail] +void MagnifierSignal::setSignal(SubSignalPool * parentSubPool, SignalSegment * sig)
[detail]  {
[detail]    TRACE;
[detail] +  beginSubPoolUpdate();
[detail]    subPool().removeAll();
[detail]    if(_context <= 0) {
[detail]      subPool().addSignal(sig);
[detail] @@ -56,7 +57,7 @@
[detail]    
[detail]    AxisWindow * w=_cursorLayer->graph();
[detail]    double dt=w->xAxis()->maximum()-w->xAxis()->minimum();
[detail] -  subPoolUpdate();
[detail] +  endSubPoolUpdate();
[detail]    w->xAxis()->setRange(0.0, dt);
[detail]  }
[detail]  
[detail]                       src/MainWindow.cpp:  version-3.4.0	modified out of comments
[detail] --- src/MainWindow.cpp-version-3.4.0-stripped	2025-09-28 04:01:20.751579103 +0200
[detail] +++ src/MainWindow.cpp-HEAD-stripped	2025-09-28 04:01:20.755579122 +0200
[detail] @@ -32,7 +32,7 @@
[detail]  
[detail]    resize(QSize(674, 523).expandedTo(minimumSizeHint()));
[detail]    Settings::getRect(this, "MainWindow");
[detail] -  setWindowIcon(QIcon(":logo-16x16.png"));
[detail] +  setWindowIcon(QIcon(":geopsy-16x16.png"));
[detail]    
[detail]  
[detail]    _dbStatusChecksum=0;
[detail] @@ -142,22 +142,20 @@
[detail]                * viewChronogramToolBut=nullptr;
[detail]    QList<QToolButton *> toolButList=findChildren<QToolButton *>();
[detail]    for(QList<QToolButton *>::iterator it=toolButList.begin(); it!=toolButList.end(); ++it) {
[detail] -    if(( *it) ->defaultAction()==_viewGraphicAction)
[detail] +    if((*it)->defaultAction()==_viewGraphicAction) {
[detail]        viewGraphicToolBut=*it;
[detail] -    else if((*it)->defaultAction()==_viewTableAction)
[detail] +    } else if((*it)->defaultAction()==_viewTableAction) {
[detail]        viewTableToolBut=* it;
[detail] -    else if((*it)->defaultAction()==_viewMapAction)
[detail] +    } else if((*it)->defaultAction()==_viewMapAction) {
[detail]        viewMapToolBut=* it;
[detail] -    else if((*it)->defaultAction()==_viewChronogramAction)
[detail] +    } else if((*it)->defaultAction()==_viewChronogramAction) {
[detail]        viewChronogramToolBut=*it;
[detail]    }
[detail] -  ASSERT(viewGraphicToolBut!=nullptr &&
[detail] -         viewTableToolBut!=nullptr &&
[detail] -         viewMapToolBut!=nullptr);
[detail] -  if(viewGraphicToolBut &&
[detail] +  }
[detail] +  ASSERT(viewGraphicToolBut &&
[detail]       viewTableToolBut &&
[detail]       viewMapToolBut &&
[detail] -     viewChronogramToolBut) {
[detail] +         viewChronogramToolBut);
[detail]      SigSelectionDnD * sigDnD=new SigSelectionDnD(viewGraphicToolBut);
[detail]      sigDnD->setDragEnabled(false);
[detail]      connect(sigDnD, SIGNAL(selectionDropped(QWidget *, const SubSignalPool&)),
[detail] @@ -174,7 +172,6 @@
[detail]      sigDnD->setDragEnabled(false);
[detail]      connect(sigDnD, SIGNAL(selectionDropped(QWidget *, const SubSignalPool&)),
[detail]               Engine::instance(), SLOT(newChronogramWindow(QWidget *, const SubSignalPool&)));
[detail] -  }
[detail]  
[detail]    QSettings& reg=CoreApplication::instance()->settings();
[detail]    if(!restoreState(reg.value("Workspace").toByteArray(), 0)) {
[detail] @@ -238,13 +235,13 @@
[detail]  
[detail]    uint checksum=static_cast<uint>(_db->count());
[detail]    checksum+=static_cast<uint>(_db->filePool().count());
[detail] -  checksum+=static_cast<uint>(cache.freeMegaBytes()*1e6);
[detail] +  checksum+=static_cast<uint>(cache.freeBytes());
[detail]    checksum+=qHash(_db->name());
[detail]    if(checksum!=_dbStatusChecksum) {
[detail] -    databaseInfo->setText(tr("%1 signals, %2 files, free cache %3 Mb")
[detail] +    databaseInfo->setText(tr("%1 signals, %2 files, free cache %3")
[detail]                             .arg(_db->count())
[detail]                             .arg(_db->filePool().count())
[detail] -                           .arg(cache.freeMegaBytes()));
[detail] +                           .arg(Number::bytesToString(cache.freeBytes())));
[detail]      if(_db->name().isEmpty()) {
[detail]        setWindowTitle("Geopsy");
[detail]      } else {
[detail] @@ -348,15 +345,17 @@
[detail]  void MainWindow::loadFilePattern()
[detail]  {
[detail]    TRACE;
[detail] -  LoadFilePattern * d=new LoadFilePattern;
[detail] +  LoadFilePattern * d=new LoadFilePattern(this);
[detail]    Settings::getWidget(d);
[detail] -  if(d->exec()==QDialog::Accepted) {
[detail] +  
[detail] +  _groupList->beginResetModel();
[detail] +  _db->masterGroup()->blockSignals(true);
[detail] +  d->setDatabase(_db);
[detail] +  d->exec();
[detail]      Settings::setWidget(d);
[detail]      d->saveHistory();
[detail] -    MessageContext mc;
[detail] -    QDir baseDir=d->baseDirectory();
[detail] -    _db->load(baseDir.absoluteFilePath(d->filePattern()), SignalFileFormat::Unknown, true);
[detail] -  }
[detail] +  _db->masterGroup()->blockSignals(false);
[detail] +  _groupList->endResetModel();
[detail]    delete d;
[detail]  }
[detail]  
[detail] @@ -365,7 +364,7 @@
[detail]    TRACE;
[detail]    MessageContext mc;
[detail]    if(!_directoryMonitor) {
[detail] -    _directoryMonitor=new DirectoryMonitor();
[detail] +    _directoryMonitor=new DirectoryMonitor(this);
[detail]      connect(_directoryMonitor, SIGNAL(destroyed()), this, SLOT(directoryMonitorDestroyed()));
[detail]      addSubWindow(_directoryMonitor);
[detail]    }
[detail] @@ -462,11 +461,23 @@
[detail]    _fileList->endAddFile();
[detail]  }
[detail]  
[detail] -void MainWindow::filesRemoved(const QList<SignalFile *>& fList)
[detail] +void MainWindow::beginRemoveFile(int index)
[detail] +{
[detail] +  TRACE;
[detail] +  _fileList->beginRemoveFile(index);
[detail] +}
[detail] +
[detail] +void MainWindow::endRemoveFile()
[detail] +{
[detail] +  TRACE;
[detail] +  _fileList->endRemoveFile();
[detail] +}
[detail] +
[detail] +void MainWindow::filesRemoved(const QList<SignalFileIndex>& fList)
[detail]  {
[detail]    if(_directoryMonitor) {
[detail] -    for(QList<SignalFile *>::ConstIterator it=fList.begin();it!=fList.end();++it) {
[detail] -      _directoryMonitor->removeFile((*it)->name());
[detail] +    for(QList<SignalFileIndex>::const_iterator it=fList.begin();it!=fList.end();++it) {
[detail] +      _directoryMonitor->removeFile(*it);
[detail]      }
[detail]    }
[detail]  }
[detail] @@ -985,8 +996,9 @@
[detail]    if(d->exec()==QDialog::Accepted) {
[detail]      Settings::setWidget(d);
[detail]      d->save();
[detail] +    _subPoolWin->beginSubPoolUpdate();
[detail]      _subPoolWin->subPool().sort();
[detail] -    _subPoolWin->subPoolUpdate();
[detail] +    _subPoolWin->endSubPoolUpdate();
[detail]    }
[detail]    delete d;
[detail]  }
[detail] @@ -1020,20 +1032,21 @@
[detail]    }
[detail]    delete sr;
[detail]    if(d->exec()==QDialog::Accepted) {
[detail] +    _subPoolWin->beginSubPoolUpdate();
[detail]      Settings::setWidget(d);
[detail]      SubSignalPool::iterator it;
[detail]      SubSignalPool& subPool=_subPoolWin->subPool();
[detail]      for(it=subPool.begin();it!=subPool.end();++it) {
[detail] -      Signal * sig=*it;
[detail] +      SignalSegment * sig=*it;
[detail]        bool ok;
[detail]        Point p=d->lookup(sig, ok);
[detail]        if(ok) {
[detail] -        sig->setReceiver(p);
[detail] -        sig->setUtmZone(d->utmZone());
[detail] +        sig->metaData()->setReceiver(p);
[detail] +        sig->metaData()->setUtmZone(d->utmZone());
[detail]        }
[detail] -      sig->setHeaderModified(true);
[detail] +      sig->metaData()->setModified(true);
[detail]      }
[detail] -    _subPoolWin->subPoolUpdate();
[detail] +    _subPoolWin->endSubPoolUpdate();
[detail]    }
[detail]    delete d;
[detail]  }
[detail] @@ -1063,10 +1076,13 @@
[detail]      Settings::setWidget(d, "GroupProperties");
[detail]      dg->setProperties(g);
[detail]      Settings::setHistory("GroupNames", g->name());
[detail] +    if(!dg->isKeepSignalOrder()) {
[detail] +      g->sortByIds();
[detail] +    }
[detail]      if(dg->isMultiGroupKey()) {
[detail]        MetaDataIndex key=dg->splitKey();
[detail]        SubSignalPool& subPool=_subPoolWin->subPool();
[detail] -      Signal * sig=subPool.at(0);
[detail] +      SignalSegment * sig=subPool.at(0);
[detail]        QVariant val=sig->header(key);
[detail]        SubSignalPool splitGroupSubPool;
[detail]        splitGroupSubPool.addSignal(sig);
[detail]                        src/MapWindow.cpp:  version-3.4.0	modified out of comments
[detail] --- src/MapWindow.cpp-version-3.4.0-stripped	2025-09-28 04:01:20.771579200 +0200
[detail] +++ src/MapWindow.cpp-HEAD-stripped	2025-09-28 04:01:20.775579218 +0200
[detail] @@ -67,7 +67,7 @@
[detail]    SubPoolWindow::setWindowTitle("Map - "+title);
[detail]  }
[detail]  
[detail] -void MapWindow::subPoolUpdate ()
[detail] +void MapWindow::endSubPoolUpdate()
[detail]  {
[detail]    TRACE;
[detail]    if(subPool().isEmpty()) {
[detail] @@ -75,11 +75,12 @@
[detail]      return;
[detail]    }
[detail]    if(subPool().count()==1) {
[detail] -    Signal& sig=*subPool().at(0);
[detail] -    QString traceName=sig.name()+" "+sig.componentLetter(sig.component());
[detail] +    SignalMetaData * sig=subPool().at(0)->metaData();
[detail] +    QString traceName=sig->name()+" "+sig->componentLetter(sig->component());
[detail]      setWindowTitle(traceName);
[detail] +  } else {
[detail] +    setWindowTitle(subPool().name());
[detail]    }
[detail] -  else setWindowTitle(subPool().name());
[detail]    endSignalChange();
[detail]    
[detail]    if(GeopsyCoreEngine::instance()->preferences()->restoreMapMakeUp()) {
[detail] @@ -87,19 +88,19 @@
[detail]    }
[detail]  }
[detail]  
[detail] -void MapWindow::endSignalChange(Signal * sig)
[detail] +void MapWindow::endSignalChange(SignalSegment * sig)
[detail]  {
[detail]    TRACE;
[detail]    if(subPool().isEmpty()) return;
[detail]    _map->mapLayer()->clear();
[detail]    SubSignalPool::iterator it;
[detail]    for(it=subPool().begin(); it!=subPool().end(); ++it) {
[detail] -    Signal * sig=*it;
[detail] +    SignalSegment * sig=*it;
[detail]      Curve<NamedPoint>& c=static_cast<NameLine *>(_map->addLine())->curve();
[detail]      c.resize(1);
[detail]      NamedPoint& p=c.at(0);
[detail] -    p=sig->receiver();
[detail] -    p.setName(sig->name());
[detail] +    p=sig->metaData()->receiver();
[detail] +    p.setName(sig->metaData()->name());
[detail]    }
[detail]    setLimits();
[detail]    _map->deepUpdate();
[detail] @@ -133,9 +134,9 @@
[detail]      
[detail]      double mind=std::numeric_limits<double>::infinity();
[detail]      for(int i=0; i<n; i++) {
[detail] -      const Point& p1=subPool().at(i)->receiver();
[detail] +      const Point& p1=subPool().at(i)->metaData()->receiver();
[detail]        for(int j=i; j<n; j++) {
[detail] -        double d=subPool().at(j)->receiver().distanceTo(p1);
[detail] +        double d=subPool().at(j)->metaData()->receiver().distanceTo(p1);
[detail]          if(d>0.0 && d<mind) {
[detail]            mind=d;
[detail]          }
[detail] @@ -144,8 +145,8 @@
[detail]      mind*=0.5;
[detail]      APP_LOG(1, tr("Maximum distance to match=%1 m\n").arg(mind));
[detail]      for(int i=0; i<n; i++) {
[detail] -      const Point& p=subPool().at(i)->receiver();
[detail] -      APP_LOG(1, tr("Sensor '%1' at %2\n").arg(subPool().at(i)->name()).arg(p.toString()));
[detail] +      const Point& p=subPool().at(i)->metaData()->receiver();
[detail] +      APP_LOG(1, tr("Sensor '%1' at %2\n").arg(subPool().at(i)->metaData()->name()).arg(p.toString()));
[detail]        for(QList<NamedPoint>::iterator it=points.begin(); it!=points.end(); it++) {
[detail]          APP_LOG(1, tr("  distance to '%1'= %2 m\n")
[detail]                     .arg(it->name()).arg(p.distanceTo(*it)));
[detail]                   src/OperandSignals.cpp:  version-3.4.0	modified out of comments
[detail] --- src/OperandSignals.cpp-version-3.4.0-stripped	2025-09-28 04:01:20.791579296 +0200
[detail] +++ src/OperandSignals.cpp-HEAD-stripped	2025-09-28 04:01:20.795579315 +0200
[detail] @@ -25,8 +25,9 @@
[detail]    
[detail]    signalList->clear();
[detail]    int n=subPool->count();
[detail] -  for(int i=0;i<n;i++ )
[detail] -    signalList->addItem(tr("%1. %2").arg(i+1).arg(subPool->at(i)->name()));
[detail] +  for(int i=0; i<n; i++) {
[detail] +    signalList->addItem(tr("%1. %2").arg(i+1).arg(subPool->at(i)->metaData()->name()));
[detail] +  }
[detail]    
[detail]    SignalDatabase * db=Engine::instance()->database(this);
[detail]    ASSERT(db);
[detail]                       src/PickEvents.cpp:  version-3.4.0	not modified
[detail]                      src/Preferences.cpp:  version-3.4.0	not modified
[detail]                 src/RotateComponents.cpp:  version-3.4.0	not modified
[detail]             src/SeismicEventDelegate.cpp:  version-3.4.0	not modified
[detail]                 src/SeismicEventView.cpp:  version-3.4.0	not modified
[detail]               src/SeismicEventWidget.cpp:  version-3.4.0	not modified
[detail]                   src/SetTableFields.cpp:  version-3.4.0	not modified
[detail]                  src/SigSelectionDnD.cpp:  version-3.4.0	not modified
[detail]                    src/SignalDisplay.cpp:  version-3.4.0	not modified
[detail]              src/SignalTableDelegate.cpp:  version-3.4.0	modified out of comments
[detail] --- src/SignalTableDelegate.cpp-version-3.4.0-stripped	2025-09-28 04:01:20.939580012 +0200
[detail] +++ src/SignalTableDelegate.cpp-HEAD-stripped	2025-09-28 04:01:20.943580030 +0200
[detail] @@ -29,6 +29,8 @@
[detail]        w->addItem(tr("Displacement"));
[detail]        w->addItem(tr("Velocity"));
[detail]        w->addItem(tr("Acceleration"));
[detail] +      w->addItem(tr("Strain"));
[detail] +      w->addItem(tr("StrainRate"));
[detail]        w->addItem(tr("Custom"));
[detail]        w->setEnabled(!readOnly);
[detail]        return w;
[detail]                  src/SignalTableItem.cpp:  version-3.4.0	modified out of comments
[detail] --- src/SignalTableItem.cpp-version-3.4.0-stripped	2025-09-28 04:01:20.959580108 +0200
[detail] +++ src/SignalTableItem.cpp-HEAD-stripped	2025-09-28 04:01:20.963580128 +0200
[detail] @@ -47,7 +47,7 @@
[detail]  {
[detail]    TRACE;
[detail]    if(!index.isValid()) return QVariant();
[detail] -  Signal * sig=_subPool->at(index.row());
[detail] +  SignalSegment * sig=_subPool->at(index.row());
[detail]    switch (role) {
[detail]    case Qt::EditRole:
[detail]    case Qt::DisplayRole: {
[detail] @@ -57,14 +57,14 @@
[detail]          return Number::secondsToDuration(sig->header(field).toDouble());
[detail]        default:
[detail]          if(field.id()==Comments::staticId()) {
[detail] -          return sig->metaData<Comments>().value().trimmed();
[detail] +          return sig->metaData()->optionalData().get<Comments>().value().trimmed();
[detail]          } else {
[detail]            return sig->header(field);
[detail]          }
[detail]        }
[detail]      }
[detail]    case Qt::ToolTipRole: {
[detail] -      QString cmt=sig->metaData<Comments>().value();
[detail] +      QString cmt=sig->metaData()->optionalData().get<Comments>().value();
[detail]        if(cmt.isEmpty()) {
[detail]          return QVariant();
[detail]        } else {
[detail] @@ -82,13 +82,13 @@
[detail]    if(!index.isValid() ||
[detail]       index.row()>=_subPool->count() ||
[detail]       index.column()>=_dataFields.count()) return false;
[detail] -  Signal * sig=_subPool->at(index.row());
[detail] +  SignalSegment * sig=_subPool->at(index.row());
[detail]    switch (role) {
[detail]    case Qt::EditRole: {
[detail]        const MetaDataField& field=_dataFields.at(index.column());
[detail]        GeopsyGuiEngine::instance()->beginSignalChange(sig);
[detail]        if(sig->setHeader(field, value) ) {
[detail] -        sig->setHeaderModified(true);
[detail] +        sig->metaData()->setModified(true);
[detail]        } else {
[detail]          SignalDatabase * db=database();
[detail]          if(db) {
[detail]                  src/SignalTableView.cpp:  version-3.4.0	modified out of comments
[detail] --- src/SignalTableView.cpp-version-3.4.0-stripped	2025-09-28 04:01:20.983580224 +0200
[detail] +++ src/SignalTableView.cpp-HEAD-stripped	2025-09-28 04:01:20.987580243 +0200
[detail] @@ -23,7 +23,7 @@
[detail]  }
[detail]  
[detail]  
[detail] -void SignalTableView::beginSignalChange(Signal * sig)
[detail] +void SignalTableView::beginSignalChange(SignalSegment * sig)
[detail]  {
[detail]    TRACE;
[detail]    SignalTableItem& m=*static_cast<SignalTableItem *>(model());
[detail] @@ -33,7 +33,7 @@
[detail]  }
[detail]  
[detail]  
[detail] -void SignalTableView::endSignalChange(Signal * sig)
[detail] +void SignalTableView::endSignalChange(SignalSegment * sig)
[detail]  {
[detail]    TRACE;
[detail]    SignalTableItem& m=*static_cast<SignalTableItem *>(model());
[detail]                         src/SortKeys.cpp:  version-3.4.0	not modified
[detail]                 src/SortKeysDelegate.cpp:  version-3.4.0	not modified
[detail]                    src/SortKeysModel.cpp:  version-3.4.0	not modified
[detail]                src/SourceCoordinates.cpp:  version-3.4.0	modified out of comments
[detail] --- src/SourceCoordinates.cpp-version-3.4.0-stripped	2025-09-28 04:01:21.051580552 +0200
[detail] +++ src/SourceCoordinates.cpp-HEAD-stripped	2025-09-28 04:01:21.055580572 +0200
[detail] @@ -111,7 +111,7 @@
[detail]    applyBut->setEnabled(true);
[detail]  }
[detail]  
[detail] -QString SourceCoordinates::keyName(Signal * sig)
[detail] +QString SourceCoordinates::keyName(SignalSegment * sig)
[detail]  {
[detail]    TRACE;
[detail]    _keyExpressionContext.setSignal(sig);
[detail]                           src/StaLta.cpp:  version-3.4.0	not modified
[detail]               src/StationCoordinates.cpp:  version-3.4.0	modified out of comments
[detail] --- src/StationCoordinates.cpp-version-3.4.0-stripped	2025-09-28 04:01:21.079580688 +0200
[detail] +++ src/StationCoordinates.cpp-HEAD-stripped	2025-09-28 04:01:21.087580726 +0200
[detail] @@ -108,7 +108,7 @@
[detail]    return ret;
[detail]  }
[detail]  
[detail] -Point StationCoordinates::lookup(Signal * sig, bool& ok)
[detail] +Point StationCoordinates::lookup(SignalSegment * sig, bool& ok)
[detail]  {
[detail]    TRACE;
[detail]    if( !_map) beginMap();
[detail] @@ -161,22 +161,22 @@
[detail]    model()->beginStationChange();
[detail]    beginMap();
[detail]    for(SubSignalPool::iterator it=subPool->begin(); it!= subPool->end(); it++ ) {
[detail] -    Signal * sig=*it;
[detail] +    SignalSegment * sig=*it;
[detail]      if(addStation(keyName(sig), coordinates(sig), true)) {
[detail]        App::log(tr("Station '%1' found with different coordinates. You will not be able to change coordinates of signals. "
[detail] -                          "Check that all components have the the same coordinates.\n").arg(sig->name()));
[detail] +                          "Check that all components have the the same coordinates.\n").arg(sig->metaData()->name()));
[detail]        ambiguities=true;
[detail]      }
[detail]      if(_utmZone.isValid()) {
[detail] -      if(sig->utmZone().isValid() && sig->utmZone()!=_utmZone) {
[detail] +      if(sig->metaData()->utmZone().isValid() && sig->metaData()->utmZone()!=_utmZone) {
[detail]          App::log(tr("UTM zone is '%1' and station '%2' belongs to UTM zone %3. Geopsy only works with metric Cartesian "
[detail]                      "coordinates within a single UTM zone. A database may contain signal from various UTM zones but they "
[detail]                      "cannot be processed together (for signal processing based on station coordinates).\n")
[detail] -                         .arg(_utmZone.toString()).arg(sig->name()).arg(sig->utmZone().toString()));
[detail] +                         .arg(_utmZone.toString()).arg(sig->metaData()->name()).arg(sig->metaData()->utmZone().toString()));
[detail]          ambiguities=true;
[detail]        }
[detail]      } else {
[detail] -      _utmZone=sig->utmZone();
[detail] +      _utmZone=sig->metaData()->utmZone();
[detail]      }
[detail]    }
[detail]    endMap();
[detail]                src/SubtractGroupItem.cpp:  version-3.4.0	not modified
[detail]                    src/SubtractValue.cpp:  version-3.4.0	not modified
[detail]                      src/TableWindow.cpp:  version-3.4.0	modified out of comments
[detail] --- src/TableWindow.cpp-version-3.4.0-stripped	2025-09-28 04:01:21.131580939 +0200
[detail] +++ src/TableWindow.cpp-HEAD-stripped	2025-09-28 04:01:21.135580958 +0200
[detail] @@ -63,13 +63,23 @@
[detail]    SubPoolWindow::setWindowTitle("Table - "+title);
[detail]  }
[detail]  
[detail] -void TableWindow::subPoolUpdate()
[detail] +void TableWindow::beginSubPoolUpdate()
[detail] +{
[detail] +  TRACE;
[detail] +  if(!subPool().isEmpty()) {
[detail] +    beginSignalChange();
[detail] +  }
[detail] +}
[detail] +
[detail] +void TableWindow::endSubPoolUpdate()
[detail]  {
[detail]    TRACE;
[detail]    if(!subPool().isEmpty()) {
[detail]      setWindowTitle(subPool().name());
[detail]      endSignalChange();
[detail] -  } else setWindowTitle(QString());
[detail] +  } else {
[detail] +    setWindowTitle(QString());
[detail] +  }
[detail]  }
[detail]  
[detail]  void TableWindow::getSelection(SubSignalPool& sel)
[detail] @@ -117,13 +127,13 @@
[detail]    endSignalChange();
[detail]  }
[detail]  
[detail] -void TableWindow::beginSignalChange(Signal * sig)
[detail] +void TableWindow::beginSignalChange(SignalSegment * sig)
[detail]  {
[detail]    TRACE;
[detail]    _headers->beginSignalChange(sig);
[detail]  }
[detail]  
[detail] -void TableWindow::endSignalChange(Signal * sig)
[detail] +void TableWindow::endSignalChange(SignalSegment * sig)
[detail]  {
[detail]    TRACE;
[detail]    _headers->endSignalChange(sig);
[detail] @@ -134,8 +144,12 @@
[detail]  {
[detail]    TRACE;
[detail]    _headers->resizeColumnsToContents();
[detail] +  
[detail] +  
[detail] +  if(_headers->dataFields().isMultiLine()) {
[detail]    _headers->resizeRowsToContents();
[detail]  }
[detail] +}
[detail]  
[detail]  void TableWindow::setDataFields()
[detail]  {
[detail]                            src/Taper.cpp:  version-3.4.0	not modified
[detail]                      src/ToolFactory.cpp:  version-3.4.0	modified out of comments
[detail] --- src/ToolFactory.cpp-version-3.4.0-stripped	2025-09-28 04:01:21.167581113 +0200
[detail] +++ src/ToolFactory.cpp-HEAD-stripped	2025-09-28 04:01:21.171581132 +0200
[detail] @@ -243,7 +243,8 @@
[detail]      tool=info->createTool(slot, nullptr);
[detail]      tool->setLibSlot(info, slot);
[detail]      if(win->inherits("GraphicWindow")) {
[detail] -      connect(tool, SIGNAL(updateSubPool()), win, SLOT(subPoolUpdate()));
[detail] +      connect(tool, SIGNAL(beginUpdateSubPool()), win, SLOT(beginSubPoolUpdate()));
[detail] +      connect(tool, SIGNAL(endUpdateSubPool()), win, SLOT(endSubPoolUpdate()));
[detail]        GraphicWindow * gwin=static_cast<GraphicWindow *>(win);
[detail]        tool->setLayers(gwin->signalLayer(), gwin->pickLayer(), gwin->timeWindowLayer());
[detail]      }
[detail]                  src/ViewParamEditor.cpp:  version-3.4.0	not modified
[detail]                  src/WaveformConsole.cpp:  version-3.4.0	modified out of comments
[detail] --- src/WaveformConsole.cpp-version-3.4.0-stripped	2025-09-28 04:01:21.203581287 +0200
[detail] +++ src/WaveformConsole.cpp-HEAD-stripped	2025-09-28 04:01:21.207581307 +0200
[detail] @@ -10,6 +10,7 @@
[detail]  #include "AGC.h"
[detail]  #include "Taper.h"
[detail]  #include "CutSignal.h"
[detail] +#include "WhitenSignal.h"
[detail]  #include "DecimateAmplitude.h"
[detail]  #include "StaLta.h"
[detail]  #include "RotateComponents.h"
[detail] @@ -70,6 +71,7 @@
[detail]  
[detail]  void WaveformConsole::processUpdate()
[detail]  {
[detail] +  _subPoolWin->beginSubPoolUpdate();
[detail]    SignalProcess * p=_subPoolWin->signalProcess();
[detail]    commandHistory->setPlainText(p->history());
[detail]    QScrollBar * vBar=commandHistory->verticalScrollBar();
[detail] @@ -78,7 +80,7 @@
[detail]      
[detail]      setSteps(p->steps());
[detail]    }
[detail] -  _subPoolWin->subPoolUpdate();
[detail] +  _subPoolWin->endSubPoolUpdate();
[detail]  }
[detail]  
[detail]  void WaveformConsole::setSteps(const QStringList& steps)
[detail] @@ -151,12 +153,18 @@
[detail]    m->addAction(a);
[detail]  
[detail]    a=new QAction(tr("Subtract signals"), this);
[detail] -  a->setObjectName("S&ubtractSignals");
[detail] +  a->setObjectName("SubtractSignals");
[detail]    a->setShortcut(tr("Ctrl+Alt+Shift+S"));
[detail]    a->setStatusTip(tr("Subtract signals by other signals"));
[detail]    connect(a, SIGNAL(triggered()), this, SLOT(subtractSignals()));
[detail]    m->addAction(a);
[detail]  
[detail] +  a=new QAction(tr("Stack signals"), this);
[detail] +  a->setObjectName("StackSignals");
[detail] +  a->setStatusTip(tr("Stack all signals into a single one"));
[detail] +  connect(a, SIGNAL(triggered()), this, SLOT(stackSignals()));
[detail] +  m->addAction(a);
[detail] +
[detail]    a=new QAction(tr("Multipl&y"), this);
[detail]    a->setObjectName("Multiply");
[detail]    a->setShortcut(tr("Ctrl+Alt+Y"));
[detail] @@ -376,6 +384,14 @@
[detail]    delete d;
[detail]  }
[detail]  
[detail] +void WaveformConsole::stackSignals()
[detail] +{
[detail] +  TRACE;
[detail] +  if(!_subPoolWin) return;
[detail] +  _subPoolWin->signalProcess()->stackSignals();
[detail] +  processUpdate();
[detail] +}
[detail] +
[detail]  void WaveformConsole::multiply()
[detail]  {
[detail]    TRACE;
[detail] @@ -430,9 +446,17 @@
[detail]  {
[detail]    TRACE;
[detail]    if(!_subPoolWin) return;
[detail] -  _subPoolWin->signalProcess()->whiten();
[detail] +  WhitenSignal * d=new WhitenSignal(this);
[detail] +  Settings::getWidget(d);
[detail] +  if(d->exec()==QDialog::Accepted) {
[detail] +    Settings::setWidget(d);
[detail] +    _subPoolWin->signalProcess()->whiten(d->minimumFrequency(),
[detail] +                                         d->maximumFrequency(),
[detail] +                                         0.01*d->apodization());
[detail]    processUpdate();
[detail]  }
[detail] +  delete d;
[detail] +}
[detail]  
[detail]  void WaveformConsole::stddevClip()
[detail]  {
[detail] @@ -644,8 +668,10 @@
[detail]  {
[detail]    TRACE;
[detail]    if(!_subPoolWin) return;
[detail] -  if(!_subPoolWin->subPool().associate3Components()) return;
[detail] -  _subPoolWin->subPoolUpdate();
[detail] +  _subPoolWin->beginSubPoolUpdate();
[detail] +  bool ok=_subPoolWin->subPool().associate3Components();
[detail] +  _subPoolWin->endSubPoolUpdate();
[detail] +  if(ok) {
[detail]    RotateComponents * d=new RotateComponents(this);
[detail]    Settings::getWidget(d);
[detail]    d->updateAll();
[detail] @@ -656,6 +682,7 @@
[detail]    }
[detail]    delete d;
[detail]  }
[detail] +}
[detail]  
[detail]  void WaveformConsole::correlations()
[detail]  {
[detail]                     src/WhitenSignal.cpp:  version-3.4.0	no last version available
[detail]                src/WindowEnvironment.cpp:  version-3.4.0	not modified
[detail]                             src/main.cpp:  version-3.4.0	modified out of comments
[detail] --- src/main.cpp-version-3.4.0-stripped	2025-09-28 04:01:21.243581480 +0200
[detail] +++ src/main.cpp-HEAD-stripped	2025-09-28 04:01:21.251581518 +0200
[detail] @@ -27,6 +27,7 @@
[detail]  int modeGroupList(int argc, char ** argv);
[detail]  int modeRecentDatabaseList(int argc, char ** argv);
[detail]  int modeGui(int argc, char ** argv, bool seedlinkView);
[detail] +int modeDatabase(int argc, char ** argv, QString exportFile);
[detail]  int modeExport(int argc, char ** argv, QString exportFile);
[detail]  int modeWaveform(int argc, char ** argv, QString exportFile);
[detail]  
[detail] @@ -41,7 +42,7 @@
[detail]  {
[detail]    skipOpenBlasMultiThreading();
[detail]    
[detail] -  enum Mode {Gui, Export, Waveform, GroupList, RecentDatabaseList, SeedlinkView};
[detail] +  enum Mode {Gui, Export, Database, Waveform, GroupList, RecentDatabaseList, SeedlinkView};
[detail]    Mode mode=Gui;
[detail]    QString toolName, exportFile, waveformFile;
[detail]  
[detail] @@ -69,6 +70,10 @@
[detail]        } else if(arg=="-group") {
[detail]          CoreApplication::checkOptionArg(i, argc, argv);
[detail]          groupName=argv[i];
[detail] +      } else if(arg=="-save") {
[detail] +        CoreApplication::checkOptionArg(i, argc, argv);
[detail] +        exportFile=argv[i];
[detail] +        mode=Database;
[detail]        } else if(arg=="-export") {
[detail]          CoreApplication::checkOptionArg(i, argc, argv);
[detail]          exportFile=argv[i];
[detail] @@ -148,6 +153,8 @@
[detail]    case SeedlinkView:
[detail]    case Gui:
[detail]      break;
[detail] +  case Database:
[detail] +    return modeDatabase(argc, argv, exportFile);
[detail]    case Export:
[detail]      return modeExport(argc, argv, exportFile);
[detail]    case Waveform:
[detail] @@ -165,6 +172,7 @@
[detail]      return 2;
[detail]    }
[detail]  
[detail] +  Engine gp;
[detail]    SciFigsGlobal s(true);
[detail]    
[detail]    GeopsyAbout * splash=new GeopsyAbout(nullptr, Qt::SplashScreen | Qt::WindowStaysOnTopHint);
[detail] @@ -183,7 +191,6 @@
[detail]    qApp->connect(qApp, SIGNAL(aboutToQuit()), splash, SLOT(close()));
[detail]  
[detail]    
[detail] -  Engine gp;
[detail]    WindowEnvironment we;
[detail]    MainWindow * w=static_cast<MainWindow *>(we.addWindow());
[detail]    if(debugStream) {
[detail] @@ -262,7 +269,52 @@
[detail]      App::log(tr("geopsy: no signal available, check options -file, -db or -group, see -h for help\n") );
[detail]      return 2;
[detail]    }
[detail] -  return subPool.save(exportFile, useOriginalBaseName, exportFormat, maximumSignalsPerFile);
[detail] +  return subPool.save(exportFile, useOriginalBaseName, exportFormat, maximumSignalsPerFile) ? 0 : 2;
[detail] +}
[detail] +
[detail] +int modeDatabase(int argc, char ** argv, QString exportFile)
[detail] +{
[detail] +  CoreApplication a(argc, argv, help);
[detail] +
[detail] +  
[detail] +  bool showProgress=false;
[detail] +  
[detail] +  int j=1;
[detail] +  for(int i=1; i<argc; i++) {
[detail] +    QByteArray arg=argv[i];
[detail] +    if(arg[0]=='-') {
[detail] +      if(arg=="-progress") {
[detail] +        showProgress=true;
[detail] +      } else {
[detail] +        argv[j++]=argv[i];
[detail] +      }
[detail] +    } else {
[detail] +      argv[j++]=argv[i];
[detail] +    }
[detail] +  }
[detail] +  if(j<argc) {
[detail] +    argv[j]=nullptr;
[detail] +    argc=j;
[detail] +  }
[detail] +
[detail] +  if(exportFile.isEmpty()) {
[detail] +    App::log(tr("geopsy: export file name is empty, see -h\n") );
[detail] +    return 2;
[detail] +  }
[detail] +  Engine gp;
[detail] +  gp.setConsoleProgress(showProgress);
[detail] +  SignalDatabase db;
[detail] +  signalFiles+=CoreApplication::getFileList(argc, argv);
[detail] +  SubSignalPool subPool=db.load(database, groupName, signalFiles, format, false);
[detail] +  if(!CoreApplication::checkRemainingArgs(argc,argv)) {
[detail] +    return 2;
[detail] +  }
[detail] +  
[detail] +  if(subPool.isEmpty()) {
[detail] +    App::log(tr("geopsy: no signal available, check options -file, -db or -group, see -h for help\n") );
[detail] +    return 2;
[detail] +  }
[detail] +  return db.saveAs(exportFile) ? 0 : 2;
[detail]  }
[detail]  
[detail]  int modeWaveform(int argc, char ** argv, QString waveformFile)
[detail] @@ -450,6 +502,7 @@
[detail]    h->addOption( "-groups [<PARENT>]", "List the groups available in current database. If PARENT is specified, the groups contained by PARENT are listed." );
[detail]    h->addOption( "-export-formats", "List the signal file formats Geopsy can export" );
[detail]    h->addOption( "-import-formats", "List the signal file formats Geopsy can import" );
[detail] +  h->addOption( "-save <FILE.gpy>", "Saves the imported signals to a new database and exits." );
[detail]    h->addOption( "-export <FILE>", "Export file specified by option -file to FILE with format -format" );
[detail]    h->addOption( "-export-format <FORMAT>", "Specify file format for option -export. The default format is guessed from the extension of "
[detail]                                             "the exported file. See option -export-formats for a list of available formats. This option cannot "
[detail]                                src/AGC.h:  version-3.4.0	not modified
[detail]                   src/ChronogramWindow.h:  version-3.4.0	modified out of comments
[detail] --- src/ChronogramWindow.h-version-3.4.0-stripped	2025-09-28 04:01:21.279581655 +0200
[detail] +++ src/ChronogramWindow.h-HEAD-stripped	2025-09-28 04:01:21.283581673 +0200
[detail] @@ -12,9 +12,9 @@
[detail]    ChronogramWindow(QWidget* parent=nullptr);
[detail]    ~ChronogramWindow();
[detail]  
[detail] -  virtual void setWindowTitle(QString title);
[detail] -  virtual void subPoolUpdate();
[detail] -  virtual void fastFourierTransform(DoubleSignal::SignalType st);
[detail] +  void setWindowTitle(QString title);
[detail] +  void endSubPoolUpdate();
[detail] +  void fastFourierTransform(DoubleSignal::SignalType st);
[detail]  
[detail]    ChronogramLayer * chronogramLayer() const {return _chronogramLayer;}
[detail]  
[detail] @@ -22,7 +22,7 @@
[detail]    void updateLabels();
[detail]  public slots:
[detail]    void getSelection(SubSignalPool& sel);
[detail] -  virtual void endSignalChange(Signal * sig=nullptr);
[detail] +  virtual void endSignalChange(SignalSegment * sig=nullptr);
[detail]  protected:
[detail]    virtual void focusInEvent(QFocusEvent * e);
[detail]  private:
[detail]                        src/Convolution.h:  version-3.4.0	not modified
[detail]                       src/Correlations.h:  version-3.4.0	not modified
[detail]           src/CustomAsciiFormatsEditor.h:  version-3.4.0	not modified
[detail]                          src/CutSignal.h:  version-3.4.0	not modified
[detail]                  src/DecimateAmplitude.h:  version-3.4.0	not modified
[detail]                             src/Engine.h:  version-3.4.0	modified out of comments
[detail] --- src/Engine.h-version-3.4.0-stripped	2025-09-28 04:01:21.375582119 +0200
[detail] +++ src/Engine.h-HEAD-stripped	2025-09-28 04:01:21.379582137 +0200
[detail] @@ -24,30 +24,35 @@
[detail]    void newSignalViewer(const SubSignalPool& subPool, bool force);
[detail]    QWidgetList subWindowList(QWidget * parent=nullptr) const;
[detail]  
[detail] -  virtual void beginAddFile(SignalDatabase * db);
[detail] -  virtual void endAddFile(SignalDatabase * db);
[detail] +  void beginAddFile(SignalDatabase * db);
[detail] +  void endAddFile(SignalDatabase * db);
[detail]  
[detail] -  virtual void beginSignalChange(Signal * sig);
[detail] -  virtual void endSignalChange(Signal * sig);
[detail] +  void beginRemoveFile(SignalDatabase * db, int index);
[detail] +  void endRemoveFile(SignalDatabase * db);
[detail]  
[detail] -  virtual void beginSignalChange(SignalDatabase * db);
[detail] -  virtual void endSignalChange(SignalDatabase * db);
[detail] +  void beginSignalChange(SignalSegment * sig);
[detail] +  void endSignalChange(SignalSegment * sig);
[detail]  
[detail] -  virtual inline MultiDocumentSubWindow * addSubWindow(QWidget * parent, QWidget * w);
[detail] -  virtual inline void removeSubWindow(QWidget * w);
[detail] -
[detail] -  virtual bool useProgress() {return true;}
[detail] -  virtual void setProgressMaximum(SignalDatabase * db, int value);
[detail] -  virtual int progressMaximum(SignalDatabase * db);
[detail] -  virtual void setProgressValue(SignalDatabase * db, int value);
[detail] -  virtual int progressValue(SignalDatabase * db);
[detail] -  virtual void increaseProgressValue(SignalDatabase * db, int value=1);
[detail] -  virtual void showMessage(SignalDatabase * db, QString message);
[detail] +  void beginSignalChange(SignalDatabase * db);
[detail] +  void endSignalChange(SignalDatabase * db);
[detail] +
[detail] +  inline MultiDocumentSubWindow * addSubWindow(QWidget * parent, QWidget * w);
[detail] +  inline void removeSubWindow(QWidget * w);
[detail] +
[detail] +  bool useProgress() {return true;}
[detail] +  void setProgressCaption(SignalDatabase * db, const QString& caption);
[detail] +  void setProgressMaximum(SignalDatabase * db, int value);
[detail] +  int progressMaximum(SignalDatabase * db);
[detail] +  void setProgressValue(SignalDatabase * db, int value);
[detail] +  int progressValue(SignalDatabase * db);
[detail] +  void increaseProgressValue(SignalDatabase * db, int value=1);
[detail] +  void progressEnd(SignalDatabase * db, int val);
[detail] +  void showMessage(SignalDatabase * db, QString message);
[detail]  public slots:
[detail] -  virtual SubPoolWindow * newTableWindow(QWidget * parent=nullptr, const SubSignalPool& subPool=SubSignalPool());
[detail] -  virtual AbstractGraphicWindow * newGraphicWindow(QWidget * parent=nullptr, const SubSignalPool& subPool=SubSignalPool());
[detail] -  virtual SubPoolWindow * newMapWindow(QWidget * parent=nullptr, const SubSignalPool& subPool=SubSignalPool());
[detail] -  virtual SubPoolWindow * newChronogramWindow(QWidget * parent=nullptr, const SubSignalPool& subPool=SubSignalPool());
[detail] +  SubPoolWindow * newTableWindow(QWidget * parent=nullptr, const SubSignalPool& subPool=SubSignalPool());
[detail] +  AbstractGraphicWindow * newGraphicWindow(QWidget * parent=nullptr, const SubSignalPool& subPool=SubSignalPool());
[detail] +  SubPoolWindow * newMapWindow(QWidget * parent=nullptr, const SubSignalPool& subPool=SubSignalPool());
[detail] +  SubPoolWindow * newChronogramWindow(QWidget * parent=nullptr, const SubSignalPool& subPool=SubSignalPool());
[detail]  };
[detail]  
[detail]  inline MultiDocumentSubWindow * Engine::addSubWindow(QWidget * parent, QWidget * w)
[detail]                     src/ExportFileType.h:  version-3.4.0	not modified
[detail]                         src/ExportPick.h:  version-3.4.0	not modified
[detail]                           src/FileView.h:  version-3.4.0	modified out of comments
[detail] --- src/FileView.h-version-3.4.0-stripped	2025-09-28 04:01:21.423582350 +0200
[detail] +++ src/FileView.h-HEAD-stripped	2025-09-28 04:01:21.427582370 +0200
[detail] @@ -11,17 +11,18 @@
[detail]  {
[detail]    Q_OBJECT
[detail]  public:
[detail] -  FileView(QWidget* parent=0);
[detail] +  FileView(QWidget* parent=nullptr);
[detail]  
[detail] -  virtual QSize sizeHint() const;
[detail] +  QSize sizeHint() const;
[detail]  
[detail] -  SignalFileItem * model() const;
[detail]    void addActions();
[detail]  
[detail]    void beginReset();
[detail]    void endReset();
[detail]    void beginAddFile();
[detail]    void endAddFile();
[detail] +  void beginRemoveFile(int index);
[detail] +  void endRemoveFile();
[detail]  public slots:
[detail]    void getSelection(SubSignalPool& sel);
[detail]  
[detail] @@ -34,8 +35,9 @@
[detail]    void listReferences();
[detail]    void copyPath();
[detail]  protected:
[detail] -  virtual void contextMenuEvent (QContextMenuEvent * e);
[detail] -  virtual void mouseDoubleClickEvent (QMouseEvent * e);
[detail] +  SignalFileItem * model() const;
[detail] +  void contextMenuEvent (QContextMenuEvent * e);
[detail] +  void mouseDoubleClickEvent (QMouseEvent * e);
[detail]  
[detail]    QAction * _removeAction;
[detail]    QAction * _listReferencesAction;
[detail]                        src/GeopsyAbout.h:  version-3.4.0	not modified
[detail]                  src/GeopsyAboutDialog.h:  version-3.4.0	not modified
[detail]                      src/GraphicWindow.h:  version-3.4.0	modified out of comments
[detail] --- src/GraphicWindow.h-version-3.4.0-stripped	2025-09-28 04:01:21.475582601 +0200
[detail] +++ src/GraphicWindow.h-HEAD-stripped	2025-09-28 04:01:21.479582621 +0200
[detail] @@ -13,10 +13,10 @@
[detail]    GraphicWindow(QWidget* parent=nullptr);
[detail]    ~GraphicWindow();
[detail]  
[detail] -  virtual void setWindowTitle(QString title);
[detail] -  virtual void subPoolUpdate();
[detail] -  virtual void endSignalChange(Signal * sig=nullptr);
[detail] -  virtual void fastFourierTransform(DoubleSignal::SignalType st);
[detail] +  void setWindowTitle(QString title);
[detail] +  void endSubPoolUpdate();
[detail] +  void endSignalChange(SignalSegment * sig=nullptr);
[detail] +  void fastFourierTransform(DoubleSignal::SignalType st);
[detail]  
[detail]    virtual SignalLayer * signalLayer() const {return _signalLayer;}
[detail]    virtual TimeWindowLayer * timeWindowLayer() const {return _timeWindowLayer;}
[detail] @@ -26,10 +26,10 @@
[detail]    void updateEvents();
[detail]  public slots:
[detail]    void getSelection(SubSignalPool& sel);
[detail] -  void showMagnify(bool magnify, int context, double time, Signal * sig);
[detail] +  void showMagnify(bool magnify, int context, double time, SignalSegment * sig);
[detail]    void closeMagnify();
[detail]    void setMagnifyPosition(double x);
[detail] -  void setMagnifySignal(Signal * sig);
[detail] +  void setMagnifySignal(SignalSegment * sig);
[detail]  protected:
[detail]    virtual void focusInEvent(QFocusEvent * e);
[detail]  
[detail]                    src/GroupProperties.h:  version-3.4.0	modified out of comments
[detail] --- src/GroupProperties.h-version-3.4.0-stripped	2025-09-28 04:01:21.495582699 +0200
[detail] +++ src/GroupProperties.h-HEAD-stripped	2025-09-28 04:01:21.499582717 +0200
[detail] @@ -22,10 +22,11 @@
[detail]    void setValues(QList<AbstractSignalGroup *> gList);
[detail]    void setProperties(AbstractSignalGroup * g);
[detail]    AbstractSignalGroup * folder();
[detail] -  bool isMultiGroupKey();
[detail] -  bool isMultiGroupArray();
[detail] +  bool isMultiGroupKey() const;
[detail] +  bool isMultiGroupArray() const;
[detail]    MetaDataIndex splitKey();
[detail]    void setNameFromHistory();
[detail] +  bool isKeepSignalOrder() const;
[detail]  public slots:
[detail]    void on_folderTree_clicked(const QModelIndex & index);
[detail]    void on_multiGroupBox_toggled(bool on);
[detail]                          src/GroupView.h:  version-3.4.0	modified out of comments
[detail] --- src/GroupView.h-version-3.4.0-stripped	2025-09-28 04:01:21.511582775 +0200
[detail] +++ src/GroupView.h-HEAD-stripped	2025-09-28 04:01:21.515582795 +0200
[detail] @@ -21,6 +21,9 @@
[detail]    void addActions();
[detail]    void setMode(Mode m);
[detail]    void select(const QRegularExpression& exp);
[detail] +
[detail] +  void beginResetModel();
[detail] +  void endResetModel();
[detail]  public slots:
[detail]    void acceptDrop(const QPoint& pos, bool& ok);
[detail]    void getSelection(SubSignalPool& sel);
[detail]                        src/GroupWidget.h:  version-3.4.0	modified out of comments
[detail] --- src/GroupWidget.h-version-3.4.0-stripped	2025-09-28 04:01:21.531582872 +0200
[detail] +++ src/GroupWidget.h-HEAD-stripped	2025-09-28 04:01:21.535582892 +0200
[detail] @@ -19,6 +19,9 @@
[detail]    void addActions() {groupView->addActions();}
[detail]    void expandAll();
[detail]    void setMode(GroupView::Mode m);
[detail] +
[detail] +  void beginResetModel();
[detail] +  void endResetModel();
[detail]  private slots:
[detail]    void on_mode_currentIndexChanged(int index);
[detail]    void on_selectButton_clicked();
[detail]         src/InstrumentalResponseWidget.h:  version-3.4.0	modified out of comments
[detail] --- src/InstrumentalResponseWidget.h-version-3.4.0-stripped	2025-09-28 04:01:21.551582969 +0200
[detail] +++ src/InstrumentalResponseWidget.h-HEAD-stripped	2025-09-28 04:01:21.555582988 +0200
[detail] @@ -29,7 +29,7 @@
[detail]    void updatePlots();
[detail]    void on_transferMode_currentIndexChanged(int index);
[detail]    void on_nameEdit_textChanged(QString text);
[detail] -  void on_noiseEdit_textChanged(QString text);
[detail] +  void on_filterEdit_textChanged(QString text);
[detail]    void on_transductionEdit_textChanged(QString text);
[detail]    void on_normalizationEdit_textChanged(QString text);
[detail]    void on_frequencyEdit_currentIndexChanged(int index);
[detail]                    src/LoadFilePattern.h:  version-3.4.0	modified out of comments
[detail] --- src/LoadFilePattern.h-version-3.4.0-stripped	2025-09-28 04:01:21.575583085 +0200
[detail] +++ src/LoadFilePattern.h-HEAD-stripped	2025-09-28 04:01:21.579583105 +0200
[detail] @@ -4,9 +4,24 @@
[detail]  #define LOADFILEPATTERN_H
[detail]  
[detail]  #include <QGpGuiTools.h>
[detail] +#include <GeopsyCore.h>
[detail]  
[detail]  #include "ui_LoadFilePattern.h"
[detail]  
[detail] +class ImportThread : public Thread
[detail] +{
[detail] +  Q_OBJECT
[detail] +public:
[detail] +  ImportThread(QObject * parent=nullptr);
[detail] +
[detail] +  void start(SignalDatabase * db, const QString& filePattern);
[detail] +protected:
[detail] +  void run();
[detail] +private:
[detail] +  SignalDatabase * _db;
[detail] +  QString _filePattern;
[detail] +};
[detail] +
[detail]  class LoadFilePattern : public Dialog, private Ui::LoadFilePattern
[detail]  {
[detail]    Q_OBJECT
[detail] @@ -14,11 +29,21 @@
[detail]    LoadFilePattern(QWidget * parent=nullptr);
[detail]    ~LoadFilePattern();
[detail]  
[detail] +  void setDatabase(SignalDatabase * db) {_db=db;}
[detail]    void saveHistory();
[detail] -  QString baseDirectory() const {return baseDirectoryEdit->text();}
[detail] -  QString filePattern() const {return filePatternEdit->currentText();}
[detail] +
[detail] +  bool isRunning() const {return _import->isRunning();}
[detail] +protected:
[detail] +  void closeEvent(QCloseEvent * event);
[detail]  private slots:
[detail]    void on_browseDirectories_clicked();
[detail] +  void on_startBut_clicked();
[detail] +  void on_stopBut_clicked();
[detail] +  void on_closeBut_clicked();
[detail] +  void importFinished();
[detail] +private:
[detail] +  SignalDatabase * _db;
[detail] +  ImportThread * _import;
[detail]  };
[detail]  
[detail]  #endif 
[detail]                    src/MagnifierSignal.h:  version-3.4.0	modified out of comments
[detail] --- src/MagnifierSignal.h-version-3.4.0-stripped	2025-09-28 04:01:21.591583163 +0200
[detail] +++ src/MagnifierSignal.h-HEAD-stripped	2025-09-28 04:01:21.595583181 +0200
[detail] @@ -10,10 +10,10 @@
[detail]  public:
[detail]    MagnifierSignal(QWidget* parent=0);
[detail]  
[detail] -  void setSignal(SubSignalPool * parentSubPool, Signal * sig);
[detail] +  void setSignal(SubSignalPool * parentSubPool, SignalSegment * sig);
[detail]    void setTime(double t);
[detail]    void setContext(int c) {_context=c;}
[detail] -  virtual void setWindowTitle(QString title);
[detail] +  void setWindowTitle(QString title);
[detail]  protected:
[detail]    virtual void resizeEvent(QResizeEvent * );
[detail]    virtual void closeEvent(QCloseEvent * e);
[detail]                         src/MainWindow.h:  version-3.4.0	modified out of comments
[detail] --- src/MainWindow.h-version-3.4.0-stripped	2025-09-28 04:01:21.611583259 +0200
[detail] +++ src/MainWindow.h-HEAD-stripped	2025-09-28 04:01:21.615583278 +0200
[detail] @@ -40,10 +40,12 @@
[detail]    virtual QStatusBar * statusBar() {return QMainWindow::statusBar();}
[detail]    void startupPreferences();
[detail]    static QAction * newAction(const QAction& original, QWidget * parent=nullptr);
[detail] -  void filesRemoved(const QList<SignalFile *>& fList);
[detail] +  void filesRemoved(const QList<SignalFileIndex>& fList);
[detail]  
[detail]    void beginAddFile();
[detail]    void endAddFile();
[detail] +  void beginRemoveFile(int index);
[detail] +  void endRemoveFile();
[detail]  public slots:
[detail]    void activeWindowChanged(MultiDocumentSubWindow * w);
[detail]    void setSubPoolActionEnabled(bool b, bool rw);
[detail]                          src/MapWindow.h:  version-3.4.0	modified out of comments
[detail] --- src/MapWindow.h-version-3.4.0-stripped	2025-09-28 04:01:21.631583356 +0200
[detail] +++ src/MapWindow.h-HEAD-stripped	2025-09-28 04:01:21.635583374 +0200
[detail] @@ -12,10 +12,10 @@
[detail]    MapWindow(QWidget* parent=0);
[detail]    ~MapWindow();
[detail]  
[detail] -  virtual void setWindowTitle(QString title);
[detail] -  virtual void subPoolUpdate();
[detail] -  virtual void endSignalChange(Signal * sig=0);
[detail] -  virtual void fastFourierTransform(DoubleSignal::SignalType st);
[detail] +  void setWindowTitle(QString title);
[detail] +  void endSubPoolUpdate();
[detail] +  void endSignalChange(SignalSegment * sig=0);
[detail] +  void fastFourierTransform(DoubleSignal::SignalType st);
[detail]  
[detail]    void setLimits();
[detail]  public slots:
[detail]                     src/OperandSignals.h:  version-3.4.0	not modified
[detail]                         src/PickEvents.h:  version-3.4.0	not modified
[detail]                        src/Preferences.h:  version-3.4.0	not modified
[detail]                   src/RotateComponents.h:  version-3.4.0	not modified
[detail]               src/SeismicEventDelegate.h:  version-3.4.0	not modified
[detail]                   src/SeismicEventView.h:  version-3.4.0	not modified
[detail]                 src/SeismicEventWidget.h:  version-3.4.0	not modified
[detail]                     src/SetTableFields.h:  version-3.4.0	not modified
[detail]                    src/SigSelectionDnD.h:  version-3.4.0	not modified
[detail]                      src/SignalDisplay.h:  version-3.4.0	not modified
[detail]                src/SignalTableDelegate.h:  version-3.4.0	not modified
[detail]                    src/SignalTableItem.h:  version-3.4.0	not modified
[detail]                    src/SignalTableView.h:  version-3.4.0	modified out of comments
[detail] --- src/SignalTableView.h-version-3.4.0-stripped	2025-09-28 04:01:21.839584360 +0200
[detail] +++ src/SignalTableView.h-HEAD-stripped	2025-09-28 04:01:21.843584380 +0200
[detail] @@ -19,8 +19,8 @@
[detail]    void getSelection(SubSignalPool& sel);
[detail]    MetaDataFieldList& dataFields();
[detail]  public slots:
[detail] -  void beginSignalChange(Signal * sig=0);
[detail] -  void endSignalChange(Signal * sig=0);
[detail] +  void beginSignalChange(SignalSegment * sig=0);
[detail] +  void endSignalChange(SignalSegment * sig=0);
[detail]  };
[detail]  
[detail]  #endif 
[detail]                           src/SortKeys.h:  version-3.4.0	not modified
[detail]                   src/SortKeysDelegate.h:  version-3.4.0	not modified
[detail]                      src/SortKeysModel.h:  version-3.4.0	not modified
[detail]                  src/SourceCoordinates.h:  version-3.4.0	modified out of comments
[detail] --- src/SourceCoordinates.h-version-3.4.0-stripped	2025-09-28 04:01:21.907584690 +0200
[detail] +++ src/SourceCoordinates.h-HEAD-stripped	2025-09-28 04:01:21.911584708 +0200
[detail] @@ -19,8 +19,8 @@
[detail]    bool init(SubSignalPool * subPool);
[detail]    bool initLookup();
[detail]  protected:
[detail] -  virtual QString keyName(Signal * sig);
[detail] -  virtual Point coordinates(Signal * sig) {return sig->source();}
[detail] +  virtual QString keyName(SignalSegment * sig);
[detail] +  virtual Point coordinates(SignalSegment * sig) {return sig->source();}
[detail]  private slots:
[detail]    void on_applyBut_clicked();
[detail]    void on_sourceNameEdit_editTextChanged(const QString& text);
[detail]                             src/StaLta.h:  version-3.4.0	not modified
[detail]                 src/StationCoordinates.h:  version-3.4.0	modified out of comments
[detail] --- src/StationCoordinates.h-version-3.4.0-stripped	2025-09-28 04:01:21.939584844 +0200
[detail] +++ src/StationCoordinates.h-HEAD-stripped	2025-09-28 04:01:21.943584863 +0200
[detail] @@ -15,7 +15,7 @@
[detail]    StationCoordinates(QWidget *parent=nullptr, Qt::WindowFlags f=Qt::Widget);
[detail]    ~StationCoordinates();
[detail]  
[detail] -  Point lookup(Signal * sig, bool & ok);
[detail] +  Point lookup(SignalSegment * sig, bool & ok);
[detail]    const UtmZone& utmZone() const {return _utmZone;}
[detail]  
[detail]    bool init(SubSignalPool * subPool);
[detail] @@ -27,8 +27,8 @@
[detail]    void on_relativePosBut_clicked();
[detail]  protected:
[detail]    bool addStation(QString name, Point coord, bool force);
[detail] -  virtual QString keyName(Signal * sig) {return sig->name();}
[detail] -  virtual Point coordinates(Signal * sig) {return sig->receiver();}
[detail] +  virtual QString keyName(SignalSegment * sig) {return sig->metaData()->name();}
[detail] +  virtual Point coordinates(SignalSegment * sig) {return sig->metaData()->receiver();}
[detail]  
[detail]    QList<NamedPoint> _stations;
[detail]  private:
[detail]                  src/SubtractGroupItem.h:  version-3.4.0	not modified
[detail]                      src/SubtractValue.h:  version-3.4.0	not modified
[detail]                        src/TableWindow.h:  version-3.4.0	modified out of comments
[detail] --- src/TableWindow.h-version-3.4.0-stripped	2025-09-28 04:01:21.987585076 +0200
[detail] +++ src/TableWindow.h-HEAD-stripped	2025-09-28 04:01:21.991585096 +0200
[detail] @@ -11,21 +11,22 @@
[detail]  {
[detail]    Q_OBJECT
[detail]  public:
[detail] -  TableWindow (QWidget* parent=0);
[detail] +  TableWindow (QWidget* parent=nullptr);
[detail]    ~TableWindow ();
[detail]  
[detail] -  virtual void setWindowTitle(QString title);
[detail] -  virtual void subPoolUpdate();
[detail] -  virtual void fastFourierTransform(DoubleSignal::SignalType st);
[detail] +  void setWindowTitle(QString title);
[detail] +  void beginSubPoolUpdate();
[detail] +  void endSubPoolUpdate();
[detail] +  void fastFourierTransform(DoubleSignal::SignalType st);
[detail]    void setEditionLocked(bool l);
[detail] -  virtual QSize sizeHint() const;
[detail] +  QSize sizeHint() const;
[detail]  public slots:
[detail]    void exportTable ();
[detail]    void importTable ();
[detail]    void getSelection(SubSignalPool& sel);
[detail]    void setDataFields();
[detail] -  virtual void beginSignalChange(Signal * sig=0);
[detail] -  virtual void endSignalChange(Signal * sig=0);
[detail] +  void beginSignalChange(SignalSegment * sig=nullptr);
[detail] +  void endSignalChange(SignalSegment * sig=nullptr);
[detail]    void resizeCells();
[detail]  private:
[detail]    SignalTableView * _headers;
[detail]                              src/Taper.h:  version-3.4.0	not modified
[detail]                        src/ToolFactory.h:  version-3.4.0	not modified
[detail]                    src/ViewParamEditor.h:  version-3.4.0	not modified
[detail]                    src/WaveformConsole.h:  version-3.4.0	modified out of comments
[detail] --- src/WaveformConsole.h-version-3.4.0-stripped	2025-09-28 04:01:22.051585385 +0200
[detail] +++ src/WaveformConsole.h-HEAD-stripped	2025-09-28 04:01:22.055585405 +0200
[detail] @@ -23,6 +23,7 @@
[detail]    void subtractValue();
[detail]    void addSignals();
[detail]    void subtractSignals();
[detail] +  void stackSignals();
[detail]    void multiply();
[detail]    void filter();
[detail]    void agc();
[detail]                       src/WhitenSignal.h:  version-3.4.0	no last version available
[detail]                  src/WindowEnvironment.h:  version-3.4.0	not modified
[detail]                               src/AGC.ui:  version-3.4.0	not modified
[detail]                       src/Convolution.ui:  version-3.4.0	not modified
[detail]                      src/Correlations.ui:  version-3.4.0	not modified
[detail]          src/CustomAsciiFormatsEditor.ui:  version-3.4.0	not modified
[detail]                         src/CutSignal.ui:  version-3.4.0	not modified
[detail]                 src/DecimateAmplitude.ui:  version-3.4.0	not modified
[detail]                    src/ExportFileType.ui:  version-3.4.0	not modified
[detail]                        src/ExportPick.ui:  version-3.4.0	not modified
[detail]                       src/GeopsyAbout.ui:  version-3.4.0	not modified
[detail]                   src/GroupProperties.ui:  version-3.4.0	modified out of comments
[detail] --- src/GroupProperties.ui-version-3.4.0-stripped	2025-09-28 04:01:22.223586216 +0200
[detail] +++ src/GroupProperties.ui-HEAD-stripped	2025-09-28 04:01:22.227586236 +0200
[detail] @@ -84,6 +84,32 @@
[detail]       </layout>
[detail]      </widget>
[detail]     </item>
[detail] +   <item row="6" column="0">
[detail] +    <spacer>
[detail] +     <property name="orientation">
[detail] +      <enum>Qt::Vertical</enum>
[detail] +     </property>
[detail] +     <property name="sizeHint" stdset="0">
[detail] +      <size>
[detail] +       <width>20</width>
[detail] +       <height>71</height>
[detail] +      </size>
[detail] +     </property>
[detail] +    </spacer>
[detail] +   </item>
[detail] +   <item row="4" column="0">
[detail] +    <spacer>
[detail] +     <property name="orientation">
[detail] +      <enum>Qt::Vertical</enum>
[detail] +     </property>
[detail] +     <property name="sizeHint" stdset="0">
[detail] +      <size>
[detail] +       <width>62</width>
[detail] +       <height>91</height>
[detail] +      </size>
[detail] +     </property>
[detail] +    </spacer>
[detail] +   </item>
[detail]     <item row="1" column="0" colspan="3">
[detail]      <layout class="QHBoxLayout">
[detail]       <property name="spacing">
[detail] @@ -123,25 +149,22 @@
[detail]       </item>
[detail]      </layout>
[detail]     </item>
[detail] -   <item row="3" column="0">
[detail] -    <widget class="QLabel" name="commentsLabel">
[detail] +   <item row="2" column="0" colspan="3">
[detail] +    <widget class="QLabel" name="infoLabel">
[detail]       <property name="text">
[detail] -      <string>Comments</string>
[detail] +      <string>info</string>
[detail]       </property>
[detail]      </widget>
[detail]     </item>
[detail] -   <item row="4" column="0">
[detail] -    <spacer>
[detail] -     <property name="orientation">
[detail] -      <enum>Qt::Vertical</enum>
[detail] -     </property>
[detail] -     <property name="sizeHint" stdset="0">
[detail] -      <size>
[detail] -       <width>62</width>
[detail] -       <height>91</height>
[detail] -      </size>
[detail] +   <item row="5" column="2" rowspan="2">
[detail] +    <widget class="QTreeView" name="folderTree">
[detail] +     <property name="editTriggers">
[detail] +      <set>QAbstractItemView::NoEditTriggers</set>
[detail]       </property>
[detail] -    </spacer>
[detail] +    </widget>
[detail] +   </item>
[detail] +   <item row="3" column="2" rowspan="2">
[detail] +    <widget class="QTextEdit" name="commentsEdit"/>
[detail]     </item>
[detail]     <item row="5" column="0" colspan="2">
[detail]      <widget class="QLabel" name="folderLabel">
[detail] @@ -150,33 +173,17 @@
[detail]       </property>
[detail]      </widget>
[detail]     </item>
[detail] -   <item row="5" column="2" rowspan="2">
[detail] -    <widget class="QTreeView" name="folderTree">
[detail] -     <property name="editTriggers">
[detail] -      <set>QAbstractItemView::NoEditTriggers</set>
[detail] +   <item row="3" column="0">
[detail] +    <widget class="QLabel" name="commentsLabel">
[detail] +     <property name="text">
[detail] +      <string>Comments</string>
[detail]       </property>
[detail]      </widget>
[detail]     </item>
[detail] -   <item row="6" column="0">
[detail] -    <spacer>
[detail] -     <property name="orientation">
[detail] -      <enum>Qt::Vertical</enum>
[detail] -     </property>
[detail] -     <property name="sizeHint" stdset="0">
[detail] -      <size>
[detail] -       <width>20</width>
[detail] -       <height>71</height>
[detail] -      </size>
[detail] -     </property>
[detail] -    </spacer>
[detail] -   </item>
[detail] -   <item row="3" column="2" rowspan="2">
[detail] -    <widget class="QTextEdit" name="commentsEdit"/>
[detail] -   </item>
[detail] -   <item row="2" column="0" colspan="3">
[detail] -    <widget class="QLabel" name="infoLabel">
[detail] +   <item row="7" column="0" colspan="3">
[detail] +    <widget class="QCheckBox" name="keepSignalOrder">
[detail]       <property name="text">
[detail] -      <string>info</string>
[detail] +      <string>Keep signal order (may be less effecient for storage)</string>
[detail]       </property>
[detail]      </widget>
[detail]     </item>
[detail]                       src/GroupWidget.ui:  version-3.4.0	not modified
[detail]        src/InstrumentalResponseWidget.ui:  version-3.4.0	modified out of comments
[detail] --- src/InstrumentalResponseWidget.ui-version-3.4.0-stripped	2025-09-28 04:01:22.255586371 +0200
[detail] +++ src/InstrumentalResponseWidget.ui-HEAD-stripped	2025-09-28 04:01:22.259586391 +0200
[detail] @@ -6,8 +6,8 @@
[detail]     <rect>
[detail]      <x>0</x>
[detail]      <y>0</y>
[detail] -    <width>535</width>
[detail] -    <height>482</height>
[detail] +    <width>599</width>
[detail] +    <height>561</height>
[detail]     </rect>
[detail]    </property>
[detail]    <property name="windowTitle">
[detail] @@ -231,12 +231,19 @@
[detail]           <item row="1" column="2">
[detail]            <widget class="QLabel" name="label_4">
[detail]             <property name="text">
[detail] -            <string>Noise level (V)</string>
[detail] +            <string>Filter frequencies [Hz]</string>
[detail]             </property>
[detail]            </widget>
[detail]           </item>
[detail]           <item row="1" column="3">
[detail] -          <widget class="QLineEdit" name="noiseEdit"/>
[detail] +          <widget class="QLineEdit" name="filterEdit">
[detail] +           <property name="statusTip">
[detail] +            <string>List four frequencies separated by a white space: f1 f2 f3 f4</string>
[detail] +           </property>
[detail] +           <property name="whatsThis">
[detail] +            <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;f1&amp;lt;f2&amp;lt;f3&amp;lt;f4&lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;p&gt;Response is set to null outside f1 and f4. It is left unchanged between f2 and f3. Between f1 and f2, f3 and f4, it is multiplied by a cosine function between 0 and 1.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
[detail] +           </property>
[detail] +          </widget>
[detail]           </item>
[detail]          </layout>
[detail]         </item>
[detail] @@ -255,7 +262,7 @@
[detail]          <widget class="QComboBox" name="transferMode">
[detail]           <item>
[detail]            <property name="text">
[detail] -           <string>Magnitude</string>
[detail] +           <string>Amplitude</string>
[detail]            </property>
[detail]           </item>
[detail]           <item>
[detail]                   src/LoadFilePattern.ui:  version-3.4.0	modified out of comments
[detail] --- src/LoadFilePattern.ui-version-3.4.0-stripped	2025-09-28 04:01:22.275586468 +0200
[detail] +++ src/LoadFilePattern.ui-HEAD-stripped	2025-09-28 04:01:22.279586487 +0200
[detail] @@ -6,31 +6,46 @@
[detail]     <rect>
[detail]      <x>0</x>
[detail]      <y>0</y>
[detail] -    <width>339</width>
[detail] -    <height>96</height>
[detail] +    <width>593</width>
[detail] +    <height>335</height>
[detail]     </rect>
[detail]    </property>
[detail]    <property name="windowTitle">
[detail] -   <string>Load file pattern</string>
[detail] +   <string>Import file pattern</string>
[detail]    </property>
[detail] +  <layout class="QVBoxLayout" name="verticalLayout">
[detail] +   <item>
[detail]    <layout class="QGridLayout" name="gridLayout">
[detail] -   <item row="0" column="0">
[detail] +     <item row="0" column="0" colspan="2">
[detail]      <widget class="QLabel" name="label">
[detail]       <property name="text">
[detail]        <string>Base directory</string>
[detail]       </property>
[detail]      </widget>
[detail]     </item>
[detail] -   <item row="0" column="1">
[detail] +     <item row="0" column="2">
[detail]      <widget class="QLineEdit" name="baseDirectoryEdit"/>
[detail]     </item>
[detail] -   <item row="0" column="2">
[detail] +     <item row="0" column="3">
[detail]      <widget class="QToolButton" name="browseDirectories">
[detail]       <property name="text">
[detail]        <string>...</string>
[detail]       </property>
[detail]      </widget>
[detail]     </item>
[detail] +     <item row="1" column="2" colspan="2">
[detail] +      <widget class="QComboBox" name="filePatternEdit">
[detail] +       <property name="sizePolicy">
[detail] +        <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
[detail] +         <horstretch>0</horstretch>
[detail] +         <verstretch>0</verstretch>
[detail] +        </sizepolicy>
[detail] +       </property>
[detail] +       <property name="editable">
[detail] +        <bool>true</bool>
[detail] +       </property>
[detail] +      </widget>
[detail] +     </item>
[detail]     <item row="1" column="0">
[detail]      <widget class="QLabel" name="label_2">
[detail]       <property name="toolTip">
[detail] @@ -44,58 +59,78 @@
[detail]       </property>
[detail]      </widget>
[detail]     </item>
[detail] -   <item row="1" column="1" colspan="2">
[detail] -    <widget class="QComboBox" name="filePatternEdit">
[detail] -     <property name="editable">
[detail] -      <bool>true</bool>
[detail] +    </layout>
[detail] +   </item>
[detail] +   <item>
[detail] +    <layout class="QHBoxLayout" name="horizontalLayout_3">
[detail] +     <item>
[detail] +      <spacer name="horizontalSpacer">
[detail] +       <property name="orientation">
[detail] +        <enum>Qt::Horizontal</enum>
[detail] +       </property>
[detail] +       <property name="sizeHint" stdset="0">
[detail] +        <size>
[detail] +         <width>40</width>
[detail] +         <height>20</height>
[detail] +        </size>
[detail] +       </property>
[detail] +      </spacer>
[detail] +     </item>
[detail] +     <item>
[detail] +      <widget class="QPushButton" name="startBut">
[detail] +       <property name="text">
[detail] +        <string>Start</string>
[detail] +       </property>
[detail] +      </widget>
[detail] +     </item>
[detail] +     <item>
[detail] +      <widget class="QPushButton" name="stopBut">
[detail] +       <property name="enabled">
[detail] +        <bool>false</bool>
[detail] +       </property>
[detail] +       <property name="text">
[detail] +        <string>Stop</string>
[detail]       </property>
[detail]      </widget>
[detail]     </item>
[detail] -   <item row="2" column="0" colspan="3">
[detail] -    <widget class="QDialogButtonBox" name="buttonBox">
[detail] +    </layout>
[detail] +   </item>
[detail] +   <item>
[detail] +    <widget class="QGpGuiTools::LogView" name="importLog"/>
[detail] +   </item>
[detail] +   <item>
[detail] +    <layout class="QHBoxLayout" name="horizontalLayout">
[detail] +     <item>
[detail] +      <spacer name="horizontalSpacer_2">
[detail]       <property name="orientation">
[detail]        <enum>Qt::Horizontal</enum>
[detail]       </property>
[detail] -     <property name="standardButtons">
[detail] -      <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
[detail] +       <property name="sizeHint" stdset="0">
[detail] +        <size>
[detail] +         <width>40</width>
[detail] +         <height>20</height>
[detail] +        </size>
[detail] +       </property>
[detail] +      </spacer>
[detail] +     </item>
[detail] +     <item>
[detail] +      <widget class="QPushButton" name="closeBut">
[detail] +       <property name="text">
[detail] +        <string>Close</string>
[detail]       </property>
[detail]      </widget>
[detail]     </item>
[detail]    </layout>
[detail] +   </item>
[detail] +  </layout>
[detail]   </widget>
[detail] + <customwidgets>
[detail] +  <customwidget>
[detail] +   <class>QGpGuiTools::LogView</class>
[detail] +   <extends>QTextBrowser</extends>
[detail] +   <header>QGpGuiTools.h</header>
[detail] +  </customwidget>
[detail] + </customwidgets>
[detail]   <resources/>
[detail] - <connections>
[detail] -  <connection>
[detail] -   <sender>buttonBox</sender>
[detail] -   <signal>accepted()</signal>
[detail] -   <receiver>LoadFilePattern</receiver>
[detail] -   <slot>accept()</slot>
[detail] -   <hints>
[detail] -    <hint type="sourcelabel">
[detail] -     <x>248</x>
[detail] -     <y>254</y>
[detail] -    </hint>
[detail] -    <hint type="destinationlabel">
[detail] -     <x>157</x>
[detail] -     <y>274</y>
[detail] -    </hint>
[detail] -   </hints>
[detail] -  </connection>
[detail] -  <connection>
[detail] -   <sender>buttonBox</sender>
[detail] -   <signal>rejected()</signal>
[detail] -   <receiver>LoadFilePattern</receiver>
[detail] -   <slot>reject()</slot>
[detail] -   <hints>
[detail] -    <hint type="sourcelabel">
[detail] -     <x>316</x>
[detail] -     <y>260</y>
[detail] -    </hint>
[detail] -    <hint type="destinationlabel">
[detail] -     <x>286</x>
[detail] -     <y>274</y>
[detail] -    </hint>
[detail] -   </hints>
[detail] -  </connection>
[detail] - </connections>
[detail] + <connections/>
[detail]  </ui>
[detail]                    src/OperandSignals.ui:  version-3.4.0	not modified
[detail]                        src/PickEvents.ui:  version-3.4.0	not modified
[detail]                       src/Preferences.ui:  version-3.4.0	not modified
[detail]                  src/RotateComponents.ui:  version-3.4.0	modified out of comments
[detail] --- src/RotateComponents.ui-version-3.4.0-stripped	2025-09-28 04:01:22.339586777 +0200
[detail] +++ src/RotateComponents.ui-HEAD-stripped	2025-09-28 04:01:22.343586797 +0200
[detail] @@ -40,6 +40,9 @@
[detail]         <property name="suffix">
[detail]          <string> °</string>
[detail]         </property>
[detail] +       <property name="minimum">
[detail] +        <double>-360.000000000000000</double>
[detail] +       </property>
[detail]         <property name="maximum">
[detail]          <double>360.000000000000000</double>
[detail]         </property>
[detail] @@ -57,6 +60,9 @@
[detail]         <property name="suffix">
[detail]          <string> °</string>
[detail]         </property>
[detail] +       <property name="minimum">
[detail] +        <double>-360.000000000000000</double>
[detail] +       </property>
[detail]         <property name="maximum">
[detail]          <double>360.000000000000000</double>
[detail]         </property>
[detail] @@ -74,6 +80,9 @@
[detail]         <property name="suffix">
[detail]          <string> °</string>
[detail]         </property>
[detail] +       <property name="minimum">
[detail] +        <double>-360.000000000000000</double>
[detail] +       </property>
[detail]         <property name="maximum">
[detail]          <double>360.000000000000000</double>
[detail]         </property>
[detail]                src/SeismicEventWidget.ui:  version-3.4.0	not modified
[detail]                    src/SetTableFields.ui:  version-3.4.0	not modified
[detail]                          src/SortKeys.ui:  version-3.4.0	not modified
[detail]                            src/StaLta.ui:  version-3.4.0	not modified
[detail]                src/StationCoordinates.ui:  version-3.4.0	not modified
[detail]                     src/SubtractValue.ui:  version-3.4.0	not modified
[detail]                             src/Taper.ui:  version-3.4.0	not modified
[detail]                   src/ViewParamEditor.ui:  version-3.4.0	not modified
[detail]                   src/WaveformConsole.ui:  version-3.4.0	not modified
[detail]                      src/WhitenSignal.ui:  version-3.4.0	no last version available
[summary] large modifications, moving from C to B
[summary] Total differences: 2113 lines
[summary] Modification level is B
OLD_DIR=$(pwd)
echo "geopsy"
cd $(find . -name "geopsy" | tail -n 1) || exit 2
pwd
dpversion B  || exit 2
cd $OLD_DIR || exit 2
################## vslarray
[detail]                      src/Acquisition.cpp:  version-1.0.3	not modified
[detail]               src/AcquisitionSignals.cpp:  version-1.0.3	modified out of comments
[detail] --- src/AcquisitionSignals.cpp-version-1.0.3-stripped	2025-09-28 04:01:22.551587801 +0200
[detail] +++ src/AcquisitionSignals.cpp-HEAD-stripped	2025-09-28 04:01:22.555587821 +0200
[detail] @@ -84,17 +84,17 @@
[detail]  {
[detail]    int nComp=nComponents();
[detail]    for(int iComp=0; iComp<nComp; iComp++) {
[detail] -    Signal * sig=new Signal(GeopsyCoreEngine::instance()->defaultDatabase());
[detail] +    SignalSegment * sig=new SignalSegment(GeopsyCoreEngine::instance()->defaultDatabase());
[detail]      sig->setTemporary();
[detail]      DoubleSignal * data=processed(iComp);
[detail] -    sig->setNSamples(data->nSamples());
[detail] +    sig->setSize(data->nSamples());
[detail]      sig->setSamplingPeriod(data->samplingPeriod());
[detail]      sig->setStartTime(startTime);
[detail] -    sig->setName(originalSignals()->name());
[detail] -    sig->setComponent(StationSignals::component(iComp, originalSignals()->components()));
[detail] -    sig->SignalTemplate<double>::copySamplesFrom(data);
[detail] +    sig->metaData()->setName(originalSignals()->name());
[detail] +    sig->metaData()->setComponent(StationSignals::component(iComp, originalSignals()->components()));
[detail] +    sig->values()->SignalTemplate<double>::copySamplesFrom(data);
[detail]      
[detail] -    QFile f(Acquisition::destination().absoluteFilePath(sig->nameComponent() + fileNameSuffix));
[detail] +    QFile f(Acquisition::destination().absoluteFilePath(sig->metaData()->nameComponent()+fileNameSuffix));
[detail]      if(f.open(QIODevice::Append)) {
[detail]        sig->writeMiniSeed(f);
[detail]      }
[detail]                             src/main.cpp:  version-1.0.3	not modified
[detail]                        src/Acquisition.h:  version-1.0.3	not modified
[detail]                 src/AcquisitionSignals.h:  version-1.0.3	not modified
[summary] Total differences: 26 lines
[summary] Modification level is C
OLD_DIR=$(pwd)
echo "vslarray"
cd $(find . -name "vslarray" | tail -n 1) || exit 2
pwd
dpversion C  || exit 2
cd $OLD_DIR || exit 2
################## dinver
[detail]                     src/AddPlotParam.cpp:  version-1.1.5	not modified
[detail]                           src/Engine.cpp:  version-1.1.5	not modified
[detail]                  src/InversionThread.cpp:  version-1.1.5	not modified
[detail]             src/LaunchThreadDelegate.cpp:  version-1.1.5	not modified
[detail]                 src/LaunchThreadItem.cpp:  version-1.1.5	not modified
[detail]                src/LaunchThreadTable.cpp:  version-1.1.5	not modified
[detail]                       src/MainWindow.cpp:  version-1.1.5	not modified
[detail]                    src/MaxNumProcess.cpp:  version-1.1.5	not modified
[detail]                    src/ModelSelector.cpp:  version-1.1.5	not modified
[detail]                  src/ModelThreadInfo.cpp:  version-1.1.5	not modified
[detail]                     src/NAModelsPlot.cpp:  version-1.1.5	not modified
[detail]           src/NAModelsPlotProperties.cpp:  version-1.1.5	not modified
[detail]                         src/PSViewer.cpp:  version-1.1.5	not modified
[detail]                      src/PluginPaths.cpp:  version-1.1.5	not modified
[detail]                   src/PluginSelector.cpp:  version-1.1.5	not modified
[detail]                    src/ProcessStatus.cpp:  version-1.1.5	not modified
[detail]                   src/SelectPSViewer.cpp:  version-1.1.5	not modified
[detail]                   src/ThreadLauncher.cpp:  version-1.1.5	not modified
[detail]                src/WindowEnvironment.cpp:  version-1.1.5	not modified
[detail]                     src/XMLDinverGui.cpp:  version-1.1.5	not modified
[detail]                             src/main.cpp:  version-1.1.5	not modified
[detail]                       src/AddPlotParam.h:  version-1.1.5	not modified
[detail]                             src/Engine.h:  version-1.1.5	not modified
[detail]                    src/InversionThread.h:  version-1.1.5	not modified
[detail]               src/LaunchThreadDelegate.h:  version-1.1.5	not modified
[detail]                   src/LaunchThreadItem.h:  version-1.1.5	not modified
[detail]                  src/LaunchThreadTable.h:  version-1.1.5	not modified
[detail]                         src/MainWindow.h:  version-1.1.5	not modified
[detail]                      src/MaxNumProcess.h:  version-1.1.5	not modified
[detail]                      src/ModelSelector.h:  version-1.1.5	not modified
[detail]                    src/ModelThreadInfo.h:  version-1.1.5	not modified
[detail]                       src/NAModelsPlot.h:  version-1.1.5	not modified
[detail]             src/NAModelsPlotProperties.h:  version-1.1.5	not modified
[detail]                           src/PSViewer.h:  version-1.1.5	not modified
[detail]                        src/PluginPaths.h:  version-1.1.5	not modified
[detail]                     src/PluginSelector.h:  version-1.1.5	not modified
[detail]                      src/ProcessStatus.h:  version-1.1.5	not modified
[detail]                     src/SelectPSViewer.h:  version-1.1.5	not modified
[detail]                     src/ThreadLauncher.h:  version-1.1.5	not modified
[detail]                  src/WindowEnvironment.h:  version-1.1.5	not modified
[detail]                       src/XMLDinverGui.h:  version-1.1.5	not modified
[detail]                      src/AddPlotParam.ui:  version-1.1.5	not modified
[detail]                     src/MaxNumProcess.ui:  version-1.1.5	not modified
[detail]            src/NAModelsPlotProperties.ui:  version-1.1.5	not modified
[detail]                       src/PluginPaths.ui:  version-1.1.5	not modified
[detail]                    src/PluginSelector.ui:  version-1.1.5	not modified
[detail]                     src/ProcessStatus.ui:  version-1.1.5	not modified
[detail]                    src/SelectPSViewer.ui:  version-1.1.5	not modified
[detail]                    src/ThreadLauncher.ui:  version-1.1.5	not modified
# No modification since last version
################## WaranCore
[detail]                         src/GpsBlock.cpp:  version-1.1.0	not modified
[detail]                           src/GpsFix.cpp:  version-1.1.0	not modified
[detail]                        src/TcpHeader.cpp:  version-1.1.0	not modified
[detail]                        src/WaranCore.cpp:  version-1.1.0	not modified
[detail]                           src/GpsBlock.h:  version-1.1.0	not modified
[detail]                             src/GpsFix.h:  version-1.1.0	not modified
[detail]                          src/TcpHeader.h:  version-1.1.0	not modified
# No modification since last version
################## TapePositioningSystem
[detail]                        src/Anchorage.cpp:  version-1.2.0	not modified
[detail]                     src/ClusterQuads.cpp:  version-1.2.0	not modified
[detail]                             src/Node.cpp:  version-1.2.0	not modified
[detail]            src/TapePositioningSystem.cpp:  version-1.2.0	not modified
[detail]                     src/Triangulator.cpp:  version-1.2.0	not modified
[detail]                          src/Anchorage.h:  version-1.2.0	not modified
[detail]                       src/ClusterQuads.h:  version-1.2.0	not modified
[detail]                               src/Node.h:  version-1.2.0	not modified
[detail]                       src/Triangulator.h:  version-1.2.0	not modified
# No modification since last version
################## waran
[detail]                src/AcquisitionWidget.cpp:  version-1.1.3	not modified
[detail]                   src/CommentsWidget.cpp:  version-1.1.3	not modified
[detail]                         src/CubeLink.cpp:  version-1.1.3	not modified
[detail]                       src/DaemonLink.cpp:  version-1.1.3	not modified
[detail]                         src/Distance.cpp:  version-1.1.3	not modified
[detail]                 src/DistanceDelegate.cpp:  version-1.1.3	not modified
[detail]                     src/DistanceItem.cpp:  version-1.1.3	not modified
[detail]                   src/DistanceWidget.cpp:  version-1.1.3	modified out of comments
[detail] --- src/DistanceWidget.cpp-version-1.1.3-stripped	2025-09-28 04:01:23.859594123 +0200
[detail] +++ src/DistanceWidget.cpp-HEAD-stripped	2025-09-28 04:01:23.863594143 +0200
[detail] @@ -33,13 +33,13 @@
[detail]  
[detail]    _rawLayer=new LineLayer(map);
[detail]    _rawLayer->setReferenceLine(new PlotLine2D);
[detail] -  _rawLayer->setReferencePen(Pen(Qt::NoPen));
[detail] +  _rawLayer->setReferencePen(Pen(Pen::NoLine));
[detail]    _rawLayer->setReferenceSymbol(Symbol(Symbol::Circle, 1, Pen(Qt::lightGray), Brush(Qt::lightGray, Qt::SolidPattern)));
[detail]    _rawLayer->addLine();
[detail]  
[detail]    _meanLayer=new NameLineLayer(map);
[detail]    _meanLayer->setReferenceLine(new NameLine);
[detail] -  _meanLayer->setReferencePen(Pen(Qt::NoPen));
[detail] +  _meanLayer->setReferencePen(Pen(Pen::NoLine));
[detail]    _meanLayer->setReferenceSymbol(Symbol(Symbol::Cross, 2));
[detail]    _meanLayer->addLine();
[detail]  
[detail]                   src/DownloadGpsRaw.cpp:  version-1.1.3	not modified
[detail]                          src/GpsLink.cpp:  version-1.1.3	not modified
[detail]                          src/NetLink.cpp:  version-1.1.3	not modified
[detail]           src/NetworkParameterEditor.cpp:  version-1.1.3	not modified
[detail]                src/NetworkParameters.cpp:  version-1.1.3	not modified
[detail]                     src/PhaseShifter.cpp:  version-1.1.3	not modified
[detail]             src/RealTimeArrayManager.cpp:  version-1.1.3	not modified
[detail]             src/RealTimeArrayProcess.cpp:  version-1.1.3	not modified
[detail]                src/RealTimeHistogram.cpp:  version-1.1.3	not modified
[detail]           src/RealTimeStationSignals.cpp:  version-1.1.3	not modified
[detail]           src/SeismicParameterEditor.cpp:  version-1.1.3	not modified
[detail]                src/SeismicParameters.cpp:  version-1.1.3	not modified
[detail]                     src/SignalViewer.cpp:  version-1.1.3	modified out of comments
[detail] --- src/SignalViewer.cpp-version-1.1.3-stripped	2025-09-28 04:01:24.067595129 +0200
[detail] +++ src/SignalViewer.cpp-HEAD-stripped	2025-09-28 04:01:24.071595147 +0200
[detail] @@ -61,7 +61,7 @@
[detail]    case 0:
[detail]      break;
[detail]    case 1:
[detail] -    a.setTitle(subPool->first()->effectiveAmplitudeUnit());
[detail] +    a.setTitle(subPool->first()->metaData()->effectiveAmplitudeUnit());
[detail]      a.setNumberType('e');
[detail]      a.setAutoTicks(true);
[detail]      a.setScaleType(Scale::Linear);
[detail] @@ -78,10 +78,10 @@
[detail]      a.removeStringLabels();
[detail]      int n=subPool->count() - 1;
[detail]      for(int i=0; i<n; i++ ) {
[detail] -      a.addStringLabel(subPool->at(i)->nameComponent(), false);
[detail] +      a.addStringLabel(subPool->at(i)->metaData()->nameComponent(), false);
[detail]      }
[detail]      
[detail] -    a.addStringLabel(subPool->at(n)->nameComponent(), true);
[detail] +    a.addStringLabel(subPool->at(n)->metaData()->nameComponent(), true);
[detail]    }
[detail]    update();
[detail]  }
[detail]                         src/StartGps.cpp:  version-1.1.3	not modified
[detail]                          src/Station.cpp:  version-1.1.3	not modified
[detail]                      src/StationItem.cpp:  version-1.1.3	not modified
[detail]                       src/SystemLink.cpp:  version-1.1.3	not modified
[detail]           src/TapeCoordinateDelegate.cpp:  version-1.1.3	not modified
[detail]               src/TapeCoordinateItem.cpp:  version-1.1.3	not modified
[detail]                        src/TapePoint.cpp:  version-1.1.3	not modified
[detail]                      src/WaranWidget.cpp:  version-1.1.3	modified out of comments
[detail] --- src/WaranWidget.cpp-version-1.1.3-stripped	2025-09-28 04:01:24.191595727 +0200
[detail] +++ src/WaranWidget.cpp-HEAD-stripped	2025-09-28 04:01:24.195595747 +0200
[detail] @@ -32,8 +32,8 @@
[detail]    seedlink->removeView();
[detail]    seedlink->seedLink()->setBufferType(SeedLinkStream::Rotate);
[detail]    setHVWindowLength(); 
[detail] -  connect(seedlink->seedLink(), SIGNAL(endSignalChange(Signal *, GeopsyCore::TimeRange)),
[detail] -          this, SLOT(dataChanged(Signal *, GeoypsCore::TimeRange)), Qt::QueuedConnection);
[detail] +  connect(seedlink->seedLink(), SIGNAL(endSignalChange(SignalSegment *, GeopsyCore::TimeRange)),
[detail] +          this, SLOT(dataChanged(SignalSegment *, GeoypsCore::TimeRange)), Qt::QueuedConnection);
[detail]  
[detail]    signalViewer->setSignals(&_signals);
[detail]  
[detail] @@ -179,14 +179,17 @@
[detail]  }
[detail]  
[detail]  
[detail] -void WaranWidget::dataChanged(Signal * sig, TimeRange tr)
[detail] +void WaranWidget::dataChanged(SignalSegment * sig, TimeRange tr)
[detail]  {
[detail]    TRACE;
[detail] -  if(!_stationNames.contains(sig->nameComponent()) && sig->component()==Signal::Vertical) {
[detail] +  if(!_stationNames.contains(sig->metaData()->nameComponent()) &&
[detail] +      sig->metaData()->component()==SignalMetaData::Vertical) {
[detail]      signalViewer->lock();
[detail] -    _stationNames.insert(sig->nameComponent());
[detail] -    QMap<QString,Point>::iterator it =_stationCoordinates.find(sig->name());
[detail] -    if(it!=_stationCoordinates.end()) sig->setReceiver(it.value());
[detail] +    _stationNames.insert(sig->metaData()->nameComponent());
[detail] +    QMap<QString,Point>::iterator it=_stationCoordinates.find(sig->metaData()->name());
[detail] +    if(it!=_stationCoordinates.end()) {
[detail] +      sig->metaData()->setReceiver(it.value());
[detail] +    }
[detail]      _signals.addSignal(sig);
[detail]      SortKey::clear();
[detail]      SortKey::add(MetaDataFactory::Name);
[detail] @@ -335,7 +338,7 @@
[detail]          for(int iComp=0; iComp<nComp;iComp++ ) {
[detail]            const SubSignalPool& subPool=stat->originals(iComp);
[detail]            if(!subPool.isEmpty()) {
[detail] -            subPool.first()->setReceiver(it.value());
[detail] +            subPool.first()->metaData()->setReceiver(it.value());
[detail]            }
[detail]          }
[detail]        }
[detail]                             src/main.cpp:  version-1.1.3	not modified
[detail]                  src/AcquisitionWidget.h:  version-1.1.3	not modified
[detail]                     src/CommentsWidget.h:  version-1.1.3	not modified
[detail]                           src/CubeLink.h:  version-1.1.3	not modified
[detail]                         src/DaemonLink.h:  version-1.1.3	not modified
[detail]                           src/Distance.h:  version-1.1.3	not modified
[detail]                   src/DistanceDelegate.h:  version-1.1.3	not modified
[detail]                       src/DistanceItem.h:  version-1.1.3	not modified
[detail]                     src/DistanceWidget.h:  version-1.1.3	not modified
[detail]                     src/DownloadGpsRaw.h:  version-1.1.3	not modified
[detail]                            src/GpsLink.h:  version-1.1.3	not modified
[detail]                            src/NetLink.h:  version-1.1.3	not modified
[detail]             src/NetworkParameterEditor.h:  version-1.1.3	not modified
[detail]                  src/NetworkParameters.h:  version-1.1.3	not modified
[detail]                       src/PhaseShifter.h:  version-1.1.3	not modified
[detail]               src/RealTimeArrayManager.h:  version-1.1.3	not modified
[detail]               src/RealTimeArrayProcess.h:  version-1.1.3	not modified
[detail]                  src/RealTimeHistogram.h:  version-1.1.3	not modified
[detail]             src/RealTimeStationSignals.h:  version-1.1.3	not modified
[detail]             src/SeismicParameterEditor.h:  version-1.1.3	not modified
[detail]                  src/SeismicParameters.h:  version-1.1.3	not modified
[detail]                       src/SignalViewer.h:  version-1.1.3	not modified
[detail]                           src/StartGps.h:  version-1.1.3	not modified
[detail]                            src/Station.h:  version-1.1.3	not modified
[detail]                        src/StationItem.h:  version-1.1.3	not modified
[detail]                         src/SystemLink.h:  version-1.1.3	not modified
[detail]             src/TapeCoordinateDelegate.h:  version-1.1.3	not modified
[detail]                 src/TapeCoordinateItem.h:  version-1.1.3	not modified
[detail]                          src/TapePoint.h:  version-1.1.3	not modified
[detail]                        src/WaranWidget.h:  version-1.1.3	modified out of comments
[detail] --- src/WaranWidget.h-version-1.1.3-stripped	2025-09-28 04:01:24.647597931 +0200
[detail] +++ src/WaranWidget.h-HEAD-stripped	2025-09-28 04:01:24.651597951 +0200
[detail] @@ -29,7 +29,7 @@
[detail]    void setKmax(double k);
[detail]    void updateDataProcess();
[detail]    void updateDataDisplay();
[detail] -  void dataChanged(Signal * sig, GeopsyCore::TimeRange tr);
[detail] +  void dataChanged(SignalSegment * sig, GeopsyCore::TimeRange tr);
[detail]    void on_loadCoordinateButton_clicked();
[detail]    void on_saveCoordinateButton_clicked();
[detail]    void on_relativePositionButton_clicked();
[detail] @@ -38,7 +38,7 @@
[detail]    void startHVProcess();
[detail]    void stopHVProcess();
[detail]  private:
[detail] -  void add(Signal * sig);
[detail] +  void add(SignalSegment * sig);
[detail]    void lockSubPool();
[detail]    void unlockSubPool();
[detail]    bool setCoordinates(const ColumnTextParser * parser);
[detail]                 src/AcquisitionWidget.ui:  version-1.1.3	not modified
[detail]                    src/CommentsWidget.ui:  version-1.1.3	not modified
[detail]                    src/DistanceWidget.ui:  version-1.1.3	not modified
[detail]                    src/DownloadGpsRaw.ui:  version-1.1.3	not modified
[detail]            src/NetworkParameterEditor.ui:  version-1.1.3	not modified
[detail]            src/SeismicParameterEditor.ui:  version-1.1.3	not modified
[detail]                          src/StartGps.ui:  version-1.1.3	not modified
[detail]                       src/WaranWidget.ui:  version-1.1.3	not modified
[summary] Total differences: 107 lines
[summary] Modification level is C
OLD_DIR=$(pwd)
echo "waran"
cd $(find . -name "waran" | tail -n 1) || exit 2
pwd
dpversion C  || exit 2
cd $OLD_DIR || exit 2
################## warangps
[detail]               src/DistanceTableModel.cpp:  version-1.1.4	not modified
[detail]                 src/GenerateGeometry.cpp:  version-1.1.4	not modified
[detail]                       src/GpsStation.cpp:  version-1.1.4	not modified
[detail]                    src/GpsTableModel.cpp:  version-1.1.4	not modified
[detail]                   src/WaranGpsWidget.cpp:  version-1.1.4	not modified
[detail]                             src/main.cpp:  version-1.1.4	not modified
[detail]                 src/DistanceTableModel.h:  version-1.1.4	not modified
[detail]                   src/GenerateGeometry.h:  version-1.1.4	not modified
[detail]                         src/GpsStation.h:  version-1.1.4	not modified
[detail]                      src/GpsTableModel.h:  version-1.1.4	not modified
[detail]                     src/WaranGpsWidget.h:  version-1.1.4	not modified
[detail]                  src/GenerateGeometry.ui:  version-1.1.4	not modified
[detail]                    src/WaranGpsWidget.ui:  version-1.1.4	not modified
# No modification since last version
################## geopsyarray
[detail]                  src/ActiveFKResults.cpp:  version-3.3.1	modified out of comments
[detail] --- src/ActiveFKResults.cpp-version-3.3.1-stripped	2025-09-28 04:01:25.055599903 +0200
[detail] +++ src/ActiveFKResults.cpp-HEAD-stripped	2025-09-28 04:01:25.059599922 +0200
[detail] @@ -91,7 +91,7 @@
[detail]      }
[detail]      _gridLayers[ig]=new IrregularGrid2DPlot(w);
[detail]      ColorMap& cm=_gridLayers[ig]->beginColorMapChange();
[detail] -    cm.generate(0, cm.count()-1, ColorPalette::defaultSequential, ColorPalette::Reversed);
[detail] +    cm.generate(0, cm.count()-1, 1, ColorPalette::defaultSequential, ColorPalette::Reversed);
[detail]      _gridLayers[ig]->endColorMapChange();
[detail]      _curveLayers[ig]=new LineLayer(w);
[detail]      _limitLayers[ig]=new DispersionLimitLayer(w);
[detail]               src/ActiveFKToolWidget.cpp:  version-3.3.1	modified out of comments
[detail] --- src/ActiveFKToolWidget.cpp-version-3.3.1-stripped	2025-09-28 04:01:25.079600018 +0200
[detail] +++ src/ActiveFKToolWidget.cpp-HEAD-stripped	2025-09-28 04:01:25.083600038 +0200
[detail] @@ -304,7 +304,7 @@
[detail]    param.setMaximumSlowness(1.0/param.ySampling().minimum());
[detail]  
[detail]    param.setOversamplingFactor(oversamplingEdit->value());
[detail] -  param.setfrequencyBandwidth(freqBandwidthEdit->value());
[detail] +  param.setFrequencyBandwidth(freqBandwidthEdit->value());
[detail]    param.setDamping(dampingFactorEdit->value());
[detail]  
[detail]    param.setMinimumDistance(minDistance->value());
[detail]                      src/ArrayPlugin.cpp:  version-3.3.1	not modified
[detail]                    src/FKTimeWindows.cpp:  version-3.3.1	modified out of comments
[detail] --- src/FKTimeWindows.cpp-version-3.3.1-stripped	2025-09-28 04:01:25.119600213 +0200
[detail] +++ src/FKTimeWindows.cpp-HEAD-stripped	2025-09-28 04:01:25.123600231 +0200
[detail] @@ -21,10 +21,9 @@
[detail]  
[detail]    _gridLayer=new LiveGridLayer(waveNumGrid);
[detail]    _gridLayer->setObjectName("grid");
[detail] -  _gridLayer->setFunction(new FKFunctionPlot);
[detail] -  _gridLayer->setSampling(3);
[detail] -  _positiveMap.generate(0, 19, ColorPalette::defaultSequential, ColorPalette::Reversed);
[detail] -  _positiveNegativeMap.generate(0, 19, ColorPalette::defaultDiverging, ColorPalette::Continuous);
[detail] +  _gridLayer->setSampling(6);
[detail] +  _positiveMap.generate(0, 19, 1, ColorPalette::defaultSequential, ColorPalette::Reversed);
[detail] +  _positiveNegativeMap.generate(0, 19, 1, ColorPalette::defaultDiverging, ColorPalette::Continuous);
[detail]    _gridLayer->setColorMap(_positiveMap);
[detail]  
[detail]    _curveLayer=new LiveCurveLayer(waveNumGrid);
[detail] @@ -54,16 +53,17 @@
[detail]    _fkPeaks=new LineLayer(waveNumGrid);
[detail]    _fkPeaks->setObjectName("fkPeaks");
[detail]    line=new PlotLine2D;
[detail] -  line->setPen(Pen(Qt::NoPen));
[detail] +  line->setPen(Pen(Pen::NoLine));
[detail]    line->setSymbol(Symbol(Symbol::Cross, 2.0, Pen(Qt::red)));
[detail]    _fkPeaks->setReferenceLine(line);
[detail]    _fkPeaks->addLine();
[detail] +  _fkPeaks->addLine()->setSymbol(Symbol(Symbol::Cross, 2.0, Pen(Qt::darkRed)));
[detail]  
[detail]    connect(waveNumGrid->graphContents(), SIGNAL(mouseMoved( QPoint, Qt::MouseButtons, Qt::KeyboardModifiers) ),
[detail]             this, SLOT(currentVelocitySlowness(QPoint)));
[detail]    valueLabel->setText(QString());
[detail] -  connect(kxEdit, SIGNAL(valueChanged(double)), this, SLOT(kxkyChanged()));
[detail] -  connect(kyEdit, SIGNAL(valueChanged(double)), this, SLOT(kxkyChanged()));
[detail] +  connect(xEdit, SIGNAL(valueChanged(double)), this, SLOT(kxkyChanged()));
[detail] +  connect(yEdit, SIGNAL(valueChanged(double)), this, SLOT(kxkyChanged()));
[detail]    connect(blockSetScroll, SIGNAL(valueChanged(int)), this, SLOT(setCurrentBlockSet()));
[detail]  
[detail]    _timeWindows=nullptr;
[detail] @@ -116,6 +116,15 @@
[detail]    waveNumGrid->yAxis()->setNumberType('f');
[detail]    waveNumGrid->yAxis()->setReversedScale(false);
[detail]  
[detail] +  xLabel->setText("kx");
[detail] +  yLabel->setText("ky");
[detail] +  xEdit->setMinimum(-100.0);
[detail] +  xEdit->setMaximum(100.0);
[detail] +  yEdit->setMinimum(-100.0);
[detail] +  yEdit->setMaximum(100.0);
[detail] +  xEdit->setDecimals(8);
[detail] +  yEdit->setDecimals(8);
[detail] +
[detail]    _gridLayer->setOpacity(1.0);
[detail]    _curveLayer->setOpacity(0.0);
[detail]    _fkMeshLayer->setOpacity(0.05);
[detail] @@ -164,6 +173,54 @@
[detail]    _fkSlowLineLayer->setOpacity(1.0);
[detail]  }
[detail]  
[detail] +void FKTimeWindows::viewAzimuthEllipticityGrid()
[detail] +{
[detail] +  TRACE;
[detail] +  waveNumGrid->xAxis()->setTitle("Azimuth (deg)");
[detail] +  waveNumGrid->xAxis()->setTitleInverseScale(QString());
[detail] +  waveNumGrid->xAxis()->setSizeType(Axis::AxisSize);
[detail] +  waveNumGrid->yAxis()->setTitle("Ellipticity (deg)");
[detail] +  waveNumGrid->yAxis()->setSizeType(Axis::AxisSize);
[detail] +  waveNumGrid->yAxis()->setScaleType(Scale::Linear);
[detail] +  waveNumGrid->yAxis()->setNumberType('f');
[detail] +  waveNumGrid->yAxis()->setReversedScale(false);
[detail] +
[detail] +  _gridLayer->setOpacity(1.0);
[detail] +  _curveLayer->setOpacity(0.0);
[detail] +  _fkMeshLayer->setOpacity(0.0);
[detail] +  _fkSlowCircleLayer->setOpacity(0.0);
[detail] +  _fkSlowLineLayer->setOpacity(0.0);
[detail] +}
[detail] +
[detail] +void FKTimeWindows::viewXsYsGrid()
[detail] +{
[detail] +  TRACE;
[detail] +  waveNumGrid->xAxis()->setTitle(tr("Source X (m)"));
[detail] +  waveNumGrid->xAxis()->setTitleInverseScale(QString());
[detail] +  waveNumGrid->xAxis()->setSizeType(Axis::Scaled);
[detail] +  waveNumGrid->yAxis()->setTitle(tr("Source Y (m)"));
[detail] +  waveNumGrid->yAxis()->setTitleInverseScale(QString());
[detail] +  waveNumGrid->yAxis()->setSizeType(Axis::Scaled);
[detail] +  waveNumGrid->yAxis()->setScaleType(Scale::Linear);
[detail] +  waveNumGrid->yAxis()->setNumberType('f');
[detail] +  waveNumGrid->yAxis()->setReversedScale(false);
[detail] +
[detail] +  xLabel->setText("x");
[detail] +  yLabel->setText("y");
[detail] +  xEdit->setMinimum(-std::numeric_limits<double>::infinity());
[detail] +  xEdit->setMaximum(std::numeric_limits<double>::infinity());
[detail] +  yEdit->setMinimum(-std::numeric_limits<double>::infinity());
[detail] +  yEdit->setMaximum(std::numeric_limits<double>::infinity());
[detail] +  xEdit->setDecimals(2);
[detail] +  yEdit->setDecimals(2);
[detail] +
[detail] +  _gridLayer->setOpacity(1.0);
[detail] +  _curveLayer->setOpacity(0.0);
[detail] +  _fkMeshLayer->setOpacity(0.0);
[detail] +  _fkSlowCircleLayer->setOpacity(0.0);
[detail] +  _fkSlowLineLayer->setOpacity(0.0);
[detail] +}
[detail] +
[detail]  void FKTimeWindows::setTimeWindowLayer(TimeWindowLayer * twLayer)
[detail]  {
[detail]    if(twLayer) {
[detail] @@ -203,9 +260,20 @@
[detail]    _gridCache=new FKCache(&_taskManager->array());
[detail]  
[detail]    App::log(tr("Current frequency: %1\n").arg(frequency));
[detail] +  _fkMeshLayer->setFrequency(frequency);
[detail]    _timeWindows->setFrequency(frequency);
[detail]    _timeWindows->setWindows();
[detail]    llt.unlock();
[detail] +  switch(_crossSpectrum->mode()) {
[detail] +  case ArrayStations::Vertical:
[detail] +  case ArrayStations::Horizontal:
[detail] +    _gridLayer->setFunction(new FKFunctionPlot(2));
[detail] +    break;
[detail] +  case ArrayStations::ThreeComponents:
[detail] +  case ArrayStations::ThreeComponentsAndStrain:
[detail] +    _gridLayer->setFunction(new FKFunctionPlot(3+array->count()));
[detail] +    break;
[detail] +  }
[detail]  
[detail]    setBlockSetList(param->blockAveraging());
[detail]  
[detail] @@ -238,6 +306,36 @@
[detail]    }
[detail]  }
[detail]  
[detail] +void FKTimeWindows::setXsYsGridLimits()
[detail] +{
[detail] +  if(_crossSpectrum && _gridLayer->opacity()>0.0) {
[detail] +    double aperture=2.0*_crossSpectrum->array().radius();
[detail] +    double size=_crossSpectrum->parameters()->sourceMapSize(aperture);
[detail] +    Point2D min=_crossSpectrum->array().array()->toAbsolute(Point2D(-size, -size));
[detail] +    Point2D max=_crossSpectrum->array().array()->toAbsolute(Point2D(size, size));
[detail] +    waveNumGrid->setMapScale(min.x(), min.y(), max.x(), max.y());
[detail] +  }
[detail] +}
[detail] +
[detail] +void FKTimeWindows::setAzimuthEllipticityGridLimits()
[detail] +{
[detail] +  if(_crossSpectrum && _gridLayer->opacity()>0.0) {
[detail] +    AxisWindow * w=waveNumGrid->graphContents()->graph();
[detail] +    if(w->xAxis()->zoomEnabled()) {
[detail] +      w->xAxis()->setRange(0.0, M_PI);
[detail] +      w->xAxis()->setUnitFactor(180.0/M_PI);
[detail] +      w->xAxis()->setAutoTicks(false);
[detail] +      w->xAxis()->setMajorTicks(M_PI/9.0);
[detail] +      w->xAxis()->setMinorTicks(M_PI/36.0);
[detail] +    }
[detail] +    w->yAxis()->setRange(-0.5*M_PI, 0.5*M_PI);
[detail] +    w->yAxis()->setUnitFactor(180.0/M_PI);
[detail] +    w->yAxis()->setAutoTicks(false);
[detail] +    w->yAxis()->setMajorTicks(M_PI/9.0);
[detail] +    w->yAxis()->setMinorTicks(M_PI/36.0);
[detail] +  }
[detail] +}
[detail] +
[detail]  void FKTimeWindows::setMatrixGridLimits(AbstractFKFunction * fk)
[detail]  {
[detail]    if(fk->crossSpectrum() && _gridLayer->opacity()>0.0) {
[detail] @@ -270,7 +368,7 @@
[detail]    _gridLayer->setForceMinimumValue(false);
[detail]    _gridLayer->setForceMaximumValue(false);
[detail]    _gridLayer->setScale(SamplingParameters::Log);
[detail] -  _gridLayer->setSymetric(false);
[detail] +  _gridLayer->setSymmetric(false);
[detail]    if(_gridLayer->autoAdjust()) {
[detail]      _gridLayer->setColorMap(_positiveMap);
[detail]    }
[detail] @@ -283,7 +381,7 @@
[detail]    _gridLayer->setForceMinimumValue(false);
[detail]    _gridLayer->setForceMaximumValue(false);
[detail]    _gridLayer->setScale(SamplingParameters::Linear);
[detail] -  _gridLayer->setSymetric(true);
[detail] +  _gridLayer->setSymmetric(true);
[detail]    if(_gridLayer->autoAdjust()) {
[detail]      _gridLayer->setColorMap(_positiveNegativeMap);
[detail]    }
[detail] @@ -296,7 +394,7 @@
[detail]    _gridLayer->setForceMinimumValue(false);
[detail]    _gridLayer->setForceMaximumValue(false);
[detail]    _gridLayer->setScale(SamplingParameters::Log);
[detail] -  _gridLayer->setSymetric(false);
[detail] +  _gridLayer->setSymmetric(false);
[detail]    if(_gridLayer->autoAdjust()) {
[detail]      _gridLayer->setColorMap(_positiveMap);
[detail]    }
[detail] @@ -309,7 +407,7 @@
[detail]    _gridLayer->setForceMinimumValue(false);
[detail]    _gridLayer->setForceMaximumValue(false);
[detail]    _gridLayer->setScale(SamplingParameters::Linear);
[detail] -  _gridLayer->setSymetric(true);
[detail] +  _gridLayer->setSymmetric(true);
[detail]    if(_gridLayer->autoAdjust()) {
[detail]      _gridLayer->setColorMap(_positiveNegativeMap);
[detail]    }
[detail] @@ -324,7 +422,7 @@
[detail]    _gridLayer->setMinimumValue(0.0);
[detail]    _gridLayer->setMaximumValue(0.0);
[detail]    _gridLayer->setScale(SamplingParameters::Linear);
[detail] -  _gridLayer->setSymetric(false);
[detail] +  _gridLayer->setSymmetric(false);
[detail]    if(_gridLayer->autoAdjust()) {
[detail]      ColorMap map;
[detail]      map.resize(2);
[detail] @@ -346,7 +444,7 @@
[detail]    _gridLayer->setMinimumValue(-dx);
[detail]    _gridLayer->setMaximumValue(dx);
[detail]    _gridLayer->setScale(SamplingParameters::Linear);
[detail] -  _gridLayer->setSymetric(true);
[detail] +  _gridLayer->setSymmetric(true);
[detail]    if(_gridLayer->autoAdjust()) {
[detail]      _gridLayer->setColorMap(_positiveNegativeMap);
[detail]    }
[detail] @@ -361,7 +459,7 @@
[detail]    _gridLayer->setMinimumValue(0.0);
[detail]    _gridLayer->setMaximumValue(360.0);
[detail]    _gridLayer->setScale(SamplingParameters::Linear);
[detail] -  _gridLayer->setSymetric(false);
[detail] +  _gridLayer->setSymmetric(false);
[detail]    if(_gridLayer->autoAdjust()) {
[detail]      _gridLayer->setColorMap(_positiveMap);
[detail]    }
[detail] @@ -376,7 +474,7 @@
[detail]    _gridLayer->setMinimumValue(-1.0);
[detail]    _gridLayer->setMaximumValue(1.0);
[detail]    _gridLayer->setScale(SamplingParameters::Linear);
[detail] -  _gridLayer->setSymetric(true);
[detail] +  _gridLayer->setSymmetric(true);
[detail]    if(_gridLayer->autoAdjust()) {
[detail]      _gridLayer->setColorMap(_positiveNegativeMap);
[detail]    }
[detail] @@ -442,7 +540,7 @@
[detail]      return;
[detail]    }
[detail]    highLightWindows(winList);
[detail] -  currentTime->setText(winList.at(_currentBlockSet).start().toString(DateTime::defaultUserFormat));
[detail] +  currentTime->setText(winList.at(_blockSetList.at(_currentBlockSet).first()).start().toString(DateTime::defaultUserFormat));
[detail]    ll.unlock();
[detail]  
[detail]    const VectorList<int>& blocks=_blockSetList.at(_currentBlockSet);
[detail] @@ -496,26 +594,50 @@
[detail]    switch(mode) {
[detail]    case ArrayStations::Vertical:
[detail]      plotOption->clear();
[detail] -    plotOption->addItem(tr("Rayleigh power"));
[detail] -    plotOption->addItem(tr("Cross-spectral matrix"));
[detail]      
[detail] +    switch(param->processType()) {
[detail] +    case FKParameters::LocalSourceVertical:
[detail] +      plotOption->addItem(tr("Beam power"));
[detail] +      plotOption->addItem(tr("Velocity"));
[detail] +      break;
[detail] +    default:
[detail] +      plotOption->addItem(tr("Beam power"));
[detail] +      plotOption->addItem(tr("Cross-spectral matrix"));
[detail] +      break;
[detail] +    }
[detail]      break;
[detail]    case ArrayStations::Horizontal:
[detail]      break;
[detail]    case ArrayStations::ThreeComponents:
[detail] +  case ArrayStations::ThreeComponentsAndStrain:
[detail]      switch(param->processType()) {
[detail]      case FKParameters::ActiveRTBF:
[detail]      case FKParameters::ActiveConventionalRayleigh:
[detail]        plotOption->clear();
[detail] -      plotOption->addItem(tr("Rayleigh power"));
[detail] +      plotOption->addItem(tr("Beam power"));
[detail]        plotOption->addItem(tr("Rayleigh ellipticity"));
[detail]        plotOption->addItem(tr("Cross-spectral matrix"));
[detail]        break;
[detail] +    case FKParameters::RDSSingle:
[detail] +      plotOption->clear();
[detail] +      plotOption->addItem(tr("Beam power"));
[detail] +      plotOption->setEnabled(false);
[detail] +      break;
[detail] +    case FKParameters::ARDSSensorOrientation: {
[detail] +        plotOption->clear();
[detail] +        plotOption->addItem(tr("Beam power at best ellipticity"));
[detail] +        plotOption->addItem(tr("Best Rayleigh ellipticity"));
[detail] +        const ArraySelection& array=_crossSpectrum->array();
[detail] +        for(int i=0; i<array.count(); i++) {
[detail] +          plotOption->addItem(tr("Orientation of '%1'").arg(array.name(i)));
[detail] +        }
[detail] +      }
[detail] +      break;
[detail]      default:
[detail]        plotOption->clear();
[detail] -      plotOption->addItem(tr("Rayleigh power at best ellipticity"));
[detail] -      plotOption->addItem(tr("Rayleigh best ellipticity"));
[detail] -      plotOption->addItem(tr("Rayleigh power at fixed ellipticity"));
[detail] +      plotOption->addItem(tr("Beam power at best ellipticity"));
[detail] +      plotOption->addItem(tr("Best Rayleigh ellipticity"));
[detail] +      plotOption->addItem(tr("Beam power at fixed ellipticity"));
[detail]        plotOption->addItem(tr("Cross-spectral matrix"));
[detail]        
[detail]        break;
[detail] @@ -546,14 +668,13 @@
[detail]    const FKParameters * param=_crossSpectrum->parameters();
[detail]    ArrayStations::Mode mode=_crossSpectrum->mode();
[detail]  
[detail] -  AbstractFKFunction * fk=nullptr;
[detail] +  AbstractFKFunction * fk=AbstractFKFunction::create(mode, param, _gridCache);;
[detail]    FKFunctionPlot * funcPlot=nullptr;
[detail]  
[detail]  
[detail]    switch(mode) {
[detail]    case ArrayStations::Vertical:
[detail]      ellipticity->setEnabled(false);
[detail] -    fk=AbstractFKFunction::create(mode, param, _gridCache);
[detail]      switch(param->processType()) {
[detail]      case FKParameters::ActiveRTBF:
[detail]      case FKParameters::ActiveCapon:
[detail] @@ -562,6 +683,29 @@
[detail]        setKxCurveLimits();
[detail]        _curveLayer->setFunction(fk);
[detail]        break;
[detail] +    case FKParameters::LocalSourceVertical:
[detail] +      viewXsYsGrid();
[detail] +      setXsYsGridLimits();
[detail] +      funcPlot=static_cast<FKFunctionPlot *>(_gridLayer->takeFunction());
[detail] +      if(!funcPlot) {
[detail] +        return;
[detail] +      }
[detail] +      switch(plotOption->currentIndex()) {
[detail] +      case 1:
[detail] +        funcPlot->setFrequency(_timeWindows->frequency().center());
[detail] +        funcPlot->setMode(FKFunctionPlot::LocalSourceVelocity);
[detail] +        funcPlot->setArray(&(_crossSpectrum->array()));
[detail] +        setPowerLimits();
[detail] +        break;
[detail] +      default:
[detail] +        funcPlot->setMode(FKFunctionPlot::LocalSourceBeamPower);
[detail] +        funcPlot->setArray(&(_crossSpectrum->array()));
[detail] +        setPowerLimits();
[detail] +        break;
[detail] +      }
[detail] +      funcPlot->setFunction(fk);
[detail] +      _gridLayer->setFunction(funcPlot);
[detail] +      break;
[detail]      default:
[detail]        funcPlot=static_cast<FKFunctionPlot *>(_gridLayer->takeFunction());
[detail]        if(!funcPlot) {
[detail] @@ -591,6 +735,7 @@
[detail]    case ArrayStations::Horizontal:
[detail]      break;
[detail]    case ArrayStations::ThreeComponents:
[detail] +  case ArrayStations::ThreeComponentsAndStrain:
[detail]      funcPlot=static_cast<FKFunctionPlot *>(_gridLayer->takeFunction());
[detail]      if(!funcPlot) {
[detail]        return;
[detail] @@ -599,7 +744,6 @@
[detail]      case FKParameters::ActiveRTBF:
[detail]        ellipticity->setEnabled(false);
[detail]        funcPlot->setMode(FKFunctionPlot::BeamPower);
[detail] -      fk=AbstractFKFunction::create(mode, param, _gridCache);
[detail]        viewKEllGrid();
[detail]        setKEllGridLimits();
[detail]        break;
[detail] @@ -614,12 +758,40 @@
[detail]          funcPlot->setMode(FKFunctionPlot::InverseBeamPower);
[detail]          break;
[detail]        }
[detail] -      fk=AbstractFKFunction::create(mode, param, _gridCache);
[detail]        viewKEllGrid();
[detail]        setKEllGridLimits();
[detail]        break;
[detail] +    case FKParameters::RDSSingle:
[detail] +      viewAzimuthEllipticityGrid();
[detail] +      setAzimuthEllipticityGridLimits();
[detail] +      funcPlot->setMode(FKFunctionPlot::BeamPower);
[detail] +      break;
[detail] +    case FKParameters::ARDSSensorOrientation:
[detail] +      switch(plotOption->currentIndex()) {
[detail] +      case 0:
[detail] +        ellipticity->setEnabled(false);
[detail] +        funcPlot->setMode(FKFunctionPlot::BeamPower);
[detail] +        viewKxKyGrid();
[detail] +        setKxKyGridLimits();
[detail] +        setPowerLimits();
[detail] +        break;
[detail] +      case 1:
[detail] +        ellipticity->setEnabled(false);
[detail] +        funcPlot->setMode(FKFunctionPlot::Ellipticity);
[detail] +        viewKxKyGrid();
[detail] +        setKxKyGridLimits();
[detail] +        setEllipticityLimits();
[detail] +        break;
[detail] +      default:
[detail] +        ellipticity->setEnabled(false);
[detail] +        funcPlot->setMode(FKFunctionPlot::SensorOrientation);
[detail] +        viewKxKyGrid();
[detail] +        setKxKyGridLimits();
[detail] +        setEllipticityLimits();
[detail] +        break;
[detail] +      }
[detail] +      break;
[detail]      default:
[detail] -      fk=AbstractFKFunction::create(mode, param, _gridCache);
[detail]        switch(plotOption->currentIndex()) {
[detail]        case 0:
[detail]          ellipticity->setEnabled(false);
[detail] @@ -661,6 +833,7 @@
[detail]          setPowerLimits();
[detail]          break;
[detail]        default:
[detail] +        delete fk;
[detail]          fk=nullptr;
[detail]          break;
[detail]        }
[detail] @@ -725,9 +898,9 @@
[detail]  void FKTimeWindows::kxkyChanged()
[detail]  {
[detail]    TRACE;
[detail] -  Point kell(kxEdit->value(), kyEdit->value(), ellipticity->value());
[detail] +  Point kell(xEdit->value(), yEdit->value(), ellipticity->value());
[detail]    valueLabel->setText(tr("Value %1").arg(_gridLayer->value(kell), 0, 'g', 5));
[detail] -  Curve<Point2D>& plot=static_cast<PlotLine2D *>(_fkPeaks->line(0))->curve();
[detail] +  Curve<Point2D>& plot=static_cast<PlotLine2D *>(_fkPeaks->line(1))->curve();
[detail]    plot.clear();
[detail]    plot.append(kell);
[detail]    _fkPeaks->deepUpdate();
[detail] @@ -744,8 +917,8 @@
[detail]      showFKPeaks();
[detail]    } else {
[detail]      LayerLocker ll(_fkPeaks);
[detail] -    Curve<Point2D>& plot=static_cast<PlotLine2D *>(_fkPeaks->line(0))->curve();
[detail] -    plot.clear();
[detail] +    static_cast<PlotLine2D *>(_fkPeaks->line(0))->curve().clear();
[detail] +    static_cast<PlotLine2D *>(_fkPeaks->line(1))->curve().clear();
[detail]      _fkPeaks->deepUpdate();
[detail]    }
[detail]  }
[detail] @@ -790,6 +963,7 @@
[detail]    case ArrayStations::Horizontal:
[detail]      break;
[detail]    case ArrayStations::ThreeComponents:
[detail] +  case ArrayStations::ThreeComponentsAndStrain:
[detail]      switch(param->processType()) {
[detail]      case FKParameters::ActiveRTBF:
[detail]        prop=Propagation1D;
[detail] @@ -816,11 +990,10 @@
[detail]        double kr=p.distanceTo(origin);
[detail]        double az=Angle::radiansToDegrees(Angle::mathToGeographic(origin.azimuthTo(p)));
[detail]        double sr=kr/(2.0*M_PI*_timeWindows->frequency().center());
[detail] -      velSlowLabel->setText(tr("Propagation towards %1 counted from North at k=%2 rad/m, v=%3 m/s or s=%4 s/m" )
[detail] +      velSlowLabel->setText(tr("Towards %1 deg from North at k=%2 rad/m, v=%3 m/s" )
[detail]                               .arg(az, 0, 'f', 4)
[detail]                               .arg(kr, 0, 'g', 3)
[detail] -                             .arg(1.0/sr, 0, 'f', 0)
[detail] -                             .arg(sr, 0, 'g', 5));
[detail] +                             .arg(1.0/sr, 0, 'f', 0));
[detail]      }
[detail]      break;
[detail]    }
[detail] @@ -834,8 +1007,9 @@
[detail]    VectorList<int> blocks;
[detail]    _blockSetList.clear();
[detail]    int i=0;
[detail] +  double timePrecision=0.5/_crossSpectrum->array().commonSamplingFrequency();
[detail]    while(true) {
[detail] -    blocks=param.list(i, stationCount, timeWindowList());
[detail] +    blocks=param.list(i, stationCount, timeWindowList(), timePrecision);
[detail]      if(blocks.isEmpty()) {
[detail]        break;
[detail]      }
[detail] @@ -872,6 +1046,7 @@
[detail]    case ArrayStations::Horizontal:
[detail]      return;
[detail]    case ArrayStations::ThreeComponents:
[detail] +  case ArrayStations::ThreeComponentsAndStrain:
[detail]      switch(param->processType()) {
[detail]      case FKParameters::ActiveRTBF:
[detail]      case FKParameters::ActiveConventionalRayleigh:
[detail] @@ -904,18 +1079,18 @@
[detail]      search->globalMax(param->absoluteThreshold());
[detail]    }
[detail]  
[detail] -  FunctionMaximaIterator it;
[detail]    WaveNumberConverter conv(_timeWindows->frequency().center());
[detail]    FKPeaks::Value value;
[detail] -  for(it=search->begin(); it!=search->end(); ++it) {
[detail] -    const FunctionSearchMaximum& m=**it;
[detail] +  int n=search->extrema().size();
[detail] +  for(int i=0; i<n; i++) {
[detail] +    const FunctionSearchExtremum& m=*search->extrema().at(i);
[detail]      const Vector<double>& k=m.position();
[detail]      double slowness=conv.slowness(k);
[detail]      if(slowness>param->minimumSlowness() &&
[detail]         !fk->isOnLimit(k, conv.frequency())) {
[detail]        Point2D kp(k[0], k[1]);
[detail]        plot.append(kp);
[detail] -      fk->setAssociatedResults(k, m.value(), value);
[detail] +      fk->setAssociatedResults(k, m.value(), value, conv);
[detail]        App::log(tr("Peak at k=(%1, %2), xi=%3 deg. v=%4, s=%5, az=%6 deg., Rz/N=%7, Rh/N=%8, power=%9\n")
[detail]                 .arg(kp.x()).arg(kp.y())
[detail]                 .arg(value.ellipticity)
[detail] @@ -929,20 +1104,26 @@
[detail]        App::log(tr("Peak on limit\n"));
[detail]      }
[detail]    }
[detail] -  if(search->maximaCount()==1) {
[detail] -    const Vector<double>& kell=(*search->begin())->position();
[detail] +  if(search->extrema().size()>=1) {
[detail] +    const Vector<double>& kell=search->extrema().first()->position();
[detail]  
[detail] -    kxEdit->blockSignals(true);
[detail] -    kyEdit->blockSignals(true);
[detail] +    xEdit->blockSignals(true);
[detail] +    yEdit->blockSignals(true);
[detail]      if(!fk->isOnLimit(kell, conv.frequency())) {
[detail] -      kxEdit->setValue(kell[0]);
[detail] -      kyEdit->setValue(kell[1]);
[detail] +      if(param->processType()==FKParameters::LocalSourceVertical) {
[detail] +        Point2D p=_crossSpectrum->array().array()->toAbsolute(Point2D(kell[0], kell[1]));
[detail] +        xEdit->setValue(p.x());
[detail] +        yEdit->setValue(p.y());
[detail] +      } else {
[detail] +        xEdit->setValue(kell[0]);
[detail] +        yEdit->setValue(kell[1]);
[detail] +      }
[detail]      } else {
[detail] -      kxEdit->setValue(0.0);
[detail] -      kyEdit->setValue(0.0);
[detail] +      xEdit->setValue(0.0);
[detail] +      yEdit->setValue(0.0);
[detail]      }
[detail] -    kxEdit->blockSignals(false);
[detail] -    kyEdit->blockSignals(false);
[detail] +    xEdit->blockSignals(false);
[detail] +    yEdit->blockSignals(false);
[detail]      kxkyChanged();
[detail]    }
[detail]    delete search;
[detail] @@ -953,17 +1134,26 @@
[detail]  void FKTimeWindows::on_brightSpot_clicked()
[detail]  {
[detail]    PrivateVector<double> k(3, 0.0);
[detail] -  k[0]=kxEdit->value();
[detail] -  k[1]=kyEdit->value();
[detail] +  k[0]=xEdit->value();
[detail] +  k[1]=yEdit->value();
[detail]    if(k[0]==0.0 && k[1]==0.0) {
[detail]      return;
[detail]    }
[detail]    FKFunctionPlot * funcPlot=static_cast<FKFunctionPlot *>(_gridLayer->takeFunction());
[detail]    AbstractFKFunction * function=funcPlot->function();
[detail] -  double power=function->value(k);
[detail] +  double power;
[detail] +  if(funcPlot->isPolarCoordinates()) {
[detail] +    Complex kc(k[0], k[1]);
[detail] +    PrivateVector<double> kp(3);
[detail] +    kp[0]=kc.abs();
[detail] +    kp[1]=kc.phase();
[detail] +    power=function->value(kp);
[detail] +  } else {
[detail] +    power=function->value(k);
[detail] +  }
[detail]    FKPeaks::Value value;
[detail] -  function->setAssociatedResults(k, power, value);
[detail] -  value.power*=powerFactor->value()*0.01;
[detail] +  WaveNumberConverter conv(_timeWindows->frequency().center());
[detail] +  function->setAssociatedResults(k, power, value, conv);
[detail]    App::log(tr("Remove bright spot at k=(%1, %2) with xi= %3 deg, Rz/N %4, Rh/N %5, power %6\n")
[detail]        .arg(k[0])
[detail]        .arg(k[1])
[detail] @@ -971,7 +1161,7 @@
[detail]        .arg(value.verticalNoise)
[detail]        .arg(value.horizontalNoise)
[detail]        .arg(value.power));
[detail] -  function->remove(k, value);
[detail] +  function->remove(k, value, powerFactor->value()*0.01);
[detail]    _gridLayer->setFunction(funcPlot);
[detail]    waveNumGrid->deepUpdate();
[detail]    if(showPeaksEdit->isChecked()) {
[detail]                     src/FKToolWidget.cpp:  version-3.3.1	modified out of comments
[detail] --- src/FKToolWidget.cpp-version-3.3.1-stripped	2025-09-28 04:01:25.143600328 +0200
[detail] +++ src/FKToolWidget.cpp-HEAD-stripped	2025-09-28 04:01:25.147600347 +0200
[detail] @@ -55,8 +55,8 @@
[detail]    _gridStepTouched=false;
[detail]  
[detail]    
[detail] -  inversionMethodEdit->setCurrentIndex(1);
[detail] -  inversionMethodEdit->setEnabled(false);
[detail] +  
[detail] +  
[detail]  
[detail]    
[detail]    detailedStatus->setButtons(startBut, stopBut);
[detail] @@ -101,8 +101,8 @@
[detail]      k=param->kmin()*FKParameters::defaultGridStepFactor(processType(processTypeEdit->currentIndex()),
[detail]                                                          inversionMethod(inversionMethodEdit->currentIndex()));
[detail]      gridStepEdit->blockSignals(true);
[detail] -    if(k>0.0 && k<pow(10.0, -gridStepEdit->decimals())) {
[detail] -      gridStepEdit->setDecimals(3-qFloor(log10(k)));
[detail] +    if(k>0.0 && k<Number::exp10(-gridStepEdit->decimals())) {
[detail] +      gridStepEdit->setDecimals(3-Number::floorLog10(k));
[detail]      }
[detail]      gridStepEdit->setValue(k);
[detail]      gridStepEdit->blockSignals(false);
[detail] @@ -110,8 +110,8 @@
[detail]    if(!_gridSizeTouched) {
[detail]      k=param->gridSize();
[detail]      gridSizeEdit->blockSignals(true);
[detail] -    if(k>0.0 && k<pow(10.0, -gridSizeEdit->decimals())) {
[detail] -      gridSizeEdit->setDecimals(3-qFloor(log10(k)));
[detail] +    if(k>0.0 && k<Number::exp10(-gridSizeEdit->decimals())) {
[detail] +      gridSizeEdit->setDecimals(3-Number::floorLog10(k));
[detail]      }
[detail]      gridSizeEdit->setValue(k);
[detail]      gridSizeEdit->blockSignals(false);
[detail] @@ -180,29 +180,37 @@
[detail]      
[detail]      processTypeEdit->blockSignals(true);
[detail]      StationSignals::Components c=tool()->array()->components();
[detail] -    if(c==StationSignals::AllComponent) {
[detail] +    if(c==StationSignals::ThreeComponents) {
[detail]        processTypeEdit->addItem(tr("Passive ARDS"));
[detail]        processTypeEdit->addItem(tr("Passive ARTBF"));
[detail]        processTypeEdit->addItem(tr("Passive RTBF (2018)"));
[detail]        processTypeEdit->addItem(tr("Passive LDS3"));
[detail] +      processTypeEdit->addItem(tr("Passive RDSSingle"));
[detail] +      processTypeEdit->addItem(tr("Passive Sensor Orientation"));
[detail]      }
[detail] -    if(c & StationSignals::HorizontalComponent) {
[detail] +    if(c==StationSignals::ThreeComponentsAndStrain) {
[detail] +      processTypeEdit->addItem(tr("Passive velocity & strain rate Rayleigh"));
[detail] +      processTypeEdit->addItem(tr("Passive velocity & strain rate Love"));
[detail] +    } else {
[detail] +      if(c & StationSignals::HorizontalComponents) {
[detail]        processTypeEdit->addItem(tr("Passive LDS2"));
[detail]        processTypeEdit->addItem(tr("Passive Radial Capon"));
[detail]        processTypeEdit->addItem(tr("Passive Transverse Capon"));
[detail]        processTypeEdit->addItem(tr("Passive Radial Conventional"));
[detail]        processTypeEdit->addItem(tr("Passive Transverse Conventional"));
[detail]      }
[detail] -    if(c & StationSignals::VerticalComponent) {
[detail] +      if(c & StationSignals::VerticalComponents) {
[detail]        processTypeEdit->addItem(tr("Passive Vertical Capon"));
[detail]        processTypeEdit->addItem(tr("Passive Vertical Conventional"));
[detail] +        processTypeEdit->addItem(tr("Passive Vertical Local Sources"));
[detail]        processTypeEdit->addItem(tr("Active Vertical Capon"));
[detail]        processTypeEdit->addItem(tr("Active Vertical Conventional"));
[detail]      }
[detail] -    if(c==StationSignals::AllComponent) {
[detail] +      if(c==StationSignals::ThreeComponents) {
[detail]        processTypeEdit->addItem(tr("Active Rayleigh Conventional"));
[detail]        processTypeEdit->addItem(tr("Active RTBF"));
[detail]      }
[detail] +    }
[detail]      processTypeEdit->blockSignals(false);
[detail]      return true;
[detail]    } else {
[detail] @@ -265,9 +273,6 @@
[detail]    param.setProcessType(processType(processTypeEdit->currentIndex()));
[detail]    param.setInversionMethod(inversionMethod(inversionMethodEdit->currentIndex()));
[detail]    
[detail] -  param.setDefaultValues();
[detail] -  param.setValues(_loadedParameters);
[detail] -
[detail]    timeLimits->getParameters(param.timeLimits());
[detail]    param.setSelectDurationFactor(0.01*selectMinimumDurationEdit->value());
[detail]    winParam->getParameters(param.windowing());
[detail] @@ -275,7 +280,7 @@
[detail]    freqSamp->getParameters(param.frequencySampling());
[detail]    blockAveraging->getParameters(param.blockAveraging());
[detail]  
[detail] -  param.setfrequencyBandwidth(freqBandwidthEdit->value());
[detail] +  param.setFrequencyBandwidth(freqBandwidthEdit->value());
[detail]    param.setOversamplingFactor(oversamplingEdit->value());
[detail]  
[detail]    param.setDamping(dampingFactorEdit->value());
[detail] @@ -289,7 +294,15 @@
[detail]    param.setKmin(tool()->parameters()->kmin()); 
[detail]    param.setKmax(tool()->parameters()->kmax()); 
[detail]  
[detail] +  if(maxPeakCount->value()==0) {
[detail] +    param.setMaximumPeakCount(0);
[detail] +    param.setMaximumPeakCountFactor(1.0);
[detail] +  } else if(maxPeakCount->value()<0) {
[detail] +    param.setMaximumPeakCount(0);
[detail] +    param.setMaximumPeakCountFactor(-1.0/maxPeakCount->value());
[detail] +  } else {
[detail]    param.setMaximumPeakCount(maxPeakCount->value());
[detail] +  }
[detail]    param.setAbsoluteThreshold(maxAbsoluteThres->value());
[detail]    param.setRelativeThreshold(maxRelativeThres->value()*0.01);
[detail]  
[detail] @@ -304,7 +317,6 @@
[detail]    TRACE;
[detail]    const FKParameters& param=*tool()->parameters();
[detail]  
[detail] -  _loadedParameters.addValues(param);
[detail]    timeLimits->setParameters(param.timeLimits());
[detail]    selectMinimumDurationEdit->setValue(100.0*param.selectDurationFactor());
[detail]    winParam->setParameters(param.windowing());
[detail] @@ -332,7 +344,15 @@
[detail]    vminEdit->setValue(1.0/param.maximumSlowness());
[detail]    vmaxEdit->setValue(1.0/param.minimumSlowness());
[detail]  
[detail] -  maxPeakCount->setValue(param.maximumPeakCount(0));
[detail] +  if(param.maximumPeakCount()==0) {
[detail] +    if(param.maximumPeakCountFactor()==1) {
[detail] +      maxPeakCount->setValue(0);
[detail] +    } else {
[detail] +      maxPeakCount->setValue(qRound(-1.0/param.maximumPeakCountFactor()));
[detail] +    }
[detail] +  } else {
[detail] +    maxPeakCount->setValue(param.maximumPeakCount());
[detail] +  }
[detail]    maxAbsoluteThres->setValue(param.absoluteThreshold());
[detail]    maxRelativeThres->setValue(param.relativeThreshold()*100.0);
[detail]  
[detail] @@ -346,7 +366,7 @@
[detail]  {
[detail]    TRACE;
[detail]    StationSignals::Components c=tool()->array()->components();
[detail] -  if(c==StationSignals::AllComponent) {
[detail] +  if(c==StationSignals::ThreeComponents) {
[detail]      switch(t) {
[detail]      case 0:
[detail]        return FKParameters::ARDS;
[detail] @@ -356,12 +376,26 @@
[detail]        return FKParameters::RTBF;
[detail]      case 3:
[detail]        return FKParameters::LDS3;
[detail] +    case 4:
[detail] +      return FKParameters::RDSSingle;
[detail] +    case 5:
[detail] +      return FKParameters::ARDSSensorOrientation;
[detail]      default:
[detail] -      t-=4;
[detail] +      t-=6;
[detail]        break;
[detail]      }
[detail]    }
[detail] -  if(c & StationSignals::HorizontalComponent) {
[detail] +  if(c==StationSignals::ThreeComponentsAndStrain) {
[detail] +    switch(t) {
[detail] +    case 0:
[detail] +      return FKParameters::VelocityStrainRateRayleigh;
[detail] +    case 1:
[detail] +      return FKParameters::VelocityStrainRateRayleigh;
[detail] +    default:
[detail] +      break;
[detail] +    }
[detail] +  } else {
[detail] +    if(c & StationSignals::HorizontalComponents) {
[detail]      switch(t) {
[detail]      case 0:
[detail]        return FKParameters::LDS2;
[detail] @@ -378,22 +412,24 @@
[detail]        break;
[detail]      }
[detail]    }
[detail] -  if(c & StationSignals::VerticalComponent) {
[detail] +    if(c & StationSignals::VerticalComponents) {
[detail]      switch(t) {
[detail]      case 0:
[detail]        return FKParameters::Capon;
[detail]      case 1:
[detail]        return FKParameters::Conventional;
[detail]      case 2:
[detail] -      return FKParameters::ActiveCapon;
[detail] +        return FKParameters::LocalSourceVertical;
[detail]      case 3:
[detail] +        return FKParameters::ActiveCapon;
[detail] +      case 4:
[detail]        return FKParameters::ActiveConventional;
[detail]      default:
[detail] -      t-=4;
[detail] +        t-=5;
[detail]        break;
[detail]      }
[detail]    }
[detail] -  if(c==StationSignals::AllComponent) {
[detail] +    if(c==StationSignals::ThreeComponents) {
[detail]      switch(t) {
[detail]      case 0:
[detail]        return FKParameters::ActiveConventionalRayleigh;
[detail] @@ -404,6 +440,7 @@
[detail]        break;
[detail]      }
[detail]    }
[detail] +  }
[detail]    return FKParameters::Capon;
[detail]  }
[detail]  
[detail] @@ -412,7 +449,7 @@
[detail]    TRACE;
[detail]    int shift=0;
[detail]    StationSignals::Components c=tool()->array()->components();
[detail] -  if(c==StationSignals::AllComponent) {
[detail] +  if(c==StationSignals::ThreeComponents) {
[detail]      switch(t) {
[detail]      case FKParameters::ARDS:
[detail]        return shift;
[detail] @@ -422,12 +459,26 @@
[detail]        return shift+2;
[detail]      case FKParameters::LDS3:
[detail]        return shift+3;
[detail] +    case FKParameters::RDSSingle:
[detail] +      return shift+4;
[detail] +    case FKParameters::ARDSSensorOrientation:
[detail] +      return shift+5;
[detail]      default:
[detail] -      shift+=4;
[detail] +      shift+=6;
[detail]        break;
[detail]      }
[detail]    }
[detail] -  if(c & StationSignals::HorizontalComponent) {
[detail] +  if(c==StationSignals::ThreeComponentsAndStrain) {
[detail] +    switch(t) {
[detail] +    case FKParameters::VelocityStrainRateRayleigh:
[detail] +      return shift;
[detail] +    case FKParameters::VelocityStrainRateLove:
[detail] +      return shift+1;
[detail] +    default:
[detail] +      break;
[detail] +    }
[detail] +  } else {
[detail] +    if(c & StationSignals::HorizontalComponents) {
[detail]      switch(t) {
[detail]      case FKParameters::LDS2:
[detail]        return shift;
[detail] @@ -444,21 +495,23 @@
[detail]        break;
[detail]      }
[detail]    }
[detail] -  if(c & StationSignals::VerticalComponent) {
[detail] +    if(c & StationSignals::VerticalComponents) {
[detail]      switch(t) {
[detail]      case FKParameters::Capon:
[detail]        return shift;
[detail]      case FKParameters::Conventional:
[detail]        return shift+1;
[detail] -    case FKParameters::ActiveCapon:
[detail] +      case FKParameters::LocalSourceVertical:
[detail]        return shift+2;
[detail] -    case FKParameters::ActiveConventional:
[detail] +      case FKParameters::ActiveCapon:
[detail]        return shift+3;
[detail] +      case FKParameters::ActiveConventional:
[detail] +        return shift+4;
[detail]      default:
[detail] -      shift+=4;
[detail] +        shift+=5;
[detail]        break;
[detail]      }
[detail] -    if(c==StationSignals::AllComponent) {
[detail] +      if(c==StationSignals::ThreeComponents) {
[detail]        switch(t) {
[detail]        case FKParameters::ActiveConventionalRayleigh:
[detail]          return shift;
[detail] @@ -470,6 +523,7 @@
[detail]        }
[detail]      }
[detail]    }
[detail] +  }
[detail]    return 0;
[detail]  }
[detail]  
[detail] @@ -591,17 +645,24 @@
[detail]    FKParameters::ProcessType t=processType(index);
[detail]    switch(t) {
[detail]    case FKParameters::ARDS:
[detail] -  case FKParameters::SensorOrientation:
[detail] +  case FKParameters::ARDSSensorOrientation:
[detail]    case FKParameters::RDSSingle:
[detail]    case FKParameters::LDS2:
[detail]    case FKParameters::LDS3:
[detail]    case FKParameters::Omni:
[detail] +  case FKParameters::VelocityStrainRateRayleigh:
[detail] +  case FKParameters::VelocityStrainRateLove:
[detail]      dampingFactorEdit->setEnabled(true);
[detail]      rotateStepCountEdit->setEnabled(false);
[detail]      srcRecDistance->setEnabled(false);
[detail]      break;
[detail]    case FKParameters::Undefined:
[detail] +  case FKParameters::SpectrumMatch:
[detail] +  case FKParameters::CrossSpectrumMatch:
[detail] +  case FKParameters::PlaneWaveInversion:
[detail] +  case FKParameters::FullSpectrumOneMode:
[detail]    case FKParameters::Capon:
[detail] +  case FKParameters::LocalSourceVertical:
[detail]      dampingFactorEdit->setEnabled(true);
[detail]      rotateStepCountEdit->setEnabled(false);
[detail]      srcRecDistance->setEnabled(false);
[detail]                   src/SPACToolWidget.cpp:  version-3.3.1	modified out of comments
[detail] --- src/SPACToolWidget.cpp-version-3.3.1-stripped	2025-09-28 04:01:25.163600424 +0200
[detail] +++ src/SPACToolWidget.cpp-HEAD-stripped	2025-09-28 04:01:25.167600444 +0200
[detail] @@ -232,7 +232,7 @@
[detail]    freqSamp->getParameters(param.frequencySampling());
[detail]    blockAveraging->getParameters(param.blockAveraging());
[detail]  
[detail] -  param.setfrequencyBandwidth(freqBandwidthEdit->value());
[detail] +  param.setFrequencyBandwidth(freqBandwidthEdit->value());
[detail]    param.setOversamplingFactor(oversamplingEdit->value());
[detail]  
[detail]    param.setMethod(spacMethod->currentIndex()==0 ? SPACParameters::MSPAC : SPACParameters::ESAC);
[detail]                    src/ActiveFKResults.h:  version-3.3.1	not modified
[detail]                 src/ActiveFKToolWidget.h:  version-3.3.1	not modified
[detail]                        src/ArrayPlugin.h:  version-3.3.1	not modified
[detail]                      src/FKTimeWindows.h:  version-3.3.1	modified out of comments
[detail] --- src/FKTimeWindows.h-version-3.3.1-stripped	2025-09-28 04:01:25.227600734 +0200
[detail] +++ src/FKTimeWindows.h-HEAD-stripped	2025-09-28 04:01:25.235600773 +0200
[detail] @@ -30,6 +30,8 @@
[detail]    void viewKxKyGrid();
[detail]    void viewMatrixGrid();
[detail]    void viewKEllGrid();
[detail] +  void viewAzimuthEllipticityGrid();
[detail] +  void viewXsYsGrid();
[detail]  
[detail]  private slots:
[detail]    void setCurrentBlockSet();
[detail] @@ -50,6 +52,8 @@
[detail]    void setPlotOptions();
[detail]    void setPlotOption();
[detail]    void setKxKyGridLimits();
[detail] +  void setXsYsGridLimits();
[detail] +  void setAzimuthEllipticityGridLimits();
[detail]    void setMatrixGridLimits(AbstractFKFunction * fk);
[detail]    void setKEllGridLimits();
[detail]    void setKxCurveLimits();
[detail]                       src/FKToolWidget.h:  version-3.3.1	modified out of comments
[detail] --- src/FKToolWidget.h-version-3.3.1-stripped	2025-09-28 04:01:25.251600850 +0200
[detail] +++ src/FKToolWidget.h-HEAD-stripped	2025-09-28 04:01:25.251600850 +0200
[detail] @@ -57,7 +57,6 @@
[detail]    static int inversionMethod(FKParameters::InversionMethod m);
[detail]  
[detail]  private:
[detail] -  FKParameters _loadedParameters;
[detail]    bool _outputFileChecked;
[detail]    bool _exportAllFKGrids;
[detail]  
[detail]                     src/SPACToolWidget.h:  version-3.3.1	not modified
[detail]                src/ActiveFKToolWidget.ui:  version-3.3.1	not modified
[detail]                     src/FKTimeWindows.ui:  version-3.3.1	modified out of comments
[detail] --- src/FKTimeWindows.ui-version-3.3.1-stripped	2025-09-28 04:01:25.299601083 +0200
[detail] +++ src/FKTimeWindows.ui-HEAD-stripped	2025-09-28 04:01:25.303601101 +0200
[detail] @@ -209,14 +209,20 @@
[detail]     <item row="6" column="0" colspan="4">
[detail]      <layout class="QHBoxLayout" name="horizontalLayout">
[detail]       <item>
[detail] -      <widget class="QLabel" name="label_4">
[detail] +      <widget class="QLabel" name="xLabel">
[detail]         <property name="text">
[detail]          <string>kx</string>
[detail]         </property>
[detail]        </widget>
[detail]       </item>
[detail]       <item>
[detail] -      <widget class="QGpGuiTools::DoubleSpinBox" name="kxEdit">
[detail] +      <widget class="QGpGuiTools::DoubleSpinBox" name="xEdit">
[detail] +       <property name="sizePolicy">
[detail] +        <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
[detail] +         <horstretch>0</horstretch>
[detail] +         <verstretch>0</verstretch>
[detail] +        </sizepolicy>
[detail] +       </property>
[detail]         <property name="decimals">
[detail]          <number>8</number>
[detail]         </property>
[detail] @@ -229,14 +235,20 @@
[detail]        </widget>
[detail]       </item>
[detail]       <item>
[detail] -      <widget class="QLabel" name="label_5">
[detail] +      <widget class="QLabel" name="yLabel">
[detail]         <property name="text">
[detail]          <string>ky</string>
[detail]         </property>
[detail]        </widget>
[detail]       </item>
[detail]       <item>
[detail] -      <widget class="QGpGuiTools::DoubleSpinBox" name="kyEdit">
[detail] +      <widget class="QGpGuiTools::DoubleSpinBox" name="yEdit">
[detail] +       <property name="sizePolicy">
[detail] +        <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
[detail] +         <horstretch>0</horstretch>
[detail] +         <verstretch>0</verstretch>
[detail] +        </sizepolicy>
[detail] +       </property>
[detail]         <property name="decimals">
[detail]          <number>8</number>
[detail]         </property>
[detail] @@ -290,6 +302,9 @@
[detail]       </item>
[detail]       <item>
[detail]        <widget class="QDoubleSpinBox" name="powerFactor">
[detail] +       <property name="toolTip">
[detail] +        <string>Reduces power to damp bright spot removal. </string>
[detail] +       </property>
[detail]         <property name="suffix">
[detail]          <string> %</string>
[detail]         </property>
[detail]                      src/FKToolWidget.ui:  version-3.3.1	modified out of comments
[detail] --- src/FKToolWidget.ui-version-3.3.1-stripped	2025-09-28 04:01:25.323601198 +0200
[detail] +++ src/FKToolWidget.ui-HEAD-stripped	2025-09-28 04:01:25.327601217 +0200
[detail] @@ -342,7 +342,7 @@
[detail]         <item>
[detail]          <widget class="QGroupBox" name="groupBox_6">
[detail]           <property name="title">
[detail] -          <string>FK gridding</string>
[detail] +          <string>FK search</string>
[detail]           </property>
[detail]           <layout class="QGridLayout" name="_2">
[detail]            <property name="leftMargin">
[detail] @@ -591,10 +591,7 @@
[detail]              <item>
[detail]               <widget class="QLabel" name="label_8">
[detail]                <property name="whatsThis">
[detail] -               <string>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
[detail] -p, li {white-space: pre-wrap;}
[detail] -&lt;/style&gt;&lt;/head&gt;&lt;body&gt;
[detail] -&lt;p &gt;It is the number of maxima that are seached for in the power spectrum. A value of 1 means export only the highest peak, any other values will also export sub-maxima that may correspond to higher modes.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
[detail] +               <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;It is the number of maxima that are seached for in the power spectrum.  A value of 1 means export only the highest peak. A value of 0 or -1 means export the N highest peaks where N is the number of sensors. A negative value means export the -N/value highest peaks. Secondary maxima that may correspond to higher modes. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
[detail]                </property>
[detail]                <property name="text">
[detail]                 <string>Maximum number</string>
[detail] @@ -610,7 +607,7 @@
[detail]                 </size>
[detail]                </property>
[detail]                <property name="minimum">
[detail] -               <number>0</number>
[detail] +               <number>-9999999</number>
[detail]                </property>
[detail]                <property name="maximum">
[detail]                 <number>9999999</number>
[detail]                    src/SPACToolWidget.ui:  version-3.3.1	not modified
[summary] Total differences: 1048 lines
[summary] Modification level is C
OLD_DIR=$(pwd)
echo "geopsyarray"
cd $(find . -name "geopsyarray" | tail -n 1) || exit 2
pwd
dpversion C  || exit 2
cd $OLD_DIR || exit 2
################## geopsyhv
[detail]   src/FrequencyWindowRejectionWidget.cpp:  version-4.0.4	not modified
[detail]                    src/GeopsyHVPrefs.cpp:  version-4.0.4	not modified
[detail]                         src/HVPlugin.cpp:  version-4.0.4	not modified
[detail]                    src/HVResultSheet.cpp:  version-4.0.4	not modified
[detail]              src/HVRotateResultSheet.cpp:  version-4.0.4	not modified
[detail]               src/HVRotateToolWidget.cpp:  version-4.0.4	modified out of comments
[detail] --- src/HVRotateToolWidget.cpp-version-4.0.4-stripped	2025-09-28 04:01:25.479601952 +0200
[detail] +++ src/HVRotateToolWidget.cpp-HEAD-stripped	2025-09-28 04:01:25.483601971 +0200
[detail] @@ -8,25 +8,33 @@
[detail]  
[detail]  
[detail]  HVRotateToolWidget::HVRotateToolWidget(QWidget * parent)
[detail] -    : AbstractHVWidget(parent)
[detail] +    : AbstractHVToolWidget(parent)
[detail]  {
[detail]    TRACE;
[detail]    setWindowIcon(QIcon( ":hvrotate-22x22.png"));
[detail]    setObjectName("HVRotateToolWidget");
[detail]  
[detail] -  winParam->addComponent(tr("Vertical"));
[detail] -  winParam->addComponent(tr("North"));
[detail] -  winParam->addComponent(tr("East"));
[detail] +  addComponent(tr("Vertical"));
[detail] +  addComponent(tr("North"));
[detail] +  addComponent(tr("East"));
[detail]  
[detail] -  removeHorizontalComponents();
[detail] +  _smoothing=addSmoothingWidget();
[detail] +  _rotate=addRotateWidget();
[detail]  
[detail]    _tool=new HVRotateTool(this);
[detail]  }
[detail]  
[detail] +void HVRotateToolWidget::updateAllFields()
[detail] +{
[detail] +  TRACE;
[detail] +  _smoothing->updateAllFields();
[detail] +  AbstractHVToolWidget::updateAllFields();
[detail] +}
[detail] +
[detail]  bool HVRotateToolWidget::setSubPool(SubSignalPool * subPool)
[detail]  {
[detail]    TRACE;
[detail] -  if(!AbstractHVWidget::setSubPool(subPool)) {
[detail] +  if(!AbstractHVToolWidget::setSubPool(subPool)) {
[detail]      return false;
[detail]    }
[detail]    setWindowTitle(tr("H/V Rotate toolbox - ")+subPool->name());
[detail] @@ -44,3 +52,21 @@
[detail]    TRACE;
[detail]    return nullptr;
[detail]  }
[detail] +
[detail] +void HVRotateToolWidget::parametersToGui()
[detail] +{
[detail] +  TRACE;
[detail] +  AbstractHVToolWidget::parametersToGui();
[detail] +  const HVRotateParameters& param=*static_cast<const HVRotateParameters *>(tool()->parameters());
[detail] +  _smoothing->setParameters(param.smoothing());
[detail] +  _rotate->setStep(param.rotationStep());
[detail] +}
[detail] +
[detail] +void HVRotateToolWidget::parametersFromGui()
[detail] +{
[detail] +  TRACE;
[detail] +  AbstractHVToolWidget::parametersFromGui();
[detail] +  HVRotateParameters& param=*static_cast<HVRotateParameters *>(tool()->parameters());
[detail] +  _smoothing->getParameters(param.smoothing());
[detail] +  param.setRotationStep(_rotate->step());
[detail] +}
[detail]                        src/HVSummary.cpp:  version-4.0.4	not modified
[detail]                     src/HVToolWidget.cpp:  version-4.0.4	modified out of comments
[detail] --- src/HVToolWidget.cpp-version-4.0.4-stripped	2025-09-28 04:01:25.519602145 +0200
[detail] +++ src/HVToolWidget.cpp-HEAD-stripped	2025-09-28 04:01:25.523602165 +0200
[detail] @@ -1,7 +1,5 @@
[detail]  
[detail]  
[detail] -#include <GeopsyGui.h>
[detail] -
[detail]  #include "HVToolWidget.h"  
[detail]  #include "HVStation.h"
[detail]  #include "HVStationSignals.h"
[detail] @@ -10,30 +8,38 @@
[detail]  #include "FrequencyWindowRejectionWidget.h"
[detail]  
[detail]  HVToolWidget::HVToolWidget(QWidget * parent) :
[detail] -    AbstractHVWidget(parent)
[detail] +    AbstractHVToolWidget(parent)
[detail]  {
[detail]    TRACE;
[detail]    setWindowIcon(QIcon(":hv-22x22.png"));
[detail]    setObjectName("HVToolWidget");
[detail]  
[detail] -  winParam->addComponent(tr("Vertical"));
[detail] -  winParam->addComponent(tr("North"));
[detail] -  winParam->addComponent(tr("East"));
[detail] +  addComponent(tr("Vertical"));
[detail] +  addComponent(tr("North"));
[detail] +  addComponent(tr("East"));
[detail]  
[detail] -  removeRotateStep();
[detail] +  _smoothing=addSmoothingWidget();
[detail] +  _horizontalComponents=addHorizontalComponentsWidget();
[detail]  
[detail] -  QMenu * m=selectBut->menu();
[detail]    QAction * a=new QAction(tr("Frequency rejection"), this);
[detail]    connect(a, SIGNAL(triggered()), this, SLOT(frequencyWindowRejection()));
[detail] -  m->addAction(a);
[detail] +  addAction(a);
[detail]  
[detail]    _tool=new HVTool(this);
[detail]  }
[detail]  
[detail] +void HVToolWidget::updateAllFields()
[detail] +{
[detail] +  TRACE;
[detail] +  _smoothing->updateAllFields();
[detail] +  _horizontalComponents->updateAllFields();
[detail] +  AbstractHVToolWidget::updateAllFields();
[detail] +}
[detail] +
[detail]  bool HVToolWidget::setSubPool(SubSignalPool * subPool)
[detail]  {
[detail]    TRACE;
[detail] -  if(!AbstractHVWidget::setSubPool(subPool)) {
[detail] +  if(!AbstractHVToolWidget::setSubPool(subPool)) {
[detail]      return false;
[detail]    }
[detail]    setWindowTitle(tr("H/V toolbox - ")+subPool->name());
[detail] @@ -54,6 +60,26 @@
[detail]    return new HVSummary;
[detail]  }
[detail]  
[detail] +void HVToolWidget::parametersToGui()
[detail] +{
[detail] +  TRACE;
[detail] +  AbstractHVToolWidget::parametersToGui();
[detail] +  const HVParameters& param=*static_cast<const HVParameters *>(tool()->parameters());
[detail] +  _smoothing->setParameters(param.smoothing());
[detail] +  _horizontalComponents->setComponent(param.horizontal());
[detail] +  _horizontalComponents->setAzimuth(param.horizontalAzimuth());
[detail] +}
[detail] +
[detail] +void HVToolWidget::parametersFromGui()
[detail] +{
[detail] +  TRACE;
[detail] +  AbstractHVToolWidget::parametersFromGui();
[detail] +  HVParameters& param=*static_cast<HVParameters *>(tool()->parameters());
[detail] +  _smoothing->getParameters(param.smoothing());
[detail] +  param.setHorizontal(_horizontalComponents->component());
[detail] +  param.setHorizontalAzimuth(_horizontalComponents->azimuth());
[detail] +}
[detail] +
[detail]  
[detail]  void HVToolWidget::frequencyWindowRejection()
[detail]  {
[detail]              src/SpectrumResultSheet.cpp:  version-4.0.4	not modified
[detail]        src/SpectrumRotateResultSheet.cpp:  version-4.0.4	not modified
[detail]         src/SpectrumRotateToolWidget.cpp:  version-4.0.4	modified out of comments
[detail] --- src/SpectrumRotateToolWidget.cpp-version-4.0.4-stripped	2025-09-28 04:01:25.571602396 +0200
[detail] +++ src/SpectrumRotateToolWidget.cpp-HEAD-stripped	2025-09-28 04:01:25.575602416 +0200
[detail] @@ -8,23 +8,31 @@
[detail]  
[detail]  
[detail]  SpectrumRotateToolWidget::SpectrumRotateToolWidget(QWidget * parent)
[detail] -    : AbstractHVWidget(parent)
[detail] +    : AbstractHVToolWidget(parent)
[detail]  {
[detail]    TRACE;
[detail]    setWindowIcon(QIcon(":spectrumrotate-22x22.png"));
[detail]    setObjectName("SpectrumRotateToolWidget");
[detail]  
[detail] -  winParam->addComponent(tr("Any component"));
[detail] +  addComponent(tr("Any component"));
[detail]  
[detail] -  removeHorizontalComponents();
[detail] +  _smoothing=addSmoothingWidget();
[detail] +  _rotate=addRotateWidget();
[detail]  
[detail]    _tool=new SpectrumRotateTool(this);
[detail]  }
[detail]  
[detail] +void SpectrumRotateToolWidget::updateAllFields()
[detail] +{
[detail] +  TRACE;
[detail] +  _smoothing->updateAllFields();
[detail] +  AbstractHVToolWidget::updateAllFields();
[detail] +}
[detail] +
[detail]  bool SpectrumRotateToolWidget::setSubPool(SubSignalPool * subPool)
[detail]  {
[detail]    TRACE;
[detail] -  if(!AbstractHVWidget::setSubPool(subPool)) {
[detail] +  if(!AbstractHVToolWidget::setSubPool(subPool)) {
[detail]      return false;
[detail]    }
[detail]    if(_winResults) {
[detail] @@ -47,3 +55,20 @@
[detail]    return nullptr;
[detail]  }
[detail]  
[detail] +void SpectrumRotateToolWidget::parametersToGui()
[detail] +{
[detail] +  TRACE;
[detail] +  AbstractHVToolWidget::parametersToGui();
[detail] +  const HVRotateParameters& param=*static_cast<const HVRotateParameters *>(tool()->parameters());
[detail] +  _smoothing->setParameters(param.smoothing());
[detail] +  _rotate->setStep(param.rotationStep());
[detail] +}
[detail] +
[detail] +void SpectrumRotateToolWidget::parametersFromGui()
[detail] +{
[detail] +  TRACE;
[detail] +  AbstractHVToolWidget::parametersFromGui();
[detail] +  HVRotateParameters& param=*static_cast<HVRotateParameters *>(tool()->parameters());
[detail] +  _smoothing->getParameters(param.smoothing());
[detail] +  param.setRotationStep(_rotate->step());
[detail] +}
[detail]                  src/SpectrumSummary.cpp:  version-4.0.4	not modified
[detail]               src/SpectrumToolWidget.cpp:  version-4.0.4	modified out of comments
[detail] --- src/SpectrumToolWidget.cpp-version-4.0.4-stripped	2025-09-28 04:01:25.607602571 +0200
[detail] +++ src/SpectrumToolWidget.cpp-HEAD-stripped	2025-09-28 04:01:25.611602589 +0200
[detail] @@ -11,24 +11,30 @@
[detail]  
[detail]  
[detail]  SpectrumToolWidget::SpectrumToolWidget(QWidget * parent)
[detail] -    : AbstractHVWidget(parent)
[detail] +    : AbstractHVToolWidget(parent)
[detail]  {
[detail]    TRACE;
[detail]    setWindowIcon(QIcon(":spectrum-22x22.png"));
[detail]    setObjectName("SpectrumToolWidget");
[detail]  
[detail] -  winParam->addComponent(tr("Any component"));
[detail] +  addComponent(tr("Any component"));
[detail]  
[detail] -  removeHorizontalComponents();
[detail] -  removeRotateStep();
[detail] +  _smoothing=addSmoothingWidget();
[detail]  
[detail]    _tool=new SpectrumTool(this);
[detail]  }
[detail]  
[detail] +void SpectrumToolWidget::updateAllFields()
[detail] +{
[detail] +  TRACE;
[detail] +  _smoothing->updateAllFields();
[detail] +  AbstractHVToolWidget::updateAllFields();
[detail] +}
[detail] +
[detail]  bool SpectrumToolWidget::setSubPool(SubSignalPool * subPool)
[detail]  {
[detail]    TRACE;
[detail] -  if(!AbstractHVWidget::setSubPool(subPool)) {
[detail] +  if(!AbstractHVToolWidget::setSubPool(subPool)) {
[detail]      return false;
[detail]    }
[detail]    if(_winResults) {
[detail] @@ -54,3 +60,19 @@
[detail]    TRACE;
[detail]    return new SpectrumSummary;
[detail]  }
[detail] +
[detail] +void SpectrumToolWidget::parametersToGui()
[detail] +{
[detail] +  TRACE;
[detail] +  AbstractHVToolWidget::parametersToGui();
[detail] +  const SpectrumParameters& param=*static_cast<const SpectrumParameters *>(tool()->parameters());
[detail] +  _smoothing->setParameters(param.smoothing());
[detail] +}
[detail] +
[detail] +void SpectrumToolWidget::parametersFromGui()
[detail] +{
[detail] +  TRACE;
[detail] +  AbstractHVToolWidget::parametersFromGui();
[detail] +  SpectrumParameters& param=*static_cast<SpectrumParameters *>(tool()->parameters());
[detail] +  _smoothing->getParameters(param.smoothing());
[detail] +}
[detail]                 src/TabHVPreferences.cpp:  version-4.0.4	not modified
[detail]     src/FrequencyWindowRejectionWidget.h:  version-4.0.4	not modified
[detail]                      src/GeopsyHVPrefs.h:  version-4.0.4	not modified
[detail]                           src/HVPlugin.h:  version-4.0.4	not modified
[detail]                      src/HVResultSheet.h:  version-4.0.4	modified out of comments
[detail] --- src/HVResultSheet.h-version-4.0.4-stripped	2025-09-28 04:01:25.691602977 +0200
[detail] +++ src/HVResultSheet.h-HEAD-stripped	2025-09-28 04:01:25.695602995 +0200
[detail] @@ -11,7 +11,7 @@
[detail]    HVResultSheet(QWidget * parent=nullptr);
[detail]    ~HVResultSheet();
[detail]  
[detail] -  virtual void setWindowTitle(QString subPoolName);
[detail] +  void setWindowTitle(QString subPoolName);
[detail]  protected slots:
[detail]    void loadResults();
[detail]  protected:
[detail]                src/HVRotateResultSheet.h:  version-4.0.4	not modified
[detail]                 src/HVRotateToolWidget.h:  version-4.0.4	modified out of comments
[detail] --- src/HVRotateToolWidget.h-version-4.0.4-stripped	2025-09-28 04:01:25.723603132 +0200
[detail] +++ src/HVRotateToolWidget.h-HEAD-stripped	2025-09-28 04:01:25.727603150 +0200
[detail] @@ -3,9 +3,9 @@
[detail]  #ifndef HVROTATETOOLWIDGET_H
[detail]  #define HVROTATETOOLWIDGET_H
[detail]  
[detail] -#include "HVToolWidget.h"
[detail] +#include <HVGui.h>
[detail]  
[detail] -class HVRotateToolWidget : public AbstractHVWidget
[detail] +class HVRotateToolWidget : public AbstractHVToolWidget
[detail]  {
[detail]    Q_OBJECT
[detail]  public:
[detail] @@ -13,8 +13,14 @@
[detail]  
[detail]    bool setSubPool(SubSignalPool * subPool);
[detail]  protected:
[detail] -  virtual AbstractResultSheet * createResultSheet();
[detail] -  virtual AbstractSummary * createSummary();
[detail] +  AbstractResultSheet * createResultSheet();
[detail] +  AbstractSummary * createSummary();
[detail] +  void updateAllFields();
[detail] +  void parametersToGui();
[detail] +  void parametersFromGui();
[detail] +
[detail] +  SmoothingParameterWidget * _smoothing;
[detail] +  RotateParameterWidget * _rotate;
[detail]  };
[detail]  
[detail]  #endif 
[detail]                          src/HVSummary.h:  version-4.0.4	modified out of comments
[detail] --- src/HVSummary.h-version-4.0.4-stripped	2025-09-28 04:01:25.743603228 +0200
[detail] +++ src/HVSummary.h-HEAD-stripped	2025-09-28 04:01:25.747603248 +0200
[detail] @@ -8,13 +8,13 @@
[detail]  class HVSummary : public AbstractSummary
[detail]  {
[detail]  public:
[detail] -  HVSummary(QWidget* parent=0);
[detail] +  HVSummary(QWidget* parent=nullptr);
[detail]    ~HVSummary();
[detail]  
[detail] -  virtual void setWindowTitle(QString subPoolName);
[detail] +  void setWindowTitle(QString subPoolName);
[detail]  protected:
[detail] -  virtual void createGraphs(bool multiStations);
[detail] -  virtual void setValues(const QMap<double, CurveResults *> * dist2stat=0);
[detail] +  void createGraphs(bool multiStations);
[detail] +  void setValues(const QMap<double, CurveResults *> * dist2stat=nullptr);
[detail]  };
[detail]  
[detail]  #endif 
[detail]                       src/HVToolWidget.h:  version-4.0.4	modified out of comments
[detail] --- src/HVToolWidget.h-version-4.0.4-stripped	2025-09-28 04:01:25.763603324 +0200
[detail] +++ src/HVToolWidget.h-HEAD-stripped	2025-09-28 04:01:25.767603344 +0200
[detail] @@ -5,11 +5,11 @@
[detail]  
[detail]  #include <HVGui.h>
[detail]  
[detail] -class HVToolWidget : public AbstractHVWidget
[detail] +class HVToolWidget : public AbstractHVToolWidget
[detail]  {
[detail]    Q_OBJECT
[detail]  public:
[detail] -  HVToolWidget(QWidget * parent);
[detail] +  HVToolWidget(QWidget * parent=nullptr);
[detail]  
[detail]    bool setSubPool(SubSignalPool * subPool);
[detail]  private slots:
[detail] @@ -17,6 +17,12 @@
[detail]  protected:
[detail]    AbstractResultSheet * createResultSheet();
[detail]    AbstractSummary * createSummary();
[detail] +  void updateAllFields();
[detail] +  void parametersToGui();
[detail] +  void parametersFromGui();
[detail] +
[detail] +  SmoothingParameterWidget * _smoothing;
[detail] +  HorizontalComponentsWidget * _horizontalComponents;
[detail]  };
[detail]  
[detail]  #endif
[detail]                src/SpectrumResultSheet.h:  version-4.0.4	not modified
[detail]          src/SpectrumRotateResultSheet.h:  version-4.0.4	not modified
[detail]           src/SpectrumRotateToolWidget.h:  version-4.0.4	modified out of comments
[detail] --- src/SpectrumRotateToolWidget.h-version-4.0.4-stripped	2025-09-28 04:01:25.811603557 +0200
[detail] +++ src/SpectrumRotateToolWidget.h-HEAD-stripped	2025-09-28 04:01:25.811603557 +0200
[detail] @@ -3,9 +3,9 @@
[detail]  #ifndef SPECTRUMROTATETOOLWIDGET_H
[detail]  #define SPECTRUMROTATETOOLWIDGET_H
[detail]  
[detail] -#include "HVToolWidget.h"
[detail] +#include <HVGui.h>
[detail]  
[detail] -class SpectrumRotateToolWidget : public AbstractHVWidget
[detail] +class SpectrumRotateToolWidget : public AbstractHVToolWidget
[detail]  {
[detail]    Q_OBJECT
[detail]  public:
[detail] @@ -13,8 +13,14 @@
[detail]  
[detail]    bool setSubPool(SubSignalPool * subPool);
[detail]  protected:
[detail] -  virtual AbstractResultSheet * createResultSheet();
[detail] -  virtual AbstractSummary * createSummary();
[detail] +  AbstractResultSheet * createResultSheet();
[detail] +  AbstractSummary * createSummary();
[detail] +  void updateAllFields();
[detail] +  void parametersToGui();
[detail] +  void parametersFromGui();
[detail] +
[detail] +  SmoothingParameterWidget * _smoothing;
[detail] +  RotateParameterWidget * _rotate;
[detail]  };
[detail]  
[detail]  #endif 
[detail]                    src/SpectrumSummary.h:  version-4.0.4	not modified
[detail]                 src/SpectrumToolWidget.h:  version-4.0.4	modified out of comments
[detail] --- src/SpectrumToolWidget.h-version-4.0.4-stripped	2025-09-28 04:01:25.843603711 +0200
[detail] +++ src/SpectrumToolWidget.h-HEAD-stripped	2025-09-28 04:01:25.847603730 +0200
[detail] @@ -5,16 +5,21 @@
[detail]  
[detail]  #include <HVGui.h>
[detail]  
[detail] -class SpectrumToolWidget : public AbstractHVWidget
[detail] +class SpectrumToolWidget : public AbstractHVToolWidget
[detail]  {
[detail]    Q_OBJECT
[detail]  public:
[detail] -  SpectrumToolWidget(QWidget * parent);
[detail] +  SpectrumToolWidget(QWidget * parent=nullptr);
[detail]  
[detail]    bool setSubPool(SubSignalPool * subPool);
[detail]  protected:
[detail] -  virtual AbstractResultSheet * createResultSheet();
[detail] -  virtual AbstractSummary * createSummary();
[detail] +  AbstractResultSheet * createResultSheet();
[detail] +  AbstractSummary * createSummary();
[detail] +  void updateAllFields();
[detail] +  void parametersToGui();
[detail] +  void parametersFromGui();
[detail] +
[detail] +  SmoothingParameterWidget * _smoothing;
[detail]  };
[detail]  
[detail]  #endif 
[detail]                   src/TabHVPreferences.h:  version-4.0.4	not modified
[detail]    src/FrequencyWindowRejectionWidget.ui:  version-4.0.4	not modified
[detail]                  src/TabHVPreferences.ui:  version-4.0.4	not modified
[summary] Total differences: 415 lines
[summary] Modification level is C
OLD_DIR=$(pwd)
echo "geopsyhv"
cd $(find . -name "geopsyhv" | tail -n 1) || exit 2
pwd
dpversion C  || exit 2
cd $OLD_DIR || exit 2
################## raydec
[detail]                           src/Plugin.cpp:  version-1.0.0	modified out of comments
[detail] --- src/Plugin.cpp-version-1.0.0-stripped	2025-09-28 04:01:25.943604194 +0200
[detail] +++ src/Plugin.cpp-HEAD-stripped	2025-09-28 04:01:25.947604214 +0200
[detail] @@ -1,15 +1,18 @@
[detail]  
[detail]  
[detail]  #include "Plugin.h"
[detail] -#include "Tool.h"
[detail] -#include "raydecVersion.h"
[detail] -#include "raydecInstallPath.h"
[detail] -
[detail] -
[detail] +#include "RayDecToolWidget.h"
[detail]  
[detail] +#include "raydecInstallPath.h"
[detail] +#include "GeopsyCoreVersion.h"
[detail] +#include "raydecVersion.h"
[detail]  
[detail]  
[detail]  
[detail] +const char * Plugin::interfaceVersion() const
[detail] +{
[detail] +  return GEOPSYCORE_VERSION;
[detail] +}
[detail]  
[detail]  void Plugin::createToolActions(QObject * toolFactory)
[detail]  {
[detail] @@ -20,6 +23,7 @@
[detail]    a->setText(tr("RayDec"));
[detail]    a->setToolTip(tr("RayDec ellipticity"));
[detail]    a->setIcon(QIcon(":raydec-22x22.png"));
[detail] +  a->setStatusTip(tr("Unsigned Rayleigh ellipticity from a single station (Hobiger et al., 2009)."));
[detail]    connect(a, SIGNAL(triggered()), toolFactory, SLOT(showTool()));
[detail]    addAction(a);
[detail]  }
[detail] @@ -29,7 +33,7 @@
[detail]    TRACE;
[detail]    switch (id) {
[detail]    case 0:
[detail] -    return new Tool(wsParent);
[detail] +    return new RayDecToolWidget(wsParent);
[detail]    default:
[detail]      break;
[detail]    }
[detail]                src/RayDecResultSheet.cpp:  version-1.0.0	no last version available
[detail]                    src/RayDecSummary.cpp:  version-1.0.0	no last version available
[detail]                 src/RayDecToolWidget.cpp:  version-1.0.0	no last version available
[detail]                             src/Plugin.h:  version-1.0.0	modified out of comments
[detail] --- src/Plugin.h-version-1.0.0-stripped	2025-09-28 04:01:25.979604369 +0200
[detail] +++ src/Plugin.h-HEAD-stripped	2025-09-28 04:01:25.983604387 +0200
[detail] @@ -11,13 +11,13 @@
[detail]    Q_PLUGIN_METADATA(IID "org.geopsy.geopsyInterface")
[detail]    Q_INTERFACES(GeopsyCore::GeopsyCoreInterface)
[detail]  public:
[detail] -  virtual QString tag() const {return "raydec";}
[detail] -  virtual QString title() const {return tr("RayDec ellipticity");}
[detail] +  QString tag() const {return "raydec";}
[detail] +  QString title() const {return tr("RayDec ellipticity");}
[detail]  
[detail] -  virtual void createToolActions(QObject * toolFactory);
[detail] -  virtual AbstractToolWidget * createTool(int id, QWidget * wsParent) const;
[detail] +  void createToolActions(QObject * toolFactory);
[detail] +  AbstractToolWidget * createTool(int id, QWidget * wsParent) const;
[detail]  
[detail] -  virtual const char * interfaceVersion() const {return GEOPSYCORE_VERSION;}
[detail] +  const char * interfaceVersion() const;
[detail]  };
[detail]  
[detail]  #endif 
[detail]                  src/RayDecResultSheet.h:  version-1.0.0	no last version available
[detail]                      src/RayDecSummary.h:  version-1.0.0	no last version available
[detail]                   src/RayDecToolWidget.h:  version-1.0.0	no last version available
[summary] Total differences: 64 lines
[summary] Modification level is C
OLD_DIR=$(pwd)
echo "raydec"
cd $(find . -name "raydec" | tail -n 1) || exit 2
pwd
dpversion C  || exit 2
cd $OLD_DIR || exit 2
################## geopsydamping
[detail]                    src/DampingPlugin.cpp:  version-2.1.4	not modified
[detail]                   src/DampingResults.cpp:  version-2.1.4	modified out of comments
[detail] --- src/DampingResults.cpp-version-2.1.4-stripped	2025-09-28 04:01:26.063604775 +0200
[detail] +++ src/DampingResults.cpp-HEAD-stripped	2025-09-28 04:01:26.067604793 +0200
[detail] @@ -51,15 +51,15 @@
[detail]    for(int ig=0; ig<n; ig++) {
[detail]      AxisWindow * w=sheet()->addGraph();
[detail]      w->setGeometry(0.5, y, 15.0, 6.0);
[detail] -    Signal * sig=subPool->at(ig);
[detail] +    SignalSegment * sig=subPool->at(ig);
[detail]      w->xAxis()->setTitle("Time (s)");
[detail]      w->xAxis()->setNumberPrecision(2);
[detail]      w->xAxis()->setTitleInverseScale("1/Time (1/s)");
[detail]      w->xAxis()->setNumberPrecisionInverseScale(2);
[detail] -    w->yAxis()->setTitle(sig->nameComponent());
[detail] +    w->yAxis()->setTitle(sig->metaData()->nameComponent());
[detail]      w->yAxis()->setNumberType('e');
[detail]      w->yAxis()->setNumberPrecision(1);
[detail] -    w->yAxis()->setTitleInverseScale(sig->nameComponent());
[detail] +    w->yAxis()->setTitleInverseScale(sig->metaData()->nameComponent());
[detail]      w->yAxis()->setNumberPrecisionInverseScale(1);
[detail]  
[detail]      PlotLine2D * line;
[detail] @@ -83,12 +83,12 @@
[detail]  
[detail]      _comments[ig]=sheet()->addText();
[detail]      _comments[ig]->setGeometry(16.0, y, 4.0, 5.0);
[detail] -    _results[ig].name=sig->nameComponent();
[detail] +    _results[ig].name=sig->metaData()->nameComponent();
[detail]      y+=6.0;
[detail]    }
[detail]  }
[detail]  
[detail] -bool DampingResults::compute(int ig, const Signal *sig, const Parameters& param)
[detail] +bool DampingResults::compute(int ig, const SignalSegment *sig, const Parameters& param)
[detail]  {
[detail]    TRACE;
[detail]    _log=param.AbstractParameters::toString();
[detail] @@ -143,13 +143,13 @@
[detail]    int nWin=0;
[detail]    double tau, val; 
[detail]  
[detail] -  const DoubleSignal * sigfft=sig->saveType(DoubleSignal::Waveform);
[detail] +  const DoubleSignal * sigfft=sig->values()->saveType(DoubleSignal::Waveform);
[detail]    DoubleSignal * tSig=new DoubleSignal(nSampSig);
[detail]    tSig->initValues(0.0, 0, nSampSig);
[detail]    tSig->setSamplingPeriod(dt);
[detail]    tSig->copySamplesFrom(sigfft, sig->startTime().secondsTo(tw.start()), 0.0, tw.lengthSeconds());
[detail]    tSig->subtractValue();
[detail] -  sig->restoreType(sigfft);
[detail] +  sig->values()->restoreType(sigfft);
[detail]    if(param.isFilter()) {
[detail]      tSig->filter(param.filter());
[detail]    }
[detail] @@ -197,7 +197,7 @@
[detail]      Message::warning(MSG_ID, tr("Damping"),
[detail]                       tr("For signal %1, the main period is larger than the fitting length. "
[detail]                          "Check the fitting length, the signal and the time range.")
[detail] -                     .arg(sig->nameComponent()), Message::cancel());
[detail] +                     .arg(sig->metaData()->nameComponent()), Message::cancel());
[detail]      return false;
[detail]    }
[detail]    _fitW=2*nw0*M_PI/(iw0*dt);
[detail]                       src/Parameters.cpp:  version-2.1.4	not modified
[detail]                      src/ToolDamping.cpp:  version-2.1.4	not modified
[detail]                     src/ToolDampingd.cpp:  version-2.1.4	not modified
[detail]                      src/DampingPlugin.h:  version-2.1.4	not modified
[detail]                     src/DampingResults.h:  version-2.1.4	modified out of comments
[detail] --- src/DampingResults.h-version-2.1.4-stripped	2025-09-28 04:01:26.139605142 +0200
[detail] +++ src/DampingResults.h-HEAD-stripped	2025-09-28 04:01:26.143605161 +0200
[detail] @@ -15,7 +15,7 @@
[detail]    DampingResults(QWidget* parent=0);
[detail]    ~DampingResults();
[detail]  
[detail] -  bool compute(int ig, const Signal *sig, const Parameters& param);
[detail] +  bool compute(int ig, const SignalSegment *sig, const Parameters& param);
[detail]    void createObjects(SubSignalPool * subPool);
[detail]    void setWindowTitle(QString title) {GraphicSheetMenu::setWindowTitle(title);}
[detail]  
[detail]                         src/Parameters.h:  version-2.1.4	not modified
[detail]                        src/ToolDamping.h:  version-2.1.4	not modified
[detail]                       src/ToolDampingd.h:  version-2.1.4	not modified
[detail]                      src/ToolDampingd.ui:  version-2.1.4	not modified
[summary] Total differences: 72 lines
[summary] Modification level is C
OLD_DIR=$(pwd)
echo "geopsydamping"
cd $(find . -name "geopsydamping" | tail -n 1) || exit 2
pwd
dpversion C  || exit 2
cd $OLD_DIR || exit 2
################## geopsytfa
[detail]                    src/TFAParameters.cpp:  version-2.1.2	not modified
[detail]                        src/TFAPlugin.cpp:  version-2.1.2	not modified
[detail]                       src/TFAResults.cpp:  version-2.1.2	modified out of comments
[detail] --- src/TFAResults.cpp-version-2.1.2-stripped	2025-09-28 04:01:26.283605837 +0200
[detail] +++ src/TFAResults.cpp-HEAD-stripped	2025-09-28 04:01:26.287605857 +0200
[detail] @@ -29,7 +29,7 @@
[detail]    _gridLayers.resize(n);
[detail]    for(int ig=0;ig < n;ig++ ) {
[detail]      AxisWindow * w=sheet()->addGraph();
[detail] -    Signal * sig=subPool->at(ig);
[detail] +    SignalSegment * sig=subPool->at(ig);
[detail]      w->xAxis()->setTitle( "Time (s)" );
[detail]      w->xAxis()->setTitleInverseScale( "1/Time (1/s)" );
[detail]      w->yAxis()->setFrequency();
[detail] @@ -40,7 +40,7 @@
[detail]      t->setAnchor(GraphicObject::BottomRight);
[detail]      t->setPrintXAnchor(16.0);
[detail]      t->setPrintYAnchor(y);
[detail] -    t->setText(sig->nameComponent());
[detail] +    t->setText(sig->metaData()->nameComponent());
[detail]      t->updateGeometry();
[detail]      ColorMapWidget * p=new ColorMapWidget;
[detail]      p->setAnchor(GraphicObject::TopLeft);
[detail] @@ -58,7 +58,7 @@
[detail]    }
[detail]  }
[detail]  
[detail] -void TFAResults::compute(int ig, Signal *sig, TFAParameters &param)
[detail] +void TFAResults::compute(int ig, SignalSegment *sig, TFAParameters &param)
[detail]  {
[detail]    TRACE;
[detail]    IrregularGrid2DPlot * plot =_gridLayers[ig];
[detail] @@ -67,7 +67,8 @@
[detail]    int nTime=tw.lengthSamples(sig->samplingFrequency());
[detail]    if(nTime<=0) {
[detail]      Message::warning(MSG_ID, tr("Time Frequency Analysis"),
[detail] -                     tr("Specified time range does not contain any signal (%1).").arg(sig->nameComponent()),
[detail] +                     tr("Specified time range does not contain any signal (%1).")
[detail] +                         .arg(sig->metaData()->nameComponent()),
[detail]                       Message::ignore(), true);
[detail]      return;
[detail]    }
[detail] @@ -84,14 +85,14 @@
[detail]                          .arg(_gridLayers.count())
[detail]                          .arg(nFreq)
[detail]                          .arg(round(64.0*1024*1024/_gridLayers.count()/nFreq))
[detail] -                        .arg(sig->nameComponent())
[detail] +                        .arg(sig->metaData()->nameComponent())
[detail]                          .arg(Number::secondsToDuration(tw.lengthSeconds(), 0))
[detail]                          .arg(nTime), Message::ignore(), true);
[detail]      return;
[detail]    }
[detail]    DoubleSignal * sigProc=new DoubleSignal(nTime);
[detail]    sigProc->setSamplingPeriod(sig->samplingPeriod());
[detail] -  sigProc->copySamplesFrom(sig, sig->startTime().secondsTo(tw.start()), 0.0, tw.lengthSeconds());
[detail] +  sigProc->copySamplesFrom(sig->values(), sig->startTime().secondsTo(tw.start()), 0.0, tw.lengthSeconds());
[detail]    IrregularGrid2D grid(nTime, nFreq);
[detail]    
[detail]    for(int iTime=0; iTime<nTime; iTime++) {
[detail] @@ -102,7 +103,7 @@
[detail]      double f=param.frequencySampling().value(iFreq);
[detail]      grid.setY(iFreq, f);
[detail]      GeopsyCoreEngine::instance()->showMessage(db, tr("Signal %1 : Morlet wavelet convolution at %2 Hz")
[detail] -                                              .arg(sig->nameComponent()).arg(f));
[detail] +                                              .arg(sig->metaData()->nameComponent()).arg(f));
[detail]      param.wavelet().setFi(f);
[detail]      ComplexSignal * w=sigProc->morletWavelet(param.wavelet());
[detail]      CONST_LOCK_SAMPLES(Complex, wSamples, w)
[detail]                          src/ToolTFA.cpp:  version-2.1.2	not modified
[detail]                         src/ToolTFAd.cpp:  version-2.1.2	not modified
[detail]                      src/TFAParameters.h:  version-2.1.2	not modified
[detail]                          src/TFAPlugin.h:  version-2.1.2	not modified
[detail]                         src/TFAResults.h:  version-2.1.2	modified out of comments
[detail] --- src/TFAResults.h-version-2.1.2-stripped	2025-09-28 04:01:26.367606243 +0200
[detail] +++ src/TFAResults.h-HEAD-stripped	2025-09-28 04:01:26.371606263 +0200
[detail] @@ -14,7 +14,7 @@
[detail]    TFAResults(QWidget* parent=0);
[detail]    ~TFAResults();
[detail]  
[detail] -  void compute(int ig, Signal *sig, TFAParameters &param);
[detail] +  void compute(int ig, SignalSegment *sig, TFAParameters &param);
[detail]    void createObjects(const SubSignalPool* subPool);
[detail]    void setWindowTitle(QString title) {GraphicSheetMenu::setWindowTitle(title);}
[detail]  private:
[detail]                            src/ToolTFA.h:  version-2.1.2	not modified
[detail]                           src/ToolTFAd.h:  version-2.1.2	not modified
[detail]                          src/ToolTFAd.ui:  version-2.1.2	not modified
[summary] Total differences: 76 lines
[summary] Modification level is C
OLD_DIR=$(pwd)
echo "geopsytfa"
cd $(find . -name "geopsytfa" | tail -n 1) || exit 2
pwd
dpversion C  || exit 2
cd $OLD_DIR || exit 2
################## geopsynr
[detail]                         src/NRPlugin.cpp:  version-1.1.2	not modified
[detail]                       src/ShotRecord.cpp:  version-1.1.2	modified out of comments
[detail] --- src/ShotRecord.cpp-version-1.1.2-stripped	2025-09-28 04:01:26.487606823 +0200
[detail] +++ src/ShotRecord.cpp-HEAD-stripped	2025-09-28 04:01:26.491606843 +0200
[detail] @@ -33,12 +33,12 @@
[detail]    int n=subPool->count();
[detail]    DateTime refStartTime=_subPool->first()->startTime();
[detail]    double refSampPeriod=_subPool->first()->samplingPeriod();
[detail] -  int refNSamples=_subPool->first()->nSamples();
[detail] +  int refNSamples=_subPool->first()->size();
[detail]    for(int i=1; i<n; i++) {
[detail] -    Signal * sig=_subPool->at(i);
[detail] +    SignalSegment * sig=_subPool->at(i);
[detail]      if(sig->startTime()!=refStartTime ||
[detail]         sig->samplingPeriod()!=refSampPeriod  ||
[detail] -       sig->nSamples()!=refNSamples) {
[detail] +       sig->size()!=refNSamples) {
[detail]        return false;
[detail]      }
[detail]    }
[detail] @@ -53,7 +53,7 @@
[detail]    TRACE;
[detail]    if(_subPool->count()!=o._subPool->count()) return false;
[detail]    for(int i =_subPool->count()-1; i>=0; i-- ) {
[detail] -    if(_subPool->at(i)->receiver()!=o._subPool->at(i)->receiver()) return false;
[detail] +    if(_subPool->at(i)->metaData()->receiver()!=o._subPool->at(i)->metaData()->receiver()) return false;
[detail]    }
[detail]    return true;
[detail]  }
[detail] @@ -63,7 +63,7 @@
[detail]  {
[detail]    TRACE;
[detail]    for(int i=_subPool->count()-1; i>=0; i-- ) {
[detail] -    if(_source->position().distanceTo(_subPool->at(i)->receiver())<distance) {
[detail] +    if(_source->position().distanceTo(_subPool->at(i)->metaData()->receiver())<distance) {
[detail]        return i;
[detail]      }
[detail]    }
[detail]                     src/StackWeights.cpp:  version-1.1.2	modified out of comments
[detail] --- src/StackWeights.cpp-version-1.1.2-stripped	2025-09-28 04:01:26.511606940 +0200
[detail] +++ src/StackWeights.cpp-HEAD-stripped	2025-09-28 04:01:26.515606958 +0200
[detail] @@ -77,10 +77,10 @@
[detail]    double weights[nShots];
[detail]    param2weights(weights);
[detail]    double sum=0.0;
[detail] -  Signal * sig=_shots.first()->receivers()->at(_receiverIndex);
[detail] +  SignalSegment * sig=_shots.first()->receivers()->at(_receiverIndex);
[detail]    TimeRange globalTw=_globalTimeLimits.absoluteRange(sig);
[detail]    TimeRange signalTw=_signalTimeLimits.absoluteRange(sig);
[detail] -  int nSamples=sig->nSamples();
[detail] +  int nSamples=sig->size();
[detail]    const DateTime& startTime=sig->startTime();
[detail]    double samplingFrequency=1.0/sig->samplingPeriod();
[detail]    int iGlobalStart=qRound((startTime.secondsTo(globalTw.start()))*samplingFrequency);
[detail] @@ -105,8 +105,8 @@
[detail]    }
[detail]    
[detail]    for(int iShot=0; iShot<nShots; iShot++) {
[detail] -    const Signal * sig=_shots.at(iShot)->receivers()->at(_receiverIndex);
[detail] -    CONST_LOCK_SAMPLES(double, samp, sig)
[detail] +    const SignalSegment * sig=_shots.at(iShot)->receivers()->at(_receiverIndex);
[detail] +    CONST_LOCK_SAMPLES(double, samp, sig->values())
[detail]        double w=weights[iShot];
[detail]        for(int i=iGlobalStart; i<iStart; i++) {
[detail]          stack[i]+=w*samp[i];
[detail] @@ -114,7 +114,7 @@
[detail]        for(int i=iEnd; i<iGlobalEnd; i++) {
[detail]          stack[i]+=w*samp[i];
[detail]        }
[detail] -    UNLOCK_SAMPLES(sig)
[detail] +    UNLOCK_SAMPLES(sig->values())
[detail]    }
[detail]    
[detail]    for(int i=iGlobalStart; i<iStart; i++) {
[detail] @@ -131,31 +131,31 @@
[detail]  {
[detail]    TRACE;
[detail]    int nShots=_shots.count();
[detail] -  int nSamples=_shots.at(0)->receivers()->first()->nSamples();
[detail] +  int nSamples=_shots.at(0)->receivers()->first()->size();
[detail]    double weights[nShots];
[detail]    param2weights(weights);
[detail]    for(int i=0; i<nShots; i++) {
[detail]      App::log(tr("Best stack weight for shot %1=%2\n")
[detail]               .arg(_shots.at(i)->receivers()->name()).arg(weights[i]));
[detail]    }
[detail] -  Signal * resSig=0;
[detail] +  SignalSegment * resSig=0;
[detail]    ASSERT(_receiverIndex<=results.count());
[detail]    if(_receiverIndex==results.count()) {
[detail] -    resSig=new Signal(*_shots.at(0)->receivers()->at(_receiverIndex));
[detail] +    resSig=new SignalSegment(*_shots.at(0)->receivers()->at(_receiverIndex));
[detail]      results.addSignal(resSig);
[detail]    } else {
[detail]      resSig=results.at(_receiverIndex);
[detail]    }
[detail] -  resSig->initValues(0.0, 0, nSamples);
[detail] -  LOCK_SAMPLES(double, resSamp, resSig)
[detail] +  resSig->values()->initValues(0.0, 0, nSamples);
[detail] +  LOCK_SAMPLES(double, resSamp, resSig->values())
[detail]      for(int iShot=0; iShot < nShots; iShot++ ) {
[detail] -      const Signal * sig=_shots.at(iShot)->receivers()->at(_receiverIndex);
[detail] -      CONST_LOCK_SAMPLES(double, samp, sig)
[detail] +      const SignalSegment * sig=_shots.at(iShot)->receivers()->at(_receiverIndex);
[detail] +      CONST_LOCK_SAMPLES(double, samp, sig->values())
[detail]          double w=weights[iShot];
[detail]          for(int i=0; i < nSamples; i++ ) {
[detail]            resSamp[i] += w * samp[i];
[detail]          }
[detail] -      UNLOCK_SAMPLES(sig)
[detail] +      UNLOCK_SAMPLES(sig->values())
[detail]      }
[detail] -  UNLOCK_SAMPLES(resSig)
[detail] +  UNLOCK_SAMPLES(resSig->values())
[detail]  }
[detail]                    src/T0Correlation.cpp:  version-1.1.2	modified out of comments
[detail] --- src/T0Correlation.cpp-version-1.1.2-stripped	2025-09-28 04:01:26.531607036 +0200
[detail] +++ src/T0Correlation.cpp-HEAD-stripped	2025-09-28 04:01:26.535607055 +0200
[detail] @@ -38,13 +38,13 @@
[detail]    TRACE;
[detail]    double globalCorr=0.0;
[detail]    for(int i=_minRecIndex; i<=_maxRecIndex; i++) {
[detail] -    Signal * shotSig=_shot->receivers()->at(i);
[detail] -    const Signal * refShotSig=_refShot->receivers()->at(i);
[detail] +    SignalSegment * shotSig=_shot->receivers()->at(i);
[detail] +    const SignalSegment * refShotSig=_refShot->receivers()->at(i);
[detail]      DateTime saveTime=shotSig->startTime();
[detail]      
[detail]      shotSig->setStartTime(refShotSig->startTime().shifted(p.x()));
[detail]      TimeRange tw=_timeLimits.absoluteRange(shotSig);
[detail] -    double norm=1.0/refShotSig->maximumAmplitude();
[detail] +    double norm=1.0/refShotSig->values()->maximumAmplitude();
[detail]      globalCorr+=shotSig->correlation(refShotSig, tw)*norm*norm;
[detail]      shotSig->setStartTime(saveTime);
[detail]    }
[detail] @@ -57,16 +57,15 @@
[detail]    TRACE;
[detail]    double globalCorr=0.0;
[detail]    for(int i=_minRecIndex; i<=_maxRecIndex; i++) {
[detail] -    const Signal * refShotSig=_refShot->receivers()->at(i);
[detail] -    const Signal * shotSig=_shot->receivers()->at(i);
[detail] -    DoubleSignal * shiftShotSig=new DoubleSignal(*shotSig);
[detail] -    shiftShotSig->copySamplesFrom(shotSig);
[detail] +    const SignalSegment * refShotSig=_refShot->receivers()->at(i);
[detail] +    const SignalSegment * shotSig=_shot->receivers()->at(i);
[detail] +    DoubleSignal * shiftShotSig=new DoubleSignal(shotSig->size());
[detail] +    shiftShotSig->copySamplesFrom(shotSig->values());
[detail]      shiftShotSig->shift(p.x());
[detail]      TimeRange tw=_timeLimits.absoluteRange(shotSig);
[detail] -    double norm=1.0/refShotSig->maximumAmplitude();
[detail] -    globalCorr+=shiftShotSig->correlation(refShotSig, refShotSig->startTime().secondsTo(tw.start()),
[detail] -                                                      shotSig->startTime().secondsTo(tw.start()),
[detail] -                                                      tw.lengthSeconds())*norm*norm;
[detail] +    double norm=1.0/refShotSig->values()->maximumAmplitude();
[detail] +    globalCorr+=shiftShotSig->correlation(refShotSig->values(), refShotSig->startTime().secondsTo(tw.start()),
[detail] +                                          shotSig->startTime().secondsTo(tw.start()), tw.lengthSeconds())*norm*norm;
[detail]      delete shiftShotSig;
[detail]    }
[detail]    return globalCorr;
[detail]                     src/T0GridSearch.cpp:  version-1.1.2	not modified
[detail]                           src/ToolNR.cpp:  version-1.1.2	modified out of comments
[detail] --- src/ToolNR.cpp-version-1.1.2-stripped	2025-09-28 04:01:26.571607229 +0200
[detail] +++ src/ToolNR.cpp-HEAD-stripped	2025-09-28 04:01:26.575607249 +0200
[detail] @@ -153,17 +153,19 @@
[detail]  
[detail]  void ToolNR::shotsToSubPool()
[detail]  {
[detail] +  emit beginUpdateSubPool();
[detail]    int nShots=_shots.count();
[detail]    const_cast<SubSignalPool *>(subPool())->removeAll();
[detail]    for(int i=0; i<nShots; i++ ) {
[detail]      const_cast<SubSignalPool *>(subPool())->addSubPool(*_shots[i]->receivers());
[detail]    }
[detail] -  emit updateSubPool();
[detail] +  emit endUpdateSubPool();
[detail]  }
[detail]  
[detail]  void ToolNR::uniformStack()
[detail]  {
[detail]    TRACE;
[detail] +  emit beginUpdateSubPool();
[detail]    int nReceivers=_shots[0]->receivers()->count();
[detail]    bool firstTime=_stack.isEmpty();
[detail]    TimeRangeParameters globalTimeLimits, signalTimeLimits;
[detail] @@ -180,12 +182,13 @@
[detail]      App::log(tr("Noise level [%1]=%2\n").arg(i).arg(forward.misfit(ok)) );
[detail]    }
[detail]    if(firstTime) showStackResults();
[detail] -  emit updateSubPool();
[detail] +  emit endUpdateSubPool();
[detail]  }
[detail]  
[detail]  void ToolNR::optimizeStack()
[detail]  {
[detail]    TRACE;
[detail] +  emit beginUpdateSubPool();
[detail]    int nReceivers=_shots[0]->receivers()->count();
[detail]    bool firstTime=_stack.isEmpty();
[detail]    TimeRangeParameters globalTimeLimits, signalTimeLimits;
[detail] @@ -213,7 +216,7 @@
[detail]      App::log(tr("Noise level [%1]=%2\n").arg(i).arg(na.misfit(bestIndex) ) );
[detail]    }
[detail]    if(firstTime) showStackResults();
[detail] -  emit updateSubPool();
[detail] +  emit endUpdateSubPool();
[detail]  }
[detail]  
[detail]  void ToolNR::showStackResults()
[detail]                          src/ToolNRd.cpp:  version-1.1.2	not modified
[detail]                           src/NRPlugin.h:  version-1.1.2	not modified
[detail]                         src/ShotRecord.h:  version-1.1.2	not modified
[detail]                       src/StackWeights.h:  version-1.1.2	not modified
[detail]                      src/T0Correlation.h:  version-1.1.2	not modified
[detail]                       src/T0GridSearch.h:  version-1.1.2	not modified
[detail]                             src/ToolNR.h:  version-1.1.2	not modified
[detail]                            src/ToolNRd.h:  version-1.1.2	not modified
[detail]                           src/ToolNRd.ui:  version-1.1.2	not modified
[summary] Total differences: 202 lines
[summary] Modification level is C
OLD_DIR=$(pwd)
echo "geopsynr"
cd $(find . -name "geopsynr" | tail -n 1) || exit 2
pwd
dpversion C  || exit 2
cd $OLD_DIR || exit 2
################## geopsyptmotion
[detail]                   src/PtMotionPlugin.cpp:  version-2.0.4	not modified
[detail]                  src/PtMotionResults.cpp:  version-2.0.4	modified out of comments
[detail] --- src/PtMotionResults.cpp-version-2.0.4-stripped	2025-09-28 04:01:26.791608292 +0200
[detail] +++ src/PtMotionResults.cpp-HEAD-stripped	2025-09-28 04:01:26.795608312 +0200
[detail] @@ -62,7 +62,7 @@
[detail]      ySuffix=tr(" - North");
[detail]      setWindowTitle(tr("Horizontal particle motion"));
[detail]    }
[detail] -  const Signal *sigZ, *sigN, *sigE;
[detail] +  const SignalSegment *sigZ, *sigN, *sigE;
[detail]    const DoubleSignal *sigZp, *sigNp, *sigEp;
[detail]    Rect r;
[detail]    int n=_curveLayers.count();
[detail] @@ -71,28 +71,28 @@
[detail]      sigN=*(++it);
[detail]      sigE=*(++it);
[detail]      if(doFilter) {
[detail] -      sigZp=filtered(sigZ, fparam);
[detail] -      sigNp=filtered(sigN, fparam);
[detail] -      sigEp=filtered(sigE, fparam);
[detail] +      sigZp=filtered(sigZ->values(), fparam);
[detail] +      sigNp=filtered(sigN->values(), fparam);
[detail] +      sigEp=filtered(sigE->values(), fparam);
[detail]      } else {
[detail] -      sigZp=sigZ->saveType(DoubleSignal::Waveform);
[detail] -      sigNp=sigN->saveType(DoubleSignal::Waveform);
[detail] -      sigEp=sigE->saveType(DoubleSignal::Waveform);
[detail] +      sigZp=sigZ->values()->saveType(DoubleSignal::Waveform);
[detail] +      sigNp=sigN->values()->saveType(DoubleSignal::Waveform);
[detail] +      sigEp=sigE->values()->saveType(DoubleSignal::Waveform);
[detail]      }
[detail]      TimeRange tw=tlParam.absoluteRange(sigZ);
[detail]      XUniqueYColorLines * plot=_curveLayers[ig];
[detail]      AxisWindow * w=plot->graph();
[detail] -    w->xAxis()->setTitle(sigZ->name()+xSuffix);
[detail] +    w->xAxis()->setTitle(sigZ->metaData()->name()+xSuffix);
[detail]      w->xAxis()->setTitleInverseScale(w->xAxis()->title());
[detail] -    w->yAxis()->setTitle(sigZ->name()+ySuffix);
[detail] +    w->yAxis()->setTitle(sigZ->metaData()->name()+ySuffix);
[detail]      w->yAxis()->setTitleInverseScale(w->yAxis()->title());
[detail]      double invdt=1.0/sigZ->samplingPeriod();
[detail]      int startIndex=qRound(sigZ->startTime().secondsTo(tw.start())*invdt);
[detail]      if(startIndex<0) startIndex=0;
[detail] -    if(startIndex>sigZ->nSamples()) startIndex=sigZ->nSamples();
[detail] +    if(startIndex>sigZ->size()) startIndex=sigZ->size();
[detail]      int endIndex=qRound(sigZ->startTime().secondsTo(tw.end())*invdt);
[detail]      if(endIndex<0) endIndex=0;
[detail] -    if(endIndex>sigZ->nSamples()) endIndex=sigZ->nSamples();
[detail] +    if(endIndex>sigZ->size()) endIndex=sigZ->size();
[detail]      plot->clear();
[detail]      plot->setPointCount(1, endIndex-startIndex);
[detail]      CONST_LOCK_SAMPLES(double, sampZ, sigZp)
[detail] @@ -122,9 +122,9 @@
[detail]        delete sigNp;
[detail]        delete sigEp;
[detail]      } else {
[detail] -      sigZ->restoreType(sigZp);
[detail] -      sigN->restoreType(sigNp);
[detail] -      sigE->restoreType(sigEp);
[detail] +      sigZ->values()->restoreType(sigZp);
[detail] +      sigN->values()->restoreType(sigNp);
[detail] +      sigE->values()->restoreType(sigEp);
[detail]      }
[detail]      w->deepUpdate();
[detail]    }
[detail]                     src/ToolPtMotion.cpp:  version-2.0.4	modified out of comments
[detail] --- src/ToolPtMotion.cpp-version-2.0.4-stripped	2025-09-28 04:01:26.811608389 +0200
[detail] +++ src/ToolPtMotion.cpp-HEAD-stripped	2025-09-28 04:01:26.811608389 +0200
[detail] @@ -41,7 +41,7 @@
[detail]    _ptMotionRes->setObjectName("ToolPtMotionResults");
[detail]    _ptMotionRes->createObjects(subPool);
[detail]    if(pickLayer()) {
[detail] -    connect(pickLayer(), SIGNAL(pickChanged(Signal *, QString)), _d->timeLimits, SLOT(updatePicks()));
[detail] +    connect(pickLayer(), SIGNAL(pickChanged(SignalSegment *, QString)), _d->timeLimits, SLOT(updatePicks()));
[detail]    }
[detail]    GeopsyGuiEngine::instance()->addSubWindow(this, _ptMotionRes)->setUserClosable(false);
[detail]  
[detail]                    src/ToolPtMotiond.cpp:  version-2.0.4	not modified
[detail]                     src/PtMotionPlugin.h:  version-2.0.4	not modified
[detail]                    src/PtMotionResults.h:  version-2.0.4	not modified
[detail]                       src/ToolPtMotion.h:  version-2.0.4	not modified
[detail]                      src/ToolPtMotiond.h:  version-2.0.4	not modified
[detail]                     src/ToolPtMotiond.ui:  version-2.0.4	not modified
[summary] Total differences: 74 lines
[summary] Modification level is C
OLD_DIR=$(pwd)
echo "geopsyptmotion"
cd $(find . -name "geopsyptmotion" | tail -n 1) || exit 2
pwd
dpversion C  || exit 2
cd $OLD_DIR || exit 2
################## geopsyrefra
[detail]                      src/RefraPlugin.cpp:  version-2.0.3	not modified
[detail]                        src/ToolRefra.cpp:  version-2.0.3	modified out of comments
[detail] --- src/ToolRefra.cpp-version-2.0.3-stripped	2025-09-28 04:01:26.967609144 +0200
[detail] +++ src/ToolRefra.cpp-HEAD-stripped	2025-09-28 04:01:26.971609162 +0200
[detail] @@ -73,7 +73,7 @@
[detail]      *it-=mean;
[detail]    }
[detail]    
[detail] -  _distSigMaps=new QMap<double, Signal *>[nSrc];
[detail] +  _distSigMaps=new QMap<double, SignalSegment *>[nSrc];
[detail]    int iNode=0;
[detail]    it=subPool->begin();
[detail]    for(int iSrc=0;iSrc<nSrc;iSrc++) {
[detail]                       src/ToolRefrad.cpp:  version-2.0.3	not modified
[detail]                        src/RefraPlugin.h:  version-2.0.3	not modified
[detail]                          src/ToolRefra.h:  version-2.0.3	modified out of comments
[detail] --- src/ToolRefra.h-version-2.0.3-stripped	2025-09-28 04:01:27.019609394 +0200
[detail] +++ src/ToolRefra.h-HEAD-stripped	2025-09-28 04:01:27.023609414 +0200
[detail] @@ -23,7 +23,7 @@
[detail]    int _nSrc; 
[detail]    QList<double> _distances; 
[detail]    QList<double> _srcDist; 
[detail] -  QMap<double, Signal *> * _distSigMaps; 
[detail] +  QMap<double, SignalSegment *> * _distSigMaps; 
[detail]  };
[detail]  
[detail]  #endif
[detail]                         src/ToolRefrad.h:  version-2.0.3	not modified
[detail]                        src/ToolRefrad.ui:  version-2.0.3	not modified
[summary] Total differences: 22 lines
[summary] Modification level is C
OLD_DIR=$(pwd)
echo "geopsyrefra"
cd $(find . -name "geopsyrefra" | tail -n 1) || exit 2
pwd
dpversion C  || exit 2
cd $OLD_DIR || exit 2
################## hvtfa
[detail]                    src/HVTFAIterator.cpp:  version-2.1.4	not modified
[detail]                        src/HVTFALoop.cpp:  version-2.1.4	modified out of comments
[detail] --- src/HVTFALoop.cpp-version-2.1.4-stripped	2025-09-28 04:01:27.115609858 +0200
[detail] +++ src/HVTFALoop.cpp-HEAD-stripped	2025-09-28 04:01:27.119609878 +0200
[detail] @@ -106,12 +106,12 @@
[detail]           << currentFrequency << " "
[detail]           << hMaxNeg/vMax << " "
[detail]           << vMax << " "
[detail] -         << hMaxNeg << "\n"
[detail] +         << hMaxNeg << " -0.25\n"
[detail]           << tMax << " "
[detail]           << currentFrequency << " "
[detail]           << hMaxPos/vMax << " "
[detail]           << vMax << " "
[detail] -         << hMaxPos << "\n";
[detail] +         << hMaxPos << " 0.25\n";
[detail]      delete s;
[detail]      _loop->_dotmaxMutex.unlock();
[detail]    }
[detail]                  src/HVTFAParameters.cpp:  version-2.1.4	not modified
[detail]                      src/HVTFAPlugin.cpp:  version-2.1.4	not modified
[detail]              src/HVTFAStationSignals.cpp:  version-2.1.4	modified out of comments
[detail] --- src/HVTFAStationSignals.cpp-version-2.1.4-stripped	2025-09-28 04:01:27.163610090 +0200
[detail] +++ src/HVTFAStationSignals.cpp-HEAD-stripped	2025-09-28 04:01:27.167610110 +0200
[detail] @@ -21,16 +21,16 @@
[detail]    subPool->sort();
[detail]    
[detail]    SubSignalPool::iterator itPool=subPool->begin();
[detail] -  Signal * sig=*itPool;
[detail] -  QString refName=sig->name();
[detail] -  Point refRec=sig->receiver();
[detail] +  SignalSegment * sig=*itPool;
[detail] +  QString refName=sig->metaData()->name();
[detail] +  Point refRec=sig->metaData()->receiver();
[detail]    double refDt=sig->samplingPeriod();
[detail]    DateTime refStartTime=sig->startTime();
[detail]    for( ++itPool;itPool!=subPool->end();++itPool) {
[detail]      sig=*itPool;
[detail] -    if(refName!=sig->name() || refRec!=sig->receiver()) {
[detail] -      refName=sig->name();
[detail] -      refRec=sig->receiver();
[detail] +    if(refName!=sig->metaData()->name() || refRec!=sig->metaData()->receiver()) {
[detail] +      refName=sig->metaData()->name();
[detail] +      refRec=sig->metaData()->receiver();
[detail]        refDt=sig->samplingPeriod();
[detail]        refStartTime=sig->startTime();
[detail]      } else {
[detail] @@ -44,7 +44,7 @@
[detail]        if(nsamplingPeriod0-round(nsamplingPeriod0)>0.01*refDt) {
[detail]          Message::warning(MSG_ID, tr("Creating array"),
[detail]                                    tr("The differences between t0s must be a multiple of "
[detail] -                                     "sampling period. Problem with signal ID %1." ).arg(sig->id()),
[detail] +                            "sampling period. Problem with signal ID %1." ).arg(sig->id().toString()),
[detail]                                     Message::cancel());
[detail]          return false;
[detail]        }
[detail]                        src/ToolHVTFA.cpp:  version-2.1.4	modified out of comments
[detail] --- src/ToolHVTFA.cpp-version-2.1.4-stripped	2025-09-28 04:01:27.183610186 +0200
[detail] +++ src/ToolHVTFA.cpp-HEAD-stripped	2025-09-28 04:01:27.187610206 +0200
[detail] @@ -57,8 +57,8 @@
[detail]    QString log;
[detail]    if(!_stationSignals.addSignals(subPool) ||
[detail]        !_stationSignals.hasAllComponents() ||
[detail] -      _stationSignals.components()!=StationSignals::AllComponent) {
[detail] -    if(_stationSignals.components()!=StationSignals::AllComponent) {
[detail] +      _stationSignals.components()!=StationSignals::ThreeComponents) {
[detail] +    if(_stationSignals.components()!=StationSignals::ThreeComponents) {
[detail]        log+=tr("Detected less than 3 components\n");
[detail]      }
[detail]      Message::warning(MSG_ID, tr("Checking stations"), log, Message::cancel());
[detail]                       src/ToolHVTFAd.cpp:  version-2.1.4	not modified
[detail]                      src/HVTFAIterator.h:  version-2.1.4	not modified
[detail]                          src/HVTFALoop.h:  version-2.1.4	not modified
[detail]                    src/HVTFAParameters.h:  version-2.1.4	not modified
[detail]                        src/HVTFAPlugin.h:  version-2.1.4	not modified
[detail]                src/HVTFAStationSignals.h:  version-2.1.4	not modified
[detail]                          src/ToolHVTFA.h:  version-2.1.4	not modified
[detail]                         src/ToolHVTFAd.h:  version-2.1.4	not modified
[detail]                        src/ToolHVTFAd.ui:  version-2.1.4	not modified
[summary] Total differences: 64 lines
[summary] Modification level is C
OLD_DIR=$(pwd)
echo "hvtfa"
cd $(find . -name "hvtfa" | tail -n 1) || exit 2
pwd
dpversion C  || exit 2
cd $OLD_DIR || exit 2
################## campbelltob3
[detail]                   src/CampbellLoader.cpp:  version-1.0.2	not modified
[detail]                           src/Plugin.cpp:  version-1.0.2	not modified
[detail]                      src/Tob3Scanner.cpp:  version-1.0.2	modified out of comments
[detail] --- src/Tob3Scanner.cpp-version-1.0.2-stripped	2025-09-28 04:01:27.399611231 +0200
[detail] +++ src/Tob3Scanner.cpp-HEAD-stripped	2025-09-28 04:01:27.403611251 +0200
[detail] @@ -462,28 +462,27 @@
[detail]  
[detail]    
[detail]    SignalFile * newFile=new SignalFile(db, _fileName, SignalFileFormat::Temporary);
[detail] -  int iSig=0;
[detail] -
[detail] +  IndexInFileSet iChannel;
[detail]    for(VectorList<TimeRange>::const_iterator it=rList.begin(); it!=rList.end(); it++) {
[detail]      const TimeRange& r=*it;
[detail]      int dt=qRound((_referenceTime.secondsTo(r.start())-readFrame(db, r))/_samplingPeriod);
[detail]      for(int ic=0; ic<_channelCount; ic++) {
[detail] -      Signal * newSignal=new Signal(db);
[detail] +      SignalSegment * newSignal=new SignalSegment(db);
[detail]        newSignal->setSamplingPeriod(_samplingPeriod);
[detail]        newSignal->setFile(newFile);
[detail] -      newSignal->setNumberInFile(iSig++);
[detail] -      newSignal->setType(Signal::Waveform);
[detail] +      newSignal->setIndexInFile(iChannel);
[detail]        newSignal->setStartTime(r.start());
[detail] -      newSignal->setCountPerVolt(_countPerVolt[ic]);
[detail] -      newSignal->setVoltPerUnit(_voltPerUnit[ic]);
[detail] -      newSignal->setNSamples(r.lengthSamples(1.0/_samplingPeriod));
[detail] -      LOCK_SAMPLES(double, newSamples, newSignal)
[detail] -        memcpy(newSamples, _buffer[ic]+dt, newSignal->nSamples()*sizeof(double));
[detail] -      UNLOCK_SAMPLES(newSignal)
[detail] -
[detail] +      newSignal->metaData()->setCountPerVolt(_countPerVolt[ic]);
[detail] +      newSignal->metaData()->setVoltPerUnit(_voltPerUnit[ic]);
[detail] +      newSignal->setSize(r.lengthSamples(1.0/_samplingPeriod));
[detail] +      LOCK_SAMPLES(double, newSamples, newSignal->values())
[detail] +        memcpy(newSamples, _buffer[ic]+dt, newSignal->size()*sizeof(double));
[detail] +      UNLOCK_SAMPLES(newSignal->values())
[detail]        pool.addSignal(newSignal);
[detail] +      iChannel++;
[detail]      }
[detail]    }
[detail] +  db->addFile(newFile);
[detail]    stop();
[detail]    return pool;
[detail]  }
[detail] @@ -495,7 +494,7 @@
[detail]    int frameIndex=_offsets.firstIndexAfter(t);
[detail]    
[detail]    if(frameIndex>0) {
[detail] -    if(frameIndex==_offsets.count() || _offsets.at(frameIndex)->_time>t) {
[detail] +    if(frameIndex==_offsets.size() || _offsets.at(frameIndex)->_time>t) {
[detail]        frameIndex--;
[detail]      }
[detail]    }
[detail]                     src/CampbellLoader.h:  version-1.0.2	not modified
[detail]                             src/Plugin.h:  version-1.0.2	not modified
[detail]                        src/Tob3Scanner.h:  version-1.0.2	not modified
[detail]                    src/CampbellLoader.ui:  version-1.0.2	not modified
[summary] Total differences: 51 lines
[summary] Modification level is C
OLD_DIR=$(pwd)
echo "campbelltob3"
cd $(find . -name "campbelltob3" | tail -n 1) || exit 2
pwd
dpversion C  || exit 2
cd $OLD_DIR || exit 2
################## dinverdc
[detail]             src/AutocorrTargetWidget.cpp:  version-2.1.3	not modified
[detail]                         src/DCPlugin.cpp:  version-2.1.3	not modified
[detail]           src/DispersionTargetWidget.cpp:  version-2.1.3	not modified
[detail]     src/EllipticityCurveTargetWidget.cpp:  version-2.1.3	modified out of comments
[detail] --- src/EllipticityCurveTargetWidget.cpp-version-2.1.3-stripped	2025-09-28 04:01:27.567612042 +0200
[detail] +++ src/EllipticityCurveTargetWidget.cpp-HEAD-stripped	2025-09-28 04:01:27.571612062 +0200
[detail] @@ -191,7 +191,7 @@
[detail]            err2=str.section(QRegularExpression("[ \t]"), 3, 3).toDouble(&ok)/mean;
[detail]            if(!ok) err2=0.0;
[detail]            if(fabs(err1-err2)>1e-4) upDownEqual=false;
[detail] -          p.setStddev(0.5*(err1+err2));
[detail] +          p.setStddev(0.5*(Angle::radiansToDegrees(::atan(mean*err2))-Angle::radiansToDegrees(::atan(mean/err1))));
[detail]            p.setWeight(winCount);
[detail]            av.append(p);
[detail]            continue;
[detail]      src/EllipticityPeakTargetWidget.cpp:  version-2.1.3	not modified
[detail]      src/MagnetoTelluricTargetWidget.cpp:  version-2.1.3	not modified
[detail]           src/ParamGroundModelWidget.cpp:  version-2.1.3	not modified
[detail]                 src/ParamLayerWidget.cpp:  version-2.1.3	not modified
[detail]               src/ParamProfileWidget.cpp:  version-2.1.3	not modified
[detail]           src/RefractionTargetWidget.cpp:  version-2.1.3	not modified
[detail]                      src/RingBrowser.cpp:  version-2.1.3	not modified
[detail]            src/TargetListFrameWidget.cpp:  version-2.1.3	not modified
[detail]                 src/TargetListWidget.cpp:  version-2.1.3	modified out of comments
[detail] --- src/TargetListWidget.cpp-version-2.1.3-stripped	2025-09-28 04:01:27.711612739 +0200
[detail] +++ src/TargetListWidget.cpp-HEAD-stripped	2025-09-28 04:01:27.719612777 +0200
[detail] @@ -37,7 +37,7 @@
[detail]    magnetoTelluricSelect->setEnabled(false);
[detail]  
[detail]    
[detail] -  QStringList misfitTypes=Misfit::types();
[detail] +  QStringList misfitTypes=MisfitType::typeIds();
[detail]    dispMisfitType->addItems(misfitTypes);
[detail]    dispMisfitType->setEnabled(false);
[detail]    autocorrMisfitType->addItems(misfitTypes);
[detail] @@ -388,44 +388,44 @@
[detail]      tl->dispersionTarget().setCurves(_dispWidget->curves());
[detail]      tl->dispersionTarget().setMisfitWeight(dispWeight->text().toDouble());
[detail]      tl->dispersionTarget().setMinimumMisfit(dispMinMisfit->text().toDouble());
[detail] -    tl->dispersionTarget().setMisfitType(Misfit::convertType(dispMisfitType->currentText(), ok));
[detail] +    tl->dispersionTarget().setMisfitType(MisfitType::convertType(dispMisfitType->currentText(), ok));
[detail]    }
[detail]    if(_autocorrWidget) {
[detail]      tl->autocorrTarget().setCurves(_autocorrWidget->curves());
[detail]      tl->autocorrTarget().setMisfitWeight(autocorrWeight->text().toDouble());
[detail]      tl->autocorrTarget().setMinimumMisfit(autocorrMinMisfit->text().toDouble());
[detail] -    tl->autocorrTarget().setMisfitType(Misfit::convertType(autocorrMisfitType->currentText(), ok));
[detail] +    tl->autocorrTarget().setMisfitType(MisfitType::convertType(autocorrMisfitType->currentText(), ok));
[detail]    }
[detail]    if(_ellCurveWidget) {
[detail]      tl->ellipticityCurveTarget().setCurves(_ellCurveWidget->curves());
[detail]      tl->ellipticityCurveTarget().setMisfitWeight(ellCurveWeight->text().toDouble());
[detail]      tl->ellipticityCurveTarget().setMinimumMisfit(ellCurveMinMisfit->text().toDouble());
[detail] -    tl->ellipticityCurveTarget().setMisfitType(Misfit::convertType(ellCurveMisfitType->currentText(), ok));
[detail] +    tl->ellipticityCurveTarget().setMisfitType(MisfitType::convertType(ellCurveMisfitType->currentText(), ok));
[detail]    }
[detail]    if(_ellPeakWidget) {
[detail]      tl->ellipticityPeakTarget().setValue(_ellPeakWidget->value());
[detail]      tl->ellipticityPeakTarget().setMinimumAmplitude(_ellPeakWidget->minimumAmplitude());
[detail]      tl->ellipticityPeakTarget().setMisfitWeight(ellPeakWeight->text().toDouble());
[detail]      tl->ellipticityPeakTarget().setMinimumMisfit(ellPeakMinMisfit->text().toDouble());
[detail] -    tl->ellipticityPeakTarget().setMisfitType(Misfit::convertType(ellPeakMisfitType->currentText(), ok));
[detail] +    tl->ellipticityPeakTarget().setMisfitType(MisfitType::convertType(ellPeakMisfitType->currentText(), ok));
[detail]    }
[detail]    if(_refraVpWidget) {
[detail]      tl->refractionVpTarget().setCurves(_refraVpWidget->curves());
[detail]      tl->refractionVpTarget().setMisfitWeight(refraVpWeight->text().toDouble());
[detail]      tl->refractionVpTarget().setMinimumMisfit(refraVpMinMisfit->text().toDouble());
[detail] -    tl->refractionVpTarget().setMisfitType(Misfit::convertType(refraVpMisfitType->currentText(), ok));
[detail] +    tl->refractionVpTarget().setMisfitType(MisfitType::convertType(refraVpMisfitType->currentText(), ok));
[detail]    }
[detail]    if(_refraVsWidget) {
[detail]      tl->refractionVsTarget().setCurves(_refraVsWidget->curves());
[detail]      tl->refractionVsTarget().setMisfitWeight(refraVsWeight->text().toDouble());
[detail]      tl->refractionVsTarget().setMinimumMisfit(refraVsMinMisfit->text().toDouble());
[detail] -    tl->refractionVsTarget().setMisfitType(Misfit::convertType(refraVsMisfitType->currentText(), ok));
[detail] +    tl->refractionVsTarget().setMisfitType(MisfitType::convertType(refraVsMisfitType->currentText(), ok));
[detail]    }
[detail]    if(_magnetoTelluricWidget) {
[detail]      tl->magnetoTelluricTarget().setCurves(_magnetoTelluricWidget->curves());
[detail]      tl->magnetoTelluricTarget().setMisfitWeight(magnetoTelluricWeight->text().toDouble());
[detail]      tl->magnetoTelluricTarget().setMinimumMisfit(magnetoTelluricMinMisfit->text().toDouble());
[detail] -    tl->magnetoTelluricTarget().setMisfitType(Misfit::convertType(magnetoTelluricMisfitType->currentText(), ok));
[detail] +    tl->magnetoTelluricTarget().setMisfitType(MisfitType::convertType(magnetoTelluricMisfitType->currentText(), ok));
[detail]    }
[detail]    tl->validateTargets();
[detail]    return tl;
[detail] @@ -453,7 +453,7 @@
[detail]    }
[detail]    dispWeight->setText(QString::number(tl->dispersionTarget().misfitWeight()));
[detail]    dispMinMisfit->setText(QString::number(tl->dispersionTarget().minimumMisfit()));
[detail] -  dispMisfitType->setCurrentText(Misfit::convertType(tl->dispersionTarget().misfitType()));
[detail] +  dispMisfitType->setCurrentText(MisfitType::convertType(tl->dispersionTarget().misfitType().typeId()));
[detail]  
[detail]    if(!tl->autocorrTarget().curves().isEmpty()) {
[detail]      on_autocorrSet_clicked();
[detail] @@ -466,7 +466,7 @@
[detail]    }
[detail]    autocorrWeight->setText(QString::number(tl->autocorrTarget().misfitWeight()));
[detail]    autocorrMinMisfit->setText(QString::number(tl->autocorrTarget().minimumMisfit()));
[detail] -  autocorrMisfitType->setCurrentText(Misfit::convertType(tl->autocorrTarget().misfitType()));
[detail] +  autocorrMisfitType->setCurrentText(MisfitType::convertType(tl->autocorrTarget().misfitType().typeId()));
[detail]  
[detail]    if(!tl->ellipticityCurveTarget().curves().isEmpty()) {
[detail]      on_ellCurveSet_clicked();
[detail] @@ -479,7 +479,7 @@
[detail]    }
[detail]    ellCurveWeight->setText(QString::number(tl->ellipticityCurveTarget().misfitWeight()));
[detail]    ellCurveMinMisfit->setText(QString::number(tl->ellipticityCurveTarget().minimumMisfit()));
[detail] -  ellCurveMisfitType->setCurrentText(Misfit::convertType(tl->ellipticityCurveTarget().misfitType()));
[detail] +  ellCurveMisfitType->setCurrentText(MisfitType::convertType(tl->ellipticityCurveTarget().misfitType().typeId()));
[detail]  
[detail]    if(tl->ellipticityPeakTarget().value().isValid()) {
[detail]      on_ellPeakSet_clicked();
[detail] @@ -491,7 +491,7 @@
[detail]    }
[detail]    ellPeakWeight->setText(QString::number(tl->ellipticityPeakTarget().misfitWeight()));
[detail]    ellPeakMinMisfit->setText(QString::number(tl->ellipticityPeakTarget().minimumMisfit()));
[detail] -  ellPeakMisfitType->setCurrentText(Misfit::convertType(tl->ellipticityPeakTarget().misfitType()));
[detail] +  ellPeakMisfitType->setCurrentText(MisfitType::convertType(tl->ellipticityPeakTarget().misfitType().typeId()));
[detail]  
[detail]    if( !tl->refractionVpTarget().curves().isEmpty()) {
[detail]      on_refraVpSet_clicked();
[detail] @@ -504,7 +504,7 @@
[detail]    }
[detail]    refraVpWeight->setText(QString::number(tl->refractionVpTarget().misfitWeight()));
[detail]    refraVpMinMisfit->setText(QString::number(tl->refractionVpTarget().minimumMisfit()));
[detail] -  refraVpMisfitType->setCurrentText(Misfit::convertType(tl->refractionVsTarget().misfitType()));
[detail] +  refraVpMisfitType->setCurrentText(MisfitType::convertType(tl->refractionVsTarget().misfitType().typeId()));
[detail]  
[detail]    if( !tl->refractionVsTarget().curves().isEmpty()) {
[detail]      on_refraVsSet_clicked();
[detail] @@ -517,7 +517,7 @@
[detail]    }
[detail]    refraVsWeight->setText(QString::number(tl->refractionVpTarget().misfitWeight()));
[detail]    refraVsMinMisfit->setText(QString::number(tl->refractionVpTarget().minimumMisfit()));
[detail] -  refraVsMisfitType->setCurrentText(Misfit::convertType(tl->refractionVpTarget().misfitType()));
[detail] +  refraVsMisfitType->setCurrentText(MisfitType::convertType(tl->refractionVpTarget().misfitType().typeId()));
[detail]  
[detail]    if( !tl->magnetoTelluricTarget().curves().isEmpty()) {
[detail]      on_magnetoTelluricSet_clicked();
[detail] @@ -530,7 +530,7 @@
[detail]    }
[detail]    magnetoTelluricWeight->setText(QString::number(tl->magnetoTelluricTarget().misfitWeight()));
[detail]    magnetoTelluricMinMisfit->setText(QString::number(tl->magnetoTelluricTarget().minimumMisfit()));
[detail] -  magnetoTelluricMisfitType->setCurrentText(Misfit::convertType(tl->magnetoTelluricTarget().misfitType()));
[detail] +  magnetoTelluricMisfitType->setCurrentText(MisfitType::convertType(tl->magnetoTelluricTarget().misfitType().typeId()));
[detail]  
[detail]    updateInfo();
[detail]  }
[detail]               src/AutocorrTargetWidget.h:  version-2.1.3	not modified
[detail]                           src/DCPlugin.h:  version-2.1.3	not modified
[detail]             src/DispersionTargetWidget.h:  version-2.1.3	not modified
[detail]       src/EllipticityCurveTargetWidget.h:  version-2.1.3	not modified
[detail]        src/EllipticityPeakTargetWidget.h:  version-2.1.3	not modified
[detail]        src/MagnetoTelluricTargetWidget.h:  version-2.1.3	not modified
[detail]             src/ParamGroundModelWidget.h:  version-2.1.3	not modified
[detail]                   src/ParamLayerWidget.h:  version-2.1.3	not modified
[detail]                 src/ParamProfileWidget.h:  version-2.1.3	not modified
[detail]             src/RefractionTargetWidget.h:  version-2.1.3	not modified
[detail]                        src/RingBrowser.h:  version-2.1.3	not modified
[detail]              src/TargetListFrameWidget.h:  version-2.1.3	not modified
[detail]                   src/TargetListWidget.h:  version-2.1.3	not modified
[detail]       src/EllipticityPeakTargetWidget.ui:  version-2.1.3	not modified
[detail]                  src/ParamLayerWidget.ui:  version-2.1.3	not modified
[detail]                src/ParamProfileWidget.ui:  version-2.1.3	not modified
[detail]                       src/RingBrowser.ui:  version-2.1.3	not modified
[detail]             src/TargetListFrameWidget.ui:  version-2.1.3	not modified
[detail]                  src/TargetListWidget.ui:  version-2.1.3	not modified
[summary] Total differences: 137 lines
[summary] Modification level is C
OLD_DIR=$(pwd)
echo "dinverdc"
cd $(find . -name "dinverdc" | tail -n 1) || exit 2
pwd
dpversion C  || exit 2
cd $OLD_DIR || exit 2
################## dinverext
[detail]                        src/ExtPlugin.cpp:  version-1.0.6	not modified
[detail]                        src/ExtTarget.cpp:  version-1.0.6	not modified
[detail]                  src/ExtTargetWidget.cpp:  version-1.0.6	not modified
[detail]                          src/Forward.cpp:  version-1.0.6	not modified
[detail]                          src/ExtPlugin.h:  version-1.0.6	not modified
[detail]                          src/ExtTarget.h:  version-1.0.6	not modified
[detail]                    src/ExtTargetWidget.h:  version-1.0.6	not modified
[detail]                            src/Forward.h:  version-1.0.6	not modified
[detail]                   src/ExtTargetWidget.ui:  version-1.0.6	not modified
# No modification since last version
################## spac2disp
[detail]                           src/Reader.cpp:  version-1.0.5	not modified
[detail]                           src/Sample.cpp:  version-1.0.5	not modified
[detail]                          src/Samples.cpp:  version-1.0.5	not modified
[detail]                 src/Spac2DispOptions.cpp:  version-1.0.5	not modified
[detail]                    src/Spac3CForward.cpp:  version-1.0.5	modified out of comments
[detail] --- src/Spac3CForward.cpp-version-1.0.5-stripped	2025-09-28 04:01:28.303615599 +0200
[detail] +++ src/Spac3CForward.cpp-HEAD-stripped	2025-09-28 04:01:28.307615619 +0200
[detail] @@ -95,7 +95,7 @@
[detail]        const ModalCurve& c=_curveList.at(i);
[detail]        const FactoryPoint& p=c.constAt(index);
[detail]        
[detail] -      rms_val+=p.misfit(nValues, nData, _autocorrFactory->mode(c.modes().first())[_iOmega], Misfit::L2, 0.0);
[detail] +      rms_val+=p.misfit(nValues, nData, _autocorrFactory->mode(c.modes().first())[_iOmega], MisfitType::L2, 0.0);
[detail]      }
[detail]    }
[detail]    if(nValues>0)
[detail]                     src/SpacSelector.cpp:  version-1.0.5	modified out of comments
[detail] --- src/SpacSelector.cpp-version-1.0.5-stripped	2025-09-28 04:01:28.323615696 +0200
[detail] +++ src/SpacSelector.cpp-HEAD-stripped	2025-09-28 04:01:28.327615716 +0200
[detail] @@ -39,7 +39,7 @@
[detail]    _limitsSolutionsLayer=new LineLayer(graph);
[detail]    _limitsSolutionsLayer->setReferenceLine(new PlotLine2D);
[detail]    _limitsSolutionsLayer->setObjectName("SPAC Limits & Solutions");
[detail] -  _limitsSolutionsLayer->addLine(Pen(Qt::NoPen), Symbol(Symbol::Circle, 1.2, Pen(Qt::black), Brush(Qt::black, Qt::SolidPattern)));
[detail] +  _limitsSolutionsLayer->addLine(Pen(Pen::NoLine), Symbol(Symbol::Circle, 1.2, Pen(Qt::black), Brush(Qt::black, Qt::SolidPattern)));
[detail]    _limitsSolutionsLayer->addLine(Pen(Qt::black, 0.6, Pen::SolidLine), Symbol());
[detail]    _limitsSolutionsLayer->addLine(Pen(Qt::black, 0.6, Pen::DotLine), Symbol());
[detail]  
[detail] @@ -134,7 +134,7 @@
[detail]      w->setObjectName(QString("ring_%1").arg(ig, 3, 10, QChar('0')));
[detail]      _spacLayers[ig]=new LineLayer(w);
[detail]      ModalLine * line=new ModalLine;
[detail] -    line->setPen(Pen(Qt::NoPen));
[detail] +    line->setPen(Pen(Pen::NoLine));
[detail]      line->setSymbol(Symbol( Symbol::Circle,1.2, Pen(Qt::gray),
[detail]                                  Brush(Qt::gray,Qt::SolidPattern)) );
[detail]      _spacLayers[ig]->setReferenceLine(line);
[detail]                             src/main.cpp:  version-1.0.5	modified out of comments
[detail] --- src/main.cpp-version-1.0.5-stripped	2025-09-28 04:01:28.347615812 +0200
[detail] +++ src/main.cpp-HEAD-stripped	2025-09-28 04:01:28.351615832 +0200
[detail] @@ -294,7 +294,7 @@
[detail]  
[detail]    
[detail]    enum Spac2dispMode {Gui, Dispersion, PickCurve, SelectTarget, Max};
[detail] -  enum Component {Vertical, AllComponent};
[detail] +  enum Component {Vertical, ThreeComponent};
[detail]    Component component=Vertical;
[detail]    Spac2dispMode spac2dispMode=Gui;
[detail]  
[detail] @@ -306,7 +306,7 @@
[detail]        if(arg=="-V") {
[detail]          component=Vertical;
[detail]        } else if(arg=="-VRT") {
[detail] -        component=AllComponent;
[detail] +        component=ThreeComponent;
[detail]          spac2dispMode=Dispersion;
[detail]        } else if(arg=="-dispersion") {
[detail]          spac2dispMode=Dispersion;
[detail] @@ -408,7 +408,7 @@
[detail]        break;
[detail]      }
[detail]      break;
[detail] -  case AllComponent:
[detail] +  case ThreeComponent:
[detail]      switch(spac2dispMode) {
[detail]      case Gui:
[detail]        App::log(tr("Not yet implemented\n"));
[detail]                             src/Reader.h:  version-1.0.5	not modified
[detail]                             src/Sample.h:  version-1.0.5	not modified
[detail]                            src/Samples.h:  version-1.0.5	not modified
[detail]                   src/Spac2DispOptions.h:  version-1.0.5	not modified
[detail]                      src/Spac3CForward.h:  version-1.0.5	not modified
[detail]                       src/SpacSelector.h:  version-1.0.5	not modified
[detail]                  src/Spac2DispOptions.ui:  version-1.0.5	not modified
[summary] Total differences: 60 lines
[summary] Modification level is C
OLD_DIR=$(pwd)
echo "spac2disp"
cd $(find . -name "spac2disp" | tail -n 1) || exit 2
pwd
dpversion C  || exit 2
cd $OLD_DIR || exit 2
################## max2curve
[detail]                    src/CurveMaxEntry.cpp:  version-1.1.3	not modified
[detail]                       src/FKMaxEntry.cpp:  version-1.1.3	not modified
[detail]                        src/FKOptions.cpp:  version-1.1.3	not modified
[detail]               src/FreqVelocityFilter.cpp:  version-1.1.3	not modified
[detail]                   src/GenericOptions.cpp:  version-1.1.3	not modified
[detail]                  src/HistogramWidget.cpp:  version-1.1.3	modified out of comments
[detail] --- src/HistogramWidget.cpp-version-1.1.3-stripped	2025-09-28 04:01:28.575616915 +0200
[detail] +++ src/HistogramWidget.cpp-HEAD-stripped	2025-09-28 04:01:28.579616933 +0200
[detail] @@ -24,7 +24,7 @@
[detail]    _gridLayer=new IrregularGrid2DPlot(graph);
[detail]    _gridLayer->setObjectName("histograms");
[detail]    ColorMap& map=_gridLayer->beginColorMapChange();
[detail] -  map.generate(0, 19, ColorPalette::defaultSequential, ColorPalette::Reversed);
[detail] +  map.generate(0, 19, 1, ColorPalette::defaultSequential, ColorPalette::Reversed);
[detail]    _gridLayer->endColorMapChange();
[detail]    LineLayer * curveLayer=new LineLayer(graph);
[detail]    curveLayer->setObjectName("curves");
[detail] @@ -62,7 +62,7 @@
[detail]  
[detail]    Settings::getRect(this, "HistogramWidget" );
[detail]  
[detail] -  _statWidget=new StatGridAnalyser(0, Qt::Window);
[detail] +  _statWidget=new StatGridAnalyser(this, Qt::Window);
[detail]    _statWidget->setGrid(_gridLayer, graph->yAxis());
[detail]    Settings::getWidget(_statWidget, "StatGridAnalyser");
[detail]    connect(_statWidget, SIGNAL(reject( double, double, double) ),
[detail] @@ -77,8 +77,6 @@
[detail]  HistogramWidget::~HistogramWidget()
[detail]  {
[detail]    TRACE;
[detail] -  Settings::setRect(_statWidget, "StatGridAnalyser" );
[detail] -  delete _statWidget;
[detail]    delete _maxList;
[detail]  }
[detail]  
[detail] @@ -526,8 +524,10 @@
[detail]  void HistogramWidget::closeEvent(QCloseEvent *e)
[detail]  {
[detail]    TRACE;
[detail] -
[detail]    Settings::setRect(this, "HistogramWidget" );
[detail] +  Settings::setRect(_statWidget, "StatGridAnalyser" );
[detail] +  delete _statWidget;
[detail] +  _statWidget=nullptr;
[detail]    QApplication::quit();
[detail]    e->accept();
[detail]  }
[detail]                         src/MaxEntry.cpp:  version-1.1.3	not modified
[detail]                     src/MaxEntryList.cpp:  version-1.1.3	not modified
[detail]                     src/SPACMaxEntry.cpp:  version-1.1.3	not modified
[detail]                      src/SPACOptions.cpp:  version-1.1.3	not modified
[detail]                 src/StatGridAnalyser.cpp:  version-1.1.3	not modified
[detail]                      src/TFAMaxEntry.cpp:  version-1.1.3	modified out of comments
[detail] --- src/TFAMaxEntry.cpp-version-1.1.3-stripped	2025-09-28 04:01:28.679617417 +0200
[detail] +++ src/TFAMaxEntry.cpp-HEAD-stripped	2025-09-28 04:01:28.683617436 +0200
[detail] @@ -42,12 +42,17 @@
[detail]      field=fields.nextField(ptr);
[detail]      _hAmplitude=field.toDouble(ok);
[detail]      field=fields.nextField(ptr);
[detail] +    if(field.isValid()) {
[detail]      _delay=field.toDouble(ok);
[detail] +    } else {
[detail] +      _delay=0.25;
[detail] +    }
[detail]      field=fields.nextField(ptr);
[detail] -    if(field.isValid())
[detail] +    if(field.isValid()) {
[detail]        _selected=field.toInt(ok)>0 ? true : false;
[detail] -    else
[detail] +    } else {
[detail]        _selected=true; 
[detail] +    }
[detail]      return ok;
[detail]    } else {
[detail]      return false;
[detail]                       src/TFAOptions.cpp:  version-1.1.3	not modified
[detail]                             src/main.cpp:  version-1.1.3	not modified
[detail]                      src/CurveMaxEntry.h:  version-1.1.3	not modified
[detail]                         src/FKMaxEntry.h:  version-1.1.3	not modified
[detail]                          src/FKOptions.h:  version-1.1.3	not modified
[detail]                 src/FreqVelocityFilter.h:  version-1.1.3	not modified
[detail]                     src/GenericOptions.h:  version-1.1.3	not modified
[detail]                    src/HistogramWidget.h:  version-1.1.3	not modified
[detail]                           src/MaxEntry.h:  version-1.1.3	not modified
[detail]                       src/MaxEntryList.h:  version-1.1.3	not modified
[detail]                       src/SPACMaxEntry.h:  version-1.1.3	not modified
[detail]                        src/SPACOptions.h:  version-1.1.3	not modified
[detail]                   src/StatGridAnalyser.h:  version-1.1.3	not modified
[detail]                        src/TFAMaxEntry.h:  version-1.1.3	modified out of comments
[detail] --- src/TFAMaxEntry.h-version-1.1.3-stripped	2025-09-28 04:01:28.891618441 +0200
[detail] +++ src/TFAMaxEntry.h-HEAD-stripped	2025-09-28 04:01:28.899618480 +0200
[detail] @@ -8,13 +8,13 @@
[detail]  class TFAMaxEntry : public MaxEntry
[detail]  {
[detail]  public:
[detail] -  virtual bool readLine(QTextStream& s);
[detail] -  virtual void writeHeader(QTextStream& s) const;
[detail] -  virtual void writeLine(QTextStream& s) const;
[detail] +  bool readLine(QTextStream& s);
[detail] +  void writeHeader(QTextStream& s) const;
[detail] +  void writeLine(QTextStream& s) const;
[detail]    static QByteArray fields();
[detail]    static bool isHeaderLine(QString f);
[detail]  
[detail] -  virtual bool operator<(const MaxEntry& o) const;
[detail] +  bool operator<(const MaxEntry& o) const;
[detail]  
[detail]    virtual double value() const {return _hv;}
[detail]    double hv() const {return _hv;}
[detail]                         src/TFAOptions.h:  version-1.1.3	not modified
[detail]                         src/FKOptions.ui:  version-1.1.3	not modified
[detail]                src/FreqVelocityFilter.ui:  version-1.1.3	not modified
[detail]                    src/GenericOptions.ui:  version-1.1.3	not modified
[detail]                   src/HistogramWidget.ui:  version-1.1.3	not modified
[detail]                       src/SPACOptions.ui:  version-1.1.3	not modified
[detail]                  src/StatGridAnalyser.ui:  version-1.1.3	not modified
[detail]                        src/TFAOptions.ui:  version-1.1.3	not modified
[summary] Total differences: 83 lines
[summary] Modification level is C
OLD_DIR=$(pwd)
echo "max2curve"
cd $(find . -name "max2curve" | tail -n 1) || exit 2
pwd
dpversion C  || exit 2
cd $OLD_DIR || exit 2
################## gppoisson
[detail]                             src/main.cpp:  version-2.0.1	not modified
# No modification since last version
################## gpprofile
[detail]                    src/ProfileReader.cpp:  version-1.1.4	modified out of comments
[detail] --- src/ProfileReader.cpp-version-1.1.4-stripped	2025-09-28 04:01:29.115619524 +0200
[detail] +++ src/ProfileReader.cpp-HEAD-stripped	2025-09-28 04:01:29.119619543 +0200
[detail] @@ -235,7 +235,7 @@
[detail]    if(!m.fromStream(s, &comments)) {
[detail]      return false;
[detail]    }
[detail] -  if(m.layerCount()>0) {
[detail] +  if(m.numberOfLayers()>0) {
[detail]      switch (_output) {
[detail]      case Original: {
[detail]          profileComment(sOut, comments);
[detail]                             src/main.cpp:  version-1.1.4	not modified
[detail]                      src/ProfileReader.h:  version-1.1.4	not modified
[summary] Total differences: 11 lines
[summary] Modification level is C
OLD_DIR=$(pwd)
echo "gpprofile"
cd $(find . -name "gpprofile" | tail -n 1) || exit 2
pwd
dpversion C  || exit 2
cd $OLD_DIR || exit 2
################## gpdc
[detail]                 src/DispersionReader.cpp:  version-1.0.5	modified out of comments
[detail] --- src/DispersionReader.cpp-version-1.0.5-stripped	2025-09-28 04:01:29.195619910 +0200
[detail] +++ src/DispersionReader.cpp-HEAD-stripped	2025-09-28 04:01:29.199619930 +0200
[detail] @@ -168,7 +168,7 @@
[detail]    if(!m.fromStream(s, &comments)) {
[detail]      return false;
[detail]    }
[detail] -  if(m.layerCount()>0) {
[detail] +  if(m.numberOfLayers()>0) {
[detail]      switch(_mode) {
[detail]      case GridMode: {
[detail]          IrregularGrid2D grid;
[detail]                             src/main.cpp:  version-1.0.5	not modified
[detail]                   src/DispersionReader.h:  version-1.0.5	not modified
[summary] Total differences: 11 lines
[summary] Modification level is C
OLD_DIR=$(pwd)
echo "gpdc"
cd $(find . -name "gpdc" | tail -n 1) || exit 2
pwd
dpversion C  || exit 2
cd $OLD_DIR || exit 2
################## gpdckernels
# Already increased version number:
# Tag = 
# Version = 0.0.0
################## gplivemodel
[detail]                     src/ControlPanel.cpp:  version-1.0.5	not modified
[detail]                     src/CurvesThread.cpp:  version-1.0.5	not modified
[detail]             src/DispersionGridThread.cpp:  version-1.0.5	not modified
[detail]                 src/DispersionThread.cpp:  version-1.0.5	not modified
[detail]                src/EllipticityThread.cpp:  version-1.0.5	not modified
[detail]                  src/LiveModelReader.cpp:  version-1.0.5	modified out of comments
[detail] --- src/LiveModelReader.cpp-version-1.0.5-stripped	2025-09-28 04:01:29.379620800 +0200
[detail] +++ src/LiveModelReader.cpp-HEAD-stripped	2025-09-28 04:01:29.383620820 +0200
[detail] @@ -107,7 +107,7 @@
[detail]    if(!m.fromStream(s, &comments)) {
[detail]      return false;
[detail]    }
[detail] -  if(m.layerCount()>0) {
[detail] +  if(m.numberOfLayers()>0) {
[detail]      if(!_sliderName.isEmpty()) {
[detail]        _w->scan(&m, _sliderName, _scanCount);
[detail]      } else {
[detail]            src/MagnetoTelluricThread.cpp:  version-1.0.5	not modified
[detail]                       src/MainWindow.cpp:  version-1.0.5	not modified
[detail]                      src/ModelSlider.cpp:  version-1.0.5	not modified
[detail]                src/ModelSliderEditor.cpp:  version-1.0.5	not modified
[detail]                          src/Results.cpp:  version-1.0.5	not modified
[detail]                    src/ResultsThread.cpp:  version-1.0.5	not modified
[detail]                  src/Seismic1DThread.cpp:  version-1.0.5	not modified
[detail]            src/ShAmplificationThread.cpp:  version-1.0.5	not modified
[detail]                             src/main.cpp:  version-1.0.5	not modified
[detail]                       src/ControlPanel.h:  version-1.0.5	not modified
[detail]                       src/CurvesThread.h:  version-1.0.5	not modified
[detail]               src/DispersionGridThread.h:  version-1.0.5	not modified
[detail]                   src/DispersionThread.h:  version-1.0.5	not modified
[detail]                  src/EllipticityThread.h:  version-1.0.5	not modified
[detail]                    src/LiveModelReader.h:  version-1.0.5	not modified
[detail]              src/MagnetoTelluricThread.h:  version-1.0.5	not modified
[detail]                         src/MainWindow.h:  version-1.0.5	not modified
[detail]                        src/ModelSlider.h:  version-1.0.5	not modified
[detail]                  src/ModelSliderEditor.h:  version-1.0.5	not modified
[detail]                            src/Results.h:  version-1.0.5	not modified
[detail]                      src/ResultsThread.h:  version-1.0.5	not modified
[detail]                    src/Seismic1DThread.h:  version-1.0.5	not modified
[detail]              src/ShAmplificationThread.h:  version-1.0.5	not modified
[detail]                      src/ControlPanel.ui:  version-1.0.5	not modified
[detail]                 src/ModelSliderEditor.ui:  version-1.0.5	not modified
[summary] Total differences: 11 lines
[summary] Modification level is C
OLD_DIR=$(pwd)
echo "gplivemodel"
cd $(find . -name "gplivemodel" | tail -n 1) || exit 2
pwd
dpversion C  || exit 2
cd $OLD_DIR || exit 2
################## gpec8
[detail]                        src/EC8Reader.cpp:  version-1.0.1	modified out of comments
[detail] --- src/EC8Reader.cpp-version-1.0.1-stripped	2025-09-28 04:01:29.807622869 +0200
[detail] +++ src/EC8Reader.cpp-HEAD-stripped	2025-09-28 04:01:29.811622887 +0200
[detail] @@ -42,7 +42,7 @@
[detail]    if(!m.fromStream(s, &comments)) {
[detail]      return false;
[detail]    }
[detail] -  if(m.layerCount()>0) {
[detail] +  if(m.numberOfLayers()>0) {
[detail]      sOut << comments;
[detail]      
[detail]      VectorList<double> sampling;
[detail]                             src/main.cpp:  version-1.0.1	not modified
[detail]                          src/EC8Reader.h:  version-1.0.1	not modified
[summary] Total differences: 11 lines
[summary] Modification level is C
OLD_DIR=$(pwd)
echo "gpec8"
cd $(find . -name "gpec8" | tail -n 1) || exit 2
pwd
dpversion C  || exit 2
cd $OLD_DIR || exit 2
################## gpdcreport
[detail]                             src/main.cpp:  version-1.0.6	modified out of comments
[detail] --- src/main.cpp-version-1.0.6-stripped	2025-09-28 04:01:29.887623255 +0200
[detail] +++ src/main.cpp-HEAD-stripped	2025-09-28 04:01:29.891623274 +0200
[detail] @@ -479,7 +479,7 @@
[detail]          pitch.resample(depths);
[detail]          Seismic1DModel * m;
[detail]          m=DCReportBlock::vpModel(depths ,vp.values());
[detail] -        RefractionDippingModel tm(m->layerCount());
[detail] +        RefractionDippingModel tm(m->numberOfLayers());
[detail]          tm.setXLeft(f.xLeft());
[detail]          tm.setXRight(f.xRight());
[detail]          tm.fromSeismic1DModel( *m, pitch.values(), Seismic1DModel::P);
[detail] @@ -504,7 +504,7 @@
[detail]          pitch.resample(depths);
[detail]          Seismic1DModel * m;
[detail]          m=DCReportBlock::vsModel(depths ,vs.values());
[detail] -        RefractionDippingModel tm(m->layerCount());
[detail] +        RefractionDippingModel tm(m->numberOfLayers());
[detail]          tm.setXLeft(f.xLeft());
[detail]          tm.setXRight(f.xRight());
[detail]          tm.fromSeismic1DModel( *m, pitch.values(), Seismic1DModel::S);
[summary] Total differences: 20 lines
[summary] Modification level is C
OLD_DIR=$(pwd)
echo "gpdcreport"
cd $(find . -name "gpdcreport" | tail -n 1) || exit 2
pwd
dpversion C  || exit 2
cd $OLD_DIR || exit 2
################## gptarget
[detail]                   src/AbstractTarget.cpp:  version-1.0.4	not modified
[detail]                        src/TargetAdd.cpp:  version-1.0.4	modified out of comments
[detail] --- src/TargetAdd.cpp-version-1.0.4-stripped	2025-09-28 04:01:29.955623584 +0200
[detail] +++ src/TargetAdd.cpp-HEAD-stripped	2025-09-28 04:01:29.959623603 +0200
[detail] @@ -25,34 +25,43 @@
[detail]  
[detail]  bool TargetAdd::setOptions(int& argc, char ** argv)
[detail]  {
[detail] +  Mode mode;
[detail]    int j=1;
[detail]    for(int i=1; i<argc; i++) {
[detail]      QByteArray arg=argv[i];
[detail]      if(arg[0]=='-') {
[detail]        if(arg=="-dispersion-rayleigh") {
[detail] -        _mode.setPolarization(Mode::Rayleigh);
[detail] +        mode.setPolarization(Mode::Rayleigh);
[detail]          CoreApplication::checkOptionArg(i, argc, argv);
[detail] -        _mode.setIndex(CoreApplication::toInt(i, i-1, argv));
[detail] +        if(!addModes(mode, argv[i])) {
[detail] +          return false;
[detail] +        }
[detail]          _type=Dispersion;
[detail]        } else if(arg=="-ellipticity") {
[detail] -        _mode.setPolarization(Mode::Rayleigh);
[detail] -        _mode.setValue(Mode::Signed);
[detail] +        mode.setPolarization(Mode::Rayleigh);
[detail] +        mode.setValue(Mode::Signed);
[detail]          CoreApplication::checkOptionArg(i, argc, argv);
[detail] -        _mode.setIndex(CoreApplication::toInt(i, i-1, argv));
[detail] +        if(!addModes(mode, argv[i])) {
[detail] +          return false;
[detail] +        }
[detail]          _type=EllipticityCurve;
[detail]        } else if(arg=="-abs-ellipticity") {
[detail] -        _mode.setPolarization(Mode::Rayleigh);
[detail] -        _mode.setValue(Mode::Absolute);
[detail] +        mode.setPolarization(Mode::Rayleigh);
[detail] +        mode.setValue(Mode::Absolute);
[detail]          CoreApplication::checkOptionArg(i, argc, argv);
[detail] -        _mode.setIndex(CoreApplication::toInt(i, i-1, argv));
[detail] +        if(!addModes(mode, argv[i])) {
[detail] +          return false;
[detail] +        }
[detail]          _type=EllipticityCurve;
[detail]        } else if(arg=="-dispersion-love") {
[detail] -        _mode.setPolarization(Mode::Love);
[detail] +        mode.setPolarization(Mode::Love);
[detail]          CoreApplication::checkOptionArg(i, argc, argv);
[detail] -        _mode.setIndex(CoreApplication::toInt(i, i-1, argv));
[detail] +        if(!addModes(mode, argv[i])) {
[detail] +          return false;
[detail] +        }
[detail]          _type=Dispersion;
[detail]        } else if(arg=="-group") {
[detail] -        _mode.setSlowness(Mode::Group);
[detail] +        mode.setSlowness(Mode::Group);
[detail]        } else if(arg=="-mt") {
[detail]          _type=MagnetoTelluric;
[detail]        } else if(arg=="-p") {
[detail] @@ -90,6 +99,21 @@
[detail]    return true;
[detail]  }
[detail]  
[detail] +bool TargetAdd::addModes(Mode m, const QString& index)
[detail] +{
[detail] +  QStringList l=index.split(',');
[detail] +  int n=l.count();
[detail] +  bool ok;
[detail] +  for(int i=0; i<n; i++) {
[detail] +    m.setIndex(l.at(i).toInt(&ok));
[detail] +    if(!ok) {
[detail] +      App::log(tr("mode INDEX is not an integer or a coma-separated list of integers.\n"));
[detail] +    }
[detail] +    _modes.append(m);
[detail] +  }
[detail] +  return true;
[detail] +}
[detail] +
[detail]  
[detail]  int TargetAdd::execute()
[detail]  {
[detail] @@ -162,7 +186,9 @@
[detail]  void TargetAdd::readCurves(QList<ModalCurve>& curves, QTextStream& s)
[detail]  {
[detail]    ModalCurve curve;
[detail] -  curve.addMode(_mode);
[detail] +  for(int i=0; i<_modes.count(); i++) {
[detail] +    curve.addMode(_modes.at(i));
[detail] +  }
[detail]    FactoryPoint p;
[detail]    QString buf;
[detail]    CoreApplication::instance()->debugUserInterrupts(false);
[detail]                    src/TargetExtract.cpp:  version-1.0.4	not modified
[detail]                      src/TargetMerge.cpp:  version-1.0.4	not modified
[detail]                             src/main.cpp:  version-1.0.4	modified out of comments
[detail] --- src/main.cpp-version-1.0.4-stripped	2025-09-28 04:01:30.003623815 +0200
[detail] +++ src/main.cpp-HEAD-stripped	2025-09-28 04:01:30.007623835 +0200
[detail] @@ -95,19 +95,23 @@
[detail]    h->addOption("S","Split a 2D target in various 1D targets");
[detail]    h->addGroup("Add", "add");
[detail]    h->addOption("-dispersion-rayleigh <INDEX>","Adds dispersion curves read from stdin as Rayleigh with "
[detail] -                                              "mode INDEX (0 is fundamental). Format: frequency(Hz) "
[detail] +                                              "mode INDEX (0 is fundamental). If INDEX is a list delimited with comas,"
[detail] +                                              "Several modes are associated with the curve. Format: frequency(Hz) "
[detail]                                                "slowness(s/m) log stddev [weight(0 for invalid)]. "
[detail]                                                "Blanks or lines starting with '#' delimit various curves.");
[detail]    h->addOption("-ellipticity <INDEX>","Adds ellipticity curves read from stdin as signed with "
[detail] -                                              "mode INDEX (0 is fundamental). Format: frequency(Hz) "
[detail] +                                              "mode INDEX (0 is fundamental). If INDEX is a list delimited with comas,"
[detail] +                                       "Several modes are associated with the curve. Format: frequency(Hz) "
[detail]                                                "Ellipticity(deg) stddev(deg) [weight(0 for invalid)]. "
[detail]                                                "Blanks or lines starting with '#' delimit various curves.");
[detail]    h->addOption("-abs-ellipticity <INDEX>","Adds ellipticity curves read from stdin as absolute values with "
[detail] -                                              "mode INDEX (0 is fundamental). Format: frequency(Hz) "
[detail] +                                              "mode INDEX (0 is fundamental). If INDEX is a list delimited with comas,"
[detail] +                                           "Several modes are associated with the curve. Format: frequency(Hz) "
[detail]                                                "Ellipticity(deg) stddev(deg) [weight(0 for invalid)]. "
[detail]                                                "Blanks or lines starting with '#' delimit various curves.");
[detail]    h->addOption("-dispersion-love <INDEX>","Adds dispersion curves read from stdin as Love with mode "
[detail] -                                          "mode INDEX (0 is fundamental). Format: frequency(Hz) "
[detail] +                                          "mode INDEX (0 is fundamental). If INDEX is a list delimited with comas,"
[detail] +                                           "Several modes are associated with the curve. Format: frequency(Hz) "
[detail]                                            "slowness(s/m) log stddev [weight(0 for invalid)]. "
[detail]                                            "Blanks or lines starting with '#' delimit various curves.");
[detail]    h->addOption("-group","Set Group slowness (default is Phase).");
[detail]                     src/AbstractTarget.h:  version-1.0.4	not modified
[detail]                          src/TargetAdd.h:  version-1.0.4	modified out of comments
[detail] --- src/TargetAdd.h-version-1.0.4-stripped	2025-09-28 04:01:30.039623989 +0200
[detail] +++ src/TargetAdd.h-HEAD-stripped	2025-09-28 04:01:30.047624028 +0200
[detail] @@ -18,6 +18,7 @@
[detail]    virtual bool setOptions(int& argc, char ** argv);
[detail]    virtual int execute();
[detail]  private:
[detail] +  bool addModes(Mode m, const QString& index);
[detail]    void readCurves(QList<ModalCurve>& curves, QTextStream& s);
[detail]    void readCurves(QList<MagnetoTelluricCurve>& curves, QTextStream& s);
[detail]  
[detail] @@ -25,7 +26,7 @@
[detail]               Dispersion, Autocorr, EllipticityCurve, EllipticityPeak,
[detail]               RefractionVp, RefractionVs, MagnetoTelluric};
[detail]    Type _type;
[detail] -  Mode _mode;
[detail] +  QList<Mode> _modes;
[detail]    Point * _position;
[detail]    double _weight, _minimumMisfit;
[detail]  };
[detail]                      src/TargetExtract.h:  version-1.0.4	not modified
[detail]                        src/TargetMerge.h:  version-1.0.4	not modified
[summary] Total differences: 139 lines
[summary] Modification level is C
OLD_DIR=$(pwd)
echo "gptarget"
cd $(find . -name "gptarget" | tail -n 1) || exit 2
pwd
dpversion C  || exit 2
cd $OLD_DIR || exit 2
################## gpviewdcreport
[detail]                             src/main.cpp:  version-1.0.3	not modified
# No modification since last version
################## gpdcmisfit
[detail]                             src/main.cpp:  version-1.0.2	modified out of comments
[detail] --- src/main.cpp-version-1.0.2-stripped	2025-09-28 04:01:30.167624608 +0200
[detail] +++ src/main.cpp-HEAD-stripped	2025-09-28 04:01:30.171624628 +0200
[detail] @@ -81,7 +81,7 @@
[detail]    targets->refractionVpTarget().setSelected(false);
[detail]    targets->refractionVsTarget().setSelected(false);
[detail]    targets->magnetoTelluricTarget().setSelected(false);
[detail] -  Misfit::Type misfitType=Misfit::L2_Normalized;
[detail] +  MisfitType::Type misfitType=MisfitType::L2_Normalized;
[detail]    bool forceMisfitType=false;
[detail]  
[detail]    
[detail] @@ -98,19 +98,19 @@
[detail]        } else if(arg=="-refra-model") {
[detail]          mode=RefractionModel;
[detail]        } else if(arg=="-l1") {
[detail] -        misfitType=Misfit::L1_Normalized;
[detail] +        misfitType=MisfitType::L1_Normalized;
[detail]          forceMisfitType=true;
[detail]        } else if(arg=="-l2") {
[detail] -        misfitType=Misfit::L2_Normalized;
[detail] +        misfitType=MisfitType::L2_Normalized;
[detail]          forceMisfitType=true;
[detail]        } else if(arg=="-akaike") {
[detail]          CoreApplication::checkOptionArg(i, argc, argv);
[detail] -        misfitType=Misfit::Akaike;
[detail] +        misfitType=MisfitType::Akaike;
[detail]          akaikeDof=CoreApplication::toInt(i, i-1, argv);
[detail]          forceMisfitType=true;
[detail]        } else if(arg=="-akaike-few") {
[detail]          CoreApplication::checkOptionArg(i, argc, argv);
[detail] -        misfitType=Misfit::AkaikeFewSamples;
[detail] +        misfitType=MisfitType::AkaikeFewSamples;
[detail]          akaikeDof=CoreApplication::toInt(i, i-1, argv);
[detail]          forceMisfitType=true;
[detail]        } else if(arg=="-o") {
[detail] @@ -423,7 +423,7 @@
[detail]      if(!m.fromStream(s, &comments)) {
[detail]        break;
[detail]      }
[detail] -    if(m.layerCount()>0) {
[detail] +    if(m.numberOfLayers()>0) {
[detail]        double totalMisfit=0.0;
[detail]        double totalWeight=0.0;
[detail]        bool ok=true;
[summary] Total differences: 44 lines
[summary] Modification level is C
OLD_DIR=$(pwd)
echo "gpdcmisfit"
cd $(find . -name "gpdcmisfit" | tail -n 1) || exit 2
pwd
dpversion C  || exit 2
cd $OLD_DIR || exit 2
################## gpell
[detail]                src/EllipticityReader.cpp:  version-1.0.4	modified out of comments
[detail] --- src/EllipticityReader.cpp-version-1.0.4-stripped	2025-09-28 04:01:30.219624859 +0200
[detail] +++ src/EllipticityReader.cpp-HEAD-stripped	2025-09-28 04:01:30.223624879 +0200
[detail] @@ -165,7 +165,7 @@
[detail]    if(!m.fromStream(s, &comments)) {
[detail]      return false;
[detail]    }
[detail] -  if(m.layerCount()>0) {
[detail] +  if(m.numberOfLayers()>0) {
[detail]      if(_nRayleigh>0) {
[detail]        Rayleigh rayleigh(&m);
[detail]        Dispersion dispersion (_nRayleigh, &_x);
[detail]                             src/main.cpp:  version-1.0.4	not modified
[detail]                  src/EllipticityReader.h:  version-1.0.4	not modified
[summary] Total differences: 11 lines
[summary] Modification level is C
OLD_DIR=$(pwd)
echo "gpell"
cd $(find . -name "gpell" | tail -n 1) || exit 2
pwd
dpversion C  || exit 2
cd $OLD_DIR || exit 2
################## gpgroup2phase
[detail]                src/Group2PhaseReader.cpp:  version-1.0.2	not modified
[detail]                             src/main.cpp:  version-1.0.2	not modified
[detail]                  src/Group2PhaseReader.h:  version-1.0.2	not modified
# No modification since last version
################## gpmodel2param
[detail]                src/Model2ParamReader.cpp:  version-1.0.2	modified out of comments
[detail] --- src/Model2ParamReader.cpp-version-1.0.2-stripped	2025-09-28 04:01:30.379625633 +0200
[detail] +++ src/Model2ParamReader.cpp-HEAD-stripped	2025-09-28 04:01:30.383625652 +0200
[detail] @@ -54,7 +54,7 @@
[detail]    if(!m.fromStream(s, &comments)) {
[detail]      return false;
[detail]    }
[detail] -  if(m.layerCount()>0) {
[detail] +  if(m.numberOfLayers()>0) {
[detail]      QFileInfo fi(_outputParam);
[detail]      if(fi.exists()) {
[detail]        App::log(tr("File %1 already exists.\n").arg(_outputParam) );
[detail]                             src/main.cpp:  version-1.0.2	not modified
[detail]                  src/Model2ParamReader.h:  version-1.0.2	not modified
[summary] Total differences: 11 lines
[summary] Modification level is C
OLD_DIR=$(pwd)
echo "gpmodel2param"
cd $(find . -name "gpmodel2param" | tail -n 1) || exit 2
pwd
dpversion C  || exit 2
cd $OLD_DIR || exit 2
################## gpparam2model
[detail]                   src/ModelGenerator.cpp:  version-1.0.2	not modified
[detail]                             src/main.cpp:  version-1.0.2	not modified
[detail]                     src/ModelGenerator.h:  version-1.0.2	not modified
# No modification since last version
################## gpdepths
[detail]                src/DepthDistribution.cpp:  version-1.0.2	not modified
[detail]                             src/main.cpp:  version-1.0.2	not modified
[detail]                  src/DepthDistribution.h:  version-1.0.2	not modified
# No modification since last version
################## gpsort
[detail]                             src/main.cpp:  version-1.0.1	not modified
# No modification since last version
################## gpcurve
[detail]                      src/CurveReader.cpp:  version-1.0.4	modified out of comments
[detail] --- src/CurveReader.cpp-version-1.0.4-stripped	2025-09-28 04:01:30.659626986 +0200
[detail] +++ src/CurveReader.cpp-HEAD-stripped	2025-09-28 04:01:30.663627005 +0200
[detail] @@ -1,7 +1,7 @@
[detail]  
[detail]  
[detail] -#include <QGpCoreTools.h>
[detail]  #include <QJSEngine>
[detail] +#include <QGpCoreTools.h>
[detail]  
[detail]  #include "CurveReader.h"
[detail]  
[detail] @@ -22,7 +22,7 @@
[detail]    _xValue=0.0;
[detail]    _columnIndex=1;
[detail]    _samplingType=LinearScale;
[detail] -  _misfitType=Misfit::L2_Normalized;
[detail] +  _misfitType=MisfitType::L2_Normalized;
[detail]    _misfitMin=0.0;
[detail]    _misfitDof=1;
[detail]    _logBase=10.0;
[detail] @@ -121,6 +121,10 @@
[detail]          _mode=StddevInf;
[detail]        } else if(arg=="-stddev-sup") {
[detail]          _mode=StddevSup;
[detail] +      } else if(arg=="-combine-stat") {
[detail] +        _mode=CombineStatistics;
[detail] +      } else if(arg=="-combine-log-stat") {
[detail] +        _mode=CombineLogStatistics;
[detail]        } else if(arg=="-misfit") {
[detail]          CoreApplication::checkOptionArg(i, argc, argv);
[detail]          _mode=Misfit;
[detail] @@ -222,7 +226,7 @@
[detail]          CoreApplication::checkOptionArg(i, argc, argv);
[detail]          QString t(argv[i]);
[detail]          bool ok=true;
[detail] -        _misfitType=Misfit::convertType(t, ok);
[detail] +        _misfitType=MisfitType::convertType(t, ok);
[detail]          if(!ok) {
[detail]            App::log(tr("gpcurve: bad misfit type '%1'\n").arg(argv[i]));
[detail]            return false;
[detail] @@ -280,6 +284,8 @@
[detail]            App::log(tr("gpcurve: bad sampling type (%1), see -help\n").arg(argv[i]) );
[detail]            return false;
[detail]          }
[detail] +      } else if(arg=="-nudft") {
[detail] +        _mode=NonUniformDFT;
[detail]        } else {
[detail]          App::log(tr("gpcurve: bad option %1, see -help\n").arg(argv[i]) );
[detail]          return false;
[detail] @@ -314,13 +320,13 @@
[detail]    TRACE;
[detail]    QTextStream sOut(stdout);
[detail]    Curve<PointND> curve;
[detail] -  QString comments;
[detail] -  while(curve.fromStream(s, &comments)) {
[detail] +  QString comments, nextComments;
[detail] +  while(curve.fromStream(s, &comments, &nextComments)) {
[detail]      sOut << comments << Qt::flush;
[detail]      if(!exec(curve)) {
[detail]        return false;
[detail]      }
[detail] -    comments.clear();
[detail] +    comments=nextComments;
[detail]    }
[detail]    sOut << comments << Qt::flush;
[detail]    return exec(curve);
[detail] @@ -363,7 +369,7 @@
[detail]      break;
[detail]    case ResampleExtrapole:
[detail]      curve.resample(_nResample, _minX, _maxX, _samplingType);
[detail] -    sOut << curve.toString();
[detail] +    sOut << curve.toString('g', 20);
[detail]      break;
[detail]    case Resample: {
[detail]        
[detail] @@ -379,7 +385,7 @@
[detail]      break;
[detail]    case Cut:
[detail]      curve.cut(_minX, _maxX, LinearScale);
[detail] -    sOut << curve.toString();
[detail] +    sOut << curve.toString('g', 20);
[detail]      break;
[detail]    case Smooth: {
[detail]        SamplingParameters s;
[detail] @@ -403,16 +409,21 @@
[detail]        p.setScaleType(SamplingParameters::Log);        
[detail]        p.windowFunction().setShape(WindowFunctionParameters::Cosine);  
[detail]        curve.smooth(s, p, &pointOptions);              
[detail] -      sOut << curve.toString();
[detail] +      sOut << curve.toString('g', 20);
[detail]      }
[detail]      break;
[detail]    case CutInterpole:
[detail]      curve.cut(_minX, _maxX, Interpole);
[detail] -    sOut << curve.toString();
[detail] +    sOut << curve.toString('g', 20);
[detail]      break;
[detail]    case Swap:
[detail]      curve.swapXY(&pointOptions);
[detail] -    sOut << curve.toString();
[detail] +    sOut << curve.toString('g', 20);
[detail] +    break;
[detail] +  case NonUniformDFT: {
[detail] +      NonUniformFourierTranform dft;
[detail] +      sOut << dft.amplitudeSpectrum(curve, &pointOptions).toString('g', 20);
[detail] +    }
[detail]      break;
[detail]    case MinIndex:
[detail]      sOut << curve.minimumY(0, &pointOptions) << "\n";
[detail] @@ -610,31 +621,48 @@
[detail]        }
[detail]      }
[detail]      break;
[detail] +  case CombineStatistics:
[detail] +    if(_combineCurve.isEmpty()) {
[detail] +      _combineCurve=convertToStatistical(curve);
[detail] +    } else {
[detail] +      _combineCurve.average(convertToStatistical(curve));
[detail] +    }
[detail] +    break;
[detail] +  case CombineLogStatistics:
[detail] +    if(_combineCurve.isEmpty()) {
[detail] +      _combineCurve=convertToStatistical(curve);
[detail] +      _combineCurve.yLog();
[detail] +    } else {
[detail] +      Curve<RealStatisticalPoint> sc=convertToStatistical(curve);
[detail] +      sc.yLog();
[detail] +      _combineCurve.average(sc);
[detail] +    }
[detail] +    break;
[detail]    case Derivative:
[detail] +    curve.sort();
[detail]      if(curve.count()<3) {
[detail]        App::log(tr("At least 3 samples per curve are required to calculate derivative\n") );
[detail]        return false;
[detail]      } else {
[detail] -      curve.sort();
[detail] -      sOut << curve.derivative(&pointOptions).toString();
[detail] +      sOut << curve.derivative(&pointOptions).toString('g', 20);
[detail]      }
[detail]      break;
[detail]    case Curvature:
[detail] +    curve.sort();
[detail]      if(curve.count()<3) {
[detail]        App::log(tr("At least 3 samples per curve are required to calculate curvature\n") );
[detail]        return false;
[detail]      } else {
[detail] -      curve.sort();
[detail] -      sOut << curve.curvature(&pointOptions).toString();
[detail] +      sOut << curve.curvature(&pointOptions).toString('g', 20);
[detail]      }
[detail]      break;
[detail]    case Angles:
[detail] +    curve.sort();
[detail]      if(curve.count()<2) {
[detail]        App::log(tr("At least 3 samples per curve are required to calculate curvature\n") );
[detail]        return false;
[detail]      } else {
[detail] -      curve.sort();
[detail] -      sOut << curve.angles(&pointOptions).toString();
[detail] +      sOut << curve.angles(&pointOptions).toString('g', 20);
[detail]      }
[detail]      break;
[detail]    case Regression:
[detail] @@ -662,57 +690,58 @@
[detail]          sum += sv.misfit(nValues, nData, v, _misfitType, _misfitMin);
[detail]        }
[detail]        switch(_misfitType) {
[detail] -      case Misfit::L1:
[detail] -      case Misfit::L1_Normalized:
[detail] -      case Misfit::L1_LogNormalized:
[detail] -      case Misfit::L1_NormalizedBySigmaOnly:
[detail] +      case MisfitType::L1:
[detail] +      case MisfitType::L1_Normalized:
[detail] +      case MisfitType::L1_LogNormalized:
[detail] +      case MisfitType::L1_NormalizedBySigmaOnly:
[detail]          sOut << sum/curve.count() << "\n";
[detail]          break;
[detail] -      case Misfit::RMS:
[detail] +      case MisfitType::RMS:
[detail]          sOut << sqrt(sum/curve.count()) << "\n";
[detail]          break;
[detail] -      case Misfit::L2:
[detail] -      case Misfit::L2_Inverse:
[detail] -      case Misfit::L2_Normalized:
[detail] -      case Misfit::L2_LogNormalized:
[detail] -      case Misfit::L2_NormalizedBySigmaOnly:
[detail] +      case MisfitType::L2:
[detail] +      case MisfitType::L2_Inverse:
[detail] +      case MisfitType::L2_Normalized:
[detail] +      case MisfitType::L2_LogNormalized:
[detail] +      case MisfitType::L2_NormalizedBySigmaOnly:
[detail] +      case MisfitType::L2_PeriodicNormalized:
[detail]          sOut << sqrt(sum) << "\n";
[detail]          break;
[detail] -      case Misfit::Akaike:
[detail] +      case MisfitType::Akaike:
[detail]          sOut << curve.count()*log(sqrt(sum/curve.count()))+2.0*_misfitDof << "\n";
[detail]          break;
[detail] -      case Misfit::AkaikeFewSamples:
[detail] +      case MisfitType::AkaikeFewSamples:
[detail]          sOut << curve.count()*log(sqrt(sum/curve.count()))
[detail]                 +2.0*_misfitDof+(2.0*_misfitDof*(_misfitDof+1.0))/(curve.count()-_misfitDof-1.0) << "\n";
[detail]          break;
[detail] -      case Misfit::Determinant:
[detail] -      case Misfit::TypeCount:
[detail] +      case MisfitType::Determinant:
[detail] +      case MisfitType::TypeCount:
[detail]          ASSERT(false);
[detail]        }
[detail]      }
[detail]      break;
[detail]    case Multiply:
[detail]      curve.yMultiply(_multiplyFactor, &pointOptions);
[detail] -    sOut << curve.toString();
[detail] +    sOut << curve.toString('g', 20);
[detail]      break;
[detail]    case Log:
[detail]      curve.yLog(&pointOptions);
[detail]      if(_logBase!=::exp(1.0)) {
[detail]        curve.yMultiply(1.0/::log(_logBase), &pointOptions);
[detail]      }
[detail] -    sOut << curve.toString();
[detail] +    sOut << curve.toString('g', 20);
[detail]      break;
[detail]    case Power:
[detail]      if(_logBase!=::exp(1.0)) {
[detail]        curve.yMultiply(::log(_logBase), &pointOptions);
[detail]      }
[detail]      curve.yExp(&pointOptions);
[detail] -    sOut << curve.toString();
[detail] +    sOut << curve.toString('g', 20);
[detail]      break;
[detail]    case Extrapolate:
[detail]      curve.extrapolateFromStart(_nResample, false, _samplingType, &pointOptions);
[detail]      curve.extrapolateFromEnd(_nResample, false, _samplingType, &pointOptions);
[detail] -    sOut << curve.toString();
[detail] +    sOut << curve.toString('g', 20);
[detail]      break;
[detail]    }
[detail]    sOut << Qt::flush;
[detail] @@ -760,14 +789,14 @@
[detail]    switch(_mode) {
[detail]    case MinMax:
[detail]      sOut << "# Min\n"
[detail] -         << _minCurve.toString()
[detail] +         << _minCurve.toString('g', 20)
[detail]           << "# Max\n"
[detail] -         << _maxCurve.toString();
[detail] +         << _maxCurve.toString('g', 20);
[detail]      break;
[detail]    case Mean:
[detail]      _minCurve.yMultiply(1.0/static_cast<double>(_curveCount));
[detail]      sOut << "# Mean\n"
[detail] -         << _minCurve.toString();
[detail] +         << _minCurve.toString('g', 20);
[detail]      break;
[detail]    case Stddev: {
[detail]        _minCurve.yMultiply(_minCurve);
[detail] @@ -776,7 +805,7 @@
[detail]        _maxCurve.yMultiply(1.0/static_cast<double>(_curveCount-1));
[detail]        _maxCurve.ySqrt();
[detail]        sOut << "# Stddev\n"
[detail] -           << _maxCurve.toString();
[detail] +           << _maxCurve.toString('g', 20);
[detail]      }
[detail]      break;
[detail]    case StddevInf: {
[detail] @@ -788,7 +817,7 @@
[detail]        _maxCurve.ySqrt();
[detail]        curve.ySubtract(_maxCurve);
[detail]        sOut << "# Stddev inf\n"
[detail] -           << curve.toString();
[detail] +           << curve.toString('g', 20);
[detail]      }
[detail]      break;
[detail]    case StddevSup: {
[detail] @@ -801,9 +830,16 @@
[detail]        _maxCurve.ySqrt();
[detail]        curve.ySum(_maxCurve);
[detail]        sOut << "# Stddev sup\n"
[detail] -           << curve.toString();
[detail] +           << curve.toString('g', 20);
[detail]      }
[detail]      break;
[detail] +  case CombineStatistics:
[detail] +    sOut << _combineCurve.toString('g', 20);
[detail] +    break;
[detail] +  case CombineLogStatistics:
[detail] +    _combineCurve.yExp();
[detail] +    sOut << _combineCurve.toString('g', 20);
[detail] +    break;
[detail]    default:
[detail]      break;
[detail]    }
[detail] @@ -883,3 +919,19 @@
[detail]    }
[detail]    return true;
[detail]  }
[detail] +
[detail] +Curve<RealStatisticalPoint> CurveReader::convertToStatistical(const Curve<PointND>& curve) const
[detail] +{
[detail] +  int n=curve.count();
[detail] +  Curve<RealStatisticalPoint> sc(n);
[detail] +  for(int i=0; i<n; i++) {
[detail] +    const PointND& p=curve.constAt(i);
[detail] +    RealStatisticalPoint& sp=sc.at(i);
[detail] +    sp.setX(p.x());
[detail] +    sp.setMean(p.y(0));
[detail] +    sp.setStddev(p.y(1));
[detail] +    sp.setWeight(p.y(2));
[detail] +  }
[detail] +  sc.sort();
[detail] +  return sc;
[detail] +}
[detail]                             src/main.cpp:  version-1.0.4	modified out of comments
[detail] --- src/main.cpp-version-1.0.4-stripped	2025-09-28 04:01:30.683627101 +0200
[detail] +++ src/main.cpp-HEAD-stripped	2025-09-28 04:01:30.687627121 +0200
[detail] @@ -61,6 +61,10 @@
[detail]    h->addOption("-stddev", "Output standard deviation curve of all input curves which must have the same sampling.");
[detail]    h->addOption("-stddev-inf", "Output mean minus one standard deviation of all input curves which must have the same sampling.");
[detail]    h->addOption("-stddev-sup", "Output mean plus one standard deviation of all input curves which must have the same sampling.");
[detail] +  h->addOption("-combine-stat", "Combine various statistical curves provided through the stdin. "
[detail] +                                "Input curves must all have the same number of samples with 4 columns: x mean stddev weight.");
[detail] +  h->addOption("-combine-log-stat", "Same as -combine-stat except that arithmetic average is performed on a log scale. "
[detail] +                                    "stddev is the geometric standard deviation (>1).");
[detail]    h->addGroup("Single-column operations", "single");
[detail]    h->addOption("-column <COL>", "Set column COL as Y affected by the following options (default=1).");
[detail]    h->addOption("-swap", "Swap x and y.");
[detail] @@ -82,6 +86,7 @@
[detail]    h->addOption("-pow <BASE>", "Takes power of Y values with base BASE.");
[detail]    h->addOption("-log <BASE>", "Takes log of Y values with base BASE.");
[detail]    h->addOption("-extrapolate <N>", "Add N samples at the beginning and at the end extrapolation from least square regression on N first and last samples.");
[detail] +  h->addOption("-nudft", "Non uniform DFT of the input X Y signal.");
[detail]    h->addGroup("Function mode", "function");
[detail]    h->addOption("-cubic-spline x0 y0 x1 y1 ...", "Builds a cubic spline passing by the knots (x0, y0), (x1, y1),...");
[detail]    h->addOption("-b-spline N, x0 y0 x1 y1 ...", "Builds a B-spline of degree N and control points (x0, y0), (x1, y1),...");
[detail] @@ -99,8 +104,8 @@
[detail]    h->addOption("-dy <DY>", "Sample function with DY step, starting from MIN to MAX.");
[detail]    h->addExample("gpcurve -function \"(-100.378*x+1.3236e+11)\" -min 1318609364 -max 1318609395", "Computes expression from min to max with default step.");
[detail]    h->addGroup("Resample mode", "resample");
[detail] -  h->addOption("-min <MIN>", "Minimum X value (default=-inf)");
[detail] -  h->addOption("-max <MAX>", "Maximum X value (default=inf)");
[detail] +  h->addOption("-min-x <MIN>", "Minimum X value (default=-std::numeric_limits<double>::infinity())");
[detail] +  h->addOption("-max-x <MAX>", "Maximum X value (default=std::numeric_limits<double>::infinity())");
[detail]    h->addOption("-sampling <TYPE>","Defines the sampling type:\n"
[detail]                                "  inverse    regular sampling in 1/X\n"
[detail]                                "  linear     regular sampling in linear(X) (default)\n"
[detail]                        src/CurveReader.h:  version-1.0.4	modified out of comments
[detail] --- src/CurveReader.h-version-1.0.4-stripped	2025-09-28 04:01:30.703627199 +0200
[detail] +++ src/CurveReader.h-HEAD-stripped	2025-09-28 04:01:30.707627218 +0200
[detail] @@ -21,13 +21,15 @@
[detail]  private:
[detail]    bool exec(Curve<PointND>& curve);
[detail]    bool loadReference();
[detail] +  Curve<RealStatisticalPoint> convertToStatistical(const Curve<PointND>& curve) const;
[detail]  
[detail]    enum Mode {None, Resample, ResampleExtrapole, Cut, CutInterpole, Swap, Regression, FunctionValue,
[detail]               MaxIndex, MaxValue, MinIndex, MinValue, LocalMax, LocalMaxIndex, LocalMaxValue,
[detail] -             LocalMin, LocalMinIndex, LocalMinValue,
[detail] +             LocalMin, LocalMinIndex, LocalMinValue, NonUniformDFT,
[detail]               Misfit, MergeReplace, MergeInterpolate, Split, ParseFunction1D, ParseFunction2D, Derivative, Curvature, Angles,
[detail]               Multiply, Log, Power, MinMax, Mean, Stddev, StddevSup, StddevInf, Extrapolate, Smooth,
[detail] -             CubicSplineMode, BSplineMode};
[detail] +             CubicSplineMode, BSplineMode,
[detail] +             CombineStatistics, CombineLogStatistics};
[detail]    Mode _mode;
[detail]    int _nResample;
[detail]    double _minX, _maxX, _minY, _maxY, _dx, _dy;
[detail] @@ -39,13 +41,14 @@
[detail]    SamplingOption _samplingType;
[detail]    QString _referenceFile;
[detail]    Curve<PointND> _referenceCurve;
[detail] -  Misfit::Type _misfitType;
[detail] +  MisfitType::Type _misfitType;
[detail]    double _misfitMin;
[detail]    int _misfitDof;
[detail]    QString _functionText;
[detail]    double _logBase;
[detail]    double _multiplyFactor;
[detail]    Curve<PointND> _minCurve, _maxCurve;
[detail] +  Curve<RealStatisticalPoint> _combineCurve;
[detail]    int _curveCount;
[detail]    CubicSpline * _cubicSpline;
[detail]    BSpline * _bSpline;
[summary] Total differences: 383 lines
[summary] Modification level is C
OLD_DIR=$(pwd)
echo "gpcurve"
cd $(find . -name "gpcurve" | tail -n 1) || exit 2
pwd
dpversion C  || exit 2
cd $OLD_DIR || exit 2
################## gprandom
[detail]                             src/main.cpp:  version-1.0.2	not modified
# No modification since last version
################## gpspac
[detail]                       src/SpacReader.cpp:  version-1.0.3	modified out of comments
[detail] --- src/SpacReader.cpp-version-1.0.3-stripped	2025-09-28 04:01:30.811627720 +0200
[detail] +++ src/SpacReader.cpp-HEAD-stripped	2025-09-28 04:01:30.815627740 +0200
[detail] @@ -195,7 +195,7 @@
[detail]        if(!m.fromStream(s, &comments)) {
[detail]          return false;
[detail]        }
[detail] -      if(m.layerCount()==0) {
[detail] +      if(m.numberOfLayers()==0) {
[detail]          return true;
[detail]        }
[detail]        sOut << comments;
[detail]                             src/main.cpp:  version-1.0.3	not modified
[detail]                         src/SpacReader.h:  version-1.0.3	not modified
[summary] Total differences: 11 lines
[summary] Modification level is C
OLD_DIR=$(pwd)
echo "gpspac"
cd $(find . -name "gpspac" | tail -n 1) || exit 2
pwd
dpversion C  || exit 2
cd $OLD_DIR || exit 2
################## gprefra
[detail]                      src/RefraReader.cpp:  version-1.0.2	not modified
[detail]                             src/main.cpp:  version-1.0.2	not modified
[detail]                        src/RefraReader.h:  version-1.0.2	not modified
# No modification since last version
################## gpsignal
[detail]                     src/SignalReader.cpp:  version-2.0.4	not modified
[detail]                             src/main.cpp:  version-2.0.4	not modified
[detail]                       src/SignalReader.h:  version-2.0.4	not modified
# No modification since last version
################## gphistogram
[detail]            src/GaussianMixtureOutput.cpp:  version-1.2.3	not modified
[detail]                  src/HistogramWidget.cpp:  version-1.2.3	modified out of comments
[detail] --- src/HistogramWidget.cpp-version-1.2.3-stripped	2025-09-28 04:01:31.067628957 +0200
[detail] +++ src/HistogramWidget.cpp-HEAD-stripped	2025-09-28 04:01:31.071628977 +0200
[detail] @@ -44,7 +44,7 @@
[detail]    _histogramLayer->setSmooth(false); 
[detail]                                       
[detail]    ColorMap map;
[detail] -  map.generate(0, 19, ColorPalette::defaultSequentialWhite, ColorPalette::Reversed);
[detail] +  map.generate(0, 19, 1, ColorPalette::defaultSequentialWhite, ColorPalette::Reversed);
[detail]    map.setWhiteTransparent(true);
[detail]    _histogramLayer->setColorMap(map);
[detail]    LineLayer * curveLayer=new LineLayer(w);
[detail] @@ -111,7 +111,7 @@
[detail]    _densityHistogramLayer=new HistogramLayer(w);
[detail]    _densityHistogramLayer->setObjectName("DensityHistogram");
[detail]    _densityHistogramLayer->setReferenceLine(new PlotLine2D);
[detail] -  _densityHistogramLayer->addLine(Pen(Qt::blue), Symbol(Symbol::NoSymbol, 1.0, Pen(Qt::NoPen), QColor(152, 152, 255)));
[detail] +  _densityHistogramLayer->addLine(Pen(Qt::blue), Symbol(Symbol::NoSymbol, 1.0, Pen(Pen::NoLine), QColor(152, 152, 255)));
[detail]    _densityCurveLayer=new LineLayer(w);
[detail]    _densityCurveLayer->setObjectName("DensityCurve");
[detail]    _densityCurveLayer->setReferenceLine(new PlotLine2D);
[detail] @@ -238,7 +238,7 @@
[detail]    if(_normalize) {
[detail]      pal.setValues(0.0001*m, m, SamplingParameters::Log);
[detail]    } else {
[detail] -    pal.generate(0, qRound(m), ColorPalette::defaultSequential, ColorPalette::Reversed);
[detail] +    pal.generate(0, qRound(m), 1, ColorPalette::defaultSequential, ColorPalette::Reversed);
[detail]      pal.setValues(0.5, m-0.5, SamplingParameters::Linear);
[detail]    }
[detail]    _histogramLayer->setColorMap(pal);
[detail] @@ -623,7 +623,7 @@
[detail]    addCurve(Curve<RealStatisticalPoint>());
[detail]    _gaussianMixtureCurve=curves->curves().last();
[detail]    _gaussianMixtureCurve->setEditable(false);
[detail] -  _gaussianMixtureCurve->line()->setPen(Pen(Qt::NoPen));
[detail] +  _gaussianMixtureCurve->line()->setPen(Pen(Pen::NoLine));
[detail]    _gaussianMixtureCurve->line()->setSymbol(Symbol(Symbol::Circle, 1.2, Pen::SolidLine, Qt::SolidPattern));
[detail]    _gaussianMixtureInversion.start(xScroll->value());
[detail]  }
[detail] @@ -634,7 +634,7 @@
[detail]    addCurve(Curve<RealStatisticalPoint>());
[detail]    _gaussianMixtureCurve=curves->curves().last();
[detail]    _gaussianMixtureCurve->setEditable(false);
[detail] -  _gaussianMixtureCurve->line()->setPen(Pen(Qt::NoPen));
[detail] +  _gaussianMixtureCurve->line()->setPen(Pen(Pen::NoLine));
[detail]    _gaussianMixtureCurve->line()->setSymbol(Symbol(Symbol::Circle, 1.2, Pen::SolidLine, Qt::SolidPattern));
[detail]    _gaussianMixtureInversion.start();
[detail]  }
[detail] @@ -677,7 +677,7 @@
[detail]    addCurve(Curve<RealStatisticalPoint>());
[detail]    CurvePropertiesWidget * prop=curves->curves().last();
[detail]    RealStatisticalLine * line=static_cast<RealStatisticalLine *>(prop->line());
[detail] -  line->setPen(Pen(Qt::NoPen));
[detail] +  line->setPen(Pen(Pen::NoLine));
[detail]    line->setSymbol(Symbol(Symbol::Circle, 1.2, Pen::SolidLine, Qt::SolidPattern));
[detail]    prop->beginCurveChange();
[detail]    line->setCurve(_hist->pickAll(4, 0.1, 0.2));
[detail]                             src/main.cpp:  version-1.2.3	not modified
[detail]              src/GaussianMixtureOutput.h:  version-1.2.3	not modified
[detail]                    src/HistogramWidget.h:  version-1.2.3	not modified
[detail]                   src/HistogramWidget.ui:  version-1.2.3	not modified
[summary] Total differences: 56 lines
[summary] Modification level is C
OLD_DIR=$(pwd)
echo "gphistogram"
cd $(find . -name "gphistogram" | tail -n 1) || exit 2
pwd
dpversion C  || exit 2
cd $OLD_DIR || exit 2
################## gpviewmax
[detail]                 src/AzimuthPlotProxy.cpp:  version-1.2.0	not modified
[detail]                     src/AzimuthProxy.cpp:  version-1.2.0	not modified
[detail]         src/ClassificationParameters.cpp:  version-1.2.0	not modified
[detail]                  src/DeltaNoiseProxy.cpp:  version-1.2.0	not modified
[detail]                 src/HistogramsWidget.cpp:  version-1.2.0	not modified
[detail]             src/HorizontalNoiseProxy.cpp:  version-1.2.0	not modified
[detail]                  src/MaxCurveBrowser.cpp:  version-1.2.0	not modified
[detail]                      src/ModeWidgets.cpp:  version-1.2.0	modified out of comments
[detail] --- src/ModeWidgets.cpp-version-1.2.0-stripped	2025-09-28 04:01:31.291630040 +0200
[detail] +++ src/ModeWidgets.cpp-HEAD-stripped	2025-09-28 04:01:31.299630079 +0200
[detail] @@ -118,7 +118,7 @@
[detail]  {
[detail]    layer->clear();
[detail]    Curve<RealStatisticalPoint> all=hist->pickAll(4, 0.1, 0.2);
[detail] -  layer->addLine(Pen(Qt::NoPen), Symbol(Symbol::Circle, 0.5, Pen(Qt::red), Brush(Qt::SolidPattern)));
[detail] +  layer->addLine(Pen(Pen::NoLine), Symbol(Symbol::Circle, 0.5, Pen(Qt::red), Brush(Qt::SolidPattern)));
[detail]    static_cast<RealStatisticalLine *>(layer->line(0))->curve()=all;
[detail]  
[detail]    QList<Curve<RealStatisticalPoint>> curves=all.split(1.2, LogScale, 0.1, 5);
[detail] @@ -134,7 +134,7 @@
[detail]  {
[detail]    layer->clear();
[detail]    Curve<RealStatisticalPoint> all=hist->pickAll(3, 5.0, 10.0); 
[detail] -  layer->addLine(Pen(Qt::NoPen), Symbol(Symbol::Circle, 0.5, Pen(Qt::red), Brush(Qt::SolidPattern)));
[detail] +  layer->addLine(Pen(Pen::NoLine), Symbol(Symbol::Circle, 0.5, Pen(Qt::red), Brush(Qt::SolidPattern)));
[detail]    static_cast<RealStatisticalLine *>(layer->line(0))->curve()=all;
[detail]  
[detail]    QList<Curve<RealStatisticalPoint>> curves=all.split(1.2, LogScale, 0.1, 5);
[detail] @@ -206,7 +206,7 @@
[detail]    double width=8.0;
[detail]    double rightPos=sheet->printRight()+9.5;
[detail]    double topPos=0.5;
[detail] -  map.generate(0, 19, ColorPalette::defaultSequentialWhite, ColorPalette::Reversed);
[detail] +  map.generate(0, 19, 1, ColorPalette::defaultSequentialWhite, ColorPalette::Reversed);
[detail]    map.setWhiteTransparent(true);
[detail]  
[detail]    IrregularGrid2DPlot * histPlot;
[detail] @@ -838,7 +838,7 @@
[detail]        if(normalize) {
[detail]          pal.setValues(0.0001*m, m, SamplingParameters::Log);
[detail]        } else {
[detail] -        pal.generate(0, qRound(m), ColorPalette::defaultSequentialWhite, ColorPalette::Reversed);
[detail] +        pal.generate(0, qRound(m), 1, ColorPalette::defaultSequentialWhite, ColorPalette::Reversed);
[detail]          pal.setWhiteTransparent(true);
[detail]          pal.setValues(0.5, m-0.5, SamplingParameters::Linear);
[detail]        }
[detail] @@ -1290,13 +1290,13 @@
[detail]  {
[detail]    TRACE;
[detail]    _gaussianMixtureLines[0]=_dispersionPick->addLine();
[detail] -  _gaussianMixtureLines[0]->setPen(Pen(Qt::NoPen));
[detail] +  _gaussianMixtureLines[0]->setPen(Pen(Pen::NoLine));
[detail]    _gaussianMixtureLines[0]->setSymbol(Symbol(Symbol::Circle, 1.2,
[detail]                                         Pen(Qt::black, 0.6, Pen::SolidLine),
[detail]                                         Qt::NoBrush));
[detail]    _curveBrowser->addLine(_gaussianMixtureLines[0], _dispersionPick);
[detail]    _gaussianMixtureLines[1]=_ellipticityPick->addLine();
[detail] -  _gaussianMixtureLines[1]->setPen(Pen(Qt::NoPen));
[detail] +  _gaussianMixtureLines[1]->setPen(Pen(Pen::NoLine));
[detail]    _gaussianMixtureLines[1]->setSymbol(Symbol(Symbol::Circle, 1.2,
[detail]                                         Pen(Qt::black, 0.6, Pen::SolidLine),
[detail]                                         Qt::NoBrush));
[detail]                   src/NoisePlotProxy.cpp:  version-1.2.0	not modified
[detail]                   src/PowerPlotProxy.cpp:  version-1.2.0	not modified
[detail]                       src/PowerProxy.cpp:  version-1.2.0	not modified
[detail]                           src/Reader.cpp:  version-1.2.0	modified out of comments
[detail] --- src/Reader.cpp-version-1.2.0-stripped	2025-09-28 04:01:31.363630389 +0200
[detail] +++ src/Reader.cpp-HEAD-stripped	2025-09-28 04:01:31.367630407 +0200
[detail] @@ -575,6 +575,7 @@
[detail]    }
[detail]    if(_showPlots==0) {
[detail]      _showPlots=Dispersion;
[detail] +    _showPlots|=VerticalNoise;
[detail]      _showPlots|=Azimuth;
[detail]      _showPlots|=Power;
[detail]    }
[detail] @@ -692,6 +693,7 @@
[detail]      } else if(line.startsWith("PROCESS_TYPE")) {
[detail]        QString type=line.section("=", 1, -1);
[detail]        if(type=="ARDS" ||
[detail] +          type=="ARDSSensorOrientation" ||
[detail]           type=="ARTBF" ||
[detail]           type=="RTBF" ||
[detail]           type=="RTBFCross" ||    
[detail] @@ -1003,6 +1005,107 @@
[detail]    return h;
[detail]  }
[detail]  
[detail] +Curve<Point2D> Reader::misfit(bool& ok) const
[detail] +{
[detail] +  Curve<Point2D> m;
[detail] +  if(!xSampling()) {
[detail] +    App::log(tr("No sampling for X defined\n"));
[detail] +    ok=false;
[detail] +    return m;
[detail] +  }
[detail] +  for(int i=0; i<xSampling()->count(); i++) {
[detail] +    m.append(Point2D(xSampling()->value(i), 0.0));
[detail] +  }
[detail] +  if(xSampling()->scaleType()!=SamplingParameters::Log) {
[detail] +    App::log(tr("Only log sampling is accepted\n"));
[detail] +    ok=false;
[detail] +    return m;
[detail] +  }
[detail] +  int * hitCount=new int[m.count()];
[detail] +  for(int i=m.count()-1; i>=0; i--) {
[detail] +    hitCount[i]=0;
[detail] +  }
[detail] +
[detail] +  ModalProxy * proxy;
[detail] +  switch(_misfitType) {
[detail] +  case SlownessMisfit:
[detail] +    proxy=new DispersionProxy;
[detail] +    break;
[detail] +  case EllipticityMisfit:
[detail] +    proxy=new EllipticityProxy;
[detail] +    break;
[detail] +  }
[detail] +  ColumnTextParser parser;
[detail] +  parser.setStandardTypes(proxy->columnFileTypes());
[detail] +  if(curveFormatFileName().isEmpty()) {
[detail] +    parser.setTypes(proxy->defaultColumnFileTypes());
[detail] +  } else {
[detail] +    XMLHeader hdr(&parser);
[detail] +    if(hdr.xml_restoreFile(curveFormatFileName())!=XMLClass::NoError) {
[detail] +      ok=false;
[detail] +      return m;
[detail] +    }
[detail] +  }
[detail] +  QStringList expandedFileNames=File::expand(curveFileNames());
[detail] +  for(QStringList::const_iterator itf=expandedFileNames.begin(); itf!=expandedFileNames.end(); itf++) {
[detail] +    QFile f(*itf);
[detail] +    QFileInfo fi(*itf);
[detail] +    if(f.open(QIODevice::ReadOnly)) {
[detail] +      parser.setText(new QTextStream(&f));
[detail] +      parser.start();
[detail] +      parser.wait();
[detail] +      ColumnTextIterator it(&parser);
[detail] +      int curveNumber=0;
[detail] +      while(!it.atEnd()) {
[detail] +        ModalCurve c;
[detail] +        proxy->setCurve(&c);
[detail] +        if(!proxy->parse(it)) {
[detail] +          ok=false;
[detail] +          return m;
[detail] +        }
[detail] +        c.setName(fi.fileName()+"#"+QString::number(++curveNumber));
[detail] +        Samples * newSamples=samples()->filterCurve(c, relativeRange().value());
[detail] +        Samples::const_iterator its;
[detail] +        double fPrecision=0.5*(xSampling()->step()-1.0);
[detail] +        switch(_misfitType) {
[detail] +        case SlownessMisfit:
[detail] +          for(its=newSamples->begin(); its!=newSamples->end(); its++) {
[detail] +            int i=m.indexOf(its->frequency(), fPrecision);
[detail] +            Point2D& mp=m.constXAt(i);
[detail] +            double dy=log(its->slowness()/c.interpole(its->frequency(), LogScale, LogScale).y());
[detail] +            mp.setY(mp.y()+dy*dy);
[detail] +            hitCount[i]++;
[detail] +          }
[detail] +          break;
[detail] +        case EllipticityMisfit:
[detail] +          for(its=newSamples->begin(); its!=newSamples->end(); its++) {
[detail] +            int i=m.indexOf(its->frequency(), fPrecision);
[detail] +            Point2D& mp=m.constXAt(i);
[detail] +            double dy=log(its->ellipticity()/c.interpole(its->frequency(), LogScale, LinearScale).y());
[detail] +            mp.setY(mp.y()+dy*dy);
[detail] +            hitCount[i]++;
[detail] +          }
[detail] +          break;
[detail] +        }
[detail] +        delete newSamples;
[detail] +      }
[detail] +    } else {
[detail] +      App::log(tr("Cannot open file '%1'\n").arg(*itf));
[detail] +      ok=false;
[detail] +      return m;
[detail] +    }
[detail] +  }
[detail] +  for(int i=m.count()-1; i>=0; i--) {
[detail] +    Point2D& mp=m.constXAt(i);
[detail] +    if(hitCount[i]>0) {
[detail] +      mp.setY(exp(sqrt(mp.y()/static_cast<double>(hitCount[i]))));
[detail] +    } else {
[detail] +      m.remove(i);
[detail] +    }
[detail] +  }
[detail] +  return m;
[detail] +}
[detail] +
[detail]  void Reader::misfit(const QList<Curve<Point2D>>& curves, Curve<Point2D>& m,
[detail]                      int * hitCount, double precision) const
[detail]  {
[detail]                           src/Sample.cpp:  version-1.2.0	not modified
[detail]                       src/SamplePlot.cpp:  version-1.2.0	not modified
[detail]                          src/Samples.cpp:  version-1.2.0	modified out of comments
[detail] --- src/Samples.cpp-version-1.2.0-stripped	2025-09-28 04:01:31.419630658 +0200
[detail] +++ src/Samples.cpp-HEAD-stripped	2025-09-28 04:01:31.423630678 +0200
[detail] @@ -4,9 +4,15 @@
[detail]  
[detail]  
[detail]  
[detail] -Samples::Samples(const Samples& o)
[detail] +Samples::Samples(const QString& headerLine)
[detail]    : VectorList<Sample>()
[detail]  {
[detail] +  _headerLine=headerLine;
[detail] +}
[detail] +
[detail] +Samples::Samples(const Samples& o)
[detail] +    : VectorList<Sample>(o)
[detail] +{
[detail]    _headerLine=o._headerLine;
[detail]  }
[detail]  
[detail] @@ -44,7 +50,7 @@
[detail]  {
[detail]    ConsoleProgress progress;
[detail]    progress.setCaption(tr("Filtering out undefined ellipticities"));
[detail] -  Samples * newSamples=new Samples(*this);
[detail] +  Samples * newSamples=new Samples(headerLine());
[detail]    int n=count();
[detail]    for(int i=0; i<n; i++) {
[detail]      const Sample& s=at(i);
[detail] @@ -62,7 +68,7 @@
[detail]  {
[detail]    ConsoleProgress progress;
[detail]    progress.setCaption(tr("Filtering out ellipticity below %1 deg.").arg(threshold));
[detail] -  Samples * newSamples=new Samples(*this);
[detail] +  Samples * newSamples=new Samples(headerLine());
[detail]    int n=count();
[detail]    for(int i=0; i<n; i++) {
[detail]      const Sample& s=at(i);
[detail] @@ -80,7 +86,7 @@
[detail]  {
[detail]    ConsoleProgress progress;
[detail]    progress.setCaption(tr("Filtering out ellipticity above %1 deg.").arg(threshold));
[detail] -  Samples * newSamples=new Samples(*this);
[detail] +  Samples * newSamples=new Samples(headerLine());
[detail]    int n=count();
[detail]    for(int i=0; i<n; i++) {
[detail]      const Sample& s=at(i);
[detail] @@ -98,7 +104,7 @@
[detail]  {
[detail]    ConsoleProgress progress;
[detail]    progress.setCaption(tr("Filtering out vertical noise below %1.").arg(threshold));
[detail] -  Samples * newSamples=new Samples(*this);
[detail] +  Samples * newSamples=new Samples(headerLine());
[detail]    int n=count();
[detail]    for(int i=0; i<n; i++) {
[detail]      const Sample& s=at(i);
[detail] @@ -116,7 +122,7 @@
[detail]  {
[detail]    ConsoleProgress progress;
[detail]    progress.setCaption(tr("Filtering out vertical noise above %1.").arg(threshold));
[detail] -  Samples * newSamples=new Samples(*this);
[detail] +  Samples * newSamples=new Samples(headerLine());
[detail]    int n=count();
[detail]    for(int i=0; i<n; i++) {
[detail]      const Sample& s=at(i);
[detail] @@ -134,7 +140,7 @@
[detail]  {
[detail]    ConsoleProgress progress;
[detail]    progress.setCaption(tr("Filtering out horizontal noise below %1.").arg(threshold));
[detail] -  Samples * newSamples=new Samples(*this);
[detail] +  Samples * newSamples=new Samples(headerLine());
[detail]    int n=count();
[detail]    for(int i=0; i<n; i++) {
[detail]      const Sample& s=at(i);
[detail] @@ -152,7 +158,7 @@
[detail]  {
[detail]    ConsoleProgress progress;
[detail]    progress.setCaption(tr("Filtering out horizontal noise above %1.").arg(threshold));
[detail] -  Samples * newSamples=new Samples(*this);
[detail] +  Samples * newSamples=new Samples(headerLine());
[detail]    int n=count();
[detail]    for(int i=0; i<n; i++) {
[detail]      const Sample& s=at(i);
[detail] @@ -170,7 +176,7 @@
[detail]  {
[detail]    ConsoleProgress progress;
[detail]    progress.setCaption(tr("Filtering out total noise below %1.").arg(threshold));
[detail] -  Samples * newSamples=new Samples(*this);
[detail] +  Samples * newSamples=new Samples(headerLine());
[detail]    int n=count();
[detail]    for(int i=0; i<n; i++) {
[detail]      const Sample& s=at(i);
[detail] @@ -188,7 +194,7 @@
[detail]  {
[detail]    ConsoleProgress progress;
[detail]    progress.setCaption(tr("Filtering out total noise above %1.").arg(threshold));
[detail] -  Samples * newSamples=new Samples(*this);
[detail] +  Samples * newSamples=new Samples(headerLine());
[detail]    int n=count();
[detail]    for(int i=0; i<n; i++) {
[detail]      const Sample& s=at(i);
[detail] @@ -206,7 +212,7 @@
[detail]  {
[detail]    ConsoleProgress progress;
[detail]    progress.setCaption(tr("Filtering out delta noise below %1.").arg(threshold));
[detail] -  Samples * newSamples=new Samples(*this);
[detail] +  Samples * newSamples=new Samples(headerLine());
[detail]    int n=count();
[detail]    for(int i=0; i<n; i++) {
[detail]      const Sample& s=at(i);
[detail] @@ -224,7 +230,7 @@
[detail]  {
[detail]    ConsoleProgress progress;
[detail]    progress.setCaption(tr("Filtering out delta noise above %1.").arg(threshold));
[detail] -  Samples * newSamples=new Samples(*this);
[detail] +  Samples * newSamples=new Samples(headerLine());
[detail]    int n=count();
[detail]    for(int i=0; i<n; i++) {
[detail]      const Sample& s=at(i);
[detail] @@ -242,7 +248,7 @@
[detail]  {
[detail]    ConsoleProgress progress;
[detail]    progress.setCaption(tr("Filtering out sigma noise below %1.").arg(threshold));
[detail] -  Samples * newSamples=new Samples(*this);
[detail] +  Samples * newSamples=new Samples(headerLine());
[detail]    int n=count();
[detail]    for(int i=0; i<n; i++) {
[detail]      const Sample& s=at(i);
[detail] @@ -260,7 +266,7 @@
[detail]  {
[detail]    ConsoleProgress progress;
[detail]    progress.setCaption(tr("Filtering out sigma noise above %1.").arg(threshold));
[detail] -  Samples * newSamples=new Samples(*this);
[detail] +  Samples * newSamples=new Samples(headerLine());
[detail]    int n=count();
[detail]    for(int i=0; i<n; i++) {
[detail]      const Sample& s=at(i);
[detail] @@ -278,7 +284,7 @@
[detail]  {
[detail]    ConsoleProgress progress;
[detail]    progress.setCaption(tr("Filtering out abnormal sigma noise (<0.01 or >100)."));
[detail] -  Samples * newSamples=new Samples(*this);
[detail] +  Samples * newSamples=new Samples(headerLine());
[detail]    int n=count();
[detail]    for(int i=0; i<n; i++) {
[detail]      const Sample& s=at(i);
[detail] @@ -296,7 +302,7 @@
[detail]  {
[detail]    ConsoleProgress progress;
[detail]    progress.setCaption(tr("Filtering out azimuth below %1 deg.").arg(threshold));
[detail] -  Samples * newSamples=new Samples(*this);
[detail] +  Samples * newSamples=new Samples(headerLine());
[detail]    int n=count();
[detail]    for(int i=0; i<n; i++) {
[detail]      const Sample& s=at(i);
[detail] @@ -314,7 +320,7 @@
[detail]  {
[detail]    ConsoleProgress progress;
[detail]    progress.setCaption(tr("Filtering out azimuth above %1 deg.").arg(threshold));
[detail] -  Samples * newSamples=new Samples(*this);
[detail] +  Samples * newSamples=new Samples(headerLine());
[detail]    int n=count();
[detail]    for(int i=0; i<n; i++) {
[detail]      const Sample& s=at(i);
[detail] @@ -331,7 +337,7 @@
[detail]  {
[detail]    ConsoleProgress progress;
[detail]    progress.setCaption(tr("Filtering out power below %1.").arg(threshold));
[detail] -  Samples * newSamples=new Samples(*this);
[detail] +  Samples * newSamples=new Samples(headerLine());
[detail]    int n=count();
[detail]    for(int i=0; i<n; i++) {
[detail]      const Sample& s=at(i);
[detail] @@ -349,7 +355,7 @@
[detail]  {
[detail]    ConsoleProgress progress;
[detail]    progress.setCaption(tr("Filtering out power above %1.").arg(threshold));
[detail] -  Samples * newSamples=new Samples(*this);
[detail] +  Samples * newSamples=new Samples(headerLine());
[detail]    int n=count();
[detail]    for(int i=0; i<n; i++) {
[detail]      const Sample& s=at(i);
[detail] @@ -368,7 +374,7 @@
[detail]    if(threshold>0.0) {
[detail]      ConsoleProgress progress;
[detail]      progress.setCaption(tr("Filtering out velocity below %1 m/s").arg(threshold));
[detail] -    Samples * newSamples=new Samples(*this);
[detail] +    Samples * newSamples=new Samples(headerLine());
[detail]      threshold=1.0/threshold;
[detail]      int n=count();
[detail]      for(int i=0; i<n; i++) {
[detail] @@ -391,7 +397,7 @@
[detail]    if(threshold<std::numeric_limits<double>::infinity()) {
[detail]      ConsoleProgress progress;
[detail]      progress.setCaption(tr("Filtering out velocity above %1 m/s").arg(threshold));
[detail] -    Samples * newSamples=new Samples(*this);
[detail] +    Samples * newSamples=new Samples(headerLine());
[detail]      threshold=1.0/threshold;
[detail]      int n=count();
[detail]      for(int i=0; i<n; i++) {
[detail] @@ -414,7 +420,7 @@
[detail]    if(threshold>0.0) {
[detail]      ConsoleProgress progress;
[detail]      progress.setCaption(tr("Filtering out wavenumber below %1 rad/m").arg(threshold));
[detail] -    Samples * newSamples=new Samples(*this);
[detail] +    Samples * newSamples=new Samples(headerLine());
[detail]      int n=count();
[detail]      for(int i=0; i<n; i++) {
[detail]        const Sample& s=at(i);
[detail] @@ -436,7 +442,7 @@
[detail]    if(threshold<std::numeric_limits<double>::infinity()) {
[detail]      ConsoleProgress progress;
[detail]      progress.setCaption(tr("Filtering out wavenumber above %1 rad/m").arg(threshold));
[detail] -    Samples * newSamples=new Samples(*this);
[detail] +    Samples * newSamples=new Samples(headerLine());
[detail]      int n=count();
[detail]      for(int i=0; i<n; i++) {
[detail]        const Sample& s=at(i);
[detail] @@ -461,7 +467,7 @@
[detail]                          .arg(slowDev).arg(noiseDev));
[detail]      Samples sortedSamples(*this); 
[detail]      std::sort(sortedSamples.begin(), sortedSamples.end(), lessThanSlowness);
[detail] -    Samples * newSamples=new Samples(*this);
[detail] +    Samples * newSamples=new Samples(headerLine());
[detail]      int n=sortedSamples.count(), j;
[detail]      double thSlow, thNoise, freq;
[detail]      bool acceptSample=true;
[detail] @@ -527,7 +533,7 @@
[detail]                          .arg(slowDev).arg(powerDev));
[detail]      Samples sortedSamples(*this); 
[detail]      std::sort(sortedSamples.begin(), sortedSamples.end(), lessThanSlowness);
[detail] -    Samples * newSamples=new Samples(*this);
[detail] +    Samples * newSamples=new Samples(headerLine());
[detail]      int n=sortedSamples.count(), j;
[detail]      double thSlow, thPower, freq;
[detail]      bool acceptSample=true;
[detail] @@ -600,7 +606,7 @@
[detail]      progress.setCaption(tr("Filtering out relative power below %1").arg(threshold));
[detail]      Samples sortedSamples(*this); 
[detail]      std::sort(sortedSamples.begin(), sortedSamples.end(), lessThan);
[detail] -    Samples * newSamples=new Samples(*this);
[detail] +    Samples * newSamples=new Samples(headerLine());
[detail]      QString time0=sortedSamples.first().time();
[detail]      double frequency0=sortedSamples.first().frequency();
[detail]      double maxPower=0.0;
[detail] @@ -647,7 +653,7 @@
[detail]    progress.setCaption(tr("Filtering out around curve '%1' (>%2 %)")
[detail]                        .arg(curve.name())
[detail]                        .arg(relativeRange*100.0));
[detail] -  Samples * newSamples=new Samples(*this);
[detail] +  Samples * newSamples=new Samples(headerLine());
[detail]    int n=count();
[detail]    double lastF=std::numeric_limits<double>::quiet_NaN();
[detail]    bool fInside=true;
[detail]                  src/SigmaNoiseProxy.cpp:  version-1.2.0	not modified
[detail]                  src/TotalNoiseProxy.cpp:  version-1.2.0	not modified
[detail]               src/VerticalNoiseProxy.cpp:  version-1.2.0	not modified
[detail]                             src/main.cpp:  version-1.2.0	modified out of comments
[detail] --- src/main.cpp-version-1.2.0-stripped	2025-09-28 04:01:31.487630987 +0200
[detail] +++ src/main.cpp-HEAD-stripped	2025-09-28 04:01:31.491631007 +0200
[detail] @@ -48,7 +48,8 @@
[detail]    if(!reader.read(argc, argv, reader.ignoreStdin())) {
[detail]      return 2;
[detail]    }
[detail] -  if(reader.isEmpty() && !a.isBatch()) {
[detail] +  if(reader.isEmpty() &&
[detail] +     (Application::hasInputTerminal() || a.hasGui())) {
[detail]      if(!reader.read(Message::getOpenFileNames(tr("Open data file"),
[detail]                                                tr("All files (*);;"
[detail]                                                   "Max files (*.max)")))) {
[detail] @@ -328,7 +329,7 @@
[detail]    h->addOption("-histograms", "Plots histograms of data samples (default).");
[detail]    h->addOption("-rayleigh", "Plots Rayleigh ellipticity and noise, null ellipticities are filtered "
[detail]                       "out unless option '-undef-ell' is specified (default=automatically detected).");
[detail] -  h->addOption("-split-ell-sign", "Split postive and negative ellipticities.");
[detail] +  h->addOption("-split-ell-sign", "Split positive and negative ellipticities.");
[detail]    h->addOption("-auto-pick", "Automatically pick curves.");
[detail]    h->addOption("-undef-ell", "Keep samples with undefined ellipticities (default=filter them).");
[detail]    h->addGroup("filter", "filter");
[detail]                   src/AzimuthPlotProxy.h:  version-1.2.0	not modified
[detail]                       src/AzimuthProxy.h:  version-1.2.0	not modified
[detail]           src/ClassificationParameters.h:  version-1.2.0	not modified
[detail]                    src/DeltaNoiseProxy.h:  version-1.2.0	not modified
[detail]                   src/HistogramsWidget.h:  version-1.2.0	not modified
[detail]               src/HorizontalNoiseProxy.h:  version-1.2.0	not modified
[detail]                    src/MaxCurveBrowser.h:  version-1.2.0	not modified
[detail]                        src/ModeWidgets.h:  version-1.2.0	not modified
[detail]                     src/NoisePlotProxy.h:  version-1.2.0	not modified
[detail]                     src/PowerPlotProxy.h:  version-1.2.0	not modified
[detail]                         src/PowerProxy.h:  version-1.2.0	not modified
[detail]                             src/Reader.h:  version-1.2.0	modified out of comments
[detail] --- src/Reader.h-version-1.2.0-stripped	2025-09-28 04:01:31.675631896 +0200
[detail] +++ src/Reader.h-HEAD-stripped	2025-09-28 04:01:31.679631916 +0200
[detail] @@ -92,7 +92,7 @@
[detail]    Plots showPlots() const {return _showPlots;}
[detail]  
[detail]    Histogram2D * histogram(const SamplingParameters& ySampling) const;
[detail] -  Curve<Point2D> misfit(bool& ok) const {return HistogramReader::misfit(ok);}
[detail] +  Curve<Point2D> misfit(bool& ok) const;
[detail]  protected:
[detail]    bool parse(QTextStream& s);
[detail]    bool loadSamples(QTextStream& s, const QString& lastLine);
[detail]                             src/Sample.h:  version-1.2.0	not modified
[detail]                         src/SamplePlot.h:  version-1.2.0	not modified
[detail]                            src/Samples.h:  version-1.2.0	modified out of comments
[detail] --- src/Samples.h-version-1.2.0-stripped	2025-09-28 04:01:31.727632147 +0200
[detail] +++ src/Samples.h-HEAD-stripped	2025-09-28 04:01:31.727632147 +0200
[detail] @@ -12,6 +12,7 @@
[detail]  {
[detail]  public:
[detail]    Samples() {}
[detail] +  Samples(const QString& headerLine);
[detail]    Samples(const Samples& o);
[detail]  
[detail]    Samples * filterUndefinedEllipticities() const;
[detail]                    src/SigmaNoiseProxy.h:  version-1.2.0	not modified
[detail]                    src/TotalNoiseProxy.h:  version-1.2.0	not modified
[detail]                 src/VerticalNoiseProxy.h:  version-1.2.0	not modified
[detail]                  src/HistogramsWidget.ui:  version-1.2.0	not modified
[summary] Total differences: 475 lines
[summary] Modification level is C
OLD_DIR=$(pwd)
echo "gpviewmax"
cd $(find . -name "gpviewmax" | tail -n 1) || exit 2
pwd
dpversion C  || exit 2
cd $OLD_DIR || exit 2
################## gpdistance
[detail]                             src/main.cpp:  version-1.0.1	not modified
# No modification since last version
################## gptime
[detail]                       src/TimeReader.cpp:  version-1.1.3	modified out of comments
[detail] --- src/TimeReader.cpp-version-1.1.3-stripped	2025-09-28 04:01:31.903632998 +0200
[detail] +++ src/TimeReader.cpp-HEAD-stripped	2025-09-28 04:01:31.907633017 +0200
[detail] @@ -196,6 +196,7 @@
[detail]          return DateTime();
[detail]        }
[detail]        t.addSeconds(s.toDouble(&ok));
[detail] +      App::endRedirect(errStream);
[detail]        return t;
[detail]      } else if(format=="doy" || format=="dow" || format=="julian-year") {
[detail]        App::log(tr("gptime: bad input format\n\n") );
[detail]                             src/main.cpp:  version-1.1.3	not modified
[detail]                         src/TimeReader.h:  version-1.1.3	not modified
[summary] Total differences: 10 lines
[summary] Modification level is C
OLD_DIR=$(pwd)
echo "gptime"
cd $(find . -name "gptime" | tail -n 1) || exit 2
pwd
dpversion C  || exit 2
cd $OLD_DIR || exit 2
################## gpcoord
[detail]                      src/CoordReader.cpp:  version-1.0.4	modified out of comments
[detail] --- src/CoordReader.cpp-version-1.0.4-stripped	2025-09-28 04:01:31.995633442 +0200
[detail] +++ src/CoordReader.cpp-HEAD-stripped	2025-09-28 04:01:31.999633462 +0200
[detail] @@ -72,6 +72,12 @@
[detail]    case AllDistances:
[detail]    case None:
[detail]      break;
[detail] +  case GenerateLine:
[detail] +    _sensorCount=_sensorCount/_circleCount.value();
[detail] +    if(_sensorCount<3) {
[detail] +      _sensorCount=3;
[detail] +    }
[detail] +    return generateLine();
[detail]    case GenerateCircles:
[detail]      _sensorCount=_sensorCount/_circleCount.value();
[detail]      if(_sensorCount<3) {
[detail] @@ -363,6 +369,9 @@
[detail]          _mode=Project;
[detail]          bool ok=true;
[detail]          QList<NamedPoint> points=loadFile(argv[i], ok);
[detail] +        if(!ok) {
[detail] +          return false;
[detail] +        }
[detail]          for(int i=0; i<points.size(); i++) {
[detail]            _polygon.addPoint(points.at(i));
[detail]          }
[detail] @@ -400,6 +409,8 @@
[detail]          _mode=TriangulateAzimuth;
[detail]          CoreApplication::checkOptionArg(i, argc, argv);
[detail]          coordFile=argv[i];
[detail] +      } else if(arg=="-line") {
[detail] +        _mode=GenerateLine;
[detail]        } else if(arg=="-circles") {
[detail]          _mode=GenerateCircles;
[detail]        } else if(arg=="-triangles") {
[detail] @@ -505,6 +516,10 @@
[detail]          _translateVector.setX(CoreApplication::toDouble(i, i-1, argv));
[detail]          CoreApplication::checkOptionArg(i, argc, argv, true, i-1);
[detail]          _translateVector.setY(CoreApplication::toDouble(i, i-2, argv));
[detail] +      } else if(arg=="-direction") {
[detail] +        CoreApplication::checkOptionArg(i, argc, argv);
[detail] +        _angle.setValue(_angleMode, CoreApplication::toDouble(i, i-1, argv));
[detail] +        _angle.setRadians(Angle::mathToGeographic(_angle.radians()));
[detail]        } else if(arg=="-from-distances") {
[detail]          _mode=FromDistances;
[detail]        } else if(arg=="-array-limits") {
[detail] @@ -600,6 +615,9 @@
[detail]    if(!coordFile.isEmpty()) {
[detail]      bool ok=true;
[detail]      QList<NamedPoint> points=loadFile(coordFile, ok);
[detail] +    if(!ok) {
[detail] +      return false;
[detail] +    }
[detail]      for(int i=points.size()-1; i>=0; i--) {
[detail]        const NamedPoint& p=points.at(i);
[detail]        _refPoints.insert(p.name(), p);
[detail] @@ -728,6 +746,7 @@
[detail]    case None:
[detail]      break;
[detail]    case FromKML:
[detail] +  case GenerateLine:
[detail]    case GenerateCircles:
[detail]    case GenerateTriangles:
[detail]    case GenerateRandom:
[detail] @@ -784,6 +803,7 @@
[detail]          case AllDistances:
[detail]          case None:
[detail]          case FromKML:
[detail] +        case GenerateLine:
[detail]          case GenerateCircles:
[detail]          case GenerateTriangles:
[detail]          case GenerateRandom:
[detail] @@ -1020,7 +1040,7 @@
[detail]              NamedPoint utmCoord;
[detail]              ok=utmCoord.fromString(pointString);
[detail]              if(!ok) {
[detail] -              App::log(tr("Error parsing input\n") );
[detail] +              App::log(tr("Error parsing input: '%1'\n").arg(pointString));
[detail]                return false;
[detail]              }
[detail]              if(zone.isValid()) {
[detail] @@ -1061,6 +1081,7 @@
[detail]            }
[detail]            break;
[detail]          case FromKML:
[detail] +        case GenerateLine:
[detail]          case GenerateCircles:
[detail]          case GenerateTriangles:
[detail]          case GenerateRandom:
[detail] @@ -1354,6 +1375,23 @@
[detail]    }
[detail]  }
[detail]  
[detail] +bool CoordReader::generateLine()
[detail] +{
[detail] +  QTextStream sOut(stdout);
[detail] +  Angle a;
[detail] +  NamedPoint p;
[detail] +  int sensorIndex=_firstIndex;
[detail] +  double dx=_maximumRadius/(_sensorCount-1);
[detail] +  p.translate(_translateVector);
[detail] +  p.setName(QString("S%1").arg(sensorIndex++, 3, 10, QChar('0')));
[detail] +  sOut << p.toString('g', 20) << Qt::endl;
[detail] +  for(int i=1; i<_sensorCount; i++) {
[detail] +    p.move(dx, _angle, a);
[detail] +    p.setName(QString("S%1").arg(sensorIndex++, 3, 10, QChar('0')));
[detail] +    sOut << p.toString('g', 20) << Qt::endl;
[detail] +  }
[detail] +  return true;
[detail] +}
[detail]  bool CoordReader::generateCircles()
[detail]  {
[detail]    QTextStream sOut(stdout);
[detail]       src/TranslationRotationForward.cpp:  version-1.0.4	not modified
[detail]                             src/main.cpp:  version-1.0.4	modified out of comments
[detail] --- src/main.cpp-version-1.0.4-stripped	2025-09-28 04:01:32.035633635 +0200
[detail] +++ src/main.cpp-HEAD-stripped	2025-09-28 04:01:32.039633655 +0200
[detail] @@ -70,7 +70,7 @@
[detail]    h->addOption("-reference LONG LAT","Set geographical coordinates at origin of rectangular coordinates (0,0).");
[detail]    h->addOption("-translate TX TY","Input must be X Y [Z [NAME]]. Translates by vection (TX,TY).");
[detail]    h->addOption("-rotate ANGLE","Input must be X Y [Z [NAME]]. Rotates around origin (0,0) counterclockwise with ANGLE in degrees.");
[detail] -  h->addOption("-project FILE","Input must be X Y DELTA. Projects intput points on polygon defined by FILE. Format of FILE is the same as -lookup."
[detail] +  h->addOption("-project FILE","Input must be X Y DELTA. Projects input points on polygon defined by FILE. Format of FILE is the same as -lookup. "
[detail]                                 "After projection, moves point along the polygon by DELTA (can be + or -).");
[detail]    h->addOption("-invert-trans-rot REF_FILE","Input must be X Y [Z] NAME. Invert the translation and rotation required to match the input with REF_FILE. "
[detail]                                              "See option '-lookup' for REF_FILE format.");
[detail] @@ -96,31 +96,33 @@
[detail]    h->addOption("-array-limits", "Computes Kmin and Kmax for the input coordinates X Y [Z NAME].");
[detail]    h->addOption("-array-pattern DIR", "Computes the array theoretical pattern in direction DIR in degrees counted clockwise from north.\n"
[detail]                                       "The value and the first two derivatives are output. Use -translate to move the center to something else than the origin.");
[detail] -  h->addOption("-circles","Generate a set of sensors distributed on circles. "
[detail] +  h->addOption("-line", "Generates a set of sensors distributed along a line, starting at X Y (see -center), with a maximum distance of R (see -radius) in direction DIR (-direction).");
[detail] +  h->addOption("-circles","Generates a set of sensors distributed on circles. "
[detail]                            "The radius provided by -radius is the maximum radius.");
[detail] -  h->addOption("-triangles","Generate a set of nested triangles. "
[detail] +  h->addOption("-triangles","Generates a set of nested triangles. "
[detail]                              "The radius provided by -radius is the maximum radius.");
[detail] -  h->addOption("-random","Generate a set of N coordinates randomly distributed inside a circle of RADIUS. "
[detail] -                                                     "The smallest distance between two staions is MIN_DISTANCE. Coordinates are named starting at index I0 (0 by default).");
[detail] -  h->addOption("-markov-chain","Generate a set of N coordinates randomly distributed inside a circle of RADIUS using a Markov chain with N_STEPS. "
[detail] -                                                                   "The smallest distance between two staions is MIN_DISTANCE. Coordinates are named starting at index I0 (0 by default).");
[detail] -  h->addOption("-circle-grid","Generate a set of N coordinates aligned on a grid inside a circle of RADIUS. "
[detail] +  h->addOption("-random","Generates a set of N coordinates randomly distributed inside a circle of R. "
[detail] +                         "The smallest distance between two staions is D. Coordinates are named starting at index I0 (0 by default).");
[detail] +  h->addOption("-markov-chain","Generates a set of N coordinates randomly distributed inside a circle of R using a Markov chain with N_STEPS. "
[detail] +                               "The smallest distance between two staions is D. Coordinates are named starting at index I0 (0 by default).");
[detail] +  h->addOption("-circle-grid","Generates a set of N coordinates aligned on a grid inside a circle of R. "
[detail]                                               "Coordinates are named starting at index I0 (0 by default).");
[detail] -  h->addOption("-random-grid-circle RADIUS N ERR [I0]","Generate a set of N coordinates nearly (random maximum error ERR) aligned on a grid inside a circle of RADIUS. "
[detail] +  h->addOption("-random-grid-circle RADIUS N ERR [I0]","Generates a set of N coordinates nearly (random maximum error ERR) aligned on a grid inside a circle of RADIUS. "
[detail]                                                          "Coordinates are named starting at index I0 (0 by default).");
[detail]    h->addOption("-size N", "Number of sensors (default=15).");
[detail]    h->addOption("-radius R", "Maximum distance from origin (default=100).");
[detail] +  h->addOption("-direction DIR", "Direction of the line (option '-line') from north (default=90, see '-h angle' for units).");
[detail]    h->addOption("-first-index I0", "Index of the first sensor (default=0). If it is greater than 0, no sensor at origin is generated (only for circles or triangles).");
[detail]    h->addOption("-circle-count NC", "Number of circles (default=2).");
[detail]    h->addOption("-radius-factor RF", "Radius factor betwen successive circles (default=3).");
[detail]    h->addOption("-minimum-distance D", "Minimum distance between sensors (default=R/ceil(sqrt(N))).");
[detail]    h->addOption("-step-count NS", "Number of Markov-chain steps (default=2).");
[detail]    h->addOption("-maximum-step S", "Maximum length of Markov-chain steps (default=R/ceil(sqrt(N))).");
[detail] -  h->addOption("-maximum-deviation E", "Maximum deviation from grid postion for -random-grid (default=R/ceil(sqrt(N)).");
[detail] -  h->addOption("-center X Y", "Set center of array to X, Y\n");
[detail] -  h->addOption("-add-sensors FILE", "Add sensors before the generation. Modifies sensors generation for random placement only.");
[detail] -  h->addOption("-add-include-polygon FILE", "When generating stations of an array, accept only stations inside polygon defined in FILE. Format of FILE is the same as -lookup.");
[detail] -  h->addOption("-add-exclude-polygon FILE", "When generating stations of an array, accept only stations outside polygon defined in FILE. Format of FILE is the same as -lookup.");
[detail] +  h->addOption("-maximum-deviation E", "Maximum deviation from grid position for -random-grid (default=R/ceil(sqrt(N)).");
[detail] +  h->addOption("-center X Y", "Sets center of array to X, Y\n");
[detail] +  h->addOption("-add-sensors FILE", "Adds sensors before the generation. Modifies sensors generation for random placement only.");
[detail] +  h->addOption("-add-include-polygon FILE", "When generating stations of an array, accepts only stations inside polygon defined in FILE. Format of FILE is the same as -lookup.");
[detail] +  h->addOption("-add-exclude-polygon FILE", "When generating stations of an array, accepts only stations outside polygon defined in FILE. Format of FILE is the same as -lookup.");
[detail]    h->addGroup("from distance", "fromdistance");
[detail]    h->addOption("-stddev VALUE","The estimated standard deviation of distance measurements (default=1cm).");
[detail]    h->addOption("-origin NAME","Sets point named NAME as the origin of the relative coordinates, solves translation ambiguity (see -from-distances).");
[detail]                        src/CoordReader.h:  version-1.0.4	modified out of comments
[detail] --- src/CoordReader.h-version-1.0.4-stripped	2025-09-28 04:01:32.055633733 +0200
[detail] +++ src/CoordReader.h-HEAD-stripped	2025-09-28 04:01:32.059633752 +0200
[detail] @@ -24,10 +24,12 @@
[detail]               Translate, Rotate, Project, Average, Localize, LineMove, Lookup, TriangulateDistance,
[detail]               TriangulateAzimuth, FromDistances, InvertTranslationRotation, Misfit,
[detail]               ArrayLimits, ArrayPattern, UTMDeclination, MagDeclination, AllDistances,
[detail] -             GenerateCircles, GenerateTriangles, GenerateRandom, GenerateMarkovChain, GenerateGridCircle, GenerateRandomGridCircle};
[detail] +             GenerateLine, GenerateCircles, GenerateTriangles, GenerateRandom, GenerateMarkovChain,
[detail] +             GenerateGridCircle, GenerateRandomGridCircle};
[detail]    enum FromDistancesOutMode {NoOutput=0, Mean=1, Raw=2, Ellipse=4, Clusters=8};
[detail]  
[detail]    bool arrayLimits(double& kmin, double& kmax);
[detail] +  bool generateLine();
[detail]    bool generateCircles();
[detail]    bool generateRandom();
[detail]    bool generateMarkovChain();
[detail]         src/TranslationRotationForward.h:  version-1.0.4	not modified
[summary] Total differences: 186 lines
[summary] Modification level is C
OLD_DIR=$(pwd)
echo "gpcoord"
cd $(find . -name "gpcoord" | tail -n 1) || exit 2
pwd
dpversion C  || exit 2
cd $OLD_DIR || exit 2
################## gpreplace
[detail]                             src/main.cpp:  version-1.0.1	not modified
# No modification since last version
################## gpsh
[detail]                         src/ShReader.cpp:  version-1.0.3	modified out of comments
[detail] --- src/ShReader.cpp-version-1.0.3-stripped	2025-09-28 04:01:32.171634294 +0200
[detail] +++ src/ShReader.cpp-HEAD-stripped	2025-09-28 04:01:32.171634294 +0200
[detail] @@ -112,7 +112,7 @@
[detail]    if(!m.fromStream(s, &comments)) {
[detail]      return false;
[detail]    }
[detail] -  if(m.layerCount()>0) {
[detail] +  if(m.numberOfLayers()>0) {
[detail]      if(_qp>0.0) {
[detail]        m.setQp(_qp);
[detail]      }
[detail] @@ -120,7 +120,7 @@
[detail]        m.setQs(_qs);
[detail]      }
[detail]      
[detail] -    for(int i=0;i<m.layerCount(); i++) {
[detail] +    for(int i=0;i<m.numberOfLayers(); i++) {
[detail]        if(m.qp(i)<=0.0) {
[detail]          App::log(tr("negative or null value for Qp at layer %1\n").arg(i) );
[detail]        }
[detail]                             src/main.cpp:  version-1.0.3	not modified
[detail]                           src/ShReader.h:  version-1.0.3	not modified
[summary] Total differences: 20 lines
[summary] Modification level is C
OLD_DIR=$(pwd)
echo "gpsh"
cd $(find . -name "gpsh" | tail -n 1) || exit 2
pwd
dpversion C  || exit 2
cd $OLD_DIR || exit 2
################## gpmt
[detail]            src/MagnetoTelluricReader.cpp:  version-1.0.3	not modified
[detail]                             src/main.cpp:  version-1.0.3	not modified
[detail]              src/MagnetoTelluricReader.h:  version-1.0.3	not modified
# No modification since last version
################## gpgridsearch
[detail]                    src/GridGenerator.cpp:  version-1.0.4	not modified
[detail]                      src/ModelWorker.cpp:  version-1.0.4	not modified
[detail]                           src/Reader.cpp:  version-1.0.4	not modified
[detail]                       src/WorkerLoop.cpp:  version-1.0.4	not modified
[detail]                             src/main.cpp:  version-1.0.4	not modified
[detail]                      src/GridGenerator.h:  version-1.0.4	not modified
[detail]                        src/ModelWorker.h:  version-1.0.4	not modified
[detail]                             src/Reader.h:  version-1.0.4	not modified
[detail]                         src/WorkerLoop.h:  version-1.0.4	not modified
# No modification since last version
################## gpfksimulator
[detail]                 src/MediumParameters.cpp:  version-1.2.0	not modified
[detail]                       src/Parameters.cpp:  version-1.2.0	not modified
[detail]            src/RandomSourceGenerator.cpp:  version-1.2.0	no last version available
[detail]           src/SimulatedCrossSpectrum.cpp:  version-1.2.0	modified out of comments
[detail] --- src/SimulatedCrossSpectrum.cpp-version-1.2.0-stripped	2025-09-28 04:01:32.539636071 +0200
[detail] +++ src/SimulatedCrossSpectrum.cpp-HEAD-stripped	2025-09-28 04:01:32.543636091 +0200
[detail] @@ -19,7 +19,7 @@
[detail]      _noisePhaseGenerator=new GlobalRandom;
[detail]      CoreApplication::instance()->addGlobalObject(_noisePhaseGenerator);
[detail]    }
[detail] -
[detail] +  _orientations=nullptr;
[detail]  }
[detail]  
[detail]  
[detail] @@ -28,6 +28,7 @@
[detail]    TRACE;
[detail]    clearSignals();
[detail]    qDeleteAll(_sourceSig);
[detail] +  delete [] _orientations;
[detail]  }
[detail]  
[detail]  Point SimulatedCrossSpectrum::setActiveSource(const VectorList<int>&, bool& ok)
[detail] @@ -86,25 +87,25 @@
[detail]  void SimulatedCrossSpectrum::addVertical()
[detail]  {
[detail]    int stationCount=_array.count();
[detail] -  ComplexMatrix& covmat=*_matrix;
[detail] -  ComplexMatrix sig(stationCount, 1);
[detail] +  HermitianMatrix& covmat=*_matrix;
[detail] +  PrivateVector<Complex> sig(stationCount);
[detail]  
[detail]    for(int is=0; is<stationCount; is++) {
[detail] -    sig.at(is, 0)=_stationSig[2][is][_currentBlock];
[detail] +    sig[is]=_stationSig[2][is][_currentBlock];
[detail]    }
[detail] -  covmat+=sig*sig.conjugate().transposed();
[detail] +  covmat.addCrossProducts(sig);
[detail]  }
[detail]  
[detail]  void SimulatedCrossSpectrum::addRotatedRadial(int rotationIndex, const Complex * sensorRotations)
[detail]  {
[detail]    int stationCount=_array.count();
[detail] -  ComplexMatrix& covmat=_rotatedMatrices[rotationIndex];
[detail] -  ComplexMatrix sig(stationCount, 1);
[detail] +  HermitianMatrix& covmat=_rotatedMatrices[rotationIndex];
[detail] +  PrivateVector<Complex> sig(stationCount);
[detail]    Angle rotation;
[detail]    rotation.setRadians(_rotateStep*rotationIndex);
[detail]    Complex rsv;
[detail]    for(int is=0; is<stationCount; is++) {
[detail] -    Complex& s=sig.at(is, 0);
[detail] +    Complex& s=sig[is];
[detail]      const Complex& rot=sensorRotations[is];
[detail]      rsv=_stationSig[0][is][_currentBlock]*rot.re();
[detail]      rsv-=_stationSig[1][is][_currentBlock]*rot.im();
[detail] @@ -113,19 +114,19 @@
[detail]      rsv+=_stationSig[0][is][_currentBlock]*rot.im();
[detail]      s+=rotation.sin()*rsv;  
[detail]    }
[detail] -  covmat+=sig*sig.conjugate().transposed();
[detail] +  covmat.addCrossProducts(sig);
[detail]  }
[detail]  
[detail]  void SimulatedCrossSpectrum::addRotatedTransverse(int rotationIndex, const Complex * sensorRotations)
[detail]  {
[detail]    int stationCount=_array.count();
[detail] -  ComplexMatrix& covmat=_rotatedMatrices[rotationIndex];
[detail] -  ComplexMatrix sig(stationCount, 1);
[detail] +  HermitianMatrix& covmat=_rotatedMatrices[rotationIndex];
[detail] +  PrivateVector<Complex> sig(stationCount);
[detail]    Angle rotation;
[detail]    rotation.setRadians(_rotateStep*rotationIndex);
[detail]    Complex rsv;
[detail]    for(int is=0; is<stationCount; is++) {
[detail] -    Complex& s=sig.at(is, 0);
[detail] +    Complex& s=sig[is];
[detail]      const Complex& rot=sensorRotations[is];
[detail]      rsv=_stationSig[1][is][_currentBlock]*rot.re();
[detail]      rsv+=_stationSig[0][is][_currentBlock]*rot.im();
[detail] @@ -134,20 +135,20 @@
[detail]      rsv-=_stationSig[1][is][_currentBlock]*rot.im();
[detail]      s-=rotation.sin()*rsv;  
[detail]    }
[detail] -  covmat+=sig*sig.conjugate().transposed();
[detail] +  covmat.addCrossProducts(sig);
[detail]  }
[detail]  
[detail]  void SimulatedCrossSpectrum::addRotatedRayleigh(int rotationIndex, const Complex * sensorRotations)
[detail]  {
[detail]    int stationCount=_array.count();
[detail]    int stationCount2=2*stationCount;
[detail] -  ComplexMatrix& covmat=_rotatedMatrices[rotationIndex];
[detail] -  ComplexMatrix sig(stationCount2, 1);
[detail] +  HermitianMatrix& covmat=_rotatedMatrices[rotationIndex];
[detail] +  PrivateVector<Complex> sig(stationCount2);
[detail]    Angle rotation;
[detail]    rotation.setRadians(_rotateStep*rotationIndex);
[detail]    Complex rsv;
[detail]    for(int is=0; is<stationCount; is++) {
[detail] -    Complex& s=sig.at(is, 0);
[detail] +    Complex& s=sig[is];
[detail]      const Complex& rot=sensorRotations[is];
[detail]      rsv=_stationSig[0][is][_currentBlock]*rot.re();
[detail]      rsv-=_stationSig[1][is][_currentBlock]*rot.im();
[detail] @@ -157,10 +158,9 @@
[detail]      s+=rotation.sin()*rsv;  
[detail]    }
[detail]    for(int is=0; is<stationCount; is++) {
[detail] -    Complex& s=sig.at(stationCount+is, 0);
[detail] -    s=_stationSig[2][is][_currentBlock];
[detail] +    sig[stationCount+is]=_stationSig[2][is][_currentBlock];
[detail]    }
[detail] -  covmat+=sig*sig.conjugate().transposed();
[detail] +  covmat.addCrossProducts(sig);
[detail]  }
[detail]  
[detail]  void SimulatedCrossSpectrum::addThreeComponent(const Complex * sensorRotations)
[detail] @@ -168,72 +168,139 @@
[detail]    TRACE;
[detail]    int stationCount=_array.count();
[detail]    int stationCount2=2*stationCount;
[detail] -  ComplexMatrix sig(3*stationCount, 1);
[detail] -  ComplexMatrix& covmat=*_matrix;
[detail] +  HermitianMatrix& covmat=*_matrix;
[detail] +  PrivateVector<Complex> sig(3*stationCount);
[detail]    for(int is=0; is<stationCount; is++) {
[detail] -    Complex& s=sig.at(is, 0);
[detail] +    Complex& s=sig[is];
[detail]      const Complex& rot=sensorRotations[is];
[detail]      s=_stationSig[0][is][_currentBlock]*rot.re();
[detail]      s-=_stationSig[1][is][_currentBlock]*rot.im();
[detail]    }
[detail]    for(int is=0; is<stationCount; is++) {
[detail] -    Complex& s=sig.at(is+stationCount, 0);
[detail] +    Complex& s=sig[is+stationCount];
[detail]      const Complex& rot=sensorRotations[is];
[detail]      s=_stationSig[1][is][_currentBlock]*rot.re();
[detail]      s+=_stationSig[0][is][_currentBlock]*rot.im();
[detail]    }
[detail] -  for(int iStat=0; iStat<stationCount; iStat++) {
[detail] -    Complex& s=sig.at(iStat+stationCount2, 0);
[detail] -    s=_stationSig[2][iStat][_currentBlock];
[detail] +  for(int is=0; is<stationCount; is++) {
[detail] +    sig[is+stationCount2]=_stationSig[2][is][_currentBlock];
[detail] +  }
[detail] +  covmat.addCrossProducts(sig);
[detail] +}
[detail] +
[detail] +void SimulatedCrossSpectrum::addVelocityStrainRate(const Complex * sensorRotations)
[detail] +{
[detail] +  int stationCount=_array.count();
[detail] +  HermitianMatrix& covmat=*_matrix;
[detail] +  PrivateVector<Complex> sig(covmat.columnCount());
[detail] +  int ie=0;
[detail] +  for(int is=0; is<stationCount; is++) {
[detail] +    if(_array.name(is).startsWith("DAS")) {
[detail] +      sig[ie++]=_stationSig[0][is][_currentBlock];
[detail] +    } else if(_array.name(is).startsWith("VERT")) {
[detail] +      sig[ie++]=_stationSig[2][is][_currentBlock];
[detail] +    } else {
[detail] +      const Complex& rot=sensorRotations[is];
[detail] +      sig[ie++]=_stationSig[0][is][_currentBlock]*rot.re()-_stationSig[1][is][_currentBlock]*rot.im();
[detail] +      sig[ie++]=_stationSig[1][is][_currentBlock]*rot.re()+_stationSig[0][is][_currentBlock]*rot.im();
[detail] +      sig[ie++]=_stationSig[2][is][_currentBlock];
[detail] +    }
[detail] +  }
[detail] +  covmat.addCrossProducts(sig);
[detail] +}
[detail] +
[detail] +int SimulatedCrossSpectrum::velocityStrainRateMatrixSize() const
[detail] +{
[detail] +  int stationCount=_array.count();
[detail] +  int n=0;
[detail] +  for(int is=0; is<stationCount; is++) {
[detail] +    if(_array.name(is).startsWith("DAS")) {
[detail] +      n++;
[detail] +    } else if(_array.name(is).startsWith("VERT")) {
[detail] +      n++;
[detail] +    } else {
[detail] +      n+=3;
[detail] +    }
[detail]    }
[detail] -  covmat+=sig*sig.conjugate().transposed();
[detail] +  return n;
[detail] +}
[detail] +
[detail] +double * SimulatedCrossSpectrum::horizontalStrainOrientations() const
[detail] +{
[detail] +  int stationCount=_array.count();
[detail] +  double * orientations=new double[stationCount];
[detail] +  for(int is=0; is<stationCount; is++) {
[detail] +    orientations[is]=std::numeric_limits<double>::quiet_NaN();
[detail] +  }
[detail] +
[detail] +  QList<int> fiberNodes;
[detail] +  for(int is=0; is<stationCount; is++) {
[detail] +    if(_array.name(is).startsWith("DAS")) {
[detail] +      fiberNodes.append(is);
[detail] +    } else if(_array.name(is).startsWith("VERT")) {
[detail] +      orientations[is]=-1;
[detail] +    } else {
[detail] +      orientations[is]=-3;
[detail] +    }
[detail] +  }
[detail] +  setHorizontalStrainOrientations(fiberNodes, orientations);
[detail] +  
[detail] +  for(int is=0; is<stationCount; is++) {
[detail] +    if(isnan(orientations[is])) {
[detail] +      App::log(tr("No orientation can be calculated for horizontal strain station %1 at (%2).\n")
[detail] +                   .arg(is).arg(array().relativePos(is).toString()));
[detail] +      delete [] orientations;
[detail] +      return nullptr;
[detail] +    }
[detail] +  }
[detail] +  return orientations;
[detail]  }
[detail]  
[detail]  
[detail]  void SimulatedCrossSpectrum::addActiveVertical(const ActiveFKSteering& geom)
[detail]  {
[detail]    int stationCount=_array.count();
[detail] -  ComplexMatrix& covmat=*_matrix;
[detail] -  ComplexMatrix sig(stationCount, 1);
[detail] +  HermitianMatrix& covmat=*_matrix;
[detail] +  PrivateVector<Complex> sig(stationCount);
[detail]    for(int is=0; is<stationCount; is++) {
[detail] -    Complex& s=sig.at(is, 0);
[detail] +    Complex& s=sig[is];
[detail]      s=_stationSig[2][is][_currentBlock];
[detail]      s*=geom.amplitudeFactor(is);
[detail]    }
[detail] -  covmat+=sig*sig.conjugateTransposedVector();
[detail] +  add(covmat, sig);
[detail]  }
[detail]  
[detail]  void SimulatedCrossSpectrum::addActiveRayleigh(const ActiveFKSteering& geom)
[detail]  {
[detail]    int stationCount=_array.count();
[detail] -  ComplexMatrix& covmat=*_matrix;
[detail] -  ComplexMatrix sig(2*stationCount, 1);
[detail] +  HermitianMatrix& covmat=*_matrix;
[detail] +  PrivateVector<Complex> sig(2*stationCount);
[detail]    for(int is=0; is<stationCount; is++) {
[detail] -    Complex& s=sig.at(is, 0);
[detail] +    Complex& s=sig[is];
[detail]      s=geom.radialRotation(is).sin()*_stationSig[1][is][_currentBlock];
[detail]      s+=geom.radialRotation(is).cos()*_stationSig[0][is][_currentBlock];
[detail]      s*=geom.amplitudeFactor(is);
[detail]    }
[detail]    for(int is=0; is<stationCount; is++) {
[detail] -    Complex& s=sig.at(stationCount+is, 0);
[detail] +    Complex& s=sig[stationCount+is];
[detail]      s=_stationSig[2][is][_currentBlock];
[detail]      s*=geom.amplitudeFactor(is);
[detail]    }
[detail] -  covmat+=sig*sig.conjugateTransposedVector();
[detail] +  add(covmat, sig);
[detail]  }
[detail]  
[detail]  void SimulatedCrossSpectrum::addActiveTransverse(const ActiveFKSteering& geom)
[detail]  {
[detail]    int stationCount=_array.count();
[detail] -  ComplexMatrix& covmat=*_matrix;
[detail] -  ComplexMatrix sig(stationCount, 1);
[detail] +  HermitianMatrix& covmat=*_matrix;
[detail] +  PrivateVector<Complex> sig(stationCount);
[detail]    for(int is=0; is<stationCount; is++) {
[detail] -    Complex& s=sig.at(is, 0);
[detail] +    Complex& s=sig[is];
[detail]      s=geom.transverseRotation(is).sin()*_stationSig[1][is][_currentBlock];
[detail]      s+=geom.transverseRotation(is).cos()*_stationSig[0][is][_currentBlock];
[detail]      s*=geom.amplitudeFactor(is);
[detail]    }
[detail] -  covmat+=sig*sig.conjugateTransposedVector();
[detail] +  add(covmat, sig);
[detail]  }
[detail]  
[detail]  void SimulatedCrossSpectrum::addSource()
[detail] @@ -263,6 +330,13 @@
[detail]    _sourceSig.remove(index);
[detail]  }
[detail]  
[detail] +void SimulatedCrossSpectrum::clearSources()
[detail] +{
[detail] +  TRACE;
[detail] +  qDeleteAll(_sourceSig);
[detail] +  _sourceSig.clear();
[detail] +}
[detail] +
[detail]  void SimulatedCrossSpectrum::setSourceSignals(int iSrc, const SourceParameters& src,
[detail]                                                const MediumParameters& medium, int blockCount)
[detail]  {
[detail] @@ -291,7 +365,6 @@
[detail]  {
[detail]    TRACE;
[detail]    Q_UNUSED(verticalNoise);
[detail] -  TODO_WARNING;
[detail]    clearSignals();
[detail]    int nStat=_array.count();
[detail]    int nSrc=_sourceSig.count();
[detail] @@ -309,7 +382,9 @@
[detail]    verticalNoise=0.0;   
[detail]    horizontalNoise=0.0;
[detail]    
[detail] -
[detail] +  if(!_orientations) {
[detail] +    _orientations=horizontalStrainOrientations();
[detail] +  }
[detail]    for(int iSrc=0; iSrc<nSrc; iSrc++) {
[detail]      SourceSignal * sig=_sourceSig[iSrc];
[detail]      switch(sig->parameters().polarization()) {
[detail] @@ -341,13 +416,22 @@
[detail]          Complex ellh(0.0, -sin(sig->parameters().ellipticity()));
[detail]          double ellv=cos(sig->parameters().ellipticity());
[detail]          for(int iStat=0; iStat<nStat; iStat++) {
[detail] -          double a=sig->parameters().azimuth(_waveModel, _array.relativePos(iStat));
[detail] -          double ca=cos(a);
[detail] -          double sa=sin(a);
[detail] +          double theta=sig->parameters().azimuth(_waveModel, _array.relativePos(iStat));
[detail] +          double ctheta=cos(theta);
[detail] +          double stheta=sin(theta);
[detail] +          if(_array.name(iStat).startsWith("DAS")) {
[detail] +            double strainFactor=cos(theta-_orientations[iStat]);
[detail] +            strainFactor=-sig->wavenumber()*strainFactor*strainFactor;
[detail]            for(int iBlock=0; iBlock<blockCount; iBlock++) {
[detail]              src=sig->stationSignal(iBlock, iStat);
[detail] -            srcX=src*ca;
[detail] -            srcY=src*sa;
[detail] +              src*=strainFactor;
[detail] +              _stationSig[0][iStat][iBlock]+=src*ellh+noise;
[detail] +            }
[detail] +          } else {
[detail] +            for(int iBlock=0; iBlock<blockCount; iBlock++) {
[detail] +              src=sig->stationSignal(iBlock, iStat);
[detail] +              srcX=src*ctheta;
[detail] +              srcY=src*stheta;
[detail]              
[detail]              _stationSig[0][iStat][iBlock]+=(srcX*sr.cos()+srcY*sr.sin())*ellh+noise;
[detail]              
[detail] @@ -357,23 +441,33 @@
[detail]            }
[detail]          }
[detail]        }
[detail] +      }
[detail]        break;
[detail]      case Mode::Transverse:
[detail]      case Mode::Love:
[detail]        for(int iStat=0; iStat<nStat; iStat++) {
[detail] -        double a=sig->parameters().azimuth(_waveModel, _array.relativePos(iStat));
[detail] -        double ca=cos(a);
[detail] -        double sa=-sin(a);
[detail] +        double theta=sig->parameters().azimuth(_waveModel, _array.relativePos(iStat));
[detail] +        double ctheta=cos(theta);
[detail] +        double stheta=-sin(theta);
[detail] +        if(_array.name(iStat).startsWith("DAS")) {
[detail] +          double strainFactor=0.5*sig->wavenumber()*sin(2.0*(theta-_orientations[iStat]));
[detail]          for(int iBlock=0; iBlock<blockCount; iBlock++) {
[detail]            src=sig->stationSignal(iBlock, iStat);
[detail] -          srcX=src*sa;
[detail] -          srcY=src*ca;
[detail] -          noise.setExp(horizontalNoise, _noisePhaseGenerator->uniform(0.0, 2.0*M_PI));
[detail] +            src.imaginaryMultiply(strainFactor);
[detail] +            _stationSig[0][iStat][iBlock]+=src+noise;
[detail] +          }
[detail] +        } else {
[detail] +          for(int iBlock=0; iBlock<blockCount; iBlock++) {
[detail] +            src=sig->stationSignal(iBlock, iStat);
[detail] +            srcX=src*stheta;
[detail] +            srcY=src*ctheta;
[detail] +            
[detail]            _stationSig[0][iStat][iBlock]+=srcX*sr.cos()+srcY*sr.sin()+noise;
[detail]            
[detail]            _stationSig[1][iStat][iBlock]+=srcY*sr.cos()-srcX*sr.sin()+noise;
[detail]          }
[detail]        }
[detail] +      }
[detail]        break;
[detail]      }
[detail]    }
[detail]                        src/Simulator.cpp:  version-1.2.0	modified out of comments
[detail] --- src/Simulator.cpp-version-1.2.0-stripped	2025-09-28 04:01:32.559636168 +0200
[detail] +++ src/Simulator.cpp-HEAD-stripped	2025-09-28 04:01:32.559636168 +0200
[detail] @@ -8,6 +8,7 @@
[detail]  #include "SourceItemModel.h"
[detail]  #include "SourceDelegate.h"
[detail]  #include "SimulatedArrayStations.h"
[detail] +#include "RandomSourceGenerator.h"
[detail]  
[detail]  Simulator::Simulator(QWidget *parent, Qt::WindowFlags f)
[detail]      : QWidget(parent, f | Qt::Window)
[detail] @@ -43,6 +44,7 @@
[detail]    _cache=nullptr;
[detail]    _kmaxSolver=nullptr;
[detail]    _crossSection=false;
[detail] +  _kmaxAvailable=false;
[detail]  }
[detail]  
[detail]  Simulator::~Simulator()
[detail] @@ -69,6 +71,9 @@
[detail]    _array->setReference();
[detail]    _array->setRelativePos(_parameters.magneticDeclination());
[detail]    _arraySelection=new ArraySelection(_array);
[detail] +  App::log(tr("Found %1 distinct stations (local coordinates):\n%2")
[detail] +               .arg(_arraySelection->count())
[detail] +               .arg(_arraySelection->toString(ArraySelection::Relative)));
[detail]    _crossSpectrum=new SimulatedCrossSpectrum(_arraySelection, &_parameters);
[detail]    _cache=new FKCache(_arraySelection);
[detail]  
[detail] @@ -76,52 +81,44 @@
[detail]    processType->addItems(FKParameters::processTypes());
[detail]    processType->blockSignals(false);
[detail]  
[detail] -  
[detail] -  waveNumMap->xAxis()->setTitle(tr("Wave number X (rad/m)"));
[detail] -  waveNumMap->xAxis()->setTitleInverseScale(tr("Wave length X/(2*pi) (m/rad)"));
[detail] -  waveNumMap->yAxis()->setTitle(tr("Wave number Y (rad/m)"));
[detail] -  waveNumMap->yAxis()->setTitleInverseScale(tr("Wave length Y/(2*pi) (m/rad)"));
[detail] -
[detail] -  _velocityLayer=new CircleViewer(waveNumMap);
[detail] +  _velocityLayer=new CircleViewer(map);
[detail]    _velocityLayer->setObjectName("velocity");
[detail] -  _azimuthLayer=new LineLayer(waveNumMap);
[detail] +  _azimuthLayer=new LineLayer(map);
[detail]    _azimuthLayer->setObjectName("azimuth");
[detail]    PlotLine2D * line=new PlotLine2D;
[detail]    line->setPen(Pen(Qt::black, 0.6, Pen::SolidLine));
[detail]    line->setSymbol(Symbol());
[detail]    _azimuthLayer->setReferenceLine(line);
[detail]  
[detail] -  _gridLayer=new LiveGridLayer(waveNumMap);
[detail] +  _gridLayer=new LiveGridLayer(map);
[detail]    _sampling=sampling;
[detail]    if(sampling<1.0) {
[detail]      sampling=1.0;
[detail]    }
[detail]    _gridLayer->setSampling(qRound(sampling));
[detail] -  _gridLayer->setFunction(new FKFunctionPlot);
[detail] +  _gridLayer->setFunction(new FKFunctionPlot(3));
[detail]    _gridLayer->setOpacity(0.8);
[detail] -  _gridLayer->setObjectName("wave number map");
[detail] -  ColorMap& map=_gridLayer->beginColorMapChange();
[detail] -  map.generate(0, 19, ColorPalette::defaultSequential, ColorPalette::Reversed);
[detail] -  map.setValues(0.0, 1.0, SamplingParameters::Linear);
[detail] +  _gridLayer->setObjectName("map");
[detail] +  ColorMap& colors=_gridLayer->beginColorMapChange();
[detail] +  colors.generate(0, 19, 1, ColorPalette::defaultSequential, ColorPalette::Reversed);
[detail] +  colors.setValues(0.0, 1.0, SamplingParameters::Linear);
[detail]    _gridLayer->endColorMapChange();
[detail]  
[detail] -  _maxLayer=new NameLineLayer(waveNumMap);
[detail] +  _maxLayer=new NameLineLayer(map);
[detail]    _maxLayer->setObjectName("max");
[detail]    NameLine * lineMax=new NameLine;
[detail] -  lineMax->setPen(Pen(Qt::NoPen));
[detail] +  lineMax->setPen(Pen(Pen::NoLine));
[detail]    lineMax->setSymbol(Symbol(Symbol::Circle, 4, Pen(Qt::black, 0.5)));
[detail]    _maxLayer->setReferenceLine(lineMax);
[detail]    _maxLayer->addLine();
[detail]  
[detail] -  _kLayer=new CircleMask(waveNumMap);
[detail] +  _kLayer=new CircleMask(map);
[detail]    _kLayer->setObjectName("grid size");
[detail] -  _kLayer->setOpacity(0.75);
[detail]  
[detail] -  _fkMeshLayer=new MeshLayer(waveNumMap);
[detail] +  _fkMeshLayer=new MeshLayer(map);
[detail]    _fkMeshLayer->setObjectName("fk mesh");
[detail] -  _fkMeshLayer->setOpacity(0.05);
[detail]  
[detail] -  waveNumMap->addFreePicks();
[detail] +  map->addFreePicks();
[detail]  
[detail]    
[detail]    KminSolver kminSolver(_array->relativePos());
[detail] @@ -137,7 +134,55 @@
[detail]      _kmaxSolver=nullptr;
[detail]      App::log(tr("Error computing kmin for station coordinates\n") );
[detail]      setKmax(5.0*theoreticalKmax());
[detail] +
[detail] +    setKxKyMap();
[detail] +  }
[detail] +}
[detail] +
[detail] +void Simulator::setKxKyMap()
[detail] +{
[detail] +  map->xAxis()->setTitle(tr("Wave number X (rad/m)"));
[detail] +  map->xAxis()->setTitleInverseScale(tr("Wave length X/(2*pi) (m/rad)"));
[detail] +  map->yAxis()->setTitle(tr("Wave number Y (rad/m)"));
[detail] +  map->yAxis()->setTitleInverseScale(tr("Wave length Y/(2*pi) (m/rad)"));
[detail] +  map->yAxis()->setReversedScale(false);
[detail] +  mapSizeEdit->setEnabled(true);
[detail] +  mapSizeEdit->setSuffix(tr(" rad/m"));
[detail] +  double s=mapSizeEdit->value();
[detail] +  map->xAxis()->setRange(-s, s);
[detail] +  map->yAxis()->setRange(-s, s);
[detail] +  _fkMeshLayer->setOpacity(0.05);
[detail] +  _kLayer->setOpacity(0.75);
[detail] +  _gridLayer->setSmooth(true);
[detail] +}
[detail] +
[detail] +void Simulator::setXsYsMap()
[detail] +{
[detail] +  map->xAxis()->setTitle(tr("Source X (m)"));
[detail] +  map->xAxis()->setTitleInverseScale(QString());
[detail] +  map->yAxis()->setTitle(tr("Source Y (m)"));
[detail] +  map->yAxis()->setTitleInverseScale(QString());
[detail] +  map->yAxis()->setReversedScale(false);
[detail] +  mapSizeEdit->setEnabled(true);
[detail] +  mapSizeEdit->setSuffix(tr(" m"));
[detail] +  _fkMeshLayer->setOpacity(0.05);
[detail] +  _kLayer->setOpacity(0.75);
[detail] +  _gridLayer->setSmooth(true);
[detail]    }
[detail] +
[detail] +void Simulator::setCrossSpectrumMap()
[detail] +{
[detail] +  map->xAxis()->setTitle(tr("Channel"));
[detail] +  map->xAxis()->setTitleInverseScale("");
[detail] +  map->yAxis()->setTitle(tr("Channel"));
[detail] +  map->yAxis()->setTitleInverseScale("");
[detail] +  map->yAxis()->setReversedScale(true);
[detail] +  mapSizeEdit->setEnabled(false);
[detail] +  map->xAxis()->setRange(0.5, _array->count()+0.5);
[detail] +  map->yAxis()->setRange(0.5, _array->count()+0.5);
[detail] +  _fkMeshLayer->setOpacity(0.0);
[detail] +  _kLayer->setOpacity(0.0);
[detail] +  _gridLayer->setSmooth(false);
[detail]  }
[detail]  
[detail]  void Simulator::initUserValues()
[detail] @@ -145,8 +190,10 @@
[detail]    if(_kmaxSolver) {
[detail]      App::log(tr("Waiting for Kmax computation...\n") );
[detail]      _kmaxSolver->wait();
[detail] +    while(!_kmaxAvailable) {
[detail]      Application::processEvents(QEventLoop::ExcludeUserInputEvents);
[detail]    }
[detail] +  }
[detail]    setWaveModel();
[detail]    
[detail]    
[detail] @@ -155,7 +202,7 @@
[detail]    _medium.setAttenuation(attenuationEdit->value());
[detail]    _parameters.setVerticalNoise(sqrt(verticalNoiseEdit->value()));
[detail]    _parameters.setHorizontalNoise(sqrt(horizontalNoiseEdit->value()));
[detail] -  on_gridSizeEdit_valueChanged(gridSizeEdit->value());
[detail] +  on_mapSizeEdit_valueChanged(mapSizeEdit->value());
[detail]    on_addSource_clicked();
[detail]    setAllSources();
[detail]    on_processType_currentIndexChanged(processType->currentIndex());
[detail] @@ -190,7 +237,16 @@
[detail]  {
[detail]    TRACE;
[detail]    _parameters.setKmax(kmax);
[detail] -  gridSizeEdit->setValue(_parameters.effectiveGridSize(frequencyEdit->value()));
[detail] +  _kmaxAvailable=true;
[detail] +  APP_LOG(1, tr("Computed kmax %1\n").arg(kmax));
[detail] +  FKParameters::ProcessType t=static_cast<FKParameters::ProcessType>(processType->currentIndex()+1);
[detail] +  switch(t) {
[detail] +  case FKParameters::LocalSourceVertical:
[detail] +    break;
[detail] +  default:
[detail] +    mapSizeEdit->setValue(_parameters.effectiveGridSize(frequencyEdit->value()));
[detail] +    break;
[detail] +  }
[detail]  }
[detail]  
[detail]  void Simulator::setWaveModel()
[detail] @@ -221,7 +277,18 @@
[detail]  {
[detail]    TRACE;
[detail]    _medium.setFrequency(f);
[detail] -  gridSizeEdit->setValue(_parameters.effectiveGridSize(f));
[detail] +  FKParameters::ProcessType t=static_cast<FKParameters::ProcessType>(processType->currentIndex()+1);
[detail] +  switch(t) {
[detail] +  case FKParameters::LocalSourceVertical: {
[detail] +      FKFunctionPlot * funcPlot=static_cast<FKFunctionPlot *>(_gridLayer->takeFunction());
[detail] +      funcPlot->setFrequency(f);
[detail] +      _gridLayer->setFunction(funcPlot);
[detail] +    }
[detail] +    break;
[detail] +  default:
[detail] +    mapSizeEdit->setValue(_parameters.effectiveGridSize(f));
[detail] +    break;
[detail] +  }
[detail]    _fkMeshLayer->setFrequency(f);
[detail]    setAllSources();
[detail]  }
[detail] @@ -234,6 +301,20 @@
[detail]    
[detail]    FKParameters::ProcessType t=static_cast<FKParameters::ProcessType>(index+1);
[detail]    _parameters.setProcessType(t);
[detail] +  switch(t) {
[detail] +  case FKParameters::LocalSourceVertical:
[detail] +    setXsYsMap();
[detail] +    mapSizeEdit->setValue(_parameters.sourceMapSize(2.0*_arraySelection->radius()));
[detail] +    break;
[detail] +  default:
[detail] +    if(plotTypeEdit->currentIndex()==4) {
[detail] +      setCrossSpectrumMap();
[detail] +    } else {
[detail] +      setKxKyMap();
[detail] +    }
[detail] +    break;
[detail] +  }
[detail] +  _cache->clearSteering(); 
[detail]    AbstractFKFunction * fk=AbstractFKFunction::create(_array->mode(), &_parameters, _cache);
[detail]    if(fk) {
[detail]      _crossSpectrum->resize();
[detail] @@ -312,18 +393,30 @@
[detail]    switch(index) {
[detail]    case 0:
[detail]      funcPlot->setMode(FKFunctionPlot::BeamPower);
[detail] +    setKxKyMap();
[detail]      break;
[detail]    case 1:
[detail]      funcPlot->setMode(FKFunctionPlot::Ellipticity);
[detail] +    setKxKyMap();
[detail]      break;
[detail]    case 2:
[detail]      funcPlot->setMode(FKFunctionPlot::FixedEllipticity);
[detail]      funcPlot->setFixedEllipticity(Angle::degreesToRadians(fixedEll->value()));
[detail]      fixedEllLabel->setEnabled(true);
[detail]      fixedEll->setEnabled(true);
[detail] +    setKxKyMap();
[detail] +    break;
[detail] +  case 3:
[detail] +    funcPlot->setMode(FKFunctionPlot::LocalSourceVelocity);
[detail] +    setXsYsMap();
[detail] +    break;
[detail] +  case 4:
[detail] +    funcPlot->setMode(FKFunctionPlot::CrossSpectralMatrix);
[detail] +    setCrossSpectrumMap();
[detail]      break;
[detail]    }
[detail]    _gridLayer->setFunction(funcPlot);
[detail] +  on_frequencyEdit_valueChanged(frequencyEdit->value());  
[detail]    updateMap();
[detail]  }
[detail]  
[detail] @@ -362,13 +455,13 @@
[detail]    setAllSources();
[detail]  }
[detail]  
[detail] -void Simulator::on_gridSizeEdit_valueChanged(double k)
[detail] +void Simulator::on_mapSizeEdit_valueChanged(double s)
[detail]  {
[detail]    TRACE;
[detail] -  _kLayer->set(0, 0, k, k, Qt::white);
[detail] +  _kLayer->set(0, 0, s, s, Qt::white);
[detail]    _kLayer->deepUpdate();
[detail] -  waveNumMap->xAxis()->setRange(-k, k);
[detail] -  waveNumMap->yAxis()->setRange(-k, k);
[detail] +  map->xAxis()->setRange(-s, s);
[detail] +  map->yAxis()->setRange(-s, s);
[detail]  }
[detail]  
[detail]  void Simulator::on_addSource_clicked()
[detail] @@ -413,6 +506,41 @@
[detail]    }
[detail]  }
[detail]  
[detail] +void Simulator::on_clearSources_clicked()
[detail] +{
[detail] +  TRACE;
[detail] +  static_cast<SourceItemModel *>(sourceTable->model())->clearSources();
[detail] +  _crossSpectrum->clearSources();
[detail] +  FKFunctionPlot * funcPlot=static_cast<FKFunctionPlot *>(_gridLayer->takeFunction());
[detail] +  _gridLayer->setFunctionValid(false);
[detail] +  _velocityLayer->clear();
[detail] +  _azimuthLayer->clear();
[detail] +  _gridLayer->setFunction(funcPlot);
[detail] +  updateMap();
[detail] +}
[detail] +
[detail] +void Simulator::on_randomSources_clicked()
[detail] +{
[detail] +  TRACE;
[detail] +  static Random r;
[detail] +  RandomSourceGenerator * d=new RandomSourceGenerator;
[detail] +  Settings::getWidget(d);
[detail] +  if(planeWavesButton->isChecked()) {
[detail] +    d->setWaveModel(SourceParameters::PlaneWaves);
[detail] +  }
[detail] +  if(d->exec()) {
[detail] +    Settings::setWidget(d);
[detail] +    int n=d->numberOfSources();
[detail] +    for(int i=0; i<n; i++) {
[detail] +      static_cast<SourceItemModel *>(sourceTable->model())->addSource(d->generate(i, r));
[detail] +      _crossSpectrum->addSource();
[detail] +      addSourceMarkers();
[detail] +      setSource(_crossSpectrum->sourceCount()-1);
[detail] +    }
[detail] +  }
[detail] +  delete d;
[detail] +}
[detail] +
[detail]  void Simulator::on_crossSectionBut_clicked()
[detail]  {
[detail]    TRACE;
[detail] @@ -434,14 +562,15 @@
[detail]  void Simulator::on_maximaBut_clicked()
[detail]  {
[detail]    TRACE;
[detail] +  WaveNumberConverter conv(_medium.frequency());
[detail]    FKFunctionPlot * funcPlot=static_cast<FKFunctionPlot *>(_gridLayer->takeFunction());
[detail]    AbstractFKFunction * fk=funcPlot->function();
[detail]  
[detail]    _parameters.setMaximumPeakCount(maximaCount->value());
[detail]    GridSearch2D * grid=static_cast<GridSearch2D *>(fk->createSearch(_parameters));
[detail]    double gridSize=_parameters.effectiveGridSize(_medium.frequency());
[detail] -  if(gridSize>gridSizeEdit->value()) {
[detail] -    gridSize=gridSizeEdit->value();
[detail] +  if(gridSize>mapSizeEdit->value()) {
[detail] +    gridSize=mapSizeEdit->value();
[detail]    }
[detail]    fk->setMaximumWavenumber(gridSize);
[detail]    fk->setMaximumSlowness(_parameters.maximumSlowness());
[detail] @@ -451,7 +580,7 @@
[detail]    fk->setAzimuthRange(_parameters.minimumAzimuth(),
[detail]                        _parameters.maximumAzimuth());
[detail]    _fkMeshLayer->setStep(_parameters.gridStep());
[detail] -  _fkMeshLayer->setSize(waveNumMap->xAxis()->visibleMaximum());
[detail] +  _fkMeshLayer->setSize(map->xAxis()->visibleMaximum());
[detail]    Curve<NamedPoint>& plot=static_cast<NameLine *>(_maxLayer->line(0))->curve();
[detail]    plot.clear();
[detail]    if(maximaCount->value()==1) {
[detail] @@ -461,29 +590,28 @@
[detail]                     _parameters.absoluteThreshold(),
[detail]                     _parameters.relativeThreshold());
[detail]    }
[detail] -  FunctionMaximaIterator it;
[detail]    double dkMin=std::numeric_limits<double>::infinity();
[detail]    double freq=_medium.frequency();
[detail]    FKPeaks::Value value;
[detail]    fprintf(stderr, "%3s %12s %12s %12s %12s %12s %12s %12s %12s %12s %12s\n",
[detail]           "N", "kx (rad/m)", "ky (rad/m)", "v (m/s)", "az. (deg)", "xi (deg)", "xi_r (deg)", "Sigma", "Rz/N", "Rh/N", "power");
[detail] -  int i=0;
[detail] -  for(it=grid->begin(); it!=grid->end(); ++it) {
[detail] -    const FunctionSearchMaximum& m=**it;
[detail] +  int n=grid->extrema().size();
[detail] +  for(int i=0; i<n; i++) {
[detail] +    const FunctionSearchExtremum& m=*grid->extrema().at(i);
[detail]      const Vector<double>& kell=m.position();
[detail]      if(!fk->isOnLimit(kell, _medium.frequency())) {
[detail]        double dk=distanceToSources(kell);
[detail]        if(dk<dkMin) {
[detail]          dkMin=dk;
[detail]        }
[detail] -      fk->setAssociatedResults(kell, m.value(), value);
[detail] +      fk->setAssociatedResults(kell, m.value(), value, conv);
[detail]        fprintf(stderr, "%3i %12lf %12lf %12.2lf %12.2lf %12.2lf %12.2lf %12.2lf %12.2lf %12.2lf %12lg\n",
[detail]               i++, kell[0], kell[1], 2.0*M_PI*freq/kell.length(0, 1),
[detail]               Angle::radiansToDegrees(Angle::mathToGeographic(kell.azimuth(0, 1))),
[detail]               Angle::radiansToDegrees(kell[2]), value.ellipticity,
[detail]               value.horizontalNoise/value.verticalNoise,
[detail]               value.verticalNoise, value.horizontalNoise, value.power);
[detail] -      NamedPoint p(kell[0], kell[1], 0.0, QString::number((*it)->value(), 'g', 2));
[detail] +      NamedPoint p(kell[0], kell[1], 0.0, QString::number(m.value(), 'g', 2));
[detail]        plot.append(p);
[detail]      }
[detail]    }
[detail] @@ -497,123 +624,6 @@
[detail]    _maxLayer->deepUpdate();
[detail]  }
[detail]  
[detail] -void Simulator::fitCrossSpectrum(GridSearch2D * grid)
[detail] -{
[detail] -  if(processType->currentText()!="RDSCross") {
[detail] -    return;
[detail] -  }
[detail] -  AbstractFKRayleigh * fk=static_cast<AbstractFKRayleigh *>(grid->function());
[detail] -  WavefieldFunction * wf=new WavefieldFunction(blockCountEdit->value(),
[detail] -                                               _arraySelection->relativePos());
[detail] -  FunctionMaximaIterator itg=grid->begin();
[detail] -  IncoherentNoise noise;
[detail] -  FKPeaks::Value value;
[detail] -  int stationCount=_crossSpectrum->array().count();
[detail] -  for(int i=0; i<grid->maximaCount(); i++, ++itg) {
[detail] -    const FunctionSearchMaximum& m=**itg;
[detail] -    const Vector<double>& kell=m.position();
[detail] -    printf("Wave %i: %lf %lf\n", i, 2.0*M_PI*_medium.frequency()/kell.length(0, 1),
[detail] -                                 Angle::radiansToDegrees(Angle::mathToGeographic(kell.azimuth(0, 1))));
[detail] -    char buf[8];
[detail] -    printf("Include this wave ? [Yn] ");
[detail] -    scanf("%s", buf);
[detail] -    if(strcmp(buf,"n")==0) {
[detail] -      continue;
[detail] -    }
[detail] -    printf("\n");
[detail] -
[detail] -    fk->setAssociatedResults(kell, m.value(), value);
[detail] -    noise.add(value.power, value.horizontalNoise*stationCount, value.verticalNoise*stationCount);
[detail] -
[detail] -    WavefieldValues::Observations obs;
[detail] -    obs.xiX=kell[2];
[detail] -    obs.powerX=fk->valueFixed(kell);
[detail] -    obs.kConcavityX=fk->concavity(kell, 0);
[detail] -    obs.xiConcavityX=fk->concavity(kell, 2);
[detail] -    printf("     X %lf %lf %lf %lf\n", obs.powerX, Angle::radiansToDegrees(obs.xiX),
[detail] -                                 obs.kConcavityX, obs.xiConcavityX);
[detail] -    PrivateVector<double> kellh(kell);
[detail] -    obs.powerH=fk->radialPower(kellh);
[detail] -    obs.xiH=kellh[2];
[detail] -    obs.kConcavityH=fk->radialConcavity(kellh, 0);
[detail] -    obs.xiConcavityH=fk->radialConcavity(kellh, 2);
[detail] -    printf("     H %lf %lf %lf %lf\n", obs.powerH, Angle::radiansToDegrees(obs.xiH),
[detail] -                                 obs.kConcavityH, obs.xiConcavityH);
[detail] -    PrivateVector<double> kellz(kell);
[detail] -    obs.powerZ=fk->verticalPower(kellz);
[detail] -    obs.xiZ=kellz[2];
[detail] -    obs.kConcavityZ=fk->verticalConcavity(kellz, 0);
[detail] -    obs.xiConcavityZ=fk->verticalConcavity(kellz, 2);
[detail] -    printf("     Z %lf %lf %lf %lf\n", obs.powerZ, Angle::radiansToDegrees(obs.xiZ),
[detail] -                                 obs.kConcavityZ, obs.xiConcavityZ);
[detail] -    wf->addObservedWave(kell.length(0, 1), kell.azimuth(0, 1), obs);
[detail] -  }
[detail] -  wf->setSteering(static_cast<HRFKDirectRayleighAll *>(fk)->steering());
[detail] -  wf->wavefield().setSignalPower();
[detail] -  wf->saveObservations("/home/wathelem/publis/3c_corr/M2.1/RTBF/observations");
[detail] -
[detail] -  OptimizationBFGS opt(wf->parameterSpaceDimension());
[detail] -  opt.setFunction(wf);
[detail] -  PrivateVector<double> maxDp(wf->parameterSpaceDimension());
[detail] -  PrivateVector<double> p(wf->parameterSpaceDimension());
[detail] -  PrivateVector<double> prec(wf->parameterSpaceDimension());
[detail] -  wf->setMaximumShift(maxDp);
[detail] -  wf->setPrecision(prec);
[detail] -  opt.setPrecision(prec);
[detail] -
[detail] -  noise.showStatus();
[detail] -  wf->wavefield().setIncoherentNoise(noise.R(), noise.sigma());
[detail] -  wf->wavefield().getParameters(p);
[detail] -  opt.reset(p);
[detail] -  wf->showDetailedMisfit();
[detail] -  opt.minimize(maxDp, 100);
[detail] -  wf->showDetailedMisfit();
[detail] -  wf->showResults(opt.value(), opt.iterationCount(), _medium.frequency());
[detail] -
[detail] -  
[detail] -
[detail] -  
[detail] -
[detail] -  
[detail] -
[detail] -  
[detail] -  
[detail] -
[detail] -#if 0
[detail] -  
[detail] -  App::freeze(true);
[detail] -  for(int i=0; i<grid->maximaCount(); i++) {
[detail] -    
[detail] -    
[detail] -    
[detail] -    
[detail] -    
[detail] -
[detail] -    QFile f("/tmp/grid"+QString::number(i));
[detail] -    f.open(QIODevice::WriteOnly);
[detail] -    QTextStream s(&f);
[detail] -    s << "x y val\n";
[detail] -    int nd=wf->parameterSpaceDimension();
[detail] -    PrivateVector<double> param(nd);
[detail] -    param.copyValues(p0);
[detail] -    
[detail] -    for(double etah=0.2; etah<5; etah+=0.05) {
[detail] -      param[2]=etah;
[detail] -      for(double etaz=0.2; etaz<5; etaz+=0.05) {
[detail] -        param[3]=etaz;
[detail] -        s << etah << " " << etaz << " " << -wf->value(param) << "\n";
[detail] -      }
[detail] -    }
[detail] -    wf->wavefield().setParameters(p0);
[detail] -    f.close();
[detail] -  }
[detail] -  App::freeze(false);
[detail] -#endif
[detail] -
[detail] -  
[detail] -  fk->setCrossSpectrum(_crossSpectrum->matrix());
[detail] -}
[detail] -
[detail]  void Simulator::displaySource(int index)
[detail]  {
[detail]    TRACE;
[detail] @@ -681,7 +691,7 @@
[detail]    
[detail]      updateMax();
[detail]    
[detail] -  waveNumMap->graphContents()->deepUpdate();
[detail] +  map->graphContents()->deepUpdate();
[detail]  }
[detail]  
[detail]  
[detail] @@ -871,7 +881,7 @@
[detail]    double kx0=omega/v0*cos(theta0);
[detail]    double ky0=omega/v0*sin(theta0);
[detail]  
[detail] -  double kmax=gridSizeEdit->value();
[detail] +  double kmax=mapSizeEdit->value();
[detail]    double kmin=kmax/100.0;
[detail]  
[detail]    double cxi0=cos(xi0);
[detail]                   src/SourceDelegate.cpp:  version-1.2.0	modified out of comments
[detail] --- src/SourceDelegate.cpp-version-1.2.0-stripped	2025-09-28 04:01:32.579636265 +0200
[detail] +++ src/SourceDelegate.cpp-HEAD-stripped	2025-09-28 04:01:32.583636284 +0200
[detail] @@ -36,27 +36,25 @@
[detail]      case 4:
[detail]        sb=createDoubleSpinBox(parent);
[detail]        sb->setWrapping(true);
[detail] -      sb->setSuffix(" deg");
[detail] -      connect(sb,SIGNAL(valueChanged(double)), this, SLOT(commitWidget()));
[detail]        sb->setMinimum(0.0);
[detail]        sb->setMaximum(360.0);
[detail]        sb->setSingleStep(5.0);
[detail] +      connect(sb,SIGNAL(valueChanged(double)), this, SLOT(commitWidget()));
[detail]        return sb;
[detail]      case 3:
[detail]      case 5:
[detail]        sb=createDoubleSpinBox(parent);
[detail] -      connect(sb,SIGNAL(valueChanged(double)), this, SLOT(commitWidget()));
[detail]        sb->setMinimum(0.0);
[detail]        sb->setMaximum(std::numeric_limits<double>::infinity());
[detail] +      connect(sb,SIGNAL(valueChanged(double)), this, SLOT(commitWidget()));
[detail]        return sb;
[detail]      case 6:
[detail]        sb=createDoubleSpinBox(parent);
[detail]        sb->setWrapping(true);
[detail] -      sb->setSuffix(" deg");
[detail] -      connect(sb,SIGNAL(valueChanged(double)), this, SLOT(commitWidget()));
[detail]        sb->setMinimum(-90.0);
[detail]        sb->setMaximum(90.0);
[detail]        sb->setSingleStep(5.0);
[detail] +      connect(sb,SIGNAL(valueChanged(double)), this, SLOT(commitWidget()));
[detail]        return sb;
[detail]      case 7:
[detail]        return nullptr;
[detail] @@ -78,37 +76,35 @@
[detail]      case 7:
[detail]        sb=createDoubleSpinBox(parent);
[detail]        sb->setWrapping(true);
[detail] -      sb->setSuffix(" °");
[detail] -      connect(sb,SIGNAL(valueChanged(double)), this, SLOT(commitWidget()));
[detail]        sb->setMinimum(0.0);
[detail]        sb->setMaximum(360.0);
[detail] +      connect(sb,SIGNAL(valueChanged(double)), this, SLOT(commitWidget()));
[detail]        return sb;
[detail]      case 3:
[detail]      case 6:
[detail]      case 8:
[detail]        sb=createDoubleSpinBox(parent);
[detail] -      connect(sb,SIGNAL(valueChanged(double)), this, SLOT(commitWidget()));
[detail]        sb->setMinimum(0.0);
[detail]        sb->setMaximum(std::numeric_limits<double>::infinity());
[detail] +      connect(sb,SIGNAL(valueChanged(double)), this, SLOT(commitWidget()));
[detail]        return sb;
[detail]      case 10:
[detail]        return nullptr;
[detail]      case 4:
[detail]      case 5:
[detail]        sb=createDoubleSpinBox(parent);
[detail] -      connect(sb,SIGNAL(valueChanged(double)), this, SLOT(commitWidget()));
[detail]        sb->setMinimum(-std::numeric_limits<double>::infinity());
[detail]        sb->setMaximum(std::numeric_limits<double>::infinity());
[detail]        sb->setSingleStep(0.1);
[detail] +      connect(sb,SIGNAL(valueChanged(double)), this, SLOT(commitWidget()));
[detail]        return sb;
[detail]      case 9:
[detail]        sb=createDoubleSpinBox(parent);
[detail]        sb->setWrapping(true);
[detail] -      sb->setSuffix(" deg");
[detail] -      connect(sb,SIGNAL(valueChanged(double)), this, SLOT(commitWidget()));
[detail]        sb->setMinimum(-90.0);
[detail]        sb->setMaximum(90.0);
[detail]        sb->setSingleStep(5.0);
[detail] +      connect(sb,SIGNAL(valueChanged(double)), this, SLOT(commitWidget()));
[detail]        return sb;
[detail]  
[detail]      case 0:
[detail] @@ -120,37 +116,6 @@
[detail]    return createLineEdit(parent);
[detail]  }
[detail]  
[detail] -void SourceDelegate::setEditorData(QWidget *editor, const QModelIndex &index) const
[detail] -{
[detail] -  switch(_waveModel) {
[detail] -  case SourceParameters::PlaneWaves:
[detail] -    switch (index.column()) {
[detail] -    case 2:
[detail] -    case 4:
[detail] -    case 6:
[detail] -      break;
[detail] -    default:
[detail] -      ItemDelegate::setEditorData(editor, index);
[detail] -      return;
[detail] -    }
[detail] -    break;
[detail] -  case SourceParameters::CircularWaves:
[detail] -    switch (index.column()) {
[detail] -    case 2:
[detail] -    case 7:
[detail] -    case 9:
[detail] -      break;
[detail] -    default:
[detail] -      ItemDelegate::setEditorData(editor, index);
[detail] -      return;
[detail] -    }
[detail] -    break;
[detail] -  }
[detail] -  DoubleSpinBox * sb=static_cast<DoubleSpinBox *>(editor);
[detail] -  double a=Angle::fromString(index.model()->data(index).toString());
[detail] -  sb->setValue(Angle::radiansToDegrees(a));
[detail] -}
[detail] -
[detail]  QSize SourceDelegate::sizeHint(const QStyleOptionViewItem & option, const QModelIndex & index) const
[detail]  {
[detail]    TRACE;
[detail]                  src/SourceItemModel.cpp:  version-1.2.0	modified out of comments
[detail] --- src/SourceItemModel.cpp-version-1.2.0-stripped	2025-09-28 04:01:32.599636361 +0200
[detail] +++ src/SourceItemModel.cpp-HEAD-stripped	2025-09-28 04:01:32.603636381 +0200
[detail] @@ -58,11 +58,11 @@
[detail]        switch(index.column()) {
[detail]        case 0: return p.name();
[detail]        case 1: return Mode::userPolarization(p.polarization());
[detail] -      case 2: return QString::number(Angle::radiansToDegrees(Angle::mathToGeographic(p.azimuth(_waveModel))))+tr(" deg");
[detail] +      case 2: return Angle::radiansToDegrees(Angle::mathToGeographic(p.azimuth(_waveModel)));
[detail]        case 3: return p.amplitude()*p.amplitude();
[detail] -      case 4: return QString::number(Angle::radiansToDegrees(p.phase()))+tr(" deg");
[detail] +      case 4: return Angle::radiansToDegrees(p.phase());
[detail]        case 5: return p.velocity();
[detail] -      case 6: return QString::number(Angle::radiansToDegrees(p.ellipticity()))+tr(" deg");
[detail] +      case 6: return Angle::radiansToDegrees(p.ellipticity());
[detail]        case 7: {
[detail]            QColor col;
[detail]            guiColor(p.color(), col);
[detail] @@ -75,14 +75,14 @@
[detail]        switch(index.column()) {
[detail]        case 0: return p.name();
[detail]        case 1: return Mode::userPolarization(p.polarization());
[detail] -      case 2: return QString::number(Angle::radiansToDegrees(Angle::mathToGeographic(p.azimuth(_waveModel))))+tr(" deg");
[detail] +      case 2: return Angle::radiansToDegrees(Angle::mathToGeographic(p.azimuth(_waveModel)));
[detail]        case 3: return p.distance();
[detail]        case 4: return p.sourcePoint().x();
[detail]        case 5: return p.sourcePoint().y();
[detail]        case 6: return p.amplitude()*p.amplitude();
[detail] -      case 7: return QString::number(Angle::radiansToDegrees(p.phase()))+tr(" deg");
[detail] +      case 7: return Angle::radiansToDegrees(p.phase());
[detail]        case 8: return p.velocity();
[detail] -      case 9: return QString::number(Angle::radiansToDegrees(p.ellipticity()))+tr(" deg");
[detail] +      case 9: return Angle::radiansToDegrees(p.ellipticity());
[detail]        case 10: {
[detail]            QColor col;
[detail]            guiColor(p.color(), col);
[detail] @@ -163,11 +163,11 @@
[detail]        switch (section) {
[detail]        case 0: return tr("Name");
[detail]        case 1: return tr("Polarization");
[detail] -      case 2: return tr("Azimuth");
[detail] +      case 2: return tr("Azimuth (°)");
[detail]        case 3: return tr("Power");
[detail] -      case 4: return tr("Phase");
[detail] -      case 5: return tr("Velocity");
[detail] -      case 6: return tr("Ellipticity");
[detail] +      case 4: return tr("Phase (°)");
[detail] +      case 5: return tr("Velocity (m/s)");
[detail] +      case 6: return tr("Ellipticity (°)");
[detail]        case 7: return tr("Color");
[detail]        default: break;
[detail]        }
[detail] @@ -176,14 +176,14 @@
[detail]        switch (section) {
[detail]        case 0: return tr("Name");
[detail]        case 1: return tr("Polarization");
[detail] -      case 2: return tr("Azimuth");
[detail] -      case 3: return tr("Distance");
[detail] -      case 4: return tr("X");
[detail] -      case 5: return tr("Y");
[detail] +      case 2: return tr("Azimuth (°)");
[detail] +      case 3: return tr("Distance (m)");
[detail] +      case 4: return tr("X (m)");
[detail] +      case 5: return tr("Y (m)");
[detail]        case 6: return tr("Power");
[detail] -      case 7: return tr("Phase");
[detail] -      case 8: return tr("Velocity");
[detail] -      case 9: return tr("Ellipticity");
[detail] +      case 7: return tr("Phase (°)");
[detail] +      case 8: return tr("Velocity (m)");
[detail] +      case 9: return tr("Ellipticity (°)");
[detail]        case 10: return tr("Color");
[detail]        default: break;
[detail]        }
[detail] @@ -230,6 +230,14 @@
[detail]    endInsertRows();
[detail]  }
[detail]  
[detail] +void SourceItemModel::addSource(const SourceParameters& source)
[detail] +{
[detail] +  TRACE;
[detail] +  beginInsertRows(QModelIndex(), _sources->count(), _sources->count());
[detail] +  _sources->append(source);
[detail] +  endInsertRows();
[detail] +}
[detail] +
[detail]  void SourceItemModel::setSources(QList<SourceParameters>& sources)
[detail]  {
[detail]    TRACE;
[detail] @@ -245,3 +253,11 @@
[detail]    _sources->removeAt(index);
[detail]    endRemoveRows();
[detail]  }
[detail] +
[detail] +void SourceItemModel::clearSources()
[detail] +{
[detail] +  TRACE;
[detail] +  beginResetModel();
[detail] +  _sources->clear();
[detail] +  endResetModel();
[detail] +}
[detail]                     src/SourceSignal.cpp:  version-1.2.0	modified out of comments
[detail] --- src/SourceSignal.cpp-version-1.2.0-stripped	2025-09-28 04:01:32.619636459 +0200
[detail] +++ src/SourceSignal.cpp-HEAD-stripped	2025-09-28 04:01:32.623636477 +0200
[detail] @@ -16,6 +16,7 @@
[detail]      _phaseGenerator=new GlobalRandom;
[detail]      CoreApplication::instance()->addGlobalObject(_phaseGenerator);
[detail]    }
[detail] +  _wavenumber=std::numeric_limits<double>::quiet_NaN();
[detail]  }
[detail]  
[detail]  
[detail] @@ -43,7 +44,7 @@
[detail]    for(int ib=0; ib<blockCount; ib++) {
[detail]      _sigs[ib].resize(ns);
[detail]    }
[detail] -  double k=2.0*M_PI*medium.frequency()/_param.velocity();
[detail] +  _wavenumber=2.0*M_PI*medium.frequency()/_param.velocity();
[detail]    double timePhase=0.0;
[detail]    if(wm==SourceParameters::PlaneWaves) {
[detail]      
[detail] @@ -59,7 +60,7 @@
[detail]        for(int is=0; is<ns; is++) {
[detail]          double az=Point2D().azimuthTo(stations[is]);
[detail]          double r=Point2D().distanceTo(stations[is])*cos(az-_param.azimuth(wm));
[detail] -        bSigs[is].setExp(_param.amplitude(), timePhase+_param.phase()-k*r);
[detail] +        bSigs[is].setExp(_param.amplitude(), timePhase+_param.phase()-_wavenumber*r);
[detail]        }
[detail]      }
[detail]    } else {
[detail] @@ -69,15 +70,16 @@
[detail]          if(ib>0) {
[detail]            timePhase=_phaseGenerator->uniform(0.0, 2.0*M_PI);
[detail]          }
[detail] -        qDebug() << "flat amplitude";
[detail]          for(int is=0; is<ns; is++) {
[detail]            double r=_param.sourcePoint().distanceTo(stations[is]);
[detail]            
[detail] -          bSigs[is].setExp(_param.amplitude(), timePhase+_param.phase()-k*r);
[detail] +          
[detail] +          bSigs[is].setHankelSecondKindFirstOrder(timePhase+_param.phase()-_wavenumber*r);
[detail] +          bSigs[is]*=_param.amplitude();
[detail]          }
[detail]        }
[detail]      } else {
[detail] -      double inv2Qk=k/(2.0*medium.attenuation());
[detail] +      double inv2Qk=_wavenumber/(2.0*medium.attenuation());
[detail]        for(int ib=0; ib<blockCount; ib++) {
[detail]          VectorList<Complex>& bSigs=_sigs[ib];
[detail]          if(ib>0) {
[detail] @@ -85,7 +87,7 @@
[detail]          }
[detail]          for(int is=0; is<ns; is++) {
[detail]            double r=_param.sourcePoint().distanceTo(stations[is]);
[detail] -          bSigs[is].setExp(_param.amplitude()/sqrt(2.0*M_PI*r)*exp(-r*inv2Qk), timePhase+_param.phase()-k*r);
[detail] +          bSigs[is].setExp(_param.amplitude()/sqrt(2.0*M_PI*r)*exp(-r*inv2Qk), timePhase+_param.phase()-_wavenumber*r);
[detail]          }
[detail]        }
[detail]      }
[detail]                             src/main.cpp:  version-1.2.0	modified out of comments
[detail] --- src/main.cpp-version-1.2.0-stripped	2025-09-28 04:01:32.639636555 +0200
[detail] +++ src/main.cpp-HEAD-stripped	2025-09-28 04:01:32.643636574 +0200
[detail] @@ -119,7 +119,9 @@
[detail]    TRACE;
[detail]    ApplicationHelp * h=new ApplicationHelp;
[detail]    h->setOptionSummary( "[OPTIONS] <STATIONS>" );
[detail] -  h->setComments( "Educational tool for FK array response." );
[detail] +  h->setComments("Educational tool for FK array response. STATIONS is a file containing the list of "
[detail] +                 "station names and their X Y coordinates. Station names beginning with 'DAS' are "
[detail] +                 "considered as strain rate measurements for 'VelocityStrainRate' processings.");
[detail]    h->addGroup("gpfksimulator", "gpfksimulator");
[detail]    h->addOption("-p <PARSER_FILE>","Parser to read station file (default=graphical dialog box).");
[detail]    h->addOption("-sources <SOURCE_FILE>","Load a list of sources.");
[detail]                   src/MediumParameters.h:  version-1.2.0	not modified
[detail]                         src/Parameters.h:  version-1.2.0	not modified
[detail]              src/RandomSourceGenerator.h:  version-1.2.0	no last version available
[detail]             src/SimulatedCrossSpectrum.h:  version-1.2.0	modified out of comments
[detail] --- src/SimulatedCrossSpectrum.h-version-1.2.0-stripped	2025-09-28 04:01:32.695636825 +0200
[detail] +++ src/SimulatedCrossSpectrum.h-HEAD-stripped	2025-09-28 04:01:32.699636845 +0200
[detail] @@ -24,6 +24,7 @@
[detail]    void addSource();
[detail]    void setSourceCount(int nSrc);
[detail]    void removeSource(int index);
[detail] +  void clearSources();
[detail]    void setSourceSignals(int iSrc, const SourceParameters& src,
[detail]                          const MediumParameters& medium, int blockCount);
[detail]    int sourceCount() const {return _sourceSig.count();}
[detail] @@ -37,9 +38,13 @@
[detail]  
[detail]    void addVertical();
[detail]    void addThreeComponent(const Complex * sensorRotations);
[detail] +  void addVelocityStrainRate(const Complex * sensorRotations);
[detail]    void addActiveVertical(const ActiveFKSteering& geom);
[detail]    void addActiveRayleigh(const ActiveFKSteering& geom);
[detail]    void addActiveTransverse(const ActiveFKSteering& geom);
[detail] +
[detail] +  int velocityStrainRateMatrixSize() const;
[detail] +  double * horizontalStrainOrientations() const;
[detail]  protected:
[detail]    void addRotatedRadial(int rotationIndex, const Complex * sensorRotations);
[detail]    void addRotatedTransverse(int rotationIndex, const Complex * sensorRotations);
[detail] @@ -52,6 +57,7 @@
[detail]    double _sensorRotation;
[detail]    SourceParameters::WaveModel _waveModel;
[detail]    Complex *** _stationSig;
[detail] +  double * _orientations;
[detail]    VectorList<SourceSignal *> _sourceSig;
[detail]  };
[detail]  
[detail]                          src/Simulator.h:  version-1.2.0	modified out of comments
[detail] --- src/Simulator.h-version-1.2.0-stripped	2025-09-28 04:01:32.715636923 +0200
[detail] +++ src/Simulator.h-HEAD-stripped	2025-09-28 04:01:32.719636941 +0200
[detail] @@ -6,7 +6,6 @@
[detail]  #include <SciFigs.h>
[detail]  #include <ArrayCore.h>
[detail]  
[detail] -#include "SourceParameters.h"
[detail]  #include "MediumParameters.h"
[detail]  #include "Parameters.h"
[detail]  #include "SourceList.h"
[detail] @@ -26,7 +25,6 @@
[detail]    void setKmax(double kmax);
[detail]    void setCrossSection(bool c) {_crossSection=c;}
[detail]    void scan(const QStringList& sources);
[detail] -  void fitCrossSpectrum(GridSearch2D * grid);
[detail]  public slots:
[detail]    bool save(QString fileName=QString());
[detail]    bool load(QString fileName=QString());
[detail] @@ -43,9 +41,11 @@
[detail]    void on_blockCountEdit_valueChanged(int a);
[detail]    void on_attenuationEdit_valueChanged(double q);
[detail]    void on_attenuationButton_toggled(bool checked);
[detail] -  void on_gridSizeEdit_valueChanged(double k);
[detail] +  void on_mapSizeEdit_valueChanged(double k);
[detail]    void on_addSource_clicked();
[detail]    void on_removeSource_clicked();
[detail] +  void on_clearSources_clicked();
[detail] +  void on_randomSources_clicked();
[detail]    void on_crossSectionBut_clicked();
[detail]    void on_maximaBut_clicked();
[detail]    void setSource(QModelIndex topLeft,QModelIndex bottomRight);
[detail] @@ -54,6 +54,10 @@
[detail]    void setKmax();
[detail]    double theoreticalKmax() const;
[detail]  private:
[detail] +  void setKxKyMap();
[detail] +  void setXsYsMap();
[detail] +  void setCrossSpectrumMap();
[detail] +
[detail]    void updateMax();
[detail]    void ellipticitySign();
[detail]    void addSourceMarkers();
[detail] @@ -83,6 +87,7 @@
[detail]  
[detail]    QTimer _kmaxTimer;
[detail]    KmaxSolver * _kmaxSolver;
[detail] +  bool _kmaxAvailable;
[detail]  
[detail]    bool _crossSection;
[detail]  };
[detail]                     src/SourceDelegate.h:  version-1.2.0	modified out of comments
[detail] --- src/SourceDelegate.h-version-1.2.0-stripped	2025-09-28 04:01:32.735637019 +0200
[detail] +++ src/SourceDelegate.h-HEAD-stripped	2025-09-28 04:01:32.735637019 +0200
[detail] @@ -17,7 +17,6 @@
[detail]    void setWaveModel(SourceParameters::WaveModel wm) {_waveModel=wm;}
[detail]  
[detail]    QWidget * createEditor(QWidget *parent, const QStyleOptionViewItem & style, const QModelIndex &index) const;
[detail] -  void setEditorData(QWidget *editor, const QModelIndex &index) const;
[detail]    QSize sizeHint(const QStyleOptionViewItem & option, const QModelIndex & index) const;
[detail]    void paint (QPainter * painter, const QStyleOptionViewItem & option, const QModelIndex & index) const;
[detail]  public slots:
[detail]                    src/SourceItemModel.h:  version-1.2.0	modified out of comments
[detail] --- src/SourceItemModel.h-version-1.2.0-stripped	2025-09-28 04:01:32.751637096 +0200
[detail] +++ src/SourceItemModel.h-HEAD-stripped	2025-09-28 04:01:32.755637116 +0200
[detail] @@ -24,7 +24,9 @@
[detail]  
[detail]    void setSources(QList<SourceParameters>& sources);
[detail]    void addSource();
[detail] +  void addSource(const SourceParameters& source);
[detail]    void removeSource(int index);
[detail] +  void clearSources();
[detail]  private:
[detail]    int colorColumn() const;
[detail]  
[detail]                       src/SourceSignal.h:  version-1.2.0	modified out of comments
[detail] --- src/SourceSignal.h-version-1.2.0-stripped	2025-09-28 04:01:32.771637192 +0200
[detail] +++ src/SourceSignal.h-HEAD-stripped	2025-09-28 04:01:32.775637212 +0200
[detail] @@ -19,10 +19,12 @@
[detail]                       int blockCount,
[detail]                       const VectorList<Point2D>& stations);
[detail]    Complex stationSignal(int blockIndex, int stationIndex) const {return _sigs[blockIndex].at(stationIndex);}
[detail] +  double wavenumber() const {return _wavenumber;}
[detail]    const SourceParameters& parameters() const {return _param;}
[detail]  private:
[detail]    static GlobalRandom * _phaseGenerator;
[detail]    VectorList<Complex> * _sigs;
[detail] +  double _wavenumber;
[detail]    SourceParameters _param;
[detail]  };
[detail]  
[detail]             src/RandomSourceGenerator.ui:  version-1.2.0	no last version available
[detail]                         src/Simulator.ui:  version-1.2.0	modified out of comments
[detail] --- src/Simulator.ui-version-1.2.0-stripped	2025-09-28 04:01:32.799637329 +0200
[detail] +++ src/Simulator.ui-HEAD-stripped	2025-09-28 04:01:32.799637329 +0200
[detail] @@ -148,6 +148,16 @@
[detail]                  <string>Beam power at fixed ell.</string>
[detail]                 </property>
[detail]                </item>
[detail] +              <item>
[detail] +               <property name="text">
[detail] +                <string>Local source velocity</string>
[detail] +               </property>
[detail] +              </item>
[detail] +              <item>
[detail] +               <property name="text">
[detail] +                <string>Cross spectral matrix</string>
[detail] +               </property>
[detail] +              </item>
[detail]               </widget>
[detail]              </item>
[detail]              <item row="2" column="2">
[detail] @@ -219,7 +229,7 @@
[detail]              <item row="2" column="0">
[detail]               <widget class="QLabel" name="label_2">
[detail]                <property name="text">
[detail] -               <string>FK Grid size</string>
[detail] +               <string>Map size</string>
[detail]                </property>
[detail]               </widget>
[detail]              </item>
[detail] @@ -258,16 +268,13 @@
[detail]               <widget class="QComboBox" name="processType"/>
[detail]              </item>
[detail]              <item row="2" column="1">
[detail] -             <widget class="QGpGuiTools::DoubleSpinBox" name="gridSizeEdit">
[detail] +             <widget class="QGpGuiTools::DoubleSpinBox" name="mapSizeEdit">
[detail]                <property name="minimumSize">
[detail]                 <size>
[detail]                  <width>50</width>
[detail]                  <height>0</height>
[detail]                 </size>
[detail]                </property>
[detail] -              <property name="suffix">
[detail] -               <string> rad/m</string>
[detail] -              </property>
[detail]                <property name="decimals">
[detail]                 <number>3</number>
[detail]                </property>
[detail] @@ -350,7 +357,7 @@
[detail]             <item>
[detail]              <widget class="QPushButton" name="clearSources">
[detail]               <property name="enabled">
[detail] -              <bool>false</bool>
[detail] +              <bool>true</bool>
[detail]               </property>
[detail]               <property name="text">
[detail]                <string>Clear</string>
[detail] @@ -358,6 +365,13 @@
[detail]              </widget>
[detail]             </item>
[detail]             <item>
[detail] +            <widget class="QPushButton" name="randomSources">
[detail] +             <property name="text">
[detail] +              <string>Random</string>
[detail] +             </property>
[detail] +            </widget>
[detail] +           </item>
[detail] +           <item>
[detail]              <spacer>
[detail]               <property name="orientation">
[detail]                <enum>Qt::Vertical</enum>
[detail] @@ -396,7 +410,7 @@
[detail]         </item>
[detail]        </layout>
[detail]       </widget>
[detail] -     <widget class="SciFigs::AxisWindow" name="waveNumMap" native="true">
[detail] +     <widget class="SciFigs::AxisWindow" name="map" native="true">
[detail]        <property name="sizePolicy">
[detail]         <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
[detail]          <horstretch>0</horstretch>
[summary] Total differences: 1380 lines
[summary] Modification level is C
OLD_DIR=$(pwd)
echo "gpfksimulator"
cd $(find . -name "gpfksimulator" | tail -n 1) || exit 2
pwd
dpversion C  || exit 2
cd $OLD_DIR || exit 2
################## gpmaplayer
[detail]                src/ColumnImageMerger.cpp:  version-1.0.4	not modified
[detail]                      src/ImageMerger.cpp:  version-1.0.4	modified out of comments
[detail] --- src/ImageMerger.cpp-version-1.0.4-stripped	2025-09-28 04:01:32.863637638 +0200
[detail] +++ src/ImageMerger.cpp-HEAD-stripped	2025-09-28 04:01:32.863637638 +0200
[detail] @@ -51,11 +51,11 @@
[detail]    TRACE;
[detail]    s->removeTrend();
[detail]    FilterParameters fparam;
[detail] -  fparam.setBand(FilterParameters::HighPass);
[detail]    fparam.setMethod(FilterParameters::FrequencyWindow);
[detail] -  fparam.setFrequencyRange(_filterFrequency);
[detail] -  fparam.setWidth(0.1);
[detail] -  fparam.frequencyWindow().setShape(WindowFunctionParameters::Cosine);
[detail] +  fparam.setBand(FilterParameters::HighPass);
[detail] +  fparam.frequencyWindow().setMinimumFrequency(_filterFrequency);
[detail] +  fparam.frequencyWindow().window().setShape(WindowFunctionParameters::Cosine);
[detail] +  fparam.frequencyWindow().setWidth(0.1);
[detail]    s->filter(fparam);
[detail]    
[detail]    DoubleSignal * sCut=new DoubleSignal(s->nSamples()-100);
[detail] @@ -67,21 +67,21 @@
[detail]  void ImageMerger::exportDebugSignals(DoubleSignal * newVector, DoubleSignal * mainVector, DoubleSignal * corr)
[detail]  {
[detail]    TRACE;
[detail] -  Signal * tmp1=new Signal(GeopsyCoreEngine::instance()->defaultDatabase());
[detail] -  tmp1->setNSamples(newVector->nSamples());
[detail] +  SignalSegment * tmp1=new SignalSegment(GeopsyCoreEngine::instance()->defaultDatabase());
[detail] +  tmp1->setSize(newVector->nSamples());
[detail]    tmp1->setSamplingPeriod(1.0);
[detail] -  tmp1->DoubleSignal::copySamplesFrom(newVector);
[detail] -  tmp1->multiply(1e3);
[detail] -  Signal * tmp2=new Signal(GeopsyCoreEngine::instance()->defaultDatabase());
[detail] -  tmp2->setNSamples(mainVector->nSamples());
[detail] -  tmp2->DoubleSignal::copySamplesFrom(mainVector);
[detail] +  tmp1->values()->copySamplesFrom(newVector);
[detail] +  tmp1->values()->multiply(1e3);
[detail] +  SignalSegment * tmp2=new SignalSegment(GeopsyCoreEngine::instance()->defaultDatabase());
[detail] +  tmp2->setSize(mainVector->nSamples());
[detail] +  tmp2->values()->copySamplesFrom(mainVector);
[detail]    tmp2->setSamplingPeriod(1.0);
[detail] -  tmp2->multiply(1e3);
[detail] -  Signal * tmp3=new Signal(GeopsyCoreEngine::instance()->defaultDatabase());
[detail] -  tmp3->setNSamples(corr->nSamples());
[detail] -  tmp3->DoubleSignal::copySamplesFrom(corr);
[detail] +  tmp2->values()->multiply(1e3);
[detail] +  SignalSegment * tmp3=new SignalSegment(GeopsyCoreEngine::instance()->defaultDatabase());
[detail] +  tmp3->setSize(corr->nSamples());
[detail] +  tmp3->values()->copySamplesFrom(corr);
[detail]    tmp3->setSamplingPeriod(1.0);
[detail] -  tmp3->multiply(1e3);
[detail] +  tmp3->values()->multiply(1e3);
[detail]    SubSignalPool pool;
[detail]    pool.addSignal(tmp1);
[detail]    
[detail]                      src/ImageSource.cpp:  version-1.0.4	not modified
[detail]                   src/RowImageMerger.cpp:  version-1.0.4	not modified
[detail]                             src/main.cpp:  version-1.0.4	not modified
[detail]                  src/ColumnImageMerger.h:  version-1.0.4	not modified
[detail]                        src/ImageMerger.h:  version-1.0.4	not modified
[detail]                        src/ImageSource.h:  version-1.0.4	not modified
[detail]                     src/RowImageMerger.h:  version-1.0.4	not modified
[summary] Total differences: 52 lines
[summary] Modification level is C
OLD_DIR=$(pwd)
echo "gpmaplayer"
cd $(find . -name "gpmaplayer" | tail -n 1) || exit 2
pwd
dpversion C  || exit 2
cd $OLD_DIR || exit 2
################## dinvermatlab
[detail]                          src/Forward.cpp:  version-1.0.4	not modified
[detail]                     src/MatlabPlugin.cpp:  version-1.0.4	not modified
[detail]                     src/MatlabTarget.cpp:  version-1.0.4	not modified
[detail]               src/MatlabTargetWidget.cpp:  version-1.0.4	not modified
[detail]                            src/Forward.h:  version-1.0.4	not modified
[detail]                       src/MatlabPlugin.h:  version-1.0.4	not modified
[detail]                       src/MatlabTarget.h:  version-1.0.4	not modified
[detail]                 src/MatlabTargetWidget.h:  version-1.0.4	not modified
[detail]                src/MatlabTargetWidget.ui:  version-1.0.4	not modified
# No modification since last version
################## matfiles
[detail]                         src/MatArray.cpp:  version-1.0.4	not modified
[detail]                       src/MatContext.cpp:  version-1.0.4	not modified
[detail]                        src/MatFormat.cpp:  version-1.0.4	modified out of comments
[detail] --- src/MatFormat.cpp-version-1.0.4-stripped	2025-09-28 04:01:33.223639378 +0200
[detail] +++ src/MatFormat.cpp-HEAD-stripped	2025-09-28 04:01:33.231639416 +0200
[detail] @@ -168,16 +168,14 @@
[detail]          int nSamples=mxGetDimensions(array)[0];
[detail]          int n0=qCeil(log10(nChannels));
[detail]          for(int iChan=0; iChan<nChannels; iChan++) {
[detail] -          Signal * newSignal=new Signal(file->database());
[detail] +          SignalSegment * newSignal=new SignalSegment(file->database());
[detail]            newSignal->setFile(file);
[detail] -          newSignal->setNumberInFile(iSig);
[detail] -          newSignal->setNSamples(nSamples);
[detail] -          newSignal->setOffsetInFile(iChan); 
[detail] -          newSignal->setMetaData(MatlabVariableName(variableName));
[detail] -          newSignal->addMetaData(vn);
[detail] -          newSignal->setType(Signal::Waveform);
[detail] +          newSignal->setIndexInFile(iSig);
[detail] +          newSignal->setSize(nSamples);
[detail] +          newSignal->setFileData(OffsetInFile(iChan)); 
[detail] +          newSignal->setFileData(MatlabVariableName(variableName));
[detail]            SignalFile::setSignalName(newSignal, variableName, QString("_%1").arg(iChan, n0, 10, QChar('0')), iChan, file->shortName());
[detail] -          newSignal->setComponent(Signal::UndefinedComponent);
[detail] +          newSignal->metaData()->setComponent(SignalMetaData::UndefinedComponent);
[detail]            iSig++;
[detail]          }
[detail]        } else {
[detail] @@ -196,9 +194,9 @@
[detail]    }
[detail]    MatContext * context=new MatContext;
[detail]    MatReader mr(context);
[detail] -  if(!mr.read(file->name())) {
[detail] +  if(!mr.read(file->name(IndexOfFile::null))) {
[detail]      delete context;
[detail] -    App::log(tr("Error reading file %1\n").arg(file->name()) );
[detail] +    App::log(tr("Error reading file %1\n").arg(file->name(IndexOfFile::null)));
[detail]      return false;
[detail]    }
[detail]    _contexts.insert(file, context);
[detail] @@ -206,7 +204,7 @@
[detail]    
[detail]    
[detail]    
[detail] -  int iSig=0;
[detail] +  IndexInFileSet iChannel;
[detail]    for(int i=0; i<context->arrayCount(); i++) {
[detail]      MatArray * array=context->array(i);
[detail]      
[detail] @@ -214,16 +212,16 @@
[detail]        int nSamples=array->dimension(0);
[detail]        int n0=qCeil(log10(nChannels));
[detail]        for(int iChan=0; iChan<nChannels; iChan++) {
[detail] -        Signal * newSignal=new Signal(file->database());
[detail] +        SignalSegment * newSignal=new SignalSegment(file->database());
[detail]          newSignal->setFile(file);
[detail] -        newSignal->setNumberInFile(iSig);
[detail] -        newSignal->setNSamples(nSamples);
[detail] -        newSignal->setOffsetInFile(iChan); 
[detail] -        newSignal->setMetaData(MatlabVariableName(array->name()));
[detail] -        newSignal->setType(Signal::Waveform);
[detail] -        SignalFile::setSignalName(newSignal, array->name(), QString("_%1").arg(iChan, n0, 10, QChar('0')), iChan, file->shortName());
[detail] -        newSignal->setComponent(Signal::UndefinedComponent);
[detail] -        iSig++;
[detail] +        newSignal->setIndexInFile(iChannel);
[detail] +        newSignal->setSize(nSamples);
[detail] +        newSignal->fileData().set<OffsetInFile>(iChan); 
[detail] +        newSignal->fileData().set<MatlabVariableName>(array->name());
[detail] +        SignalFile::setSignalName(newSignal, array->name(), QString("_%1").arg(iChan, n0, 10, QChar('0')), iChan,
[detail] +                                  file->shortDisplayName(IndexOfFile::null));
[detail] +        newSignal->metaData()->setComponent(SignalMetaData::UndefinedComponent);
[detail] +        iChannel++;
[detail]        }
[detail]      
[detail]    }
[detail] @@ -231,10 +229,10 @@
[detail]  #endif
[detail]  }
[detail]  
[detail] -bool MatFormat::load(const Signal * sig, double * samples) const
[detail] +bool MatFormat::load(const SignalSegment * sig, double * samples) const
[detail]  {
[detail]    TRACE;
[detail] -  const MatlabVariableName& variableName=sig->metaData<MatlabVariableName>();
[detail] +  const MatlabVariableName& variableName=sig->fileData().get<MatlabVariableName>();
[detail]  #ifdef GP_MATLAB_LIBS
[detail]    MATFile * fmat=MatFormatPrivate::open(sig->file()->name());
[detail]    if(!fmat) {
[detail] @@ -243,30 +241,30 @@
[detail]    mxArray * array=matGetVariable(fmat, variableName.value().toLatin1().data());
[detail]    
[detail]    int nSamples=sig->nSamples();
[detail] -  double * ptr=mxGetPr(array)+nSamples*sig->numberInFile();
[detail] +  double * ptr=mxGetPr(array)+nSamples*sig->fileData<NumberInFile>().value();
[detail]    memcpy(samples, ptr, sizeof(double)*nSamples);
[detail]    mxDestroyArray(array);
[detail]    matClose(fmat);
[detail]    return true;
[detail]  #else
[detail]    MatContext * context;
[detail] -  QMap<SignalFile *, MatContext *>::const_iterator it=_contexts.find(sig->file());
[detail] +  QMap<SignalFile *, MatContext *>::const_iterator it=_contexts.find(static_cast<SignalFile *>(sig->file()));
[detail]    if(it==_contexts.end()) {
[detail]      context=new MatContext;
[detail]      MatReader mr(context);
[detail] -    if(!mr.read(sig->file()->name())) {
[detail] +    if(!mr.read(sig->file()->name(IndexOfFile::null))) {
[detail]        delete context;
[detail] -      App::log(tr("Error reading file %1\n").arg(sig->file()->name()));
[detail] +      App::log(tr("Error reading file %1\n").arg(sig->file()->name(IndexOfFile::null)));
[detail]        return false;
[detail]      }
[detail] -    _contexts.insert(sig->file(), context);
[detail] +    _contexts.insert(static_cast<SignalFile *>(sig->file()), context);
[detail]    } else {
[detail]      context=it.value();
[detail]    }
[detail]    MatArray * array=context->array(variableName.value());
[detail]    if(array) {
[detail] -    int nSamples=sig->nSamples();
[detail] -    double * ptr=array->realDoubleValues()+sig->offsetInFile()*array->dimension(0);
[detail] +    int nSamples=sig->size();
[detail] +    double * ptr=array->realDoubleValues()+sig->fileData().get<OffsetInFile>().value()*array->dimension(0);
[detail]      for(int i=0; i<nSamples; i++) {
[detail]        samples[i]=*ptr;
[detail]        ptr++;
[detail] @@ -282,8 +280,8 @@
[detail]  bool MatFormat::save(const SubSignalPool& subpool, const QString& filePath) const
[detail]  {
[detail]    TRACE;
[detail] -#ifdef GP_MATLAB_LIBS
[detail]    App::log(tr("Export of mat-files not yet supported (if you need it, send a request to the developers.\n") );
[detail] +#ifdef GP_MATLAB_LIBS
[detail]    return true;
[detail]  #else
[detail]    Q_UNUSED(subpool)
[detail]                        src/MatReader.cpp:  version-1.0.4	not modified
[detail]               src/MatlabVariableName.cpp:  version-1.0.4	not modified
[detail]                           src/Plugin.cpp:  version-1.0.4	not modified
[detail]                           src/MatArray.h:  version-1.0.4	not modified
[detail]                         src/MatContext.h:  version-1.0.4	not modified
[detail]                          src/MatFormat.h:  version-1.0.4	modified out of comments
[detail] --- src/MatFormat.h-version-1.0.4-stripped	2025-09-28 04:01:33.327639880 +0200
[detail] +++ src/MatFormat.h-HEAD-stripped	2025-09-28 04:01:33.331639900 +0200
[detail] @@ -20,7 +20,7 @@
[detail]    bool isReadOnly() const {return false;}
[detail]  
[detail]    bool load(SignalFile * file) const;
[detail] -  bool load(const Signal * sig, double * samples) const;
[detail] +  bool load(const SignalSegment * sig, double * samples) const;
[detail]    bool save(const SubSignalPool& subpool, const QString& filePath) const;
[detail]  private:
[detail]  #ifndef GP_MATLAB_LIBS
[detail]                          src/MatReader.h:  version-1.0.4	not modified
[detail]                 src/MatlabVariableName.h:  version-1.0.4	not modified
[detail]                             src/Plugin.h:  version-1.0.4	not modified
[summary] Total differences: 144 lines
[summary] Modification level is C
OLD_DIR=$(pwd)
echo "matfiles"
cd $(find . -name "matfiles" | tail -n 1) || exit 2
pwd
dpversion C  || exit 2
cd $OLD_DIR || exit 2
################## GeopsyLand
[detail]                       src/MainWindow.cpp:  version-1.0.5	not modified
[detail]                         src/MiniBash.cpp:  version-1.0.5	not modified
[detail]                         src/Terminal.cpp:  version-1.0.5	not modified
[detail]                  src/TerminalProcess.cpp:  version-1.0.5	not modified
[detail]                             src/main.cpp:  version-1.0.5	not modified
[detail]                         src/MainWindow.h:  version-1.0.5	not modified
[detail]                           src/MiniBash.h:  version-1.0.5	not modified
[detail]                           src/Terminal.h:  version-1.0.5	not modified
[detail]                    src/TerminalProcess.h:  version-1.0.5	not modified
[detail]                        src/MainWindow.ui:  version-1.0.5	not modified
# No modification since last version
################## gpvoronoi
[detail]                           src/Reader.cpp:  version-1.0.2	not modified
[detail]                             src/main.cpp:  version-1.0.2	not modified
[detail]                             src/Reader.h:  version-1.0.2	not modified
# No modification since last version
################## screenpicker
[detail]                        src/MouseGrab.cpp:  version-1.0.1	modified out of comments
[detail] --- src/MouseGrab.cpp-version-1.0.1-stripped	2025-09-28 04:01:33.711641736 +0200
[detail] +++ src/MouseGrab.cpp-HEAD-stripped	2025-09-28 04:01:33.715641756 +0200
[detail] @@ -3,6 +3,8 @@
[detail]  #include <QtGui>
[detail]  
[detail]  #include "MouseGrab.h"
[detail] +#include "WaylandPickWidget.h"
[detail] +#include "Picker.h"
[detail]  
[detail]  
[detail]  
[detail] @@ -12,10 +14,13 @@
[detail]  {
[detail]    TRACE;
[detail]    setupUi(this);
[detail] -  stopButton->setEnabled(false);
[detail]    _stream=nullptr;
[detail] -  _count=0;
[detail]    Application::instance()->setStream(log , QThread::currentThread());
[detail] +  _wayland=nullptr;
[detail] +  _picker=new Picker(this);
[detail] +  connect(_picker, SIGNAL(newPoint(double, double)),
[detail] +          this, SLOT(newPoint(double, double)));
[detail] +  connect(_picker, SIGNAL(finished()), this, SLOT(finished()));
[detail]  }
[detail]  
[detail]  
[detail] @@ -25,6 +30,7 @@
[detail]    log->remove();
[detail]    releaseMouse();
[detail]    closeStream();
[detail] +  delete _wayland;
[detail]  }
[detail]  
[detail]  void MouseGrab::closeStream()
[detail] @@ -33,6 +39,7 @@
[detail]    if(_stream) {
[detail]      delete _stream->device();
[detail]      delete _stream;
[detail] +    _stream=nullptr;
[detail]    }
[detail]  }
[detail]  
[detail] @@ -47,45 +54,53 @@
[detail]        delete f;
[detail]      } else {
[detail]        App::log(tr("Saving to file %1\n").arg(fileName));
[detail] -      closeStream();
[detail] +      App::log(tr("Press ESC to finish\n"));
[detail]        _stream=new QTextStream(f);
[detail] -      grabMouse();
[detail] -      QCursor c(QPixmap(":cross.png"));
[detail] -      c.setPos(15, 15);
[detail] -      setCursor(c);
[detail] +      if(QGuiApplication::platformName()=="wayland") {
[detail] +        setWindowFlag(Qt::WindowStaysOnTopHint, true);
[detail] +        _wayland=new WaylandPickWidget;
[detail] +        _wayland->setPicker(_picker);
[detail] +        _wayland->showMaximized();
[detail] +      }
[detail]        startButton->setEnabled(false);
[detail] -      stopButton->setEnabled(true);
[detail]        if(!referenceSystemEdit->isCheckable() || referenceSystemEdit->isChecked()) {
[detail] -        _realMinimumX=realMinimumXEdit->text().toDouble();
[detail] -        _realMaximumX=realMaximumXEdit->text().toDouble();
[detail] -        _realMinimumY=realMinimumYEdit->text().toDouble();
[detail] -        _realMaximumY=realMaximumYEdit->text().toDouble();
[detail] -        _xLogScale=xLogScaleEdit->isChecked();
[detail] -        _yLogScale=yLogScaleEdit->isChecked();
[detail] -        _count=0;
[detail] -        App::log(tr("Setting reference points...\n"
[detail] -                    "  Click on minimum X\n"));
[detail] +        _picker->setRealMinimumX(realMinimumXEdit->text().toDouble());
[detail] +        _picker->setRealMaximumX(realMaximumXEdit->text().toDouble());
[detail] +        _picker->setRealMinimumY(realMinimumYEdit->text().toDouble());
[detail] +        _picker->setRealMaximumY(realMaximumYEdit->text().toDouble());
[detail] +        _picker->setXLogScale(xLogScaleEdit->isChecked());
[detail] +        _picker->setYLogScale(yLogScaleEdit->isChecked());
[detail] +        if(_wayland) {
[detail] +          _picker->start(true, _wayland);
[detail]        } else {
[detail] -        _count=4;
[detail] -        App::log(tr("Re-using existing reference system\n"
[detail] -                    "Digitalization of the curve...\n"));
[detail] +          _picker->start(true, this);
[detail] +        }
[detail] +      } else {
[detail] +        if(_wayland) {
[detail] +          _picker->start(false, _wayland);
[detail] +        } else {
[detail] +          _picker->start(false, this);
[detail] +        }
[detail]        }
[detail]      }
[detail]    }
[detail]  }
[detail]  
[detail] -
[detail] -void MouseGrab::mouseReleaseEvent(QMouseEvent * event)
[detail] +void MouseGrab::keyReleaseEvent(QKeyEvent * event)
[detail]  {
[detail] -  TRACE;
[detail] -  if(stopButton->geometry().contains(event->pos())) {
[detail] +  if(event->key()==Qt::Key_Escape) {
[detail]      releaseMouse();
[detail]      QCursor c(Qt::ArrowCursor);
[detail]      setCursor(c);
[detail] -    event->ignore();
[detail] -    startButton->setEnabled(true);
[detail] -    stopButton->setEnabled(false);
[detail] +    _picker->end();
[detail]    } else {
[detail] +    QWidget::keyReleaseEvent(event);
[detail] +  }
[detail] +}
[detail] +
[detail] +void MouseGrab::mouseReleaseEvent(QMouseEvent * event)
[detail] +{
[detail] +  TRACE;
[detail]      if(event->button()==Qt::LeftButton) {
[detail]  #if(QT_VERSION>=QT_VERSION_CHECK(6, 0, 0))
[detail]        double x=event->globalPosition().x();
[detail] @@ -94,52 +109,31 @@
[detail]        double x=event->globalX();
[detail]        double y=event->globalY();
[detail]  #endif
[detail] -      switch(_count) {
[detail] -      case 0:
[detail] -        _screenMinimumX=x;
[detail] -        App::log(tr("    minimum X=%1\n"
[detail] -                    "  Click on maximum X\n").arg(x));
[detail] -        break;
[detail] -      case 1:
[detail] -        _screenMaximumX=x;
[detail] -        App::log(tr("    maximum X=%1\n"
[detail] -                    "  Click on minimum Y\n").arg(x));
[detail] -        break;
[detail] -      case 2:
[detail] -        _screenMinimumY=y;
[detail] -        App::log(tr("    minimum Y=%1\n"
[detail] -                    "  Click on maximum Y\n").arg(y));
[detail] -        break;
[detail] -      case 3:
[detail] -        _screenMaximumY=y;
[detail] -        App::log(tr("    maximum Y=%1\n"
[detail] -                    "  Reference points set\n"
[detail] -                    "Digitalization of the curve...\n").arg(y));
[detail] +    _picker->addPoint(x, y);
[detail] +    event->accept();
[detail] +  }
[detail] +}
[detail] +
[detail] +void MouseGrab::newPoint(double x, double y)
[detail] +{
[detail] +  TRACE;
[detail] +  if(!referenceSystemEdit->isCheckable()) {
[detail]          referenceSystemEdit->setCheckable(true);
[detail]          referenceSystemEdit->setChecked(false);
[detail] -        break;
[detail] -      default:
[detail] -        App::log(tr("point (%1): %2 %3 --> ").arg(_count-3).arg(x).arg(y));
[detail] -        if(_xLogScale) {
[detail] -          x=::exp(::log(_realMinimumX)+(x-_screenMinimumX)/
[detail] -                  (_screenMaximumX-_screenMinimumX)*(::log(_realMaximumX/_realMinimumX)));
[detail] -        } else {
[detail] -          x=_realMinimumX+(x-_screenMinimumX)/
[detail] -              (_screenMaximumX-_screenMinimumX)*(_realMaximumX-_realMinimumX);
[detail] -        }
[detail] -        if(_yLogScale) {
[detail] -          y=::exp(::log(_realMinimumY)+(y-_screenMinimumY)/
[detail] -                  (_screenMaximumY-_screenMinimumY)*(::log(_realMaximumY/_realMinimumY)));
[detail] -        } else {
[detail] -          y=_realMinimumY+(y-_screenMinimumY)/
[detail] -              (_screenMaximumY-_screenMinimumY)*(_realMaximumY-_realMinimumY);
[detail]          }
[detail]          (*_stream) << x << " " << y << Qt::endl;
[detail] -        App::log(tr("%1 %2\n").arg(x).arg(y));
[detail] -        break;
[detail]        }
[detail] -      _count++;
[detail] -    }
[detail] -    event->accept();
[detail] +
[detail] +
[detail] +void MouseGrab::finished()
[detail] +{
[detail] +  TRACE;
[detail] +  if(_wayland) {
[detail] +    setWindowFlag(Qt::WindowStaysOnTopHint, false);
[detail] +    _wayland->deleteLater();
[detail] +    _wayland=nullptr;
[detail]    }
[detail] +  startButton->setEnabled(true);
[detail] +  App::log(tr("File saved\n"));
[detail] +  closeStream();
[detail]  }
[detail]                           src/Picker.cpp:  version-1.0.1	no last version available
[detail]                src/WaylandPickWidget.cpp:  version-1.0.1	no last version available
[detail]                             src/main.cpp:  version-1.0.1	not modified
[detail]                          src/MouseGrab.h:  version-1.0.1	modified out of comments
[detail] --- src/MouseGrab.h-version-1.0.1-stripped	2025-09-28 04:01:33.759641967 +0200
[detail] +++ src/MouseGrab.h-HEAD-stripped	2025-09-28 04:01:33.767642007 +0200
[detail] @@ -7,24 +7,28 @@
[detail]  
[detail]  #include "ui_MouseGrab.h"
[detail]  
[detail] +class WaylandPickWidget;
[detail] +class Picker;
[detail] +
[detail]  class MouseGrab : public QWidget, private Ui::MouseGrab
[detail]  {
[detail]    Q_OBJECT
[detail]  public:
[detail]    MouseGrab(QWidget * parent=0);
[detail]    ~MouseGrab();
[detail] -
[detail] -  virtual void mouseReleaseEvent(QMouseEvent * event);
[detail] +protected:
[detail] +  void mouseReleaseEvent(QMouseEvent * event);
[detail] +  void keyReleaseEvent(QKeyEvent * event);
[detail] +private slots:
[detail] +  void newPoint(double x, double y);
[detail] +  void finished();
[detail] +  void on_startButton_clicked();
[detail]  private:
[detail]    void closeStream();
[detail]  
[detail]    QTextStream * _stream;
[detail] -  int _count;
[detail] -  double _realMinimumX, _realMaximumX, _realMinimumY, _realMaximumY;
[detail] -  double _screenMinimumX, _screenMaximumX, _screenMinimumY, _screenMaximumY;
[detail] -  bool _xLogScale, _yLogScale;
[detail] -private slots:
[detail] -  void on_startButton_clicked();
[detail] +  WaylandPickWidget * _wayland;
[detail] +  Picker * _picker;
[detail]  };
[detail]  
[detail]  #endif 
[detail]                             src/Picker.h:  version-1.0.1	no last version available
[detail]                  src/WaylandPickWidget.h:  version-1.0.1	no last version available
[detail]                         src/MouseGrab.ui:  version-1.0.1	modified out of comments
[detail] --- src/MouseGrab.ui-version-1.0.1-stripped	2025-09-28 04:01:33.795642141 +0200
[detail] +++ src/MouseGrab.ui-HEAD-stripped	2025-09-28 04:01:33.799642161 +0200
[detail] @@ -6,8 +6,8 @@
[detail]     <rect>
[detail]      <x>0</x>
[detail]      <y>0</y>
[detail] -    <width>227</width>
[detail] -    <height>329</height>
[detail] +    <width>360</width>
[detail] +    <height>399</height>
[detail]     </rect>
[detail]    </property>
[detail]    <property name="windowTitle">
[detail] @@ -26,13 +26,6 @@
[detail]         </property>
[detail]        </widget>
[detail]       </item>
[detail] -     <item>
[detail] -      <widget class="QPushButton" name="stopButton">
[detail] -       <property name="text">
[detail] -        <string>Stop</string>
[detail] -       </property>
[detail] -      </widget>
[detail] -     </item>
[detail]       <item>
[detail]        <spacer name="horizontalSpacer">
[detail]         <property name="orientation">
[summary] Total differences: 262 lines
[summary] Modification level is C
OLD_DIR=$(pwd)
echo "screenpicker"
cd $(find . -name "screenpicker" | tail -n 1) || exit 2
pwd
dpversion C  || exit 2
cd $OLD_DIR || exit 2
################## phaseit
[detail]                     src/CurveResults.cpp:  version-1.0.3	not modified
[detail]                      src/GridResults.cpp:  version-1.0.3	modified out of comments
[detail] --- src/GridResults.cpp-version-1.0.3-stripped	2025-09-28 04:01:33.867642489 +0200
[detail] +++ src/GridResults.cpp-HEAD-stripped	2025-09-28 04:01:33.871642509 +0200
[detail] @@ -118,7 +118,7 @@
[detail]    sheet()->addObject(_colorMapCoherence);
[detail]  
[detail]    _colorMapPhase->setObjectName("ColorMapPhase");
[detail] -  _colorMapPhase->generate(0, 10, ColorPalette::defaultDiverging);
[detail] +  _colorMapPhase->generate(0, 10, 1, ColorPalette::defaultDiverging);
[detail]    _colorMapPhase->setNumberPrecision(0);
[detail]    _colorMapPhase->setTitle("Phase shift (%)");
[detail]    _colorMapPhase->setValues(-18.0, 18.0, SamplingParameters::Linear);
[detail] @@ -129,7 +129,7 @@
[detail]    sheet()->addObject(_colorMapPhase);
[detail]  
[detail]    _colorMapAmplitude->setObjectName("ColorMapAmplitude");
[detail] -  _colorMapAmplitude->generate(0, 10, ColorPalette::defaultDiverging);
[detail] +  _colorMapAmplitude->generate(0, 10, 1, ColorPalette::defaultDiverging);
[detail]    _colorMapAmplitude->setNumberPrecision(0);
[detail]    _colorMapAmplitude->setTitle("Spectral ratio");
[detail]    _colorMapAmplitude->setValues(0.5, 2.0, SamplingParameters::Log);
[detail]                       src/Parameters.cpp:  version-1.0.3	not modified
[detail]                           src/Plugin.cpp:  version-1.0.3	not modified
[detail]                   src/ProcessSignals.cpp:  version-1.0.3	not modified
[detail]                      src/TaskManager.cpp:  version-1.0.3	not modified
[detail]                             src/Tool.cpp:  version-1.0.3	not modified
[detail]                       src/ToolWidget.cpp:  version-1.0.3	modified out of comments
[detail] --- src/ToolWidget.cpp-version-1.0.3-stripped	2025-09-28 04:01:33.975643011 +0200
[detail] +++ src/ToolWidget.cpp-HEAD-stripped	2025-09-28 04:01:33.979643031 +0200
[detail] @@ -53,10 +53,10 @@
[detail]    TRACE;
[detail]    AbstractToolWidget::restoreFields();
[detail]    if(timeWindowLayer()) {
[detail] -    connect(timeWindowLayer(), SIGNAL(addWindows(const Signal *, const TimeRange&)),
[detail] -            this, SLOT(manualAddWindows(const Signal *, const TimeRange&)));
[detail] -    connect(timeWindowLayer(), SIGNAL(removeWindows(const Signal *, const TimeRange&)),
[detail] -            this, SLOT(manualRemoveWindows(const Signal *, const TimeRange&)));
[detail] +    connect(timeWindowLayer(), SIGNAL(addWindows(const SignalSegment *, const TimeRange&)),
[detail] +            this, SLOT(manualAddWindows(const SignalSegment *, const TimeRange&)));
[detail] +    connect(timeWindowLayer(), SIGNAL(removeWindows(const SignalSegment *, const TimeRange&)),
[detail] +            this, SLOT(manualRemoveWindows(const SignalSegment *, const TimeRange&)));
[detail]    }
[detail]  }
[detail]  
[detail] @@ -81,7 +81,7 @@
[detail]    }
[detail]    
[detail]    for(int i=0; i<tool()->componentCount(); i++) {
[detail] -    winParam->addComponent(Signal::userName(tool()->component(i)));
[detail] +    winParam->addComponent(SignalMetaData::userName(tool()->component(i)));
[detail]    }
[detail]    int nStat=tool()->stationCount();
[detail]    for(int i=0; i<nStat; i++) {
[detail] @@ -158,7 +158,7 @@
[detail]    }
[detail]  }
[detail]  
[detail] -void ToolWidget::manualAddWindows(const Signal *, const TimeRange& r)
[detail] +void ToolWidget::manualAddWindows(const SignalSegment *, const TimeRange& r)
[detail]  {
[detail]    TRACE;
[detail]    QString log=tr("Add windows in range [%1, %2]\n")
[detail] @@ -172,7 +172,7 @@
[detail]    windowsChanged();
[detail]  }
[detail]  
[detail] -void ToolWidget::manualRemoveWindows(const Signal *, const TimeRange& r)
[detail] +void ToolWidget::manualRemoveWindows(const SignalSegment *, const TimeRange& r)
[detail]  {
[detail]    TRACE;
[detail]    parametersFromGui();
[detail]                      src/WindowIndex.cpp:  version-1.0.3	not modified
[detail]                           src/Worker.cpp:  version-1.0.3	modified out of comments
[detail] --- src/Worker.cpp-version-1.0.3-stripped	2025-09-28 04:01:34.015643204 +0200
[detail] +++ src/Worker.cpp-HEAD-stripped	2025-09-28 04:01:34.019643224 +0200
[detail] @@ -110,17 +110,18 @@
[detail]    DoubleSignal * refSig=_reference->processed(0);
[detail]    DoubleSignal * sig=procStat->processed(0);
[detail]    FilterParameters filterParam;
[detail] -  filterParam.setMethod(FilterParameters::FrequencyWindow);
[detail] -  filterParam.frequencyWindow().setShape(WindowFunctionParameters::Gaussian);
[detail] -  filterParam.setBand(FilterParameters::BandPass);
[detail]    int nFreqs=param->frequencySampling().count();
[detail]    for(int iBand=0; iBand<nFreqs; iBand++) {
[detail]      if(terminated()) break;
[detail]      double freq=param->frequencySampling().value(iBand);
[detail]      
[detail] -    filterParam.frequencyWindow().setSigma(0.34161); 
[detail] -    filterParam.setFrequencyRange(freq*(1.0-param->frequencyBandwidth()),
[detail] -                                  freq*(1.0+param->frequencyBandwidth()));
[detail] +    
[detail] +    filterParam.setMethod(FilterParameters::FrequencyWindow);
[detail] +    filterParam.setBand(FilterParameters::BandPass);
[detail] +    filterParam.frequencyWindow().setMinimumFrequency(freq*(1.0-param->frequencyBandwidth()));
[detail] +    filterParam.frequencyWindow().setMaximumFrequency(freq*(1.0+param->frequencyBandwidth()));
[detail] +    filterParam.frequencyWindow().window().setShape(WindowFunctionParameters::Gaussian);
[detail] +    filterParam.frequencyWindow().setWidth(0.34161);
[detail]      DoubleSignal * refSigFilt=new DoubleSignal(*refSig);
[detail]      refSigFilt->copySamplesFrom(refSig);
[detail]      refSigFilt->fastFourierTransform(DoubleSignal::Spectrum);
[detail]                       src/CurveResults.h:  version-1.0.3	not modified
[detail]                        src/GridResults.h:  version-1.0.3	not modified
[detail]                         src/Parameters.h:  version-1.0.3	not modified
[detail]                             src/Plugin.h:  version-1.0.3	not modified
[detail]                     src/ProcessSignals.h:  version-1.0.3	not modified
[detail]                        src/TaskManager.h:  version-1.0.3	not modified
[detail]                               src/Tool.h:  version-1.0.3	modified out of comments
[detail] --- src/Tool.h-version-1.0.3-stripped	2025-09-28 04:01:34.139643805 +0200
[detail] +++ src/Tool.h-HEAD-stripped	2025-09-28 04:01:34.143643823 +0200
[detail] @@ -33,7 +33,7 @@
[detail]    bool loadWindows(QString fileName);
[detail]  
[detail]    int componentCount() const {return _stations.nComponents();}
[detail] -  Signal::Components component(int index) {return _stations.component(index);}
[detail] +  SignalMetaData::Components component(int index) {return _stations.component(index);}
[detail]  
[detail]    int stationCount() const {return _stations.count();}
[detail]    const StationSignals * station(int index) {return _stations.at(index);}
[detail]                         src/ToolWidget.h:  version-1.0.3	modified out of comments
[detail] --- src/ToolWidget.h-version-1.0.3-stripped	2025-09-28 04:01:34.159643901 +0200
[detail] +++ src/ToolWidget.h-HEAD-stripped	2025-09-28 04:01:34.163643920 +0200
[detail] @@ -33,8 +33,8 @@
[detail]    void endAddWindowsManually();
[detail]    void beginRemoveWindowsManually();
[detail]    void endRemoveWindowsManually();
[detail] -  void manualAddWindows(const Signal *, const TimeRange& r);
[detail] -  void manualRemoveWindows(const Signal *, const TimeRange& r);
[detail] +  void manualAddWindows(const SignalSegment *, const TimeRange& r);
[detail] +  void manualRemoveWindows(const SignalSegment *, const TimeRange& r);
[detail]    void clearWindows();
[detail]    void loadWindows(QString fileName=QString());
[detail]    void finish();
[detail] @@ -50,7 +50,7 @@
[detail]    void setStationPlots();
[detail]  
[detail]    QRect * _trackingRect;
[detail] -  Signal * _trackedSignal;
[detail] +  SignalSegment * _trackedSignal;
[detail]  };
[detail]  
[detail]  #endif 
[detail]                        src/WindowIndex.h:  version-1.0.3	not modified
[detail]                             src/Worker.h:  version-1.0.3	not modified
[detail]                        src/ToolWidget.ui:  version-1.0.3	not modified
[summary] Total differences: 124 lines
[summary] Modification level is C
OLD_DIR=$(pwd)
echo "phaseit"
cd $(find . -name "phaseit" | tail -n 1) || exit 2
pwd
dpversion C  || exit 2
cd $OLD_DIR || exit 2
################## GeopsyPyCoreWave
[detail]                 src/GeopsyPyCoreWave.cpp:  version-0.0.1	modified out of comments
[detail] --- src/GeopsyPyCoreWave.cpp-version-0.0.1-stripped	2025-09-28 04:01:34.259644384 +0200
[detail] +++ src/GeopsyPyCoreWave.cpp-HEAD-stripped	2025-09-28 04:01:34.267644423 +0200
[detail] @@ -147,5 +147,15 @@
[detail]  
[detail]    return mod;
[detail]  }
[detail] -
[detail] +#else  
[detail] +#include <stdio.h>
[detail] +extern "C" void * PyInit_GeopsyPyCoreWave(void)
[detail] +{
[detail] +  printf("!!!!\n"
[detail] +         "!!!!  GeopsyPyCoreWave module is not properly compiled\n"
[detail] +         "!!!!    Python include paths were probably not provided at the configuration level.\n"
[detail] +         "!!!!    See https:
[detail] +         "!!!!\n");
[detail] +  return NULL;
[detail] +}
[detail]  #endif 
[detail]                  src/PythonArguments.cpp:  version-0.0.1	not modified
[detail]                      src/PythonError.cpp:  version-0.0.1	not modified
[detail]                    src/PythonArguments.h:  version-0.0.1	not modified
[detail]                        src/PythonError.h:  version-0.0.1	not modified
[summary] Total differences: 19 lines
[summary] Modification level is C
OLD_DIR=$(pwd)
echo "GeopsyPyCoreWave"
cd $(find . -name "GeopsyPyCoreWave" | tail -n 1) || exit 2
pwd
dpversion C  || exit 2
cd $OLD_DIR || exit 2
################## GeopsyPySciFigs
[detail]                    src/ActionExecute.cpp:  version-0.0.1	modified out of comments
[detail] --- src/ActionExecute.cpp-version-0.0.1-stripped	2025-09-28 04:01:34.383644984 +0200
[detail] +++ src/ActionExecute.cpp-HEAD-stripped	2025-09-28 04:01:34.387645002 +0200
[detail] @@ -18,8 +18,8 @@
[detail]  {
[detail]    TRACE;
[detail]    _acknowledge=nullptr;
[detail] -  _nextWidgetId=1;
[detail] -  _legend.generate(0, 20, ColorPalette::defaultCategorical);
[detail] +  _nextObjectId=1;
[detail] +  _legend.generate(0, 20, 1, ColorPalette::defaultCategorical);
[detail]  }
[detail]  
[detail]  
[detail] @@ -39,41 +39,66 @@
[detail]  }
[detail]  
[detail]  
[detail] -int ActionExecute::addObject(QObject * object)
[detail] +int ActionExecute::addqObject(QObject * object)
[detail]  {
[detail]    _objectLists.lock();
[detail] -  int id=_nextWidgetId++;
[detail] -  _idsToObjects.insert(id, object);
[detail] -  _objectsToIds.insert(object, id);
[detail] +  int id=_nextObjectId++;
[detail] +  _idsToQObjects.insert(id, object);
[detail] +  _qObjectsToIds.insert(object, id);
[detail]    _objectLists.unlock();
[detail] -  connect(object, SIGNAL(destroyed(QObject *)), this, SLOT(objectDestroyed(QObject *)));
[detail] +  connect(object, SIGNAL(destroyed(QObject *)), this, SLOT(qObjectDestroyed(QObject *)));
[detail]    QObjectList list=object->children();
[detail]    for(int i=0; i<list.size(); i++) {
[detail]      QObject * object=list.at(i);
[detail]      if(!object->objectName().isEmpty() &&
[detail]         !object->inherits("QAction")) {
[detail] -      addObject(object);
[detail] +      addqObject(object);
[detail]      }
[detail]    }
[detail]    return id;
[detail]  }
[detail]  
[detail] -void ActionExecute::objectDestroyed(QObject * object)
[detail] +void ActionExecute::qObjectDestroyed(QObject * object)
[detail]  {
[detail] -  int id=find(object);
[detail] +  int id=qFind(object);
[detail]    if(id>=0) {
[detail]      _objectLists.lock();
[detail] -    _idsToObjects.remove(id);
[detail] -    _objectsToIds.remove(object);
[detail] +    _idsToQObjects.remove(id);
[detail] +    _qObjectsToIds.remove(object);
[detail]      _objectLists.unlock();
[detail]    }
[detail]  }
[detail]  
[detail] -int ActionExecute::find(QObject * object) const
[detail] +
[detail] +int ActionExecute::addxmlObject(XMLClass * object)
[detail] +{
[detail] +  _objectLists.lock();
[detail] +  int id=_nextObjectId++;
[detail] +  _idsToXMLObjects.insert(id, object);
[detail] +  _xmlObjectsToIds.insert(object, id);
[detail] +  _objectLists.unlock();
[detail] +  return id;
[detail] +}
[detail] +
[detail] +int ActionExecute::qFind(QObject * object) const
[detail] +{
[detail] +  _objectLists.lock();
[detail] +  QMap<QObject *, int>::const_iterator it=_qObjectsToIds.find(object);
[detail] +  if(it!=_qObjectsToIds.end()) {
[detail] +    int id=it.value();
[detail] +    _objectLists.unlock();
[detail] +    return id;
[detail] +  } else {
[detail] +    _objectLists.unlock();
[detail] +    return -1;
[detail] +  }
[detail] +}
[detail] +
[detail] +int ActionExecute::xmlFind(XMLClass * object) const
[detail]  {
[detail]    _objectLists.lock();
[detail] -  QMap<QObject *, int>::const_iterator it=_objectsToIds.find(object);
[detail] -  if(it!=_objectsToIds.end()) {
[detail] +  QMap<XMLClass *, int>::const_iterator it=_xmlObjectsToIds.find(object);
[detail] +  if(it!=_xmlObjectsToIds.end()) {
[detail]      int id=it.value();
[detail]      _objectLists.unlock();
[detail]      return id;
[detail] @@ -88,7 +113,7 @@
[detail]    GraphicSheetMenu * w=new GraphicSheetMenu(nullptr, Qt::Window);
[detail]    w->resize(QSize(800, 600));
[detail]    w->show();
[detail] -  *objectId=addObject(w->sheet());
[detail] +  *objectId=addqObject(w->sheet());
[detail]    acknowledge();
[detail]  }
[detail]  
[detail] @@ -99,7 +124,7 @@
[detail]      w->resize(QSize(800, 600));
[detail]      w->show();
[detail]    } else {
[detail] -    GraphicSheet * s=find<GraphicSheet>(parentId);
[detail] +    GraphicSheet * s=qFind<GraphicSheet>(parentId);
[detail]      if(s) {
[detail]        s->addObject(w, true);
[detail]      } else {
[detail] @@ -108,13 +133,13 @@
[detail]        return acknowledge();
[detail]      }
[detail]    }
[detail] -  *objectId=addObject(w);
[detail] +  *objectId=addqObject(w);
[detail]    acknowledge();
[detail]  }
[detail]  
[detail]  void ActionExecute::addCurves(int parentId, const CurveData * d)
[detail]  {
[detail] -  AxisWindow * w=find<AxisWindow>(parentId);
[detail] +  AxisWindow * w=qFind<AxisWindow>(parentId);
[detail]    if(w) {
[detail]      QList<LineLayer *> layers=w->graphContents()->findLayers<LineLayer>(QString());
[detail]      if(layers.isEmpty()) {
[detail] @@ -132,7 +157,7 @@
[detail]  
[detail]  void ActionExecute::propertyValue(int objectId, int propertyId, QVariant * val)
[detail]  {
[detail] -  QObject * object=find<QObject>(objectId);
[detail] +  QObject * object=qFind<QObject>(objectId);
[detail]    if(object) {
[detail]      const char * className=object->metaObject()->className();
[detail]      int propertyOffset=PythonClassFactory::instance()->propertyOffset(className);
[detail] @@ -148,7 +173,7 @@
[detail]  
[detail]  void ActionExecute::setPropertyValue(int objectId, int propertyId, PyObject * args, bool * ok)
[detail]  {
[detail] -  QObject * object=find<QObject>(objectId);
[detail] +  QObject * object=qFind<QObject>(objectId);
[detail]    if(!object) {
[detail]      GraphicalUserInterface::instance()->setErrorMessage(tr("unknown object %1").arg(objectId));
[detail]      *ok=false;
[detail] @@ -187,7 +212,7 @@
[detail]  
[detail]  void ActionExecute::method(int objectId, int methodId, PyObject * args, MethodArgument ** returnValue)
[detail]  {
[detail] -  QObject * object=find<QObject>(objectId);
[detail] +  QObject * object=qFind<QObject>(objectId);
[detail]    if(!object) {
[detail]      GraphicalUserInterface::instance()->setErrorMessage(tr("unknown object %1").arg(objectId));
[detail]      *returnValue=nullptr;
[detail] @@ -280,6 +305,7 @@
[detail]                      qtArgs.at(4)->argument());
[detail]        break;
[detail]      default:
[detail] +      ok=false;  
[detail]        ASSERT(false);
[detail]      }
[detail]    } else {
[detail] @@ -318,6 +344,7 @@
[detail]                      qtArgs.at(4)->argument());
[detail]        break;
[detail]      default:
[detail] +      ok=false;  
[detail]        ASSERT(false);
[detail]      }
[detail]    }
[detail] @@ -333,6 +360,176 @@
[detail]    acknowledge();
[detail]  }
[detail]  
[detail] +void ActionExecute::xml_child(int objectId, PyObject * args,  MethodArgument ** returnValue)
[detail] +{
[detail] +  GraphicalUserInterface * gui=GraphicalUserInterface::instance();
[detail] +  *returnValue=nullptr;
[detail] +  XMLClass * object=xmlFind<XMLClass>(objectId);
[detail] +  if(!object) {
[detail] +    gui->setErrorMessage(tr("unknown object %1").arg(objectId));
[detail] +    return acknowledge();
[detail] +  }
[detail] +  int argc=MethodArgument::checkCount(args, 1);
[detail] +  if(argc<0) {
[detail] +    return acknowledge();
[detail] +  }
[detail] +  PyObject * arg=PyTuple_GET_ITEM(args, 0);
[detail] +  if(arg==NULL) {
[detail] +    gui->setErrorMessage(tr("child name is missing"));
[detail] +    return acknowledge();
[detail] +  }
[detail] +  bool ok=true;
[detail] +  QString tagAtt=MethodArgument::toString(arg, ok, 0);
[detail] +  if(!ok) {
[detail] +    gui->setErrorMessage(tr("child name is missing"));
[detail] +    return acknowledge();
[detail] +  }
[detail] +  QString tag;
[detail] +  XMLClass::Error error;
[detail] +  XMLRestoreAttributes att=XMLClass::attributes(tagAtt, tag, error);
[detail] +  if(error==XMLClass::NoError) {
[detail] +    StringSection tagSection(tag);
[detail] +    XMLMember m=object->xml_member(tagSection, att, nullptr);
[detail] +    if(m.child()) {
[detail] +      MethodArgument * qtReturnArg=new MethodArgument;
[detail] +      QMetaType type=PythonClassFactory::instance()->customMetaType(m.child()->xml_tagName());
[detail] +#if(QT_VERSION>=QT_VERSION_CHECK(6, 5, 0))
[detail] +      if(!qtReturnArg->setReturnArgument(type)) {
[detail] +#else
[detail] +      if(!qtReturnArg->setReturnArgument(type.id())) {
[detail] +#endif
[detail] +        gui->setErrorMessage(tr("child '%1' not found.").arg(tag));
[detail] +      } else {
[detail] +        qtReturnArg->setXMLObject(m.child());
[detail] +        qtReturnArg->registerObject();
[detail] +        *returnValue=qtReturnArg;
[detail] +      }
[detail] +    }
[detail] +  } else {
[detail] +    gui->setErrorMessage(tr("error parsing tag and attributes ('%1')")
[detail] +                             .arg(tagAtt));
[detail] +  }
[detail] +  acknowledge();
[detail] +}
[detail] +
[detail] +void ActionExecute::xml_value(int objectId, PyObject * args, QVariant * val)
[detail] +{
[detail] +  GraphicalUserInterface * gui=GraphicalUserInterface::instance();
[detail] +  XMLClass * object=xmlFind<XMLClass>(objectId);
[detail] +  if(!object) {
[detail] +    gui->setErrorMessage(tr("unknown object %1").arg(objectId));
[detail] +    return acknowledge();
[detail] +  }
[detail] +  int argc=MethodArgument::checkCount(args, 1);
[detail] +  if(argc<0) {
[detail] +    return acknowledge();
[detail] +  }
[detail] +  PyObject * arg=PyTuple_GET_ITEM(args, 0);
[detail] +  if(arg==NULL) {
[detail] +    gui->setErrorMessage(tr("property name is missing"));
[detail] +    return acknowledge();
[detail] +  }
[detail] +  bool ok=true;
[detail] +  QString tagAtt=MethodArgument::toString(arg, ok, 0);
[detail] +  if(!ok) {
[detail] +    gui->setErrorMessage(tr("property name is missing"));
[detail] +    return acknowledge();
[detail] +  }
[detail] +  QString tag;
[detail] +  XMLClass::Error error;
[detail] +  XMLRestoreAttributes att=XMLClass::attributes(tagAtt, tag, error);
[detail] +  if(error==XMLClass::NoError) {
[detail] +    XMLHeader hdr(object);
[detail] +    QString xml=hdr.xml_saveString(false, nullptr);
[detail] +    XMLGenericItem genObject(object->xml_tagName());
[detail] +    XMLHeader qenhdr(&genObject);
[detail] +    qenhdr.xml_restoreString(xml, nullptr);
[detail] +
[detail] +    QList<XMLGenericItem *> items=genObject.children(tag);
[detail] +    if(items.size()==1) {
[detail] +      *val=items.first()->value();
[detail] +    } else {
[detail] +      int n=items.size();
[detail] +      QList<XMLGenericItem *> matchingAttItems;
[detail] +      for(int i=0; i<n; i++) {
[detail] +        const XMLSaveAttributes& itemAtt=items.at(i)->attributes();
[detail] +        for(XMLRestoreAttributeIterator it=att.begin(); it!=att.end(); it++) {
[detail] +          if(!it.value().isEmpty() && it.value()==itemAtt.value(it.key().toStringBuffer())) {
[detail] +            matchingAttItems.append(items.at(i));
[detail] +          }
[detail] +        }
[detail] +      }
[detail] +      switch(matchingAttItems.size()) {
[detail] +      case 0:
[detail] +        gui->setErrorMessage(tr("no matching item for tag (%1).").arg(tag));
[detail] +        break;
[detail] +      case 1:
[detail] +        *val=matchingAttItems.first()->value();
[detail] +        break;
[detail] +      default:
[detail] +        gui->setErrorMessage(tr("%1 values with the same tag (%2).").arg(matchingAttItems.size()).arg(tag));
[detail] +        break;
[detail] +      }
[detail] +    }
[detail] +  } else {
[detail] +    gui->setErrorMessage(tr("error parsing tag and attributes ('%1')")
[detail] +                             .arg(tagAtt));
[detail] +  }
[detail] +  acknowledge();
[detail] +}
[detail] +
[detail] +void ActionExecute::xml_setValue(int objectId, PyObject * args, bool * ok)
[detail] +{
[detail] +  GraphicalUserInterface * gui=GraphicalUserInterface::instance();
[detail] +  XMLClass * object=xmlFind<XMLClass>(objectId);
[detail] +  if(!object) {
[detail] +    gui->setErrorMessage(tr("unknown object %1").arg(objectId));
[detail] +    return acknowledge();
[detail] +  }
[detail] +  int argc=MethodArgument::checkCount(args, 2);
[detail] +  if(argc<0) {
[detail] +    return acknowledge();
[detail] +  }
[detail] +  PyObject * arg=PyTuple_GET_ITEM(args, 0);
[detail] +  if(arg==NULL) {
[detail] +    gui->setErrorMessage(tr("property name is missing"));
[detail] +    return acknowledge();
[detail] +  }
[detail] +  QString tagAtt=MethodArgument::toString(arg, *ok, 0);
[detail] +  if(!*ok) {
[detail] +    gui->setErrorMessage(tr("property name is missing"));
[detail] +    return acknowledge();
[detail] +  }
[detail] +  QString tag;
[detail] +  XMLClass::Error error;
[detail] +  XMLRestoreAttributes att=XMLClass::attributes(tagAtt, tag, error);
[detail] +  if(error==XMLClass::NoError) {
[detail] +    PyObject * arg=PyTuple_GET_ITEM(args, 1);
[detail] +    if(arg==NULL) {
[detail] +      gui->setErrorMessage(tr("property value is missing"));
[detail] +      return acknowledge();
[detail] +    }
[detail] +    QString contents=MethodArgument::toString(arg, *ok, 1);
[detail] +    if(!*ok) {
[detail] +      gui->setErrorMessage(tr("error parsing value ('%1')")
[detail] +                               .arg(contents));
[detail] +      return acknowledge();
[detail] +    }
[detail] +    StringSection tagSection(tag);
[detail] +    StringSection contentsSection(contents);
[detail] +    XMLMember m=object->xml_member(tagSection, att, nullptr);
[detail] +    if(m.isValidMember()) {
[detail] +      *ok=object->xml_setProperty(m.memberID(), tagSection, att, contentsSection, nullptr);
[detail] +    } else {
[detail] +      *ok=false;
[detail] +    }
[detail] +  } else {
[detail] +    gui->setErrorMessage(tr("error parsing tag and attributes ('%1')")
[detail] +                             .arg(tagAtt));
[detail] +  }
[detail] +  acknowledge();
[detail] +}
[detail] +
[detail]  void ActionExecute::setLimits(AxisWindow * w)
[detail]  {
[detail]    GraphContents * gc=w->graphContents();
[detail] @@ -361,7 +558,7 @@
[detail]  void ActionExecute::dumpIds() const
[detail]  {
[detail]    QMap<int, QObject *>::const_iterator it;
[detail] -  for(it=_idsToObjects.begin(); it!=_idsToObjects.end(); it++) {
[detail] +  for(it=_idsToQObjects.begin(); it!=_idsToQObjects.end(); it++) {
[detail]      QObject * obj=it.value();
[detail]      printf("%3i %10p %15s %15s\n", it.key(), obj, obj->metaObject()->className(),
[detail]             obj->objectName().toLatin1().data());
[detail]                    src/ActionRequest.cpp:  version-0.0.1	modified out of comments
[detail] --- src/ActionRequest.cpp-version-0.0.1-stripped	2025-09-28 04:01:34.403645080 +0200
[detail] +++ src/ActionRequest.cpp-HEAD-stripped	2025-09-28 04:01:34.407645100 +0200
[detail] @@ -36,6 +36,12 @@
[detail]            a, SLOT(setPropertyValue(int, int, PyObject *, bool *)), Qt::QueuedConnection);
[detail]    connect(this, SIGNAL(requestMethod(int, int, PyObject *, MethodArgument **)),
[detail]            a, SLOT(method(int, int, PyObject *, MethodArgument **)), Qt::QueuedConnection);
[detail] +  connect(this, SIGNAL(requestXMLChild(int, PyObject *, MethodArgument **)),
[detail] +          a, SLOT(xml_child(int, PyObject *, MethodArgument **)), Qt::QueuedConnection);
[detail] +  connect(this, SIGNAL(requestXMLValue(int, PyObject *, QVariant *)),
[detail] +          a, SLOT(xml_value(int, PyObject *, QVariant *)), Qt::QueuedConnection);
[detail] +  connect(this, SIGNAL(requestXMLSetValue(int, PyObject *, bool *)),
[detail] +          a, SLOT(xml_setValue(int, PyObject *, bool *)), Qt::QueuedConnection);
[detail]    connect(this, SIGNAL(requestSetVerbosity(int)), a, SLOT(setVerbosity(int)), Qt::QueuedConnection);
[detail]    connect(this, SIGNAL(requestQuit()), a, SLOT(quit()), Qt::QueuedConnection);
[detail]    a->initAcknowledge(&_acknowledge);
[detail] @@ -80,7 +86,7 @@
[detail]  
[detail]  bool ActionRequest::setPropertyValue(int objectId, int propertyId, PyObject * args)
[detail]  {
[detail] -  bool ok;
[detail] +  bool ok=true;
[detail]    emit requestSetPropertyValue(objectId, propertyId, args, &ok);
[detail]    waitAcknowledge();
[detail]    return ok;
[detail] @@ -94,6 +100,31 @@
[detail]    return value;
[detail]  }
[detail]  
[detail] +MethodArgument * ActionRequest::xml_child(int objectId, PyObject * args)
[detail] +{
[detail] +  MethodArgument * value=nullptr;
[detail] +  emit requestXMLChild(objectId, args, &value);
[detail] +  waitAcknowledge();
[detail] +  return value;
[detail] +}
[detail] +
[detail] +QVariant ActionRequest::xml_value(int objectId, PyObject * args)
[detail] +{
[detail] +  QVariant val;
[detail] +  emit requestXMLValue(objectId, args, &val);
[detail] +  waitAcknowledge();
[detail] +  return val;
[detail] +}
[detail] +
[detail] +bool ActionRequest::xml_setValue(int objectId, PyObject * args)
[detail] +{
[detail] +  bool ok=true;
[detail] +  emit requestXMLSetValue(objectId, args, &ok);
[detail] +  waitAcknowledge();
[detail] +  return ok;
[detail] +}
[detail] +
[detail] +
[detail]  void ActionRequest::setVerbosity(int level)
[detail]  {
[detail]    emit requestSetVerbosity(level);
[detail]                        src/CurveData.cpp:  version-0.0.1	not modified
[detail]                  src/GeopsyPySciFigs.cpp:  version-0.0.1	modified out of comments
[detail] --- src/GeopsyPySciFigs.cpp-version-0.0.1-stripped	2025-09-28 04:01:34.435645235 +0200
[detail] +++ src/GeopsyPySciFigs.cpp-HEAD-stripped	2025-09-28 04:01:34.443645273 +0200
[detail] @@ -32,7 +32,7 @@
[detail]  {
[detail]    int wId=GraphicalUserInterface::instance()->createGraphicSheet();
[detail]    if(wId>0) {
[detail] -    return PythonClassFactory::instance()->create("SciFigs::GraphicSheet", wId);
[detail] +    return PythonClassFactory::instance()->createQObject("SciFigs::GraphicSheet", wId);
[detail]    } else {
[detail]      Py_RETURN_NONE;
[detail]    }
[detail] @@ -51,7 +51,7 @@
[detail]      wId=GraphicalUserInterface::instance()->createAxisWindow(PythonClassFactory::objectId(argParent));
[detail]    }
[detail]    if(wId>0) {
[detail] -    return PythonClassFactory::instance()->create("SciFigs::AxisWindow", wId);
[detail] +    return PythonClassFactory::instance()->createQObject("SciFigs::AxisWindow", wId);
[detail]    } else {
[detail]      Py_RETURN_NONE;
[detail]    }
[detail] @@ -131,7 +131,12 @@
[detail]       !classFactory->add(&Axis::staticMetaObject) ||
[detail]       !classFactory->add(&GraphContents::staticMetaObject) ||
[detail]       !classFactory->add(GraphContentsLayerFactory::instance()) ||
[detail] -     !classFactory->add(&GraphicSheet::staticMetaObject)) {
[detail] +     !classFactory->add(&GraphicSheet::staticMetaObject) ||
[detail] +     !classFactory->add(Legend::xmlLegendTag) ||
[detail] +     !classFactory->add(LegendItem::xmlLegendItemTag) ||
[detail] +     !classFactory->add(Pen::xmlPenTag) ||
[detail] +     !classFactory->add(Symbol::xmlSymbolTag)
[detail] +    ) {
[detail]      GraphicalUserInterface::instance()->stopEngine();
[detail]      Py_DECREF(mod);
[detail]      return NULL;
[detail] @@ -144,5 +149,16 @@
[detail]  
[detail]    return mod;
[detail]  }
[detail] -
[detail] +#else  
[detail] +#include <stdio.h>
[detail] +extern "C" void * PyInit_GeopsyPySciFigs(void)
[detail] +{
[detail] +  printf("!!!!\n"
[detail] +         "!!!!  GeopsyPySciFigs module is not properly compiled\n"
[detail] +         "!!!!    Either Python include paths were probably not provided at the configuration level\n"
[detail] +         "!!!!    or Qt version is not >= 6.5.\n"
[detail] +         "!!!!    See https:
[detail] +         "!!!!\n");
[detail] +  return NULL;
[detail] +}
[detail]  #endif 
[detail]           src/GraphicalUserInterface.cpp:  version-0.0.1	modified out of comments
[detail] --- src/GraphicalUserInterface.cpp-version-0.0.1-stripped	2025-09-28 04:01:34.459645351 +0200
[detail] +++ src/GraphicalUserInterface.cpp-HEAD-stripped	2025-09-28 04:01:34.463645370 +0200
[detail] @@ -212,19 +212,61 @@
[detail]    }
[detail]  }
[detail]  
[detail] -int GraphicalUserInterface::objectId(QObject * obj) const
[detail] +MethodArgument *  GraphicalUserInterface::xml_child(int objectId, PyObject * args) const
[detail]  {
[detail] -  return _execute->find(obj);
[detail] +  if(isQtApplicationAvailable()) {
[detail] +    return _request->xml_child(objectId, args);
[detail] +  } else {
[detail] +    return nullptr;
[detail] +  }
[detail] +}
[detail] +
[detail] +QVariant GraphicalUserInterface::xml_value(int objectId, PyObject * args) const
[detail] +{
[detail] +  if(isQtApplicationAvailable()) {
[detail] +    return _request->xml_value(objectId, args);
[detail] +  } else {
[detail] +    return false;
[detail] +  }
[detail] +}
[detail] +
[detail] +bool GraphicalUserInterface::xml_setValue(int objectId, PyObject * args) const
[detail] +{
[detail] +  if(isQtApplicationAvailable()) {
[detail] +    return _request->xml_setValue(objectId, args);
[detail] +  } else {
[detail] +    return false;
[detail] +  }
[detail] +}
[detail] +
[detail] +int GraphicalUserInterface::qObjectId(QObject * obj) const
[detail] +{
[detail] +  return _execute->qFind(obj);
[detail] +}
[detail] +
[detail] +int GraphicalUserInterface::xmlObjectId(XMLClass * obj) const
[detail] +{
[detail] +  return _execute->xmlFind(obj);
[detail] +}
[detail] +
[detail] +QObject * GraphicalUserInterface::qObject(int objectId) const
[detail] +{
[detail] +  return _execute->qFind<QObject>(objectId);
[detail] +}
[detail] +
[detail] +XMLClass * GraphicalUserInterface::xmlObject(int objectId) const
[detail] +{
[detail] +  return _execute->xmlFind<XMLClass>(objectId);
[detail]  }
[detail]  
[detail] -QObject * GraphicalUserInterface::object(int objectId) const
[detail] +int GraphicalUserInterface::addqObject(QObject * obj)
[detail]  {
[detail] -  return _execute->find<QObject>(objectId);
[detail] +  return _execute->addqObject(obj);
[detail]  }
[detail]  
[detail] -int GraphicalUserInterface::addObject(QObject * obj)
[detail] +int GraphicalUserInterface::addxmlObject(XMLClass * obj)
[detail]  {
[detail] -  return _execute->addObject(obj);
[detail] +  return _execute->addxmlObject(obj);
[detail]  }
[detail]  
[detail]  #endif 
[detail]                   src/MethodArgument.cpp:  version-0.0.1	modified out of comments
[detail] --- src/MethodArgument.cpp-version-0.0.1-stripped	2025-09-28 04:01:34.483645466 +0200
[detail] +++ src/MethodArgument.cpp-HEAD-stripped	2025-09-28 04:01:34.487645486 +0200
[detail] @@ -22,6 +22,10 @@
[detail]    _customTypes.insert(QMetaType::fromType<LegendWidget *>().id(), customTypeId++);
[detail]    _customTypes.insert(QMetaType::fromType<ColorMapWidget *>().id(), customTypeId++);
[detail]    _customTypes.insert(QMetaType::fromType<ImageWidget *>().id(), customTypeId++);
[detail] +  _customTypes.insert(QMetaType::fromType<Legend>().id(), customTypeId++);
[detail] +  _customTypes.insert(QMetaType::fromType<LegendItem *>().id(), customTypeId++);
[detail] +  _customTypes.insert(QMetaType::fromType<Pen *>().id(), customTypeId++);
[detail] +  _customTypes.insert(QMetaType::fromType<Symbol *>().id(), customTypeId++);
[detail]    
[detail]  }
[detail]  
[detail] @@ -43,38 +47,25 @@
[detail]  {
[detail]    QMetaType t(_type);
[detail]    GraphicalUserInterface::instance()->setErrorMessage(tr("unsupported type: %1 (%2)")
[detail] -#if(QT_VERSION>=QT_VERSION_CHECK(6, 5, 0))
[detail]                                                            .arg(t.name()).arg(_type));
[detail] -#else
[detail] -                                                          .arg(t.name().data()).arg(_type));
[detail] -#endif
[detail]    return false;
[detail]  }
[detail]  
[detail] -#if(QT_VERSION>=QT_VERSION_CHECK(6, 5, 0))
[detail]  bool MethodArgument::setArgument(PyObject * args, int index, const QMetaType& type)
[detail] -#else
[detail] -bool MethodArgument::setArgument(PyObject * args, int index, int typeId)
[detail] -#endif
[detail]  {
[detail] +  GraphicalUserInterface * gui=GraphicalUserInterface::instance();
[detail]    if(args==NULL) {
[detail] -    GraphicalUserInterface::instance()->setErrorMessage(tr("argument %1 is missing")
[detail] -                                                            .arg(index));
[detail] +    gui->setErrorMessage(tr("argument %1 is missing").arg(index));
[detail]  
[detail]      return false;
[detail]    }
[detail]    PyObject * arg=PyTuple_GET_ITEM(args, index);
[detail]    if(arg==NULL) {
[detail] -    GraphicalUserInterface::instance()->setErrorMessage(tr("argument %1 is missing")
[detail] -                                                            .arg(index));
[detail] +    gui->setErrorMessage(tr("argument %1 is missing").arg(index));
[detail]      return false;
[detail]    }
[detail]    bool ok=true;
[detail] -#if(QT_VERSION>=QT_VERSION_CHECK(6, 5, 0))
[detail]    _type=type.id();
[detail] -#else
[detail] -  _type=typeId;
[detail] -#endif
[detail]    switch(_type) {
[detail]    case QMetaType::Bool:
[detail]      _booleanFlag=toBool(arg, ok, index);
[detail] @@ -98,67 +89,69 @@
[detail]      if(it==_customTypes.end()) {
[detail]        return unsupportedTypeError();
[detail]      }
[detail] -    _object.qObject=toObjectStar(arg);
[detail] +    switch(PythonClassFactory::instance()->objectType(arg)) {
[detail] +    case 0:
[detail] +      _qObject.qObject=gui->qObject(PythonClassFactory::instance()->objectId(arg));
[detail]      switch(it.value()) {
[detail]      case 0:
[detail] -      if(_object.qObject->metaObject()->inherits(&AxisWindow::staticMetaObject)) {
[detail] -        _argument=Q_ARG(AxisWindow *, _object.axisWindow);
[detail] +        if(_qObject.qObject->metaObject()->inherits(&AxisWindow::staticMetaObject)) {
[detail] +          _argument=Q_ARG(AxisWindow *, _qObject.axisWindow);
[detail]        } else {
[detail]          ok=false;
[detail]        }
[detail]        break;
[detail]      case 1:
[detail] -      if(_object.qObject->metaObject()->inherits(&Axis::staticMetaObject)) {
[detail] -        _argument=Q_ARG(Axis *, _object.axis);
[detail] +        if(_qObject.qObject->metaObject()->inherits(&Axis::staticMetaObject)) {
[detail] +          _argument=Q_ARG(Axis *, _qObject.axis);
[detail]        } else {
[detail]          ok=false;
[detail]        }
[detail]        break;
[detail]      case 2:
[detail] -      if(_object.qObject->metaObject()->inherits(&GraphContents::staticMetaObject)) {
[detail] -        _argument=Q_ARG(GraphContents *, _object.graphContents);
[detail] +        if(_qObject.qObject->metaObject()->inherits(&GraphContents::staticMetaObject)) {
[detail] +          _argument=Q_ARG(GraphContents *, _qObject.graphContents);
[detail]        } else {
[detail]          ok=false;
[detail]        }
[detail]        break;
[detail]      case 3:
[detail] -      if(_object.qObject->metaObject()->inherits(&GraphContentsLayer::staticMetaObject)) {
[detail] -        _argument=Q_ARG(GraphContentsLayer *, _object.graphContentsLayer);
[detail] +        if(_qObject.qObject->metaObject()->inherits(&GraphContentsLayer::staticMetaObject)) {
[detail] +          _argument=Q_ARG(GraphContentsLayer *, _qObject.graphContentsLayer);
[detail]        } else {
[detail]          ok=false;
[detail]        }
[detail]        break;
[detail]      case 4:
[detail] -      if(_object.qObject->metaObject()->inherits(&GraphicObject::staticMetaObject)) {
[detail] -        _argument=Q_ARG(GraphicObject *, _object.graphicObject);
[detail] +        if(_qObject.qObject->metaObject()->inherits(&GraphicObject::staticMetaObject)) {
[detail] +          _argument=Q_ARG(GraphicObject *, _qObject.graphicObject);
[detail]        } else {
[detail]          ok=false;
[detail]        }
[detail]        break;
[detail]      case 5:
[detail] -      if(_object.qObject->metaObject()->inherits(&TextEdit::staticMetaObject)) {
[detail] -        _argument=Q_ARG(TextEdit *, _object.textEdit);
[detail] +        if(_qObject.qObject->metaObject()->inherits(&TextEdit::staticMetaObject)) {
[detail] +          _argument=Q_ARG(TextEdit *, _qObject.textEdit);
[detail]        } else {
[detail]          ok=false;
[detail]        }
[detail]        break;
[detail]      case 6:
[detail] -      if(_object.qObject->metaObject()->inherits(&LegendWidget::staticMetaObject)) {
[detail] -        _argument=Q_ARG(LegendWidget *, _object.legendWidget);
[detail] +        if(_qObject.qObject->metaObject()->inherits(&LegendWidget::staticMetaObject)) {
[detail] +          _argument=Q_ARG(LegendWidget *, _qObject.legendWidget);
[detail]        } else {
[detail]          ok=false;
[detail]        }
[detail]        break;
[detail]      case 7:
[detail] -      if(_object.qObject->metaObject()->inherits(&ColorMapWidget::staticMetaObject)) {
[detail] -        _argument=Q_ARG(ColorMapWidget *, _object.colorMapWidget);
[detail] +        if(_qObject.qObject->metaObject()->inherits(&ColorMapWidget::staticMetaObject)) {
[detail] +          _argument=Q_ARG(ColorMapWidget *, _qObject.colorMapWidget);
[detail]        } else {
[detail]          ok=false;
[detail]        }
[detail]        break;
[detail]      case 8:
[detail] -      if(_object.qObject->metaObject()->inherits(&ImageWidget::staticMetaObject)) {
[detail] -        _argument=Q_ARG(ImageWidget *, _object.imageWidget);
[detail] +        if(_qObject.qObject->metaObject()->inherits(&ImageWidget::staticMetaObject)) {
[detail] +          _argument=Q_ARG(ImageWidget *, _qObject.imageWidget);
[detail]        } else {
[detail]          ok=false;
[detail]        }
[detail] @@ -166,29 +159,42 @@
[detail]      default:
[detail]        ASSERT(false);
[detail]      }
[detail] +      break;
[detail] +    case 1:
[detail] +      _xmlObject.xmlObject=gui->xmlObject(PythonClassFactory::instance()->objectId(arg));
[detail] +      switch(it.value()) {
[detail] +      case 9:
[detail] +        _argument=Q_ARG(Legend, *_xmlObject.legend);
[detail] +        break;
[detail] +      case 10:
[detail] +        _argument=Q_ARG(LegendItem *, _xmlObject.legendItem);
[detail] +        break;
[detail] +      case 11:
[detail] +        _argument=Q_ARG(Pen *, _xmlObject.pen);
[detail] +        break;
[detail] +      case 12:
[detail] +        _argument=Q_ARG(Symbol *, _xmlObject.symbol);
[detail] +        break;
[detail] +      default:
[detail] +        ASSERT(false);
[detail] +      }
[detail] +      break;
[detail] +    default:
[detail] +      ASSERT(false);
[detail] +    }
[detail]      if(!ok) {
[detail] -      GraphicalUserInterface::instance()->setErrorMessage(tr("object %1 of type %2 cannot be casted into type %3")
[detail] +      gui->setErrorMessage(tr("object %1 of type %2 cannot be casted into type %3")
[detail]                                                                .arg(PythonClassFactory::objectId(arg))
[detail] -                                                              .arg(_object.qObject->metaObject()->className())
[detail] -#if(QT_VERSION>=QT_VERSION_CHECK(6, 5, 0))
[detail] +                              .arg(_qObject.qObject->metaObject()->className())
[detail]                                                                .arg(type.name()));
[detail] -#else
[detail] -                                                              .arg(QMetaType::typeName(typeId)));
[detail] -#endif
[detail]      }
[detail]    }
[detail]    return ok;
[detail]  }
[detail]  
[detail] -#if(QT_VERSION>=QT_VERSION_CHECK(6, 5, 0))
[detail]  bool MethodArgument::setReturnArgument(const QMetaType& type)
[detail]  {
[detail]    _type=type.id();
[detail] -#else
[detail] -bool MethodArgument::setReturnArgument(int typeId)
[detail] -{
[detail] -  _type=typeId;
[detail] -#endif
[detail]    switch(_type) {
[detail]    case QMetaType::Bool:
[detail]      _returnArgument=Q_RETURN_ARG(bool, _booleanFlag);
[detail] @@ -212,31 +218,43 @@
[detail]      }
[detail]      switch(it.value()) {
[detail]      case 0:
[detail] -      _returnArgument=Q_RETURN_ARG(AxisWindow *, _object.axisWindow);
[detail] +      _returnArgument=Q_RETURN_ARG(AxisWindow *, _qObject.axisWindow);
[detail]        break;
[detail]      case 1:
[detail] -      _returnArgument=Q_RETURN_ARG(Axis *, _object.axis);
[detail] +      _returnArgument=Q_RETURN_ARG(Axis *, _qObject.axis);
[detail]        break;
[detail]      case 2:
[detail] -      _returnArgument=Q_RETURN_ARG(GraphContents *, _object.graphContents);
[detail] +      _returnArgument=Q_RETURN_ARG(GraphContents *, _qObject.graphContents);
[detail]        break;
[detail]      case 3:
[detail] -      _returnArgument=Q_RETURN_ARG(GraphContentsLayer *, _object.graphContentsLayer);
[detail] +      _returnArgument=Q_RETURN_ARG(GraphContentsLayer *, _qObject.graphContentsLayer);
[detail]        break;
[detail]      case 4:
[detail] -      _returnArgument=Q_RETURN_ARG(GraphicObject *, _object.graphicObject);
[detail] +      _returnArgument=Q_RETURN_ARG(GraphicObject *, _qObject.graphicObject);
[detail]        break;
[detail]      case 5:
[detail] -      _returnArgument=Q_RETURN_ARG(TextEdit *, _object.textEdit);
[detail] +      _returnArgument=Q_RETURN_ARG(TextEdit *, _qObject.textEdit);
[detail]        break;
[detail]      case 6:
[detail] -      _returnArgument=Q_RETURN_ARG(LegendWidget *, _object.legendWidget);
[detail] +      _returnArgument=Q_RETURN_ARG(LegendWidget *, _qObject.legendWidget);
[detail]        break;
[detail]      case 7:
[detail] -      _returnArgument=Q_RETURN_ARG(ColorMapWidget *, _object.colorMapWidget);
[detail] +      _returnArgument=Q_RETURN_ARG(ColorMapWidget *, _qObject.colorMapWidget);
[detail]        break;
[detail]      case 8:
[detail] -      _returnArgument=Q_RETURN_ARG(ImageWidget *, _object.imageWidget);
[detail] +      _returnArgument=Q_RETURN_ARG(ImageWidget *, _qObject.imageWidget);
[detail] +      break;
[detail] +    case 9:
[detail] +      _returnArgument=Q_RETURN_ARG(Legend, *(_xmlObject.legend=new Legend));
[detail] +      break;
[detail] +    case 10:
[detail] +      _returnArgument=Q_RETURN_ARG(LegendItem *, _xmlObject.legendItem);
[detail] +      break;
[detail] +    case 11:
[detail] +      _returnArgument=Q_RETURN_ARG(Pen *, _xmlObject.pen);
[detail] +      break;
[detail] +    case 12:
[detail] +      _returnArgument=Q_RETURN_ARG(Symbol *, _xmlObject.symbol);
[detail]        break;
[detail]      default:
[detail]        ASSERT(false);
[detail] @@ -322,6 +340,12 @@
[detail]                                                                .arg(index));
[detail]        break;
[detail]      }
[detail] +  } else if(PyFloat_Check(arg)) {
[detail] +    double val=PyFloat_AsDouble(arg);
[detail] +    return QString::number(val, 'g', 16);
[detail] +  } else if(PyLong_Check(arg)) {
[detail] +    int val=PyLong_AsLong(arg);
[detail] +    return QString::number(val);
[detail]    } else {
[detail]      GraphicalUserInterface::instance()->setErrorMessage(tr("argument %1 must be a string")
[detail]                                                              .arg(index));
[detail] @@ -330,19 +354,20 @@
[detail]    return QString();
[detail]  }
[detail]  
[detail] -QObject * MethodArgument::toObjectStar(PyObject * arg)
[detail] -{
[detail] -  return GraphicalUserInterface::instance()->object(PythonClassFactory::instance()->objectId(arg));
[detail] -}
[detail] -
[detail]  
[detail]  void MethodArgument::registerObject()
[detail]  {
[detail] -  if(_object.qObject) {
[detail] -    _objectClassName=_object.qObject->metaObject()->className();
[detail] -    _objectId=GraphicalUserInterface::instance()->objectId(_object.qObject);
[detail] +  if(_qObject.qObject) {
[detail] +    _objectClassName=_qObject.qObject->metaObject()->className();
[detail] +    _objectId=GraphicalUserInterface::instance()->qObjectId(_qObject.qObject);
[detail] +    if(_objectId<0) { 
[detail] +      _objectId=GraphicalUserInterface::instance()->addqObject(_qObject.qObject);
[detail] +    }
[detail] +  } else if(_xmlObject.xmlObject) {
[detail] +    _objectClassName=_xmlObject.xmlObject->xml_tagName();
[detail] +    _objectId=GraphicalUserInterface::instance()->xmlObjectId(_xmlObject.xmlObject);
[detail]      if(_objectId<0) { 
[detail] -      _objectId=GraphicalUserInterface::instance()->addObject(_object.qObject);
[detail] +      _objectId=GraphicalUserInterface::instance()->addxmlObject(_xmlObject.xmlObject);
[detail]      }
[detail]    }
[detail]  }
[detail] @@ -361,19 +386,17 @@
[detail]    case QMetaType::Void:
[detail]      Py_RETURN_NONE;
[detail]    default:
[detail] -    if(_object.qObject) {
[detail] -      return PythonClassFactory::instance()->create(_objectClassName, _objectId);
[detail] +    if(_qObject.qObject) {
[detail] +      return PythonClassFactory::instance()->createQObject(_objectClassName, _objectId);
[detail] +    } else if(_xmlObject.xmlObject) {
[detail] +      return PythonClassFactory::instance()->createXMLObject(_objectClassName, _objectId);
[detail]      } else {
[detail]        Py_RETURN_NONE;
[detail]      }
[detail]    }
[detail]  }
[detail]  
[detail] -#if(QT_VERSION>=QT_VERSION_CHECK(6, 5, 0))
[detail]  QVariant MethodArgument::toVariant(PyObject * args, int index, const QMetaType& type)
[detail] -#else
[detail] -QVariant MethodArgument::toVariant(PyObject * args, int index, int typeId)
[detail] -#endif
[detail]  {
[detail]    QVariant val;
[detail]    if(args==NULL) {
[detail] @@ -388,11 +411,7 @@
[detail]      return val;
[detail]    }
[detail]    bool ok=true;
[detail] -#if(QT_VERSION>=QT_VERSION_CHECK(6, 5, 0))
[detail]    switch(type.id()) {
[detail] -#else
[detail] -  switch(typeId) {
[detail] -#endif
[detail]    case QMetaType::Bool:
[detail]      val=toBool(arg, ok, index);
[detail]      break;
[detail] @@ -407,11 +426,7 @@
[detail]      break;
[detail]    default:
[detail]      GraphicalUserInterface::instance()->setErrorMessage(tr("unsupported type %1 for argument %i")
[detail] -#if(QT_VERSION>=QT_VERSION_CHECK(6, 5, 0))
[detail]                                                              .arg(type.name()).arg(index));
[detail] -#else
[detail] -                                                            .arg(QMetaType::typeName(typeId)).arg(index));
[detail] -#endif
[detail]      break;
[detail]    }
[detail]    if(!ok) {
[detail]                       src/MethodSort.cpp:  version-0.0.1	not modified
[detail]               src/PythonClassFactory.cpp:  version-0.0.1	modified out of comments
[detail] --- src/PythonClassFactory.cpp-version-0.0.1-stripped	2025-09-28 04:01:34.519645640 +0200
[detail] +++ src/PythonClassFactory.cpp-HEAD-stripped	2025-09-28 04:01:34.523645660 +0200
[detail] @@ -12,15 +12,16 @@
[detail]  
[detail]  PythonClassFactory * PythonClassFactory::_self=nullptr;
[detail]  
[detail] -struct QtObjectData {
[detail] +struct ObjectData {
[detail]    PyObject_HEAD
[detail] +  int objectType;  
[detail]    int objectId;
[detail]  };
[detail]  
[detail]  static PyTypeObject typeTemplate={
[detail]      PyVarObject_HEAD_INIT(NULL, 0)
[detail]      0,                       
[detail] -    sizeof(QtObjectData),    
[detail] +    sizeof(ObjectData),      
[detail]      0,                       
[detail]      0,                       
[detail]      0,                       
[detail] @@ -89,11 +90,16 @@
[detail]    ASSERT(!_self);
[detail]    _self=this;
[detail]  
[detail] -  _mapValues=new PyCFunction[MULITPLE_FUNCTION_COUNT];
[detail] -  _mapSetValues=new PyCFunction[MULITPLE_FUNCTION_COUNT];
[detail] -  _mapMethods=new PyCFunction[MULITPLE_FUNCTION_COUNT];
[detail] +  _mapValues=new PyCFunction[MULTIPLE_FUNCTION_COUNT];
[detail] +  _mapSetValues=new PyCFunction[MULTIPLE_FUNCTION_COUNT];
[detail] +  _mapMethods=new PyCFunction[MULTIPLE_FUNCTION_COUNT];
[detail]    MULTIPLE_FUNCTION(VALUE_FUNCTION)
[detail]    MULTIPLE_FUNCTION(METHOD_FUNCTION)
[detail] +
[detail] +  _customMetaTypes.insert(Legend::xmlLegendTag, QMetaType::fromType<Legend *>());
[detail] +  _customMetaTypes.insert(LegendItem::xmlLegendItemTag, QMetaType::fromType<LegendItem *>());
[detail] +  _customMetaTypes.insert(Pen::xmlPenTag, QMetaType::fromType<Pen *>());
[detail] +  _customMetaTypes.insert(Symbol::xmlSymbolTag, QMetaType::fromType<Symbol *>());
[detail]  }
[detail]  
[detail]  
[detail] @@ -153,6 +159,7 @@
[detail]      type.methodOffset=0;
[detail]    }
[detail]    type.qtObject=object;
[detail] +  type.metaType=object->metaType();
[detail]    type.pyObject=new PyTypeObject(typeTemplate);
[detail]    type.pyObject->tp_name=object->className();
[detail]    type.pyObject->tp_doc=PyDoc_STR("GeopsyPySciFigs object");
[detail] @@ -162,15 +169,62 @@
[detail]    return addMethods(_types.find(object->className()).value());
[detail]  }
[detail]  
[detail] +bool PythonClassFactory::add(const QString& xml_tagName)
[detail] +{
[detail] +  TypeInfo type;
[detail] +  type.propertyOffset=0;
[detail] +  type.methodOffset=0;
[detail] +  type.qtObject=nullptr;
[detail] +  QMap<QString, QMetaType>::const_iterator it=_customMetaTypes.find(xml_tagName);
[detail] +  if(it==_customMetaTypes.end()) {
[detail] +    GraphicalUserInterface::instance()->setErrorMessage(tr("unknown object type '%1'").arg(xml_tagName));
[detail] +    return false;
[detail] +  }
[detail] +  type.metaType=it.value();
[detail] +  type.pyObject=new PyTypeObject(typeTemplate);
[detail] +
[detail] +  _charStrings.append(xml_tagName.toLatin1());
[detail] +  type.pyObject->tp_name=_charStrings.last().data();
[detail] +  type.pyObject->tp_doc=PyDoc_STR("GeopsyPySciFigs object");
[detail] +
[detail] +  _types.insert(xml_tagName, type);
[detail] +
[detail] +  PyMethodDef * methods=new PyMethodDef[4];
[detail] +  int methodIndex=0;
[detail] +
[detail] +  PyMethodDef& mChild=methods[methodIndex++];
[detail] +  mChild.ml_name="child";
[detail] +  mChild.ml_flags=METH_VARARGS;
[detail] +  mChild.ml_doc="Object child(QString name): returns child with name.";
[detail] +  mChild.ml_meth=(PyCFunction) xml_child;
[detail] +
[detail] +  PyMethodDef& mValue=methods[methodIndex++];
[detail] +  mValue.ml_name="value";
[detail] +  mValue.ml_flags=METH_VARARGS;
[detail] +  mValue.ml_doc="QString value(QString name): returns property value.";
[detail] +  mValue.ml_meth=(PyCFunction) xml_value;
[detail] +
[detail] +  PyMethodDef& mSetValue=methods[methodIndex++];
[detail] +  mSetValue.ml_name="setValue";
[detail] +  mSetValue.ml_flags=METH_VARARGS;
[detail] +  mSetValue.ml_doc="setValue(QString name, value): sets property value.";
[detail] +  mSetValue.ml_meth=(PyCFunction) xml_setValue;
[detail] +
[detail] +  methods[methodIndex].ml_name=NULL;
[detail] +  type.pyObject->tp_methods=methods;
[detail] +
[detail] +  return PyType_Ready(type.pyObject)>=0;
[detail] +}
[detail] +
[detail]  bool PythonClassFactory::addMethods(TypeInfo& type)
[detail]  {
[detail]    
[detail]    int nProperties=type.qtObject->propertyCount()-type.propertyOffset;
[detail] -  if(nProperties>MULITPLE_FUNCTION_COUNT) {
[detail] -    GraphicalUserInterface::instance()->setErrorMessage(tr("Number of properties in class %1 exceed %3 (%2)")
[detail] +  if(nProperties>MULTIPLE_FUNCTION_COUNT) {
[detail] +    GraphicalUserInterface::instance()->setErrorMessage(tr("number of properties in class %1 exceed %3 (%2)")
[detail]                                                              .arg(type.qtObject->className())
[detail]                                                              .arg(nProperties)
[detail] -                                                            .arg(MULITPLE_FUNCTION_COUNT));
[detail] +                                                            .arg(MULTIPLE_FUNCTION_COUNT));
[detail]      return false;
[detail]    }
[detail]    int nAcceptedProperties=0;
[detail] @@ -220,11 +274,11 @@
[detail]    int nAcceptedMethods=methodSort.count();
[detail]    nMethods=lastMethodIndex-firstMethodIndex+1;
[detail]    type.methodOffset+=firstMethodIndex;
[detail] -  if(nMethods>MULITPLE_FUNCTION_COUNT) {
[detail] +  if(nMethods>MULTIPLE_FUNCTION_COUNT) {
[detail]      GraphicalUserInterface::instance()->setErrorMessage(tr("Number of methods in class %1 exceed %3 (%2)")
[detail]                                                              .arg(type.qtObject->className())
[detail]                                                              .arg(nMethods)
[detail] -                                                            .arg(MULITPLE_FUNCTION_COUNT));
[detail] +                                                            .arg(MULTIPLE_FUNCTION_COUNT));
[detail]      return false;
[detail]    }
[detail]  
[detail] @@ -243,28 +297,24 @@
[detail]        doc.prepend(" ");
[detail]        doc.prepend(p.typeName());
[detail]        doc+="(): returns property value.";
[detail] -      _methodNames.append(doc);
[detail] -      mValue.ml_doc=_methodNames.last().data();
[detail] +      _charStrings.append(doc);
[detail] +      mValue.ml_doc=_charStrings.last().data();
[detail]        mValue.ml_meth=_mapValues[i];
[detail]        PyMethodDef& mSetValue=methods[methodIndex++];
[detail]        QByteArray name(p.name());
[detail]        if(name.at(0)>='a') {
[detail] -#if(QT_VERSION>=QT_VERSION_CHECK(6, 0, 0))
[detail]          name[0]+='A'-'a';
[detail] -#else
[detail] -        name[0]=name[0]+static_cast<char>('A'-'a');
[detail] -#endif
[detail]        }
[detail]        name.prepend("set");
[detail] -      _methodNames.append(name);
[detail] -      mSetValue.ml_name=_methodNames.last().data();
[detail] +      _charStrings.append(name);
[detail] +      mSetValue.ml_name=_charStrings.last().data();
[detail]        mSetValue.ml_flags=METH_VARARGS;
[detail]        doc=name;
[detail]        doc+="(";
[detail]        doc+=p.typeName();
[detail]        doc+="): sets property value.";
[detail] -      _methodNames.append(doc);
[detail] -      mSetValue.ml_doc=_methodNames.last().data();
[detail] +      _charStrings.append(doc);
[detail] +      mSetValue.ml_doc=_charStrings.last().data();
[detail]        mSetValue.ml_meth=_mapSetValues[i];
[detail]      }
[detail]    }
[detail] @@ -277,8 +327,8 @@
[detail]        QByteArray name(m.name());
[detail]        name+="_";
[detail]        name+=QByteArray::number(++methodOverloads[m.name()].index);
[detail] -      _methodNames.append(name);
[detail] -      mMethod.ml_name=_methodNames.last().data();
[detail] +      _charStrings.append(name);
[detail] +      mMethod.ml_name=_charStrings.last().data();
[detail]      } else {
[detail]        mMethod.ml_name=m.name();
[detail]      }
[detail] @@ -287,35 +337,23 @@
[detail]      QList<QByteArray> pnames=m.parameterNames();
[detail]      doc+="(";
[detail]      for(int i=0; i<m.parameterCount()-1; i++) {
[detail] -#if(QT_VERSION>=QT_VERSION_CHECK(6, 5, 0))
[detail]        doc+=m.parameterMetaType(i).name();
[detail] -#else
[detail] -      doc+=QMetaType::typeName(m.parameterType(i));
[detail] -#endif
[detail]        doc+=" ";
[detail]        doc+=pnames.at(i);
[detail]        doc+=", ";
[detail]      }
[detail]      if(m.parameterCount()>0) {
[detail] -#if(QT_VERSION>=QT_VERSION_CHECK(6, 5, 0))
[detail]        doc+=m.parameterMetaType(m.parameterCount()-1).name();
[detail] -#else
[detail] -      doc+=QMetaType::typeName(m.parameterType(m.parameterCount()-1));
[detail] -#endif
[detail]        doc+=" ";
[detail]        doc+=pnames.at(m.parameterCount()-1);
[detail]      }
[detail]      doc+=")";
[detail]      if(m.returnType()!=QMetaType::Void) {
[detail]        doc.prepend(" ");
[detail] -#if(QT_VERSION>=QT_VERSION_CHECK(6, 5, 0))
[detail]        doc.prepend(m.returnMetaType().name());
[detail] -#else
[detail] -      doc.prepend(QMetaType::typeName(m.returnType()));
[detail] -#endif
[detail]      }
[detail] -    _methodNames.append(doc);
[detail] -    mMethod.ml_doc=_methodNames.last().data();
[detail] +    _charStrings.append(doc);
[detail] +    mMethod.ml_doc=_charStrings.last().data();
[detail]      mMethod.ml_meth=_mapMethods[index];
[detail]    }
[detail]  
[detail] @@ -353,11 +391,7 @@
[detail]  {
[detail]    QVariant val=GraphicalUserInterface::instance()->propertyValue(objectId, propertyId);
[detail]    if(val.isValid()) {
[detail] -#if(QT_VERSION>=QT_VERSION_CHECK(6, 5, 0))
[detail]      switch(val.metaType().id()) {
[detail] -#else
[detail] -    switch(val.type()) {
[detail] -#endif
[detail]      case QMetaType::Bool:
[detail]        return val.toBool() ? Py_True : Py_False;
[detail]      case QMetaType::Int:
[detail] @@ -369,11 +403,7 @@
[detail]          return PyUnicode_FromKindAndData(PyUnicode_2BYTE_KIND, valStr.data(), valStr.size());
[detail]        }
[detail]      default:
[detail] -#if(QT_VERSION>=QT_VERSION_CHECK(6, 5, 0))
[detail]        GraphicalUserInterface::instance()->setErrorMessage(tr("unsupported type %1").arg(val.metaType().id()));
[detail] -#else
[detail] -      GraphicalUserInterface::instance()->setErrorMessage(tr("unsupported type %1").arg(val.type()));
[detail] -#endif
[detail]        return NULL;
[detail]      }
[detail]    } else {
[detail] @@ -437,15 +467,31 @@
[detail]    }
[detail]  }
[detail]  
[detail] -PyObject * PythonClassFactory::create(const QString& className, int objectId) const
[detail] +PyObject * PythonClassFactory::createQObject(const QString& className, int objectId) const
[detail] +{
[detail] +  QMap<QString, TypeInfo>::const_iterator it=_types.find(className);
[detail] +  if(it!=_types.end()) {
[detail] +    PyObject * pyObj=_PyObject_New(it.value().pyObject);
[detail] +    ((ObjectData *)pyObj)->objectId=objectId;
[detail] +    ((ObjectData *)pyObj)->objectType=0;
[detail] +    return pyObj;
[detail] +  } else {
[detail] +    GraphicalUserInterface::instance()->setErrorMessage(tr("unknown object type '%1' (create QObject)")
[detail] +                                                            .arg(className));
[detail] +    return NULL;
[detail] +  }
[detail] +}
[detail] +
[detail] +PyObject * PythonClassFactory::createXMLObject(const QString& className, int objectId) const
[detail]  {
[detail]    QMap<QString, TypeInfo>::const_iterator it=_types.find(className);
[detail]    if(it!=_types.end()) {
[detail]      PyObject * pyObj=_PyObject_New(it.value().pyObject);
[detail] -    ((QtObjectData *)pyObj)->objectId=objectId;
[detail] +    ((ObjectData *)pyObj)->objectId=objectId;
[detail] +    ((ObjectData *)pyObj)->objectType=1;
[detail]      return pyObj;
[detail]    } else {
[detail] -    GraphicalUserInterface::instance()->setErrorMessage(tr("unknown object type '%1' (create)")
[detail] +    GraphicalUserInterface::instance()->setErrorMessage(tr("unknown object type '%1' (create XMLClass)")
[detail]                                                              .arg(className));
[detail]      return NULL;
[detail]    }
[detail] @@ -453,10 +499,69 @@
[detail]  
[detail]  int PythonClassFactory::objectId(PyObject * obj)
[detail]  {
[detail] -  return ((QtObjectData *)obj)->objectId;
[detail] +  return ((ObjectData *)obj)->objectId;
[detail] +}
[detail] +
[detail] +int PythonClassFactory::objectType(PyObject * obj)
[detail] +{
[detail] +  return ((ObjectData *)obj)->objectType;
[detail]  }
[detail]  
[detail]  MULTIPLE_FUNCTION(IMPL_VALUE_FUNCTION)
[detail]  MULTIPLE_FUNCTION(IMPL_METHOD_FUNCTION)
[detail]  
[detail] +PyObject * PythonClassFactory::xml_child(ObjectData * self, PyObject * args)
[detail] +{
[detail] +  MethodArgument * val=GraphicalUserInterface::instance()->xml_child(self->objectId, args);
[detail] +  if(val) {
[detail] +    return val->toPyObject();
[detail] +  } else {
[detail] +    return NULL;
[detail] +  }
[detail] +}
[detail] +
[detail] +PyObject * PythonClassFactory::xml_value(ObjectData * self, PyObject * args)
[detail] +{
[detail] +  QVariant val=GraphicalUserInterface::instance()->xml_value(self->objectId, args);
[detail] +  if(val.isValid()) {
[detail] +    switch(val.metaType().id()) {
[detail] +    case QMetaType::Bool:
[detail] +      return val.toBool() ? Py_True : Py_False;
[detail] +    case QMetaType::Int:
[detail] +      return PyLong_FromLong(val.toInt());
[detail] +    case QMetaType::Double:
[detail] +      return PyFloat_FromDouble(val.toDouble());
[detail] +    case QMetaType::QString: {
[detail] +      QString valStr=val.toString();
[detail] +      return PyUnicode_FromKindAndData(PyUnicode_2BYTE_KIND, valStr.data(), valStr.size());
[detail] +    }
[detail] +    default:
[detail] +      GraphicalUserInterface::instance()->setErrorMessage(tr("unsupported type %1").arg(val.metaType().id()));
[detail] +      return NULL;
[detail] +    }
[detail] +  } else {
[detail] +    GraphicalUserInterface::instance()->setErrorMessage(tr("invalid property value"));
[detail] +    return NULL;
[detail] +  }
[detail] +}
[detail] +
[detail] +PyObject * PythonClassFactory::xml_setValue(ObjectData * self, PyObject * args)
[detail] +{
[detail] +  if(GraphicalUserInterface::instance()->xml_setValue(self->objectId, args)) {
[detail] +    Py_RETURN_NONE;
[detail] +  } else {
[detail] +    return NULL;
[detail] +  }
[detail] +}
[detail] +
[detail] +QMetaType PythonClassFactory::customMetaType(const QString& className)
[detail] +{
[detail] +  QMap<QString, QMetaType>::const_iterator it=_customMetaTypes.find(className);
[detail] +  if(it!=_customMetaTypes.end()) {
[detail] +    return it.value();
[detail] +  } else {
[detail] +    return QMetaType();
[detail] +  }
[detail] +}
[detail] +
[detail]  #endif 
[detail]                      src/ActionExecute.h:  version-0.0.1	modified out of comments
[detail] --- src/ActionExecute.h-version-0.0.1-stripped	2025-09-28 04:01:34.543645757 +0200
[detail] +++ src/ActionExecute.h-HEAD-stripped	2025-09-28 04:01:34.547645775 +0200
[detail] @@ -20,9 +20,12 @@
[detail]  
[detail]    void initAcknowledge(QWaitCondition * m);
[detail]  
[detail] -  int find(QObject * obj) const;
[detail] -  template <class T> T * find(int objectId) const;
[detail] -  int addObject(QObject * obj);
[detail] +  int qFind(QObject * object) const;
[detail] +  int xmlFind(XMLClass * object) const;
[detail] +  template <class T> T * qFind(int objectId) const;
[detail] +  template <class T> T * xmlFind(int objectId) const;
[detail] +  int addqObject(QObject * object);
[detail] +  int addxmlObject(XMLClass * object);
[detail]  public slots:
[detail]    void createGraphicSheet(int * objectId);
[detail]    void createAxisWindow(int parentId, int * objectId);
[detail] @@ -30,10 +33,13 @@
[detail]    void propertyValue(int objectId, int propertyId, QVariant * val);
[detail]    void setPropertyValue(int objectId, int propertyId, PyObject * args, bool * ok);
[detail]    void method(int objectId, int methodId, PyObject * args, MethodArgument ** returnValue);
[detail] +  void xml_child(int objectId, PyObject * args, MethodArgument ** returnValue);
[detail] +  void xml_value(int objectId, PyObject * args, QVariant * val);
[detail] +  void xml_setValue(int objectId, PyObject * args, bool * ok);
[detail]    void setVerbosity(int level);
[detail]    void quit();
[detail]  private slots:
[detail] -  void objectDestroyed(QObject * obj);
[detail] +  void qObjectDestroyed(QObject * object);
[detail]  private:
[detail]    void dumpIds() const;
[detail]    void acknowledge();
[detail] @@ -41,22 +47,39 @@
[detail]    static void setLimits(AxisWindow * w);
[detail]  
[detail]    QWaitCondition * _acknowledge;
[detail] -  int _nextWidgetId;
[detail] +  int _nextObjectId;
[detail]    mutable QMutex _objectLists;
[detail] -  QMap<int, QObject *> _idsToObjects;
[detail] -  QMap<QObject *, int> _objectsToIds;
[detail] +  QMap<int, QObject *> _idsToQObjects;
[detail] +  QMap<QObject *, int> _qObjectsToIds;
[detail] +  QMap<int, XMLClass *> _idsToXMLObjects;
[detail] +  QMap<XMLClass *, int> _xmlObjectsToIds;
[detail]    Legend _legend;
[detail]  };
[detail]  
[detail]  template <class T>
[detail] -T * ActionExecute::find(int objectId) const
[detail] +T * ActionExecute::qFind(int objectId) const
[detail]  {
[detail]    _objectLists.lock();
[detail] -  QMap<int, QObject *>::const_iterator it=_idsToObjects.find(objectId);
[detail] -  if(it!=_idsToObjects.end()) {
[detail] -    QObject * obj=it.value();
[detail] +  QMap<int, QObject *>::const_iterator it=_idsToQObjects.find(objectId);
[detail] +  if(it!=_idsToQObjects.end()) {
[detail] +    QObject * object=it.value();
[detail]      _objectLists.unlock();
[detail] -    return qobject_cast<T *>(obj);
[detail] +    return qobject_cast<T *>(object);
[detail] +  } else {
[detail] +    _objectLists.unlock();
[detail] +    return nullptr;
[detail] +  }
[detail] +}
[detail] +
[detail] +template <class T>
[detail] +T * ActionExecute::xmlFind(int objectId) const
[detail] +{
[detail] +  _objectLists.lock();
[detail] +  QMap<int, XMLClass *>::const_iterator it=_idsToXMLObjects.find(objectId);
[detail] +  if(it!=_idsToXMLObjects.end()) {
[detail] +    XMLClass * object=it.value();
[detail] +    _objectLists.unlock();
[detail] +    return static_cast<T *>(object);
[detail]    } else {
[detail]      _objectLists.unlock();
[detail]      return nullptr;
[detail]                      src/ActionRequest.h:  version-0.0.1	modified out of comments
[detail] --- src/ActionRequest.h-version-0.0.1-stripped	2025-09-28 04:01:34.567645873 +0200
[detail] +++ src/ActionRequest.h-HEAD-stripped	2025-09-28 04:01:34.571645892 +0200
[detail] @@ -27,6 +27,9 @@
[detail]    QVariant propertyValue(int objectId, int propertyId);
[detail]    bool setPropertyValue(int objectId, int propertyId, PyObject * args);
[detail]    MethodArgument * method(int objectId, int methodId, PyObject * args);
[detail] +  MethodArgument * xml_child(int objectId, PyObject * args);
[detail] +  QVariant xml_value(int objectId, PyObject * args);
[detail] +  bool xml_setValue(int objectId, PyObject * args);
[detail]    void setVerbosity(int level);
[detail]    void quit();
[detail]  signals:
[detail] @@ -36,6 +39,9 @@
[detail]    void requestPropertyValue(int objectId, int propertyId, QVariant * val);
[detail]    void requestSetPropertyValue(int objectId, int propertyId, PyObject * args, bool * ok);
[detail]    void requestMethod(int objectId, int methoddId, PyObject * args, MethodArgument ** val);
[detail] +  void requestXMLChild(int objectId, PyObject * args, MethodArgument ** val);
[detail] +  void requestXMLValue(int objectId, PyObject * args, QVariant * val);
[detail] +  void requestXMLSetValue(int objectId, PyObject * args, bool * ok);
[detail]    void requestSetVerbosity(int level);
[detail]    void requestQuit();
[detail]  private:
[detail]                          src/CurveData.h:  version-0.0.1	not modified
[detail]             src/GraphicalUserInterface.h:  version-0.0.1	modified out of comments
[detail] --- src/GraphicalUserInterface.h-version-0.0.1-stripped	2025-09-28 04:01:34.607646066 +0200
[detail] +++ src/GraphicalUserInterface.h-HEAD-stripped	2025-09-28 04:01:34.611646085 +0200
[detail] @@ -36,13 +36,19 @@
[detail]    QVariant propertyValue(int objectId, int propertyId) const;
[detail]    bool setPropertyValue(int objectId, int propertyId, PyObject * args) const;
[detail]    MethodArgument * method(int objectId, int methodId, PyObject * args) const;
[detail] +  MethodArgument * xml_child(int objectId, PyObject * args) const;
[detail] +  QVariant xml_value(int objectId, PyObject * args) const;
[detail] +  bool xml_setValue(int objectId, PyObject * args) const;
[detail]  
[detail]    void addCurves(int parentId, CurveData * d);
[detail]    void setVerbosity(int level);
[detail]  
[detail] -  int objectId(QObject * obj) const;
[detail] -  QObject * object(int objectId) const;
[detail] -  int addObject(QObject * obj);
[detail] +  int qObjectId(QObject * obj) const;
[detail] +  int xmlObjectId(XMLClass * obj) const;
[detail] +  QObject * qObject(int objectId) const;
[detail] +  XMLClass * xmlObject(int objectId) const;
[detail] +  int addqObject(QObject * obj);
[detail] +  int addxmlObject(XMLClass * obj);
[detail]  private:
[detail]    void waitForStarted();
[detail]    void waitForStopped();
[detail]                     src/MethodArgument.h:  version-0.0.1	modified out of comments
[detail] --- src/MethodArgument.h-version-0.0.1-stripped	2025-09-28 04:01:34.627646163 +0200
[detail] +++ src/MethodArgument.h-HEAD-stripped	2025-09-28 04:01:34.631646182 +0200
[detail] @@ -11,43 +11,32 @@
[detail]  class MethodArgument
[detail]  {
[detail]  public:
[detail] -  MethodArgument() {_object.qObject=nullptr;}
[detail] +  MethodArgument() {_qObject.qObject=nullptr; _xmlObject.xmlObject=nullptr;}
[detail]  
[detail]    static void initTypes();
[detail]    static bool isSupported(int type);
[detail]  
[detail] -#if(QT_VERSION>=QT_VERSION_CHECK(6, 5, 0))
[detail]    bool setArgument(PyObject * args, int index, const QMetaType& type);
[detail]    bool setReturnArgument(const QMetaType& type);
[detail] +
[detail]    static QVariant toVariant(PyObject * args, int index, const QMetaType& type);
[detail] -#else
[detail] -  bool setArgument(PyObject * args, int index, int typeId);
[detail] -  bool setReturnArgument(int typeId);
[detail] -  static QVariant toVariant(PyObject * args, int index, int typeId);
[detail] -#endif
[detail] +  static bool toBool(PyObject * arg, bool& ok, int index);
[detail] +  static int toInt(PyObject * arg, bool& ok, int index);
[detail] +  static double toDouble(PyObject * arg, bool& ok, int index);
[detail] +  static QString toString(PyObject * arg, bool& ok, int index);
[detail] +
[detail]    PyObject * toPyObject() const;
[detail]  
[detail]    static int checkCount(PyObject * args, int expectedCount);
[detail]    static int maximumArgumentCount() {return MAXIMUM_ARGUMENT_COUNT;}
[detail]  
[detail] -#if(QT_VERSION>=QT_VERSION_CHECK(6, 5, 0))
[detail]    const QMetaMethodArgument& argument() {return _argument;}
[detail]    QMetaMethodReturnArgument& returnArgument() {return _returnArgument;}
[detail] -#else
[detail] -  const QGenericArgument& argument() {return _argument;}
[detail] -  QGenericReturnArgument& returnArgument() {return _returnArgument;}
[detail] -#endif
[detail]    bool hasReturnArgument() const {return _type!=QMetaType::Void;}
[detail] +  void setXMLObject(XMLClass * object) {_xmlObject.xmlObject=object;}
[detail]    void registerObject();
[detail] -
[detail]  private:
[detail]    bool unsupportedTypeError() const;
[detail] -  static bool toBool(PyObject * arg, bool& ok, int index);
[detail] -  static int toInt(PyObject * arg, bool& ok, int index);
[detail] -  static double toDouble(PyObject * arg, bool& ok, int index);
[detail] -  static QString toString(PyObject * arg, bool& ok, int index);
[detail] -  static QObject * toObjectStar(PyObject * arg);
[detail] -
[detail]    static QMap<int, int> _customTypes;
[detail]  
[detail]    int _type;
[detail] @@ -66,17 +55,19 @@
[detail]      LegendWidget * legendWidget;
[detail]      ColorMapWidget * colorMapWidget;
[detail]      ImageWidget * imageWidget;
[detail] -  } _object;
[detail] -  const char * _objectClassName;
[detail] +  } _qObject;
[detail] +  union {
[detail] +    XMLClass * xmlObject;
[detail] +    Legend * legend;
[detail] +    LegendItem * legendItem;
[detail] +    Pen * pen;
[detail] +    Symbol * symbol;
[detail] +  } _xmlObject;
[detail] +  QString _objectClassName;
[detail]    int _objectId;
[detail]  
[detail] -#if(QT_VERSION>=QT_VERSION_CHECK(6, 5, 0))
[detail]    QMetaMethodArgument _argument;
[detail]    QMetaMethodReturnArgument _returnArgument;
[detail] -#else
[detail] -  QGenericArgument _argument;
[detail] -  QGenericReturnArgument _returnArgument;
[detail] -#endif
[detail]  };
[detail]  
[detail]  #endif 
[detail]                         src/MethodSort.h:  version-0.0.1	not modified
[detail]                 src/PythonClassFactory.h:  version-0.0.1	modified out of comments
[detail] --- src/PythonClassFactory.h-version-0.0.1-stripped	2025-09-28 04:01:34.667646356 +0200
[detail] +++ src/PythonClassFactory.h-HEAD-stripped	2025-09-28 04:01:34.667646356 +0200
[detail] @@ -7,28 +7,28 @@
[detail]  #include "PythonNumPy.h"
[detail]  #include <QGpCoreTools.h>
[detail]  
[detail] -struct QtObjectData;
[detail] +struct ObjectData;
[detail]  
[detail]  #define DECL_VALUE_FUNCTION(h, t, u) \
[detail] -  static PyObject * value_##h##t##u(QtObjectData * self, PyObject *); \
[detail] -  static PyObject * setValue_##h##t##u(QtObjectData * self, PyObject * args);
[detail] +  static PyObject * value_##h##t##u(ObjectData * self, PyObject *); \
[detail] +  static PyObject * setValue_##h##t##u(ObjectData * self, PyObject * args);
[detail]  
[detail]  #define IMPL_VALUE_FUNCTION(h, t, u) \
[detail] -  PyObject * PythonClassFactory::value_##h##t##u(QtObjectData * self, PyObject *) \
[detail] +  PyObject * PythonClassFactory::value_##h##t##u(ObjectData * self, PyObject *) \
[detail]    { \
[detail]      return value(self->objectId, h*100+t*10+u); \
[detail]    } \
[detail] -  PyObject * PythonClassFactory::setValue_##h##t##u(QtObjectData * self, PyObject * args) \
[detail] +  PyObject * PythonClassFactory::setValue_##h##t##u(ObjectData * self, PyObject * args) \
[detail]    { \
[detail]      return setValue(self->objectId, h*100+t*10+u, args); \
[detail]    }
[detail]  
[detail]  
[detail]  #define DECL_METHOD_FUNCTION(h, t, u) \
[detail] -  static PyObject * method_##h##t##u(QtObjectData * self, PyObject *);
[detail] +  static PyObject * method_##h##t##u(ObjectData * self, PyObject *);
[detail]  
[detail]  #define IMPL_METHOD_FUNCTION(h, t, u) \
[detail] -PyObject * PythonClassFactory::method_##h##t##u(QtObjectData * self, PyObject * args) \
[detail] +PyObject * PythonClassFactory::method_##h##t##u(ObjectData * self, PyObject * args) \
[detail]  { \
[detail]    return method(self->objectId, h*100+t*10+u, args); \
[detail]  }
[detail] @@ -57,9 +57,11 @@
[detail]    MULTIPLE_FUNCTION_10(FUNCTION, h, 8) \
[detail]    MULTIPLE_FUNCTION_10(FUNCTION, h, 9)
[detail]  
[detail] -#define MULITPLE_FUNCTION_COUNT 100
[detail] +#define MULTIPLE_FUNCTION_COUNT 120
[detail]  #define MULTIPLE_FUNCTION(FUNCTION) \
[detail] -  MULTIPLE_FUNCTION_100(FUNCTION, 0)
[detail] +  MULTIPLE_FUNCTION_100(FUNCTION, 0) \
[detail] +  MULTIPLE_FUNCTION_10(FUNCTION, 1, 0) \
[detail] +  MULTIPLE_FUNCTION_10(FUNCTION, 1, 1) \
[detail]  
[detail]  
[detail]  class PythonClassFactory
[detail] @@ -72,22 +74,29 @@
[detail]  
[detail]    bool add(XMLClassFactory * factory);
[detail]    bool add(const QMetaObject * object);
[detail] +  bool add(const QString& xml_tagName);
[detail]    void cleanFunctionMaps();
[detail]  
[detail]    int propertyOffset(const QString& className) const;
[detail]    int methodOffset(const QString& className) const;
[detail]    const QMetaObject * metaObject(const QString& className) const;
[detail] -  PyObject * create(const QString& className, int objectId) const;
[detail] +  PyObject * createQObject(const QString& className, int objectId) const;
[detail] +  PyObject * createXMLObject(const QString& className, int objectId) const;
[detail] +
[detail] +  QMetaType customMetaType(const QString& className);
[detail]  
[detail]    static int objectId(PyObject * obj);
[detail] +  static int objectType(PyObject * obj);
[detail]  private:
[detail]    struct TypeInfo {
[detail]      PyTypeObject * pyObject;
[detail]      const QMetaObject * qtObject;
[detail] +    QMetaType metaType;
[detail]      int propertyOffset, methodOffset;
[detail]    };
[detail] +  QMap<QString, QMetaType> _customMetaTypes;
[detail]    QMap<QString, TypeInfo> _types;
[detail] -  QList<QByteArray> _methodNames;
[detail] +  QList<QByteArray> _charStrings;
[detail]    PyCFunction * _mapValues, * _mapSetValues, * _mapMethods;
[detail]  
[detail]    bool addMethods(TypeInfo& type);
[detail] @@ -98,6 +107,9 @@
[detail]  
[detail]    MULTIPLE_FUNCTION(DECL_VALUE_FUNCTION)
[detail]    MULTIPLE_FUNCTION(DECL_METHOD_FUNCTION)
[detail] +  static PyObject * xml_child(ObjectData * self, PyObject * args);
[detail] +  static PyObject * xml_value(ObjectData * self, PyObject * args);
[detail] +  static PyObject * xml_setValue(ObjectData * self, PyObject * args);
[detail]  
[detail]    static PythonClassFactory * _self;
[detail]  };
[detail]                        src/PythonNumPy.h:  version-0.0.1	not modified
[summary] Total differences: 1523 lines
[summary] Modification level is C
OLD_DIR=$(pwd)
echo "GeopsyPySciFigs"
cd $(find . -name "GeopsyPySciFigs" | tail -n 1) || exit 2
pwd
dpversion C  || exit 2
cd $OLD_DIR || exit 2
################## gpconvolution
[detail]                  src/ConvolutionLoop.cpp:  version-1.0.0	modified out of comments
[detail] --- src/ConvolutionLoop.cpp-version-1.0.0-stripped	2025-09-28 04:01:34.735646685 +0200
[detail] +++ src/ConvolutionLoop.cpp-HEAD-stripped	2025-09-28 04:01:34.739646703 +0200
[detail] @@ -95,8 +92,8 @@
[detail]    cf.setFile(fileName);
[detail]    while(!cf.wait()) {}
[detail]    QList<NamedPoint> points=cf.points();
[detail] -  _passiveSrc.resize(points.count());
[detail] -  for(int i=points.count()-1; i>=0; i--) {
[detail] +  _passiveSrc.resize(points.size());
[detail] +  for(int i=points.size()-1; i>=0; i--) {
[detail]      _passiveSrc[i]=new Source();
[detail]      _passiveSrc[i]->setPosition(points.at(i));
[detail]      _passiveSrc[i]->setAmplitude(Point(0, 0, 1));
[detail] @@ -158,7 +155,7 @@
[detail]    CoordinateFile cf;
[detail]    cf.setNameRequired(false);
[detail]    if(parserFile.isEmpty()) {
[detail] -    QVector<int> defaultTypes;
[detail] +    VectorList<int> defaultTypes;
[detail]      defaultTypes << 2 << 4 << 6;
[detail]      cf.setTypes(defaultTypes);
[detail]    } else {
[detail] @@ -170,8 +167,8 @@
[detail]    
[detail]    
[detail]    std::sort(points.begin(), points.end());
[detail] -  _rec.resize(points.count());
[detail] -  for(int i=points.count()-1; i>=0; i--) {
[detail] +  _rec.resize(points.size());
[detail] +  for(int i=points.size()-1; i>=0; i--) {
[detail]      _rec[i]=new Receiver;
[detail]      _rec[i]->setPosition(points.at(i));
[detail]    }
[detail] @@ -213,7 +210,7 @@
[detail]    App::log(tr("%1 Green functions sampled at %2 s with %3 samples\n").arg(_gfs.functionCount()).arg(_gfs.samplingPeriod()).arg(_gfs.sampleCount()) );
[detail]  }
[detail]  
[detail] -LoopTask * ConvolutionLoop::newTask()
[detail] +LoopWorker * ConvolutionLoop::newWorker()
[detail]  {
[detail]    TRACE;
[detail]    ConvolutionTask * t=new ConvolutionTask;
[detail] @@ -261,7 +258,7 @@
[detail]        return false;
[detail]      }
[detail]    }
[detail] -  waitFinished();
[detail] +  waitFinished(0);
[detail]  
[detail]    QString stationName("HIS%1");
[detail]    for(int iRec=0; iRec<_rec.count(); iRec++) {
[detail]                  src/ConvolutionTask.cpp:  version-1.0.0	modified out of comments
[detail] --- src/ConvolutionTask.cpp-version-1.0.0-stripped	2025-09-28 04:01:34.755646781 +0200
[detail] +++ src/ConvolutionTask.cpp-HEAD-stripped	2025-09-28 04:01:34.759646800 +0200
[detail] @@ -8,7 +8,7 @@
[detail]  
[detail]  
[detail]  ConvolutionTask::ConvolutionTask()
[detail] -  : LoopTask()
[detail] +  : LoopWorker()
[detail]  {
[detail]    TRACE;
[detail]    _rand=0;
[detail] @@ -31,7 +31,7 @@
[detail]    _rand=new Random(seed);
[detail]  }
[detail]  
[detail] -void ConvolutionTask::setReceivers(QVector<Receiver *> * rec)
[detail] +void ConvolutionTask::setReceivers(VectorList<Receiver *> * rec)
[detail]  {
[detail]    _commonRec=rec;
[detail]    qDeleteAll(_rec);
[detail]                    src/GreenFunction.cpp:  version-1.0.0	modified out of comments
[detail] --- src/GreenFunction.cpp-version-1.0.0-stripped	2025-09-28 04:01:34.775646878 +0200
[detail] +++ src/GreenFunction.cpp-HEAD-stripped	2025-09-28 04:01:34.779646898 +0200
[detail] @@ -12,7 +12,7 @@
[detail]  {
[detail]    TRACE;
[detail]    for(int i=0; i<9; i++) {
[detail] -    _values[i]=0;
[detail] +    _values[i]=nullptr;
[detail]    }
[detail]  }
[detail]  
[detail] @@ -85,24 +85,26 @@
[detail]    return true;
[detail]  }
[detail]  
[detail] -void GreenFunction::setAmplitudeUnit(Signal::AmplitudeUnits unit)
[detail] +void GreenFunction::setAmplitudeUnit(SignalMetaData::AmplitudeUnits unit)
[detail]  {
[detail]    switch(unit) {
[detail] -  case Signal::Acceleration: {
[detail] +  case SignalMetaData::Acceleration: {
[detail]        double omega=2.0*M_PI/samplingPeriod();
[detail]        double factor=-omega*omega;
[detail]        multiply(factor);
[detail]      }
[detail]      break;
[detail] -  case Signal::Velocity: {
[detail] +  case SignalMetaData::Velocity: {
[detail]        double omega=2.0*M_PI/samplingPeriod();
[detail]        Complex factor(0.0, omega);
[detail]        multiply(factor);
[detail]      }
[detail]      break;
[detail] -  case Signal::Displacement:
[detail] +  case SignalMetaData::Displacement:
[detail]      break;
[detail] -  case Signal::UndefinedUnit:
[detail] +  case SignalMetaData::Strain:
[detail] +  case SignalMetaData::StrainRate:
[detail] +  case SignalMetaData::UndefinedUnit:
[detail]      ASSERT(false);
[detail]    }
[detail]  }
[detail] @@ -128,18 +130,22 @@
[detail]                      .arg(startTime).arg(endTime));
[detail]  
[detail]    
[detail] -  TaperParameters param;
[detail] -  param.setWindow(TaperParameters::Tukey);
[detail] +  WindowFunctionParameters param;
[detail] +  param.setShape(WindowFunctionParameters::Tukey);
[detail]    param.setAlpha(0.20);
[detail]    endTime*=1.1;
[detail]    for(int i=0; i<9; i++) {
[detail] -    _values[i]->taper(-endTime, endTime, param);
[detail] +    if(!_values[i]->taper(-endTime, endTime, param)) {
[detail] +      App::log(tr("Error applying taper, skipping\n"));
[detail] +    }
[detail]    }
[detail]    
[detail] -  param.setWindow(TaperParameters::Cosine);
[detail] +  param.setShape(WindowFunctionParameters::Cosine);
[detail]    param.setReversed(true);
[detail]    for(int i=0; i<9; i++) {
[detail] -    _values[i]->taper(-startTime, startTime, param);
[detail] +    if(!_values[i]->taper(-startTime, startTime, param)) {
[detail] +      App::log(tr("Error applying taper, skipping\n"));
[detail] +    }
[detail]    }
[detail]  }
[detail]  
[detail] @@ -217,7 +223,7 @@
[detail]      s.setFieldWidth(12);
[detail]      s << values[0]->re(samples[0], i) << values[0]->im(samples[0], i)
[detail]        << values[1]->re(samples[1], i) << values[1]->im(samples[1], i)
[detail] -      << values[2]->re(samples[2], i) << values[2]->im(samples[2], i) << ::endl;
[detail] +      << values[2]->re(samples[2], i) << values[2]->im(samples[2], i) << Qt::endl;
[detail]    }
[detail]    unlockSamples(2, componentIndex);
[detail]    return true;
[detail] @@ -226,13 +232,13 @@
[detail]  
[detail]  void GreenFunction::save(const QString& baseName)
[detail]  {
[detail] -  Signal * sig=new Signal(GeopsyCoreEngine::instance()->defaultDatabase());
[detail] -  sig->setNSamples(_values[0]->nSamples());
[detail] +  SignalSegment * sig=new SignalSegment(GeopsyCoreEngine::instance()->defaultDatabase());
[detail] +  sig->setSize(_values[0]->nSamples());
[detail]    sig->setSamplingPeriod(samplingPeriod());
[detail]    for(int i=0; i<9; i++) {
[detail] -    sig->setType(DoubleSignal::Spectrum);
[detail] -    sig->DoubleSignal::copySamplesFrom(_values[i]);
[detail] -    sig->fastFourierTransform(DoubleSignal::Waveform);
[detail] +    sig->values()->setType(DoubleSignal::Spectrum);
[detail] +    sig->values()->DoubleSignal::copySamplesFrom(_values[i]);
[detail] +    sig->values()->fastFourierTransform(DoubleSignal::Waveform);
[detail]      SubSignalPool pool;
[detail]      pool.addSignal(sig);
[detail]      pool.save(baseName+"green_"+QString::number(i)+".sac",
[detail]                   src/GreenFunctions.cpp:  version-1.0.0	not modified
[detail]                       src/Parameters.cpp:  version-1.0.0	modified out of comments
[detail] --- src/Parameters.cpp-version-1.0.0-stripped	2025-09-28 04:01:34.811647052 +0200
[detail] +++ src/Parameters.cpp-HEAD-stripped	2025-09-28 04:01:34.815647071 +0200
[detail] @@ -11,7 +11,7 @@
[detail]    TRACE;
[detail]    _passiveFireProbability=0.001;
[detail]    _duration=300;  
[detail] -  _amplitudeUnits=Signal::Velocity;
[detail] +  _amplitudeUnits=SignalMetaData::Velocity;
[detail]    _effectiveSourceDuration=10.0;
[detail]    _randomSeed=0; 
[detail]    _receiverFile="receiv.pos";
[detail] @@ -26,36 +26,6 @@
[detail]  }
[detail]  
[detail]  
[detail] -
[detail] -Parameters::Parameters(const Parameters& o)
[detail] -  : AbstractParameters()
[detail] -{
[detail] -  TRACE;
[detail] -  _duration=o._duration;
[detail] -  _effectiveSourceDuration=o._effectiveSourceDuration;
[detail] -  _amplitudeUnits=o._amplitudeUnits;
[detail] -
[detail] -  _passiveFireProbability=o._passiveFireProbability;
[detail] -  _randomSeed=o._randomSeed;
[detail] -  _passiveSourceFile=o._passiveSourceFile;
[detail] -  _passiveSignalPath=o._passiveSignalPath;
[detail] -  _passiveOnly=o._passiveOnly;
[detail] -  _activeSourceFile=o._activeSourceFile;
[detail] -  _sourceFunctionFile=o._sourceFunctionFile;
[detail] -
[detail] -  _receiverFile=o._receiverFile;
[detail] -  for(int i=0; i<3; i++) {
[detail] -    _greenFunctionFile[i]=o._greenFunctionFile[i];
[detail] -  }
[detail] -  _outputBaseName=o._outputBaseName;
[detail] -  _distIndFile=o._distIndFile;
[detail] -  _firstReceiverIndex=o._firstReceiverIndex;
[detail] -  _minimumVelocity=o._minimumVelocity;
[detail] -  _maximumVelocity=o._maximumVelocity;
[detail] -  _processSourceIndexes=o._processSourceIndexes;
[detail] -}
[detail] -
[detail] -
[detail]  Parameters::~Parameters()
[detail]  {
[detail]    TRACE;
[detail] @@ -119,13 +89,13 @@
[detail]    log+=prefix+"GREEN_FUNCTION_FILE_010"+suffix+"="+_greenFunctionFile[1]+"\n";
[detail]    log+=prefix+"GREEN_FUNCTION_FILE_001"+suffix+"="+_greenFunctionFile[2]+"\n";
[detail]    log+=prefix+"OUTPUT_BASE_NAME"+suffix+"="+_outputBaseName+"\n";
[detail] -  log+="# Not mandatory, it allows checking that the order of src and rec in Green functions is properly order\n";
[detail] +  log+="# Not mandatory, it allows checking that the src and rec in Green functions are properly ordered\n";
[detail]    log+="# The output file must match exactly the 'dist.ind.DEPTH' file provided as input to Hisada code\n";
[detail]    log+=prefix+"DIST_IND_FILE"+suffix+"="+_distIndFile+"\n";
[detail]    log+="# Process only a restricted number of sources, list separated by space.\n"
[detail] -       "# Passive source are indexed first, then active sources.";
[detail] +       "# Passive source are indexed first, then active sources.\n";
[detail]    log+=prefix+"PROCESS_SOURCE_INDEXES"+suffix+"="+processSourceIndexes()+"\n";
[detail] -  log+="# First receiver index can be usefull to combine several runs with various subset of receivers\n";
[detail] +  log+="# First receiver index can be useful to combine several runs with various subset of receivers\n";
[detail]    log+=prefix+"FIRST_RECEIVER_INDEX"+suffix+"="+QString::number(_firstReceiverIndex)+"\n";
[detail]    log+="# Effective duration of source function (controls Green function taper length)\n";
[detail]    log+=prefix+"EFFECTIVE_SOURCE_DURATION"+suffix+"="+Number::secondsToDuration(_effectiveSourceDuration, -1, &locale)+"\n";
[detail] @@ -191,7 +161,7 @@
[detail]      _passiveSignalPath=value;
[detail]      return true;
[detail]    case 17:
[detail] -    _passiveOnly=(value=="y");
[detail] +    _passiveOnly=Number::toBoolean(value, ok);
[detail]      return true;
[detail]    default:
[detail]      break;
[detail]                         src/Receiver.cpp:  version-1.0.0	not modified
[detail]                           src/Source.cpp:  version-1.0.0	not modified
[detail]                   src/SourceFunction.cpp:  version-1.0.0	modified out of comments
[detail] --- src/SourceFunction.cpp-version-1.0.0-stripped	2025-09-28 04:01:34.867647322 +0200
[detail] +++ src/SourceFunction.cpp-HEAD-stripped	2025-09-28 04:01:34.871647342 +0200
[detail] @@ -30,7 +30,7 @@
[detail]    AsciiLineParser parser(buffer, TEXT_LINE_LENGTH, 2);
[detail]    parser.setEmptyValues(false);
[detail]    
[detail] -  QVector<double> values;
[detail] +  VectorList<double> values;
[detail]    f.readLine(buffer, TEXT_LINE_LENGTH);
[detail]    parser.reset();
[detail]    parser.readLine();
[detail]             src/ThreeComponentSignal.cpp:  version-1.0.0	modified out of comments
[detail] --- src/ThreeComponentSignal.cpp-version-1.0.0-stripped	2025-09-28 04:01:34.887647419 +0200
[detail] +++ src/ThreeComponentSignal.cpp-HEAD-stripped	2025-09-28 04:01:34.891647438 +0200
[detail] @@ -53,34 +53,35 @@
[detail]  
[detail]  void ThreeComponentSignal::save(const QString& baseName, const QString& name)
[detail]  {
[detail] -  Signal * sig=new Signal(GeopsyCoreEngine::instance()->defaultDatabase());
[detail] -  sig->setNSamples(_sig[0]->nSamples());
[detail] +  SignalSegment * sig=new SignalSegment(GeopsyCoreEngine::instance()->defaultDatabase());
[detail] +  sig->setSize(_sig[0]->nSamples());
[detail]    sig->setSamplingPeriod(samplingPeriod());
[detail] +  sig->setStartTime(DateTime(QDate(2000, 1, 1), 0.0, 0.0));
[detail]    for(int i=0; i<3; i++) {
[detail]      sig->setType(_sig[i]->type());
[detail] -    sig->DoubleSignal::copySamplesFrom(_sig[i]);
[detail] -    sig->fastFourierTransform(DoubleSignal::Waveform);
[detail] +    sig->values()->copySamplesFrom(_sig[i]);
[detail] +    sig->values()->fastFourierTransform(DoubleSignal::Waveform);
[detail]      
[detail] -    sig->setReceiver(Point(_position.y(), _position.x(), _position.z()));
[detail] +    sig->metaData()->setReceiver(Point(_position.y(), _position.x(), _position.z()));
[detail]      switch(i) {
[detail]      case 0:
[detail] -      sig->setComponent(Signal::North);
[detail] +      sig->metaData()->setComponent(SignalMetaData::North);
[detail]        break;
[detail]      case 1:
[detail] -      sig->setComponent(Signal::East);
[detail] +      sig->metaData()->setComponent(SignalMetaData::East);
[detail]        break;
[detail]      default:
[detail]        
[detail]        
[detail]        
[detail] -      sig->multiply(-1.0);
[detail] -      sig->setComponent(Signal::Vertical);
[detail] +      sig->values()->multiply(-1.0);
[detail] +      sig->metaData()->setComponent(SignalMetaData::Vertical);
[detail]        break;
[detail]      }
[detail] -    sig->setName(name);
[detail] +    sig->metaData()->setName(name);
[detail]      SubSignalPool pool;
[detail]      pool.addSignal(sig);
[detail] -    pool.save(baseName+name+"_"+Signal::componentLetter(sig->component())+".sac",
[detail] +    pool.save(baseName+name+"_"+SignalMetaData::componentLetter(sig->metaData()->component())+".sac",
[detail]                false, SignalFileFormat::SacBigEndian);
[detail]    }
[detail]  }
[detail] @@ -90,31 +91,31 @@
[detail]    TRACE;
[detail]    SubSignalPool subpool;
[detail]    subpool=GeopsyCoreEngine::instance()->defaultDatabase()->load(fileName+"_E.sac");
[detail] -  if(subpool.count()!=1 || subpool.first()->nSamples()!=sampleCount()) {
[detail] +  if(subpool.count()!=1 || subpool.first()->size()!=sampleCount()) {
[detail]      App::log(tr("Number of samples in loaded signal is not compatible for component E (%1 instead of %2).\n")
[detail] -             .arg(subpool.first()->nSamples())
[detail] +             .arg(subpool.first()->size())
[detail]               .arg(sampleCount()));
[detail]      return false;
[detail]    }
[detail] -  _sig[0]->copySamplesFrom(subpool.first(), 0, 0, sampleCount());
[detail] +  _sig[0]->copySamplesFrom(subpool.first()->values(), 0, 0, sampleCount());
[detail]    subpool.removeAll();
[detail]    subpool=GeopsyCoreEngine::instance()->defaultDatabase()->load(fileName+"_N.sac");
[detail] -  if(subpool.count()!=1 || subpool.first()->nSamples()!=sampleCount()) {
[detail] +  if(subpool.count()!=1 || subpool.first()->size()!=sampleCount()) {
[detail]      App::log(tr("Number of samples in loaded signal is not compatible for component N (%1 instead of %2).\n")
[detail] -             .arg(subpool.first()->nSamples())
[detail] +             .arg(subpool.first()->size())
[detail]               .arg(sampleCount()));
[detail]      return false;
[detail]    }
[detail] -  _sig[1]->copySamplesFrom(subpool.first(), 0, 0, sampleCount());
[detail] +  _sig[1]->copySamplesFrom(subpool.first()->values(), 0, 0, sampleCount());
[detail]    subpool.removeAll();
[detail]    subpool=GeopsyCoreEngine::instance()->defaultDatabase()->load(fileName+"_Z.sac");
[detail] -  if(subpool.count()!=1 || subpool.first()->nSamples()!=sampleCount()) {
[detail] +  if(subpool.count()!=1 || subpool.first()->size()!=sampleCount()) {
[detail]      App::log(tr("Number of samples in loaded signal is not compatible for component Z (%1 instead of %2).\n")
[detail] -             .arg(subpool.first()->nSamples())
[detail] +             .arg(subpool.first()->size())
[detail]               .arg(sampleCount()));
[detail]      return false;
[detail]    }
[detail] -  _sig[2]->copySamplesFrom(subpool.first(), 0, 0, sampleCount());
[detail] +  _sig[2]->copySamplesFrom(subpool.first()->values(), 0, 0, sampleCount());
[detail]    subpool.removeAll();
[detail]    return true;
[detail]  }
[detail]                             src/main.cpp:  version-1.0.0	modified out of comments
[detail] --- src/main.cpp-version-1.0.0-stripped	2025-09-28 04:01:34.911647535 +0200
[detail] +++ src/main.cpp-HEAD-stripped	2025-09-28 04:01:34.915647555 +0200
[detail] @@ -32,10 +32,10 @@
[detail]            App::log(tr("error loading parameters from '%1', see '-param-example'\n").arg(argv[i]) );
[detail]            return 2;
[detail]          }
[detail] -      } else if(arg=="-set-param") {
[detail] +      } else if(arg=="-set") {
[detail]          CoreApplication::checkOptionArg(i, argc, argv);
[detail]          AbstractParameters::KeywordMap keywords;
[detail] -        param.collectKeywords(keywords, QString::null, QString::null);
[detail] +        param.collectKeywords(keywords, QString(), QString());
[detail]          if(!param.parse(argv[i], &keywords)) {
[detail]            App::log(tr("Error setting parameter '%1'.\n").arg(argv[i]) );
[detail]            return 2;
[detail] @@ -44,9 +44,9 @@
[detail]          mode=Distances;
[detail]        } else if(arg=="-green-functions") {
[detail]          CoreApplication::checkOptionArg(i, argc, argv);
[detail] -        sourceIndex=atoi(argv[i]);
[detail] +        sourceIndex=CoreApplication::toInt(i, i-1, argv);
[detail]          CoreApplication::checkOptionArg(i, argc, argv);
[detail] -        receiverIndex=atoi(argv[i]);
[detail] +        receiverIndex=CoreApplication::toInt(i, i-2, argv);
[detail]          mode=GreenFunctions;
[detail]        } else if(arg=="-param-example") {
[detail]          QTextStream(stdout) << param.AbstractParameters::toString()
[detail] @@ -91,7 +91,7 @@
[detail]    h->setComments("Convolute Green functions produced by Hisada Fortran code with random sources");
[detail]    h->addGroup("gpconvolution", "gpconvolution");
[detail]    h->addOption("-param <PARAM>","Load parameters in PARAM");
[detail] -  h->addOption("-set-param <KEYWORD>=<VALUE>","Set VALUE to KEYWORD parameter.");
[detail] +  h->addOption("-set <KEYWORD>=<VALUE>","Set VALUE to KEYWORD parameter.");
[detail]    h->addOption("-param-example","Output default parameters, template to build a new parameter file.");
[detail]    h->addOption("-distances","Output source and receiver index and their respective distances.");
[detail]    h->addOption("-green-functions <SRC> <REC>","Output Green functions for SRC and REC indexes as .sac files.");
[detail]                    src/ConvolutionLoop.h:  version-1.0.0	modified out of comments
[detail] --- src/ConvolutionLoop.h-version-1.0.0-stripped	2025-09-28 04:01:34.931647631 +0200
[detail] +++ src/ConvolutionLoop.h-HEAD-stripped	2025-09-28 04:01:34.935647651 +0200
[detail] @@ -24,13 +24,13 @@
[detail]    void distances();
[detail]    void greenFunctions(int iSrc, int iRec);
[detail]  protected:
[detail] -  virtual LoopTask * newTask();
[detail] +  virtual LoopWorker * newWorker();
[detail]  private:
[detail]    int sampleCount();
[detail]    bool exportDistInd(QString fileName);
[detail] -  bool readPassiveSources(QString fileName, QString parserFile=QString::null);
[detail] +  bool readPassiveSources(QString fileName, QString parserFile=QString());
[detail]    bool readActiveSources(QString fileName);
[detail] -  bool readReceivers(QString fileName, QString parserFile=QString::null);
[detail] +  bool readReceivers(QString fileName, QString parserFile=QString());
[detail]    void showStatus() const;
[detail]    double propagationTime() const;
[detail]    bool loadPassiveSignals();
[detail] @@ -38,9 +38,9 @@
[detail]    Random * _rand;
[detail]    Parameters _param;
[detail]    double _sampleCount;
[detail] -  QVector<Source *> _passiveSrc;
[detail] -  QVector<Source *> _activeSrc;
[detail] -  QVector<Receiver *> _rec;
[detail] +  VectorList<Source *> _passiveSrc;
[detail] +  VectorList<Source *> _activeSrc;
[detail] +  VectorList<Receiver *> _rec;
[detail]    GreenFunctions _gfs;
[detail]    SourceFunction _sf;
[detail]  };
[detail]                    src/ConvolutionTask.h:  version-1.0.0	modified out of comments
[detail] --- src/ConvolutionTask.h-version-1.0.0-stripped	2025-09-28 04:01:34.959647768 +0200
[detail] +++ src/ConvolutionTask.h-HEAD-stripped	2025-09-28 04:01:34.963647786 +0200
[detail] @@ -10,16 +10,16 @@
[detail]  class GreenFunctions;
[detail]  class SourceFunction;
[detail]  
[detail] -class ConvolutionTask : public LoopTask
[detail] +class ConvolutionTask : public LoopWorker
[detail]  {
[detail]  public:
[detail]    ConvolutionTask();
[detail]    ~ConvolutionTask();
[detail]  
[detail]    void setParameters(const Parameters& p, int seed);
[detail] -  void setPassiveSources(const QVector<Source *> * src) {_passiveSrc=src;}
[detail] -  void setActiveSources(const QVector<Source *> * src) {_activeSrc=src;}
[detail] -  void setReceivers(QVector<Receiver *> * rec);
[detail] +  void setPassiveSources(const VectorList<Source *> * src) {_passiveSrc=src;}
[detail] +  void setActiveSources(const VectorList<Source *> * src) {_activeSrc=src;}
[detail] +  void setReceivers(VectorList<Receiver *> * rec);
[detail]    void setGreenFunctions(const GreenFunctions * gfs) {_gfs=gfs;}
[detail]    void setSourceFunction(const SourceFunction * sf) {_sf=sf;}
[detail]  
[detail] @@ -28,10 +28,10 @@
[detail]    int _seed;
[detail]    Random * _rand;
[detail]    Parameters _param;
[detail] -  const QVector<Source *> * _passiveSrc;
[detail] -  const QVector<Source *> * _activeSrc;
[detail] -  QVector<Receiver *> _rec;
[detail] -  QVector<Receiver *> * _commonRec;
[detail] +  const VectorList<Source *> * _passiveSrc;
[detail] +  const VectorList<Source *> * _activeSrc;
[detail] +  VectorList<Receiver *> _rec;
[detail] +  VectorList<Receiver *> * _commonRec;
[detail]    const GreenFunctions * _gfs;
[detail]    const SourceFunction * _sf;
[detail]  
[detail]                      src/GreenFunction.h:  version-1.0.0	modified out of comments
[detail] --- src/GreenFunction.h-version-1.0.0-stripped	2025-09-28 04:01:34.983647883 +0200
[detail] +++ src/GreenFunction.h-HEAD-stripped	2025-09-28 04:01:34.987647902 +0200
[detail] @@ -36,7 +36,7 @@
[detail]    void save(const QString& baseName);
[detail]  private:
[detail]    void muteNoise(double startTime, double endTime);
[detail] -  void setAmplitudeUnit(Signal::AmplitudeUnits unit);
[detail] +  void setAmplitudeUnit(SignalMetaData::AmplitudeUnits unit);
[detail]    bool resample(int n, double dt);
[detail]  
[detail]    void unlockSamples(int index, int baseIndex);
[detail]                     src/GreenFunctions.h:  version-1.0.0	not modified
[detail]                         src/Parameters.h:  version-1.0.0	modified out of comments
[detail] --- src/Parameters.h-version-1.0.0-stripped	2025-09-28 04:01:35.019648057 +0200
[detail] +++ src/Parameters.h-HEAD-stripped	2025-09-28 04:01:35.023648077 +0200
[detail] @@ -13,7 +13,6 @@
[detail]  {
[detail]  public:
[detail]    Parameters();
[detail] -  Parameters(const Parameters& o);
[detail]    ~Parameters();
[detail]  
[detail]    AbstractParameters * clone() const {return new Parameters(*this);}
[detail] @@ -60,11 +59,11 @@
[detail]    const QString& distIndFile() const {return _distIndFile;}
[detail]    void setDistIndFile(const QString& d) {_distIndFile=d;}
[detail]  
[detail] -  Signal::AmplitudeUnits amplitudeUnits() const {return _amplitudeUnits;}
[detail] -  void setAmplitudeUnits(Signal::AmplitudeUnits u) {_amplitudeUnits=u;}
[detail] +  SignalMetaData::AmplitudeUnits amplitudeUnits() const {return _amplitudeUnits;}
[detail] +  void setAmplitudeUnits(SignalMetaData::AmplitudeUnits u) {_amplitudeUnits=u;}
[detail]  
[detail] -  virtual QString toString(PARAMETERS_TOSTRING_ARGS_DECL) const;
[detail] -  virtual void collectKeywords(PARAMETERS_COLLECTKEYWORDS_ARGS);
[detail] +  QString toString(PARAMETERS_TOSTRING_ARGS_DECL) const;
[detail] +  void collectKeywords(PARAMETERS_COLLECTKEYWORDS_ARGS);
[detail]  
[detail]    void setMinimumVelocity(double v) {_minimumVelocity=v;}
[detail]    double minimumVelocity() const {return _minimumVelocity;}
[detail] @@ -74,9 +73,8 @@
[detail]  
[detail]    bool processSource(int sourceIndex) const;
[detail]  protected:
[detail] -  virtual int keywordCount(PARAMETERS_KEYWORDCOUNT_ARGS) const;
[detail] -  virtual bool setValue(PARAMETERS_SETVALUE_ARGS);
[detail] -
[detail] +  int keywordCount(PARAMETERS_KEYWORDCOUNT_ARGS) const;
[detail] +  bool setValue(PARAMETERS_SETVALUE_ARGS);
[detail]  private:
[detail]    QString processSourceIndexes() const;
[detail]    void setProcessSourceIndexes(const QString& s);
[detail] @@ -96,7 +94,7 @@
[detail]    QSet<int> _processSourceIndexes;
[detail]    int _randomSeed;
[detail]    int _firstReceiverIndex;
[detail] -  Signal::AmplitudeUnits _amplitudeUnits;
[detail] +  SignalMetaData::AmplitudeUnits _amplitudeUnits;
[detail]    bool _passiveOnly;
[detail]  };
[detail]  
[detail]                           src/Receiver.h:  version-1.0.0	not modified
[detail]                             src/Source.h:  version-1.0.0	modified out of comments
[detail] --- src/Source.h-version-1.0.0-stripped	2025-09-28 04:01:35.059648250 +0200
[detail] +++ src/Source.h-HEAD-stripped	2025-09-28 04:01:35.063648270 +0200
[detail] @@ -34,7 +34,7 @@
[detail]    void passiveFire(const SourceFunction& sf, const Parameters& param, Random * rand);
[detail]    void activeFire(const SourceFunction& sf);
[detail]  private:
[detail] -  QVector<GreenFunction *> _gf;
[detail] +  VectorList<GreenFunction *> _gf;
[detail]    Point _amplitude;
[detail]    int _repeatCount;
[detail]    double _startTime;
[detail]                     src/SourceFunction.h:  version-1.0.0	not modified
[detail]               src/ThreeComponentSignal.h:  version-1.0.0	not modified
[summary] Total differences: 520 lines
[summary] Modification level is C
OLD_DIR=$(pwd)
echo "gpconvolution"
cd $(find . -name "gpconvolution" | tail -n 1) || exit 2
pwd
dpversion C  || exit 2
cd $OLD_DIR || exit 2