Skip to content

GitLab

Commit d1a67026 authored by Stéphane Albert's avatar Stéphane Albert
Browse files
Options

ENH: OTB-app name & doc-name display & searcn.

parent b3621b37
Hide whitespace changes
Inline Side-by-side
Showing with 156 additions and 117 deletions
Code/Common/Gui/mvdApplicationsToolBox.cxx
View file @ d1a67026
/*=========================================================================
/*=========================================================================
Program: Monteverdi
Language: C++
......@@ -54,6 +54,13 @@ namespace mvd
/*****************************************************************************/
/* CONSTANTS */
enum COLUMN
{
COLUMN_NAME = 0,
COLUMN_TITLE,
//
COLUMN_COUNT,
};
/*****************************************************************************/
/* STATIC IMPLEMENTATION SECTION */
......@@ -83,7 +90,7 @@ ApplicationsToolBox
//
// connect double click on the tree Widget
QObject::connect(GetAlgorithmsTree(),
QObject::connect( m_UI->m_AlgorithmsTree,
SIGNAL( itemDoubleClicked(QTreeWidgetItem* ,int) ),
this,
SLOT( OnAlgorithmTreeDoubleClick(QTreeWidgetItem* ,int) )
......@@ -104,92 +111,99 @@ ApplicationsToolBox
}
/*******************************************************************************/
QTreeWidget *
ApplicationsToolBox
::GetAlgorithmsTree()
{
return m_UI->m_AlgorithmsTree;
}
// QTreeWidget *
// ApplicationsToolBox
// ::GetAlgorithmsTree()
// {
// return m_UI->m_AlgorithmsTree;
// }
/*******************************************************************************/
void
ApplicationsToolBox
::FillTreeUsingTags()
{
assert( m_UI->m_AlgorithmsTree!=NULL );
//
// clear algorithms tree
GetAlgorithmsTree()->clear();
m_UI->m_AlgorithmsTree->clear();
if( m_AppTags.empty() )
return;
//
// main item (title)
QTreeWidgetItem * mainItem = new QTreeWidgetItem( m_UI->m_AlgorithmsTree );
if ( m_AppTags.size() > 0 )
mainItem->setText( COLUMN_NAME, tr( "Orfeo Toolbox Algorithms" ) );
mainItem->setExpanded( !m_SearchText.isEmpty() );
//
// iterate on map: key as high-level item / algorithms as lower-level items
for( ApplicationsTagContainer::const_iterator itTag( m_AppTags.begin() );
itTag!=m_AppTags.end();
++itTag )
{
//
// main item (title)
QTreeWidgetItem * mainItem = new QTreeWidgetItem( GetAlgorithmsTree() );
mainItem->setText(0, tr("Orfeo Toolbox Algorithms"));
mainItem->setExpanded( !m_SearchText.isEmpty() );
//
// iterate on map: key as high-level item / algorithms as lower-level items
ApplicationsTagContainer::const_iterator itTag = m_AppTags.begin();
while( itTag != m_AppTags.end() )
//
// current Doctag name
QString qcurrentTag( (*itTag).first.c_str() );
// If a current tag applicaton name match the searchText, add the
// tag as an item to the tree
if (m_SearchText.isEmpty() ||
IsSearchTextMatchAnyAlgorithm( qcurrentTag ) ||
qcurrentTag.contains(m_SearchText ,Qt::CaseInsensitive))
{
//
// current Doctag name
QString qcurrentTag( (*itTag).first.c_str() );
// If a current tag applicaton name match the searchText, add the
// tag as an item to the tree
if (m_SearchText.isEmpty() ||
IsSearchTextMatchAnyAlgorithm( qcurrentTag ) ||
qcurrentTag.contains(m_SearchText ,Qt::CaseInsensitive))
{
//
// step #1 -> DocTag is a main item
QTreeWidgetItem * cmainItem = new QTreeWidgetItem( mainItem );
cmainItem->setText(0, qcurrentTag );
cmainItem->setExpanded( !m_SearchText.isEmpty() );
//
// add category icon
cmainItem->setIcon(0, QIcon( ":/icons/otb" ));
//
// step #2 -> Add algorithms name if matching the search label
StringVector::const_iterator itApps = (*itTag).second.begin();
while( itApps != (*itTag).second.end() )
{
// get current app name
QString qcurrentAlg( (*itApps).c_str() );
// get current app DocName
QString qcurrentAlgDocName = GetApplicationDocNameByApplicationName(qcurrentAlg );
// does the current algorithm DocName match the search text
if ( m_SearchText.isEmpty() ||
qcurrentAlgDocName.contains(m_SearchText, Qt::CaseInsensitive) ||
qcurrentTag.contains(m_SearchText ,Qt::CaseInsensitive))
{
//
// set current application name as secondary item
QTreeWidgetItem * secItem = new QTreeWidgetItem( cmainItem );
secItem->setText(0, GetApplicationDocNameByApplicationName( qcurrentAlg ) );
//
// add algorithm icon
secItem->setIcon(0, QIcon( ":/icons/process" ));
}
++itApps;
}
}
++itTag;
}
// step #1 -> DocTag is a main item
QTreeWidgetItem * cmainItem = new QTreeWidgetItem( mainItem );
cmainItem->setText( COLUMN_NAME, qcurrentTag );
cmainItem->setExpanded( !m_SearchText.isEmpty() );
//
// add category icon
cmainItem->setIcon( COLUMN_NAME, QIcon( ":/icons/otb" ) );
//
// step #2 -> Add algorithms name if matching the search label
for( StringVector::const_iterator itApps( itTag->second.begin() );
itApps != itTag->second.end();
++itApps )
{
// get current app name
QString name( itApps->c_str() );
// get current app DocName
QString title(
GetApplicationDocNameByApplicationName( name )
);
// does the current algorithm DocName match the search text
if ( m_SearchText.isEmpty() ||
title.contains( m_SearchText, Qt::CaseInsensitive ) ||
name.contains( m_SearchText ,Qt::CaseInsensitive ) )
{
//
// set current application name as secondary item
QTreeWidgetItem * secItem = new QTreeWidgetItem( cmainItem );
secItem->setText( COLUMN_NAME, name );
secItem->setText( COLUMN_TITLE, title );
secItem->setToolTip( COLUMN_NAME, title );
secItem->setIcon( COLUMN_NAME, QIcon( ":/icons/process" ) );
}
}
}
}
//Expand algorithms tree by default
this->GetAlgorithmsTree()->expandAll();
// Expand algorithms tree by default
m_UI->m_AlgorithmsTree->expandAll();
m_UI->m_AlgorithmsTree->resizeColumnToContents( COLUMN_NAME );
m_UI->m_AlgorithmsTree->resizeColumnToContents( COLUMN_TITLE );
}
/*******************************************************************************/
......@@ -197,32 +211,24 @@ bool
ApplicationsToolBox
::IsSearchTextMatchAnyAlgorithm(const QString & tagName )
{
bool res = false;
// find the pair corresponding to the tagName
ApplicationsTagContainer::const_iterator itTag = m_AppTags.find( ToStdString( tagName ) );
if( itTag != m_AppTags.end() )
{
// iterate on the alg names relative to this tag
StringVector::const_iterator itApps = (*itTag).second.begin();
while( itApps != (*itTag).second.end() )
{
// current application name
QString currentAppName( (*itApps).c_str() );
// get current app Doc name
QString qcurrentDocNameItem = GetApplicationDocNameByApplicationName( currentAppName );
if ( qcurrentDocNameItem.contains(m_SearchText ,Qt::CaseInsensitive) )
{
return true;
}
++itApps;
}
}
return res;
ApplicationsTagContainer::const_iterator itTag(
m_AppTags.find(
ToStdString( tagName )
)
);
if( itTag==m_AppTags.end() )
return false;
for( StringVector::const_iterator itApps( itTag->second.begin() );
itApps != itTag->second.end();
++itApps )
if( GetApplicationDocNameByApplicationName( itApps->c_str() )
.contains( m_SearchText, Qt::CaseInsensitive ) )
return true;
return false;
}
/*******************************************************************************/
......@@ -230,7 +236,10 @@ void
ApplicationsToolBox
::LaunchApplication( const QString& appName )
{
emit ApplicationToLaunchSelected(appName, GetApplicationDocNameByApplicationName( appName ) );
emit ApplicationToLaunchSelected(
appName,
GetApplicationDocNameByApplicationName( appName )
);
}
/*******************************************************************************/
......@@ -288,7 +297,7 @@ ApplicationsToolBox
m_SearchText = search;
// fill the tree with the application
FillTreeUsingTags();
FillTreeUsingTags();
}
/*******************************************************************************/
......@@ -296,24 +305,43 @@ void
ApplicationsToolBox
::OnAlgorithmTreeDoubleClick( QTreeWidgetItem * item , int column )
{
//
// Execute algorithm : check if the
// item is low-level ->does not any child
if ( item->childCount() == 0 )
// qDebug() << item << column;
if( item->childCount() > 0 )
return;
QString text( item->text( column ) );
if( text.isEmpty() )
return;
switch( column )
{
QString currentDocName = item->text( column );
//
// Execute the algorithm
if ( !currentDocName.isEmpty() )
case COLUMN_NAME:
break;
case COLUMN_TITLE:
{
//
// get the application name relative to the DocName clicked
std::string appName = m_AppsDocNameToNameMap[ ToStdString( currentDocName ) ];
ApplicationDocNameToNameMap::const_iterator it(
m_AppsDocNameToNameMap.find(
ToStdString( text )
)
);
LaunchApplication( QString (appName.c_str() ) );
assert( it!=m_AppsDocNameToNameMap.end() );
assert( it->second.empty() );
text = FromStdString( it->second );
}
break;
default:
assert( false && "Unexpected enum value." );
break;
}
LaunchApplication( text );
}
/*******************************************************************************/
......
Code/Common/Gui/mvdApplicationsToolBox.h
View file @ d1a67026
......@@ -95,7 +95,7 @@ public:
virtual ~ApplicationsToolBox();
/** Get TreeWidget */
QTreeWidget * GetAlgorithmsTree();
// QTreeWidget * GetAlgorithmsTree();
/*-[ PUBLIC SLOTS SECTION ]------------------------------------------------*/
......
Code/Common/Gui/mvdApplicationsToolBox.ui
View file @ d1a67026
......@@ -6,7 +6,7 @@
<rect>
<x>0</x>
<y>0</y>
<width>94</width>
<width>363</width>
<height>116</height>
</rect>
</property>
......@@ -38,11 +38,22 @@
<enum>Qt::CustomContextMenu</enum>
</property>
<property name="headerHidden">
<bool>true</bool>
<bool>false</bool>
</property>
<attribute name="headerVisible">
<bool>true</bool>
</attribute>
<attribute name="headerCascadingSectionResizes">
<bool>true</bool>
</attribute>
<column>
<property name="text">
<string notr="true">Name</string>
</property>
</column>
<column>
<property name="text">
<string notr="true">1</string>
<string>Title</string>
</property>
</column>
</widget>
......
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