Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
G
GEPARD
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Operations
Operations
Incidents
Packages & Registries
Packages & Registries
Package Registry
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
GEPARD
GEPARD
Commits
744ab90b
Commit
744ab90b
authored
Sep 27, 2019
by
Lars Bittrich
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
legacyConvert.py: fixed relative import
binary module tsp removed! ramancontrol.py: fixed default
parent
a1f9b4a1
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
2 additions
and
2 deletions
+2
-2
external/tsp.cp36-win_amd64.pyd
external/tsp.cp36-win_amd64.pyd
+0
-0
legacyConvert.py
legacyConvert.py
+1
-1
ramancom/ramancontrol.py
ramancom/ramancontrol.py
+1
-1
No files found.
external/tsp.cp36-win_amd64.pyd
deleted
100644 → 0
View file @
a1f9b4a1
File deleted
legacyConvert.py
View file @
744ab90b
...
...
@@ -36,7 +36,7 @@ def legacyConversion(dset, recreatefullimage=False):
print
(
"This may take some time"
)
# local imports as these functions are only needed for the rare occasion of legacy conversion
from
opticalscan
import
loadAndPasteImage
from
.
opticalscan
import
loadAndPasteImage
# try to load png and check for detection contours
recreatefullimage
=
recreatefullimage
or
not
os
.
path
.
exists
(
dset
.
getLegacyImageName
())
...
...
ramancom/ramancontrol.py
View file @
744ab90b
...
...
@@ -29,7 +29,7 @@ defaultPath = os.path.dirname(os.path.split(__file__)[0])
config
=
configparser
.
ConfigParser
()
config
.
read
(
os
.
path
.
join
(
defaultPath
,
'gepard.cfg'
))
interface
=
"
RENISHAW
_CONTROL"
interface
=
"
SIMULATED_RAMAN
_CONTROL"
try
:
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment