OpenCascade/occt
1
0
Fork 0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-04-05 18:16:23 +03:00
Code Packages Releases Activity

0025094: Visualization, Visual3d_View - code clean up

Browse Source 
Remove debug and obsolete code. Apply coding rules.
This commit is contained in:
kgv 2014-07-20 15:04:13 +04:00 committed by bugmaster
parent 37ac4a67fc
commit d4f1753b9c
7 changed files with 2004 additions and 2391 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/Visual3d/FILES
View File

@ -1,9 +1,6 @@
Visual3d_View.pxx
Visual3d_ViewManager.pxx
Visual3d.edl
Visual3d_CMPLRS.edl
EXTERNLIB
Visual3d_WOKSteps.edl
Visual3d_View_Print.cxx
Visual3d_NListOfLayerItem.hxx
Visual3d_MapOfZLayerSettings.hxx

26
src/Visual3d/Visual3d_View.cdl
View File

@ -1192,14 +1192,8 @@ is
fields
--
-- Classe: Visual3d_View
--
-- Purpose: Declaration of the variables specific to views.
--
-- Reminder: A view is defined by:
-- - a ViewManager
-- - a ContextView
-- the ViewManager associated with the view
myViewManager : ViewManagerPtr from Visual3d;
-- the associated C structure
MyCView : CView from Graphic3d;
@ -1211,11 +1205,12 @@ fields
MyWindow : Window from Aspect;
-- association Structure_COMPUTE and Structure_Computed
MyTOCOMPUTESequence : SequenceOfStructure from Graphic3d;
MyCOMPUTEDSequence : SequenceOfStructure from Graphic3d;
myStructsToCompute : SequenceOfStructure from Graphic3d;
myStructsComputed : SequenceOfStructure from Graphic3d;
myIsInComputedMode : Boolean from Standard;
-- the graphic driver used
MyGraphicDriver : GraphicDriver from Graphic3d;
myGraphicDriver : GraphicDriver from Graphic3d;
-- the background of the associated window
MyBackground : Background from Aspect;
@ -1224,16 +1219,9 @@ fields
MyGradientBackground : GradientBackground from Aspect;
-- the displayed structures in the view
MyDisplayedStructure : MapOfStructure from Graphic3d;
myStructsDisplayed : MapOfStructure from Graphic3d;
myImmediateStructures : MapOfStructure from Graphic3d;
-- the ViewManager associated with the view
MyPtrViewManager : ViewManagerPtr from Visual3d;
-- Booleans
MyCBitFields : CBitFields8 from Graphic3d;
MyGTrihedron : CGraduatedTrihedron from Graphic3d;
myDefaultCamera : Camera_Handle from Graphic3d;

4235
src/Visual3d/Visual3d_View.cxx
View File

File diff suppressed because it is too large Load Diff

29
src/Visual3d/Visual3d_View.pxx
View File

@ -1,29 +0,0 @@
// Copyright (c) 1995-1999 Matra Datavision
// Copyright (c) 1999-2014 OPEN CASCADE SAS
//
// This file is part of Open CASCADE Technology software library.
//
// This library is free software; you can redistribute it and/or modify it under
// the terms of the GNU Lesser General Public License version 2.1 as published
// by the Free Software Foundation, with special exception defined in the file
// OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT
// distribution for complete text of the license and disclaimer of any warranty.
//
// Alternatively, this file may be used under the terms of Open CASCADE
// commercial license or contractual agreement.
#ifndef VIEW_PXX_INCLUDED
#define VIEW_PXX_INCLUDED
// views identifiers : possible range
#define View_IDMIN 1
#define View_IDMAX 10000
#define MyViewManager ((Visual3d_ViewManager *) MyPtrViewManager)
#define MyMatOfMapIsEvaluated MyCBitFields.bool1
#define MyMatOfOriIsEvaluated MyCBitFields.bool2
#define IsInitialized MyCBitFields.bool5
#define ComputedModeIsActive MyCBitFields.bool6
#endif

15
src/Visual3d/Visual3d_ViewManager.cxx
View File

