projects
/
ctsim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
r538: no message
[ctsim.git]
/
src
/
ctsim.h
diff --git
a/src/ctsim.h
b/src/ctsim.h
index e33c05cd2f914f3661b9a1a74c5cff21a6c0c9f9..eb497b0b655c02a39a7b34d3bb9c613843c8f9de 100644
(file)
--- a/
src/ctsim.h
+++ b/
src/ctsim.h
@@
-9,7
+9,7
@@
** This is part of the CTSim program
** Copyright (c) 1983-2001 Kevin Rosenberg
**
** This is part of the CTSim program
** Copyright (c) 1983-2001 Kevin Rosenberg
**
-** $Id: ctsim.h,v 1.4
0 2001/02/02 00:46:38
kevin Exp $
+** $Id: ctsim.h,v 1.4
5 2001/02/11 22:23:03
kevin Exp $
**
** This program is free software; you can redistribute it and/or modify
** it under the terms of the GNU General Public License (version 2) as
**
** This program is free software; you can redistribute it and/or modify
** it under the terms of the GNU General Public License (version 2) as
@@
-39,6
+39,9
@@
#include "wx/wx.h"
#endif
#include "wx/config.h"
#include "wx/wx.h"
#endif
#include "wx/config.h"
+#ifdef __WXMSW__
+#include "wx/msw/helpchm.h"
+#endif
#ifdef MSVC
#define CTSIM_MDI 1
#ifdef MSVC
#define CTSIM_MDI 1
@@
-72,7
+75,7
@@
class Graph3dFileDocument;
#include "dlgezplot.h"
#include "dlgezplot.h"
-#if defined(__WXMSW__)
+#if defined(__WXMSW__)
|| defined (MSVC)
#define CTSIM_WINHELP 1
#endif
#define CTSIM_WINHELP 1
#endif
@@
-108,7
+111,7
@@
private:
bool m_bShuttingDown;
#if CTSIM_WINHELP
bool m_bShuttingDown;
#if CTSIM_WINHELP
- wx
Win
HelpController m_winHelp;
+ wx
CHM
HelpController m_winHelp;
#endif
wxHtmlHelpController m_htmlHelp;
#endif
wxHtmlHelpController m_htmlHelp;
@@
-122,7
+125,7
@@
public:
void OnSize (wxSizeEvent& event);
#if CTSIM_WINHELP
void OnSize (wxSizeEvent& event);
#if CTSIM_WINHELP
- wx
Win
HelpController& getWinHelpController()
+ wx
CHM
HelpController& getWinHelpController()
{return m_winHelp; }
#endif
wxHtmlHelpController& getHtmlHelpController()
{return m_winHelp; }
#endif
wxHtmlHelpController& getHtmlHelpController()
@@
-134,6
+137,7
@@
public:
void OnHelpTopics (wxCommandEvent& event);
void OnHelpContents (wxCommandEvent& event);
void OnCreatePhantom (wxCommandEvent& event);
void OnHelpTopics (wxCommandEvent& event);
void OnHelpContents (wxCommandEvent& event);
void OnCreatePhantom (wxCommandEvent& event);
+ void OnPreferences (wxCommandEvent& event);
#if defined(CTSIM_WINHELP) && (defined(DEBUG) || defined(_DEBUG))
void OnHelpSecondary (wxCommandEvent& event);
#if defined(CTSIM_WINHELP) && (defined(DEBUG) || defined(_DEBUG))
void OnHelpSecondary (wxCommandEvent& event);
@@
-177,7
+181,10
@@
class CTSimApp: public wxApp
private:
enum { O_HELP, O_VERSION };
static struct option ctsimOptions[];
private:
enum { O_HELP, O_VERSION };
static struct option ctsimOptions[];
-
+
+ bool m_bAdvancedOptions;
+ bool m_bSetModifyNewDocs;
+
wxDocManager* m_docManager;
MainFrame* m_pFrame;
wxConfig* m_pConfig;
wxDocManager* m_docManager;
MainFrame* m_pFrame;
wxConfig* m_pConfig;
@@
-194,7
+201,9
@@
private:
TextFileDocument* m_pLogDoc;
void usage (const char* program);
TextFileDocument* m_pLogDoc;
void usage (const char* program);
-
+ void openConfig();
+ void closeConfig();
+
public:
CTSimApp();
bool OnInit();
public:
CTSimApp();
bool OnInit();
@@
-214,10
+223,14
@@
public:
{ return new EZPlotDialog (m_pFrame); }
void getCompatibleImages (const ImageFileDocument* pIFDoc, std::vector<ImageFileDocument*>& vecIF);
{ return new EZPlotDialog (m_pFrame); }
void getCompatibleImages (const ImageFileDocument* pIFDoc, std::vector<ImageFileDocument*>& vecIF);
-
+ bool getAdvancedOptions() const { return m_bAdvancedOptions; }
+ void setAdvancedOptions (bool bAdv) { m_bAdvancedOptions = bAdv; }
+
void setIconForFrame (wxFrame* pFrame);
wxConfig* getConfig()
{ return m_pConfig; }
void setIconForFrame (wxFrame* pFrame);
wxConfig* getConfig()
{ return m_pConfig; }
+ bool getAskDeleteNewDocs() const { return m_bSetModifyNewDocs; }
+ void setAskDeleteNewDocs(bool bAsk) { m_bSetModifyNewDocs = bAsk; }
wxDocTemplate* getDocTemplImage() { return m_pDocTemplImage; }
wxDocTemplate* getDocTemplProjection() { return m_pDocTemplProjection; }
wxDocTemplate* getDocTemplImage() { return m_pDocTemplImage; }
wxDocTemplate* getDocTemplProjection() { return m_pDocTemplProjection; }
@@
-248,11
+261,14
@@
enum {
MAINMENU_HELP_ABOUT = 600,
MAINMENU_HELP_CONTENTS,
MAINMENU_HELP_TOPICS,
MAINMENU_HELP_ABOUT = 600,
MAINMENU_HELP_CONTENTS,
MAINMENU_HELP_TOPICS,
+#if defined(CTSIM_WINHELP) && (defined(DEBUG) || defined(_DEBUG))
MAINMENU_HELP_SECONDARY,
MAINMENU_HELP_SECONDARY,
+#endif
MAINMENU_FILE_CREATE_PHANTOM,
MAINMENU_FILE_CREATE_FILTER,
MAINMENU_FILE_EXIT,
MAINMENU_FILE_CREATE_PHANTOM,
MAINMENU_FILE_CREATE_FILTER,
MAINMENU_FILE_EXIT,
+ MAINMENU_FILE_PREFERENCES,
PJMENU_FILE_PROPERTIES,
PJMENU_RECONSTRUCT_FBP,
PJMENU_FILE_PROPERTIES,
PJMENU_RECONSTRUCT_FBP,
@@
-315,6
+331,9
@@
enum {
GRAPH3D_VIEW_COLOR,
GRAPH3D_VIEW_LIGHTING,
GRAPH3D_VIEW_SMOOTH,
GRAPH3D_VIEW_COLOR,
GRAPH3D_VIEW_LIGHTING,
GRAPH3D_VIEW_SMOOTH,
+ GRAPH3D_VIEW_SCALE_AUTO,
+ GRAPH3D_VIEW_SCALE_MINMAX,
+ GRAPH3D_VIEW_SCALE_FULL,
};
#endif
};
#endif