Salome HOME
projects
/
modules
/
med.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Copyright update 2021
[modules/med.git]
/
src
/
MEDCalc
/
gui
/
ProcessingController.cxx
diff --git
a/src/MEDCalc/gui/ProcessingController.cxx
b/src/MEDCalc/gui/ProcessingController.cxx
index 9c4a22309f9bac938059602f8a3e3a4e96d059ed..3a55776052e1970676e2b1c9fed743c6e2098072 100644
(file)
--- a/
src/MEDCalc/gui/ProcessingController.cxx
+++ b/
src/MEDCalc/gui/ProcessingController.cxx
@@
-1,4
+1,4
@@
-// Copyright (C) 2016 CEA/DEN, EDF R&D
+// Copyright (C) 2016
-2021
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
//
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
@@
-73,7
+73,8
@@
ProcessingController::createActions()
label = tr("LAB_PROCESSING_INTERPOLATE_FIELD");
icon = tr("ICO_PROCESSING_INTERPOLATE_FIELD");
label = tr("LAB_PROCESSING_INTERPOLATE_FIELD");
icon = tr("ICO_PROCESSING_INTERPOLATE_FIELD");
- actionId = _salomeModule->createStandardAction(label,this, SLOT(OnInterpolateField()),icon,label);
+ actionId = _salomeModule->createStandardAction(label, this, SLOT(OnInterpolateField()),
+ icon, label, FIELDSOp::OpProcessingInterpolation);
_salomeModule->createTool(actionId, processingToolbarId);
_salomeModule->action(actionId)->setIconVisibleInMenu(true);
_salomeModule->createMenu(actionId, processingMenuId);
_salomeModule->createTool(actionId, processingToolbarId);
_salomeModule->action(actionId)->setIconVisibleInMenu(true);
_salomeModule->createMenu(actionId, processingMenuId);
@@
-82,10
+83,7
@@
ProcessingController::createActions()
void
ProcessingController::OnChangeUnderlyingMesh()
{
void
ProcessingController::OnChangeUnderlyingMesh()
{
- // We need a studyEditor updated on the active study
- _studyEditor->updateActiveStudy();
-
- // Get the selected objects in the study (SObject). In cas of a
+ // Get the selected objects in the study (SObject). In case of a
// multiple selection, we consider only the first item. At least one
// item must be selected.
SALOME_StudyEditor::SObjectList* listOfSObject = _studyEditor->getSelectedObjects();
// multiple selection, we consider only the first item. At least one
// item must be selected.
SALOME_StudyEditor::SObjectList* listOfSObject = _studyEditor->getSelectedObjects();
@@
-103,8
+101,10
@@
ProcessingController::OnChangeUnderlyingMesh()
if ( fieldSeriesId < 0)
return;
MEDCALC::FieldHandlerList* fieldHandlerList = MEDFactoryClient::getDataManager()->getFieldListInFieldseries(fieldSeriesId);
if ( fieldSeriesId < 0)
return;
MEDCALC::FieldHandlerList* fieldHandlerList = MEDFactoryClient::getDataManager()->getFieldListInFieldseries(fieldSeriesId);
+ /* todo: always false!
if (fieldHandlerList->length() < 0)
return;
if (fieldHandlerList->length() < 0)
return;
+ */
// For a field series, get the first real field entry:
MEDCALC::FieldHandler fieldHandler = (*fieldHandlerList)[0];
fieldId = fieldHandler.id;
// For a field series, get the first real field entry:
MEDCALC::FieldHandler fieldHandler = (*fieldHandlerList)[0];
fieldId = fieldHandler.id;
@@
-143,9
+143,6
@@
ProcessingController::OnChangeUnderlyingMeshInputValidated()
void
ProcessingController::OnInterpolateField()
{
void
ProcessingController::OnInterpolateField()
{
- // We need a studyEditor updated on the active study
- _studyEditor->updateActiveStudy();
-
// Get the selected objects in the study (SObject). In case of a
// multiple selection, we consider only the first item. At least one
// item must be selected.
// Get the selected objects in the study (SObject). In case of a
// multiple selection, we consider only the first item. At least one
// item must be selected.
@@
-164,8
+161,10
@@
ProcessingController::OnInterpolateField()
if ( fieldSeriesId < 0)
return;
MEDCALC::FieldHandlerList* fieldHandlerList = MEDFactoryClient::getDataManager()->getFieldListInFieldseries(fieldSeriesId);
if ( fieldSeriesId < 0)
return;
MEDCALC::FieldHandlerList* fieldHandlerList = MEDFactoryClient::getDataManager()->getFieldListInFieldseries(fieldSeriesId);
+ /* todo: always false!
if (fieldHandlerList->length() < 0)
return;
if (fieldHandlerList->length() < 0)
return;
+ */
// For a field series, get the first real field entry:
MEDCALC::FieldHandler fieldHandler = (*fieldHandlerList)[0];
fieldId = fieldHandler.id;
// For a field series, get the first real field entry:
MEDCALC::FieldHandler fieldHandler = (*fieldHandlerList)[0];
fieldId = fieldHandler.id;