# HG changeset patch # User benoitrigolleau # Date 1183047456 0 # Node ID 5060939ca69d1dbc5892e4f4919735735af6713b # Parent 880dce3d7b007cfbda88f123cb8aa2941ad4a862 enable/disable audio FilterStack WaitCursor for the search diff -r 880dce3d7b00 -r 5060939ca69d data/svdata.vcproj --- a/data/svdata.vcproj Thu Jun 28 07:06:41 2007 +0000 +++ b/data/svdata.vcproj Thu Jun 28 16:17:36 2007 +0000 @@ -438,530 +438,6 @@ RelativePath="fileio\WavFileWriter.h" > - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - second; - filter->putInput(input, samples); + if(filter->isFilterEnabled()){ + filter->putInput(input, samples); + } } } @@ -56,7 +58,9 @@ if (iter != m_filters.end()) { Filter * filter = iter->second; - filter->getOutput(output, samples); + if(filter->isFilterEnabled()){ + filter->getOutput(output, samples); + } } } diff -r 880dce3d7b00 -r 5060939ca69d sv/main/EasaierSessionManager.cpp --- a/sv/main/EasaierSessionManager.cpp Thu Jun 28 07:06:41 2007 +0000 +++ b/sv/main/EasaierSessionManager.cpp Thu Jun 28 16:17:36 2007 +0000 @@ -19,6 +19,8 @@ #include #include #include +#include +#include #include "layer/Layer.h" @@ -139,7 +141,9 @@ LoadedFile* newFile = new LoadedFile(localPath); newFile->setFileType(type); newFile->setUri(uri); + int index = m_httpClient->get(uri, newFile); + //connect(m_httpClient,SIGNAL(requestFinished ( int, bool)),this, SLOT(getFinished(int, bool))); std::cerr << "Ask for file : GET " << path.toStdString() << " - index : " << index << std::endl; @@ -164,6 +168,7 @@ } if (error) { + QApplication::restoreOverrideCursor(); QMessageBox::critical(MainWindow::instance(), tr("Download Failed"), m_httpClient->errorString()); return; } @@ -255,12 +260,14 @@ { QFile file(filename); if (file.open(QFile::ReadOnly)) { + QApplication::restoreOverrideCursor(); QMessageBox::critical(MainWindow::instance(), tr("Download Error"), file.readAll()); } } else { std::cerr << "fileLoaded() : " << index << " all successful. " << std::endl; } + QApplication::restoreOverrideCursor(); } void EasaierSessionManager::loadRelatedModel() @@ -363,8 +370,6 @@ void EasaierSessionManager::queryDatabase(const QString& themeName) { - QString text = tr("Sorry query database information on the %1 theme is not yet available. All results are returned").arg(themeName); - QMessageBox::information( MainWindow::instance(), tr("Query database information"), text); QueryThemeModel *themeModel = (m_queryModel->getThemes()).find(themeName)->second; QString params = ""; @@ -377,5 +382,8 @@ QString filename = "http://"+ m_httpClient->getHost() + ":" + QString::number(m_httpClient->getHostPort())+ "/easaier/servlet/MOQueryServlet?theme="+themeName+""+params; + + QApplication::setOverrideCursor( Qt::WaitCursor ); loadFile(filename, LoadedFile::QUERY_RESULTS); + } diff -r 880dce3d7b00 -r 5060939ca69d sv/main/MainWindow.cpp --- a/sv/main/MainWindow.cpp Thu Jun 28 07:06:41 2007 +0000 +++ b/sv/main/MainWindow.cpp Thu Jun 28 16:17:36 2007 +0000 @@ -5320,10 +5320,9 @@ void MainWindow::queryDatabase() { QString themeName = sender()->objectName(); + m_EasaierManager->queryDatabase(themeName); + m_qtabwidget->setCurrentIndex(Result); - m_EasaierManager->queryDatabase(themeName); - - m_qtabwidget->setCurrentIndex(Result); } void MainWindow::createMultiPaneLayerContainer(){ diff -r 880dce3d7b00 -r 5060939ca69d sv/sound_access.vcproj --- a/sv/sound_access.vcproj Thu Jun 28 07:06:41 2007 +0000 +++ b/sv/sound_access.vcproj Thu Jun 28 16:17:36 2007 +0000 @@ -1228,6 +1228,90 @@ RelativePath="icons\zoom.png" > + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -r 880dce3d7b00 -r 5060939ca69d widgets/AdvancedToolBox.cpp --- a/widgets/AdvancedToolBox.cpp Thu Jun 28 07:06:41 2007 +0000 +++ b/widgets/AdvancedToolBox.cpp Thu Jun 28 16:17:36 2007 +0000 @@ -44,6 +44,11 @@ m_button = new QPushButton(QIcon(), text); m_button->setMaximumHeight(m_btnHeight); m_button->setSizePolicy(QSizePolicy::Preferred,QSizePolicy::Fixed); + + QPalette palette; + palette.setColor(QPalette::Button, palette.color(QPalette::Button).dark(110)); //palette.color(QPalette::Highlight) palette.color(QPalette::Active, QPalette::Base).dark(110) + m_button->setPalette(palette); + m_layout->addWidget(m_button); m_layout->addWidget(newWidget); m_widget = newWidget; diff -r 880dce3d7b00 -r 5060939ca69d widgets/ItemAudioFilterList.cpp --- a/widgets/ItemAudioFilterList.cpp Thu Jun 28 07:06:41 2007 +0000 +++ b/widgets/ItemAudioFilterList.cpp Thu Jun 28 16:17:36 2007 +0000 @@ -16,8 +16,6 @@ #include "ItemAudioFilterList.h" #include "data/model/LayerItemModel.h" -#include "layer/Layer.h" -#include "base/PlayParameters.h" #include @@ -44,6 +42,7 @@ m_labelName->setMaximumHeight(25); //labelName->setText("ljdh lksdf hl"); + m_checkBoxPlay->setLayoutDirection(Qt::RightToLeft); m_checkBoxPlay->setMaximumSize(30,30); m_layoutMain->setSpacing(5); @@ -81,15 +80,11 @@ void ItemAudioFilterList::setPropertyBox(PropertyBox *box){ m_propertyBox = box; if(m_propertyBox!=0){ - - m_container = m_propertyBox->container(); + m_container = (Filter *) m_propertyBox->container(); + updateCheckboxs(); + connect(m_propertyBox, SIGNAL(showLayer(bool)), this, SLOT(showLayer(bool))); - - updateCheckboxs(); - connect(m_propertyBox, SIGNAL(showLayer(bool)), this, SLOT(showLayer(bool))); } - - //connect(); } void ItemAudioFilterList::configAction(){ @@ -105,19 +100,13 @@ ItemAudioFilterList::configAction(); } -void ItemAudioFilterList::updateCheckboxs(){ - - PlayParameters *params = m_container->getPlayParameters(); - - if(params){ +void ItemAudioFilterList::updateCheckboxs(){ + m_checkBoxPlay->setEnabled(true); - m_checkBoxPlay->setChecked(!params->isPlayMuted()); - - connect(params, SIGNAL(playAudibleChanged(bool)),m_checkBoxPlay, SLOT(setState(bool))); - connect(m_checkBoxPlay, SIGNAL(stateChanged(int)),params, SLOT(setPlayAudible(int))); - }else{ - m_checkBoxPlay->setEnabled(false); - } + m_checkBoxPlay->setChecked(m_container->isFilterEnabled()); + + connect(m_container, SIGNAL(filterEnableChanged(bool)),m_checkBoxPlay, SLOT(setState(bool))); + connect(m_checkBoxPlay, SIGNAL(stateChanged(int)),m_container, SLOT(setFilterEnabled(int))); } diff -r 880dce3d7b00 -r 5060939ca69d widgets/ItemAudioFilterList.h --- a/widgets/ItemAudioFilterList.h Thu Jun 28 07:06:41 2007 +0000 +++ b/widgets/ItemAudioFilterList.h Thu Jun 28 16:17:36 2007 +0000 @@ -17,6 +17,8 @@ #include "GenericItemList.h" #include "PropertyBox.h" +#include "filter/Filter.h" + #include #include @@ -24,6 +26,7 @@ #include + class ItemAudioFilterList : public GenericItemList{ Q_OBJECT @@ -42,7 +45,7 @@ QCheckBox *m_checkBoxPlay; QHBoxLayout *m_layoutMain; PropertyBox *m_propertyBox; - PropertyContainer *m_container; + Filter *m_container; private slots : void openPropertyBox(); diff -r 880dce3d7b00 -r 5060939ca69d widgets/ItemContainer.cpp --- a/widgets/ItemContainer.cpp Thu Jun 28 07:06:41 2007 +0000 +++ b/widgets/ItemContainer.cpp Thu Jun 28 16:17:36 2007 +0000 @@ -18,6 +18,7 @@ #include #include #include +#include ItemContainer::ItemContainer(QWidget *parent) : QWidget(parent){ @@ -28,6 +29,7 @@ QVBoxLayout *mainlayout = new QVBoxLayout(); m_itemLayout = new QVBoxLayout; + mainlayout->addLayout(m_itemLayout); mainlayout->addStretch(); @@ -52,6 +54,7 @@ this, SLOT(newItemSelected(int))); m_itemLayout->insertWidget(0,item); + m_cpt++; } diff -r 880dce3d7b00 -r 5060939ca69d widgets/QueryResultsWidget.cpp --- a/widgets/QueryResultsWidget.cpp Thu Jun 28 07:06:41 2007 +0000 +++ b/widgets/QueryResultsWidget.cpp Thu Jun 28 16:17:36 2007 +0000 @@ -15,6 +15,7 @@ #include #include +#include #include @@ -98,4 +99,5 @@ m_resultsLayout->addWidget(result,m_ndResults,0); m_ndResults++; + } diff -r 880dce3d7b00 -r 5060939ca69d widgets/SearchWidget.cpp --- a/widgets/SearchWidget.cpp Thu Jun 28 07:06:41 2007 +0000 +++ b/widgets/SearchWidget.cpp Thu Jun 28 16:17:36 2007 +0000 @@ -120,7 +120,6 @@ QString themeName = getActiveTheme(); m_searchButton->setObjectName(themeName); highlightThemeButton(themeName); - } void SearchWidget::addTheme(const QString &name, const QString &label)