- Add .m file saving

- Add about button

Author: ehsan-torabi

controlFunctions.go

@@ -8,9 +8,11 @@ import (
 	"fyne.io/fyne/v2"
 	"fyne.io/fyne/v2/canvas"
 	"fyne.io/fyne/v2/dialog"
+	"fyne.io/fyne/v2/widget"
 	"image/color"
 	"io"
 	"log"
+	url2 "net/url"
 	"os"
 	"path/filepath"
 	"strconv"
@@ -19,12 +21,13 @@ import (
 
 var SavedProject struct {
 	Options struct {
-		FlatMatrix         bool
-		MatlabSaveFormat   bool
-		MatrixCol          int
-		MatrixRow          int
-		SettingsSaved      bool
-		OneHotEncodingSave bool
+		FlatMatrix           bool
+		MatlabSaveFormat     bool
+		DotMFileWithVariable bool
+		MatrixCol            int
+		MatrixRow            int
+		SettingsSaved        bool
+		OneHotEncodingSave   bool
 	}
 	TempData struct {
 		Saved      bool
@@ -137,16 +140,24 @@ func matlabSaveCheckBoxFunction(b bool) {
 	Options.MatlabSaveFormat = b
 	if b {
 		targetFileEntry.Enable()
+		dotMFileWithVariableCheck.Enable()
 		flatMatrixCheck.Disable()
 		flatMatrixCheck.SetChecked(false)
 		Options.FlatMatrix = false
 		Application.mainWindow.Canvas().Refresh(Application.mainWindow.Content())
 	} else {
+		dotMFileWithVariableCheck.Disable()
 		targetFileEntry.Disable()
 		flatMatrixCheck.Enable()
 		Application.mainWindow.Canvas().Refresh(Application.mainWindow.Content())
 	}
 }
+
+func DotMFileWithVariableCheck(b bool) {
+	Options.DotMFileWithVariable = b
+
+}
+
 func expertPNGOperation() {
 	filename := "draw.png"
 	if input.Text != "" {
@@ -206,6 +217,7 @@ func applyProjectSetting(withInitial bool) {
 	colInput.Disable()
 	flatMatrixCheck.Disable()
 	matlabSaveCheck.Disable()
+	dotMFileWithVariableCheck.Disable()
 	oneHotEncodingSaveCheck.Disable()
 	Options.SettingsSaved = true
 	if withInitial {
@@ -220,6 +232,7 @@ func resetProjectSetting() {
 			colInput.Enable()
 			flatMatrixCheck.Enable()
 			matlabSaveCheck.Enable()
+			dotMFileWithVariableCheck.Enable()
 			oneHotEncodingSaveCheck.Enable()
 			counterLabel.SetText("0")
 			Options.SettingsSaved = false
@@ -235,12 +248,29 @@ func resetProjectSetting() {
 		}, Application.mainWindow,
 	)
 }
+
+func aboutBtn() {
+	url, _ := url2.Parse("https://github.com/ehsan-torabi")
+	repoURL, _ := url2.Parse("https://github.com/ehsan-torabi/Draw2Matrix")
+	richText := widget.NewRichText(
+		&widget.TextSegment{Text: "Programmed by : Ehsan Torabi Farsani", Style: widget.RichTextStyle{}},
+		&widget.TextSegment{Text: "\nFor more details, visit our ", Style: widget.RichTextStyle{}},
+		&widget.HyperlinkSegment{Text: "Github", URL: url},
+		&widget.TextSegment{Text: "\t", Style: widget.RichTextStyle{}},
+		&widget.HyperlinkSegment{Text: "Draw2Matrix Repository", URL: repoURL},
+		&widget.TextSegment{Text: "\n", Style: widget.RichTextStyle{}},
+	)
+	dialog.NewCustom("About", "exit", richText, Application.mainWindow).Show()
+
+}
+
 func labelValidator(s string) error {
 	if len(s) > 20 {
 		return fmt.Errorf("label too long")
 	}
 	return nil
 }
+
 func rowValidator(s string) error {
 	val, err := strconv.Atoi(s)
 	if err != nil || val <= 0 {
@@ -296,6 +326,7 @@ func loadProjectFile(reader io.ReadCloser) error {
 	colInput.Text = strconv.Itoa(Options.MatrixCol - 1)
 	oneHotEncodingSaveCheck.SetChecked(Options.OneHotEncodingSave)
 	matlabSaveCheck.SetChecked(Options.MatlabSaveFormat)
+	dotMFileWithVariableCheck.SetChecked(Options.DotMFileWithVariable)
 	flatMatrixCheck.SetChecked(Options.FlatMatrix)
 	Application.mainWindow.Content().Refresh()
 	return nil

dataTools.go

@@ -155,9 +155,13 @@ func AddToFileForMatlab(inputData [][]int8, outputData string) {
 // SaveFileForMatlab saves the matrix data and target data to separate files
 // in MATLAB compatible format
 func SaveFileForMatlab(dirPath, dataFileName, targetFileName string) error {
+	extension := ".txt"
+	if Options.DotMFileWithVariable {
+		extension = ".m"
+	}
 	// Prepare file paths
-	dataPath := filepath.Join(dirPath, dataFileName+".txt")
-	targetPath := filepath.Join(dirPath, targetFileName+".txt")
+	dataPath := filepath.Join(dirPath, dataFileName+extension)
+	targetPath := filepath.Join(dirPath, targetFileName+extension)
 
 	// Create data file
 	dataFile, err := os.OpenFile(dataPath, os.O_CREATE|os.O_TRUNC|os.O_WRONLY, 0600)
@@ -175,18 +179,29 @@ func SaveFileForMatlab(dirPath, dataFileName, targetFileName string) error {
 
 	// Write processed matrix data
 	finalData := processForMatlabString(transposeMatrix(TempData.TempMatrix))
+	if Options.DotMFileWithVariable {
+		finalData = dataFileName + " = " + finalData + ";"
+	}
 	if _, err = dataFile.WriteString(finalData); err != nil {
 		return err
 	}
 
 	if Options.OneHotEncodingSave {
-		_, err = targetFile.WriteString(oneHotSaveUtil())
+		finalTarget := oneHotSaveUtil()
+		if Options.DotMFileWithVariable {
+			finalTarget = targetFileName + " = " + finalTarget + ";"
+		}
+		_, err = targetFile.WriteString(finalTarget)
 		if err != nil {
 			log.Println(err)
 			return err
 		}
 	} else {
-		_, err = targetFile.WriteString(fmt.Sprintf("%v", TempData.TempTarget))
+		finalTarget := fmt.Sprintf("%v", TempData.TempTarget)
+		if Options.DotMFileWithVariable {
+			finalTarget = targetFileName + " = " + finalTarget + ";"
+		}
+		_, err = targetFile.WriteString(finalTarget)
 		if err != nil {
 			log.Println(err)
 			return err

main.go

@@ -16,12 +16,13 @@ import (
 
 // Options stores the global application settings
 var Options struct {
-	FlatMatrix         bool // Whether to flatten the matrix when saving
-	MatlabSaveFormat   bool // Whether to save in MATLAB compatible format
-	MatrixCol          int  // Number of columns in the output matrix
-	MatrixRow          int  // Number of rows in the output matrix
-	SettingsSaved      bool // Whether settings have been Saved and locked
-	OneHotEncodingSave bool // Whether to save target to one-hot-encoding format
+	FlatMatrix           bool // Whether to flatten the matrix when saving
+	MatlabSaveFormat     bool // Whether to save in MATLAB compatible format
+	DotMFileWithVariable bool // Whether to save array in variable for matlab in .m file
+	MatrixCol            int  // Number of columns in the output matrix
+	MatrixRow            int  // Number of rows in the output matrix
+	SettingsSaved        bool // Whether settings have been Saved and locked
+	OneHotEncodingSave   bool // Whether to save target to one-hot-encoding format
 }
 
 var (
@@ -68,6 +69,7 @@ func main() {
 
 	matlabSaveCheck.Checked = false
 	flatMatrixCheck.Checked = false
+	dotMFileWithVariableCheck.Disable()
 
 	rowInput.SetPlaceHolder("Rows")
 	rowInput.SetText(strconv.Itoa(Options.MatrixRow))

mainWidgets.go

@@ -29,12 +29,13 @@ var (
 	flatMatrixCheck = widget.NewCheck("Flat Matrix", func(b bool) {
 		Options.FlatMatrix = b
 	})
-	matlabSaveCheck         = widget.NewCheck("Matlab Save Format", matlabSaveCheckBoxFunction)
-	oneHotEncodingSaveCheck = widget.NewCheck("One Hot Encoding Save", oneHotEncodingCheckBoxFunction)
-	colInput                = widget.NewEntry()
-	rowInput                = widget.NewEntry()
-	addBtn                  = widget.NewButtonWithIcon("Add", theme.ContentAddIcon(), addButtonFunction)
-	addAndClearPaintBtn     = widget.NewButtonWithIcon("Add & Clear Paint", theme.ContentCutIcon(), func() {
+	matlabSaveCheck           = widget.NewCheck("Matlab Save Format", matlabSaveCheckBoxFunction)
+	dotMFileWithVariableCheck = widget.NewCheck(".m file save", DotMFileWithVariableCheck)
+	oneHotEncodingSaveCheck   = widget.NewCheck("One Hot Encoding Save", oneHotEncodingCheckBoxFunction)
+	colInput                  = widget.NewEntry()
+	rowInput                  = widget.NewEntry()
+	addBtn                    = widget.NewButtonWithIcon("Add", theme.ContentAddIcon(), addButtonFunction)
+	addAndClearPaintBtn       = widget.NewButtonWithIcon("Add & Clear Paint", theme.ContentCutIcon(), func() {
 		addButtonFunction()
 		Application.paintObject.Clear()
 	})
@@ -44,7 +45,8 @@ var (
 	resetProjectBtn = widget.NewButtonWithIcon("Reset Project", theme.ContentClearIcon(), resetProjectSetting)
 	toolbar         = widget.NewToolbar(
 		widget.NewToolbarAction(theme.DocumentSaveIcon(), saveProjectFileFunction),
-		widget.NewToolbarAction(theme.ContentUndoIcon(), loadProjectFileFunction))
+		widget.NewToolbarAction(theme.ContentUndoIcon(), loadProjectFileFunction),
+		widget.NewToolbarAction(theme.InfoIcon(), aboutBtn))
 )
 
 // Layout containers
@@ -53,7 +55,7 @@ var (
 		openPaint,
 		widget.NewLabel("Matrix Settings:"),
 		container.NewGridWithColumns(2, rowInput, colInput),
-		container.NewGridWithColumns(3, flatMatrixCheck, matlabSaveCheck, oneHotEncodingSaveCheck),
+		container.NewGridWithColumns(4, flatMatrixCheck, matlabSaveCheck, dotMFileWithVariableCheck, oneHotEncodingSaveCheck),
 		container.NewGridWithColumns(2, resetProjectBtn, saveOptionsBtn),
 	)