From 7bbe1e69f9ff9c0ce427cefb165e57f40b8661e4 Mon Sep 17 00:00:00 2001
From: Marius Stanciu <marius.adrian@gmail.com>
Date: Sun, 20 Feb 2022 16:39:04 +0200
Subject: [PATCH] - making the above fix accept few possibilities

---
 CHANGELOG.md                  |  1 +
 appEditors/AppGerberEditor.py | 16 +++++++++++-----
 appPlugins/ToolImage.py       |  3 +--
 app_Main.py                   | 18 +++++++++---------
 4 files changed, 22 insertions(+), 16 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index afddbfea..4674cacd 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,6 +10,7 @@ CHANGELOG for FlatCAM beta
 20.02.2022
 
 - fixed a minor error in the Gerber Editor which created a graphic glitch on shape selection
+- making the above fix accept few possibilities
 
 19.02.2022
 
diff --git a/appEditors/AppGerberEditor.py b/appEditors/AppGerberEditor.py
index cd15bc12..cc6b00d0 100644
--- a/appEditors/AppGerberEditor.py
+++ b/appEditors/AppGerberEditor.py
@@ -5542,6 +5542,15 @@ class AppGerberEditor(QtCore.QObject):
         with self.app.proc_container.new('%s ...' % _("Plotting")):
             self.shapes.clear(update=True)
 
+            if len(self.app.options['global_sel_draw_color']) == 7:
+                sel_draw_color = self.app.options['global_sel_draw_color'] + 'FF'
+            else:
+                sel_draw_color = self.app.options['global_sel_draw_color'][:-2] + 'FF'
+            if len(self.app.options['global_draw_color']) == 7:
+                draw_color = self.app.options['global_draw_color'] + 'FF'
+            else:
+                draw_color = self.app.options['global_draw_color'][:-2] + 'FF'
+
             for storage in self.storage_dict:
                 # fix for apertures with no geometry inside
                 if 'geometry' in self.storage_dict[storage]:
@@ -5552,12 +5561,9 @@ class AppGerberEditor(QtCore.QObject):
                                 continue
 
                             if elem in self.selected:
-                                self.plot_shape(geometry=geometric_data,
-                                                color=self.app.options['global_sel_draw_color'][:-2] + 'FF',
-                                                linewidth=2)
+                                self.plot_shape(geometry=geometric_data, color=sel_draw_color, linewidth=2)
                             else:
-                                self.plot_shape(geometry=geometric_data,
-                                                color=self.app.options['global_draw_color'][:-2] + 'FF')
+                                self.plot_shape(geometry=geometric_data, color=draw_color)
 
             if self.utility:
                 for elem in self.utility:
diff --git a/appPlugins/ToolImage.py b/appPlugins/ToolImage.py
index d92cc40f..f155d855 100644
--- a/appPlugins/ToolImage.py
+++ b/appPlugins/ToolImage.py
@@ -5,7 +5,7 @@
 # MIT Licence                                              #
 # ##########################################################
 from PyQt6 import QtGui, QtWidgets
-import os, sys
+import os
 
 from shapely.geometry import shape
 from shapely.ops import unary_union
@@ -13,7 +13,6 @@ from shapely.affinity import scale, translate
 
 import numpy as np
 
-import rasterio
 from rasterio import open as rasterio_open
 from rasterio.features import shapes
 
diff --git a/app_Main.py b/app_Main.py
index 76cb7131..35b3c210 100644
--- a/app_Main.py
+++ b/app_Main.py
@@ -61,22 +61,22 @@ from appDatabase import ToolsDB2
 from vispy.gloo.util import _screenshot
 from vispy.io import write_png
 
-# FlatCAM defaults (preferences)
+# App defaults (preferences)
 from defaults import FlatCAMDefaults
 
-# FlatCAM Objects
+# App Objects
 from appGUI.preferences.OptionsGroupUI import OptionsGroupUI
 from appGUI.preferences.PreferencesUIManager import PreferencesUIManager
 from appObjects.ObjectCollection import *
 from appObjects.FlatCAMObj import FlatCAMObj
 from appObjects.AppObject import AppObject
 
-# FlatCAM Parsing files
+# App Parsing files
 from appParsers.ParseExcellon import Excellon
 from appParsers.ParseGerber import Gerber
 from camlib import to_dict, dict2obj, ET, ParseError, Geometry, CNCjob
 
-# FlatCAM appGUI
+# App appGUI
 from appGUI.PlotCanvas import *
 from appGUI.PlotCanvasLegacy import *
 from appGUI.PlotCanvas3d import *
@@ -84,10 +84,10 @@ from appGUI.MainGUI import *
 from appGUI.GUIElements import FCFileSaveDialog, message_dialog, FlatCAMSystemTray, FCInputDialogSlider, \
     FCGridLayout, FCLabel
 
-# FlatCAM Pre-processors
+# App Pre-processors
 from appPreProcessor import load_preprocessors
 
-# FlatCAM appEditors
+# App appEditors
 from appEditors.AppGeoEditor import AppGeoEditor
 from appEditors.AppExcEditor import AppExcEditor
 from appEditors.AppGerberEditor import AppGerberEditor
@@ -95,14 +95,14 @@ from appEditors.AppTextEditor import AppTextEditor
 from appEditors.appGCodeEditor import AppGCodeEditor
 from appParsers.ParseHPGL2 import HPGL2
 
-# FlatCAM Workers
+# App Workers
 from appProcess import *
 from appWorkerStack import WorkerStack
 
-# FlatCAM Tools
+# App Plugins
 from appPlugins import *
 
-# FlatCAM Translation
+# App Translation
 import gettext
 import appTranslation as fcTranslate
 import builtins