Merge pull request #547 from davidgiven/driveselect

Add a flux visualiser to the GUI.

Author: davidgiven

FluxEngine.cydsn/CortexM3/ARM_GCC_541/Release/FluxEngine.hex

@@ -2,7 +2,7 @@ syntax = "proto2";
 
 import "lib/common.proto";
 
-// Next: 14
+// Next: 15
 message DriveProto
 {
     optional int32 drive = 1
@@ -26,6 +26,10 @@ message DriveProto
         default = 0,
         (help) = "Bias to apply to the head position (in tracks)"
     ];
+    optional int32 group_offset = 14 [
+        default = 0,
+        (help) = "When writing groups, erase all tracks except this one in each group"
+    ];
     optional int32 head_width = 10
         [ default = 1, (help) = "Width of the head (in tracks)" ];
     optional int32 tpi = 11 [ default = 96, (help) = "TPI of drive" ];

lib/drive.proto

@@ -203,7 +203,7 @@ void writeTracks(FluxSink& fluxSink,
                 Logger() << BeginWriteOperationLogMessage{
                     physicalTrack, location.head};
 
-                if (offset == 0)
+                if (offset == config.drive().group_offset())
                 {
                     auto fluxmap = producer(location);
                     if (!fluxmap)

lib/readerwriter.cc

@@ -41,7 +41,8 @@ decoder {
 }
 
 drive {
-	head_bias: 1
+	head_bias: 0
+	group_offset: 1
 }
 
 tracks {

src/formats/brother120.textpb

@@ -1,10 +1,13 @@
 ifneq ($(shell $(WX_CONFIG) --version),)
 
 FLUXENGINE_GUI_SRCS = \
+	src/gui/fluxviewercontrol.cc \
+	src/gui/fluxviewerwindow.cc \
+	src/gui/hexviewerwindow.cc \
+	src/gui/layout.cpp \
 	src/gui/main.cc \
 	src/gui/mainwindow.cc \
-	src/gui/visualisation.cc \
-	src/gui/layout.cpp \
+	src/gui/visualisationcontrol.cc \
 
 FLUXENGINE_GUI_OBJS = \
 	$(patsubst %.cpp, $(OBJDIR)/%.o, \