-now stringlist available, with loadfromfile and savetofile

-dirlisten now initializable with stringlist -now datetime aswell in intenseimages -spectrum loads better. -bug solved qdoas retrieval is now read without leading zero in image -bug solved line spectralimages now readable
pioupus · Feb 22, 2012 · fee77e5 · fee77e5
1 parent ff27564
commit fee77e5
Show file tree

Hide file tree

Showing 10 changed files with 427 additions and 104 deletions.
diff --git a/maxdoas/qdoaswrapper.cpp b/maxdoas/qdoaswrapper.cpp
@@ -473,7 +473,7 @@ TRetrievalImage* QDoasWrapper::getRetrievalImage_(QString symbol){
             for(int y = 0;y<lastposImage->getHeight();y++ ){
                 for(int x = 0;x<lastposImage->getWidth();x++ ){
                     TRetrieval *tr = lastposImage->valueBuffer[y][x];
-                    int index = tr->mirrorCoordinate->pixelIndex;
+                    int index = tr->mirrorCoordinate->pixelIndex+1;
                     if (index > values.count())
                         ok = false;
                     else{

diff --git a/maxdoas/scriptwrapper.cpp b/maxdoas/scriptwrapper.cpp
@@ -144,11 +144,43 @@ QScriptValue QDoasConfigFileConstructor(QScriptContext *context, QScriptEngine *
     return engine->newQObject(object, QScriptEngine::ScriptOwnership);
 }
 
+QScriptValue TScriptStringListConstructor(QScriptContext *context, QScriptEngine *engine)
+{
+    QObject *object = new TScriptStringList();
+    return engine->newQObject(object, QScriptEngine::ScriptOwnership);
+}
+
 QScriptValue TDirListConstructor(QScriptContext *context, QScriptEngine *engine)
 {
-    QString sp = context->argument(0).toString();
+    QObject *slo = context->argument(0).toQObject();
+    TScriptStringList *sl = dynamic_cast<TScriptStringList*>(slo);
     int startindex = context->argument(1).toInteger();
-    QObject *object = new tdirlist(sp,startindex,"CCA");
+    QString sp;
+    QObject *object;
+    if (sl == NULL){
+        sp = context->argument(0).toString();
+        object = new tdirlist(sp,startindex,"CCA");
+    }else{
+        object = new tdirlist(sl,startindex,"CCA");
+    }
+
+    return engine->newQObject(object, QScriptEngine::ScriptOwnership);
+}
+
+QScriptValue TDirListConstructorCCARetImage(QScriptContext *context, QScriptEngine *engine)
+{
+    QObject *slo = context->argument(0).toQObject();
+    TScriptStringList *sl = dynamic_cast<TScriptStringList*>(slo);
+    int startindex = context->argument(1).toInteger();
+    QString sp;
+    QObject *object;
+    if (sl == NULL){
+        sp = context->argument(0).toString();
+        object = new tdirlist(sp,startindex,"CCARetImage");
+    }else{
+        object = new tdirlist(sl,startindex,"CCARetImage");
+    }
+
     return engine->newQObject(object, QScriptEngine::ScriptOwnership);
 }
 
@@ -168,6 +200,14 @@ QScriptValue TRetrievalImageConstructorSIGIS(QScriptContext *context, QScriptEng
     return engine->newQObject(object, QScriptEngine::ScriptOwnership);
 }
 
+QScriptValue TRetrievalImageConstructorCCA(QScriptContext *context, QScriptEngine *engine)
+{
+    QString FileName = context->argument(0).toString();
+    QObject *object = new TRetrievalImage(FileName,"CCA",0,0);
+    return engine->newQObject(object, QScriptEngine::ScriptOwnership);
+}
+
+
 QScriptValue TRetrievalImageConstructorCopy(QScriptContext *context, QScriptEngine *engine)
 {
     QObject *from = context->argument(0).toQObject();
@@ -253,6 +293,11 @@ QScriptValue FreeObject(QScriptContext *context, QScriptEngine *engine)
                        TEmissionrate *er = dynamic_cast<TEmissionrate*>(obj);
                        if(er != NULL){
                            delete er;
+                       }else{
+                           TScriptStringList *sl = dynamic_cast<TScriptStringList*>(obj);
+                           if(sl != NULL){
+                                delete sl;
+                           }
                        }
                    }
                }
@@ -580,10 +625,22 @@ TScriptWrapper::TScriptWrapper(THWDriver* hwdriver)
     QScriptValue metactordlsi = ScriptEngine->newQMetaObject(&QObject::staticMetaObject, ctordlsi);
     ScriptEngine->globalObject().setProperty("TDirlistSIGIS", metactordlsi);
 
+    QScriptValue ctordlcri = ScriptEngine->newFunction(TDirListConstructorCCARetImage);
+    QScriptValue metactordcri = ScriptEngine->newQMetaObject(&QObject::staticMetaObject, ctordlcri);
+    ScriptEngine->globalObject().setProperty("TDirlistCCARetImg", metactordcri);
+
+
+
     QScriptValue ctordretimg = ScriptEngine->newFunction(TRetrievalImageConstructorSIGIS);
     QScriptValue metactordretimg = ScriptEngine->newQMetaObject(&QObject::staticMetaObject, ctordretimg);
     ScriptEngine->globalObject().setProperty("TRetrievalImageSIGIS", metactordretimg);
 
+    QScriptValue ctordretimgcca = ScriptEngine->newFunction(TRetrievalImageConstructorCCA);
+    QScriptValue metactordretimgcca = ScriptEngine->newQMetaObject(&QObject::staticMetaObject, ctordretimgcca);
+    ScriptEngine->globalObject().setProperty("TRetrievalImageCCA", metactordretimgcca);
+
+
+
     QScriptValue ctordretimgc = ScriptEngine->newFunction(TRetrievalImageConstructorCopy);
     QScriptValue metactordretimgc = ScriptEngine->newQMetaObject(&QObject::staticMetaObject, ctordretimgc);
     ScriptEngine->globalObject().setProperty("TRetrievalImage", metactordretimgc);
@@ -609,6 +666,10 @@ TScriptWrapper::TScriptWrapper(THWDriver* hwdriver)
     QScriptValue metaqdconf = ScriptEngine->newQMetaObject(&QObject::staticMetaObject, qdconf);
     ScriptEngine->globalObject().setProperty("TQDoasConfigFile", metaqdconf);
 
+    QScriptValue qdsl = ScriptEngine->newFunction(TScriptStringListConstructor);
+    QScriptValue metasl = ScriptEngine->newQMetaObject(&QObject::staticMetaObject, qdsl);
+    ScriptEngine->globalObject().setProperty("TStringList", metasl);
+
     QScriptValue plotobj = ScriptEngine->newQObject(TSpectrumPlotter::instance(0),QScriptEngine::ScriptOwnership);
     ScriptEngine->globalObject().setProperty("plot", plotobj);
 
@@ -618,6 +679,7 @@ TScriptWrapper::TScriptWrapper(THWDriver* hwdriver)
 
     QScriptValue qdoasobj = ScriptEngine->newQObject(QDoasWrapper::instance(),QScriptEngine::ScriptOwnership);
     ScriptEngine->globalObject().setProperty("qdoas", qdoasobj);
+
 }