Permalink
Browse files

Menus and about dialog added.

  • Loading branch information...
ecordell committed Aug 17, 2009
1 parent c7e5a59 commit 142d71415083a9972b323948bee701be3b7714cc
View
Binary file not shown.
View
Binary file not shown.
@@ -0,0 +1,15 @@
+<?xml version='1.0' encoding='UTF-8' standalone='yes'?>
+<assembly xmlns='urn:schemas-microsoft-com:asm.v1' manifestVersion='1.0'>
+ <trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">
+ <security>
+ <requestedPrivileges>
+ <requestedExecutionLevel level='asInvoker' uiAccess='false' />
+ </requestedPrivileges>
+ </security>
+ </trustInfo>
+ <dependency>
+ <dependentAssembly>
+ <assemblyIdentity type='win32' name='Microsoft.Windows.Common-Controls' version='6.0.0.0' processorArchitecture='x86' publicKeyToken='6595b64144ccf1df' language='*' />
+ </dependentAssembly>
+ </dependency>
+</assembly>
Binary file not shown.
Binary file not shown.
View
Binary file not shown.
View
Binary file not shown.
View
@@ -0,0 +1 @@
+Manifest resource last updated at 21:04:52.97 on Sun 08/16/2009
View
Binary file not shown.
View
Binary file not shown.
View
Binary file not shown.
View
Binary file not shown.
View
@@ -28,6 +28,9 @@ DEFINE_EVENT_TYPE(wxEVT_JTHREAD)
BEGIN_EVENT_TABLE(ChaosToolsFrm,wxFrame)
EVT_COMMAND(wxID_ANY, wxEVT_MTHREAD, ChaosToolsFrm::OnMandelThread)
EVT_COMMAND(wxID_ANY, wxEVT_JTHREAD, ChaosToolsFrm::OnJuliaThread)
+ EVT_MENU(wxID_EXIT, ChaosToolsFrm::OnExit)
+ EVT_MENU(ID_OPTIONS, ChaosToolsFrm::OnOptions)
+ EVT_MENU(wxID_ABOUT, ChaosToolsFrm::OnAbout)
EVT_CLOSE(ChaosToolsFrm::OnClose)
EVT_BUTTON(ID_RESETIFSBUTTON,ChaosToolsFrm::OnIfsResetClick)
EVT_BUTTON(ID_IFSITERBUTTON,ChaosToolsFrm::OnIfsIterClick)
@@ -48,8 +51,8 @@ END_EVENT_TABLE()
const int numThreads = 1;
unsigned char* rgbMandel;
unsigned char* rgbJulia;
-std::vector<double> xCoords;
-std::vector<double> yCoords;
+wxVector<double> xCoords;
+wxVector<double> yCoords;
int lineCtr = 0;
ChaosToolsFrm::ChaosToolsFrm(wxWindow *parent, wxWindowID id, const wxString &title, const wxPoint &position, const wxSize& size, long style)
@@ -115,6 +118,17 @@ ChaosToolsFrm::~ChaosToolsFrm()
void ChaosToolsFrm::CreateGUIControls()
{
+ menuBar = new wxMenuBar();
+ fileMenu = new wxMenu();
+ fileMenu->Append(wxID_EXIT, wxT("E&xit"), wxT("Exits ChaosTools"));
+ toolsMenu = new wxMenu();
+ toolsMenu->Append(ID_OPTIONS, wxT("&Options"), wxT("Select Options for ChaosTools"));
+ helpMenu = new wxMenu();
+ helpMenu->Append(wxID_ABOUT, wxT("&About"), wxT("About ChaosTools"));
+ menuBar->Append(fileMenu, wxT("&File"));
+ menuBar->Append(toolsMenu, wxT("&Tools"));
+ menuBar->Append(helpMenu, wxT("&Help"));
+ SetMenuBar(menuBar);
mainSizer = new wxBoxSizer(wxHORIZONTAL);
this->SetSizer(mainSizer);
this->SetAutoLayout(true);
@@ -496,7 +510,24 @@ void ChaosToolsFrm::OnClose(wxCloseEvent& event)
{
Destroy();
}
+void ChaosToolsFrm::OnExit(wxCommandEvent& event)
+{
+ Destroy();
+}
+void ChaosToolsFrm::OnAbout(wxCommandEvent& event)
+{
+ wxAboutDialogInfo info;
+ info.AddDeveloper(wxT("Evan Cordell"));
+ info.SetCopyright(wxT("(c) 2009 Evan Cordell <cordell.evan@gmail.com>"));
+ info.SetDescription(wxT("ChaosTools is a compilation of several methods for investigating mathematical chaos and related topics. It was written in completion of requirements for Evan Cordell's LSMSA Distinction project."));
+ info.SetName(wxT("ChaosTools"));
+ info.SetVersion(wxT("1.0.0"));
+ wxAboutBox(info);
+}
+void ChaosToolsFrm::OnOptions(wxCommandEvent& event)
+{
+}
void ChaosToolsFrm::mainBookPageChanged(wxNotebookEvent& event)
{
/*
View
@@ -48,8 +48,8 @@
#include <wx/dcbuffer.h>
#include <wx/graphics.h>
#include <wx/utils.h>
+#include <wx/aboutdlg.h>
#include <cstdlib>
-#include <vector>
//Image includes
#include "Images/cos.xpm"
@@ -103,6 +103,10 @@ class ChaosToolsFrm : public wxFrame
private:
+ wxMenuBar *menuBar;
+ wxMenu *fileMenu;
+ wxMenu *helpMenu;
+ wxMenu *toolsMenu;
wxTextCtrl *ymaxIterText;
wxStaticText *ymaxIterLabel;
wxTextCtrl *yminIterText;
@@ -204,82 +208,89 @@ class ChaosToolsFrm : public wxFrame
private:
enum
{
- ID_YMAXITERTEXT = 1126,
- ID_YMAXITERLABEL = 1125,
- ID_YMINITERTEXT = 1124,
- ID_YMINITERLABEL = 1123,
- ID_XMAXITERTEXT = 1122,
- ID_XMAXITERLABEL = 1121,
- ID_XMINITERTEXT = 1120,
- ID_XMINITERLABEL = 1119,
- ID_STATUSBAR = 1035,
- ID_RESETIFSBUTTON = 1091,
- ID_TXTIFSTHETA = 1089,
- ID_ROTTEXT = 1088,
- ID_IFSCFTEXT = 1086,
- ID_IFSCFLABEL = 1085,
- ID_TXTIFSMAXITER = 1080,
- ID_IFSITERLABEL = 1082,
- ID_IFSITERBUTTON = 1079,
- ID_PLOTIFSAREA = 1087,
- ID_IFSPAGE = 1075,
- ID_MANDELORBITAREA = 1056,
- ID_MANDELJULIAAREA = 1053,
- ID_RESETMANDELBUTTON = 1051,
- ID_TXTMANDELMAXITER = 1050,
- ID_MANDELITERLABEL = 1054,
- ID_PLOTMANDELBUTTON = 1049,
- ID_PLOTMANDELAREA = 1045,
- ID_MANDELPAGE = 1006,
- ID_JULIAORBITAREA = 1074,
- ID_JULIARESETBUTTON = 1071,
- ID_JULIAIMAGTEXT = 1068,
- ID_JULIAIMAGLABEL = 1067,
- ID_JULIAREALTEXT = 1066,
- ID_JULIAREALLABEL = 1065,
- ID_JULIAPARAMLABEL = 1070,
- ID_TXTJULIAMAXITER = 1069,
- ID_JULIAITERLABEL = 1063,
- ID_PLOTJULIABUTTON = 1062,
- ID_PLOTJULIAAREA = 1058,
- ID_JULIAPAGE = 1005,
- ID_CALCBIFBUTTON = 1033,
- ID_XMAXBIFTEXT = 1030,
- ID_XMAXBIFLABEL = 1029,
- ID_XMINBIFTEXT = 1028,
- ID_XMINBIFLABEL = 1027,
- ID_RMINBIFTEXT = 1023,
- ID_RMINBIFLABEL = 1022,
- ID_FUNCTIONBIFCHOICE = 1014,
- ID_PLOTBIFAREA = 1010,
- ID_BIFPAGE = 1004,
- ID_RESETBIFBUTTON = 1034,
- ID_CALCITERBUTTON = 1104,
- ID_ITERSEEDTEXT = 1101,
- ID_ITERSEEDLABEL = 1100,
- ID_RMAXBIFTEXT = 1026,
- ID_RMAXBIFLABEL = 1024,
- ID_ITERBIFTEXT = 1021,
- ID_ITERBIFLABEL = 1020,
- ID_FUNCTIONBIFBITMAP = 1015,
- ID_FUNCTIONITERCHOICE = 1103,
- ID_BIFFUNCTIONLABEL = 1013,
- ID_PLOTITERAREA = 1106,
- ID_WXNOTEBOOKPAGE4 = 1097,
- ID_PLOTCHARTAREA = 1105,
- ID_WXNOTEBOOKPAGE3 = 1096,
- ID_PLOTHISTAREA = 1102,
- ID_WXNOTEBOOKPAGE2 = 1095,
- ID_ITERGRID = 1099,
- ID_WXNOTEBOOKPAGE1 = 1094,
- ID_ITERBOOK = 1093,
- ID_ITERPAGE = 1002,
- ID_MAINBOOK = 1008,
+ ID_YMAXITERTEXT = wxID_HIGHEST,
+ ID_YMAXITERLABEL,
+ ID_YMINITERTEXT,
+ ID_YMINITERLABEL,
+ ID_XMAXITERTEXT,
+ ID_XMAXITERLABEL,
+ ID_XMINITERTEXT,
+ ID_XMINITERLABEL,
+ ID_STATUSBAR,
+ ID_RESETIFSBUTTON,
+ ID_TXTIFSTHETA,
+ ID_ROTTEXT,
+ ID_IFSCFTEXT,
+ ID_IFSCFLABEL,
+ ID_TXTIFSMAXITER,
+ ID_IFSITERLABEL,
+ ID_IFSITERBUTTON,
+ ID_PLOTIFSAREA,
+ ID_IFSPAGE,
+ ID_MANDELORBITAREA,
+ ID_MANDELJULIAAREA,
+ ID_RESETMANDELBUTTON,
+ ID_TXTMANDELMAXITER,
+ ID_MANDELITERLABEL,
+ ID_PLOTMANDELBUTTON,
+ ID_PLOTMANDELAREA,
+ ID_MANDELPAGE,
+ ID_JULIAORBITAREA,
+ ID_JULIARESETBUTTON,
+ ID_JULIAIMAGTEXT,
+ ID_JULIAIMAGLABEL,
+ ID_JULIAREALTEXT,
+ ID_JULIAREALLABEL,
+ ID_JULIAPARAMLABEL,
+ ID_TXTJULIAMAXITER,
+ ID_JULIAITERLABEL,
+ ID_PLOTJULIABUTTON,
+ ID_PLOTJULIAAREA,
+ ID_JULIAPAGE,
+ ID_CALCBIFBUTTON,
+ ID_XMAXBIFTEXT,
+ ID_XMAXBIFLABEL,
+ ID_XMINBIFTEXT,
+ ID_XMINBIFLABEL,
+ ID_RMINBIFTEXT,
+ ID_RMINBIFLABEL,
+ ID_FUNCTIONBIFCHOICE,
+ ID_PLOTBIFAREA,
+ ID_BIFPAGE,
+ ID_RESETBIFBUTTON,
+ ID_CALCITERBUTTON,
+ ID_ITERSEEDTEXT,
+ ID_ITERSEEDLABEL,
+ ID_RMAXBIFTEXT,
+ ID_RMAXBIFLABEL,
+ ID_ITERBIFTEXT,
+ ID_ITERBIFLABEL,
+ ID_FUNCTIONBIFBITMAP,
+ ID_FUNCTIONITERCHOICE,
+ ID_BIFFUNCTIONLABEL,
+ ID_PLOTITERAREA,
+ ID_WXNOTEBOOKPAGE4,
+ ID_PLOTCHARTAREA,
+ ID_WXNOTEBOOKPAGE3,
+ ID_PLOTHISTAREA,
+ ID_WXNOTEBOOKPAGE2,
+ ID_ITERGRID,
+ ID_WXNOTEBOOKPAGE1,
+ ID_ITERBOOK,
+ ID_ITERPAGE,
+ ID_MAINBOOK,
+ ID_OPTIONS,
};
private:
//! Called when the wxWindow is closed.
void OnClose(wxCloseEvent& event);
+ //! Called when the wxWindow is closed from the menu.
+ void OnExit(wxCommandEvent& event);
+ //! Called when the about menu item is selected. Displays the about window.
+ void OnAbout(wxCommandEvent& event);
+ //! Called when the options menu item is selected. Displays the options window.
+ void OnOptions(wxCommandEvent& event);
//! Called by the constructor. Constructs every GUI element and sets initial properties.
void CreateGUIControls();

0 comments on commit 142d714

Please sign in to comment.