[Start] Fix Minor Regression on LoadCustom
Handle image files using FreeCADGui but all other formats using FreeCAD
This commit is contained in:
@@ -1,23 +1,23 @@
|
||||
#***************************************************************************
|
||||
#* Copyright (c) 2018 Yorik van Havre <yorik@uncreated.net> *
|
||||
#* *
|
||||
#* This program is free software; you can redistribute it and/or modify *
|
||||
#* it under the terms of the GNU Lesser General Public License (LGPL) *
|
||||
#* as published by the Free Software Foundation; either version 2 of *
|
||||
#* the License, or (at your option) any later version. *
|
||||
#* for detail see the LICENCE text file. *
|
||||
#* *
|
||||
#* This program is distributed in the hope that it will be useful, *
|
||||
#* but WITHOUT ANY WARRANTY; without even the implied warranty of *
|
||||
#* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
|
||||
#* GNU Library General Public License for more details. *
|
||||
#* *
|
||||
#* You should have received a copy of the GNU Library General Public *
|
||||
#* License along with this program; if not, write to the Free Software *
|
||||
#* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 *
|
||||
#* USA *
|
||||
#* *
|
||||
#***************************************************************************
|
||||
# ***************************************************************************
|
||||
# * Copyright (c) 2018 Yorik van Havre <yorik@uncreated.net> *
|
||||
# * *
|
||||
# * This program is free software; you can redistribute it and/or modify *
|
||||
# * it under the terms of the GNU Lesser General Public License (LGPL) *
|
||||
# * as published by the Free Software Foundation; either version 2 of *
|
||||
# * the License, or (at your option) any later version. *
|
||||
# * for detail see the LICENCE text file. *
|
||||
# * *
|
||||
# * This program is distributed in the hope that it will be useful, *
|
||||
# * but WITHOUT ANY WARRANTY; without even the implied warranty of *
|
||||
# * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
|
||||
# * GNU Library General Public License for more details. *
|
||||
# * *
|
||||
# * You should have received a copy of the GNU Library General Public *
|
||||
# * License along with this program; if not, write to the Free Software *
|
||||
# * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 *
|
||||
# * USA *
|
||||
# * *
|
||||
# ***************************************************************************
|
||||
|
||||
import os
|
||||
import FreeCAD
|
||||
@@ -27,7 +27,9 @@ from urllib.parse import unquote
|
||||
|
||||
|
||||
# filename will be given before this script is run
|
||||
cfolders = FreeCAD.ParamGet("User parameter:BaseApp/Preferences/Mod/Start").GetString("ShowCustomFolder","")
|
||||
cfolders = FreeCAD.ParamGet("User parameter:BaseApp/Preferences/Mod/Start").GetString(
|
||||
"ShowCustomFolder", ""
|
||||
)
|
||||
if cfolders:
|
||||
dirnumber = int(filename[0])
|
||||
filename = filename[2:]
|
||||
@@ -36,8 +38,30 @@ if cfolders:
|
||||
cfolder = os.path.dirname(cfolder)
|
||||
f = unquote(filename).replace("+", " ")
|
||||
ext = os.path.splitext(filename)[1].lower().strip(".")
|
||||
mod = FreeCAD.ParamGet("User parameter:BaseApp/Preferences/Mod/Start").GetString("DefaultImport"+ext,"")
|
||||
FreeCADGui.loadFile(os.path.join(cfolder, f),mod)
|
||||
mod = FreeCAD.ParamGet("User parameter:BaseApp/Preferences/Mod/Start").GetString(
|
||||
"DefaultImport" + ext, ""
|
||||
)
|
||||
if (
|
||||
ext.lower() == "bmp"
|
||||
or ext.lower() == "cur"
|
||||
or ext.lower() == "gif"
|
||||
or ext.lower() == "ico"
|
||||
or ext.lower() == "pbm"
|
||||
or ext.lower() == "pgm"
|
||||
or ext.lower() == "png"
|
||||
or ext.lower() == "jpg"
|
||||
or ext.lower() == "jpeg"
|
||||
or ext.lower() == "ppm"
|
||||
or ext.lower() == "svg"
|
||||
or ext.lower() == "svgz"
|
||||
or ext.lower() == "xbm"
|
||||
or ext.lower() == "xpm"
|
||||
):
|
||||
App.newDocument()
|
||||
FreeCADGui.insert(os.path.join(cfolder, f), App.activeDocument().Name)
|
||||
App.activeDocument().recompute()
|
||||
else:
|
||||
FreeCAD.loadFile(os.path.join(cfolder, f), mod)
|
||||
FreeCADGui.activeDocument().sendMsgToViews("ViewFit")
|
||||
|
||||
from StartPage import StartPage
|
||||
|
||||
Reference in New Issue
Block a user