Changeset e43c8d0 in thomson

Timestamp:

Mar 24, 2012, 3:26:03 PM (12 years ago)

Author:

Adrien Destugues <pulkomandy@…>

Branches:

main

Children:

4a558d7

Parents:

fe55aa5

Message:

Some cleanup.

git-svn-id: ​svn://localhost/thomson@26 85ae3b6b-dc8f-4344-a89d-598714f2e4e5

Location:

elec/CrO2/software

Files:

• Makefile (modified) (2 diffs)
• device.cpp (modified) (1 diff)
• gui.cpp (modified) (2 diffs)
• gui.h (modified) (1 diff)

elec/CrO2/software/Makefile

@@ -3 +3 @@
 ifdef WINDIR
         # windows
-USBFLAGS = -I/usr/local/mingw/include
-USBLIBS = -L/usr/local/mingw/lib -lusb
+USBFLAGS = -I/local/include
+USBLIBS = -L/local/lib -lusb
 EXE_SUFFIX = .exe
 else
@@ -14 +14 @@
 
 CC              = g++
-CPPFLAGS = $(USBFLAGS) -Os -Wall -I/usr/include/IUP/ -I/local/include -std=c++0x -mthreads
-LIBS = $(USBLIBS) -Os -L/usr/lib/ -mwindows -liup -liupcontrols -liupcd -lcd -lfreetype -lz -lcomctl32 -lole32 -mthreads
+CPPFLAGS = $(USBFLAGS) -Os -Wall -I/local/include -std=c++0x -mthreads
+LIBS = $(USBLIBS) -Os -mwindows -liup -liupcontrols -liupcd -lcd -lfreetype -lz -lcomctl32 -lole32 -mthreads
 
 PROJECT = CrO2

elec/CrO2/software/device.cpp

@@ -30 +30 @@
 Device& Device::getDevice() throw(const char*)
 {
+        // If Device constructor throws an exception, instance is not initialized.
+        // So, the constructor will be called again at next getDevice call, until
+        // it succeeds.
         if (instance == NULL)
                 instance = new Device();

elec/CrO2/software/gui.cpp

@@ -108 +108 @@
         IupSetAttribute(hexEd, "ALIGNMENT", "ALEFT");
         Callback<Gui, const char*, int, int>::create(hexEd, "VALUE_CB", this, &Gui::matVal);
+        Callback<Gui, int, int, int, const char*>::create(hexEd, "VALUE_EDIT_CB", this, &Gui::setMatVal);
         
         // WINDOW LAYOUT
@@ -227 +228 @@
         return IUP_DEFAULT;
 }
+
+
+int Gui::setMatVal(int x, int y, const char* val)
+{
+        int pos = (y-1) * 16 + (x-1);
+
+        if (file == NULL || selblock < 0 || selblock >= file->getBlockCount())
+                return 0;
+
+        const Tape::Block& block = file->getBlock(selblock);
+        block.data[pos] = 0; // TODO parse hex val to int
+
+        return 0;
+}
+
 
 const char* Gui::matVal(int y, int x)

elec/CrO2/software/gui.h

@@ -27 +27 @@
                 // Explore
                 int selectBlock(int id, int what);
+                int setMatVal(int x, int y, const char* newVal);
                 const char* matVal(int y, int x);
                 const char* toHex(int val);