X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FModuleBase%2FModuleBase_Preferences.cpp;h=e07a3119b7f76bddac3062752f67b185d9d1c425;hb=1dfcab3d738e427bea678317e167c587dfbff195;hp=c14fd6dd9e72557202372d764b764189d117d3bc;hpb=7074394f8f08413d885f63be01df6bd5007b868c;p=modules%2Fshaper.git diff --git a/src/ModuleBase/ModuleBase_Preferences.cpp b/src/ModuleBase/ModuleBase_Preferences.cpp index c14fd6dd9..e07a3119b 100644 --- a/src/ModuleBase/ModuleBase_Preferences.cpp +++ b/src/ModuleBase/ModuleBase_Preferences.cpp @@ -1,4 +1,4 @@ -// Copyright (C) 2014-2017 CEA/DEN, EDF R&D +// Copyright (C) 2014-2020 CEA/DEN, EDF R&D // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public @@ -12,10 +12,9 @@ // // You should have received a copy of the GNU Lesser General Public // License along with this library; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.salome-platform.org/ or -// email : webmaster.salome@opencascade.com +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // #include "ModuleBase_Preferences.h" @@ -154,7 +153,6 @@ void ModuleBase_Preferences::resetConfigPropPreferences(SUIT_PreferenceMgr* theP void ModuleBase_Preferences::createCustomPage(ModuleBase_IPrefMgr* thePref, int thePageId) { SUIT_ResourceMgr* aResMgr = ModuleBase_Preferences::resourceMgr(); - bool isResModified = false; // Make a Tab from each section std::list aSections = Config_PropManager::getSections(); @@ -170,23 +168,66 @@ void ModuleBase_Preferences::createCustomPage(ModuleBase_IPrefMgr* thePref, int // check that the property is defined QString aSection(aProp->section().c_str()); QString aName(aProp->name().c_str()); - if (!aResMgr->hasValue(aSection, aName)) { + if (!aResMgr->hasValue(aSection, aName)) aResMgr->setValue(aSection, aName, QString(aProp->value().c_str())); - isResModified = true; - } + // Add item if (aProp->type() != Config_Prop::Disabled) { SUIT_PreferenceMgr::PrefItemType aPrefType = SUIT_PreferenceMgr::Auto; - if (aProp->type() == Config_Prop::Directory) { + switch (aProp->type()) { + case Config_Prop::Directory: aPrefType = SUIT_PreferenceMgr::File; - } else { + break; + case Config_Prop::Cursor: + aPrefType = SUIT_PreferenceMgr::Selector; + break; + default: aPrefType = (SUIT_PreferenceMgr::PrefItemType) aProp->type(); } + int anId = thePref->addPreference(QObject::tr(aProp->title().c_str()), aTab, aPrefType, QString::fromStdString(aProp->section()), QString::fromStdString(aProp->name())); - if(aProp->type() == Config_Prop::Directory) { + + switch (aProp->type()) { + case Config_Prop::Directory: thePref->setItemProperty("path_type", Qtx::PT_Directory, anId); + break; + case SUIT_PreferenceMgr::DblSpin: + if (aProp->min() != "") { + double aMin = QString(aProp->min().c_str()).toDouble(); + thePref->setItemProperty("min", aMin, anId); + } + if (aProp->max() != "") { + double aMax = QString(aProp->max().c_str()).toDouble(); + thePref->setItemProperty("max", aMax, anId); + } + break; + case SUIT_PreferenceMgr::IntSpin: + if (aProp->min() != "") { + int aMin = QString(aProp->min().c_str()).toInt(); + thePref->setItemProperty("min", aMin, anId); + } + if (aProp->max() != "") { + int aMax = QString(aProp->max().c_str()).toInt(); + thePref->setItemProperty("max", aMax, anId); + } + break; + case Config_Prop::Cursor: + { + QList aIndicesList; + QList aIconsList; + aIndicesList << 0 << 1 << 2; + aIconsList << QPixmap(":pictures/ArrowCursor.png") << + QPixmap(":pictures/CrossCursor.png") << + QPixmap(":pictures/HandCursor.png"); + + thePref->setItemProperty("indexes", aIndicesList, anId); + thePref->setItemProperty("icons", aIconsList, anId); + } + break; + default: // [to avoid compilation warnings] + break; } } } @@ -226,7 +267,8 @@ private: //********************************************************** ModuleBase_PreferencesDlg::ModuleBase_PreferencesDlg(SUIT_ResourceMgr* theResurces, QWidget* theParent) - : QDialog(theParent), + : QDialog(theParent, + Qt::Dialog | Qt::CustomizeWindowHint | Qt::WindowTitleHint | Qt::WindowCloseButtonHint), myIsChanged(false) { setWindowTitle(tr("Edit preferences")); @@ -254,7 +296,6 @@ ModuleBase_PreferencesDlg::ModuleBase_PreferencesDlg(SUIT_ResourceMgr* theResurc createEditors(); myPreferences->retrieve(); - setMinimumSize(800, 240); } ModuleBase_PreferencesDlg::~ModuleBase_PreferencesDlg() @@ -320,10 +361,52 @@ void ModuleBase_PreferencesDlg::createViewerPage(int thePageId) int sensitivityGroup = myPreferences->addItem(tr("Selection sensitivity"), viewTab); myPreferences->setItemProperty("columns", 2, sensitivityGroup); - myPreferences->addItem(tr("Vertex"), sensitivityGroup, SUIT_PreferenceMgr::Double, + myPreferences->addItem(tr("Vertex"), sensitivityGroup, SUIT_PreferenceMgr::DblSpin, ModuleBase_Preferences::VIEWER_SECTION, "point-selection-sensitivity"); - myPreferences->addItem(tr("Edge"), sensitivityGroup, SUIT_PreferenceMgr::Double, + myPreferences->addItem(tr("Edge"), sensitivityGroup, SUIT_PreferenceMgr::DblSpin, ModuleBase_Preferences::VIEWER_SECTION, "edge-selection-sensitivity"); + + int highlightGroup = myPreferences->addItem(tr("Additional highlighting"), viewTab); + myPreferences->setItemProperty("columns", 2, highlightGroup); + myPreferences->addItem(tr("In 3d mode"), highlightGroup, + SUIT_PreferenceMgr::Bool, ModuleBase_Preferences::VIEWER_SECTION, "highlighting-3d"); + myPreferences->addItem(tr("In 2d mode"), highlightGroup, + SUIT_PreferenceMgr::Bool, ModuleBase_Preferences::VIEWER_SECTION, "highlighting-2d"); + + int colorScaleGroup = myPreferences->addItem(tr("Color scale"), viewTab); + myPreferences->setItemProperty("columns", 4, colorScaleGroup); + int aItem = myPreferences->addItem(tr("X position"), colorScaleGroup, + SUIT_PreferenceMgr::Double, ModuleBase_Preferences::VIEWER_SECTION, "scalar_bar_x_position"); + myPreferences->setItemProperty("min", 0, aItem); + myPreferences->setItemProperty("max", 1, aItem); + + aItem = myPreferences->addItem(tr("Y position"), colorScaleGroup, + SUIT_PreferenceMgr::Double, ModuleBase_Preferences::VIEWER_SECTION, "scalar_bar_y_position"); + myPreferences->setItemProperty("min", 0, aItem); + myPreferences->setItemProperty("max", 1, aItem); + + aItem = myPreferences->addItem(tr("Width"), colorScaleGroup, + SUIT_PreferenceMgr::Double, ModuleBase_Preferences::VIEWER_SECTION, "scalar_bar_width"); + myPreferences->setItemProperty("min", 0, aItem); + myPreferences->setItemProperty("max", 1, aItem); + + aItem = myPreferences->addItem(tr("Height"), colorScaleGroup, + SUIT_PreferenceMgr::Double, ModuleBase_Preferences::VIEWER_SECTION, "scalar_bar_height"); + myPreferences->setItemProperty("min", 0, aItem); + myPreferences->setItemProperty("max", 1, aItem); + + aItem = myPreferences->addItem(tr("Intervals number"), colorScaleGroup, + SUIT_PreferenceMgr::Integer, ModuleBase_Preferences::VIEWER_SECTION, "scalar_bar_nb_intervals"); + myPreferences->setItemProperty("min", 0, aItem); + myPreferences->setItemProperty("max", 100, aItem); + + aItem = myPreferences->addItem(tr("Text height"), colorScaleGroup, + SUIT_PreferenceMgr::Integer, ModuleBase_Preferences::VIEWER_SECTION, "scalar_bar_text_height"); + myPreferences->setItemProperty("min", 0, aItem); + myPreferences->setItemProperty("max", 100, aItem); + + aItem = myPreferences->addItem(tr("Text color"), colorScaleGroup, + SUIT_PreferenceMgr::Color, ModuleBase_Preferences::VIEWER_SECTION, "scalar_bar_text_color"); } void ModuleBase_PreferencesDlg::createMenuPage(int thePageId) @@ -375,6 +458,12 @@ void ModuleBase_PreferencesDlg::onDefault() ModuleBase_Preferences::resetConfigPropPreferences(myPreferences); } +void ModuleBase_PreferencesDlg::showEvent(QShowEvent* theEvent) +{ + QDialog::showEvent(theEvent); + adjustSize(); +} + //********************************************************** //********************************************************** //**********************************************************