Skip to content

Commit

Permalink
Remove Dark (#15) and Remote Configuration tabs (#16)
Browse files Browse the repository at this point in the history
  • Loading branch information
Diana Norgaard committed Dec 6, 2017
1 parent 6b00cc3 commit dc7c314
Showing 1 changed file with 15 additions and 15 deletions.
30 changes: 15 additions & 15 deletions Configuration/ScannerConfiguration.cpp
Expand Up @@ -101,15 +101,15 @@ BOOL CScannerConfiguration::OnInitDialog()
m_pageCommunication.m_scannerTree = &m_scannerTree;

// the dark configuration
m_pageDark.Construct(IDD_CONFIGURE_DARK);
m_pageDark.m_configuration = m_configuration;
m_pageDark.m_scannerTree = &m_scannerTree;
//m_pageDark.Construct(IDD_CONFIGURE_DARK);
//m_pageDark.m_configuration = m_configuration;
//m_pageDark.m_scannerTree = &m_scannerTree;

// the remote configuration
m_pageRemote.Construct(IDD_CONFIGURATION_REMOTE);
m_pageRemote.m_configuration = m_configuration;
m_pageRemote.m_scannerTree = &m_scannerTree;
m_pageRemote.m_pPSP->dwFlags |= PSP_PREMATURE;
//m_pageRemote.Construct(IDD_CONFIGURATION_REMOTE);
//m_pageRemote.m_configuration = m_configuration;
//m_pageRemote.m_scannerTree = &m_scannerTree;
//m_pageRemote.m_pPSP->dwFlags |= PSP_PREMATURE;

// add the pages to the sheet
m_sheet.AddPage(&m_pageLocation);
Expand All @@ -118,8 +118,8 @@ BOOL CScannerConfiguration::OnInitDialog()
m_sheet.AddPage(&m_pageWind);
m_sheet.AddPage(&m_pageVII);
m_sheet.AddPage(&m_pageCommunication);
m_sheet.AddPage(&m_pageDark);
m_sheet.AddPage(&m_pageRemote);
//m_sheet.AddPage(&m_pageDark);
//m_sheet.AddPage(&m_pageRemote);

// find the position of the sheet
CRect rect, rect2;
Expand Down Expand Up @@ -251,17 +251,17 @@ void CScannerConfiguration::OnChangeScanner(){
if(change){
int active = m_sheet.GetActiveIndex();
m_sheet.RemovePage(&m_pageCommunication);
m_sheet.RemovePage(&m_pageDark);
m_sheet.RemovePage(&m_pageRemote);
//m_sheet.RemovePage(&m_pageDark);
//m_sheet.RemovePage(&m_pageRemote);
m_sheet.AddPage(&m_pageCommunication);
m_sheet.AddPage(&m_pageDark);
m_sheet.AddPage(&m_pageRemote);
//m_sheet.AddPage(&m_pageDark);
//m_sheet.AddPage(&m_pageRemote);
m_sheet.SetActivePage(active);
}

// Tell all windows that we've changed scanner
m_pageCommunication.OnChangeScanner();
m_pageDark.OnChangeScanner();
//m_pageDark.OnChangeScanner();
m_pageLocation.OnChangeScanner();
for(int k = 0; k < MAX_CHANNEL_NUM; ++k){
if(m_showEvalPage[k])
Expand All @@ -271,7 +271,7 @@ void CScannerConfiguration::OnChangeScanner(){
m_pageVII.OnChangeScanner();
if(m_showWindPage)
m_pageWind.OnChangeScanner();
m_pageRemote.OnChangeScanner();
//m_pageRemote.OnChangeScanner();
}

/** Called when the user has clicked the button 'Add Scanner' */
Expand Down

0 comments on commit dc7c314

Please sign in to comment.