github-starred/ultimatepp
2
0
Fork 0
mirror of https://github.com/ultimatepp/ultimatepp.git synced 2026-07-11 22:03:01 -06:00
Code Issues 33 Projects Packages Wiki Activity Actions

Bazaar/Oce2Upp : added functions to generated OCE package

Browse source 
git-svn-id: svn://ultimatepp.org/upp/trunk@6859 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
micio 2014-02-03 21:25:26 +00:00
parent c25887d2ce
commit c29769a70e
3 changed files with 19 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

11
bazaar/Oce2Upp/OCECtrl_CPP
View file

@ -53,7 +53,7 @@ void OCECtrl::SetDocument(OCEDoc *doc)
HWND windowHandle = GetHWND();
// Creates the view object
view = document->GetViewer()->CreateView();
view = new NIS_View(document->GetViewer());
// Creates the OpenCascade window handle
Aspect_Handle aWindowHandle = (Aspect_Handle)windowHandle;
@ -72,7 +72,7 @@ void OCECtrl::SetDocument(OCEDoc *doc)
Window WindowHandle = GetWindow();
// Creates the view object
view = document->GetViewer()->CreateView();
view = new NIS_View(document->GetViewer());
Aspect_Handle aWindowHandle = (Aspect_Handle)WindowHandle;
Handle(Xw_Window) hWnd = new Xw_Window (document->GetGraphicDriver()->GetDisplayConnection(), aWindowHandle);
@ -201,7 +201,12 @@ void OCECtrl::InitView(void)
view->SetTransparency();
// Signals resize needed
// view->SetPlaneOff();
view->SetDepth(10000);
view->SetSurfaceDetail(V3d_TEX_ALL);
// Signals resize needed
view->MustBeResized();
} // END OCECtrl::InitView()

9
bazaar/Oce2Upp/OCECtrl_H
View file

@ -11,10 +11,8 @@ class OCECtrl : public DHCtrl
bool opened;
protected:
// The view object
Handle(V3d_View) view;
Handle(NIS_View) view;
#ifdef PLATFORM_WIN32
// state handler, to catch init and terminate
@ -46,9 +44,14 @@ class OCECtrl : public DHCtrl
// Paint function with context
virtual void Paint(Draw &draw) ;
protected:
// get document
OCEDoc *GetDocument(void) const { return document; }
// get the view handle
Handle(NIS_View) GetViewHandle(void) const { return view; }
////////////////////////////////////////////////////////////////////////////////////////////
public:

5
bazaar/Oce2Upp/OCE_H
View file

@ -2,6 +2,8 @@
#define _OCE_H
#include <GLCtrl/GLCtrl.h>
#undef Convex
#undef HAVE_CONFIG_H
#ifdef PLATFORM_POSIX
#define OCE_HAVE_FSTREAM
@ -11,7 +13,9 @@
#define OCE_HAVE_LIMITS_H
#define HAVE_SYS_STAT_H
#define HAVE_STRING_H
#ifndef HAVE_UNISTD_H
#define HAVE_UNISTD_H
#endif
#define HAVE_SIGNAL_H
#define HAVE_SYS_SEM_H
#define HAVE_STATFS\
@ -64,6 +68,7 @@
#include <OpenGl_GraphicDriver.hxx>
#include <Graphic3d_GraphicDriver.hxx>
#include <V3d_View.hxx>
#include <NIS_View.hxx>
#include <V3d_Viewer.hxx>
#include <AIS_InteractiveContext.hxx>