xython 1.1.0__tar.gz → 1.3.0__tar.gz

{xython-1.1.0/src/xython.egg-info → xython-1.3.0}/PKG-INFO

@@ -1,13 +1,13 @@
 Metadata-Version: 2.1
 Name: xython
-Version: 1.1.0
+Version: 1.3.0
 Summary: Easy Read / Write for Excel, Word, Color, Etc using Python
 Home-page: https://github.com/sjpark/xython
-Download-URL: https://github.com/sjpark/xython/archive/v1.1.0.tar.gz
+Download-URL: https://github.com/sjpark/xython/archive/v1.3.0.tar.gz
 Author: sjpark
 Author-email: sjpkorea@yahoo.com
 Classifier: License :: OSI Approved :: MIT License
-Requires-Python: >=3.10
+Requires-Python: >=3.9
 Description-Content-Type: text/markdown
 
 ## xython 모듈에 대하여

{xython-1.1.0 → xython-1.3.0}/setup.py

@@ -4,9 +4,9 @@ from setuptools import setup, find_packages
 #    long_description = fh.read()
 setup(
     name='xython',
-    version='1.1.0',
+    version='1.3.0',
     url='https://github.com/sjpark/xython',
-    download_url='https://github.com/sjpark/xython/archive/v1.1.0.tar.gz',
+    download_url='https://github.com/sjpark/xython/archive/v1.3.0.tar.gz',
     author='sjpark',
     author_email='sjpkorea@yahoo.com',
     description='Easy Read / Write for Excel, Word, Color, Etc using Python',
@@ -19,7 +19,7 @@ setup(
     long_description_content_type="text/markdown",
     long_description=open('README.md', "r", encoding='UTF8').read(),
     install_requires=[''],
-    python_requires='>=3.10',
+    python_requires='>=3.9',
     zip_safe=False,
     classifiers=['License :: OSI Approved :: MIT License'],
     )

{xython-1.1.0 → xython-1.3.0}/src/xython/__init__.py

@@ -6,12 +6,12 @@ import inspect
 import os
 import sys
 
-__version__ = '3.0.0'
+__version__ = '1.3.0'
 real_path = os.path.dirname(os.path.abspath(__file__)).replace("\\","/")
 sys.path.append(real_path)
 
 try:
-    from xython import xython
+    from xython import *
 
 except ImportError as e:
     print(e," Please re-check.")

{xython-1.1.0 → xython-1.3.0}/src/xython/anydb.py

@@ -57,7 +57,7 @@ class anydb:
 		col_list.extend(value_list)
 		return col_list
 
-	def change_dic_to_sql_data(self, dic_data):
+	def change_dic_to_list_as_col_value_style(self, dic_data):
 		"""
 		사전의 자료를 sql에 입력이 가능한 형식으로 만드는 것
 		결과 : [[컬럼리스트], [자료1], [자료2]....]
@@ -76,17 +76,12 @@ class anydb:
 		출력형태 : dataframe로 바꾼것
 		"""
 		checked_list2d = self.yt.change_list1d_to_list2d(list2d)
-		checked_col_list = []
 		# 컬럼의 이름이 없거나하면 기본적인 이름을 만드는 것이다
-		if col_list == "" or col_list == []:
-			for num in range(len(checked_list2d)):
-				checked_col_list.append("col" + str(num))
-		else:
-			checked_col_list = col_list
-		input_df = pd.DataFrame(data=checked_list2d, columns=col_list)
+		checked_col_list = self.check_input_data(col_list, list2d)
+		input_df = pd.DataFrame(data=checked_list2d, columns=checked_col_list)
 		return input_df
 
-	def change_sqlite_table_to_df(self, table_name, db_name=""):
+	def change_sqlite_to_df(self, table_name, db_name=""):
 		"""
 		sqlite의 테이블을 df로 변경
 		"""
@@ -99,7 +94,7 @@ class anydb:
 		input_df = pd.DataFrame.from_records(data=sql_result.fetchall(), columns=cols)
 		return input_df
 
-	def change_sqlite_table_to_list(self, table_name, db_name=""):
+	def change_sqlite_to_list(self, table_name, db_name=""):
 		"""
 		sqlite의 테이블 자료를 리스트로 변경
 		출력형태 :[2차원리스트(제목), 2차원리스트(값들)]
@@ -131,13 +126,13 @@ class anydb:
 			col_name = col_name.replace(data1, data2)
 		return col_name
 
-	def check_col_name_all_in_sqlite_table(self, table_name, db_name =""):
+	def check_col_name_all_in_sqlite(self, table_name, db_name =""):
 		"""
 		현재 있는 테이블의 이름에 특수문자들을 지우는 것이다
 		공백을 _로 변경하는것, Column의 이름을 변경한다
 		"""
 		self.check_cursor(db_name)
-		all_col_names = self.read_col_name_all_in_sqlite_table(db_name, table_name)
+		all_col_names = self.read_col_name_all_in_sqlite(db_name, table_name)
 		for col_name in all_col_names:
 			col_name_new = self.check_col_name(col_name)
 			if not col_name_new == col_name:
@@ -162,6 +157,16 @@ class anydb:
 			result = ""
 		return result
 
+	def check_input_data(self, col_list, data_list):
+		result = []
+		# 컬럼의 이름이 없거나하면 기본적인 이름을 만드는 것이다
+		if col_list == "" or col_list == []:
+			for num in range(len(data_list)):
+				result.append("col" + str(num))
+		else:
+			result = col_list
+		return result
+
 	def check_df_range(self, input_df):
 		"""
 		개인적으로 만든 이용형태를 것으로,
@@ -189,7 +194,7 @@ class anydb:
 			temp.append(one)
 		return temp
 
-	def delete_column_in_sqlite_table(self, table_name, col_name_list, db_name=""):
+	def delete_column_in_sqlite(self, table_name, col_name_list, db_name=""):
 		"""
 		컬럼 삭제
 		입력형태 : ["col_1","col_2","col_3"]
@@ -211,12 +216,12 @@ class anydb:
 		input_df.dropna(how="all", axis=1, inplace=True)
 		return input_df
 
-	def delete_empty_column_in_sqlite_table(self, table_name, db_name=""):
+	def delete_empty_column_in_sqlite(self, table_name, db_name=""):
 		"""
 		테이블의 컬럼중에서 아무런 값도 없는 컬럼을 삭제한다
 		"""
 		self.check_cursor(db_name)
-		col_name_all = self.read_col_name_all_in_sqlite_table(db_name, table_name)
+		col_name_all = self.read_col_name_all_in_sqlite(db_name, table_name)
 
 		for col_name in col_name_all:
 			sql = ("select COUNT(*) from %s where %s is not null" % (table_name, col_name))
@@ -226,14 +231,14 @@ class anydb:
 				sql = ("ALTER TABLE %s DROP COLUMN %s " % (table_name, col_name))
 				self.cursor.execute(sql)
 
-	def delete_sqlite_table(self, table_name, db_name=""):
+	def delete_sqlite(self, table_name, db_name=""):
 		"""
 		입력형태 : 테이블이름
 		"""
 		self.check_cursor(db_name)
 		self.cursor.execute("DROP TABLE " + table_name)
 
-	def insert_cols_in_sqlite_table(self, table_name, col_data_list_s, db_name=""):
+	def insert_cols_in_sqlite(self, table_name, col_data_list_s, db_name=""):
 		"""
 		새로운 컬럼을 만든다
 		col_data_list_s : [["이름1","int"],["이름2","text"]]
@@ -297,7 +302,7 @@ class anydb:
 		"""
 		self.make_connection_with_sqlite_db(db_name)
 
-	def make_new_sqlite_table_with_column(self, table_name, column_data_list, db_name=""):
+	def make_new_sqlite_with_column(self, table_name, column_data_list, db_name=""):
 		"""
 		어떤 형태의 자료가 입력이 되어도 테이블을 만드는 sql을 만드는 것이다
 		입력형태 1 : 테이블이름, [['번호1',"text"], ['번호2',"text"],['번호3',"text"],['번호4',"text"]]
@@ -371,7 +376,7 @@ class anydb:
 		"""
 		return result
 
-	def read_col_name_all_in_sqlite_table(self, table_name, db_name=""):
+	def read_col_name_all_in_sqlite(self, table_name, db_name=""):
 		"""
 		해당하는 테이의 컬럼구조를 갖고온다
 		입력형태 : 테이블이름
@@ -385,7 +390,7 @@ class anydb:
 			result.append(one_list[1])
 		return result
 
-	def read_col_property_all_in_sqlite_table(self, table_name, db_name=""):
+	def read_col_property_all_in_sqlite(self, table_name, db_name=""):
 		"""
 		해당하는 테이블의 컬럼의 모든 구조를 갖고온다
 		"""
@@ -397,7 +402,7 @@ class anydb:
 			result.append(temp_2)
 		return result
 
-	def read_columns_data_from_no1_to_no2_in_sqlite_table(self, table_name, offset=0, row_count=100, db_name=""):
+	def read_columns_data_from_no1_to_no2_in_sqlite(self, table_name, offset=0, row_count=100, db_name=""):
 		"""
 		테이블의 자료중 원하는 갯수만 읽어오는 것
 		"""
@@ -467,6 +472,14 @@ class anydb:
 		result = df_obj.iat[int(xy[0]), int(xy[1])]
 		return result
 
+	def read_pickle_file(self, path_n_name=""):
+		"""
+		pickle로 자료를 만든것을 읽어오는 것이다
+		"""
+		with open(path_n_name, "rb") as fr:
+			result = pickle.load(fr)
+		return result
+
 	def read_table_data_by_col_names_at_sqlite(self, col_name_s="", condition="all", db_name=""):
 		"""
 		문자는 컬럼이름으로, 숫자는 몇번째인것으로...
@@ -487,7 +500,7 @@ class anydb:
 		result = self.cursor.fetchall()
 		return result
 
-	def read_table_data_for_sqlite_table(self, table_name, db_name=""):
+	def read_table_data_for_sqlite(self, table_name, db_name=""):
 		"""
 		테이블의 모든 자료를 읽어온다
 		입력형태 : 테이블 이름
@@ -523,6 +536,15 @@ class anydb:
 		self.con.commit()
 		return result
 
+	def save_input_data_to_pickle_file(self, source_data = "", file_name = "", path = "D:\\"):
+		"""
+		자료를 pickle 로 저장하는것
+		"""
+		if not "." in file_name:
+			file_name = file_name +".pickle"
+		with open(path+file_name, "wb") as fr:
+			pickle.dump(source_data, fr)
+
 	def save_sqlite_memorydb_to_diskdb(self, db_name=""):
 		"""
 		memory에 저장된것을 화일로 저장하는것
@@ -560,7 +582,7 @@ class anydb:
 		"""
 		return result
 
-	def write_data_in_sqlite_table(self, table_name, col_name_s, col_value_s, db_name=""):
+	def write_data_to_sqlite(self, table_name, col_name_s, col_value_s, db_name=""):
 		"""
 		"""
 		self.check_cursor(db_name)
@@ -586,22 +608,22 @@ class anydb:
 		excel.write_list1d_in_yline("", xy, col_list)
 		excel.write_value_in_range_as_speedy("", [xy[0] + 1, xy[1]], value_list)
 
-	def write_df_to_sqlite_table(self, table_name, df_data, db_name=""):
+	def write_df_to_sqlite(self, table_name, df_data, db_name=""):
 		"""
 		df자료를 sqlite에 새로운 테이블로 만들어서 넣는 것
 		"""
 		self.check_cursor(db_name)
 		df_data.to_sql(table_name, self.con)
 
-	def write_dic_in_sqlite_table(self, table_name, dic_data, db_name=""):
+	def write_dic_to_sqlite(self, table_name, dic_data, db_name=""):
 		"""
 		사전의 키를 y이름으로 해서 값을 입력한다
 		"""
 		self.check_cursor(db_name)
 
 		for one_col in list(dic_data[0].keys()):
-			if not one_col in self.read_col_name_all_in_sqlite_table(table_name):
-				self.insert_cols_in_sqlite_table(table_name, [one_col])
+			if not one_col in self.read_col_name_all_in_sqlite(table_name):
+				self.insert_cols_in_sqlite(table_name, [one_col])
 
 		sql = self.make_insert_sql_by_col_names(table_name, list(dic_data[0].keys()))
 		value_list = []
@@ -609,7 +631,7 @@ class anydb:
 			value_list.append(list(one_dic.values()))
 		self.cursor.executemany(sql, value_list)
 
-	def write_list_to_sqlite_table(self, table_name, col_name_s, list_values, db_name=""):
+	def write_list_to_sqlite(self, table_name, col_name_s, list_values, db_name=""):
 		"""
 		리스트의 형태로 넘어오는것중에 y이름과 값을 분리해서 얻는 것이다
 		"""
@@ -617,7 +639,7 @@ class anydb:
 		sql = self.make_insert_sql_by_col_names(table_name, col_name_s)
 		self.cursor.executemany(sql, list_values)
 
-	def write_sqlite_table_data_all_to_df(self, table_name, db_name=""):
+	def write_sqlite_data_all_to_df(self, table_name, db_name=""):
 		"""
 		sqlite를 df로 만드는것
 		"""
@@ -628,7 +650,7 @@ class anydb:
 		input_df = pd.DataFrame.from_records(data=query.fetchall(), columns=cols)
 		return input_df
 
-	def write_value_in_df_by_xy(self, df, xy, value):
+	def write_value_to_df_by_xy(self, df, xy, value):
 		"""
 		dataframe에 좌표로 값을 저장
 		"""
@@ -641,21 +663,4 @@ class anydb:
 			data_set = [(lambda x: np.NaN)(a) for a in range(len(df.columns))]
 			for no in range(xy[0] - x_max):
 				df.loc[len(df.index)] = data_set
-		df.iat[int(xy[0]), int(xy[1])] = value
-
-	def read_pickle_file(self, path_n_name=""):
-		"""
-		pickle로 자료를 만든것을 읽어오는 것이다
-		"""
-		with open(path_n_name, "rb") as fr:
-			result = pickle.load(fr)
-		return result
-
-	def save_input_data_to_pickle_file(self, source_data = "", file_name = "", path = "D:\\"):
-		"""
-		자료를 pickle 로 저장하는것
-		"""
-		if not "." in file_name:
-			file_name = file_name +".pickle"
-		with open(path+file_name, "wb") as fr:
-			pickle.dump(source_data, fr)
+		df.iat[int(xy[0]), int(xy[1])] = value

{xython-1.1.0 → xython-1.3.0}/src/xython/basic_data.py

@@ -821,6 +821,236 @@ class basic_data:
 		              "중복된 단어 찾기": [4, "\\b(\\w+)\\s+\\1\\b", "type_z0"],
 		              }
 
