- comment changes on the file licenses (added major contributor names)

This commit is contained in:
Marius Stanciu 2019-03-10 15:22:16 +02:00
parent 53627b566c
commit ffd707ccce
39 changed files with 304 additions and 82 deletions

View File

@ -6,6 +6,11 @@
# MIT Licence # # MIT Licence #
############################################################ ############################################################
############################################################ #
# File Modified: Marius Adrian Stanciu (c) #
# Date: 3/10/2019 #
############################################################
from PyQt5 import QtGui, QtCore, QtWidgets from PyQt5 import QtGui, QtCore, QtWidgets
from PyQt5.QtCore import Qt, QSettings from PyQt5.QtCore import Qt, QSettings
import FlatCAMApp import FlatCAMApp

View File

@ -6,6 +6,11 @@
# MIT Licence # # MIT Licence #
############################################################ ############################################################
############################################################
# File Modified (major mod): Marius Adrian Stanciu #
# Date: 3/10/2019 #
############################################################
from PyQt5 import QtGui, QtCore, QtWidgets from PyQt5 import QtGui, QtCore, QtWidgets
from PyQt5.QtCore import Qt, QSettings from PyQt5.QtCore import Qt, QSettings
from GUIElements import * from GUIElements import *

View File

@ -1,3 +1,11 @@
############################################################
# FlatCAM: 2D Post-processing for Manufacturing #
# http://flatcam.org #
# File Author: Matthieu Berthomé #
# Date: 5/26/2017 #
# MIT Licence #
############################################################
from importlib.machinery import SourceFileLoader from importlib.machinery import SourceFileLoader
import os import os
from abc import ABCMeta, abstractmethod from abc import ABCMeta, abstractmethod

View File

@ -1,3 +1,11 @@
############################################################
# FlatCAM: 2D Post-processing for Manufacturing #
# http://flatcam.org #
# File Author: Marius Adrian Stanciu (c) #
# Date: 3/10/2019 #
# MIT Licence #
############################################################
import os import os
import sys import sys

View File

@ -1,3 +1,16 @@
############################################################
# FlatCAM: 2D Post-processing for Manufacturing #
# http://flatcam.org #
# Author: Juan Pablo Caram (c) #
# Date: 2/5/2014 #
# MIT Licence #
############################################################
############################################################
# File Modified (major mod): Marius Adrian Stanciu #
# Date: 3/10/2019 #
############################################################
from PyQt5 import QtGui, QtCore, QtWidgets from PyQt5 import QtGui, QtCore, QtWidgets
from PyQt5.QtCore import Qt, pyqtSignal, pyqtSlot from PyQt5.QtCore import Qt, pyqtSignal, pyqtSlot
from PyQt5.QtWidgets import QTextEdit, QCompleter, QAction from PyQt5.QtWidgets import QTextEdit, QCompleter, QAction

View File

@ -6,6 +6,10 @@
# MIT Licence # # MIT Licence #
############################################################ ############################################################
############################################################
# File modified by: Dennis Hayrullin #
############################################################
# from PyQt5.QtCore import QModelIndex # from PyQt5.QtCore import QModelIndex
from FlatCAMObj import * from FlatCAMObj import *
import inspect # TODO: Remove import inspect # TODO: Remove

View File

@ -1,3 +1,16 @@
############################################################
# FlatCAM: 2D Post-processing for Manufacturing #
# http://flatcam.org #
# Author: Juan Pablo Caram (c) #
# Date: 2/5/2014 #
# MIT Licence #
############################################################
############################################################
# File Modified (major mod): Marius Adrian Stanciu #
# Date: 3/10/2019 #
############################################################
import sys import sys
from PyQt5 import QtGui, QtCore, QtWidgets from PyQt5 import QtGui, QtCore, QtWidgets
from PyQt5.QtCore import Qt from PyQt5.QtCore import Qt

View File

@ -1,3 +1,11 @@
############################################################
# FlatCAM: 2D Post-processing for Manufacturing #
# http://flatcam.org #
# File Author: Marius Adrian Stanciu (c) #
# Date: 3/10/2019 #
# MIT Licence #
############################################################
import re import re
import itertools import itertools
import math import math

View File

@ -2,6 +2,13 @@
# Vasilis Vlachoudis # Vasilis Vlachoudis
# Date: 20-Oct-2015 # Date: 20-Oct-2015
############################################################
# FlatCAM: 2D Post-processing for Manufacturing #
# http://flatcam.org #
# File modified: Marius Adrian Stanciu #
# Date: 3/10/2019 #
############################################################
import math import math
import sys import sys

View File

