From 8d20d502c8e82edc968cd2144fa13e764bc51bc6 Mon Sep 17 00:00:00 2001 From: rnv Date: Fri, 25 Mar 2011 10:11:38 +0000 Subject: [PATCH] Implementation of the "16566: EDF PAL 514: Implement system of units (milimeters, meters, inch...)" issue. --- doc/salome/gui/images/studyproperties.png | Bin 9255 -> 9515 bytes .../gui/input/study_management_chapter.doc | 13 +- .../SalomeApp_StudyPropertiesDlg.cxx | 451 ++++++++---------- src/SalomeApp/SalomeApp_StudyPropertiesDlg.h | 50 +- src/SalomeApp/resources/SalomeApp_msg_en.ts | 18 +- 5 files changed, 235 insertions(+), 297 deletions(-) diff --git a/doc/salome/gui/images/studyproperties.png b/doc/salome/gui/images/studyproperties.png index e4f9f3d6e20b885f38b6cbafe7dee87b752049bc..c86d0bc041b2e12b27b999662f44ecd0ba4b7842 100755 GIT binary patch literal 9515 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 literal 9255 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 KrdZlI@IL@NAbI`( diff --git a/doc/salome/gui/input/study_management_chapter.doc b/doc/salome/gui/input/study_management_chapter.doc index b1d88af2c..71f3ed5e2 100644 --- a/doc/salome/gui/input/study_management_chapter.doc +++ b/doc/salome/gui/input/study_management_chapter.doc @@ -91,18 +91,19 @@ To confirm your choice click \b Open. \image html studyproperties.png

    -
  • \b Author - allows to change the name of the study author
    • -
  • \b Created - gives the date and time of Study creation
    • +
  • \b Author - allows to change the name of the study author.
    • +
  • Creation date - gives the date and time of Study creation.
  • \b Locked - allows to lock the study for modifications. -Just click on this field and choose \b Yes item. In this case your study will be locked for any modifications +In case if \b Locked checkbox is checked your study will be locked for any modifications for all users. Next time you try to edit it, you will see the following warning message: \image html lockedstudy.png
    • -
  • \b Modified - allows to see if any modifications have been +
  • Modified/Not Modified - allows to see if any modifications have been introduced into study since its last save.
    • +
  • Length units - allows to change the units of the study.
    • +
  • \b Comment - allows to change the comment of the study.
  • \b Modifications - allows to view the list of changes made in the study. -In this dialog box click on the \b Modifications field and scroll it -down. Each record contains the date and time of the +Each record contains the date and time of the modification and the name of the user, who has introduced it.
diff --git a/src/SalomeApp/SalomeApp_StudyPropertiesDlg.cxx b/src/SalomeApp/SalomeApp_StudyPropertiesDlg.cxx index 32e612e6e..9180ea122 100644 --- a/src/SalomeApp/SalomeApp_StudyPropertiesDlg.cxx +++ b/src/SalomeApp/SalomeApp_StudyPropertiesDlg.cxx @@ -22,12 +22,11 @@ // SALOME SalomeApp // File : SalomeApp_StudyPropertiesDlg.cxx -// Author : Sergey ANIKIN +// Author : Roman NIKOLAEV // Module : SALOME // $Header$ // #include "SalomeApp_StudyPropertiesDlg.h" -#include "SalomeApp_ListView.h" #include "SalomeApp_Study.h" #include "SUIT_Session.h" @@ -41,109 +40,30 @@ // QT Includes #include #include +#include +#include +#include +#include +#include +#include +#include +#include +#include -using namespace std; - +#include + #define DEFAULT_MARGIN 11 -#define DEFAULT_SPACING 6 +#define DEFAULT_SPACING 6 #define SPACER_SIZE 5 #define MIN_LIST_WIDTH 300 #define MIN_LIST_HEIGHT 150 -class SalomeApp_PropItem : public SalomeApp_ListViewItem -{ -public: - /*! constructor */ - SalomeApp_PropItem(SalomeApp_ListView* parent, - const QString theName, - const bool theEditable, - const int theUserType) : - SalomeApp_ListViewItem( parent, QStringList(theName), theEditable ) - { - setUserType(theUserType); - } - /*! constructor */ - SalomeApp_PropItem(SalomeApp_ListView* parent, - SalomeApp_ListViewItem* after, - const QString theName, - const bool theEditable, - const int theUserType) : - SalomeApp_ListViewItem( parent, after, theName, theEditable ) - { - setUserType(theUserType); - } - /*! fills widget with initial values (list or single value)*/ - void fillWidgetWithValues( SalomeApp_EntityEdit* theWidget ) - { - QStringList list; - switch(getUserType()) { - //case SalomeApp_StudyPropertiesDlg::prpModeId: - // { - // list << SalomeApp_StudyPropertiesDlg::tr("PRP_MODE_FROM_SCRATCH") << - // SalomeApp_StudyPropertiesDlg::tr("PRP_MODE_FROM_COPYFROM"); - // theWidget->insertList(list); - // break; - // } - case SalomeApp_StudyPropertiesDlg::prpLockedId: - { - list << SalomeApp_StudyPropertiesDlg::tr( "PRP_NO" ) << SalomeApp_StudyPropertiesDlg::tr( "PRP_YES" ); - theWidget->insertList(list, getValue() == SalomeApp_StudyPropertiesDlg::tr( "PRP_NO" ) ? 0 : 1 ); - break; - } - case SalomeApp_StudyPropertiesDlg::prpModificationsId: - { - SalomeApp_Study* study = - dynamic_cast( SUIT_Session::session()->activeApplication()->activeStudy() ); - if (study) { - _PTR(Study) studyDoc = study->studyDS(); - _PTR(AttributeStudyProperties) propAttr; - if ( studyDoc ) { - propAttr = studyDoc->GetProperties(); - if ( propAttr ) { - std::vector aUsers; - std::vector aMins, aHours, aDays, aMonths, aYears; - propAttr->GetModificationsList(aUsers, aMins, aHours, aDays, aMonths, aYears, false); - int aCnt = aUsers.size(); - for ( int i = 0; i < aCnt; i++ ) { - QString val; - val.sprintf("%2.2d/%2.2d/%2d %2.2d:%2.2d", - aDays [i], - aMonths[i], - aYears [i], - aHours [i], - aMins [i]); - val = val + " : " + QString( aUsers[i].c_str() ); - list.prepend(val); - } - theWidget->setDuplicatesEnabled(true); - theWidget->insertList(list); - } - } - } - break; - } - default: - { - SalomeApp_ListViewItem::fillWidgetWithValues(theWidget); - break; - } - } - } - /*! finishes editing of entity */ - virtual UpdateType finishEditing( SalomeApp_EntityEdit* theWidget ) { - if ( getUserType() == SalomeApp_StudyPropertiesDlg::prpModificationsId ) - return utCancel; - else - return SalomeApp_ListViewItem::finishEditing(theWidget); - } -}; /*!Constructor. Initialize study properties dialog.*/ SalomeApp_StudyPropertiesDlg::SalomeApp_StudyPropertiesDlg(QWidget* parent) - : QDialog(parent, Qt::WindowTitleHint | Qt::WindowSystemMenuHint ), - myChanged( false ) + : QDialog(parent, Qt::WindowTitleHint | Qt::WindowSystemMenuHint ), + myIsChanged(false) { - setObjectName( "" ); setModal( TRUE ); setWindowTitle(tr("TLT_STUDY_PROPERTIES")); @@ -151,39 +71,83 @@ SalomeApp_StudyPropertiesDlg::SalomeApp_StudyPropertiesDlg(QWidget* parent) setWindowFlags( windowFlags() & ~Qt::WindowContextHelpButtonHint ); - QGridLayout* mainLayout = new QGridLayout(this); - mainLayout->setMargin(DEFAULT_MARGIN); - mainLayout->setSpacing(DEFAULT_SPACING); - - myPropList = new SalomeApp_ListView(this); - myPropList->setColumnCount(2); - QStringList aLabels; - aLabels << "" << ""; - myPropList->setHeaderLabels( aLabels ); - myPropList->enableEditing(TRUE); - myPropList->setMinimumSize(MIN_LIST_WIDTH, MIN_LIST_HEIGHT); - mainLayout->addWidget(myPropList, 0, 0, 1, 3); - - myOKBtn = new QPushButton(tr("BUT_OK"), this); - mainLayout->addWidget(myOKBtn, 1, 0); - - myCancelBtn = new QPushButton(tr("BUT_CANCEL"), this); - mainLayout->addWidget(myCancelBtn, 1, 2); - - QSpacerItem* spacer1 = - new QSpacerItem(SPACER_SIZE, SPACER_SIZE, QSizePolicy::Expanding, QSizePolicy::Minimum); - mainLayout->addItem(spacer1, 1, 1); - // Display study properties SalomeApp_Study* study = dynamic_cast( SUIT_Session::session()->activeApplication()->activeStudy() ); if (study) myStudyDoc = study->studyDS(); + //Author + QLabel* authorLbl = new QLabel(tr("PRP_AUTHOR"),this); + myAuthor = new QLineEdit(this); + + //Creation date + QLabel* dateLbl = new QLabel(tr("PRP_DATE"),this); + myDate = new QLabel(this); + + //Locked flag + myLocked = new QCheckBox(tr("PRP_LOCKED"), this); + + //Modification flag + myModification = new QLabel(this); + + //Units + QLabel* unitsLbl = new QLabel(tr("PRP_UNITS"),this); + myUnits = new QComboBox(this); + + //Comment + QLabel* commentLabel = new QLabel(tr("PRP_COMMENT"),this); + myComment = new QTextEdit(this); + myComment->setMaximumHeight(80); + + //Modifications + QLabel* modificationsLabel = new QLabel(tr("PRP_MODIFICATIONS"),this); + myModifications = new QTreeWidget(this); + myModifications->setRootIsDecorated(false); + myModifications->setUniformRowHeights(true); + myModifications->setAllColumnsShowFocus(true); + myModifications->setColumnCount(2); + myModifications->setMaximumHeight(80); + QStringList columnNames; + columnNames.append(tr("PRP_AUTHOR")); + columnNames.append(tr("PRP_DATE_MODIF")); + + QTreeWidgetItem * headerItem = new QTreeWidgetItem(columnNames); + myModifications->setHeaderItem ( headerItem ); + + QFrame* buttonFrame = new QFrame(this); + + QHBoxLayout* horizontalLayout = new QHBoxLayout(buttonFrame); + + myOkButton = new QPushButton(tr("BUT_OK"), buttonFrame); + myCancelButton = new QPushButton(tr("BUT_CANCEL"), buttonFrame); + + horizontalLayout->addWidget(myOkButton); + horizontalLayout->addItem( new QSpacerItem(0, 0, QSizePolicy::Expanding, QSizePolicy::Minimum) ); + horizontalLayout->addWidget(myCancelButton); + + QGridLayout* gridLayout = new QGridLayout(this); + gridLayout->setMargin(DEFAULT_MARGIN); + gridLayout->setSpacing(DEFAULT_SPACING); + gridLayout->addWidget(authorLbl, 0, 0, 1, 1); + gridLayout->addWidget(myAuthor, 0, 1, 1, 1); + gridLayout->addWidget(dateLbl, 1, 0, 1, 1); + gridLayout->addWidget(myDate, 1, 1, 1, 1); + gridLayout->addWidget(myLocked, 2, 0, 1, 1); + gridLayout->addWidget(myModification, 2, 1, 1, 1); + gridLayout->addWidget(unitsLbl, 3, 0, 1, 1); + gridLayout->addWidget(myUnits, 3, 1, 1, 1); + gridLayout->addItem(new QSpacerItem(/*72*/0, 0/*20*/, QSizePolicy::Expanding, QSizePolicy::Minimum), 3, 2, 1, 1); + gridLayout->addWidget(commentLabel, 4, 0, 1, 1); + gridLayout->addWidget(myComment, 4, 1, 1, 2); + gridLayout->addWidget(modificationsLabel, 5, 0, 1, 1); + gridLayout->addWidget(myModifications, 5, 1, 1, 2); + gridLayout->addWidget(buttonFrame, 6, 0, 1, 3); + + connect(myOkButton, SIGNAL(clicked()), this, SLOT(clickOnOk())); + connect(myCancelButton, SIGNAL(clicked()), this, SLOT(reject())); + initData(); - - connect(myOKBtn, SIGNAL(clicked()), this, SLOT(onOK())); - connect(myCancelBtn, SIGNAL(clicked()), this, SLOT(reject())); } /*! @@ -203,172 +167,133 @@ void SalomeApp_StudyPropertiesDlg::initData() if (hasData) propAttr = myStudyDoc->GetProperties(); hasData = hasData && propAttr; - - // Study author's name - SalomeApp_PropItem* item = new SalomeApp_PropItem(myPropList, tr("PRP_AUTHOR")+":", true, prpAuthorId); - if (hasData) - item->setValue(propAttr->GetUserName().c_str()); - - // Date of creation - item = new SalomeApp_PropItem(myPropList, item, tr("PRP_DATE")+":", false, prpDateId); + if (hasData) { + //Creator and creation date + myAuthor->setText(propAttr->GetUserName().c_str()); int minutes, hours, day, month, year; if (propAttr->GetCreationDate(minutes, hours, day, month, year)) { QString strDate; strDate.sprintf("%2.2d/%2.2d/%2d %2.2d:%2.2d", day, month, year, hours, minutes); - item->setValue(strDate); + myDate->setText(strDate); + } + + //Is Locked? + myLocked->setChecked(propAttr->IsLocked()); + + //Is Modified? + bool isModified = false; + SalomeApp_Study* study = dynamic_cast + (SUIT_Session::session()->activeApplication()->activeStudy()); + if (study) { + isModified = study->isModified(); + if (hasData) { + if (propAttr->IsModified() != isModified) { + propAttr->SetModified((int)isModified); + } + } } - } - // Creation mode -// item = new SalomeApp_PropItem(myPropList, item, tr("PRP_MODE")+":", true, prpModeId); -// item->setEditingType( SalomeApp_EntityEdit::etComboBox); -// if (hasData) item->setValue(propAttr->GetCreationMode()); + QString modif = propAttr->IsModified() ? tr( "PRP_MODIFIED" ) : tr( "PRP_NOT_MODIFIED" ); + myModification->setText(modif); + + //Units + QStringList theList; + theList <<""<<"mm"<<"cm"<<"m"<<"km"<<"inch"; + myUnits->insertItems(0,theList); - // Locked or not - item = new SalomeApp_PropItem(myPropList, item, tr("PRP_LOCKED")+":", true, prpLockedId); - item->setEditingType( SalomeApp_EntityEdit::etComboBox); - if ( hasData ) - item->setValue( tr( propAttr->IsLocked() ? "PRP_YES" : "PRP_NO" ) ); + QString anUnit = propAttr->GetUnits().c_str(); - // Saved or not - item = new SalomeApp_PropItem(myPropList, item, tr("PRP_MODIFIED")+":", false, prpSavedId); - bool isModified = false; - SalomeApp_Study* study = dynamic_cast - (SUIT_Session::session()->activeApplication()->activeStudy()); - if (study) { - isModified = study->isModified(); - if (hasData) { - if (propAttr->IsModified() != isModified) { - propAttr->SetModified((int)isModified); + int aFound = -1; + for (int i = 0; i < myUnits->count(); i++) { + if ( myUnits->itemText(i) == anUnit ) { + aFound = i; + break; } } - } - if (hasData) { - if (propAttr->IsModified()) - item->setValue( tr( "PRP_YES" ) ); - else - item->setValue( tr( "PRP_NO" ) ); - } - - // Modifications list - item = new SalomeApp_PropItem(myPropList, item, tr("PRP_MODIFICATIONS")+":", true, prpModificationsId); - item->setEditingType( SalomeApp_EntityEdit::etComboBox); - if (hasData) { + + if (aFound >= 0) { + myUnits->setCurrentIndex(aFound); + } + + //Comments + myComment->setPlainText(propAttr->GetComment().c_str()); + + //Modifications std::vector aUsers; - std::vector aMins, aHours, aDays, aMonths, aYears; + std::vector aMins, aHours, aDays, aMonths, aYears; propAttr->GetModificationsList(aUsers, aMins, aHours, aDays, aMonths, aYears, false); - int aLast = aUsers.size()-1; - if (aLast >= 0) { - QString val; - val.sprintf("%2.2d/%2.2d/%2d %2.2d:%2.2d", - aDays [aLast], - aMonths[aLast], - aYears [aLast], - aHours [aLast], - aMins [aLast]); - val = val + " : " + QString(aUsers[aUsers.size()-1].c_str()); - item->setValue(val); - } + int aCnt = aUsers.size(); + for ( int i = 0; i < aCnt; i++ ) { + QString date; + date.sprintf("%2.2d/%2.2d/%2d %2.2d:%2.2d", + aDays [i], + aMonths[i], + aYears [i], + aHours [i], + aMins [i]); + QStringList aList; + aList.append(aUsers[i].c_str()); + aList.append(date); + QTreeWidgetItem* item = new QTreeWidgetItem(aList); + myModifications->addTopLevelItem(item); + } } - - myOKBtn->setEnabled(hasData); -} - -/*! - accept data. Return true. -*/ -bool SalomeApp_StudyPropertiesDlg::acceptData() -{ - return TRUE; + adjustSize(); } /*! Fill properties attributes. */ -void SalomeApp_StudyPropertiesDlg::onOK() +void SalomeApp_StudyPropertiesDlg::clickOnOk() { - myPropList->accept(); - - if (acceptData()) { - _PTR(AttributeStudyProperties) propAttr = myStudyDoc->GetProperties(); - //myChanged = propChanged(); - if ( propAttr /*&& myChanged*/ ) { - QTreeWidgetItemIterator it( myPropList ); - // iterate through all items of the listview - while (*it) { - SalomeApp_PropItem* item = (SalomeApp_PropItem*)(*it); - switch (item->getUserType()) { - case prpAuthorId: - if (QString(propAttr->GetUserName().c_str()) != item->getValue().trimmed()) { - if (!propAttr->IsLocked()) { - propAttr->SetUserName(item->getValue().trimmed().toStdString()); - myChanged = true; - } else { - SUIT_MessageBox::warning(SUIT_Session::session()->activeApplication()->desktop(), - QObject::tr("WRN_WARNING"), - QObject::tr("WRN_STUDY_LOCKED") ); - } - } - break; - //case prpModeId: - // propAttr->SetCreationMode(item->getValue().trimmed().latin1()); - // break; - case prpLockedId: - { - bool bLocked = item->getValue().compare(tr("PRP_YES")) == 0; - if (propAttr->IsLocked() != bLocked) { - propAttr->SetLocked(bLocked); - myChanged = true; - } - } - break; - default: - break; - } - ++it; + _PTR(AttributeStudyProperties) propAttr = myStudyDoc->GetProperties(); + //Firstly, store locked flag + if(propAttr) { + bool bLocked = myLocked->isChecked(); + if (propAttr->IsLocked() != bLocked) { + propAttr->SetLocked(bLocked); + myIsChanged = true; + } + + bool needWarning = false; + + //Author + if (QString(propAttr->GetUserName().c_str()) != myAuthor->text().trimmed()) { + if(!propAttr->IsLocked()) { + propAttr->SetUserName(myAuthor->text().trimmed().toStdString()); + myIsChanged = true; + } else { + needWarning = true; } } - accept(); - } -} - -/*! - Check is properties changed? -*/ -bool SalomeApp_StudyPropertiesDlg::propChanged() -{ - _PTR(AttributeStudyProperties) propAttr = myStudyDoc->GetProperties(); - if (propAttr) { - QTreeWidgetItemIterator it (myPropList); - // iterate through all items of the listview - while (*it) { - SalomeApp_PropItem* item = (SalomeApp_PropItem*)(*it); - switch (item->getUserType()) { - case prpAuthorId: - if ( QString( propAttr->GetUserName().c_str() ) != item->getValue().trimmed() ) { - return true; - } - break; - //case prpModeId: - // if ( QString( propAttr->GetCreationMode().c_str() ) != item->getValue().trimmed() ) { - // return true; - // } - // break; - case prpLockedId: - { - bool bLocked = item->getValue().compare( tr( "PRP_YES" ) ) == 0; - if ( propAttr->IsLocked() != bLocked ) { - return true; - } - break; - } - default: - break; + //Unit + if (QString(propAttr->GetUnits().c_str()) != myUnits->currentText()) { + if(!propAttr->IsLocked()) { + propAttr->SetUnits(myUnits->currentText().toStdString()); + myIsChanged = true; + } else { + needWarning = true; } - ++it; } + + //Comment + if (QString(propAttr->GetComment().c_str()) != myComment->toPlainText()) { + if(!propAttr->IsLocked()) { + propAttr->SetComment(myComment->toPlainText().toStdString()); + myIsChanged = true; + } else { + needWarning = true; + } + } + + if(needWarning) { + SUIT_MessageBox::warning(SUIT_Session::session()->activeApplication()->desktop(), + QObject::tr("WRN_WARNING"), + QObject::tr("WRN_STUDY_LOCKED") ); + } + + accept(); } - return false; } diff --git a/src/SalomeApp/SalomeApp_StudyPropertiesDlg.h b/src/SalomeApp/SalomeApp_StudyPropertiesDlg.h index 217d1af3f..f1da51aa7 100644 --- a/src/SalomeApp/SalomeApp_StudyPropertiesDlg.h +++ b/src/SalomeApp/SalomeApp_StudyPropertiesDlg.h @@ -21,7 +21,7 @@ // // File : SalomeApp_StudyPropertiesDlg.h -// Author : Sergey ANIKIN +// Author : Roman NIKOLAEV // Module : SALOME // #ifndef SALOMEAPP_STUDY_PROPERTIES_DLG_H @@ -36,45 +36,41 @@ #include -class SalomeApp_ListView; +class QLineEdit; +class QLabel; +class QCheckBox; +class QComboBox; +class QTextEdit; +class QTreeWidget; class QPushButton; class SALOMEAPP_EXPORT SalomeApp_StudyPropertiesDlg : public QDialog { Q_OBJECT - -public: - enum { - prpAuthorId, - prpModeId, - prpDateId, - prpSavedId, - prpLockedId, - prpModificationsId, - prpLastId - }; - public: SalomeApp_StudyPropertiesDlg( QWidget* parent = 0 ); ~SalomeApp_StudyPropertiesDlg(); - bool isChanged() { return myChanged; } - + bool isChanged() { return myIsChanged; } + public slots: - void onOK(); - + void clickOnOk(); + private: - void initData(); - bool acceptData(); - bool propChanged(); + void initData(); private: - SalomeApp_ListView* myPropList; - QPushButton* myOKBtn; - QPushButton* myCancelBtn; - bool myChanged; - - _PTR(Study) myStudyDoc; + _PTR(Study) myStudyDoc; + bool myIsChanged; + QLineEdit* myAuthor; + QLabel* myDate; + QCheckBox* myLocked; + QLabel* myModification; + QComboBox* myUnits; + QTextEdit* myComment; + QTreeWidget* myModifications; + QPushButton* myOkButton; + QPushButton* myCancelButton; }; #endif // SALOMEAPP_STUDY_PROPERTIES_DLG_H diff --git a/src/SalomeApp/resources/SalomeApp_msg_en.ts b/src/SalomeApp/resources/SalomeApp_msg_en.ts index e7d8d8d40..6281d174c 100644 --- a/src/SalomeApp/resources/SalomeApp_msg_en.ts +++ b/src/SalomeApp/resources/SalomeApp_msg_en.ts @@ -347,6 +347,18 @@ Do you want to reload it ? PRP_MODIFICATIONS Modifications + + PRP_DATE_MODIF + Date + + + PRP_UNITS + Length units + + + PRP_COMMENT + Comment + PRP_NO No @@ -359,9 +371,13 @@ Do you want to reload it ? PRP_MODIFIED Modified + + PRP_NOT_MODIFIED + Not modified + PRP_DATE - Created + Creation date PRP_MODE -- 2.39.2