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_v14_rc' into BR_quadtree
[modules/hydro.git]
/
src
/
HYDROGUI
/
HYDROGUI_ChannelOp.h
diff --git
a/src/HYDROGUI/HYDROGUI_ChannelOp.h
b/src/HYDROGUI/HYDROGUI_ChannelOp.h
index 25f47a37bb28f69238a3dda9f4732e899973c75a..ec7c92722add563dbf2b23d9234d2ca34473f43e 100644
(file)
--- a/
src/HYDROGUI/HYDROGUI_ChannelOp.h
+++ b/
src/HYDROGUI/HYDROGUI_ChannelOp.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
@@
-20,6
+16,7
@@
// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
//
// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
//
+
#ifndef HYDROGUI_ChannelOp_H
#define HYDROGUI_ChannelOp_H
#ifndef HYDROGUI_ChannelOp_H
#define HYDROGUI_ChannelOp_H
@@
-46,21
+43,27
@@
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:
protected slots:
- virtual void onCreatePreview(
const bool theIsInit = false
);
+ virtual void onCreatePreview();
protected:
virtual void erasePreview();
protected:
virtual void erasePreview();
- virtual Handle(HYDROData_Channel) getObjectToEdit() const;
+
+ virtual Handle(HYDROData_Channel) createNewObject() const;
+
+ virtual QColor getDefaultFillingColor() const;
+
+ virtual QColor getDefaultBorderColor() const;
+
+ virtual HYDROGUI_Shape* getPreviewShape() const { return myPreviewPrs; };
protected:
bool myIsEdit;
Handle(HYDROData_Channel) myEditedObject;
protected:
bool myIsEdit;
Handle(HYDROData_Channel) myEditedObject;
- OCCViewer_ViewManager* myViewManager;
-
HYDROGUI_Shape* myPreviewPrs;
};
HYDROGUI_Shape* myPreviewPrs;
};