X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FModuleBase%2FModuleBase_Preferences.cpp;h=4d5f2a1c50d0f84b5912425809543a06540c30e5;hb=5cd9804b0680fcf9c89c4265964679e36c015773;hp=641a1bc5952dcf716842fa34baa95ce154bffe79;hpb=8435c27f11ddbf621936b63e3ced2a4836bde6c2;p=modules%2Fshaper.git diff --git a/src/ModuleBase/ModuleBase_Preferences.cpp b/src/ModuleBase/ModuleBase_Preferences.cpp index 641a1bc59..4d5f2a1c5 100644 --- a/src/ModuleBase/ModuleBase_Preferences.cpp +++ b/src/ModuleBase/ModuleBase_Preferences.cpp @@ -1,8 +1,21 @@ -// Copyright (C) 2014-20xx CEA/DEN, EDF R&D - -// File: ModuleBase_Preferences.cpp -// Created: 07 Aug 2014 -// Author: Vitaly SMETANNIKOV +// Copyright (C) 2014-2019 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 +// License as published by the Free Software Foundation; either +// 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 +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// Lesser General Public License for more details. +// +// 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 +// +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +// #include "ModuleBase_Preferences.h" //#include "ModuleBase_Constants.h" @@ -163,16 +176,58 @@ void ModuleBase_Preferences::createCustomPage(ModuleBase_IPrefMgr* thePref, int // 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; } } } @@ -189,7 +244,7 @@ public: /// \param theMgr a preferences manager ModuleBase_PrefMgr(ModuleBase_PreferencesMgr* theMgr):myMgr(theMgr) {} - virtual int addPreference(const QString& theLbl, int pId, + virtual int addPreference(const QString& theLbl, int pId, SUIT_PreferenceMgr::PrefItemType theType, const QString& theSection, const QString& theName ) { @@ -210,7 +265,8 @@ private: //********************************************************** //********************************************************** //********************************************************** -ModuleBase_PreferencesDlg::ModuleBase_PreferencesDlg(SUIT_ResourceMgr* theResurces, QWidget* theParent) +ModuleBase_PreferencesDlg::ModuleBase_PreferencesDlg(SUIT_ResourceMgr* theResurces, + QWidget* theParent) : QDialog(theParent), myIsChanged(false) { @@ -239,7 +295,7 @@ ModuleBase_PreferencesDlg::ModuleBase_PreferencesDlg(SUIT_ResourceMgr* theResurc createEditors(); myPreferences->retrieve(); - setMinimumSize(800, 240); + setMinimumSize(820, 300); } ModuleBase_PreferencesDlg::~ModuleBase_PreferencesDlg() @@ -293,22 +349,64 @@ void ModuleBase_PreferencesDlg::createViewerPage(int thePageId) // Create other parameters group in viewer tab int selectionGroup = myPreferences->addItem(tr("Default selection"), viewTab); myPreferences->setItemProperty("columns", 3, selectionGroup); - myPreferences->addItem(tr("Faces"), selectionGroup, + myPreferences->addItem(tr("Faces"), selectionGroup, SUIT_PreferenceMgr::Bool, ModuleBase_Preferences::VIEWER_SECTION, "face-selection"); - myPreferences->addItem(tr("Edges"), selectionGroup, + myPreferences->addItem(tr("Edges"), selectionGroup, SUIT_PreferenceMgr::Bool, ModuleBase_Preferences::VIEWER_SECTION, "edge-selection"); - myPreferences->addItem(tr("Vertices"), selectionGroup, + myPreferences->addItem(tr("Vertices"), selectionGroup, SUIT_PreferenceMgr::Bool, ModuleBase_Preferences::VIEWER_SECTION, "vertex-selection"); 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) @@ -319,7 +417,8 @@ void ModuleBase_PreferencesDlg::createMenuPage(int thePageId) myPreferences->setItemProperty("columns", 1, aSizeGroup); int aRowsNb = myPreferences->addItem(tr("Number of rows"), aSizeGroup, - SUIT_PreferenceMgr::IntSpin, ModuleBase_Preferences::MENU_SECTION, + SUIT_PreferenceMgr::IntSpin, + ModuleBase_Preferences::MENU_SECTION, "rows_number"); myPreferences->setItemProperty("min", 1, aRowsNb); myPreferences->setItemProperty("max", 6, aRowsNb);