Skip to content

Commit a0f35da

Browse files
committed
doc !
1 parent f5ecdfa commit a0f35da

File tree

175 files changed

+12908
-4995
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

175 files changed

+12908
-4995
lines changed

Lamia/Lamia.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
# -*- coding: utf-8 -*-
12
"""
23
This file is part of LAMIA.
34
@@ -23,7 +24,7 @@
2324
"""
2425

2526

26-
# -*- coding: utf-8 -*-
27+
2728

2829
"""
2930
Class

Lamia/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
MainModule core
2929
"""
3030

31-
from .Lamia import *
31+
#from .Lamia import *
3232

3333

3434
# noinspection PyPep8Naming

Lamia/dialog/InspectionDigue_linkage.py

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -40,10 +40,10 @@
4040
import qgis.gui
4141

4242

43-
FORM_CLASS, _ = uic.loadUiType(os.path.join(
44-
os.path.dirname(__file__), 'InspectionDigue_linkage.ui'))
43+
# FORM_CLASS, _ = uic.loadUiType(os.path.join(os.path.dirname(__file__), 'InspectionDigue_linkage.ui'))
4544

46-
class LinkageDialog(QDialog, FORM_CLASS):
45+
# class LinkageDialog(QDialog, FORM_CLASS):
46+
class LinkageDialog(QDialog):
4747

4848
def __init__(self, widget, parent=None):
4949
"""Constructor."""
@@ -53,9 +53,12 @@ def __init__(self, widget, parent=None):
5353
# self.<objectname>, and you can use autoconnect slots - see
5454
# http://qt-project.org/doc/qt-4.8/designer-using-a-ui-file.html
5555
# #widgets-and-dialogs-with-auto-connect
56-
self.setupUi(self)
57-
self.finished.connect(self.dialogIsFinished)
5856
self.widget = widget
57+
path = os.path.join(os.path.dirname(__file__), 'InspectionDigue_linkage.ui')
58+
uic.loadUi(path, self)
59+
# self.setupUi(self)
60+
self.finished.connect(self.dialogIsFinished)
61+
5962

6063
self.comboBox_linktype.addItems(self.widget.linkagespec.keys())
6164
"""

Lamia/dialog/InspectionDigue_windowwidget.py

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
# -*- coding: utf-8 -*-
2+
from __future__ import unicode_literals
3+
14
"""
25
This file is part of LAMIA.
36
@@ -23,7 +26,7 @@
2326
"""
2427

2528

26-
# -*- coding: utf-8 -*-
29+
2730

2831
# qgis pyqt import
2932
from qgis.PyQt import QtGui, uic, QtCore
@@ -196,12 +199,12 @@ def __init__(self, canvas, dockwgt=None, parent=None):
196199
self.editfeatureworking = False
197200
self.editfeaturelayer = None
198201

199-
self.currentprestationlabel = QLabel(self.tr('Prestation inactif'))
202+
self.currentprestationlabel = QLabel(self.tr(u'Prestation inactif'))
200203
self.statusBar().addWidget(self.currentprestationlabel, 1)
201204

202-
self.GPSlabel = QLabel(self.tr(u'GPS non connecté'))
205+
self.GPSlabel = QLabel(self.tr('GPS non connecté'))
203206
self.statusBar().addWidget(self.GPSlabel)
204-
self.GPSlabelprecision = QLabel(self.tr(u'Précision'))
207+
self.GPSlabelprecision = QLabel(self.tr('Précision'))
205208
self.statusBar().addWidget(self.GPSlabelprecision)
206209

207210
if debug: logging.getLogger('Lamia').debug('step1')
@@ -1474,7 +1477,7 @@ def exportBase(self):
14741477
print('export fini')
14751478

14761479
def openHelp(self):
1477-
path = os.path.join(os.path.dirname(__file__),'..','html','index.html')
1480+
path = os.path.join(os.path.dirname(__file__),'..','doc_html','index.html')
14781481
os.startfile(path)
14791482

14801483

Lamia/dialog/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,4 +23,4 @@
2323
"""
2424

2525

26-
from .Lamia_numpad import *
26+
#from .Lamia_numpad import *
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
# Sphinx build info version 1
22
# This file hashes the configuration used when building these files. When it is not found, a full rebuild will be done.
3-
config: 37a827955c65a0bb19bb08405e43db62
3+
config: fdda42d2848412cade145a9f63bf2481
44
tags: 645f666f9bcd5a90fca523b33c5a78b7

0 commit comments

Comments
 (0)