@ -1,3 +1,11 @@
############################################################
# FlatCAM: 2D Post-processing for Manufacturing #
# http://flatcam.org #
# File Author: Marius Adrian Stanciu (c) #
# Date: 3/10/2019 #
# MIT Licence #
############################################################
######################################################################### #########################################################################
### Borrowed code from 'https://github.com/gddc/ttfquery/blob/master/ ### ### Borrowed code from 'https://github.com/gddc/ttfquery/blob/master/ ###
### and made it work with Python 3 ############# ### and made it work with Python 3 #############

View File

@ -21,7 +21,7 @@ CAD program, and create G-Code for Isolation routing.
- further work in internationalization, added a fallback to English language in case there is no translation for a string - further work in internationalization, added a fallback to English language in case there is no translation for a string
- fix for issue #262: when doing Edit-> Save & Close Editor on a Geometry that is not generated through first entering into an Editor, the geometry disappear - fix for issue #262: when doing Edit-> Save & Close Editor on a Geometry that is not generated through first entering into an Editor, the geometry disappear
- finished preparing for internationalization for the files: camlib and objectCollection - finished preparing for internationalization for the files: camlib and objectCollection
- fixed tools shortcuts not working anymore due of the new toogle parameter for the .run(). - fixed tools shortcuts not working anymore due of the new toggle parameter for the .run().
- finished preparing for internationalization for the files: FlatCAMEditor, FlatCAMGUI - finished preparing for internationalization for the files: FlatCAMEditor, FlatCAMGUI
- finished preparing for internationalization for the files: FlatCAMObj, ObjectUI - finished preparing for internationalization for the files: FlatCAMObj, ObjectUI
- sorted the languages in the Preferences combobox - sorted the languages in the Preferences combobox

View File

@ -1,3 +1,11 @@
############################################################
# FlatCAM: 2D Post-processing for Manufacturing #
# http://flatcam.org #
# File Author: Dennis Hayrullin #
# Date: 2/5/2016 #
# MIT Licence #
############################################################
import numpy as np import numpy as np
from PyQt5.QtGui import QPalette from PyQt5.QtGui import QPalette
import vispy.scene as scene import vispy.scene as scene

View File

@ -1,3 +1,11 @@
############################################################
# FlatCAM: 2D Post-processing for Manufacturing #
# http://flatcam.org #
# File Author: Dennis Hayrullin #
# Date: 2/5/2016 #
# MIT Licence #
############################################################
from vispy.visuals import markers, LineVisual, InfiniteLineVisual from vispy.visuals import markers, LineVisual, InfiniteLineVisual
from vispy.visuals.axis import Ticker, _get_ticks_talbot from vispy.visuals.axis import Ticker, _get_ticks_talbot
from vispy.scene.widgets import Grid from vispy.scene.widgets import Grid

View File

@ -1,3 +1,11 @@
############################################################
# FlatCAM: 2D Post-processing for Manufacturing #
# http://flatcam.org #
# File Author: Dennis Hayrullin #
# Date: 2/5/2016 #
# MIT Licence #
############################################################
from OpenGL import GLU from OpenGL import GLU

View File

@ -1,3 +1,11 @@
############################################################
# FlatCAM: 2D Post-processing for Manufacturing #
# http://flatcam.org #
# File Author: Dennis Hayrullin #
# Date: 2/5/2016 #
# MIT Licence #
############################################################
from vispy.visuals import CompoundVisual, LineVisual, MeshVisual, TextVisual, MarkersVisual from vispy.visuals import CompoundVisual, LineVisual, MeshVisual, TextVisual, MarkersVisual
from vispy.scene.visuals import VisualNode, generate_docstring, visuals from vispy.scene.visuals import VisualNode, generate_docstring, visuals
from vispy.gloo import set_state from vispy.gloo import set_state

View File

@ -1,3 +1,11 @@
############################################################
# FlatCAM: 2D Post-processing for Manufacturing #
# http://flatcam.org #
# File Author: Marius Adrian Stanciu (c) #
# Date: 3/10/2019 #
# MIT Licence #
############################################################
from PyQt5 import QtGui from PyQt5 import QtGui
from GUIElements import FCEntry from GUIElements import FCEntry
from FlatCAMTool import FlatCAMTool from FlatCAMTool import FlatCAMTool

View File

@ -1,3 +1,11 @@
############################################################
# FlatCAM: 2D Post-processing for Manufacturing #
# http://flatcam.org #
# File Author: Marius Adrian Stanciu (c) #
# Date: 3/10/2019 #
# MIT Licence #
############################################################
from FlatCAMTool import FlatCAMTool from FlatCAMTool import FlatCAMTool
from GUIElements import RadioSet, FCEntry from GUIElements import RadioSet, FCEntry

