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 'master' of ssh://git.salome-platform.org/modules/hydro
[modules/hydro.git]
/
src
/
HYDROGUI
/
HYDROGUI_PolylineOp.h
diff --git
a/src/HYDROGUI/HYDROGUI_PolylineOp.h
b/src/HYDROGUI/HYDROGUI_PolylineOp.h
index aebd8be05d6e912378811ef172d53e739292b261..6a35535d10eae06e261279e17cc9da3b6274169d 100755
(executable)
--- a/
src/HYDROGUI/HYDROGUI_PolylineOp.h
+++ b/
src/HYDROGUI/HYDROGUI_PolylineOp.h
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-201
3
CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-201
5
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) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@
-6,7
+6,7
@@
// 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
@@
-25,9
+25,8
@@
#include "HYDROGUI_Operation.h"
#include "HYDROGUI_Operation.h"
-#include <HYDROData_Polyline.h>
+#include <HYDROData_Polyline
XY
.h>
-class OCCViewer_ViewManager;
class CurveCreator_Curve;
class HYDROGUI_PolylineOp : public HYDROGUI_Operation
class CurveCreator_Curve;
class HYDROGUI_PolylineOp : public HYDROGUI_Operation
@@
-41,6
+40,8
@@
public:
void deleteSelected();
bool deleteEnabled();
void deleteSelected();
bool deleteEnabled();
+ virtual void updatePreviewZLayer( int theLayer );
+
protected:
virtual void startOperation();
virtual void abortOperation();
protected:
virtual void startOperation();
virtual void abortOperation();
@@
-48,7
+49,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 );
protected slots:
void onEditorSelectionChanged();
protected slots:
void onEditorSelectionChanged();
@@
-58,11
+60,9
@@
private:
void erasePreview();
private:
void erasePreview();
private:
- OCCViewer_ViewManager* myViewManager;
-
- bool myIsEdit;
- Handle(HYDROData_Polyline) myEditedObject;
- CurveCreator_Curve* myCurve;
+ bool myIsEdit;
+ Handle(HYDROData_PolylineXY) myEditedObject;
+ CurveCreator_Curve* myCurve;
};
#endif
};
#endif