Saving is complete

Author: gorbit99

Diff for: Component.c

@@ -112,13 +112,17 @@ ComponentData component_create(float x, float y, char *name, float size, float t
 
 	data.type = CT_MODULE;
 
+	data.name = (char *)malloc(strlen(name) + 1);
+	strcpy(data.name, name);
+
 	return data;
 }
 
 void component_free_data(ComponentData *dat) {
 	free(dat->pinData.pins);
 	SDL_DestroyTexture(dat->texture);
 	parser_free_function(&dat->funData);
+	free(dat->name);
 }
 
 void component_render(ComponentData *dat, SDL_Renderer *renderer, Point camPos, Color color) {
@@ -233,6 +237,8 @@ ComponentData component_create_wire_between(ComponentData *comp1, ComponentData
 
 	data.type = CT_WIRE;
 
+	data.name = NULL;
+
 	return data;
 }
 

Diff for: Component.h

@@ -76,6 +76,7 @@ typedef struct ComponentData {
 	PinData pinData; /**< Pins of the component */
 	FunctionData funData; /**< Function of the component */
 	ComponentType type; /**< Type of the component */
+	char *name; /**< Name of the component */
 } ComponentData;
 
 /**

Diff for: NodeVector.c

@@ -29,8 +29,11 @@ void nodev_push_back(NodeVector *vector, Node node) {
 }
 
 void nodev_erase(NodeVector *vector, int index) {
+	node_free(nodev_at(vector, index));
 	for (size_t i = index + 1; i < vector->count; i++) {
 		vector->nodes[i - 1] = vector->nodes[i];
+		for (int j = 0; j < vector->nodes[i].component.funData.outC; j++)
+				vector->nodes[i - 1].wires[j].origin = &vector->nodes[i - 1];
 	}
 	vector->count--;
 }
@@ -93,4 +96,33 @@ void nodev_reposition(NodeVector *vector, Node *node, Point position) {
 			}
 		}
 	}
+}
+
+void nodev_delete(NodeVector *vector, Node *node) {
+	for (int w = 0; w < node->component.funData.outC; w++) {
+		Wire *wire = &node->wires[w];
+		for (size_t c = 0; c < wire->conCount; c++) {
+			Connection *conn = &wire->connections[c];
+			nodev_at(vector, conn->dest)->component.pinData.pins[conn->pin].occupied = false;
+		}
+	}
+	for (size_t i = 0; i < vector->count; i++) {
+		if (nodev_at(vector, i) == node) {
+			nodev_erase(vector, i);
+
+			for (size_t n = 0; n < vector->count; n++) {
+				Node *other = nodev_at(vector, n);
+				for (int w = 0; w < other->component.funData.outC; w++) {
+					Wire *wire = &other->wires[w];
+					for (size_t c = 0; c < wire->conCount; c++) {
+						Connection *conn = &wire->connections[c];
+						if (conn->dest == i) {
+							wire_erase(wire, c);
+						}
+					}
+				}
+			}
+			break;
+		}
+	}
 }

Diff for: NodeVector.h

@@ -107,4 +107,12 @@ void nodev_free(NodeVector *vector);
  */
 void nodev_reposition(NodeVector *vector, Node *node, Point position);
 
+/**
+ * @brief Delete a node and erase the connections
+ * 
+ * @param vector Vector to delete node from
+ * @param node Node to delete
+ */
+void nodev_delete(NodeVector *vector, Node *node);
+
 #endif //HOMEWORK_NODEVECTOR_H

Diff for: Save.c

@@ -0,0 +1,29 @@
+#include "Save.h"
+#include "debugmalloc.h"
+
+void save_node(FILE *file, Node *node) {
+    fprintf(file, "\t%s %f,%f\n", node->component.name, node->component.x, node->component.y);
+}
+
+bool save_vector(NodeVector *vector, char *fileName) {
+    FILE *file = fopen(fileName, "wt");
+    if (file == NULL) {
+        log_error("Couldn't open file %s!", fileName);
+        return false;
+    }
+
+    fprintf(file, "Nodes\n");
+    for (size_t n = 0; n < vector->count; n++)
+        save_node(file, nodev_at(vector, n));
+    fprintf(file, "Connections\n");
+    for (size_t n = 0; n < vector->count; n++) {
+        Node *node = nodev_at(vector, n);
+        for (int w = 0; w < node->component.funData.outC; w++) {
+            Wire *wire = &node->wires[w];
+            for (size_t c = 0; c < wire->conCount; c++) {
+                Connection *conn = &wire->connections[c];
+                fprintf(file, "\t%d %d %d %d\n", n, w, conn->dest, conn->pin);
+            }
+        }
+    }
+}

Diff for: Save.h

@@ -0,0 +1,15 @@
+#ifndef HOMEWORK_SAVE_H
+#define HOMEWORK_SAVE_H
+
+#include <stdio.h>
+#include <stdbool.h>
+#include "NodeVector.h"
+#include "Utility.h"
+
+void save_node(FILE *file, Node *node);
+
+void save_connections(FILE *file, Node *node);
+
+bool save_vector(NodeVector *vector, char *fileName);
+
+#endif

Diff for: debugmalloclog.txt

@@ -0,0 +1 @@
+debugmalloc: free @ C:\Users\gorbi\Documents\Projects\School\LogicSim\LogicSim\Component.c:125: olyan teruletet akarsz felszabaditani, ami nincs lefoglalva!

Diff for: main.c

@@ -11,6 +11,7 @@
 #include "Windowing.h"
 #include "Search.h"
 #include "WireDrawing.h"
+#include "Save.h"
 
 enum ProgramState {
 	VIEWING_CIRCUIT,
@@ -165,8 +166,13 @@ int main(int argc, char **argv) {
 				camera_update(&camera, &mainWindow.input, mainWindow.renderer);
 				nodev_reposition(&vec, moved, mouseWS);
 
+				if (input_get_key(&mainWindow.input, SDL_SCANCODE_DELETE).isPressed) {
+					nodev_delete(&vec, moved);
+					moved = NULL;
+				}
+
 				//Transitions
-				if (input_get_mouse_button(&mainWindow.input, SDL_BUTTON_LEFT).isPressed) {
+				if (input_get_mouse_button(&mainWindow.input, SDL_BUTTON_LEFT).isPressed || moved == NULL) {
 					state = VIEWING_CIRCUIT;
 				}
 				break;
@@ -215,6 +221,8 @@ int main(int argc, char **argv) {
 
 	window_quit_SDL();
 
+	save_vector(&vec, "test.sav");
+
 	nodev_free(&vec);
 
 	return 0;