View File

@ -1,3 +1,11 @@
############################################################
# FlatCAM: 2D Post-processing for Manufacturing #
# http://flatcam.org #
# File Author: Marius Adrian Stanciu (c) #
# Date: 3/10/2019 #
# MIT Licence #
############################################################
from FlatCAMTool import FlatCAMTool from FlatCAMTool import FlatCAMTool
from GUIElements import RadioSet, FloatEntry, FCComboBox, IntEntry from GUIElements import RadioSet, FloatEntry, FCComboBox, IntEntry

View File

@ -1,3 +1,11 @@
############################################################
# FlatCAM: 2D Post-processing for Manufacturing #
# http://flatcam.org #
# File Author: Marius Adrian Stanciu (c) #
# Date: 3/10/2019 #
# MIT Licence #
############################################################
from FlatCAMTool import FlatCAMTool from FlatCAMTool import FlatCAMTool
from FlatCAMObj import * from FlatCAMObj import *
from VisPyVisuals import * from VisPyVisuals import *

View File

@ -1,3 +1,11 @@
############################################################
# FlatCAM: 2D Post-processing for Manufacturing #
# http://flatcam.org #
# File Author: Marius Adrian Stanciu (c) #
# Date: 3/10/2019 #
# MIT Licence #
############################################################
from FlatCAMTool import FlatCAMTool from FlatCAMTool import FlatCAMTool
from FlatCAMObj import * from FlatCAMObj import *
from VisPyVisuals import * from VisPyVisuals import *

View File

@ -1,3 +1,11 @@
############################################################
# FlatCAM: 2D Post-processing for Manufacturing #
# http://flatcam.org #
# File Modified by: Marius Adrian Stanciu (c) #
# Date: 3/10/2019 #
# MIT Licence #
############################################################
from FlatCAMTool import FlatCAMTool from FlatCAMTool import FlatCAMTool
from copy import copy,deepcopy from copy import copy,deepcopy
from ObjectCollection import * from ObjectCollection import *

View File

@ -1,3 +1,11 @@
############################################################
# FlatCAM: 2D Post-processing for Manufacturing #
# http://flatcam.org #
# File Modified: Marius Adrian Stanciu (c) #
# Date: 3/10/2019 #
# MIT Licence #
############################################################
from FlatCAMTool import FlatCAMTool from FlatCAMTool import FlatCAMTool
from copy import copy,deepcopy from copy import copy,deepcopy
from ObjectCollection import * from ObjectCollection import *

View File

@ -1,3 +1,11 @@
############################################################
# FlatCAM: 2D Post-processing for Manufacturing #
# http://flatcam.org #
# File Author: Marius Adrian Stanciu (c) #
# Date: 3/10/2019 #
# MIT Licence #
############################################################
from FlatCAMTool import FlatCAMTool from FlatCAMTool import FlatCAMTool
from copy import copy, deepcopy from copy import copy, deepcopy
from ObjectCollection import * from ObjectCollection import *
@ -397,85 +405,6 @@ class Panelize(FlatCAMTool):
rows -= 1 rows -= 1
panel_lengthy = ((ymax - ymin) * rows) + (spacing_rows * (rows - 1)) panel_lengthy = ((ymax - ymin) * rows) + (spacing_rows * (rows - 1))
# def clean_temp():
# # deselect all to avoid delete selected object when run delete from shell
# self.app.collection.set_all_inactive()
#
# for del_obj in self.objs:
# self.app.collection.set_active(del_obj.options['name'])
# self.app.on_delete()
#
# self.objs[:] = []
# def panelize():
# if panel_obj is not None:
# self.app.inform.emit("Generating panel ... Please wait.")
#
# self.app.progress.emit(10)
#
# if isinstance(panel_obj, FlatCAMExcellon):
# currenty = 0.0
# self.app.progress.emit(0)
#
# def initialize_local_excellon(obj_init, app):
# obj_init.tools = panel_obj.tools
# # drills are offset, so they need to be deep copied
# obj_init.drills = deepcopy(panel_obj.drills)
# obj_init.offset([float(currentx), float(currenty)])
# obj_init.create_geometry()
# self.objs.append(obj_init)
#
# self.app.progress.emit(0)
# for row in range(rows):
# currentx = 0.0
# for col in range(columns):
# local_outname = self.outname + ".tmp." + str(col) + "." + str(row)
# self.app.new_object("excellon", local_outname, initialize_local_excellon, plot=False,
# autoselected=False)
# currentx += lenghtx
# currenty += lenghty
# else:
# currenty = 0
# self.app.progress.emit(0)
#
# def initialize_local_geometry(obj_init, app):
# obj_init.solid_geometry = panel_obj.solid_geometry
# obj_init.offset([float(currentx), float(currenty)])
# self.objs.append(obj_init)
#
# self.app.progress.emit(0)
# for row in range(rows):
# currentx = 0
#
# for col in range(columns):
# local_outname = self.outname + ".tmp." + str(col) + "." + str(row)
# self.app.new_object("geometry", local_outname, initialize_local_geometry, plot=False,
# autoselected=False)
# currentx += lenghtx
# currenty += lenghty
#
# def job_init_geometry(obj_fin, app_obj):
# FlatCAMGeometry.merge(self.objs, obj_fin)
#
# def job_init_excellon(obj_fin, app_obj):
# # merge expects tools to exist in the target object
# obj_fin.tools = panel_obj.tools.copy()
# FlatCAMExcellon.merge(self.objs, obj_fin)
#
# if isinstance(panel_obj, FlatCAMExcellon):
# self.app.progress.emit(50)
# self.app.new_object("excellon", self.outname, job_init_excellon, plot=True, autoselected=True)
# else:
# self.app.progress.emit(50)
# self.app.new_object("geometry", self.outname, job_init_geometry, plot=True, autoselected=True)
#
# else:
# self.app.inform.emit("[ERROR_NOTCL] Obj is None")
# return "ERROR: Obj is None"
# panelize()
# clean_temp()
def panelize_2(): def panelize_2():
if panel_obj is not None: if panel_obj is not None:
self.app.inform.emit(_("Generating panel ... Please wait.")) self.app.inform.emit(_("Generating panel ... Please wait."))

