Commit 6d8f9f65 authored by Rashad Kanavath's avatar Rashad Kanavath
Browse files

Merge branch 'release-3.2' of https://git.orfeo-toolbox.org/git/monteverdi2 into release-3.2

parents 94fe5aed 7c833a6f
......@@ -17,7 +17,6 @@
=========================================================================*/
#include "mvdProcessObjectObserver.h"
#include <cassert>
/*****************************************************************************/
/* INCLUDE SECTION */
......@@ -28,6 +27,7 @@
//
// System includes (sorted by alphabetic order)
#include <cassert>
//
// ITK includes (sorted by alphabetic order)
......
......@@ -327,11 +327,11 @@ ImportImagesDialog
for( int i=0; i<COLUMN_COUNT; ++i )
{
qDebug() <<
qApp->translate(
"mvd::ImportImagesDialog",
HEADERS[ i ]
);
// qDebug() <<
// qApp->translate(
// "mvd::ImportImagesDialog",
// HEADERS[ i ]
// );
// labels <<
// qApp->translate(
......
......@@ -11,7 +11,7 @@
</rect>
</property>
<property name="windowTitle">
<string>Configure multi-resolution pyramids</string>
<string>Configure multi-resolution pyramid</string>
</property>
<property name="locale">
<locale language="C" country="AnyCountry"/>
......
......@@ -259,13 +259,15 @@ MultiResolutionPyramidWidget
// It fixes compile-time:
// error: call of pow(unsigned int, unsigned int) is ambiguous
double rf = m_GDALOverviewsBuilder->GetResolutionFactor();
int m = m_GDALOverviewsBuilder->CountResolutions() -
int m =
m_GDALOverviewsBuilder->CountResolutions() -
m_GDALOverviewsBuilder->GetNbResolutions();
m_UI->sizeSpinBox->setValue(
static_cast< int >(
std::pow ( rf,
m
) )
std::pow( rf, m )
)
);
m_UI->sizeSpinBox->blockSignals( signalsBlocked );
......
......@@ -31,6 +31,9 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="toolTip">
<string>File format used for overview file</string>
</property>
<property name="text">
<string>Format:</string>
</property>
......@@ -47,6 +50,9 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="toolTip">
<string>Decimation factor = Base power Level</string>
</property>
<property name="text">
<string>Base:</string>
</property>
......@@ -60,7 +66,11 @@
</widget>
</item>
<item row="0" column="4" rowspan="4">
<widget class="QListView" name="resolutionsListView"/>
<widget class="QListView" name="resolutionsListView">
<property name="toolTip">
<string>Size list of all overview levels</string>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QLabel" name="algorithmLabel">
......@@ -70,6 +80,9 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="toolTip">
<string>Algorithm used when resampling image to compute overview level</string>
</property>
<property name="text">
<string>Algorithm:</string>
</property>
......@@ -86,6 +99,9 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="toolTip">
<string>Decimation factor = Base power Level</string>
</property>
<property name="text">
<string>Levels:</string>
</property>
......@@ -102,6 +118,9 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="toolTip">
<string>Algorithm used to compress overview level data</string>
</property>
<property name="text">
<string>Compression:</string>
</property>
......@@ -118,6 +137,9 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="toolTip">
<string>Minimal size (in pixels) of smallest overview level</string>
</property>
<property name="text">
<string>Size:</string>
</property>
......
This diff is collapsed.
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment