Skip to content

Visualization - Refactor selection management and presentation handling #1272

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
dpasukhi wants to merge 1 commit into
base: IR
Choose a base branch
from
Draft

Visualization - Refactor selection management and presentation handling #1272

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions src/Visualization/TKD3DHost/D3DHost/D3DHost_GraphicDriver.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,11 +42,9 @@ occ::handle<Graphic3d_CView> D3DHost_GraphicDriver::CreateView(
{
occ::handle<D3DHost_View> aView = new D3DHost_View(theMgr, this, myCaps, &myStateCounter);
myMapOfView.Add(aView);
for (NCollection_List<occ::handle<Graphic3d_Layer>>::Iterator aLayerIter(myLayers);
aLayerIter.More();
aLayerIter.Next())
for (size_t i = 0; i < myLayers.Size(); ++i)
{
const occ::handle<Graphic3d_Layer>& aLayer = aLayerIter.Value();
const occ::handle<Graphic3d_Layer>& aLayer = myLayers.Value(i);
aView->InsertLayerAfter(aLayer->LayerId(), aLayer->LayerSettings(), Graphic3d_ZLayerId_UNKNOWN);
}
return aView;
Expand Down
14 changes: 7 additions & 7 deletions src/Visualization/TKOpenGl/OpenGl/OpenGl_FrameStats.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,16 +99,16 @@ void OpenGl_FrameStats::updateStatistics(const occ::handle<Graphic3d_CView>& the
|| (aBits & Graphic3d_RenderingParams::PerfCounters_Layers) != 0
|| toCountGroups;

myCountersTmp[Graphic3d_FrameStatsCounter_NbLayers] = aView->LayerList().Layers().Size();
myCountersTmp[Graphic3d_FrameStatsCounter_NbLayers] =
static_cast<int>(aView->LayerList().Layers().Size());
if (toCountStructs || (aBits & Graphic3d_RenderingParams::PerfCounters_Layers) != 0)
{
const int aViewId = aView->Identification();
for (NCollection_List<occ::handle<Graphic3d_Layer>>::Iterator aLayerIter(
aView->LayerList().Layers());
aLayerIter.More();
aLayerIter.Next())
const int aViewId = aView->Identification();
const NCollection_LinearVector<occ::handle<Graphic3d_Layer>>& aLayers_ =
aView->LayerList().Layers();
for (size_t aLayerIdx_ = 0; aLayerIdx_ < aLayers_.Size(); ++aLayerIdx_)
{
const occ::handle<OpenGl_Layer>& aLayer = aLayerIter.Value();
const occ::handle<OpenGl_Layer>& aLayer = aLayers_.Value(aLayerIdx_);
myCountersTmp[Graphic3d_FrameStatsCounter_NbStructs] += aLayer->NbStructures();
if (theIsImmediateOnly && !aLayer->LayerSettings().IsImmediate())
{
Expand Down
6 changes: 2 additions & 4 deletions src/Visualization/TKOpenGl/OpenGl/OpenGl_GraphicDriver.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -788,11 +788,9 @@ occ::handle<Graphic3d_CView> OpenGl_GraphicDriver::CreateView(
{
occ::handle<OpenGl_View> aView = new OpenGl_View(theMgr, this, myCaps, &myStateCounter);
myMapOfView.Add(aView);
for (NCollection_List<occ::handle<Graphic3d_Layer>>::Iterator aLayerIter(myLayers);
aLayerIter.More();
aLayerIter.Next())
for (size_t i = 0; i < myLayers.Size(); ++i)
{
const occ::handle<Graphic3d_Layer>& aLayer = aLayerIter.Value();
const occ::handle<Graphic3d_Layer>& aLayer = myLayers.Value(i);
aView->InsertLayerAfter(aLayer->LayerId(), aLayer->LayerSettings(), Graphic3d_ZLayerId_UNKNOWN);
}
return aView;
Expand Down
Loading
Loading