Skip to content
This repository has been archived by the owner on May 23, 2023. It is now read-only.

Commit

Permalink
fix the h5j reader
Browse files Browse the repository at this point in the history
  • Loading branch information
takashi310 committed Apr 13, 2022
1 parent a31fa6e commit 1991cef
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 1 deletion.
14 changes: 14 additions & 0 deletions fluorender/FluoRender/DataManager.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -9396,8 +9396,15 @@ wxThread::ExitCode ProjectDataLoaderThread::Entry()
br->SetBDVMetadataPath(metadata.ToStdWstring().c_str());
}
}

if (type == LOAD_TYPE_H5J)
m_pdl->ms_pThreadCS->Enter();

reader->Preprocess();

if (type == LOAD_TYPE_H5J)
m_pdl->ms_pThreadCS->Leave();

if (type == LOAD_TYPE_BRKXML && !((BRKXMLReader *)reader)->GetExMetadataURL().empty())
{
wxString metadatapath = ((BRKXMLReader *)reader)->GetExMetadataURL();
Expand All @@ -9423,8 +9430,15 @@ wxThread::ExitCode ProjectDataLoaderThread::Entry()
{
VolumeData *vd = new VolumeData();
vd->SetSkipBrick(skip_brick);

if (type == LOAD_TYPE_H5J)
m_pdl->ms_pThreadCS->Enter();

auto data = reader->Convert(t_num>=0?t_num:reader->GetCurTime(), i, true);

if (type == LOAD_TYPE_H5J)
m_pdl->ms_pThreadCS->Leave();

/*
if (datasize > 0)
{
Expand Down
5 changes: 4 additions & 1 deletion fluorender/FluoRender/MPropView.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -244,6 +244,7 @@ m_sync(false)
sizer_7->Add(m_scale_text, 0, wxALIGN_CENTER, 0);

//size limiter

wxBoxSizer* sizer_8 = new wxBoxSizer(wxHORIZONTAL);
m_size_chk = new wxCheckBox(this, ID_size_chk, " Size limit: ",
wxDefaultPosition, wxSize(100, 20));
Expand All @@ -255,7 +256,7 @@ m_sync(false)
sizer_8->Add(m_size_chk, 0, wxALIGN_CENTER);
sizer_8->Add(m_size_sldr, 0, wxALIGN_CENTER);
sizer_8->Add(m_size_text, 0, wxALIGN_CENTER);

wxBoxSizer* sizer_9 = new wxBoxSizer(wxHORIZONTAL);
m_r_st = new wxStaticText(this, 0, " Radius Scale: ",
wxDefaultPosition, wxSize(100, 20));
Expand All @@ -280,6 +281,8 @@ m_sync(false)
sizer_v2->Add(sizer_8, 0, wxALIGN_LEFT);
sizer_v2->Add(sizer_9, 0, wxALIGN_LEFT);
sizer_v2->Add(sizer_10, 0, wxALIGN_RIGHT);

sizer_v2->Hide(sizer_8);

wxBoxSizer* sizer_all = new wxBoxSizer(wxHORIZONTAL);
sizer_all->Add(sizer_v1, 0, wxALIGN_TOP);
Expand Down

0 comments on commit 1991cef

Please sign in to comment.