Salome HOME
projects
/
modules
/
shaper.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of newgeom:newgeom
[modules/shaper.git]
/
src
/
XGUI
/
XGUI_ViewPort.h
diff --git
a/src/XGUI/XGUI_ViewPort.h
b/src/XGUI/XGUI_ViewPort.h
index 5d73031a1605825dceac5624a8f84ba057fd6f1a..f22cc9d92808d6a4a1cdb951bf4e5f11e57d5793 100644
(file)
--- a/
src/XGUI/XGUI_ViewPort.h
+++ b/
src/XGUI/XGUI_ViewPort.h
@@
-1,7
+1,9
@@
#ifndef XGUI_ViewPort_H
#define XGUI_ViewPort_H
#ifndef XGUI_ViewPort_H
#define XGUI_ViewPort_H
-#include "XGUI_ViewBackground.h"
+#include "XGUI.h"
+
+#include <Qtx.h>
#include <QWidget>
#include <V3d_Viewer.hxx>
#include <QWidget>
#include <V3d_Viewer.hxx>
@@
-10,20
+12,20
@@
class XGUI_ViewWindow;
class XGUI_ViewWindow;
-class XGUI_
ViewPort
: public QWidget
+class XGUI_
EXPORT XGUI_ViewPort
: public QWidget
{
Q_OBJECT
{
Q_OBJECT
-public:
+
public:
XGUI_ViewPort(XGUI_ViewWindow* theParent, const Handle(V3d_Viewer)& theViewer,
V3d_TypeOfView theType = V3d_ORTHOGRAPHIC);
XGUI_ViewPort(XGUI_ViewWindow* theParent, const Handle(V3d_Viewer)& theViewer,
V3d_TypeOfView theType = V3d_ORTHOGRAPHIC);
- ~XGUI_ViewPort();
+
virtual
~XGUI_ViewPort();
virtual QPaintEngine* paintEngine() const
{
return 0;
}
virtual QPaintEngine* paintEngine() const
{
return 0;
}
- QImage dumpView(QRect theRect = QRect(), bool toUpdate = true);
+ QImage dumpView(
unsigned char*& theData,
QRect theRect = QRect(), bool toUpdate = true);
Handle(V3d_View) getView() const
{
Handle(V3d_View) getView() const
{
@@
-40,7
+42,7
@@
public:
void fitRect(const QRect& rect);
void startZoomAtPoint(int x, int y);
void zoom(int x0, int y0, int x, int y);
void fitRect(const QRect& rect);
void startZoomAtPoint(int x, int y);
void zoom(int x0, int y0, int x, int y);
-
void fitAll(bool theKeepScale = false, bool theWithZ = true, bool theUpd = true);
+ void fitAll(bool theKeepScale = false, bool theWithZ = true, bool theUpd = true);
void setAdvancedZoomingEnabled(const bool theState)
{
void setAdvancedZoomingEnabled(const bool theState)
{
@@
-51,27
+53,28
@@
public:
return myIsAdvancedZoomingEnabled;
}
return myIsAdvancedZoomingEnabled;
}
-
XGUI_ViewBackground
background() const
+
Qtx::BackgroundData
background() const
{
return myBackground;
}
{
return myBackground;
}
- void setBackground(const
XGUI_ViewBackground
& bgData);
+ void setBackground(const
Qtx::BackgroundData
& bgData);
- void syncronizeWith(
const XGUI_ViewPort* ref
);
+ void syncronizeWith(
const XGUI_ViewPort* ref
);
signals:
signals:
- void vpChangeBackground(const
XGUI_ViewBackground
&);
+ void vpChangeBackground(const
Qtx::BackgroundData
&);
void vpClosed();
void vpMapped();
void vpTransformed();
void vpUpdated();
void vpClosed();
void vpMapped();
void vpTransformed();
void vpUpdated();
+ void resized();
-protected:
+
protected:
virtual void paintEvent(QPaintEvent*);
virtual void resizeEvent(QResizeEvent*);
virtual void paintEvent(QPaintEvent*);
virtual void resizeEvent(QResizeEvent*);
-private:
+
private:
Handle(V3d_View) activeView() const
{
return myActiveView;
Handle(V3d_View) activeView() const
{
return myActiveView;
@@
-92,7
+95,7
@@
private:
double myScale;
double myScale;
-
XGUI_ViewBackground
myBackground;
+
Qtx::BackgroundData
myBackground;
int myBgImgHeight;
int myBgImgWidth;
};
int myBgImgHeight;
int myBgImgWidth;
};