View File

@ -1,3 +1,11 @@
############################################################
# FlatCAM: 2D Post-processing for Manufacturing #
# http://flatcam.org #
# File Author: Marius Adrian Stanciu (c) #
# Date: 3/10/2019 #
# MIT Licence #
############################################################
from PyQt5 import QtGui, QtCore, QtWidgets from PyQt5 import QtGui, QtCore, QtWidgets
from PyQt5.QtCore import Qt from PyQt5.QtCore import Qt
from FlatCAMTool import FlatCAMTool from FlatCAMTool import FlatCAMTool

View File

@ -1,3 +1,11 @@
############################################################
# FlatCAM: 2D Post-processing for Manufacturing #
# http://flatcam.org #
# File Author: Marius Adrian Stanciu (c) #
# Date: 3/10/2019 #
# MIT Licence #
############################################################
from FlatCAMTool import FlatCAMTool from FlatCAMTool import FlatCAMTool
from FlatCAMCommon import LoudDict from FlatCAMCommon import LoudDict
from GUIElements import FCComboBox, FCEntry, FCTable from GUIElements import FCComboBox, FCEntry, FCTable

View File

@ -1,3 +1,11 @@
############################################################
# FlatCAM: 2D Post-processing for Manufacturing #
# http://flatcam.org #
# File Author: Marius Adrian Stanciu (c) #
# Date: 3/10/2019 #
# MIT Licence #
############################################################
from PyQt5 import QtGui, QtCore, QtWidgets from PyQt5 import QtGui, QtCore, QtWidgets
from PyQt5.QtCore import Qt from PyQt5.QtCore import Qt
from GUIElements import FCEntry, FCButton, OptionalInputSection from GUIElements import FCEntry, FCButton, OptionalInputSection

View File

@ -2,10 +2,10 @@
# FlatCAM: 2D Post-processing for Manufacturing # # FlatCAM: 2D Post-processing for Manufacturing #
# http://flatcam.org # # http://flatcam.org #
# Author: Juan Pablo Caram (c) # # Author: Juan Pablo Caram (c) #
# Date: 12/20/2018 # # Date: 12/20/2018 #
# MIT Licence # # MIT Licence #
# # # #
# Creates a portable copy of FlatCAM, including Python # # Creates a portable copy of FlatCAM, including Python #
# itself and all dependencies. # # itself and all dependencies. #
# # # #
# This is not an aid to install FlatCAM from source on # # This is not an aid to install FlatCAM from source on #
@ -13,6 +13,12 @@
# and running and ready to be packaged. # # and running and ready to be packaged. #
############################################################ ############################################################
############################################################
# File Modified (major mod): Marius Adrian Stanciu #
# Date: 3/10/2019 #
############################################################
# Files not needed: Qt, tk.dll, tcl.dll, tk/, tcl/, vtk/, # Files not needed: Qt, tk.dll, tcl.dll, tk/, tcl/, vtk/,
# scipy.lib.lapack.flapack.pyd, scipy.lib.blas.fblas.pyd, # scipy.lib.lapack.flapack.pyd, scipy.lib.blas.fblas.pyd,
# numpy.core._dotblas.pyd, scipy.sparse.sparsetools._bsr.pyd, # numpy.core._dotblas.pyd, scipy.sparse.sparsetools._bsr.pyd,

