diff --git a/BaseCommonLibrary/BaseTool/ImageOperatorBase.cpp b/BaseCommonLibrary/BaseTool/ImageOperatorBase.cpp index 7551a5e..a9da3c7 100644 --- a/BaseCommonLibrary/BaseTool/ImageOperatorBase.cpp +++ b/BaseCommonLibrary/BaseTool/ImageOperatorBase.cpp @@ -1890,7 +1890,7 @@ int ResampleGDAL(const char* pszSrcFile, const char* pszOutFile, double* gt, int } // GDALDestroyGenImgProjTransformer(hTransformArg); - + qDebug() << "create init GDALDataset " ; GDALDataset* pDDst = pDriver->Create(pszOutFile, new_width, new_height, nBandCount, dataType, NULL); if(pDDst == NULL) { diff --git a/LAMPDataProcessEXE/main.cpp b/LAMPDataProcessEXE/main.cpp index 6d282d8..fc9f78d 100644 --- a/LAMPDataProcessEXE/main.cpp +++ b/LAMPDataProcessEXE/main.cpp @@ -28,7 +28,7 @@ void customMessageHandler(QtMsgType type, const QMessageLogContext& context, con switch (type) { case QtDebugMsg: { - QString logMessage = QString("%1 Debug: %2 (%3:%4, %5)\n") + QString logMessage = QString("%1 Debug: %2 (%3:%4, %5)") .arg(dateTime) // Assuming dateTime is a QDateTime object and needs to be converted to string .arg(QString::fromLocal8Bit(localMsg.constData())) .arg(file) @@ -40,7 +40,7 @@ void customMessageHandler(QtMsgType type, const QMessageLogContext& context, con } case QtInfoMsg: { - QString logMessage = QString("%1 Info: %2 (%3:%4, %5)\n") + QString logMessage = QString("%1 Info: %2 (%3:%4, %5)") .arg(dateTime) .arg(QString::fromLocal8Bit(localMsg.constData())) .arg(file) @@ -52,7 +52,7 @@ void customMessageHandler(QtMsgType type, const QMessageLogContext& context, con } case QtWarningMsg: { - QString logMessage = QString("%1 Warning: %2 (%3:%4, %5)\n") + QString logMessage = QString("%1 Warning: %2 (%3:%4, %5)") .arg(dateTime) .arg(QString::fromLocal8Bit(localMsg.constData())) .arg(file) @@ -63,7 +63,7 @@ void customMessageHandler(QtMsgType type, const QMessageLogContext& context, con } case QtCriticalMsg: { - QString logMessage = QString("%1 Critical: %2 (%3:%4, %5)\n") + QString logMessage = QString("%1 Critical: %2 (%3:%4, %5)") .arg(dateTime) .arg(QString::fromLocal8Bit(localMsg.constData())) .arg(file) @@ -75,7 +75,7 @@ void customMessageHandler(QtMsgType type, const QMessageLogContext& context, con } case QtFatalMsg: { - QString logMessage = QString("%1 Fatal: %2 (%3:%4, %5)\n") + QString logMessage = QString("%1 Fatal: %2 (%3:%4, %5)") .arg(dateTime) .arg(QString::fromLocal8Bit(localMsg.constData())) .arg(file) diff --git a/RasterMainWidgetGUI/RasterMainWidget/RasterMainWidget.ui b/RasterMainWidgetGUI/RasterMainWidget/RasterMainWidget.ui index dcfe319..553c998 100644 --- a/RasterMainWidgetGUI/RasterMainWidget/RasterMainWidget.ui +++ b/RasterMainWidgetGUI/RasterMainWidget/RasterMainWidget.ui @@ -203,7 +203,7 @@ 0 0 906 - 22 + 23 @@ -333,6 +333,12 @@ + + line-height:1 + + + 1 + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> diff --git a/Toolbox/BaseToolbox/BaseToolbox/QDEMResampleDialog.cpp b/Toolbox/BaseToolbox/BaseToolbox/QDEMResampleDialog.cpp index 2790c1f..5c42a13 100644 --- a/Toolbox/BaseToolbox/BaseToolbox/QDEMResampleDialog.cpp +++ b/Toolbox/BaseToolbox/BaseToolbox/QDEMResampleDialog.cpp @@ -65,14 +65,14 @@ void QDEMResampleDialog::onAccepted() Eigen::MatrixXd srcgt = demimg.gt; // - QString srcgtstr= "src gt\n"; - srcgtstr += "----- src gt ------------------------------------\n"; - srcgtstr += QString("%1 %2 %3\n").arg(srcgt(0, 0)).arg(srcgt(0, 1)).arg(srcgt(0, 2)); - srcgtstr += QString("%1 %2 %3\n").arg(srcgt(1, 0)).arg(srcgt(1, 1)).arg(srcgt(1, 2)); - srcgtstr += "-----------------------------------------\n"; - - double Xscale = gridx / srcgt(0, 1); - double Yscale = gridy / srcgt(1, 2); + + qDebug() << "----- src gt ------------------------------------"; + qDebug() << QString("%1\t%2\t%3").arg(srcgt(0, 0)).arg(srcgt(0, 1)).arg(srcgt(0, 2)); + qDebug() << QString("%1\t%2\t%3").arg(srcgt(1, 0)).arg(srcgt(1, 1)).arg(srcgt(1, 2)); + qDebug() << "-----------------------------------------"; + + double Xscale = srcgt(0, 1)/gridx; + double Yscale = srcgt(1, 2)/gridy; int new_width = ceil(Xscale * demimg.width) + 1; int new_height = ceil(Yscale * demimg.height) + 1; @@ -81,12 +81,12 @@ void QDEMResampleDialog::onAccepted() srcgt(1, 2) = gridy; - srcgtstr = "target gt\n"; - srcgtstr += "----- target gt ------------------------------------\n"; - srcgtstr += QString("%1 %2 %3\n").arg(srcgt(0, 0)).arg(srcgt(0, 1)).arg(srcgt(0, 2)); - srcgtstr += QString("%1 %2 %3\n").arg(srcgt(1, 0)).arg(srcgt(1, 1)).arg(srcgt(1, 2)); - srcgtstr += "-----------------------------------------\n"; - qDebug() << srcgtstr; + qDebug() << "target gt"; + qDebug() << "----- target gt ------------------------------------"; + qDebug() << QString("%1\t%2\t%3").arg(srcgt(0, 0)).arg(srcgt(0, 1)).arg(srcgt(0, 2)); + qDebug() << QString("%1\t%2\t%3").arg(srcgt(1, 0)).arg(srcgt(1, 1)).arg(srcgt(1, 2)); + qDebug() << "-----------------------------------------"; + std::shared_ptr gt(new double[6]); gt.get()[0] = srcgt(0, 0); gt.get()[1] = srcgt(0, 1); @@ -96,7 +96,10 @@ void QDEMResampleDialog::onAccepted() gt.get()[5] = srcgt(1, 2); qDebug() << "DEM ReSample start ..."; - ResampleGDAL(inDEMPath.toLocal8Bit().constData(), + qDebug() << "height:\t" << new_height; + qDebug() << "width:\t" << new_width; + + qDebug() << ResampleGDAL(inDEMPath.toLocal8Bit().constData(), outDEMPath.toLocal8Bit().constData(), gt.get(), new_width, new_height, GDALResampleAlg::GRA_Bilinear); qDebug() << "DEM ReSample finished!!!"; diff --git a/Toolbox/BaseToolbox/BaseToolbox/QDEMResampleDialog.ui b/Toolbox/BaseToolbox/BaseToolbox/QDEMResampleDialog.ui index 3245fec..d17784d 100644 --- a/Toolbox/BaseToolbox/BaseToolbox/QDEMResampleDialog.ui +++ b/Toolbox/BaseToolbox/BaseToolbox/QDEMResampleDialog.ui @@ -105,7 +105,16 @@ - 8 + 6 + + + -720.000000000000000 + + + 720.000000000000000 + + + 0.000010000000000 @@ -118,7 +127,16 @@ - 8 + 6 + + + -720.000000000000000 + + + 720.000000000000000 + + + -0.000010000000000