diff include/rsearcher.h @ 5:e3b10fb860b3

release v1.0.
author pyon@macmini
date Mon, 22 Oct 2018 22:17:02 +0900
parents 06342fc544e4
children 9a8b581c1993
line wrap: on
line diff
--- a/include/rsearcher.h	Mon Oct 15 20:07:38 2018 +0900
+++ b/include/rsearcher.h	Mon Oct 22 22:17:02 2018 +0900
@@ -1,5 +1,5 @@
 // Filename   : rsearcher.h
-// Last Change: 2018-10-12 ‹à 16:16:26.
+// Last Change: 2018-10-22 ŒŽ 13:08:14.
 //
 
 #ifndef __RSEARCH_H__
@@ -29,7 +29,24 @@
 #include <wx/utils.h> 
 #include <wx/textfile.h>
 #include <wx/timer.h>
+#include <wx/hashmap.h>
 
+/* Data Class */
+class HhsClass {
+	public:
+		wxString no;
+		wxString birth;
+		wxString name;
+		wxString kana;
+		wxString addr;
+		wxString sex;
+
+		HhsClass( wxArrayString& buf );
+};
+
+WX_DECLARE_HASH_MAP( wxString, HhsClass*, wxStringHash, wxStringEqual, HhsHash );
+
+/* Control-Window Class */
 class MySearchCtrl : public wxSearchCtrl
 {
     DECLARE_EVENT_TABLE()
@@ -75,6 +92,7 @@
 		wxString	  m_user;
 		wxArrayString m_index;
 		wxTimer       m_timer;
+		HhsHash       hhash;
 	
 	protected:
 		MySearchCtrl*		m_searchCtrl;
@@ -100,36 +118,41 @@
 		wxDataViewColumn* 	m_dataViewListColumnDate;
 		wxTextCtrl* 		m_textCtrlLog;
 		wxSlider*           m_slider;
+		wxButton*           m_buttonPsearch;
 		wxButton*           m_buttonPrint;
+		wxButton*           m_buttonHelp;
 		wxButton*           m_buttonLogout;
-		wxButton*           m_buttonTest;
 	
 	public:
 		MainFrame( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = wxT( "Searcher Remote" ), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 500,300 ), long style = wxDEFAULT_FRAME_STYLE|wxTAB_TRAVERSAL );
 		~MainFrame();
 
 		void SetServer( wxString server ) { m_server = server; };
-		void SetUser( wxString user ) { m_user = user; };
+		void SetUser( wxString user ) { m_user = user; WriteLog( wxT( "[login] " ) + m_user ); };
 		void CreateControls( void );
+		void SetAccelerator( void );
 		void Cmd( wxString cmd );
 		void Search( void );
+		void PasteSeaarch( void );
 		void LoadDB( void );
-        void LoadBitmap( wxScrolledWindow* sc, wxStaticBitmap* sb, wxString file );
-        void LoadBitmaps( wxString date );
+        bool LoadBitmap( wxScrolledWindow* sc, wxStaticBitmap* sb, wxString file );
+        bool LoadBitmaps( wxString date, bool reload );
         void GetImages( wxString hhs, wxString date );
 		void PrintImages( void );
+		void WriteLog( wxString msg );
 		void RemoveFile( wxString pattern );
         void InDevelop( bool );
 
 		void OnItemSelected( wxDataViewEvent& event );
 		void OnItemDClicked( wxDataViewEvent& event );
         void OnNBookChanged( wxBookCtrlEvent& event );
+        void OnPasteSearch( wxCommandEvent& event );
         void OnPrint( wxCommandEvent& event );
 		void OnClose( wxCloseEvent& event );	// save config
 		void OnIdle( wxIdleEvent& event );
 		void OnTimer( wxTimerEvent& event );
+        void OnHelp( wxCommandEvent& event );
         void OnLogout( wxCommandEvent& event );
-        void OnTestButton( wxCommandEvent& event );
 };
 
 #endif // __RSEARCH_H__