eh

Author: Darker

.gitignore

@@ -8,6 +8,10 @@
 *.obj
 *.lastbuildstate
 
+build.bat
+
+.gitignore
+
 #################
 ## Eclipse
 #################

main.hpp

@@ -72,14 +72,14 @@
 #include "include/SettingsManager.hpp"
 #include "include/Buttons.hpp"
 #include "include/Wavelength.hpp"
+#include "include/GraphMemoryMan.hpp"
+#include "include/Percentage.hpp"
 
 #include <String>
 #include <math.h>
 
 
-//Definice vzhledu a textu:
-#define APP_STYLE_MAINBG wxColor(230,230,246)
-#define APP_LOGO_PADDING 10
+#include "include/design.hpp"
 
 //Definice samplovani:
 #define DEFAULT_SAMPLE_LENGTH 1024
@@ -153,10 +153,12 @@ enum
  BUTTON_Screenshot,
  BUTTON_PrevCam,
  BUTTON_NextCam,
- STHREAD_EVENT
+ STHREAD_EVENT,
+ BUTTON_Pause
 };
 
 class WavelengthPanel;
+class PercentagePanel;
 class AppMain;
 class FrameMain : public wxFrame
 {
@@ -180,13 +182,13 @@ class FrameMain : public wxFrame
 	void SpectrumBoundsChanged();
 
 private:
-
+	GraphMemoryMan* graphMem;
 	wxGLCanvasSubClass* GLcanvas;
 	UVStatusPanel *uvbut;
 	SettingsManager *SetMan;
 	bool drawing;
 
-
+	PauseButton *pauseBut;
 	QuitButton *quitBut;
 	MaxDemaxButton *maxBut;
 	ScreenshotButton *scrBut;
@@ -195,6 +197,7 @@ class FrameMain : public wxFrame
 	NextButton *nextBut;
 
 	WavelengthPanel *wavlen;
+	PercentagePanel *percpan;
 	/**Window status**/
 	bool dragged;
 	wxPoint dragPoint;
@@ -244,5 +247,12 @@ std::string toString(const T& value)
     oss << value;
     return oss.str();
 }
+
+//Signum
+//http://stackoverflow.com/a/4609795/607407
+//Returns sign of the input value
+template <typename T> int sgn(T val) {
+    return (T(0) < val) - (val < T(0));
+}
 //Konverze barev do RGB
 

minimal.cpp

@@ -29,6 +29,14 @@ BEGIN_EVENT_TABLE(WavelengthPanel, wxPanel)
  EVT_PAINT(WavelengthPanel::paintEvent)
 END_EVENT_TABLE()
 
+BEGIN_EVENT_TABLE(PercentagePanel, wxPanel)
+ EVT_PAINT(PercentagePanel::paintEvent)
+END_EVENT_TABLE()
+
+/*BEGIN_EVENT_TABLE(GraphMemory, wxPanel)
+ EVT_PAINT(GraphMemory::paintEvent)
+END_EVENT_TABLE()*/
+
 IMPLEMENT_APP(AppMain)
 
 
@@ -41,6 +49,7 @@ FrameMain::FrameMain(const wxString& title, SettingsManager *n_SetMan)
  SetFont(wxFont(11, wxFONTFAMILY_SWISS, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL));
  SetFocus();
 
+
  //Zarovnat okno pri maximalizaci
  Connect(wxEVT_MAXIMIZE, wxCommandEventHandler(FrameMain::Align), NULL, this);
  //Eventy pro posouvani
@@ -64,20 +73,27 @@ FrameMain::FrameMain(const wxString& title, SettingsManager *n_SetMan)
   /**Vlnove lenghty*/
   wavlen = new WavelengthPanel(this,SetMan ,666, kam);
   wavlen->Align();
+  /**Procenta nalevo**/
+  percpan = new PercentagePanel(this);
+  percpan->Align();
   /**Graf**/
 
   GLcanvas = new wxGLCanvasSubClass(this, kam, SetMan);
   GLcanvas->Centre();
+  
+  /**Graf pauza**/
+  graphMem = new GraphMemoryMan(this, GLcanvas);
+  GLcanvas->setMemory(graphMem);
 
-
+  pauseBut = new PauseButton(this, BUTTON_Pause, graphMem);
   quitBut = new QuitButton(this, BUTTON_Quit);
   maxBut = new MaxDemaxButton(this, BUTTON_Max, ST_MAXED);
 
   prevBut = new PreviousButton(this, BUTTON_PrevCam, SetMan);
   nextBut = new NextButton(this, BUTTON_NextCam, prevBut, SetMan);
   prevBut->SetNextBut(nextBut);
 
-  scrBut = new ScreenshotButton(this, BUTTON_Screenshot);
+  scrBut = new ScreenshotButton(this, BUTTON_Screenshot, GLcanvas);
   grBut = new GraphButton(this, wxID_ANY, SetMan);
   if (SetMan->GetSetting(SETT_GEN_CFG) == 0)
   {
@@ -92,6 +108,7 @@ FrameMain::FrameMain(const wxString& title, SettingsManager *n_SetMan)
   }
 
 
+
   /*drawPane = new BasicDrawPane(this, SetMan);
   timer = new RenderTimer(drawPane);
   timer->start();
@@ -225,8 +242,10 @@ void FrameMain::Align(wxCommandEvent& WXUNUSED(event)) {
  GLcanvas->SetFocus();
  timer->Start();
 
- wavlen->Align();
+ pauseBut->Align();
 
+ wavlen->Align();
+ percpan->Align();
 }
 void FrameMain::setUVStatus(const bool status) {
   uvbut->State(status);

src/Wavelength.cpp

@@ -97,7 +97,9 @@ void WavelengthPanel::render(wxDC &dc) {
 
  int sirka = abs(uv-ir);
 
- 
+ if(sirka<2)
+	 return;
+
 
  sirka-= tsirka+mezera;