diff options
| author | Daniel Jones <admin@danieljon.es> | 2020-07-08 23:15:20 +0930 |
|---|---|---|
| committer | Daniel Jones <admin@danieljon.es> | 2020-07-08 23:15:20 +0930 |
| commit | 3a429d84c0e38b4a33834400aa0213082b634d55 (patch) | |
| tree | e897390f88b0893e181c191d8cec1ebef547dfad /MainWindow.h | |
| parent | 848e32a6983cd2d61e3c1e9a489ca6563536099f (diff) | |
| download | foxlogicgates-3a429d84c0e38b4a33834400aa0213082b634d55.tar.gz foxlogicgates-3a429d84c0e38b4a33834400aa0213082b634d55.zip | |
Made gate updating work on separate thread, added 3 way NAND gate
Becuase of a recursion and stack overflow problem when looping objects i've moved the object updating to a separate thread, and it no longer does recursion. I also added a 3 input NAND gate and paved the work to add more 3 input gates.
Diffstat (limited to 'MainWindow.h')
| -rw-r--r-- | MainWindow.h | 35 |
1 files changed, 35 insertions, 0 deletions
diff --git a/MainWindow.h b/MainWindow.h index 0902169..a443e71 100644 --- a/MainWindow.h +++ b/MainWindow.h @@ -32,6 +32,8 @@ #include "BinaryDisplay.h" #include "pugixml.hpp" // saving/loading +class Thread; + class MainWindow : public FXMainWindow { FXDECLARE(MainWindow) @@ -54,6 +56,7 @@ class MainWindow : public FXMainWindow ID_BUTTON_OUTPUT, ID_BUTTON_AND, ID_BUTTON_NAND, + ID_BUTTON_3NAND, ID_BUTTON_OR, ID_BUTTON_NOR, ID_BUTTON_XOR, @@ -63,6 +66,8 @@ class MainWindow : public FXMainWindow ID_BUTTON_SAVE, ID_BUTTON_LOAD, + + ID_UPDATE_OBJECTS, }; /* Event handlers */ @@ -78,6 +83,7 @@ class MainWindow : public FXMainWindow long output_button_press(FXObject*,FXSelector,void* ptr); long and_button_press(FXObject*,FXSelector,void* ptr); long nand_button_press(FXObject*,FXSelector,void* ptr); + long nand3_button_press(FXObject*,FXSelector,void* ptr); long or_button_press(FXObject*,FXSelector,void* ptr); long nor_button_press(FXObject*,FXSelector,void* ptr); long xor_button_press(FXObject*,FXSelector,void* ptr); @@ -94,6 +100,8 @@ class MainWindow : public FXMainWindow FXApp *get_app(){ return app; }; + long update_objects(FXObject*,FXSelector,void* ptr); + protected: MainWindow(){} @@ -147,6 +155,7 @@ class MainWindow : public FXMainWindow FXGIFIcon *OUTPUT_icon; FXGIFIcon *AND_icon; FXGIFIcon *NAND_icon; + FXGIFIcon *NAND3_icon; FXGIFIcon *OR_icon; FXGIFIcon *NOR_icon; FXGIFIcon *XOR_icon; @@ -159,6 +168,7 @@ class MainWindow : public FXMainWindow FXButton *OUTPUT_button; FXButton *AND_button; FXButton *NAND_button; + FXButton *NAND3_button; FXButton *OR_button; FXButton *NOR_button; FXButton *XOR_button; @@ -191,6 +201,31 @@ class MainWindow : public FXMainWindow /* saving/loading */ std::string file_name = ""; + /* threads */ + Thread *update_thread; + FXMutex lock; + FXGUISignal *sig; + bool ready_to_draw = false; +}; + +class Thread : public FXThread +{ + + private: + MainWindow *mw; + FXGUISignal *sig; + + public: + Thread(MainWindow *mw_, FXGUISignal *sig_) { mw = mw_; sig = sig_; }; + int run() + { + while (1) + { + FXThread::sleep(70000000); + sig->signal(); + }; + return 0; + }; }; #endif // MAINWINDOW_H |