Commit 1b94bc4d authored by Julien Michel's avatar Julien Michel
Browse files

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

parents d7922c94 3d483ece
......@@ -11,23 +11,12 @@ macro(create_monteverdi_application)
add_executable(${APPLICATION_NAME}
WIN32
${APPLICATION_SOURCES})
elseif(APPLE)
add_executable(${APPLICATION_NAME}
MACOSX_BUNDLE
${APPLICATION_SOURCES})
else() #Linux
else() #Unix
add_executable(${APPLICATION_NAME}
${APPLICATION_SOURCES})
endif()
set(EXECUTABLE_NAME ${APPLICATION_NAME})
if(APPLE)
string(SUBSTRING ${APPLICATION_NAME} 0 1 FIRST_LETTER)
string(TOUPPER ${FIRST_LETTER} FIRST_LETTER)
string(REGEX REPLACE "^.(.*)" "${FIRST_LETTER}\\1" APPLICATION_OUTPUT_NAME "${APPLICATION_NAME}")
endif()
if (APPLICATION_OUTPUT_NAME)
set_target_properties(${APPLICATION_NAME} PROPERTIES OUTPUT_NAME ${APPLICATION_OUTPUT_NAME})
......
......@@ -239,51 +239,16 @@ MainWindow
mainWindow->setCentralWidget( appWidget );
mainWindow->show();
/*
//
// add the application in a tab
// TODO : check if this application is already opened ???
int tabIndex = m_CentralTabWidget->addTab(
appWidget, QIcon( ":/icons/process" ), docName );
// no checking needed here, if index is not available nothing is
// done. Focus on the newly added tab
m_CentralTabWidget->setCurrentIndex( tabIndex );
//
// connections. not using m_CentralTabWidget->currentWidget() leads
// to a wrong connection!!!!
QObject::connect(
m_CentralTabWidget->currentWidget(),
SIGNAL( OTBApplicationOutputImageChanged( const QString&,
const QString& ) ),
// to:
this,
SLOT( OnOTBApplicationOutputImageChanged( const QString&,
const QString& ) )
);
// Connect the View "Quit" signal, to the mainWindow close slot
QObject::connect(
appWidget,
SIGNAL( ExecutionDone( int ) ),
// to:
this,
SLOT( OnExecutionDone( int ) )
);
//
// on quit widget signal, close its tab
QObject::connect(
m_CentralTabWidget->currentWidget(),
SIGNAL( QuitSignal() ),
// to:
this,
SLOT( OnTabCloseRequested() )
);
*/
mainWindow,
SLOT( close() )
);
mainWindow->show();
#endif // OTB_USE_QT4
}
......
......@@ -158,6 +158,9 @@
<height>20</height>
</size>
</property>
<property name="toolTip">
<string>Current zoom-level of view, relative to reference layer (projection and spacing).</string>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
</property>
......
......@@ -2,23 +2,45 @@
Monteverdi Release Note
=========================
Monteverdi 3.2.0 - Changes since version 3.0.0 (2016/03/30)
===========================================================
Monteverdi 3.2.0 - Changes since version 3.0.0 (March 30th, 2016)
=================================================================
* Bug fixes:
* BUG: mantis-1125 use OTB_APPLICATION_PATH in startup files
* BUG: MANTIS-1096 (QuicklookView)
* MRG: Merged bugfix-1096 into develop.
* MANTIS-1196: OTB-application Quit button closes widget but not window when using Mapla
* MANTIS-1179: Using the Upper Bound mode for resolution lookup in preferences result in wrong resolution used
* MANTIS-1178: Zoom to full resolution does not zoom to 1 image pixel = 1 screen pixel for georeferenced data
* MANTIS-1159: TrainImageClassifier sample.vtr parameter is sometime ignored
* MANTIS-1157: Monteverdi crashes when trying to move the view without any images
* MANTIS-1156: Linux standalone package doesn't work on Fedora 22
* MANTIS-1154: Exception raised when opening LUM or LUM+HDR
* MANTIS-1153: Superimpose app in PHR mode reports wrong origin/spacing/keywordlist
* MANTIS-1152: Maximum number of class in KMean application limited to 255
* MANTIS-1148: OTB-applications not loaded
* MANTIS-1147: With Monteverdi develop branch of today : opening large images with overview file leads to eating all available memory
* MANTIS-1144: Unable to keep unconstrained dynamic mode
* MANTIS-1140: Lost pixel position informations in layer stack
* MANTIS-1138: Numeric value editing hell
* MANTIS-1136: Unable to open sensor products (with RPC) in Monteverdi
* MANTIS-1131: Non projected visualization mode seems slow
* MANTIS-1125: Use OTB_APPLICATION_PATH in startup files
* MANTIS-1122: Black screen after Zoom-to-extent (MinGW)
* MANTIS-1120: Unwanted zoom-to-extent when loading second image
* MANTIS-1118: Crash when restoring UI layout if quicklook view is visible at startup.
* MANTIS-1111: Geoid-file <arning message needs restart displayed when not needed.
* MANTIS-1105: Quicklook and ROI badly displayed when opening no-proj image
* MANTIS-1096: The quicklook is often lost
* MANTIS-0827: Import of image with 0 as value on the whole area is impossible
* RFC:
* Request for Changes-20: Take screenshot
* Request for Changes-21: Support CDS import
* Request for Changes-23: Ice as an Orfeo ToolBox module
* Request for Changes-25: Disable Ice shaders if OpenGL version is lower than 2.0 (adopted, merged)
* Request for Changes-24: MVD/OTB GDAL overviews multi-resolution pyramid configuration (adopted, merged)
* Request for Changes-25: Disable Ice shaders if OpenGL version is lower than 2.0 (especially when using via remote-desktop service).
* Request for Changes-24: MVD/OTB GDAL overviews multi-resolution pyramid configuration
Monteverdi 3.0.0 - Changes since version 0.8.1 (December 22nd, 2015)
===============================================================
====================================================================
* Versionning
- Monteverdi2 discontinued and becomes Monteverdi 3.0.0
......
......@@ -2288,7 +2288,7 @@ p, li { white-space: pre-wrap; }
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Mouse wheel&lt;/p&gt;&lt;/td&gt;
&lt;td&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Rotate layers up/down&lt;/p&gt;&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/body&gt;&lt;/html&gt;</source>
<translation>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
<translation type="obsolete">&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
p, li { white-space: pre-wrap; }
&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;Droid Sans&apos;; font-size:10pt; font-weight:400; font-style:normal;&quot;&gt;
......@@ -4849,6 +4849,10 @@ Merci d&apos;en sélectionner un autre.</translation>
<source>OpenGL</source>
<translation></translation>
</message>
<message>
<source>Current zoom-level of view, relative to reference layer (projection and spacing).</source>
<translation>Niveau de zoom courant de la vue, relativement à la couche de référence (projection et espacement).</translation>
</message>
</context>
<context>
<name>mvd::SystemError</name>
......
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