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
refs #550: fix crash when myObject is NULL
[modules/hydro.git]
/
src
/
HYDROGUI
/
HYDROGUI_PolylineOp.h
diff --git
a/src/HYDROGUI/HYDROGUI_PolylineOp.h
b/src/HYDROGUI/HYDROGUI_PolylineOp.h
index 614960dfecb719eeae3c0bc93ac8cc77b5b8c3d7..a78e34b9685102aa4a1103faf1bae3a97785f667 100755
(executable)
--- a/
src/HYDROGUI/HYDROGUI_PolylineOp.h
+++ b/
src/HYDROGUI/HYDROGUI_PolylineOp.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
@@
-25,11
+21,9
@@
#include "HYDROGUI_Operation.h"
#include "HYDROGUI_Operation.h"
-#include <HYDROData_Polyline.h>
+#include <HYDROData_Polyline
XY
.h>
-class OCCViewer_ViewManager;
class CurveCreator_Curve;
class CurveCreator_Curve;
-class HYDROGUI_AISCurve;
class HYDROGUI_PolylineOp : public HYDROGUI_Operation
{
class HYDROGUI_PolylineOp : public HYDROGUI_Operation
{
@@
-39,6
+33,11
@@
public:
HYDROGUI_PolylineOp( HYDROGUI_Module* theModule, bool isEdit );
virtual ~HYDROGUI_PolylineOp();
HYDROGUI_PolylineOp( HYDROGUI_Module* theModule, bool isEdit );
virtual ~HYDROGUI_PolylineOp();
+ void deleteSelected();
+ bool deleteEnabled();
+
+ virtual void updatePreviewZLayer( int theLayer );
+
protected:
virtual void startOperation();
virtual void abortOperation();
protected:
virtual void startOperation();
virtual void abortOperation();
@@
-46,7
+45,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();
@@
-56,12
+56,9
@@
private:
void erasePreview();
private:
void erasePreview();
private:
- OCCViewer_ViewManager* myViewManager;
-
- bool myIsEdit;
- Handle(HYDROData_Polyline) myEditedObject;
- CurveCreator_Curve* myCurve;
- HYDROGUI_AISCurve* myAISCurve;
+ bool myIsEdit;
+ Handle(HYDROData_PolylineXY) myEditedObject;
+ CurveCreator_Curve* myCurve;
};
#endif
};
#endif