kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ENH: allow cancel and display of progress during cpu intensive configure steps

This commit is contained in:
Bill Hoffman 2003-07-08 13:12:10 -04:00
parent 6566ba20ac
commit b274069b93
2 changed files with 75 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
Source/MFCDialog/CMakeSetupDialog.cpp
View File

@ -117,13 +117,41 @@ void updateProgress(const char *msg, float prog, void *cd)
sprintf(tmp,"%s",msg);
}
CMakeSetupDialog *self = (CMakeSetupDialog *)cd;
self->SetDlgItemText(IDC_PROGRESS, tmp);
self->SetDlgItemText(IDC_PROGRESS, tmp);
CWnd* cancel = self->GetDlgItem(IDCANCEL);
//
// Retrieve and dispatch any waiting messages.
//
MSG wmsg;
while (::PeekMessage (&wmsg, NULL, 0, 0, PM_REMOVE))
{
switch(wmsg.message)
{
case WM_LBUTTONDOWN:
case WM_LBUTTONUP:
case WM_LBUTTONDBLCLK:
{
if(wmsg.hwnd == cancel->m_hWnd)
{
::DispatchMessage(&wmsg);
}
}
break;
case WM_COMMAND:
case WM_SETCURSOR:
case WM_PAINT:
::DispatchMessage(&wmsg);
break;
}
}
}
CMakeSetupDialog::CMakeSetupDialog(const CMakeCommandLineInfo& cmdInfo,
CWnd* pParent /*=NULL*/)
: CDialog(CMakeSetupDialog::IDD, pParent)
{
{
m_Cursor = LoadCursor(NULL, IDC_ARROW);
m_RunningConfigure = false;
cmSystemTools::SetRunCommandHideConsole(true);
cmSystemTools::SetErrorCallback(MFCMessageCallback);
m_RegistryKey = "Software\\Kitware\\CMakeSetup\\Settings\\StartPath";
@ -208,7 +236,6 @@ BEGIN_MESSAGE_MAP(CMakeSetupDialog, CDialog)
ON_WM_SYSCOMMAND()
ON_WM_PAINT()
ON_WM_QUERYDRAGICON()
ON_WM_DROPFILES()
ON_BN_CLICKED(IDC_BUTTON2, OnBrowseWhereSource)
ON_BN_CLICKED(IDC_BuildProjects, OnConfigure)
ON_BN_CLICKED(IDC_BUTTON3, OnBrowseWhereBuild)
@ -221,10 +248,12 @@ BEGIN_MESSAGE_MAP(CMakeSetupDialog, CDialog)
ON_BN_CLICKED(IDC_OK, OnOk)
ON_CBN_EDITCHANGE(IDC_Generator, OnEditchangeGenerator)
ON_BN_CLICKED(IDC_HELP_BUTTON, OnHelpButton)
ON_BN_CLICKED(IDCANCEL, OnCancel)
ON_BN_CLICKED(IDC_AdvancedValues, OnAdvancedValues)
ON_BN_DOUBLECLICKED(IDC_AdvancedValues, OnDoubleclickedAdvancedValues)
//}}AFX_MSG_MAP
ON_WM_DROPFILES()
ON_BN_CLICKED(IDCANCEL, OnCancel)
ON_WM_SETCURSOR()
//}}AFX_MSG_MAP
END_MESSAGE_MAP()
/////////////////////////////////////////////////////////////////////////////
@ -606,8 +635,10 @@ void CMakeSetupDialog::RunCMake(bool generateProjectFiles)
}
}
// set the wait cursor
::SetCursor(LoadCursor(NULL, IDC_WAIT));
m_Cursor = LoadCursor(NULL, IDC_WAIT);
::SetCursor(m_Cursor);
m_RunningConfigure = true;
// get all the info from the dialog
this->UpdateData();
// always save the current gui values to disk
@ -649,8 +680,10 @@ void CMakeSetupDialog::RunCMake(bool generateProjectFiles)
this->SaveToRegistry();
// path is up-to-date now
m_BuildPathChanged = false;
// put the cursor back
::SetCursor(LoadCursor(NULL, IDC_ARROW));
// put the cursor back
m_Cursor = LoadCursor(NULL, IDC_ARROW);
::SetCursor(m_Cursor);
m_RunningConfigure = false;
cmSystemTools::ResetErrorOccuredFlag();
}
@ -1054,6 +1087,17 @@ void CMakeSetupDialog::OnGetMinMaxInfo( MINMAXINFO FAR* lpMMI )
void CMakeSetupDialog::OnCancel()
{
if(m_RunningConfigure)
{
if(MessageBox("You are in the middle of a Configure.\n"
"If you Cancel now the configure information will be lost.\n"
"Are you sure you want to Cancel?", "Confirm Exit",
MB_YESNO) == IDYES)
{
cmSystemTools::SetFatalErrorOccured();
}
return;
}
if(m_CacheEntriesList.IsDirty())
{
if(MessageBox("You have changed options but not rebuilt, "
@ -1395,3 +1439,9 @@ void CMakeSetupDialog::OnDropFiles(HDROP hDropInfo)
DragFinish(hDropInfo);
}
BOOL CMakeSetupDialog::OnSetCursor(CWnd* pWnd, UINT nHitTest, UINT message)
{
::SetCursor(m_Cursor);
return true;
}

29
Source/MFCDialog/CMakeSetupDialog.h
View File

@ -1,17 +1,17 @@
/*=========================================================================
Program: CMake - Cross-Platform Makefile Generator
Module: $RCSfile$
Language: C++
Date: $Date$
Version: $Revision$
Program: CMake - Cross-Platform Makefile Generator
Module: $RCSfile$
Language: C++
Date: $Date$
Version: $Revision$
Copyright (c) 2002 Kitware, Inc., Insight Consortium. All rights reserved.
See Copyright.txt or http://www.cmake.org/HTML/Copyright.html for details.
Copyright (c) 2002 Kitware, Inc., Insight Consortium. All rights reserved.
See Copyright.txt or http://www.cmake.org/HTML/Copyright.html for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
PURPOSE. See the above copyright notices for more information.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
// CMakeSetupDialogDlg.h : header file
@ -59,7 +59,7 @@ protected:
void RemoveAdvancedValues();
// Dialog Data
//{{AFX_DATA(CMakeSetupDialog)
enum { IDD = IDD_CMakeSetupDialog_DIALOG };
enum { IDD = IDD_CMakeSetupDialog_DIALOG };
CButton m_AdvancedValuesControl;
CStatic m_BuildForLabel;
CButton m_BrowseSource;
@ -80,7 +80,7 @@ protected:
CButton m_Configure;
CString m_GeneratorChoiceString;
BOOL m_AdvancedValues;
//}}AFX_DATA
//}}AFX_DATA
// ClassWizard generated virtual function overrides
//{{AFX_VIRTUAL(CMakeSetupDialog)
@ -125,13 +125,16 @@ protected:
afx_msg void OnAdvancedValues();
afx_msg void OnDoubleclickedAdvancedValues();
afx_msg void OnDropFiles(HDROP);
afx_msg BOOL OnSetCursor(CWnd* pWnd, UINT nHitTest, UINT message);
//}}AFX_MSG
DECLARE_MESSAGE_MAP()
int m_oldCX;
int m_oldCX;
int m_oldCY;
float m_deltaXRemainder;
cmake *m_CMakeInstance;
HCURSOR m_Cursor;
bool m_RunningConfigure;
};
//{{AFX_INSERT_LOCATION}}