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
bos #28928: Merge branch 'rnv/28928'
[modules/med.git]
/
src
/
MEDCalc
/
gui
/
DatasourceController.cxx
diff --git
a/src/MEDCalc/gui/DatasourceController.cxx
b/src/MEDCalc/gui/DatasourceController.cxx
index f0f18b997dff9e65e6e5b982a941d69d7dc5bbcd..49a2a0720f8df68e45b3e771e5270fec7205a71e 100644
(file)
--- a/
src/MEDCalc/gui/DatasourceController.cxx
+++ b/
src/MEDCalc/gui/DatasourceController.cxx
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-202
0
CEA/DEN, EDF R&D
+// Copyright (C) 2007-202
1
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
@@
-75,7
+75,8
@@
void DatasourceController::createActions() {
QString tooltip = tr("TIP_ADD_DATA_SOURCE");
QString icon = tr("ICO_DATASOURCE_ADD");
int actionId;
QString tooltip = tr("TIP_ADD_DATA_SOURCE");
QString icon = tr("ICO_DATASOURCE_ADD");
int actionId;
- actionId = _salomeModule->createStandardAction(label,this, SLOT(OnAddDatasource()),icon,tooltip);
+ actionId = _salomeModule->createStandardAction(label, this, SLOT(OnAddDatasource()),
+ icon, tooltip, FIELDSOp::OpAddDataSource);
_salomeModule->createTool(actionId, toolbarId);
// This action has to be placed in the general file menu with the label "Import MED file"
_salomeModule->createTool(actionId, toolbarId);
// This action has to be placed in the general file menu with the label "Import MED file"
@@
-242,11
+243,11
@@
void DatasourceController::OnExpandField()
// First retrieve the fieldseries id associated to this study object
SALOMEDS::GenericAttribute_var anAttr;
SALOMEDS::AttributeParameter_var aParam;
// First retrieve the fieldseries id associated to this study object
SALOMEDS::GenericAttribute_var anAttr;
SALOMEDS::AttributeParameter_var aParam;
- if (
soFieldseries->FindAttribute(anAttr,"AttributeParameter") ) {
-
aParam = SALOMEDS::AttributeParameter::_narrow(anAttr)
;
- if (! aParam->IsSet(FIELD_SERIES_ID, PT_INTEGER))
- return;
- }
+ if (
!soFieldseries->FindAttribute(anAttr,"AttributeParameter") )
+
return
;
+ aParam = SALOMEDS::AttributeParameter::_narrow(anAttr);
+ if (! aParam->IsSet(FIELD_SERIES_ID, PT_INTEGER))
+ return;
long fieldseriesId = aParam->GetInt(FIELD_SERIES_ID);
STDLOG("Expand the field timeseries "<<fieldseriesId);
long fieldseriesId = aParam->GetInt(FIELD_SERIES_ID);
STDLOG("Expand the field timeseries "<<fieldseriesId);
@@
-296,11
+297,11
@@
void DatasourceController::OnUseInWorkspace() {
return;
SALOMEDS::GenericAttribute_var anAttr;
SALOMEDS::AttributeParameter_var aParam;
return;
SALOMEDS::GenericAttribute_var anAttr;
SALOMEDS::AttributeParameter_var aParam;
- if (
soField->FindAttribute(anAttr,"AttributeParameter") ) {
-
aParam = SALOMEDS::AttributeParameter::_narrow(anAttr)
;
- if (! aParam->IsSet(IS_IN_WORKSPACE, PT_BOOLEAN))
- return;
- }
+ if (
!soField->FindAttribute(anAttr,"AttributeParameter") )
+
return
;
+ aParam = SALOMEDS::AttributeParameter::_narrow(anAttr);
+ if (! aParam->IsSet(IS_IN_WORKSPACE, PT_BOOLEAN))
+ return;
bool isInWorkspace = aParam->GetBool(IS_IN_WORKSPACE);
if ( isInWorkspace ) {
QMessageBox::warning(_salomeModule->getApp()->desktop(),
bool isInWorkspace = aParam->GetBool(IS_IN_WORKSPACE);
if ( isInWorkspace ) {
QMessageBox::warning(_salomeModule->getApp()->desktop(),
@@
-365,11
+366,11
@@
void DatasourceController::OnUseInWorkspace() {
continue;
SALOMEDS::GenericAttribute_var anAttr;
SALOMEDS::AttributeParameter_var aParam;
continue;
SALOMEDS::GenericAttribute_var anAttr;
SALOMEDS::AttributeParameter_var aParam;
- if (
soField->FindAttribute(anAttr,"AttributeParameter") ) {
-
aParam = SALOMEDS::AttributeParameter::_narrow(anAttr)
;
- if (! aParam->IsSet(IS_IN_WORKSPACE, PT_BOOLEAN))
- return;
- }
+ if (
!soField->FindAttribute(anAttr,"AttributeParameter") )
+
return
;
+ aParam = SALOMEDS::AttributeParameter::_narrow(anAttr);
+ if (! aParam->IsSet(IS_IN_WORKSPACE, PT_BOOLEAN))
+ return;
bool isInWorkspace = aParam->GetBool(IS_IN_WORKSPACE);
if ( !isInWorkspace ) {
if (! aParam->IsSet(FIELD_ID, PT_INTEGER))
bool isInWorkspace = aParam->GetBool(IS_IN_WORKSPACE);
if ( !isInWorkspace ) {
if (! aParam->IsSet(FIELD_ID, PT_INTEGER))