DRAFT: Smoothingwithgeneric

adagucserverEC/CCreateHistogram.cpp

@@ -1,5 +1,5 @@
 #include "CCreateHistogram.h"
-#include "CGenericDataWarper.h"
+#include "GenericDataWarper/CGenericDataWarper.h"
 #include "CImageDataWriter.h"
 const char *CCreateHistogram::className = "CCreateHistogram";
 
@@ -107,7 +107,7 @@ int CCreateHistogram::addData(std::vector<CDataSource *> &dataSources) {
       sourceGeo.CRS = dataSource->nativeProj4;
 
       CDBDebug("Rendering %f,%f", sourceGeo.dfBBOX[0], sourceGeo.dfBBOX[1]);
-      GenericDataWarper genericDataWarper;
+      CGenericDataWarper genericDataWarper;
       switch (dataType) {
       case CDF_CHAR:
         genericDataWarper.render<char>(&warper, sourceData, &sourceGeo, dataSource->srvParams->Geo, &settings, &drawFunction);

adagucserverEC/CDataPostProcessors/CDataPostProcessor_IncludeLayer.cpp

@@ -239,7 +239,7 @@ int CDPPIncludeLayer::execute(CServerConfig::XMLE_DataPostProc *proc, CDataSourc
         CDBError("Unable to initialize projection");
         return 1;
       }
-      GenericDataWarper genericDataWarper;
+      CGenericDataWarper genericDataWarper;
       switch (varToWriteTo->getType()) {
       case CDF_CHAR:
         genericDataWarper.render<char>(&warper, sourceData, &sourceGeo, &destGeo, &settings, &drawFunction);

adagucserverEC/CDataPostProcessors/CDataPostProcessor_WFP.cpp

@@ -1,6 +1,6 @@
 #include "CDataPostProcessor_WFP.h"
 #include "CRequest.h"
-#include "CGenericDataWarper.h"
+#include "GenericDataWarper/CGenericDataWarper.h"
 #include <utils/LayerUtils.h>
 
 /************************/
@@ -176,7 +176,7 @@ int CDPPWFP::execute(CServerConfig::XMLE_DataPostProc *proc, CDataSource *dataSo
       CDBError("Unable to initialize projection");
       return 1;
     }
-    GenericDataWarper genericDataWarper;
+    CGenericDataWarper genericDataWarper;
 
     genericDataWarper.render<float>(&warper, windSectorDataField, &sourceGeo, &destGeo, &settings, &drawFunction);
   }
@@ -186,7 +186,7 @@ int CDPPWFP::execute(CServerConfig::XMLE_DataPostProc *proc, CDataSource *dataSo
 
 void CDPPWFP::drawFunction(int x, int y, float, void *_settings, void *warperInstance) {
   Settings *settings = (Settings *)_settings;
-  GenericDataWarper *warper = (GenericDataWarper *)warperInstance;
+  CGenericDataWarper *warper = (CGenericDataWarper *)warperInstance;
   if (x >= 0 && y >= 0 && x < (int)settings->width && y < (int)settings->height) {
     float windSpeed = settings->destGridWindSpeed[x + y * settings->width];
     float windDir = settings->destGridWindDirection[x + y * settings->width];
@@ -215,8 +215,8 @@ void CDPPWFP::drawFunction(int x, int y, float, void *_settings, void *warperIns
 
     size_t selectedQ = 1; // Second quantile, which is currently 0.95
     size_t selectedH = 0; // Currently only the first (10 meter)
-    size_t selectedX = warper->sourceDataPX;
-    size_t selectedY = warper->sourceDataPY;
+    size_t selectedX = warper->warperState.sourceDataPX;
+    size_t selectedY = warper->warperState.sourceDataPY;
     size_t gridLocationPointer = selectedX + selectedY * numX;
     size_t windHeightPointer = selectedH * numY * numX;
     size_t windQuantilePointer = selectedQ * numZ * numY * numX;

adagucserverEC/CDrawFunction.cpp

@@ -1,4 +1,5 @@
 #include "CDrawFunction.h"
+#include "CImageOperators/smoothRasterField.h"
 
 CDrawFunctionSettings getDrawFunctionSettings(CDataSource *dataSource, CDrawImage *drawImage, const CStyleConfiguration *styleConfiguration) {
   CDrawFunctionSettings settings;
@@ -43,5 +44,8 @@ CDrawFunctionSettings getDrawFunctionSettings(CDataSource *dataSource, CDrawImag
       }
     }
   }
+
+  settings.smoothingFiter = 0;
+  settings.smoothingDistanceMatrix = nullptr; // smoothingMakeDistanceMatrix(settings.smoothingFiter);
   return settings;
 }

adagucserverEC/CDrawFunction.h

@@ -6,7 +6,7 @@
 #include <pthread.h>
 #include "CDataSource.h"
 #include "CDrawImage.h"
-#include "CGenericDataWarper.h"
+#include "GenericDataWarper/CGenericDataWarper.h"
 #include "CStyleConfiguration.h"
 
 class CDrawFunctionSettings {
@@ -36,6 +36,8 @@ class CDrawFunctionSettings {
   float legendScale;
   float legendOffset;
   CDrawImage *drawImage;
+  float *smoothingDistanceMatrix = nullptr;
+  int smoothingFiter = 0;
 };
 
 CDrawFunctionSettings getDrawFunctionSettings(CDataSource *dataSource, CDrawImage *drawImage, const CStyleConfiguration *styleConfiguration);

adagucserverEC/CGDALDataWriter.cpp

@@ -328,7 +328,7 @@ int CGDALDataWriter::addData(std::vector<CDataSource *> &dataSources) {
   settings.width = srvParam->Geo->dWidth;
   settings.height = srvParam->Geo->dHeight;
   settings.data = warpedData;
-  GenericDataWarper genericDataWarper;
+  CGenericDataWarper genericDataWarper;
   switch (dataType) {
   case CDF_CHAR:
     genericDataWarper.render<char>(&warper, sourceData, &sourceGeo, srvParam->Geo, &settings, &drawFunction);