@ -56,7 +56,6 @@
// for the class
#include <Visual3d_ViewManager.ixx>
#include <Visual3d_ViewManager.pxx>
#include <Standard_ErrorHandler.hxx>
@ -76,17 +75,9 @@
# include <Xw_Window.hxx>
#endif
//-Aliases
//-Global data definitions
// -- les vues definies
// MyDefinedView : SequenceOfView;
// -- le generateur d'identificateurs de vues
// MyViewGenId : GenId;
//-Constructors
// views identifiers : possible range
#define View_IDMIN 1
#define View_IDMAX 10000
Visual3d_ViewManager::Visual3d_ViewManager (const Handle(Graphic3d_GraphicDriver)& theDriver):
Graphic3d_StructureManager (theDriver),

20
src/Visual3d/Visual3d_ViewManager.pxx
View File

@ -1,20 +0,0 @@
// Copyright (c) 1995-1999 Matra Datavision
// Copyright (c) 1999-2014 OPEN CASCADE SAS
//
// This file is part of Open CASCADE Technology software library.
//
// This library is free software; you can redistribute it and/or modify it under
// the terms of the GNU Lesser General Public License version 2.1 as published
// by the Free Software Foundation, with special exception defined in the file
// OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT
// distribution for complete text of the license and disclaimer of any warranty.
//
// Alternatively, this file may be used under the terms of Open CASCADE
// commercial license or contractual agreement.
#ifndef VIEWMANAGER_PXX_INCLUDED
#define VIEWMANAGER_PXX_INCLUDED
#include <Visual3d_View.pxx>
#endif

67
src/Visual3d/Visual3d_View_Print.cxx
View File

@ -1,67 +0,0 @@
// Created by: THA
// Copyright (c) 1999-2014 OPEN CASCADE SAS
//
// This file is part of Open CASCADE Technology software library.
//
// This library is free software; you can redistribute it and/or modify it under
// the terms of the GNU Lesser General Public License version 2.1 as published
// by the Free Software Foundation, with special exception defined in the file
// OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT
// distribution for complete text of the license and disclaimer of any warranty.
//
// Alternatively, this file may be used under the terms of Open CASCADE
// commercial license or contractual agreement.
// e-mail t-hartl@muenchen.matra-dtv.fr
/************************************************************************/
/* Includes */
/************************************************************************/
#include <Visual3d_View.jxx>
#include <Visual3d_View.pxx>
/************************************************************************/
/* Print Methods */
/************************************************************************/
Standard_Boolean Visual3d_View::Print
(const Aspect_Handle hPrintDC,
const Standard_Boolean showBackground,
const Standard_CString filename,
const Aspect_PrintAlgo printAlgorithm,
const Standard_Real theScaleFactor) const
{
return Print (MyViewManager->UnderLayer (),
MyViewManager->OverLayer (),
hPrintDC, showBackground,
filename, printAlgorithm,
theScaleFactor);
}
Standard_Boolean Visual3d_View::Print
(const Handle(Visual3d_Layer)& AnUnderLayer,
const Handle(Visual3d_Layer)& AnOverLayer,
const Aspect_Handle hPrintDC,
const Standard_Boolean showBackground,
const Standard_CString aFilename,
const Aspect_PrintAlgo printAlgorithm,
const Standard_Real theScaleFactor) const
{
if (IsDeleted ()) return Standard_False;
if ((! IsDefined ()) || (! IsActive ())) return Standard_False;
if (! MyWindow->IsMapped ()) return Standard_False;
Aspect_CLayer2d OverCLayer;
Aspect_CLayer2d UnderCLayer;
OverCLayer.ptrLayer = UnderCLayer.ptrLayer = NULL;
if (! AnOverLayer.IsNull ()) OverCLayer = AnOverLayer->CLayer ();
if (! AnUnderLayer.IsNull ()) UnderCLayer = AnUnderLayer->CLayer ();
return MyGraphicDriver->Print (MyCView, UnderCLayer, OverCLayer,
hPrintDC, showBackground, aFilename,
printAlgorithm, theScaleFactor);
}