Salome HOME
projects
/
modules
/
hydro.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'BR_LAND_COVER' of ssh://git.salome-platform.org/modules/hydro into...
[modules/hydro.git]
/
src
/
HYDROGUI
/
HYDROGUI_StreamOp.h
diff --git
a/src/HYDROGUI/HYDROGUI_StreamOp.h
b/src/HYDROGUI/HYDROGUI_StreamOp.h
index 8d356e0ac76def86a719ed8c1c39f45712903e9c..277bb0a8a60c51691c68bc044c05a0b57f316512 100755
(executable)
--- a/
src/HYDROGUI/HYDROGUI_StreamOp.h
+++ b/
src/HYDROGUI/HYDROGUI_StreamOp.h
@@
-1,12
+1,8
@@
-// Copyright (C) 2007-2013 CEA/DEN, EDF R&D, OPEN CASCADE
-//
-// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
-//
+// Copyright (C) 2014-2015 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
// 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.
+// 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
//
// This library is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
@@
-26,8
+22,8
@@
#include "HYDROGUI_Operation.h"
#include <HYDROData_Stream.h>
#include "HYDROGUI_Operation.h"
#include <HYDROData_Stream.h>
+#include <QStringList>
-class OCCViewer_ViewManager;
class HYDROGUI_Shape;
class HYDROGUI_StreamOp : public HYDROGUI_Operation
class HYDROGUI_Shape;
class HYDROGUI_StreamOp : public HYDROGUI_Operation
@@
-46,7
+42,8
@@
protected:
virtual HYDROGUI_InputPanel* createInputPanel() const;
virtual HYDROGUI_InputPanel* createInputPanel() const;
- virtual bool processApply( int& theUpdateFlags, QString& theErrorMsg );
+ virtual bool processApply( int& theUpdateFlags, QString& theErrorMsg,
+ QStringList& theBrowseObjectsEntries );
virtual bool isToAbortOnApply() const { return false; }
virtual bool isToAbortOnApply() const { return false; }
@@
-61,12
+58,14
@@
private:
void updatePanelData();
private:
void updatePanelData();
private:
- OCCViewer_ViewManager* myViewManager;
-
bool myIsEdit;
Handle(HYDROData_Stream) myEditedObject;
HYDROGUI_Shape* myPreviewPrs;
bool myIsEdit;
Handle(HYDROData_Stream) myEditedObject;
HYDROGUI_Shape* myPreviewPrs;
+
+ QString myHydAxis;
+ QStringList myProfiles;
+ QList<double> myProfileParams;
};
#endif
};
#endif