+		self.vars["shape_enum"] ={
+			'mixed': -2,
+			'rectangle': 1,
+			'직사각형': 1,
+			'parallelogram': 2,
+			'평행사변형': 2,
+			'trapezoid': 3,
+			'사다리꼴': 3,
+			'diamond': 4,
+			'다이아몬드': 4,
+			'roundedrectangle': 5,
+			'둥근모서리사각형': 5,
+			'Octagon': 6,
+			'팔각형': 6,
+			'isoscelestriangle': 7,
+			'이등변삼각형': 7,
+			'RightTriangle': 8,
+			'직각삼각형': 8,
+			'Oval': 9,
+			'타원': 9,
+			'Hexagon': 10,
+			'육각형': 10,
+			'Cross': 11,
+			'십자형': 11,
+			'RegularPentagon': 12,
+			'오각형': 12,
+			'Can': 13,
+			'원통형': 13,
+			'Cube': 14,
+			'정육면체': 14,
+			'Bevel': 15,
+			'빗면사각형': 15,
+			'FoldedCorner': 16,
+			'모서리접힌사각형': 16,
+			'SmileyFace': 17,
+			'웃는얼굴': 17,
+			'Donut': 18,
+			'원형': 18,
+			'NoSymbol': 19,
+			'BlockArc': 20,
+			'막힌원호': 20,
+			'Heart': 21,
+			'하트': 21,
+			'LightningBolt': 22,
+			'번개': 22,
+			'Sun': 23,
+			'해': 23,
+			'Moon': 24,
+			'달': 24,
+			'Arc': 25,
+			'원호': 25,
+			'DoubleBracket': 26,
+			'양쪽대괄호': 26,
+			'DoubleBrace': 27,
+			'양쪽중괄호': 27,
+			'Plaque': 28,
+			'배지': 28,
+			'LeftBracket': 29,
+			'왼쪽대괄호': 29,
+			'RightBracket': 30,
+			'오른쪽대괄호': 30,
+			'LeftBrace': 31,
+			'왼쪽중괄호': 31,
+			'RightBrace': 32,
+			'오른쪽중괄호': 32,
+			'RightArrow': 33,
+			'오른쪽화살표': 33,
+			'LeftArrow': 34,
+			'왼쪽화살표': 34,
+			'UpArrow': 35,
+			'위쪽화살표': 35,
+			'DownArrow': 36,
+			'아래쪽화살표': 36,
+			'LeftRightArrow': 37,
+			'왼쪽오른쪽화살표': 37,
+			'UpDownArrow': 38,
+			'위쪽아래쪽화살표': 38,
+			'QuadArrow': 39,
+			'상하좌우화살표': 39,
+			'LeftRightUpArrow': 40,
+			'상좌우화살표': 40,
+			'BentArrow': 41,
+			'굽음화살표': 41,
+			'UTurnArrow': 42,
+			'U턴화살표': 42,
+			'LeftUpArrow': 43,
+			'좌상화살표': 43,
+			'BentUpArrow': 44,
+			'위로굽음화살표': 44,
+			'CurvedRightArrow': 45,
+			'CurvedLeftArrow': 46,
+			'CurvedUpArrow': 47,
+			'CurvedDownArrow': 48,
+			'StripedRightArrow': 49,
+			'NotchedRightArrow': 50,
+			'Pentagon': 51,
+			'Chevron': 52,
+			'RightArrowCallout': 53,
+			'LeftArrowCallout': 54,
+			'UpArrowCallout': 55,
+			'DownArrowCallout': 56,
+			'LeftRightArrowCallout': 57,
+			'UpDownArrowCallout': 58,
+			'QuadArrowCallout': 59,
+			'CircularArrow': 60,
+			'FlowchartProcess': 61,
+			'FlowchartAlternateProcess': 62,
+			'FlowchartDecision': 63,
+			'FlowchartData': 64,
+			'FlowchartPredefinedProcess': 65,
+			'FlowchartInternalStorage': 66,
+			'FlowchartDocument': 67,
+			'FlowchartMultidocument': 68,
+			'FlowchartTerminator': 69,
+			'FlowchartPreparation': 70,
+			'FlowchartManualInput': 71,
+			'FlowchartManualOperation': 72,
+			'FlowchartConnector': 73,
+			'FlowchartOffpageConnector': 74,
+			'FlowchartCard': 75,
+			'FlowchartPunchedTape': 76,
+			'FlowchartSummingJunction': 77,
+			'FlowchartOr': 78,
+			'FlowchartCollate': 79,
+			'FlowchartSort': 80,
+			'FlowchartExtract': 81,
+			'FlowchartMerge': 82,
+			'FlowchartStoredData': 83,
+			'FlowchartDelay': 84,
+			'FlowchartSequentialAccessStorage': 85,
+			'FlowchartMagneticDisk': 86,
+			'FlowchartDirectAccessStorage': 87,
+			'FlowchartDisplay': 88,
+			'Explosion1': 89,
+			'Explosion2': 90,
+			'4pointStar': 91,
+			'5pointStar': 92,
+			'8pointStar': 93,
+			'16pointStar': 94,
+			'24pointStar': 95,
+			'32pointStar': 96,
+			'UpRibbon': 97,
+			'DownRibbon': 98,
+			'CurvedUpRibbon': 99,
+			'CurvedDownRibbon': 100,
+			'VerticalScroll': 101,
+			'HorizontalScroll': 102,
+			'Wave': 103,
+			'DoubleWave': 104,
+			'RectangularCallout': 105,
+			'RoundedRectangularCallout': 106,
+			'OvalCallout': 107,
+			'CloudCallout': 108,
+			'LineCallout1': 109,
+			'LineCallout2': 110,
+			'LineCallout3': 111,
+			'LineCallout4': 112,
+			'LineCallout1AccentBar': 113,
+			'LineCallout2AccentBar': 114,
+			'LineCallout3AccentBar': 115,
+			'LineCallout4AccentBar': 116,
+			'LineCallout1NoBorder': 117,
+			'LineCallout2NoBorder': 118,
+			'LineCallout3NoBorder': 119,
+			'LineCallout4NoBorder': 120,
+			'LineCallout1BorderandAccentBar': 121,
+			'LineCallout2BorderandAccentBar': 122,
+			'LineCallout3BorderandAccentBar': 123,
+			'LineCallout4BorderandAccentBar': 124,
+			'ActionButtonCustom': 125,
+			'ActionButtonHome': 126,
+			'ActionButtonHelp': 127,
+			'ActionButtonInformation': 128,
+			'ActionButtonBackorPrevious': 129,
+			'ActionButtonForwardorNext': 130,
+			'ActionButtonBeginning': 131,
+			'ActionButtonEnd': 132,
+			'ActionButtonReturn': 133,
+			'ActionButtonDocument': 134,
+			'ActionButtonSound': 135,
+			'ActionButtonMovie': 136,
+			'Balloon': 137,
+			'NotPrimitive': 138,
+			'FlowchartOfflineStorage': 139,
+			'LeftRightRibbon': 140,
+			'DiagonalStripe': 141,
+			'Pie': 142,
+			'NonIsoscelesTrapezoid': 143,
+			'Decagon': 144,
+			'Heptagon': 145,
+			'Dodecagon': 146,
+			'6pointStar': 147,
+			'7pointStar': 148,
+			'10pointStar': 149,
+			'12pointStar': 150,
+			'Round1Rectangle': 151,
+			'Round2SameRectangle': 152,
+			'SnipRoundRectangle': 154,
+			'Snip1Rectangle': 155,
+			'Snip2SameRectangle': 156,
+			'Round2DiagRectangle': 157,
+			'Snip2DiagRectangle': 157,
+			'Frame': 158,
+			'HalfFrame': 159,
+			'Tear': 160,
+			'Chord': 161,
+			'Corner': 162,
+			'MathPlus': 163,
+			'MathMinus': 164,
+			'MathMultiply': 165,
+			'MathDivide': 166,
+			'MathEqual': 167,
+			'MathNotEqual': 168,
+			'CornerTabs': 169,
+			'SquareTabs': 170,
+			'PlaqueTabs': 171,
+			'Gear6': 172,
+			'Gear9': 173,
+			'Funnel': 174,
+			'PieWedge': 175,
+			'LeftCircularArrow': 176,
+			'LeftRightCircularArrow': 177,
+			'SwooshArrow': 178,
+			'Cloud': 179,
+			'ChartX': 180,
+			'ChartStar': 181,
+			'ChartPlus': 182,
+			'LineInverse': 183,}
+
+
 class basic_cell_class():
 	# 각 셀에대해서 어떤 자료들을 넣을수있을지 설정하도록 만든 것이다
 	# 다음에 추가적인것들도 가능하도록 클래스로 만든 것이다