Skip to content

Commit 6df7ddb

Browse files
latwoodnwagenbrenner
authored andcommitted
fixed difference in mesh resolution calculated and shown in the gui vs the actual mesh, which resulted in the output files having differing names in the mesh resolution part from the case file names. This fix also makes the gui and cli mesh resolutions finally consistent. For issue #564 and #7
1 parent b63bd97 commit 6df7ddb

1 file changed

Lines changed: 6 additions & 6 deletions

File tree

src/gui/mainWindow.cpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1607,7 +1607,7 @@ int mainWindow::checkInputFile(QString fileName)
16071607
//get the geo-transform
16081608
if(poInputDS->GetGeoTransform(adfGeoTransform) == CE_None)
16091609
{
1610-
int c1, c2;
1610+
double c1, c2;
16111611
c1 = adfGeoTransform[1];
16121612
c2 = adfGeoTransform[5];
16131613
if(abs(c1) == abs(c2))
@@ -3191,13 +3191,13 @@ int mainWindow::checkGoogleItem()
31913191
{
31923192
if(checkSurfaceItem() != red)
31933193
{
3194-
if((int)noGoogleCellSize > tree->google->googleResSpinBox->value())
3194+
if(noGoogleCellSize > tree->google->googleResSpinBox->value())
31953195
{
31963196
tree->googleItem->setIcon(0, tree->caution);
31973197
tree->googleItem->setToolTip(0, "The resolution of the google file may be too fine.");
31983198
status = amber;
31993199
}
3200-
else if((int)GDALCellSize > tree->google->googleResSpinBox->value())
3200+
else if(GDALCellSize > tree->google->googleResSpinBox->value())
32013201
{
32023202
tree->googleItem->setIcon(0, tree->caution);
32033203
tree->googleItem->setToolTip(0, "The output resolution is finer than the DEM resolution");
@@ -3241,7 +3241,7 @@ int mainWindow::checkFbItem()
32413241
{
32423242
if(checkSurfaceItem() == green || checkSurfaceItem() == amber)
32433243
{
3244-
if((int)GDALCellSize > tree->fb->fbResSpinBox->value())
3244+
if(GDALCellSize > tree->fb->fbResSpinBox->value())
32453245
{
32463246
tree->fbItem->setIcon(0, tree->caution);
32473247
tree->fbItem->setToolTip(0, "The output resolutions is finer than the DEM resolution");
@@ -3286,7 +3286,7 @@ int mainWindow::checkShapeItem()
32863286
status = amber;
32873287
}
32883288
*/
3289-
if((int)GDALCellSize > tree->shape->shapeResSpinBox->value())
3289+
if(GDALCellSize > tree->shape->shapeResSpinBox->value())
32903290
{
32913291
tree->shapeItem->setIcon(0, tree->caution);
32923292
tree->shapeItem->setToolTip(0, "The output resolutions is finer than the DEM resolution");
@@ -3330,7 +3330,7 @@ int mainWindow::checkPdfItem()
33303330
status = amber;
33313331
}
33323332
*/
3333-
if((int)GDALCellSize > tree->pdf->pdfResSpinBox->value())
3333+
if(GDALCellSize > tree->pdf->pdfResSpinBox->value())
33343334
{
33353335
tree->pdfItem->setIcon(0, tree->caution);
33363336
tree->pdfItem->setToolTip(0, "The output resolutions is finer than the DEM resolution");

0 commit comments

Comments
 (0)