haskal
/
kicad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

PROGRESS_REPORTER: code formatting

This commit is contained in:
Maciej Suminski 2018-02-09 14:20:11 +01:00
parent bc7ca08f07
commit c39fd46c07
2 changed files with 23 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
common/widgets/progress_reporter.cpp
View File

@ -32,7 +32,8 @@ PROGRESS_REPORTER::PROGRESS_REPORTER( int aNumPhases ) :
m_progress( 0 ), m_progress( 0 ),
m_maxProgress( 1 ) m_maxProgress( 1 )
{ {
}; }
void PROGRESS_REPORTER::BeginPhase( int aPhase ) void PROGRESS_REPORTER::BeginPhase( int aPhase )
{ {
@ -41,6 +42,7 @@ void PROGRESS_REPORTER::BeginPhase( int aPhase )
updateUI(); updateUI();
} }
void PROGRESS_REPORTER::AdvancePhase( ) void PROGRESS_REPORTER::AdvancePhase( )
{ {
m_phase++; m_phase++;
@ -48,31 +50,36 @@ void PROGRESS_REPORTER::AdvancePhase( )
updateUI(); updateUI();
} }
void PROGRESS_REPORTER::Report( const wxString& aMessage ) void PROGRESS_REPORTER::Report( const wxString& aMessage )
{ {
m_rptMessage = aMessage; m_rptMessage = aMessage;
updateUI(); updateUI();
} }
void PROGRESS_REPORTER::SetMaxProgress ( int aMaxProgress )
void PROGRESS_REPORTER::SetMaxProgress( int aMaxProgress )
{ {
m_maxProgress = aMaxProgress; m_maxProgress = aMaxProgress;
updateUI(); updateUI();
} }
void PROGRESS_REPORTER::AdvanceProgress( )
void PROGRESS_REPORTER::AdvanceProgress()
{ {
m_progress++; m_progress++;
} }
int PROGRESS_REPORTER::currentProgress() const int PROGRESS_REPORTER::currentProgress() const
{ {
double current = ( 1.0 / (double)m_numPhases ) * double current = ( 1.0 / (double) m_numPhases ) *
( (double) m_phase + ( (double) m_progress.load() / (double) m_maxProgress ) ); ( (double) m_phase + ( (double) m_progress.load() / (double) m_maxProgress ) );
return (int)(current * 1000); return (int)( current * 1000 );
} }
// Please, *DO NOT* use wxPD_APP_MODAL style: it is not necessary // Please, *DO NOT* use wxPD_APP_MODAL style: it is not necessary
// (without this option the PROGRESS_REPORTER is modal for the parent frame) // (without this option the PROGRESS_REPORTER is modal for the parent frame)
// and PROGRESS_REPORTER works fine on OSX only without this style // and PROGRESS_REPORTER works fine on OSX only without this style
@ -103,14 +110,16 @@ void WX_PROGRESS_REPORTER::updateUI()
wxProgressDialog::Update( cur, m_rptMessage ); wxProgressDialog::Update( cur, m_rptMessage );
} }
void PROGRESS_REPORTER::KeepRefreshing( bool aWait ) void PROGRESS_REPORTER::KeepRefreshing( bool aWait )
{ {
#ifdef USE_OPENMP #ifdef USE_OPENMP
while ( m_progress < m_maxProgress && m_maxProgress > 0) while( m_progress < m_maxProgress && m_maxProgress > 0 )
{ {
updateUI(); updateUI();
wxMilliSleep(10); wxMilliSleep( 10 );
if ( !aWait )
if( !aWait )
return; return;
} }
#else #else

10
include/widgets/progress_reporter.h
View File

@ -45,23 +45,23 @@ class PROGRESS_REPORTER
/** /**
* Uses the next vailable virtual zone of the dialog progress bar * Uses the next vailable virtual zone of the dialog progress bar
*/ */
void AdvancePhase( ); void AdvancePhase();
/** /**
* Display aMessage in the progress bar dialog * Display aMessage in the progress bar dialog
*/ */
void Report ( const wxString& aMessage ); void Report( const wxString& aMessage );
/** /**
* Fix the value thar gives the 100 precent progress bar length * Fix the value thar gives the 100 precent progress bar length
* (inside the current virtual zone) * (inside the current virtual zone)
*/ */
void SetMaxProgress ( int aMaxProgress ); void SetMaxProgress( int aMaxProgress );
/** /**
* Increment the progress bar length (inside the current virtual zone) * Increment the progress bar length (inside the current virtual zone)
*/ */
void AdvanceProgress( ); void AdvanceProgress();
/** /**
* Update the UI dialog. * Update the UI dialog.
@ -99,7 +99,7 @@ public:
* aNumPhases = n creates n virtual progress bar zones: a 0 to 100 percent width * aNumPhases = n creates n virtual progress bar zones: a 0 to 100 percent width
* of a virtual zone fills 0 to 1/n progress bar full size of the nth virtual zone index * of a virtual zone fills 0 to 1/n progress bar full size of the nth virtual zone index
*/ */
WX_PROGRESS_REPORTER( wxWindow *aParent, const wxString &aTitle, int aNumPhases ); WX_PROGRESS_REPORTER( wxWindow* aParent, const wxString& aTitle, int aNumPhases );
~WX_PROGRESS_REPORTER(); ~WX_PROGRESS_REPORTER();
private: private: