Commit 5cb5d545 authored by Jay's avatar Jay Committed by jay
Browse files

Trying a from existing method

parent a6b19e49
Loading
Loading
Loading
Loading
+23 −0
Original line number Diff line number Diff line
@@ -1581,6 +1581,29 @@ WHERE points.active = True AND measures.active=TRUE AND measures.jigreject=FALSE

        return obj

    @classmethod
    def from_remote_database(cls, config, query_string='SELECT * FROM public.images'):
        """
        This is a constructor that takes an existing database containing images and sensors, 
        copies the selected rows into the project specified in the autocnet_config variable, 
        and instantiates a new NetworkCandidateGraph object. This method is
        similar to the `from_database` method. The main difference is that this
        method assumes that the image and sensor rows are prepopulated in an external db
        and simply copies those entires into the currently speficied project.
        """
        sourceSession, _ = new_connection(config)
        sourcesession = sourceSession()
        sourceimages = sourcesession.execute(query_string).all()
        #sourceimageids = [i.id for i in sourceimages]
        #sourcecameras = sourcesession.query(Cameras).filter(Cameras.id.in_(sourceimageids)).all()
        
        session = Session()
        session.add_all(sourceimages)
        session.commit()
        session.close()
        
        sourcesession.close()

    @classmethod
    def from_database(cls, query_string='SELECT * FROM public.images'):
        """
+1 −1
Original line number Diff line number Diff line
@@ -36,4 +36,4 @@ def new_connection(config):
    engine = sqlalchemy.create_engine(db_uri,
                                      poolclass=sqlalchemy.pool.NullPool)
    Session = sqlalchemy.orm.sessionmaker(bind=engine, autocommit=True)
    return Session(), engine
    return Session, engine
+1 −1
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ def setup_package():
        packages=find_packages(),
        include_package_data=True,
        package_data={'autocnet' : list(examples)},
        scripts=['bin/acn_submit', 'bin/acn_overlaps', 'bin/acn_subpixel'],
        scripts=['bin/acn_submit', 'bin/acn_overlaps', 'bin/acn_subpixel', 'bin/acn_load_images'],
        zip_safe=False,
        install_requires=[],
        classifiers=[