-// Copyright (C) 2014-20xx CEA/DEN, EDF R&D
-
-// File: CollectionPlugin_WidgetField.cpp
-// Created: 16 Nov 2016
-// Author: Vitaly SMETANNIKOV
+// Copyright (C) 2014-2022 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 "CollectionPlugin_WidgetField.h"
#include "CollectionPlugin_Field.h"
#include <ModuleBase_Tools.h>
#include <ModuleBase_IWorkshop.h>
+#include <ModuleBase_IModule.h>
#include <ModuleBase_ISelection.h>
-
-#include <XGUI_Tools.h>
-#include <XGUI_Workshop.h>
-#include <XGUI_PropertyPanel.h>
+#include <ModuleBase_IPropertyPanel.h>
#include <ModelAPI_AttributeSelectionList.h>
#include <ModelAPI_AttributeStringArray.h>
#include <QHeaderView>
#include <QStackedWidget>
#include <QValidator>
-#include <QStyledItemDelegate>
#include <QLineEdit>
#include <QEvent>
#include <QMouseEvent>
const char* MYTrue = "True";
const char* MYFalse = "False";
-class DataTableItemDelegate : public QStyledItemDelegate
+DataTableItemDelegate::DataTableItemDelegate(ModelAPI_AttributeTables::ValueType theType)
+ : QStyledItemDelegate(), myType(theType)
{
-public:
- DataTableItemDelegate(ModelAPI_AttributeTables::ValueType theType) :
- QStyledItemDelegate() { myType = theType; }
-
- virtual QWidget* createEditor(QWidget* theParent,
- const QStyleOptionViewItem & theOption,
- const QModelIndex& theIndex) const;
-
- ModelAPI_AttributeTables::ValueType dataType() const { return myType; }
-
- void setDataType(ModelAPI_AttributeTables::ValueType theType) { myType = theType; }
-
-signals:
- void startEditing();
+}
-private:
- ModelAPI_AttributeTables::ValueType myType;
-};
QWidget* DataTableItemDelegate::createEditor(QWidget* theParent,
const QStyleOptionViewItem & theOption,
const QModelIndex& theIndex ) const
{
+ QWidget* aEditor = 0;
if ((theIndex.column() == 0) && (theIndex.row() > 0)) {
QWidget* aWgt = QStyledItemDelegate::createEditor(theParent, theOption, theIndex);
QLineEdit* aEdt = static_cast<QLineEdit*>(aWgt);
aEdt->setReadOnly(true);
- return aEdt;
+ aEditor = aEdt;
} else {
QLineEdit* aLineEdt = 0;
switch (myType) {
theIndex));
if (aLineEdt) {
aLineEdt->setValidator(new QDoubleValidator(aLineEdt));
- return aLineEdt;
+ aEditor = aLineEdt;
}
break;
case ModelAPI_AttributeTables::INTEGER:
theIndex));
if (aLineEdt) {
aLineEdt->setValidator(new QIntValidator(aLineEdt));
- return aLineEdt;
+ aEditor = aLineEdt;
}
break;
case ModelAPI_AttributeTables::BOOLEAN:
QComboBox* aBox = new QComboBox(theParent);
aBox->addItem(MYFalse);
aBox->addItem(MYTrue);
- return aBox;
+ aEditor = aBox;
}
+ break;
+ default:
+ aEditor = QStyledItemDelegate::createEditor(theParent, theOption, theIndex);
}
}
- return QStyledItemDelegate::createEditor(theParent, theOption, theIndex);
+ if (myType == ModelAPI_AttributeTables::BOOLEAN)
+ connect(aEditor, SIGNAL(currentTextChanged(const QString&)),
+ SLOT(onEditItem(const QString&)));
+ else
+ connect(aEditor, SIGNAL(textEdited(const QString&)),
+ SLOT(onEditItem(const QString&)));
+ return aEditor;
+}
+
+void DataTableItemDelegate::onEditItem(const QString& theText)
+{
+ QWidget* aWgt = dynamic_cast<QWidget*>(sender());
+ commitData(aWgt);
}
ModuleBase_IWorkshop* theWorkshop,
const Config_WidgetAPI* theData):
ModuleBase_WidgetSelector(theParent, theWorkshop, theData), myHeaderEditor(0),
- myIsEditing(false), myActivation(false)
+ myIsTabEdit(false), myActivation(false)
{
QVBoxLayout* aMainLayout = new QVBoxLayout(this);
myCompNamesList << "Comp 1";
myStepWgt = new QStackedWidget(aStepFrame);
aStepLayout->addWidget(myStepWgt, 2, 0, 1, 2);
+
+ myDelegate =
+ new DataTableItemDelegate((ModelAPI_AttributeTables::ValueType)
+ myFieldTypeCombo->currentIndex());
+
appendStepControls();
// Buttons below
// Data table
QTableWidget* aDataTbl = new QTableWidget(1, myCompNamesList.count() + 1, aWidget);
aDataTbl->installEventFilter(this);
- DataTableItemDelegate* aDelegate = 0;
- if (myDataTblList.isEmpty())
- aDelegate = new DataTableItemDelegate(
- (ModelAPI_AttributeTables::ValueType) myFieldTypeCombo->currentIndex());
- else
- aDelegate = dynamic_cast<DataTableItemDelegate*>(myDataTblList.first()->itemDelegate());
+ aDataTbl->setItemDelegate(myDelegate);
QIntList aColWidth;
if (!myDataTblList.isEmpty()) {
for (int i = 0; i < aFirstTable->columnCount(); i++)
aColWidth.append(aFirstTable->columnWidth(i));
}
- aDataTbl->setItemDelegate(aDelegate);
myDataTblList.append(aDataTbl);
aDataTbl->verticalHeader()->hide();
}
if (aColWidth.length() > 0) {
- for (int i = 0; i < aDataTbl->columnCount(); i++)
+ for (int i = 0; i < aDataTbl->columnCount(); i++) {
+ if (i < aColWidth.size())
aDataTbl->setColumnWidth(i, aColWidth.at(i));
+ }
}
aStepLayout->addWidget(aDataTbl, 1, 0, 1, 2);
connect(aDataTbl, SIGNAL(cellChanged(int, int)), SLOT(onTableEdited(int, int)));
- QAbstractItemDelegate* aDel = aDataTbl->itemDelegate();
myStepWgt->addWidget(aWidget);
aDataTbl->horizontalHeader()->viewport()->installEventFilter(this);
}
storeValueCustom();
}
+//**********************************************************************************
+//void CollectionPlugin_WidgetField::showEvent(QShowEvent* theEvent)
+//{
+// myShapeTypeCombo->setEnabled(!isEditingMode());
+// myFieldTypeCombo->setEnabled(!isEditingMode());
+// myNbComponentsSpn->setEnabled(!isEditingMode());
+//}
//**********************************************************************************
bool CollectionPlugin_WidgetField::eventFilter(QObject* theObject, QEvent* theEvent)
} else if (theEvent->type() == QEvent::FocusIn) {
QTableWidget* aTable = dynamic_cast<QTableWidget*>(theObject);
if (aTable) {
- XGUI_Workshop* aWorkshop = XGUI_Tools::workshop(myWorkshop);
- XGUI_PropertyPanel* aPanel = aWorkshop->propertyPanel();
+ ModuleBase_IPropertyPanel* aPanel = myWorkshop->propertyPanel();
if (aPanel->activeWidget() != this) {
myActivation = true;
aPanel->activateWidget(this, false);
{
QList<QWidget*> aControls;
// this control will accept focus and will be highlighted in the Property Panel
- aControls.push_back(myShapeTypeCombo);
- aControls.push_back(myFieldTypeCombo);
- aControls.push_back(myNbComponentsSpn);
+ aControls.append(myShapeTypeCombo);
+ aControls.append(myFieldTypeCombo);
+ aControls.append(myNbComponentsSpn);
+ if (myStampSpnList.size() > 0)
+ aControls.append(myStampSpnList.first());
+ if (myDataTblList.size() > 0)
+ aControls.append(myDataTblList.first());
+
return aControls;
}
}
}
}
- updateObject(myFeature);
return true;
}
std::string aTypeStr = aSelList->selectionType();
if (aTypeStr == "")
return false; // The attribute is not initialized
+ isBlocked = myShapeTypeCombo->blockSignals(true);
myShapeTypeCombo->setCurrentIndex(getSelectionType(aTypeStr));
+ myShapeTypeCombo->blockSignals(isBlocked);
// Get number of components
AttributeStringArrayPtr aStringsAttr =
isBlocked = myFieldTypeCombo->blockSignals(true);
myFieldTypeCombo->setCurrentIndex(aTablesAttr->type());
myFieldTypeCombo->blockSignals(isBlocked);
+ myDelegate->setDataType(aTablesAttr->type());
AttributeIntArrayPtr aStampsAttr = aData->intArray(CollectionPlugin_Field::STAMPS_ID());
// Fill data table
QTableWidget* aTable = myDataTblList.at(i);
isBlocked = aTable->blockSignals(true);
aTable->setRowCount(aRows);
+ aTable->setColumnCount(aCols + 1);
+ updateHeaders(aTable);
for (int j = 0; j < aCols + 1; j++) {
for (int k = 0; k < aRows; k++) {
aItem = aTable->item(k, j);
// Add selection names
AttributeSelectionPtr aAttr = aSelList->value(k - 1);
if (aItem) {
- aItem->setText(aAttr->namingName().c_str());
+ aItem->setText(QString::fromStdWString(aAttr->namingName()));
} else {
- aItem = new QTableWidgetItem(aAttr->namingName().c_str());
+ aItem = new QTableWidgetItem(QString::fromStdWString(aAttr->namingName()));
aTable->setItem(k, j, aItem);
}
} else if (j > 0) {
}
}
// Restore columns width
- for (int i = 0; i < aTable->columnCount(); i++)
- aTable->setColumnWidth(i, aColWidth.at(i));
+ for (int col = 0; col < aTable->columnCount(); col++) {
+ if (col < aColWidth.size())
+ aTable->setColumnWidth(col, aColWidth.at(col));
+ }
aTable->blockSignals(isBlocked);
}
//**********************************************************************************
int CollectionPlugin_WidgetField::getSelectionType(const std::string& theStr) const
{
- if (theStr == "vertex")
+ QString aType(theStr.c_str());
+ aType = aType.toLower();
+ if (aType == "vertex")
return 0;
- else if (theStr == "edge")
+ else if (aType == "edge")
return 1;
- else if (theStr == "face")
+ else if (aType == "face")
return 2;
- else if (theStr == "solid")
+ else if (aType == "solid")
return 3;
- else if (theStr == "object")
+ else if (aType == "object")
return 4;
- else if (theStr == "part")
+ else if (aType == "part")
return 5;
return -1;
}
aTable->setItem(j, i, aItem);
}
AttributeSelectionPtr aAttr = aSelList->value(j - 1);
- aItem->setText(aAttr->namingName().c_str());
- aItem->setToolTip(aAttr->namingName().c_str());
+ aItem->setText(QString::fromStdWString(aAttr->namingName()));
+ aItem->setToolTip(QString::fromStdWString(aAttr->namingName()));
}
} else {
QString aDefVal = aTable->item(0, i)->text();
}
}
}
+ emit valuesChanged();
}
//**********************************************************************************
removeStepControls();
myStepSlider->setMaximum(aMax);
- AttributeTablesPtr aTablesAttr = myFeature->data()->tables(CollectionPlugin_Field::VALUES_ID());
- aTablesAttr->setSize(aTablesAttr->rows(), aTablesAttr->columns(), myDataTblList.size());
+ //AttributeTablesPtr aTablesAttr = myFeature->data()->tables(CollectionPlugin_Field::VALUES_ID());
+ //aTablesAttr->setSize(aTablesAttr->rows(), aTablesAttr->columns(), myDataTblList.size());
+ emit valuesChanged();
}
//**********************************************************************************
//**********************************************************************************
bool CollectionPlugin_WidgetField::
- isValidSelection(const std::shared_ptr<ModuleBase_ViewerPrs>& thePrs)
+ isValidSelectionCustom(const std::shared_ptr<ModuleBase_ViewerPrs>& thePrs)
{
return (myShapeTypeCombo->currentIndex() == 5)? false : true;
}
//**********************************************************************************
-void CollectionPlugin_WidgetField::onSelectionChanged()
+bool CollectionPlugin_WidgetField::
+ setSelection(QList<std::shared_ptr<ModuleBase_ViewerPrs>>& theValues, const bool theToValidate)
{
if (myActivation) {
myActivation = false;
- return;
+ return false;
}
// Ignore selection for Parts mode
if (myShapeTypeCombo->currentIndex() == 5)
- return;
-
- QList<ModuleBase_ViewerPrsPtr> aSelected =
- myWorkshop->selection()->getSelected(ModuleBase_ISelection::AllControls);
-
+ return false;
+
+ QList<ModuleBase_ViewerPrsPtr> aSelected;
+ QList<ModuleBase_ViewerPrsPtr>::const_iterator anIt;
+ for (anIt = theValues.begin(); anIt != theValues.end(); anIt++) {
+ ModuleBase_ViewerPrsPtr aValue = *anIt;
+ ResultPtr aRes = std::dynamic_pointer_cast<ModelAPI_Result>(aValue->object());
+ if (theToValidate && aRes.get()) {
+ if (myShapeTypeCombo->currentIndex() > 3)
+ aSelected.append(aValue);
+ else if (acceptSubShape(aValue->shape(), aRes))
+ aSelected.append(aValue);
+ }
+ }
AttributeSelectionListPtr aSelList =
myFeature->data()->selectionList(CollectionPlugin_Field::SELECTED_ID());
aSelList->setSelectionType(getSelectionType(myShapeTypeCombo->currentIndex()));
aTable->setItem(j, i, aItem);
}
AttributeSelectionPtr aAttr = aSelList->value(j - 1);
- aItem->setText(aAttr->namingName().c_str());
- aItem->setToolTip(aAttr->namingName().c_str());
+ aItem->setText(QString::fromStdWString(aAttr->namingName()));
+ aItem->setToolTip(QString::fromStdWString(aAttr->namingName()));
}
} else {
QString aDefVal = aTable->item(0, i)->text();
// Update only selection name
for(int j = 1; j < aNewRows - 1; j++) {
AttributeSelectionPtr aAttr = aSelList->value(j);
- aTable->item(j, 0)->setText(aAttr->namingName().c_str());
- aTable->item(j, 0)->setToolTip(aAttr->namingName().c_str());
+ aTable->item(j, 0)->setText(QString::fromStdWString(aAttr->namingName()));
+ aTable->item(j, 0)->setToolTip(QString::fromStdWString(aAttr->namingName()));
}
}
}
- emit valuesChanged();
+ return true;
}
//**********************************************************************************
void CollectionPlugin_WidgetField::onFieldTypeChanged(int theIdx)
{
- DataTableItemDelegate* aDelegate = 0;
- aDelegate = dynamic_cast<DataTableItemDelegate*>(myDataTblList.first()->itemDelegate());
- if (aDelegate) {
- ModelAPI_AttributeTables::ValueType aOldType = aDelegate->dataType();
- if (aOldType != theIdx) {
- aDelegate->setDataType((ModelAPI_AttributeTables::ValueType)theIdx);
- int aColumns = myDataTblList.first()->columnCount();
- int aRows = myDataTblList.first()->rowCount();
- foreach(QTableWidget* aTable, myDataTblList) {
- for(int i = 1; i < aColumns; i++) {
- for(int j = 0; j < aRows; j++) {
- switch (theIdx) {
- case ModelAPI_AttributeTables::DOUBLE:
- case ModelAPI_AttributeTables::INTEGER:
- if ((aOldType == ModelAPI_AttributeTables::BOOLEAN) ||
- (aOldType == ModelAPI_AttributeTables::STRING)) {
- aTable->item(j, i)->setText("0");
- }
- break;
- case ModelAPI_AttributeTables::BOOLEAN:
- aTable->item(j, i)->setText(MYFalse);
- break;
- case ModelAPI_AttributeTables::STRING:
- aTable->item(j, i)->setText("");
- break;
- }
+ ModelAPI_AttributeTables::ValueType aOldType = myDelegate->dataType();
+ if (aOldType != theIdx) {
+ myDelegate->setDataType((ModelAPI_AttributeTables::ValueType)theIdx);
+ int aColumns = myDataTblList.first()->columnCount();
+ int aRows = myDataTblList.first()->rowCount();
+ foreach(QTableWidget* aTable, myDataTblList) {
+ for(int i = 1; i < aColumns; i++) {
+ for(int j = 0; j < aRows; j++) {
+ switch (theIdx) {
+ case ModelAPI_AttributeTables::DOUBLE:
+ case ModelAPI_AttributeTables::INTEGER:
+ aTable->item(j, i)->setText("0");
+ break;
+ case ModelAPI_AttributeTables::BOOLEAN:
+ aTable->item(j, i)->setText(MYFalse);
+ break;
+ case ModelAPI_AttributeTables::STRING:
+ aTable->item(j, i)->setText("");
+ break;
}
}
}
- emit valuesChanged();
}
+ emit valuesChanged();
}
}
//**********************************************************************************
void CollectionPlugin_WidgetField::onShapeTypeChanged(int theType)
{
- activateSelectionAndFilters(theType == 5? false:true);
+ updateSelectionModesAndFilters(theType == 5? false:true);
AttributeSelectionListPtr aSelList =
myFeature->data()->selectionList(CollectionPlugin_Field::SELECTED_ID());
if (aTypeName == aSelList->selectionType())
return;
aSelList->setSelectionType(aTypeName);
+ // Updated event has to be sent here in case if type of shapes
+ // was changed from Part to any other in order to updater Apply button status
+ myFeature->data()->sendAttributeUpdated(aSelList.get());
//Clear old selection
clearData();
aSelList->clear();
AttributeTablesPtr aTablesAttr = myFeature->data()->tables(CollectionPlugin_Field::VALUES_ID());
aTablesAttr->setSize(1, myNbComponentsSpn->value(), myDataTblList.size());
+ updateObject(myFeature);
emit valuesChanged();
}
//**********************************************************************************
bool CollectionPlugin_WidgetField::processEnter()
{
- if (myIsEditing) {
- myIsEditing = false;
+ if (myIsTabEdit) {
+ myIsTabEdit = false;
+ return true;
+ }
+ QWidget* aCurrWgt = qApp->focusWidget();
+ int aCurWgtId = myStepWgt->currentIndex();
+ if ((aCurrWgt == myShapeTypeCombo) ||
+ (aCurrWgt == myFieldTypeCombo) ||
+ (aCurrWgt == myNbComponentsSpn) ||
+ (aCurrWgt == myStampSpnList[aCurWgtId]) ||
+ (aCurrWgt == myDataTblList[aCurWgtId])) {
+ setFocus();
return true;
}
return false;
//**********************************************************************************
void CollectionPlugin_WidgetField::onFocusChanged(QWidget* theOld, QWidget* theNew)
{
- if (theNew && (!myIsEditing))
- myIsEditing = dynamic_cast<QLineEdit*>(theNew);
+ if (theNew && (!myIsTabEdit))
+ myIsTabEdit = dynamic_cast<QLineEdit*>(theNew);
}
//**********************************************************************************
aTable->setColumnWidth(theIndex, theNew);
}
}
+
+//**********************************************************************************
+QList<std::shared_ptr<ModuleBase_ViewerPrs>>
+ CollectionPlugin_WidgetField::getAttributeSelection() const
+{
+ QList<std::shared_ptr<ModuleBase_ViewerPrs>> aList;
+ if(myFeature) {
+ DataPtr aData = myFeature->data();
+ AttributeSelectionListPtr aSelList =
+ aData->selectionList(CollectionPlugin_Field::SELECTED_ID());
+ AttributeSelectionPtr aAttr;
+ ObjectPtr anObject;
+ for (int i = 0; i < aSelList->size(); i++) {
+ aAttr = aSelList->value(i);
+ ModuleBase_ViewerPrsPtr
+ aPrs(new ModuleBase_ViewerPrs(aAttr->context(), aAttr->value(), NULL));
+ aList.append(aPrs);
+ }
+ }
+ return aList;
+}
\ No newline at end of file
