Skip to content
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

Fixes for project loading progress display #3672

Merged
merged 6 commits into from
Jul 6, 2017
Merged

Fixes for project loading progress display #3672

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
f76cb6f
Fix project loading progress backjump
PhysSong Jun 28, 2017
aee0f2b
Show the name of currently being loaded track.
PhysSong Jun 28, 2017
cf90bb7
Fix crash and coding conventions
PhysSong Jul 3, 2017
c1d24df
Remove unused variable start_val
PhysSong Jul 3, 2017
135f65c
Fix code conventions
PhysSong Jul 3, 2017
097feb0
Update Song.cpp
PhysSong Jul 3, 2017
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
5 changes: 5 additions & 0 deletions include/Song.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,10 @@ class EXPORT Song : public TrackContainer

void processNextBuffer();

inline int getLoadingTrackCount() const
{
return m_nLoadingTrack;
}
inline int getMilliseconds() const
{
return m_elapsedMilliSeconds;
Expand Down Expand Up @@ -339,6 +343,7 @@ private slots:

ControllerVector m_controllers;

int m_nLoadingTrack;

QString m_fileName;
QString m_oldFileName;
Expand Down
17 changes: 17 additions & 0 deletions src/core/Song.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1054,6 +1054,23 @@ void Song::loadProject( const QString & fileName )
}

node = dataFile.content().firstChild();

QDomNodeList tclist=dataFile.content().elementsByTagName("trackcontainer");
m_nLoadingTrack=0;
for( int i=0,n=tclist.count(); i<n; ++i ){
QDomNode nd=tclist.at(i).firstChild();
while(!nd.isNull()){
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think the general idea is to put the braces on the same column/tab although I'm not 100% sure about the convention around this.


( .. )
{
  this
}


( .. ){
  not this
}

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Here also {

if( nd.isElement() && nd.nodeName() == "track" )
{
++m_nLoadingTrack;
if( nd.toElement().attribute("type").toInt() == Track::BBTrack ){
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

And here {

n += nd.toElement().elementsByTagName("bbtrack").at(0).toElement().firstChildElement().childNodes().count();
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

A bit too long line here.

}
nd=nd.nextSibling();
}
}
}

while( !node.isNull() )
{
if( node.isElement() )
Expand Down
7 changes: 4 additions & 3 deletions src/core/TrackContainer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ void TrackContainer::loadSettings( const QDomElement & _this )
{
pd = new QProgressDialog( tr( "Loading project..." ),
tr( "Cancel" ), 0,
_this.childNodes().count(),
Engine::getSong()->getLoadingTrackCount(),
gui->mainWindow() );
pd->setWindowModality( Qt::ApplicationModal );
pd->setWindowTitle( tr( "Please wait..." ) );
Expand All @@ -102,8 +102,6 @@ void TrackContainer::loadSettings( const QDomElement & _this )
else
{
start_val = pd->value();
pd->setMaximum( pd->maximum() +
_this.childNodes().count() );
}
}

Expand All @@ -124,6 +122,9 @@ void TrackContainer::loadSettings( const QDomElement & _this )
if( node.isElement() &&
!node.toElement().attribute( "metadata" ).toInt() )
{
QString trackName = node.toElement().hasAttribute( "name" ) ? node.toElement().attribute( "name" ) :
node.firstChild().toElement().attribute( "name" );
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

125 and 126 too long lines. The coding conventions suggestion for ternary operators is something like this:

QString trackName = node.toElement().hasAttribute( "name" )
            ? node.toElement().attribute( "name" )
            : node.firstChild().toElement().attribute( "name" );

pd->setLabelText( tr("Loading Track %1 (%2/Total %3)").arg( trackName ).arg( pd->value() ).arg( Engine::getSong()->getLoadingTrackCount() ) );
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It crashes here on command line render. If you wrap it in an if, something like this:

if( gui )
{
   pd->setLabelText( tr("Loading Track %1 (%2/Total %3)").arg(
   	trackName ).arg( pd->value() ).arg(
   	Engine::getSong()->getLoadingTrackCount() ) )
}

that should fix it.

Also. The line is much too long and wraps badly. Please try and use more lines.

Track::create( node.toElement(), this );
}
node = node.nextSibling();
Expand Down