-// Copyright (C) 2007-2012 CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2016 CEA/DEN, EDF R&D, OPEN CASCADE
//
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
// License as published by the Free Software Foundation; either
-// version 2.1 of the License.
+// version 2.1 of the License, or (at your option) any later version.
//
// This library is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
#include <SUIT_ResourceMgr.h>
#include <SUIT_Session.h>
#include <SUIT_ViewManager.h>
-#include <SALOME_ListIteratorOfListIO.hxx>
+#include <SALOME_ListIO.hxx>
#include <OCCViewer_ViewModel.h>
#include <SVTK_ViewModel.h>
#include <SVTK_ViewWindow.h>
*/
/*!
- \brief Contructor
+ \brief Constructor
*/
GEOMToolsGUI_MaterialList::GEOMToolsGUI_MaterialList( QWidget* parent )
: QListWidget( parent )
myShowSelWidget = showSelWidget;
// Set title
setWindowTitle( tr( "MATERIAL_PROPERTIES_TLT" ) );
-
+
// main layout
QVBoxLayout* main = new QVBoxLayout( mainFrame() );
main->setMargin( 0 );
SUIT_ViewWindow* window = app->desktop()->activeWindow();
if ( window ) {
int mgrId = window->getViewManager()->getGlobalId();
- PropMap propMap = study->getObjectPropMap( mgrId, io->getEntry() );
- QString matProp = propMap.value(GEOM::propertyName( GEOM::Material )).toString();
+ PropMap propMap = study->getObjectProperties( mgrId, io->getEntry() );
+ QString matProp = propMap.value(GEOM::propertyName( GEOM::Material )).toString();
if ( !matProp.isEmpty() )
myCurrentModel.fromProperties( matProp );
QColor c = propMap.value(GEOM::propertyName( GEOM::Color )).value<QColor>();
// it is no allowed to change global material
// user is asked about creating of a new user material model based on the currently selected one
if ( SUIT_MessageBox::question( this,
- tr( "GEOM_WRN_WARNING" ),
- tr( "QUE_CREATE_NEW_MATERIAL" ),
- QMessageBox::Yes | QMessageBox::No,
- QMessageBox::Yes ) == QMessageBox::Yes ) {
+ tr( "GEOM_WRN_WARNING" ),
+ tr( "QUE_CREATE_NEW_MATERIAL" ),
+ QMessageBox::Yes | QMessageBox::No,
+ QMessageBox::Yes ) == QMessageBox::Yes ) {
// user has chosen creation of new user model
onAddMaterial();
}
QListWidgetItem* item = myMaterials->currentItem();
if ( item && item->data( TypeRole ).toInt() == User ) {
if ( SUIT_MessageBox::question( this,
- tr( "GEOM_WRN_WARNING" ),
- tr( "QUE_REMOVE_MATERIAL" ).arg( item->text() ),
- QMessageBox::Yes | QMessageBox::No,
- QMessageBox::Yes ) == QMessageBox::Yes ) {
+ tr( "GEOM_WRN_WARNING" ),
+ tr( "QUE_REMOVE_MATERIAL" ).arg( item->text() ),
+ QMessageBox::Yes | QMessageBox::No,
+ QMessageBox::Yes ) == QMessageBox::Yes ) {
myResourceMgr.remove( item->data( NameRole ).toString() );
delete item;
}
// enable line edit
myLineEditCurArg->setEnabled(true);
myLineEditCurArg->setFocus();
- SelectionIntoArgument();
+ SelectionIntoArgument();
// after setFocus(), because it will be setDown(false) when loses focus
send->setDown(true);
}
if ( study ) {
SALOME_ListIO aSelList;
aSelMgr->selectedObjects(aSelList);
- int nbSel = GEOMBase::GetNameOfSelectedIObjects(aSelList, aString, true);
- }
+ /*int nbSel = */GEOMBase::GetNameOfSelectedIObjects(aSelList, aString, true);
+ }
myLineEditCurArg->setText( aString );
}