View File

@ -1,3 +1,11 @@
############################################################
# FlatCAM: 2D Post-processing for Manufacturing #
# http://flatcam.org #
# File Author: Marius Adrian Stanciu (c) #
# Date: 3/10/2019 #
# MIT Licence #
############################################################
from FlatCAMPostProc import * from FlatCAMPostProc import *

View File

@ -1,3 +1,11 @@
############################################################
# FlatCAM: 2D Post-processing for Manufacturing #
# http://flatcam.org #
# File Author: Marius Adrian Stanciu (c) #
# Date: 3/10/2019 #
# MIT Licence #
############################################################
from FlatCAMPostProc import * from FlatCAMPostProc import *

View File

@ -1,3 +1,11 @@
############################################################
# FlatCAM: 2D Post-processing for Manufacturing #
# http://flatcam.org #
# File Author: Marius Adrian Stanciu (c) #
# Date: 3/10/2019 #
# MIT Licence #
############################################################
from FlatCAMPostProc import * from FlatCAMPostProc import *

View File

@ -1,3 +1,11 @@
############################################################
# FlatCAM: 2D Post-processing for Manufacturing #
# http://flatcam.org #
# File Author: Marius Adrian Stanciu (c) #
# Date: 3/10/2019 #
# MIT Licence #
############################################################
from FlatCAMPostProc import * from FlatCAMPostProc import *

View File

@ -1,3 +1,11 @@
############################################################
# FlatCAM: 2D Post-processing for Manufacturing #
# http://flatcam.org #
# File Author: Marius Adrian Stanciu (c) #
# Date: 3/10/2019 #
# MIT Licence #
############################################################
from FlatCAMPostProc import * from FlatCAMPostProc import *

View File

@ -1,3 +1,11 @@
############################################################
# FlatCAM: 2D Post-processing for Manufacturing #
# http://flatcam.org #
# File Author: Marius Adrian Stanciu (c) #
# Date: 3/10/2019 #
# MIT Licence #
############################################################
from FlatCAMPostProc import * from FlatCAMPostProc import *

View File

@ -1,3 +1,11 @@
############################################################
# FlatCAM: 2D Post-processing for Manufacturing #
# http://flatcam.org #
# File Author: Matthieu Berthomé #
# Date: 5/26/2017 #
# MIT Licence #
############################################################
from FlatCAMPostProc import * from FlatCAMPostProc import *

View File

@ -1,3 +1,11 @@
############################################################
# FlatCAM: 2D Post-processing for Manufacturing #
# http://flatcam.org #
# File Author: Matthieu Berthomé #
# Date: 5/26/2017 #
# MIT Licence #
############################################################
from FlatCAMPostProc import * from FlatCAMPostProc import *

View File

@ -1,3 +1,11 @@
############################################################
# FlatCAM: 2D Post-processing for Manufacturing #
# http://flatcam.org #
# File Author: Matthieu Berthomé #
# Date: 5/26/2017 #
# MIT Licence #
############################################################
from FlatCAMPostProc import * from FlatCAMPostProc import *
# This post processor is configured to output code that # This post processor is configured to output code that

View File

@ -1,3 +1,11 @@
############################################################
# FlatCAM: 2D Post-processing for Manufacturing #
# http://flatcam.org #
# File Author: Marius Adrian Stanciu (c) #
# Date: 3/10/2019 #
# MIT Licence #
############################################################
from FlatCAMPostProc import * from FlatCAMPostProc import *

View File

@ -1,3 +1,11 @@
############################################################
# FlatCAM: 2D Post-processing for Manufacturing #
# http://flatcam.org #
# File Author: Marius Adrian Stanciu (c) #
# Date: 3/10/2019 #
# MIT Licence #
############################################################
from FlatCAMPostProc import * from FlatCAMPostProc import *

View File

@ -1,3 +1,11 @@
############################################################
# FlatCAM: 2D Post-processing for Manufacturing #
# http://flatcam.org #
# File Author: Marius Adrian Stanciu (c) #
# Date: 3/10/2019 #
# MIT Licence #
############################################################
from FlatCAMPostProc import * from FlatCAMPostProc import *